]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blame - src/patches/grsecurity-2.9.1-3.10.9-201308202015.patch
projects / people / teissler / ipfire-2.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
grub: disable pax mprotect for grub.
[people/teissler/ipfire-2.x.git] / src / patches / grsecurity-2.9.1-3.10.9-201308202015.patch
CommitLineData
bb5f0bf8
AF		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index b89a739..79768fb 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -48,14 +51,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38-.*
39+.[^g]*
40+.gen*
41 .*.d
42 .mm
43 53c700_d.h
44@@ -69,9 +75,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48+PERF*
49 SCCS
50 System.map*
51 TAGS
52+TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56@@ -80,6 +88,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60+ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64@@ -92,19 +101,24 @@ bounds.h
65 bsetup
66 btfixupprep
67 build
68+builtin-policy.h
69 bvmlinux
70 bzImage*
71 capability_names.h
72 capflags.c
73 classlist.h*
74+clut_vga16.c
75+common-cmds.h
76 comp*.log
77 compile.h*
78 conf
79 config
80 config-*
81 config_data.h*
82+config.c
83 config.mak
84 config.mak.autogen
85+config.tmp
86 conmakehash
87 consolemap_deftbl.c*
88 cpustr.h
89@@ -115,9 +129,11 @@ devlist.h*
90 dnotify_test
91 docproc
92 dslm
93+dtc-lexer.lex.c
94 elf2ecoff
95 elfconfig.h*
96 evergreen_reg_safe.h
97+exception_policy.conf
98 fixdep
99 flask.h
100 fore200e_mkfirm
101@@ -125,12 +141,15 @@ fore200e_pca_fw.c*
102 gconf
103 gconf.glade.h
104 gen-devlist
105+gen-kdb_cmds.c
106 gen_crc32table
107 gen_init_cpio
108 generated
109 genheaders
110 genksyms
111 *_gray256.c
112+hash
113+hid-example
114 hpet_example
115 hugepage-mmap
116 hugepage-shm
117@@ -145,14 +164,14 @@ int32.c
118 int4.c
119 int8.c
120 kallsyms
121-kconfig
122+kern_constants.h
123 keywords.c
124 ksym.c*
125 ksym.h*
126 kxgettext
127 lex.c
128 lex.*.c
129-linux
130+lib1funcs.S
131 logo_*.c
132 logo_*_clut224.c
133 logo_*_mono.c
134@@ -162,14 +181,15 @@ mach-types.h
135 machtypes.h
136 map
137 map_hugetlb
138-media
139 mconf
140+mdp
141 miboot*
142 mk_elfconfig
143 mkboot
144 mkbugboot
145 mkcpustr
146 mkdep
147+mkpiggy
148 mkprep
149 mkregtable
150 mktables
151@@ -185,6 +205,8 @@ oui.c*
152 page-types
153 parse.c
154 parse.h
155+parse-events*
156+pasyms.h
157 patches*
158 pca200e.bin
159 pca200e_ecd.bin2
160@@ -194,6 +216,7 @@ perf-archive
161 piggyback
162 piggy.gzip
163 piggy.S
164+pmu-*
165 pnmtologo
166 ppc_defs.h*
167 pss_boot.h
168@@ -203,7 +226,10 @@ r200_reg_safe.h
169 r300_reg_safe.h
170 r420_reg_safe.h
171 r600_reg_safe.h
172+realmode.lds
173+realmode.relocs
174 recordmcount
175+regdb.c
176 relocs
177 rlim_names.h
178 rn50_reg_safe.h
179@@ -213,8 +239,12 @@ series
180 setup
181 setup.bin
182 setup.elf
183+signing_key*
184+size_overflow_hash.h
185 sImage
186+slabinfo
187 sm_tbl*
188+sortextable
189 split-include
190 syscalltab.h
191 tables.c
192@@ -224,6 +254,7 @@ tftpboot.img
193 timeconst.h
194 times.h*
195 trix_boot.h
196+user_constants.h
197 utsrelease.h*
198 vdso-syms.lds
199 vdso.lds
200@@ -235,13 +266,17 @@ vdso32.lds
201 vdso32.so.dbg
202 vdso64.lds
203 vdso64.so.dbg
204+vdsox32.lds
205+vdsox32-syms.lds
206 version.h*
207 vmImage
208 vmlinux
209 vmlinux-*
210 vmlinux.aout
211 vmlinux.bin.all
212+vmlinux.bin.bz2
213 vmlinux.lds
214+vmlinux.relocs
215 vmlinuz
216 voffset.h
217 vsyscall.lds
218@@ -249,9 +284,12 @@ vsyscall_32.lds
219 wanxlfw.inc
220 uImage
221 unifdef
222+utsrelease.h
223 wakeup.bin
224 wakeup.elf
225 wakeup.lds
226+x509*
227 zImage*
228 zconf.hash.c
229+zconf.lex.c
230 zoffset.h
231diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
232index 2fe6e76..889ee23 100644
233--- a/Documentation/kernel-parameters.txt
234+++ b/Documentation/kernel-parameters.txt
235@@ -976,6 +976,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
236 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
237 Default: 1024
238
239+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
240+ ignore grsecurity's /proc restrictions
241+
242+
243 hashdist= [KNL,NUMA] Large hashes allocated during boot
244 are distributed across NUMA nodes. Defaults on
245 for 64-bit NUMA, off otherwise.
246@@ -1928,6 +1932,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
247 noexec=on: enable non-executable mappings (default)
248 noexec=off: disable non-executable mappings
249
250+ nopcid [X86-64]
251+ Disable PCID (Process-Context IDentifier) even if it
252+ is supported by the processor.
253+
254 nosmap [X86]
255 Disable SMAP (Supervisor Mode Access Prevention)
256 even if it is supported by processor.
257@@ -2195,6 +2203,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
258 the specified number of seconds. This is to be used if
259 your oopses keep scrolling off the screen.
260
261+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
262+ virtualization environments that don't cope well with the
263+ expand down segment used by UDEREF on X86-32 or the frequent
264+ page table updates on X86-64.
265+
266+ pax_sanitize_slab=
267+ 0/1 to disable/enable slab object sanitization (enabled by
268+ default).
269+
270+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
271+
272+ pax_extra_latent_entropy
273+ Enable a very simple form of latent entropy extraction
274+ from the first 4GB of memory as the bootmem allocator
275+ passes the memory pages to the buddy allocator.
276+
277+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
278+ when the processor supports PCID.
279+
280 pcbit= [HW,ISDN]
281
282 pcd. [PARIDE]
283diff --git a/Makefile b/Makefile
284index 4b31d62..ac99d49 100644
285--- a/Makefile
286+++ b/Makefile
287@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
288
289 HOSTCC = gcc
290 HOSTCXX = g++
291-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
292-HOSTCXXFLAGS = -O2
293+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
294+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
295+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
296
297 # Decide whether to build built-in, modular, or both.
298 # Normally, just do built-in.
299@@ -414,8 +415,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
300 # Rules shared between *config targets and build targets
301
302 # Basic helpers built in scripts/
303-PHONY += scripts_basic
304-scripts_basic:
305+PHONY += scripts_basic gcc-plugins
306+scripts_basic: gcc-plugins
307 $(Q)$(MAKE) $(build)=scripts/basic
308 $(Q)rm -f .tmp_quiet_recordmcount
309
310@@ -576,6 +577,65 @@ else
311 KBUILD_CFLAGS += -O2
312 endif
313
314+ifndef DISABLE_PAX_PLUGINS
315+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
316+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
317+else
318+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
319+endif
320+ifneq ($(PLUGINCC),)
321+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
322+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
323+endif
324+ifdef CONFIG_PAX_MEMORY_STACKLEAK
325+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
326+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
327+endif
328+ifdef CONFIG_KALLOCSTAT_PLUGIN
329+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
330+endif
331+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
332+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
333+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
334+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
335+endif
336+ifdef CONFIG_CHECKER_PLUGIN
337+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
338+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
339+endif
340+endif
341+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
342+ifdef CONFIG_PAX_SIZE_OVERFLOW
343+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
344+endif
345+ifdef CONFIG_PAX_LATENT_ENTROPY
346+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
347+endif
348+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
349+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
350+endif
351+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
352+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
353+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
354+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
355+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN
356+ifeq ($(KBUILD_EXTMOD),)
357+gcc-plugins:
358+ $(Q)$(MAKE) $(build)=tools/gcc
359+else
360+gcc-plugins: ;
361+endif
362+else
363+gcc-plugins:
364+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
365+ $(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.))
366+else
367+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
368+endif
369+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
370+endif
371+endif
372+
373 include $(srctree)/arch/$(SRCARCH)/Makefile
374
375 ifdef CONFIG_READABLE_ASM
376@@ -733,7 +793,7 @@ export mod_sign_cmd
377
378
379 ifeq ($(KBUILD_EXTMOD),)
380-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
381+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
382
383 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
384 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
385@@ -782,6 +842,8 @@ endif
386
387 # The actual objects are generated when descending,
388 # make sure no implicit rule kicks in
389+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
390+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
391 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
392
393 # Handle descending into subdirectories listed in $(vmlinux-dirs)
394@@ -791,7 +853,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
395 # Error messages still appears in the original language
396
397 PHONY += $(vmlinux-dirs)
398-$(vmlinux-dirs): prepare scripts
399+$(vmlinux-dirs): gcc-plugins prepare scripts
400 $(Q)$(MAKE) $(build)=$@
401
402 # Store (new) KERNELRELASE string in include/config/kernel.release
403@@ -835,6 +897,7 @@ prepare0: archprepare FORCE
404 $(Q)$(MAKE) $(build)=.
405
406 # All the preparing..
407+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
408 prepare: prepare0
409
410 # Generate some files
411@@ -942,6 +1005,8 @@ all: modules
412 # using awk while concatenating to the final file.
413
414 PHONY += modules
415+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
416+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
417 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
418 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
419 @$(kecho) ' Building modules, stage 2.';
420@@ -957,7 +1022,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
421
422 # Target to prepare building external modules
423 PHONY += modules_prepare
424-modules_prepare: prepare scripts
425+modules_prepare: gcc-plugins prepare scripts
426
427 # Target to install modules
428 PHONY += modules_install
429@@ -1023,7 +1088,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
430 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
431 signing_key.priv signing_key.x509 x509.genkey \
432 extra_certificates signing_key.x509.keyid \
433- signing_key.x509.signer
434+ signing_key.x509.signer tools/gcc/size_overflow_hash.h
435
436 # clean - Delete most, but leave enough to build external modules
437 #
438@@ -1063,6 +1128,7 @@ distclean: mrproper
439 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
440 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
441 -o -name '.*.rej' \
442+ -o -name '.*.rej' -o -name '*.so' \
443 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
444 -type f -print | xargs rm -f
445
446@@ -1223,6 +1289,8 @@ PHONY += $(module-dirs) modules
447 $(module-dirs): crmodverdir $(objtree)/Module.symvers
448 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
449
450+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
451+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
452 modules: $(module-dirs)
453 @$(kecho) ' Building modules, stage 2.';
454 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
455@@ -1359,17 +1427,21 @@ else
456 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
457 endif
458
459-%.s: %.c prepare scripts FORCE
460+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
461+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
462+%.s: %.c gcc-plugins prepare scripts FORCE
463 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
464 %.i: %.c prepare scripts FORCE
465 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
466-%.o: %.c prepare scripts FORCE
467+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
468+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
469+%.o: %.c gcc-plugins prepare scripts FORCE
470 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
471 %.lst: %.c prepare scripts FORCE
472 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
473-%.s: %.S prepare scripts FORCE
474+%.s: %.S gcc-plugins prepare scripts FORCE
475 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
476-%.o: %.S prepare scripts FORCE
477+%.o: %.S gcc-plugins prepare scripts FORCE
478 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
479 %.symtypes: %.c prepare scripts FORCE
480 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
481@@ -1379,11 +1451,15 @@ endif
482 $(cmd_crmodverdir)
483 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
484 $(build)=$(build-dir)
485-%/: prepare scripts FORCE
486+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
487+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
488+%/: gcc-plugins prepare scripts FORCE
489 $(cmd_crmodverdir)
490 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
491 $(build)=$(build-dir)
492-%.ko: prepare scripts FORCE
493+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
494+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
495+%.ko: gcc-plugins prepare scripts FORCE
496 $(cmd_crmodverdir)
497 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
498 $(build)=$(build-dir) $(@:.ko=.o)
499diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
500index c2cbe4f..f7264b4 100644
501--- a/arch/alpha/include/asm/atomic.h
502+++ b/arch/alpha/include/asm/atomic.h
503@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
504 #define atomic_dec(v) atomic_sub(1,(v))
505 #define atomic64_dec(v) atomic64_sub(1,(v))
506
507+#define atomic64_read_unchecked(v) atomic64_read(v)
508+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
509+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
510+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
511+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
512+#define atomic64_inc_unchecked(v) atomic64_inc(v)
513+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
514+#define atomic64_dec_unchecked(v) atomic64_dec(v)
515+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
516+
517 #define smp_mb__before_atomic_dec() smp_mb()
518 #define smp_mb__after_atomic_dec() smp_mb()
519 #define smp_mb__before_atomic_inc() smp_mb()
520diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
521index ad368a9..fbe0f25 100644
522--- a/arch/alpha/include/asm/cache.h
523+++ b/arch/alpha/include/asm/cache.h
524@@ -4,19 +4,19 @@
525 #ifndef __ARCH_ALPHA_CACHE_H
526 #define __ARCH_ALPHA_CACHE_H
527
528+#include <linux/const.h>
529
530 /* Bytes per L1 (data) cache line. */
531 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
532-# define L1_CACHE_BYTES 64
533 # define L1_CACHE_SHIFT 6
534 #else
535 /* Both EV4 and EV5 are write-through, read-allocate,
536 direct-mapped, physical.
537 */
538-# define L1_CACHE_BYTES 32
539 # define L1_CACHE_SHIFT 5
540 #endif
541
542+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
543 #define SMP_CACHE_BYTES L1_CACHE_BYTES
544
545 #endif
546diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
547index 968d999..d36b2df 100644
548--- a/arch/alpha/include/asm/elf.h
549+++ b/arch/alpha/include/asm/elf.h
550@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
551
552 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
553
554+#ifdef CONFIG_PAX_ASLR
555+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
556+
557+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
558+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
559+#endif
560+
561 /* $0 is set by ld.so to a pointer to a function which might be
562 registered using atexit. This provides a mean for the dynamic
563 linker to call DT_FINI functions for shared libraries that have
564diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
565index bc2a0da..8ad11ee 100644
566--- a/arch/alpha/include/asm/pgalloc.h
567+++ b/arch/alpha/include/asm/pgalloc.h
568@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
569 pgd_set(pgd, pmd);
570 }
571
572+static inline void
573+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
574+{
575+ pgd_populate(mm, pgd, pmd);
576+}
577+
578 extern pgd_t *pgd_alloc(struct mm_struct *mm);
579
580 static inline void
581diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
582index 81a4342..348b927 100644
583--- a/arch/alpha/include/asm/pgtable.h
584+++ b/arch/alpha/include/asm/pgtable.h
585@@ -102,6 +102,17 @@ struct vm_area_struct;
586 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
587 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
588 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
589+
590+#ifdef CONFIG_PAX_PAGEEXEC
591+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
592+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
593+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
594+#else
595+# define PAGE_SHARED_NOEXEC PAGE_SHARED
596+# define PAGE_COPY_NOEXEC PAGE_COPY
597+# define PAGE_READONLY_NOEXEC PAGE_READONLY
598+#endif
599+
600 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
601
602 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
603diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
604index 2fd00b7..cfd5069 100644
605--- a/arch/alpha/kernel/module.c
606+++ b/arch/alpha/kernel/module.c
607@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
608
609 /* The small sections were sorted to the end of the segment.
610 The following should definitely cover them. */
611- gp = (u64)me->module_core + me->core_size - 0x8000;
612+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
613 got = sechdrs[me->arch.gotsecindex].sh_addr;
614
615 for (i = 0; i < n; i++) {
616diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
617index b9e37ad..44c24e7 100644
618--- a/arch/alpha/kernel/osf_sys.c
619+++ b/arch/alpha/kernel/osf_sys.c
620@@ -1297,10 +1297,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
621 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
622
623 static unsigned long
624-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
625- unsigned long limit)
626+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
627+ unsigned long limit, unsigned long flags)
628 {
629 struct vm_unmapped_area_info info;
630+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
631
632 info.flags = 0;
633 info.length = len;
634@@ -1308,6 +1309,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
635 info.high_limit = limit;
636 info.align_mask = 0;
637 info.align_offset = 0;
638+ info.threadstack_offset = offset;
639 return vm_unmapped_area(&info);
640 }
641
642@@ -1340,20 +1342,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
643 merely specific addresses, but regions of memory -- perhaps
644 this feature should be incorporated into all ports? */
645
646+#ifdef CONFIG_PAX_RANDMMAP
647+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
648+#endif
649+
650 if (addr) {
651- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
652+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
653 if (addr != (unsigned long) -ENOMEM)
654 return addr;
655 }
656
657 /* Next, try allocating at TASK_UNMAPPED_BASE. */
658- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
659- len, limit);
660+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
661+
662 if (addr != (unsigned long) -ENOMEM)
663 return addr;
664
665 /* Finally, try allocating in low memory. */
666- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
667+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
668
669 return addr;
670 }
671diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
672index 0c4132d..88f0d53 100644
673--- a/arch/alpha/mm/fault.c
674+++ b/arch/alpha/mm/fault.c
675@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
676 __reload_thread(pcb);
677 }
678
679+#ifdef CONFIG_PAX_PAGEEXEC
680+/*
681+ * PaX: decide what to do with offenders (regs->pc = fault address)
682+ *
683+ * returns 1 when task should be killed
684+ * 2 when patched PLT trampoline was detected
685+ * 3 when unpatched PLT trampoline was detected
686+ */
687+static int pax_handle_fetch_fault(struct pt_regs *regs)
688+{
689+
690+#ifdef CONFIG_PAX_EMUPLT
691+ int err;
692+
693+ do { /* PaX: patched PLT emulation #1 */
694+ unsigned int ldah, ldq, jmp;
695+
696+ err = get_user(ldah, (unsigned int *)regs->pc);
697+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
698+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
699+
700+ if (err)
701+ break;
702+
703+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
704+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
705+ jmp == 0x6BFB0000U)
706+ {
707+ unsigned long r27, addr;
708+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
709+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
710+
711+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
712+ err = get_user(r27, (unsigned long *)addr);
713+ if (err)
714+ break;
715+
716+ regs->r27 = r27;
717+ regs->pc = r27;
718+ return 2;
719+ }
720+ } while (0);
721+
722+ do { /* PaX: patched PLT emulation #2 */
723+ unsigned int ldah, lda, br;
724+
725+ err = get_user(ldah, (unsigned int *)regs->pc);
726+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
727+ err |= get_user(br, (unsigned int *)(regs->pc+8));
728+
729+ if (err)
730+ break;
731+
732+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
733+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
734+ (br & 0xFFE00000U) == 0xC3E00000U)
735+ {
736+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
737+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
738+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
739+
740+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
741+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
742+ return 2;
743+ }
744+ } while (0);
745+
746+ do { /* PaX: unpatched PLT emulation */
747+ unsigned int br;
748+
749+ err = get_user(br, (unsigned int *)regs->pc);
750+
751+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
752+ unsigned int br2, ldq, nop, jmp;
753+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
754+
755+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
756+ err = get_user(br2, (unsigned int *)addr);
757+ err |= get_user(ldq, (unsigned int *)(addr+4));
758+ err |= get_user(nop, (unsigned int *)(addr+8));
759+ err |= get_user(jmp, (unsigned int *)(addr+12));
760+ err |= get_user(resolver, (unsigned long *)(addr+16));
761+
762+ if (err)
763+ break;
764+
765+ if (br2 == 0xC3600000U &&
766+ ldq == 0xA77B000CU &&
767+ nop == 0x47FF041FU &&
768+ jmp == 0x6B7B0000U)
769+ {
770+ regs->r28 = regs->pc+4;
771+ regs->r27 = addr+16;
772+ regs->pc = resolver;
773+ return 3;
774+ }
775+ }
776+ } while (0);
777+#endif
778+
779+ return 1;
780+}
781+
782+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
783+{
784+ unsigned long i;
785+
786+ printk(KERN_ERR "PAX: bytes at PC: ");
787+ for (i = 0; i < 5; i++) {
788+ unsigned int c;
789+ if (get_user(c, (unsigned int *)pc+i))
790+ printk(KERN_CONT "???????? ");
791+ else
792+ printk(KERN_CONT "%08x ", c);
793+ }
794+ printk("\n");
795+}
796+#endif
797
798 /*
799 * This routine handles page faults. It determines the address,
800@@ -133,8 +251,29 @@ retry:
801 good_area:
802 si_code = SEGV_ACCERR;
803 if (cause < 0) {
804- if (!(vma->vm_flags & VM_EXEC))
805+ if (!(vma->vm_flags & VM_EXEC)) {
806+
807+#ifdef CONFIG_PAX_PAGEEXEC
808+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
809+ goto bad_area;
810+
811+ up_read(&mm->mmap_sem);
812+ switch (pax_handle_fetch_fault(regs)) {
813+
814+#ifdef CONFIG_PAX_EMUPLT
815+ case 2:
816+ case 3:
817+ return;
818+#endif
819+
820+ }
821+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
822+ do_group_exit(SIGKILL);
823+#else
824 goto bad_area;
825+#endif
826+
827+ }
828 } else if (!cause) {
829 /* Allow reads even for write-only mappings */
830 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
831diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
832index 18a9f5e..ca910b7 100644
833--- a/arch/arm/Kconfig
834+++ b/arch/arm/Kconfig
835@@ -1766,7 +1766,7 @@ config ALIGNMENT_TRAP
836
837 config UACCESS_WITH_MEMCPY
838 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
839- depends on MMU
840+ depends on MMU && !PAX_MEMORY_UDEREF
841 default y if CPU_FEROCEON
842 help
843 Implement faster copy_to_user and clear_user methods for CPU
844diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
845index da1c77d..2ee6056 100644
846--- a/arch/arm/include/asm/atomic.h
847+++ b/arch/arm/include/asm/atomic.h
848@@ -17,17 +17,35 @@
849 #include <asm/barrier.h>
850 #include <asm/cmpxchg.h>
851
852+#ifdef CONFIG_GENERIC_ATOMIC64
853+#include <asm-generic/atomic64.h>
854+#endif
855+
856 #define ATOMIC_INIT(i) { (i) }
857
858 #ifdef __KERNEL__
859
860+#define _ASM_EXTABLE(from, to) \
861+" .pushsection __ex_table,\"a\"\n"\
862+" .align 3\n" \
863+" .long " #from ", " #to"\n" \
864+" .popsection"
865+
866 /*
867 * On ARM, ordinary assignment (str instruction) doesn't clear the local
868 * strex/ldrex monitor on some implementations. The reason we can use it for
869 * atomic_set() is the clrex or dummy strex done on every exception return.
870 */
871 #define atomic_read(v) (*(volatile int *)&(v)->counter)
872+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
873+{
874+ return v->counter;
875+}
876 #define atomic_set(v,i) (((v)->counter) = (i))
877+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
878+{
879+ v->counter = i;
880+}
881
882 #if __LINUX_ARM_ARCH__ >= 6
883
884@@ -42,6 +60,35 @@ static inline void atomic_add(int i, atomic_t *v)
885 int result;
886
887 __asm__ __volatile__("@ atomic_add\n"
888+"1: ldrex %1, [%3]\n"
889+" adds %0, %1, %4\n"
890+
891+#ifdef CONFIG_PAX_REFCOUNT
892+" bvc 3f\n"
893+"2: bkpt 0xf103\n"
894+"3:\n"
895+#endif
896+
897+" strex %1, %0, [%3]\n"
898+" teq %1, #0\n"
899+" bne 1b"
900+
901+#ifdef CONFIG_PAX_REFCOUNT
902+"\n4:\n"
903+ _ASM_EXTABLE(2b, 4b)
904+#endif
905+
906+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
907+ : "r" (&v->counter), "Ir" (i)
908+ : "cc");
909+}
910+
911+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
912+{
913+ unsigned long tmp;
914+ int result;
915+
916+ __asm__ __volatile__("@ atomic_add_unchecked\n"
917 "1: ldrex %0, [%3]\n"
918 " add %0, %0, %4\n"
919 " strex %1, %0, [%3]\n"
920@@ -60,6 +107,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
921 smp_mb();
922
923 __asm__ __volatile__("@ atomic_add_return\n"
924+"1: ldrex %1, [%3]\n"
925+" adds %0, %1, %4\n"
926+
927+#ifdef CONFIG_PAX_REFCOUNT
928+" bvc 3f\n"
929+" mov %0, %1\n"
930+"2: bkpt 0xf103\n"
931+"3:\n"
932+#endif
933+
934+" strex %1, %0, [%3]\n"
935+" teq %1, #0\n"
936+" bne 1b"
937+
938+#ifdef CONFIG_PAX_REFCOUNT
939+"\n4:\n"
940+ _ASM_EXTABLE(2b, 4b)
941+#endif
942+
943+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
944+ : "r" (&v->counter), "Ir" (i)
945+ : "cc");
946+
947+ smp_mb();
948+
949+ return result;
950+}
951+
952+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
953+{
954+ unsigned long tmp;
955+ int result;
956+
957+ smp_mb();
958+
959+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
960 "1: ldrex %0, [%3]\n"
961 " add %0, %0, %4\n"
962 " strex %1, %0, [%3]\n"
963@@ -80,6 +163,35 @@ static inline void atomic_sub(int i, atomic_t *v)
964 int result;
965
966 __asm__ __volatile__("@ atomic_sub\n"
967+"1: ldrex %1, [%3]\n"
968+" subs %0, %1, %4\n"
969+
970+#ifdef CONFIG_PAX_REFCOUNT
971+" bvc 3f\n"
972+"2: bkpt 0xf103\n"
973+"3:\n"
974+#endif
975+
976+" strex %1, %0, [%3]\n"
977+" teq %1, #0\n"
978+" bne 1b"
979+
980+#ifdef CONFIG_PAX_REFCOUNT
981+"\n4:\n"
982+ _ASM_EXTABLE(2b, 4b)
983+#endif
984+
985+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
986+ : "r" (&v->counter), "Ir" (i)
987+ : "cc");
988+}
989+
990+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
991+{
992+ unsigned long tmp;
993+ int result;
994+
995+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
996 "1: ldrex %0, [%3]\n"
997 " sub %0, %0, %4\n"
998 " strex %1, %0, [%3]\n"
999@@ -98,11 +210,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1000 smp_mb();
1001
1002 __asm__ __volatile__("@ atomic_sub_return\n"
1003-"1: ldrex %0, [%3]\n"
1004-" sub %0, %0, %4\n"
1005+"1: ldrex %1, [%3]\n"
1006+" subs %0, %1, %4\n"
1007+
1008+#ifdef CONFIG_PAX_REFCOUNT
1009+" bvc 3f\n"
1010+" mov %0, %1\n"
1011+"2: bkpt 0xf103\n"
1012+"3:\n"
1013+#endif
1014+
1015 " strex %1, %0, [%3]\n"
1016 " teq %1, #0\n"
1017 " bne 1b"
1018+
1019+#ifdef CONFIG_PAX_REFCOUNT
1020+"\n4:\n"
1021+ _ASM_EXTABLE(2b, 4b)
1022+#endif
1023+
1024 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1025 : "r" (&v->counter), "Ir" (i)
1026 : "cc");
1027@@ -134,6 +260,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1028 return oldval;
1029 }
1030
1031+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1032+{
1033+ unsigned long oldval, res;
1034+
1035+ smp_mb();
1036+
1037+ do {
1038+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1039+ "ldrex %1, [%3]\n"
1040+ "mov %0, #0\n"
1041+ "teq %1, %4\n"
1042+ "strexeq %0, %5, [%3]\n"
1043+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1044+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1045+ : "cc");
1046+ } while (res);
1047+
1048+ smp_mb();
1049+
1050+ return oldval;
1051+}
1052+
1053 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1054 {
1055 unsigned long tmp, tmp2;
1056@@ -167,7 +315,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1057
1058 return val;
1059 }
1060+
1061+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1062+{
1063+ return atomic_add_return(i, v);
1064+}
1065+
1066 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1067+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1068+{
1069+ (void) atomic_add_return(i, v);
1070+}
1071
1072 static inline int atomic_sub_return(int i, atomic_t *v)
1073 {
1074@@ -182,6 +340,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1075 return val;
1076 }
1077 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1078+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1079+{
1080+ (void) atomic_sub_return(i, v);
1081+}
1082
1083 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1084 {
1085@@ -197,6 +359,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1086 return ret;
1087 }
1088
1089+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1090+{
1091+ return atomic_cmpxchg(v, old, new);
1092+}
1093+
1094 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1095 {
1096 unsigned long flags;
1097@@ -209,6 +376,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1098 #endif /* __LINUX_ARM_ARCH__ */
1099
1100 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1101+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1102+{
1103+ return xchg(&v->counter, new);
1104+}
1105
1106 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1107 {
1108@@ -221,11 +392,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1109 }
1110
1111 #define atomic_inc(v) atomic_add(1, v)
1112+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1113+{
1114+ atomic_add_unchecked(1, v);
1115+}
1116 #define atomic_dec(v) atomic_sub(1, v)
1117+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1118+{
1119+ atomic_sub_unchecked(1, v);
1120+}
1121
1122 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1123+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1124+{
1125+ return atomic_add_return_unchecked(1, v) == 0;
1126+}
1127 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1128 #define atomic_inc_return(v) (atomic_add_return(1, v))
1129+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1130+{
1131+ return atomic_add_return_unchecked(1, v);
1132+}
1133 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1134 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1135
1136@@ -241,6 +428,14 @@ typedef struct {
1137 u64 __aligned(8) counter;
1138 } atomic64_t;
1139
1140+#ifdef CONFIG_PAX_REFCOUNT
1141+typedef struct {
1142+ u64 __aligned(8) counter;
1143+} atomic64_unchecked_t;
1144+#else
1145+typedef atomic64_t atomic64_unchecked_t;
1146+#endif
1147+
1148 #define ATOMIC64_INIT(i) { (i) }
1149
1150 #ifdef CONFIG_ARM_LPAE
1151@@ -257,6 +452,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1152 return result;
1153 }
1154
1155+static inline u64 atomic64_read_unchecked(const atomic64_unchecked_t *v)
1156+{
1157+ u64 result;
1158+
1159+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1160+" ldrd %0, %H0, [%1]"
1161+ : "=&r" (result)
1162+ : "r" (&v->counter), "Qo" (v->counter)
1163+ );
1164+
1165+ return result;
1166+}
1167+
1168 static inline void atomic64_set(atomic64_t *v, u64 i)
1169 {
1170 __asm__ __volatile__("@ atomic64_set\n"
1171@@ -265,6 +473,15 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1172 : "r" (&v->counter), "r" (i)
1173 );
1174 }
1175+
1176+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1177+{
1178+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1179+" strd %2, %H2, [%1]"
1180+ : "=Qo" (v->counter)
1181+ : "r" (&v->counter), "r" (i)
1182+ );
1183+}
1184 #else
1185 static inline u64 atomic64_read(const atomic64_t *v)
1186 {
1187@@ -279,6 +496,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1188 return result;
1189 }
1190
1191+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
1192+{
1193+ u64 result;
1194+
1195+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1196+" ldrexd %0, %H0, [%1]"
1197+ : "=&r" (result)
1198+ : "r" (&v->counter), "Qo" (v->counter)
1199+ );
1200+
1201+ return result;
1202+}
1203+
1204 static inline void atomic64_set(atomic64_t *v, u64 i)
1205 {
1206 u64 tmp;
1207@@ -292,6 +522,21 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1208 : "r" (&v->counter), "r" (i)
1209 : "cc");
1210 }
1211+
1212+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1213+{
1214+ u64 tmp;
1215+
1216+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1217+"1: ldrexd %0, %H0, [%2]\n"
1218+" strexd %0, %3, %H3, [%2]\n"
1219+" teq %0, #0\n"
1220+" bne 1b"
1221+ : "=&r" (tmp), "=Qo" (v->counter)
1222+ : "r" (&v->counter), "r" (i)
1223+ : "cc");
1224+}
1225+
1226 #endif
1227
1228 static inline void atomic64_add(u64 i, atomic64_t *v)
1229@@ -302,6 +547,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1230 __asm__ __volatile__("@ atomic64_add\n"
1231 "1: ldrexd %0, %H0, [%3]\n"
1232 " adds %0, %0, %4\n"
1233+" adcs %H0, %H0, %H4\n"
1234+
1235+#ifdef CONFIG_PAX_REFCOUNT
1236+" bvc 3f\n"
1237+"2: bkpt 0xf103\n"
1238+"3:\n"
1239+#endif
1240+
1241+" strexd %1, %0, %H0, [%3]\n"
1242+" teq %1, #0\n"
1243+" bne 1b"
1244+
1245+#ifdef CONFIG_PAX_REFCOUNT
1246+"\n4:\n"
1247+ _ASM_EXTABLE(2b, 4b)
1248+#endif
1249+
1250+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1251+ : "r" (&v->counter), "r" (i)
1252+ : "cc");
1253+}
1254+
1255+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1256+{
1257+ u64 result;
1258+ unsigned long tmp;
1259+
1260+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1261+"1: ldrexd %0, %H0, [%3]\n"
1262+" adds %0, %0, %4\n"
1263 " adc %H0, %H0, %H4\n"
1264 " strexd %1, %0, %H0, [%3]\n"
1265 " teq %1, #0\n"
1266@@ -313,12 +588,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1267
1268 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1269 {
1270- u64 result;
1271- unsigned long tmp;
1272+ u64 result, tmp;
1273
1274 smp_mb();
1275
1276 __asm__ __volatile__("@ atomic64_add_return\n"
1277+"1: ldrexd %1, %H1, [%3]\n"
1278+" adds %0, %1, %4\n"
1279+" adcs %H0, %H1, %H4\n"
1280+
1281+#ifdef CONFIG_PAX_REFCOUNT
1282+" bvc 3f\n"
1283+" mov %0, %1\n"
1284+" mov %H0, %H1\n"
1285+"2: bkpt 0xf103\n"
1286+"3:\n"
1287+#endif
1288+
1289+" strexd %1, %0, %H0, [%3]\n"
1290+" teq %1, #0\n"
1291+" bne 1b"
1292+
1293+#ifdef CONFIG_PAX_REFCOUNT
1294+"\n4:\n"
1295+ _ASM_EXTABLE(2b, 4b)
1296+#endif
1297+
1298+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1299+ : "r" (&v->counter), "r" (i)
1300+ : "cc");
1301+
1302+ smp_mb();
1303+
1304+ return result;
1305+}
1306+
1307+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1308+{
1309+ u64 result;
1310+ unsigned long tmp;
1311+
1312+ smp_mb();
1313+
1314+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1315 "1: ldrexd %0, %H0, [%3]\n"
1316 " adds %0, %0, %4\n"
1317 " adc %H0, %H0, %H4\n"
1318@@ -342,6 +654,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1319 __asm__ __volatile__("@ atomic64_sub\n"
1320 "1: ldrexd %0, %H0, [%3]\n"
1321 " subs %0, %0, %4\n"
1322+" sbcs %H0, %H0, %H4\n"
1323+
1324+#ifdef CONFIG_PAX_REFCOUNT
1325+" bvc 3f\n"
1326+"2: bkpt 0xf103\n"
1327+"3:\n"
1328+#endif
1329+
1330+" strexd %1, %0, %H0, [%3]\n"
1331+" teq %1, #0\n"
1332+" bne 1b"
1333+
1334+#ifdef CONFIG_PAX_REFCOUNT
1335+"\n4:\n"
1336+ _ASM_EXTABLE(2b, 4b)
1337+#endif
1338+
1339+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1340+ : "r" (&v->counter), "r" (i)
1341+ : "cc");
1342+}
1343+
1344+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1345+{
1346+ u64 result;
1347+ unsigned long tmp;
1348+
1349+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1350+"1: ldrexd %0, %H0, [%3]\n"
1351+" subs %0, %0, %4\n"
1352 " sbc %H0, %H0, %H4\n"
1353 " strexd %1, %0, %H0, [%3]\n"
1354 " teq %1, #0\n"
1355@@ -353,18 +695,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1356
1357 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1358 {
1359- u64 result;
1360- unsigned long tmp;
1361+ u64 result, tmp;
1362
1363 smp_mb();
1364
1365 __asm__ __volatile__("@ atomic64_sub_return\n"
1366-"1: ldrexd %0, %H0, [%3]\n"
1367-" subs %0, %0, %4\n"
1368-" sbc %H0, %H0, %H4\n"
1369+"1: ldrexd %1, %H1, [%3]\n"
1370+" subs %0, %1, %4\n"
1371+" sbcs %H0, %H1, %H4\n"
1372+
1373+#ifdef CONFIG_PAX_REFCOUNT
1374+" bvc 3f\n"
1375+" mov %0, %1\n"
1376+" mov %H0, %H1\n"
1377+"2: bkpt 0xf103\n"
1378+"3:\n"
1379+#endif
1380+
1381 " strexd %1, %0, %H0, [%3]\n"
1382 " teq %1, #0\n"
1383 " bne 1b"
1384+
1385+#ifdef CONFIG_PAX_REFCOUNT
1386+"\n4:\n"
1387+ _ASM_EXTABLE(2b, 4b)
1388+#endif
1389+
1390 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1391 : "r" (&v->counter), "r" (i)
1392 : "cc");
1393@@ -398,6 +754,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1394 return oldval;
1395 }
1396
1397+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1398+{
1399+ u64 oldval;
1400+ unsigned long res;
1401+
1402+ smp_mb();
1403+
1404+ do {
1405+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1406+ "ldrexd %1, %H1, [%3]\n"
1407+ "mov %0, #0\n"
1408+ "teq %1, %4\n"
1409+ "teqeq %H1, %H4\n"
1410+ "strexdeq %0, %5, %H5, [%3]"
1411+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1412+ : "r" (&ptr->counter), "r" (old), "r" (new)
1413+ : "cc");
1414+ } while (res);
1415+
1416+ smp_mb();
1417+
1418+ return oldval;
1419+}
1420+
1421 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1422 {
1423 u64 result;
1424@@ -421,21 +801,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1425
1426 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1427 {
1428- u64 result;
1429- unsigned long tmp;
1430+ u64 result, tmp;
1431
1432 smp_mb();
1433
1434 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1435-"1: ldrexd %0, %H0, [%3]\n"
1436-" subs %0, %0, #1\n"
1437-" sbc %H0, %H0, #0\n"
1438+"1: ldrexd %1, %H1, [%3]\n"
1439+" subs %0, %1, #1\n"
1440+" sbcs %H0, %H1, #0\n"
1441+
1442+#ifdef CONFIG_PAX_REFCOUNT
1443+" bvc 3f\n"
1444+" mov %0, %1\n"
1445+" mov %H0, %H1\n"
1446+"2: bkpt 0xf103\n"
1447+"3:\n"
1448+#endif
1449+
1450 " teq %H0, #0\n"
1451-" bmi 2f\n"
1452+" bmi 4f\n"
1453 " strexd %1, %0, %H0, [%3]\n"
1454 " teq %1, #0\n"
1455 " bne 1b\n"
1456-"2:"
1457+"4:\n"
1458+
1459+#ifdef CONFIG_PAX_REFCOUNT
1460+ _ASM_EXTABLE(2b, 4b)
1461+#endif
1462+
1463 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1464 : "r" (&v->counter)
1465 : "cc");
1466@@ -458,13 +851,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1467 " teq %0, %5\n"
1468 " teqeq %H0, %H5\n"
1469 " moveq %1, #0\n"
1470-" beq 2f\n"
1471+" beq 4f\n"
1472 " adds %0, %0, %6\n"
1473-" adc %H0, %H0, %H6\n"
1474+" adcs %H0, %H0, %H6\n"
1475+
1476+#ifdef CONFIG_PAX_REFCOUNT
1477+" bvc 3f\n"
1478+"2: bkpt 0xf103\n"
1479+"3:\n"
1480+#endif
1481+
1482 " strexd %2, %0, %H0, [%4]\n"
1483 " teq %2, #0\n"
1484 " bne 1b\n"
1485-"2:"
1486+"4:\n"
1487+
1488+#ifdef CONFIG_PAX_REFCOUNT
1489+ _ASM_EXTABLE(2b, 4b)
1490+#endif
1491+
1492 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1493 : "r" (&v->counter), "r" (u), "r" (a)
1494 : "cc");
1495@@ -477,10 +882,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1496
1497 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1498 #define atomic64_inc(v) atomic64_add(1LL, (v))
1499+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1500 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1501+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1502 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1503 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1504 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1505+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1506 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1507 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1508 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1509diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1510index 75fe66b..ba3dee4 100644
1511--- a/arch/arm/include/asm/cache.h
1512+++ b/arch/arm/include/asm/cache.h
1513@@ -4,8 +4,10 @@
1514 #ifndef __ASMARM_CACHE_H
1515 #define __ASMARM_CACHE_H
1516
1517+#include <linux/const.h>
1518+
1519 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1520-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1521+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1522
1523 /*
1524 * Memory returned by kmalloc() may be used for DMA, so we must make
1525@@ -24,5 +26,6 @@
1526 #endif
1527
1528 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1529+#define __read_only __attribute__ ((__section__(".data..read_only")))
1530
1531 #endif
1532diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1533index 17d0ae8..014e350 100644
1534--- a/arch/arm/include/asm/cacheflush.h
1535+++ b/arch/arm/include/asm/cacheflush.h
1536@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1537 void (*dma_unmap_area)(const void *, size_t, int);
1538
1539 void (*dma_flush_range)(const void *, const void *);
1540-};
1541+} __no_const;
1542
1543 /*
1544 * Select the calling method
1545diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1546index 6dcc164..b14d917 100644
1547--- a/arch/arm/include/asm/checksum.h
1548+++ b/arch/arm/include/asm/checksum.h
1549@@ -37,7 +37,19 @@ __wsum
1550 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1551
1552 __wsum
1553-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1554+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1555+
1556+static inline __wsum
1557+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1558+{
1559+ __wsum ret;
1560+ pax_open_userland();
1561+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1562+ pax_close_userland();
1563+ return ret;
1564+}
1565+
1566+
1567
1568 /*
1569 * Fold a partial checksum without adding pseudo headers
1570diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1571index 4f009c1..466c59b 100644
1572--- a/arch/arm/include/asm/cmpxchg.h
1573+++ b/arch/arm/include/asm/cmpxchg.h
1574@@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1575
1576 #define xchg(ptr,x) \
1577 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1578+#define xchg_unchecked(ptr,x) \
1579+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1580
1581 #include <asm-generic/cmpxchg-local.h>
1582
1583diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1584index 6ddbe44..b5e38b1 100644
1585--- a/arch/arm/include/asm/domain.h
1586+++ b/arch/arm/include/asm/domain.h
1587@@ -48,18 +48,37 @@
1588 * Domain types
1589 */
1590 #define DOMAIN_NOACCESS 0
1591-#define DOMAIN_CLIENT 1
1592 #ifdef CONFIG_CPU_USE_DOMAINS
1593+#define DOMAIN_USERCLIENT 1
1594+#define DOMAIN_KERNELCLIENT 1
1595 #define DOMAIN_MANAGER 3
1596+#define DOMAIN_VECTORS DOMAIN_USER
1597 #else
1598+
1599+#ifdef CONFIG_PAX_KERNEXEC
1600 #define DOMAIN_MANAGER 1
1601+#define DOMAIN_KERNEXEC 3
1602+#else
1603+#define DOMAIN_MANAGER 1
1604+#endif
1605+
1606+#ifdef CONFIG_PAX_MEMORY_UDEREF
1607+#define DOMAIN_USERCLIENT 0
1608+#define DOMAIN_UDEREF 1
1609+#define DOMAIN_VECTORS DOMAIN_KERNEL
1610+#else
1611+#define DOMAIN_USERCLIENT 1
1612+#define DOMAIN_VECTORS DOMAIN_USER
1613+#endif
1614+#define DOMAIN_KERNELCLIENT 1
1615+
1616 #endif
1617
1618 #define domain_val(dom,type) ((type) << (2*(dom)))
1619
1620 #ifndef __ASSEMBLY__
1621
1622-#ifdef CONFIG_CPU_USE_DOMAINS
1623+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1624 static inline void set_domain(unsigned val)
1625 {
1626 asm volatile(
1627@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1628 isb();
1629 }
1630
1631-#define modify_domain(dom,type) \
1632- do { \
1633- struct thread_info *thread = current_thread_info(); \
1634- unsigned int domain = thread->cpu_domain; \
1635- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1636- thread->cpu_domain = domain | domain_val(dom, type); \
1637- set_domain(thread->cpu_domain); \
1638- } while (0)
1639-
1640+extern void modify_domain(unsigned int dom, unsigned int type);
1641 #else
1642 static inline void set_domain(unsigned val) { }
1643 static inline void modify_domain(unsigned dom, unsigned type) { }
1644diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1645index 56211f2..17e8a25 100644
1646--- a/arch/arm/include/asm/elf.h
1647+++ b/arch/arm/include/asm/elf.h
1648@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1649 the loader. We need to make sure that it is out of the way of the program
1650 that it will "exec", and that there is sufficient room for the brk. */
1651
1652-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1653+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1654+
1655+#ifdef CONFIG_PAX_ASLR
1656+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1657+
1658+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1659+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1660+#endif
1661
1662 /* When the program starts, a1 contains a pointer to a function to be
1663 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1664@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1665 extern void elf_set_personality(const struct elf32_hdr *);
1666 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1667
1668-struct mm_struct;
1669-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1670-#define arch_randomize_brk arch_randomize_brk
1671-
1672 #ifdef CONFIG_MMU
1673 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1674 struct linux_binprm;
1675diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1676index de53547..52b9a28 100644
1677--- a/arch/arm/include/asm/fncpy.h
1678+++ b/arch/arm/include/asm/fncpy.h
1679@@ -81,7 +81,9 @@
1680 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1681 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1682 \
1683+ pax_open_kernel(); \
1684 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1685+ pax_close_kernel(); \
1686 flush_icache_range((unsigned long)(dest_buf), \
1687 (unsigned long)(dest_buf) + (size)); \
1688 \
1689diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1690index e42cf59..7b94b8f 100644
1691--- a/arch/arm/include/asm/futex.h
1692+++ b/arch/arm/include/asm/futex.h
1693@@ -50,6 +50,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1694 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1695 return -EFAULT;
1696
1697+ pax_open_userland();
1698+
1699 smp_mb();
1700 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1701 "1: ldrex %1, [%4]\n"
1702@@ -65,6 +67,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1703 : "cc", "memory");
1704 smp_mb();
1705
1706+ pax_close_userland();
1707+
1708 *uval = val;
1709 return ret;
1710 }
1711@@ -95,6 +99,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1712 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1713 return -EFAULT;
1714
1715+ pax_open_userland();
1716+
1717 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1718 "1: " TUSER(ldr) " %1, [%4]\n"
1719 " teq %1, %2\n"
1720@@ -105,6 +111,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1721 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1722 : "cc", "memory");
1723
1724+ pax_close_userland();
1725+
1726 *uval = val;
1727 return ret;
1728 }
1729@@ -127,6 +135,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1730 return -EFAULT;
1731
1732 pagefault_disable(); /* implies preempt_disable() */
1733+ pax_open_userland();
1734
1735 switch (op) {
1736 case FUTEX_OP_SET:
1737@@ -148,6 +157,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1738 ret = -ENOSYS;
1739 }
1740
1741+ pax_close_userland();
1742 pagefault_enable(); /* subsumes preempt_enable() */
1743
1744 if (!ret) {
1745diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1746index 83eb2f7..ed77159 100644
1747--- a/arch/arm/include/asm/kmap_types.h
1748+++ b/arch/arm/include/asm/kmap_types.h
1749@@ -4,6 +4,6 @@
1750 /*
1751 * This is the "bare minimum". AIO seems to require this.
1752 */
1753-#define KM_TYPE_NR 16
1754+#define KM_TYPE_NR 17
1755
1756 #endif
1757diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1758index 9e614a1..3302cca 100644
1759--- a/arch/arm/include/asm/mach/dma.h
1760+++ b/arch/arm/include/asm/mach/dma.h
1761@@ -22,7 +22,7 @@ struct dma_ops {
1762 int (*residue)(unsigned int, dma_t *); /* optional */
1763 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1764 const char *type;
1765-};
1766+} __do_const;
1767
1768 struct dma_struct {
1769 void *addr; /* single DMA address */
1770diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1771index 2fe141f..192dc01 100644
1772--- a/arch/arm/include/asm/mach/map.h
1773+++ b/arch/arm/include/asm/mach/map.h
1774@@ -27,13 +27,16 @@ struct map_desc {
1775 #define MT_MINICLEAN 6
1776 #define MT_LOW_VECTORS 7
1777 #define MT_HIGH_VECTORS 8
1778-#define MT_MEMORY 9
1779+#define MT_MEMORY_RWX 9
1780 #define MT_ROM 10
1781-#define MT_MEMORY_NONCACHED 11
1782+#define MT_MEMORY_NONCACHED_RX 11
1783 #define MT_MEMORY_DTCM 12
1784 #define MT_MEMORY_ITCM 13
1785 #define MT_MEMORY_SO 14
1786 #define MT_MEMORY_DMA_READY 15
1787+#define MT_MEMORY_RW 16
1788+#define MT_MEMORY_RX 17
1789+#define MT_MEMORY_NONCACHED_RW 18
1790
1791 #ifdef CONFIG_MMU
1792 extern void iotable_init(struct map_desc *, int);
1793diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1794index 12f71a1..04e063c 100644
1795--- a/arch/arm/include/asm/outercache.h
1796+++ b/arch/arm/include/asm/outercache.h
1797@@ -35,7 +35,7 @@ struct outer_cache_fns {
1798 #endif
1799 void (*set_debug)(unsigned long);
1800 void (*resume)(void);
1801-};
1802+} __no_const;
1803
1804 #ifdef CONFIG_OUTER_CACHE
1805
1806diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1807index cbdc7a2..32f44fe 100644
1808--- a/arch/arm/include/asm/page.h
1809+++ b/arch/arm/include/asm/page.h
1810@@ -114,7 +114,7 @@ struct cpu_user_fns {
1811 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1812 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1813 unsigned long vaddr, struct vm_area_struct *vma);
1814-};
1815+} __no_const;
1816
1817 #ifdef MULTI_USER
1818 extern struct cpu_user_fns cpu_user;
1819diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1820index 943504f..c37a730 100644
1821--- a/arch/arm/include/asm/pgalloc.h
1822+++ b/arch/arm/include/asm/pgalloc.h
1823@@ -17,6 +17,7 @@
1824 #include <asm/processor.h>
1825 #include <asm/cacheflush.h>
1826 #include <asm/tlbflush.h>
1827+#include <asm/system_info.h>
1828
1829 #define check_pgt_cache() do { } while (0)
1830
1831@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1832 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1833 }
1834
1835+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1836+{
1837+ pud_populate(mm, pud, pmd);
1838+}
1839+
1840 #else /* !CONFIG_ARM_LPAE */
1841
1842 /*
1843@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1844 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1845 #define pmd_free(mm, pmd) do { } while (0)
1846 #define pud_populate(mm,pmd,pte) BUG()
1847+#define pud_populate_kernel(mm,pmd,pte) BUG()
1848
1849 #endif /* CONFIG_ARM_LPAE */
1850
1851@@ -126,6 +133,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1852 __free_page(pte);
1853 }
1854
1855+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1856+{
1857+#ifdef CONFIG_ARM_LPAE
1858+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1859+#else
1860+ if (addr & SECTION_SIZE)
1861+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1862+ else
1863+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1864+#endif
1865+ flush_pmd_entry(pmdp);
1866+}
1867+
1868 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1869 pmdval_t prot)
1870 {
1871@@ -155,7 +175,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1872 static inline void
1873 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1874 {
1875- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1876+ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1877 }
1878 #define pmd_pgtable(pmd) pmd_page(pmd)
1879
1880diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1881index 5cfba15..f415e1a 100644
1882--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1883+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1884@@ -20,12 +20,15 @@
1885 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1886 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1887 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1888+#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1889 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1890 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1891 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1892+
1893 /*
1894 * - section
1895 */
1896+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1897 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1898 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1899 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1900@@ -37,6 +40,7 @@
1901 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1902 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1903 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1904+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1905
1906 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1907 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1908@@ -66,6 +70,7 @@
1909 * - extended small page/tiny page
1910 */
1911 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1912+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1913 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1914 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1915 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1916diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1917index f97ee02..cc9fe9e 100644
1918--- a/arch/arm/include/asm/pgtable-2level.h
1919+++ b/arch/arm/include/asm/pgtable-2level.h
1920@@ -126,6 +126,9 @@
1921 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1922 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1923
1924+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1925+#define L_PTE_PXN (_AT(pteval_t, 0))
1926+
1927 /*
1928 * These are the memory types, defined to be compatible with
1929 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1930diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1931index 18f5cef..25b8f43 100644
1932--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1933+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1934@@ -41,6 +41,7 @@
1935 */
1936 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1937 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1938+#define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7)
1939 #define PMD_SECT_S (_AT(pmdval_t, 3) << 8)
1940 #define PMD_SECT_AF (_AT(pmdval_t, 1) << 10)
1941 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 11)
1942@@ -71,6 +72,7 @@
1943 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1944 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1945 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1946+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1947 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1948
1949 /*
1950diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1951index 86b8fe3..e25f975 100644
1952--- a/arch/arm/include/asm/pgtable-3level.h
1953+++ b/arch/arm/include/asm/pgtable-3level.h
1954@@ -74,6 +74,7 @@
1955 #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
1956 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1957 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1958+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1959 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1960 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
1961 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
1962@@ -82,6 +83,7 @@
1963 /*
1964 * To be used in assembly code with the upper page attributes.
1965 */
1966+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1967 #define L_PTE_XN_HIGH (1 << (54 - 32))
1968 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1969
1970diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1971index 9bcd262..fba731c 100644
1972--- a/arch/arm/include/asm/pgtable.h
1973+++ b/arch/arm/include/asm/pgtable.h
1974@@ -30,6 +30,9 @@
1975 #include <asm/pgtable-2level.h>
1976 #endif
1977
1978+#define ktla_ktva(addr) (addr)
1979+#define ktva_ktla(addr) (addr)
1980+
1981 /*
1982 * Just any arbitrary offset to the start of the vmalloc VM area: the
1983 * current 8MB value just means that there will be a 8MB "hole" after the
1984@@ -45,6 +48,9 @@
1985 #define LIBRARY_TEXT_START 0x0c000000
1986
1987 #ifndef __ASSEMBLY__
1988+extern pteval_t __supported_pte_mask;
1989+extern pmdval_t __supported_pmd_mask;
1990+
1991 extern void __pte_error(const char *file, int line, pte_t);
1992 extern void __pmd_error(const char *file, int line, pmd_t);
1993 extern void __pgd_error(const char *file, int line, pgd_t);
1994@@ -53,6 +59,50 @@ extern void __pgd_error(const char *file, int line, pgd_t);
1995 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
1996 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
1997
1998+#define __HAVE_ARCH_PAX_OPEN_KERNEL
1999+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2000+
2001+#ifdef CONFIG_PAX_KERNEXEC
2002+#include <asm/domain.h>
2003+#include <linux/thread_info.h>
2004+#include <linux/preempt.h>
2005+#endif
2006+
2007+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2008+static inline int test_domain(int domain, int domaintype)
2009+{
2010+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2011+}
2012+#endif
2013+
2014+#ifdef CONFIG_PAX_KERNEXEC
2015+static inline unsigned long pax_open_kernel(void) {
2016+#ifdef CONFIG_ARM_LPAE
2017+ /* TODO */
2018+#else
2019+ preempt_disable();
2020+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2021+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2022+#endif
2023+ return 0;
2024+}
2025+
2026+static inline unsigned long pax_close_kernel(void) {
2027+#ifdef CONFIG_ARM_LPAE
2028+ /* TODO */
2029+#else
2030+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2031+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2032+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2033+ preempt_enable_no_resched();
2034+#endif
2035+ return 0;
2036+}
2037+#else
2038+static inline unsigned long pax_open_kernel(void) { return 0; }
2039+static inline unsigned long pax_close_kernel(void) { return 0; }
2040+#endif
2041+
2042 /*
2043 * This is the lowest virtual address we can permit any user space
2044 * mapping to be mapped at. This is particularly important for
2045@@ -72,8 +122,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2046 /*
2047 * The pgprot_* and protection_map entries will be fixed up in runtime
2048 * to include the cachable and bufferable bits based on memory policy,
2049- * as well as any architecture dependent bits like global/ASID and SMP
2050- * shared mapping bits.
2051+ * as well as any architecture dependent bits like global/ASID, PXN,
2052+ * and SMP shared mapping bits.
2053 */
2054 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2055
2056@@ -257,7 +307,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
2057 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2058 {
2059 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2060- L_PTE_NONE | L_PTE_VALID;
2061+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2062 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2063 return pte;
2064 }
2065diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
2066index f3628fb..a0672dd 100644
2067--- a/arch/arm/include/asm/proc-fns.h
2068+++ b/arch/arm/include/asm/proc-fns.h
2069@@ -75,7 +75,7 @@ extern struct processor {
2070 unsigned int suspend_size;
2071 void (*do_suspend)(void *);
2072 void (*do_resume)(void *);
2073-} processor;
2074+} __do_const processor;
2075
2076 #ifndef MULTI_CPU
2077 extern void cpu_proc_init(void);
2078diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2079index ce0dbe7..c085b6f 100644
2080--- a/arch/arm/include/asm/psci.h
2081+++ b/arch/arm/include/asm/psci.h
2082@@ -29,7 +29,7 @@ struct psci_operations {
2083 int (*cpu_off)(struct psci_power_state state);
2084 int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
2085 int (*migrate)(unsigned long cpuid);
2086-};
2087+} __no_const;
2088
2089 extern struct psci_operations psci_ops;
2090
2091diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2092index d3a22be..3a69ad5 100644
2093--- a/arch/arm/include/asm/smp.h
2094+++ b/arch/arm/include/asm/smp.h
2095@@ -107,7 +107,7 @@ struct smp_operations {
2096 int (*cpu_disable)(unsigned int cpu);
2097 #endif
2098 #endif
2099-};
2100+} __no_const;
2101
2102 /*
2103 * set platform specific SMP operations
2104diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2105index f00b569..aa5bb41 100644
2106--- a/arch/arm/include/asm/thread_info.h
2107+++ b/arch/arm/include/asm/thread_info.h
2108@@ -77,9 +77,9 @@ struct thread_info {
2109 .flags = 0, \
2110 .preempt_count = INIT_PREEMPT_COUNT, \
2111 .addr_limit = KERNEL_DS, \
2112- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2113- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2114- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2115+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2116+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2117+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2118 .restart_block = { \
2119 .fn = do_no_restart_syscall, \
2120 }, \
2121@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2122 #define TIF_SYSCALL_AUDIT 9
2123 #define TIF_SYSCALL_TRACEPOINT 10
2124 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2125-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2126+/* within 8 bits of TIF_SYSCALL_TRACE
2127+ * to meet flexible second operand requirements
2128+ */
2129+#define TIF_GRSEC_SETXID 12
2130+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2131 #define TIF_USING_IWMMXT 17
2132 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2133 #define TIF_RESTORE_SIGMASK 20
2134@@ -165,10 +169,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2135 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2136 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2137 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2138+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2139
2140 /* Checks for any syscall work in entry-common.S */
2141 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2142- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2143+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2144
2145 /*
2146 * Change these and you break ASM code in entry-common.S
2147diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2148index 7e1f760..de33b13 100644
2149--- a/arch/arm/include/asm/uaccess.h
2150+++ b/arch/arm/include/asm/uaccess.h
2151@@ -18,6 +18,7 @@
2152 #include <asm/domain.h>
2153 #include <asm/unified.h>
2154 #include <asm/compiler.h>
2155+#include <asm/pgtable.h>
2156
2157 #define VERIFY_READ 0
2158 #define VERIFY_WRITE 1
2159@@ -63,11 +64,38 @@ extern int __put_user_bad(void);
2160 static inline void set_fs(mm_segment_t fs)
2161 {
2162 current_thread_info()->addr_limit = fs;
2163- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2164+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2165 }
2166
2167 #define segment_eq(a,b) ((a) == (b))
2168
2169+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2170+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2171+
2172+static inline void pax_open_userland(void)
2173+{
2174+
2175+#ifdef CONFIG_PAX_MEMORY_UDEREF
2176+ if (segment_eq(get_fs(), USER_DS)) {
2177+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2178+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2179+ }
2180+#endif
2181+
2182+}
2183+
2184+static inline void pax_close_userland(void)
2185+{
2186+
2187+#ifdef CONFIG_PAX_MEMORY_UDEREF
2188+ if (segment_eq(get_fs(), USER_DS)) {
2189+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2190+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2191+ }
2192+#endif
2193+
2194+}
2195+
2196 #define __addr_ok(addr) ({ \
2197 unsigned long flag; \
2198 __asm__("cmp %2, %0; movlo %0, #0" \
2199@@ -143,8 +171,12 @@ extern int __get_user_4(void *);
2200
2201 #define get_user(x,p) \
2202 ({ \
2203+ int __e; \
2204 might_fault(); \
2205- __get_user_check(x,p); \
2206+ pax_open_userland(); \
2207+ __e = __get_user_check(x,p); \
2208+ pax_close_userland(); \
2209+ __e; \
2210 })
2211
2212 extern int __put_user_1(void *, unsigned int);
2213@@ -188,8 +220,12 @@ extern int __put_user_8(void *, unsigned long long);
2214
2215 #define put_user(x,p) \
2216 ({ \
2217+ int __e; \
2218 might_fault(); \
2219- __put_user_check(x,p); \
2220+ pax_open_userland(); \
2221+ __e = __put_user_check(x,p); \
2222+ pax_close_userland(); \
2223+ __e; \
2224 })
2225
2226 #else /* CONFIG_MMU */
2227@@ -230,13 +266,17 @@ static inline void set_fs(mm_segment_t fs)
2228 #define __get_user(x,ptr) \
2229 ({ \
2230 long __gu_err = 0; \
2231+ pax_open_userland(); \
2232 __get_user_err((x),(ptr),__gu_err); \
2233+ pax_close_userland(); \
2234 __gu_err; \
2235 })
2236
2237 #define __get_user_error(x,ptr,err) \
2238 ({ \
2239+ pax_open_userland(); \
2240 __get_user_err((x),(ptr),err); \
2241+ pax_close_userland(); \
2242 (void) 0; \
2243 })
2244
2245@@ -312,13 +352,17 @@ do { \
2246 #define __put_user(x,ptr) \
2247 ({ \
2248 long __pu_err = 0; \
2249+ pax_open_userland(); \
2250 __put_user_err((x),(ptr),__pu_err); \
2251+ pax_close_userland(); \
2252 __pu_err; \
2253 })
2254
2255 #define __put_user_error(x,ptr,err) \
2256 ({ \
2257+ pax_open_userland(); \
2258 __put_user_err((x),(ptr),err); \
2259+ pax_close_userland(); \
2260 (void) 0; \
2261 })
2262
2263@@ -418,11 +462,44 @@ do { \
2264
2265
2266 #ifdef CONFIG_MMU
2267-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2268-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2269+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2270+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2271+
2272+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2273+{
2274+ unsigned long ret;
2275+
2276+ check_object_size(to, n, false);
2277+ pax_open_userland();
2278+ ret = ___copy_from_user(to, from, n);
2279+ pax_close_userland();
2280+ return ret;
2281+}
2282+
2283+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2284+{
2285+ unsigned long ret;
2286+
2287+ check_object_size(from, n, true);
2288+ pax_open_userland();
2289+ ret = ___copy_to_user(to, from, n);
2290+ pax_close_userland();
2291+ return ret;
2292+}
2293+
2294 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2295-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2296+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2297 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2298+
2299+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2300+{
2301+ unsigned long ret;
2302+ pax_open_userland();
2303+ ret = ___clear_user(addr, n);
2304+ pax_close_userland();
2305+ return ret;
2306+}
2307+
2308 #else
2309 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2310 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2311@@ -431,6 +508,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2312
2313 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2314 {
2315+ if ((long)n < 0)
2316+ return n;
2317+
2318 if (access_ok(VERIFY_READ, from, n))
2319 n = __copy_from_user(to, from, n);
2320 else /* security hole - plug it */
2321@@ -440,6 +520,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2322
2323 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2324 {
2325+ if ((long)n < 0)
2326+ return n;
2327+
2328 if (access_ok(VERIFY_WRITE, to, n))
2329 n = __copy_to_user(to, from, n);
2330 return n;
2331diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2332index 96ee092..37f1844 100644
2333--- a/arch/arm/include/uapi/asm/ptrace.h
2334+++ b/arch/arm/include/uapi/asm/ptrace.h
2335@@ -73,7 +73,7 @@
2336 * ARMv7 groups of PSR bits
2337 */
2338 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2339-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2340+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2341 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2342 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2343
2344diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2345index 60d3b73..e5a0f22 100644
2346--- a/arch/arm/kernel/armksyms.c
2347+++ b/arch/arm/kernel/armksyms.c
2348@@ -53,7 +53,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2349
2350 /* networking */
2351 EXPORT_SYMBOL(csum_partial);
2352-EXPORT_SYMBOL(csum_partial_copy_from_user);
2353+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2354 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2355 EXPORT_SYMBOL(__csum_ipv6_magic);
2356
2357@@ -89,9 +89,9 @@ EXPORT_SYMBOL(__memzero);
2358 #ifdef CONFIG_MMU
2359 EXPORT_SYMBOL(copy_page);
2360
2361-EXPORT_SYMBOL(__copy_from_user);
2362-EXPORT_SYMBOL(__copy_to_user);
2363-EXPORT_SYMBOL(__clear_user);
2364+EXPORT_SYMBOL(___copy_from_user);
2365+EXPORT_SYMBOL(___copy_to_user);
2366+EXPORT_SYMBOL(___clear_user);
2367
2368 EXPORT_SYMBOL(__get_user_1);
2369 EXPORT_SYMBOL(__get_user_2);
2370diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2371index d43c7e5..257c050 100644
2372--- a/arch/arm/kernel/entry-armv.S
2373+++ b/arch/arm/kernel/entry-armv.S
2374@@ -47,6 +47,87 @@
2375 9997:
2376 .endm
2377
2378+ .macro pax_enter_kernel
2379+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2380+ @ make aligned space for saved DACR
2381+ sub sp, sp, #8
2382+ @ save regs
2383+ stmdb sp!, {r1, r2}
2384+ @ read DACR from cpu_domain into r1
2385+ mov r2, sp
2386+ @ assume 8K pages, since we have to split the immediate in two
2387+ bic r2, r2, #(0x1fc0)
2388+ bic r2, r2, #(0x3f)
2389+ ldr r1, [r2, #TI_CPU_DOMAIN]
2390+ @ store old DACR on stack
2391+ str r1, [sp, #8]
2392+#ifdef CONFIG_PAX_KERNEXEC
2393+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2394+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2395+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2396+#endif
2397+#ifdef CONFIG_PAX_MEMORY_UDEREF
2398+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2399+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2400+#endif
2401+ @ write r1 to current_thread_info()->cpu_domain
2402+ str r1, [r2, #TI_CPU_DOMAIN]
2403+ @ write r1 to DACR
2404+ mcr p15, 0, r1, c3, c0, 0
2405+ @ instruction sync
2406+ instr_sync
2407+ @ restore regs
2408+ ldmia sp!, {r1, r2}
2409+#endif
2410+ .endm
2411+
2412+ .macro pax_open_userland
2413+#ifdef CONFIG_PAX_MEMORY_UDEREF
2414+ @ save regs
2415+ stmdb sp!, {r0, r1}
2416+ @ read DACR from cpu_domain into r1
2417+ mov r0, sp
2418+ @ assume 8K pages, since we have to split the immediate in two
2419+ bic r0, r0, #(0x1fc0)
2420+ bic r0, r0, #(0x3f)
2421+ ldr r1, [r0, #TI_CPU_DOMAIN]
2422+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2423+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2424+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2425+ @ write r1 to current_thread_info()->cpu_domain
2426+ str r1, [r0, #TI_CPU_DOMAIN]
2427+ @ write r1 to DACR
2428+ mcr p15, 0, r1, c3, c0, 0
2429+ @ instruction sync
2430+ instr_sync
2431+ @ restore regs
2432+ ldmia sp!, {r0, r1}
2433+#endif
2434+ .endm
2435+
2436+ .macro pax_close_userland
2437+#ifdef CONFIG_PAX_MEMORY_UDEREF
2438+ @ save regs
2439+ stmdb sp!, {r0, r1}
2440+ @ read DACR from cpu_domain into r1
2441+ mov r0, sp
2442+ @ assume 8K pages, since we have to split the immediate in two
2443+ bic r0, r0, #(0x1fc0)
2444+ bic r0, r0, #(0x3f)
2445+ ldr r1, [r0, #TI_CPU_DOMAIN]
2446+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2447+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2448+ @ write r1 to current_thread_info()->cpu_domain
2449+ str r1, [r0, #TI_CPU_DOMAIN]
2450+ @ write r1 to DACR
2451+ mcr p15, 0, r1, c3, c0, 0
2452+ @ instruction sync
2453+ instr_sync
2454+ @ restore regs
2455+ ldmia sp!, {r0, r1}
2456+#endif
2457+ .endm
2458+
2459 .macro pabt_helper
2460 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2461 #ifdef MULTI_PABORT
2462@@ -89,11 +170,15 @@
2463 * Invalid mode handlers
2464 */
2465 .macro inv_entry, reason
2466+
2467+ pax_enter_kernel
2468+
2469 sub sp, sp, #S_FRAME_SIZE
2470 ARM( stmib sp, {r1 - lr} )
2471 THUMB( stmia sp, {r0 - r12} )
2472 THUMB( str sp, [sp, #S_SP] )
2473 THUMB( str lr, [sp, #S_LR] )
2474+
2475 mov r1, #\reason
2476 .endm
2477
2478@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2479 .macro svc_entry, stack_hole=0
2480 UNWIND(.fnstart )
2481 UNWIND(.save {r0 - pc} )
2482+
2483+ pax_enter_kernel
2484+
2485 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2486+
2487 #ifdef CONFIG_THUMB2_KERNEL
2488 SPFIX( str r0, [sp] ) @ temporarily saved
2489 SPFIX( mov r0, sp )
2490@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2491 ldmia r0, {r3 - r5}
2492 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2493 mov r6, #-1 @ "" "" "" ""
2494+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2495+ @ offset sp by 8 as done in pax_enter_kernel
2496+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2497+#else
2498 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2499+#endif
2500 SPFIX( addeq r2, r2, #4 )
2501 str r3, [sp, #-4]! @ save the "real" r0 copied
2502 @ from the exception stack
2503@@ -316,6 +410,9 @@ ENDPROC(__pabt_svc)
2504 .macro usr_entry
2505 UNWIND(.fnstart )
2506 UNWIND(.cantunwind ) @ don't unwind the user space
2507+
2508+ pax_enter_kernel_user
2509+
2510 sub sp, sp, #S_FRAME_SIZE
2511 ARM( stmib sp, {r1 - r12} )
2512 THUMB( stmia sp, {r0 - r12} )
2513@@ -357,7 +454,8 @@ ENDPROC(__pabt_svc)
2514 .endm
2515
2516 .macro kuser_cmpxchg_check
2517-#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
2518+#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \
2519+ !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
2520 #ifndef CONFIG_MMU
2521 #warning "NPTL on non MMU needs fixing"
2522 #else
2523@@ -414,7 +512,9 @@ __und_usr:
2524 tst r3, #PSR_T_BIT @ Thumb mode?
2525 bne __und_usr_thumb
2526 sub r4, r2, #4 @ ARM instr at LR - 4
2527+ pax_open_userland
2528 1: ldrt r0, [r4]
2529+ pax_close_userland
2530 #ifdef CONFIG_CPU_ENDIAN_BE8
2531 rev r0, r0 @ little endian instruction
2532 #endif
2533@@ -449,10 +549,14 @@ __und_usr_thumb:
2534 */
2535 .arch armv6t2
2536 #endif
2537+ pax_open_userland
2538 2: ldrht r5, [r4]
2539+ pax_close_userland
2540 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2541 blo __und_usr_fault_16 @ 16bit undefined instruction
2542+ pax_open_userland
2543 3: ldrht r0, [r2]
2544+ pax_close_userland
2545 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2546 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2547 orr r0, r0, r5, lsl #16
2548@@ -481,7 +585,8 @@ ENDPROC(__und_usr)
2549 */
2550 .pushsection .fixup, "ax"
2551 .align 2
2552-4: mov pc, r9
2553+4: pax_close_userland
2554+ mov pc, r9
2555 .popsection
2556 .pushsection __ex_table,"a"
2557 .long 1b, 4b
2558@@ -690,7 +795,7 @@ ENTRY(__switch_to)
2559 THUMB( stmia ip!, {r4 - sl, fp} ) @ Store most regs on stack
2560 THUMB( str sp, [ip], #4 )
2561 THUMB( str lr, [ip], #4 )
2562-#ifdef CONFIG_CPU_USE_DOMAINS
2563+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2564 ldr r6, [r2, #TI_CPU_DOMAIN]
2565 #endif
2566 set_tls r3, r4, r5
2567@@ -699,7 +804,7 @@ ENTRY(__switch_to)
2568 ldr r8, =__stack_chk_guard
2569 ldr r7, [r7, #TSK_STACK_CANARY]
2570 #endif
2571-#ifdef CONFIG_CPU_USE_DOMAINS
2572+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2573 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2574 #endif
2575 mov r5, r0
2576diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2577index bc5bc0a..d0998ca 100644
2578--- a/arch/arm/kernel/entry-common.S
2579+++ b/arch/arm/kernel/entry-common.S
2580@@ -10,18 +10,46 @@
2581
2582 #include <asm/unistd.h>
2583 #include <asm/ftrace.h>
2584+#include <asm/domain.h>
2585 #include <asm/unwind.h>
2586
2587+#include "entry-header.S"
2588+
2589 #ifdef CONFIG_NEED_RET_TO_USER
2590 #include <mach/entry-macro.S>
2591 #else
2592 .macro arch_ret_to_user, tmp1, tmp2
2593+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2594+ @ save regs
2595+ stmdb sp!, {r1, r2}
2596+ @ read DACR from cpu_domain into r1
2597+ mov r2, sp
2598+ @ assume 8K pages, since we have to split the immediate in two
2599+ bic r2, r2, #(0x1fc0)
2600+ bic r2, r2, #(0x3f)
2601+ ldr r1, [r2, #TI_CPU_DOMAIN]
2602+#ifdef CONFIG_PAX_KERNEXEC
2603+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2604+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2605+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2606+#endif
2607+#ifdef CONFIG_PAX_MEMORY_UDEREF
2608+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2609+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2610+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2611+#endif
2612+ @ write r1 to current_thread_info()->cpu_domain
2613+ str r1, [r2, #TI_CPU_DOMAIN]
2614+ @ write r1 to DACR
2615+ mcr p15, 0, r1, c3, c0, 0
2616+ @ instruction sync
2617+ instr_sync
2618+ @ restore regs
2619+ ldmia sp!, {r1, r2}
2620+#endif
2621 .endm
2622 #endif
2623
2624-#include "entry-header.S"
2625-
2626-
2627 .align 5
2628 /*
2629 * This is the fast syscall return path. We do as little as
2630@@ -350,6 +378,7 @@ ENDPROC(ftrace_stub)
2631
2632 .align 5
2633 ENTRY(vector_swi)
2634+
2635 sub sp, sp, #S_FRAME_SIZE
2636 stmia sp, {r0 - r12} @ Calling r0 - r12
2637 ARM( add r8, sp, #S_PC )
2638@@ -399,6 +428,12 @@ ENTRY(vector_swi)
2639 ldr scno, [lr, #-4] @ get SWI instruction
2640 #endif
2641
2642+ /*
2643+ * do this here to avoid a performance hit of wrapping the code above
2644+ * that directly dereferences userland to parse the SWI instruction
2645+ */
2646+ pax_enter_kernel_user
2647+
2648 #ifdef CONFIG_ALIGNMENT_TRAP
2649 ldr ip, __cr_alignment
2650 ldr ip, [ip]
2651diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2652index 160f337..db67ee4 100644
2653--- a/arch/arm/kernel/entry-header.S
2654+++ b/arch/arm/kernel/entry-header.S
2655@@ -73,6 +73,60 @@
2656 msr cpsr_c, \rtemp @ switch back to the SVC mode
2657 .endm
2658
2659+ .macro pax_enter_kernel_user
2660+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2661+ @ save regs
2662+ stmdb sp!, {r0, r1}
2663+ @ read DACR from cpu_domain into r1
2664+ mov r0, sp
2665+ @ assume 8K pages, since we have to split the immediate in two
2666+ bic r0, r0, #(0x1fc0)
2667+ bic r0, r0, #(0x3f)
2668+ ldr r1, [r0, #TI_CPU_DOMAIN]
2669+#ifdef CONFIG_PAX_MEMORY_UDEREF
2670+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2671+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2672+#endif
2673+#ifdef CONFIG_PAX_KERNEXEC
2674+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2675+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2676+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2677+#endif
2678+ @ write r1 to current_thread_info()->cpu_domain
2679+ str r1, [r0, #TI_CPU_DOMAIN]
2680+ @ write r1 to DACR
2681+ mcr p15, 0, r1, c3, c0, 0
2682+ @ instruction sync
2683+ instr_sync
2684+ @ restore regs
2685+ ldmia sp!, {r0, r1}
2686+#endif
2687+ .endm
2688+
2689+ .macro pax_exit_kernel
2690+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2691+ @ save regs
2692+ stmdb sp!, {r0, r1}
2693+ @ read old DACR from stack into r1
2694+ ldr r1, [sp, #(8 + S_SP)]
2695+ sub r1, r1, #8
2696+ ldr r1, [r1]
2697+
2698+ @ write r1 to current_thread_info()->cpu_domain
2699+ mov r0, sp
2700+ @ assume 8K pages, since we have to split the immediate in two
2701+ bic r0, r0, #(0x1fc0)
2702+ bic r0, r0, #(0x3f)
2703+ str r1, [r0, #TI_CPU_DOMAIN]
2704+ @ write r1 to DACR
2705+ mcr p15, 0, r1, c3, c0, 0
2706+ @ instruction sync
2707+ instr_sync
2708+ @ restore regs
2709+ ldmia sp!, {r0, r1}
2710+#endif
2711+ .endm
2712+
2713 #ifndef CONFIG_THUMB2_KERNEL
2714 .macro svc_exit, rpsr, irq = 0
2715 .if \irq != 0
2716@@ -92,6 +146,9 @@
2717 blne trace_hardirqs_off
2718 #endif
2719 .endif
2720+
2721+ pax_exit_kernel
2722+
2723 msr spsr_cxsf, \rpsr
2724 #if defined(CONFIG_CPU_V6)
2725 ldr r0, [sp]
2726@@ -155,6 +212,9 @@
2727 blne trace_hardirqs_off
2728 #endif
2729 .endif
2730+
2731+ pax_exit_kernel
2732+
2733 ldr lr, [sp, #S_SP] @ top of the stack
2734 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2735 clrex @ clear the exclusive monitor
2736diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2737index 25442f4..d4948fc 100644
2738--- a/arch/arm/kernel/fiq.c
2739+++ b/arch/arm/kernel/fiq.c
2740@@ -84,17 +84,16 @@ int show_fiq_list(struct seq_file *p, int prec)
2741
2742 void set_fiq_handler(void *start, unsigned int length)
2743 {
2744-#if defined(CONFIG_CPU_USE_DOMAINS)
2745- void *base = (void *)0xffff0000;
2746-#else
2747 void *base = vectors_page;
2748-#endif
2749 unsigned offset = FIQ_OFFSET;
2750
2751+ pax_open_kernel();
2752 memcpy(base + offset, start, length);
2753+ pax_close_kernel();
2754+
2755+ if (!cache_is_vipt_nonaliasing())
2756+ flush_icache_range(base + offset, offset + length);
2757 flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);
2758- if (!vectors_high())
2759- flush_icache_range(offset, offset + length);
2760 }
2761
2762 int claim_fiq(struct fiq_handler *f)
2763diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2764index 8bac553..caee108 100644
2765--- a/arch/arm/kernel/head.S
2766+++ b/arch/arm/kernel/head.S
2767@@ -52,7 +52,9 @@
2768 .equ swapper_pg_dir, KERNEL_RAM_VADDR - PG_DIR_SIZE
2769
2770 .macro pgtbl, rd, phys
2771- add \rd, \phys, #TEXT_OFFSET - PG_DIR_SIZE
2772+ mov \rd, #TEXT_OFFSET
2773+ sub \rd, #PG_DIR_SIZE
2774+ add \rd, \rd, \phys
2775 .endm
2776
2777 /*
2778@@ -434,7 +436,7 @@ __enable_mmu:
2779 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2780 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2781 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2782- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2783+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2784 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2785 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2786 #endif
2787diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
2788index 1fd749e..47adb08 100644
2789--- a/arch/arm/kernel/hw_breakpoint.c
2790+++ b/arch/arm/kernel/hw_breakpoint.c
2791@@ -1029,7 +1029,7 @@ static int __cpuinit dbg_reset_notify(struct notifier_block *self,
2792 return NOTIFY_OK;
2793 }
2794
2795-static struct notifier_block __cpuinitdata dbg_reset_nb = {
2796+static struct notifier_block dbg_reset_nb = {
2797 .notifier_call = dbg_reset_notify,
2798 };
2799
2800diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2801index 1e9be5d..03edbc2 100644
2802--- a/arch/arm/kernel/module.c
2803+++ b/arch/arm/kernel/module.c
2804@@ -37,12 +37,37 @@
2805 #endif
2806
2807 #ifdef CONFIG_MMU
2808-void *module_alloc(unsigned long size)
2809+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2810 {
2811+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2812+ return NULL;
2813 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2814- GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
2815+ GFP_KERNEL, prot, -1,
2816 __builtin_return_address(0));
2817 }
2818+
2819+void *module_alloc(unsigned long size)
2820+{
2821+
2822+#ifdef CONFIG_PAX_KERNEXEC
2823+ return __module_alloc(size, PAGE_KERNEL);
2824+#else
2825+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2826+#endif
2827+
2828+}
2829+
2830+#ifdef CONFIG_PAX_KERNEXEC
2831+void module_free_exec(struct module *mod, void *module_region)
2832+{
2833+ module_free(mod, module_region);
2834+}
2835+
2836+void *module_alloc_exec(unsigned long size)
2837+{
2838+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2839+}
2840+#endif
2841 #endif
2842
2843 int
2844diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2845index 07314af..c46655c 100644
2846--- a/arch/arm/kernel/patch.c
2847+++ b/arch/arm/kernel/patch.c
2848@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2849 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2850 int size;
2851
2852+ pax_open_kernel();
2853 if (thumb2 && __opcode_is_thumb16(insn)) {
2854 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2855 size = sizeof(u16);
2856@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2857 *(u32 *)addr = insn;
2858 size = sizeof(u32);
2859 }
2860+ pax_close_kernel();
2861
2862 flush_icache_range((uintptr_t)(addr),
2863 (uintptr_t)(addr) + size);
2864diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
2865index e19edc6..e186ee1 100644
2866--- a/arch/arm/kernel/perf_event.c
2867+++ b/arch/arm/kernel/perf_event.c
2868@@ -56,7 +56,7 @@ armpmu_map_hw_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config)
2869 int mapping;
2870
2871 if (config >= PERF_COUNT_HW_MAX)
2872- return -ENOENT;
2873+ return -EINVAL;
2874
2875 mapping = (*event_map)[config];
2876 return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping;
2877diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
2878index 1f2740e..b36e225 100644
2879--- a/arch/arm/kernel/perf_event_cpu.c
2880+++ b/arch/arm/kernel/perf_event_cpu.c
2881@@ -171,7 +171,7 @@ static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
2882 return NOTIFY_OK;
2883 }
2884
2885-static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = {
2886+static struct notifier_block cpu_pmu_hotplug_notifier = {
2887 .notifier_call = cpu_pmu_notify,
2888 };
2889
2890diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2891index 5bc2615..dcd439f 100644
2892--- a/arch/arm/kernel/process.c
2893+++ b/arch/arm/kernel/process.c
2894@@ -223,6 +223,7 @@ void machine_power_off(void)
2895
2896 if (pm_power_off)
2897 pm_power_off();
2898+ BUG();
2899 }
2900
2901 /*
2902@@ -236,7 +237,7 @@ void machine_power_off(void)
2903 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2904 * to use. Implementing such co-ordination would be essentially impossible.
2905 */
2906-void machine_restart(char *cmd)
2907+__noreturn void machine_restart(char *cmd)
2908 {
2909 smp_send_stop();
2910
2911@@ -258,8 +259,8 @@ void __show_regs(struct pt_regs *regs)
2912
2913 show_regs_print_info(KERN_DEFAULT);
2914
2915- print_symbol("PC is at %s\n", instruction_pointer(regs));
2916- print_symbol("LR is at %s\n", regs->ARM_lr);
2917+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2918+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2919 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2920 "sp : %08lx ip : %08lx fp : %08lx\n",
2921 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2922@@ -426,12 +427,6 @@ unsigned long get_wchan(struct task_struct *p)
2923 return 0;
2924 }
2925
2926-unsigned long arch_randomize_brk(struct mm_struct *mm)
2927-{
2928- unsigned long range_end = mm->brk + 0x02000000;
2929- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2930-}
2931-
2932 #ifdef CONFIG_MMU
2933 #ifdef CONFIG_KUSER_HELPERS
2934 /*
2935@@ -447,7 +442,7 @@ static struct vm_area_struct gate_vma = {
2936
2937 static int __init gate_vma_init(void)
2938 {
2939- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2940+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2941 return 0;
2942 }
2943 arch_initcall(gate_vma_init);
2944@@ -466,48 +461,23 @@ int in_gate_area_no_mm(unsigned long addr)
2945 {
2946 return in_gate_area(NULL, addr);
2947 }
2948-#define is_gate_vma(vma) ((vma) = &gate_vma)
2949+#define is_gate_vma(vma) ((vma) == &gate_vma)
2950 #else
2951 #define is_gate_vma(vma) 0
2952 #endif
2953
2954 const char *arch_vma_name(struct vm_area_struct *vma)
2955 {
2956- return is_gate_vma(vma) ? "[vectors]" :
2957- (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
2958- "[sigpage]" : NULL;
2959+ return is_gate_vma(vma) ? "[vectors]" : NULL;
2960 }
2961
2962-static struct page *signal_page;
2963-extern struct page *get_signal_page(void);
2964-
2965 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2966 {
2967 struct mm_struct *mm = current->mm;
2968- unsigned long addr;
2969- int ret;
2970-
2971- if (!signal_page)
2972- signal_page = get_signal_page();
2973- if (!signal_page)
2974- return -ENOMEM;
2975
2976 down_write(&mm->mmap_sem);
2977- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
2978- if (IS_ERR_VALUE(addr)) {
2979- ret = addr;
2980- goto up_fail;
2981- }
2982-
2983- ret = install_special_mapping(mm, addr, PAGE_SIZE,
2984- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2985- &signal_page);
2986-
2987- if (ret == 0)
2988- mm->context.sigpage = addr;
2989-
2990- up_fail:
2991+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2992 up_write(&mm->mmap_sem);
2993- return ret;
2994+ return 0;
2995 }
2996 #endif
2997diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2998index 3653164..d83e55d 100644
2999--- a/arch/arm/kernel/psci.c
3000+++ b/arch/arm/kernel/psci.c
3001@@ -24,7 +24,7 @@
3002 #include <asm/opcodes-virt.h>
3003 #include <asm/psci.h>
3004
3005-struct psci_operations psci_ops;
3006+struct psci_operations psci_ops __read_only;
3007
3008 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3009
3010diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3011index 03deeff..741ce88 100644
3012--- a/arch/arm/kernel/ptrace.c
3013+++ b/arch/arm/kernel/ptrace.c
3014@@ -937,10 +937,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
3015 return current_thread_info()->syscall;
3016 }
3017
3018+#ifdef CONFIG_GRKERNSEC_SETXID
3019+extern void gr_delayed_cred_worker(void);
3020+#endif
3021+
3022 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3023 {
3024 current_thread_info()->syscall = scno;
3025
3026+#ifdef CONFIG_GRKERNSEC_SETXID
3027+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3028+ gr_delayed_cred_worker();
3029+#endif
3030+
3031 /* Do the secure computing check first; failures should be fast. */
3032 if (secure_computing(scno) == -1)
3033 return -1;
3034diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3035index b4b1d39..efdc9be 100644
3036--- a/arch/arm/kernel/setup.c
3037+++ b/arch/arm/kernel/setup.c
3038@@ -97,21 +97,23 @@ EXPORT_SYMBOL(system_serial_high);
3039 unsigned int elf_hwcap __read_mostly;
3040 EXPORT_SYMBOL(elf_hwcap);
3041
3042+pteval_t __supported_pte_mask __read_only;
3043+pmdval_t __supported_pmd_mask __read_only;
3044
3045 #ifdef MULTI_CPU
3046-struct processor processor __read_mostly;
3047+struct processor processor;
3048 #endif
3049 #ifdef MULTI_TLB
3050-struct cpu_tlb_fns cpu_tlb __read_mostly;
3051+struct cpu_tlb_fns cpu_tlb __read_only;
3052 #endif
3053 #ifdef MULTI_USER
3054-struct cpu_user_fns cpu_user __read_mostly;
3055+struct cpu_user_fns cpu_user __read_only;
3056 #endif
3057 #ifdef MULTI_CACHE
3058-struct cpu_cache_fns cpu_cache __read_mostly;
3059+struct cpu_cache_fns cpu_cache __read_only;
3060 #endif
3061 #ifdef CONFIG_OUTER_CACHE
3062-struct outer_cache_fns outer_cache __read_mostly;
3063+struct outer_cache_fns outer_cache __read_only;
3064 EXPORT_SYMBOL(outer_cache);
3065 #endif
3066
3067@@ -236,9 +238,13 @@ static int __get_cpu_architecture(void)
3068 asm("mrc p15, 0, %0, c0, c1, 4"
3069 : "=r" (mmfr0));
3070 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3071- (mmfr0 & 0x000000f0) >= 0x00000030)
3072+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3073 cpu_arch = CPU_ARCH_ARMv7;
3074- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3075+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3076+ __supported_pte_mask |= L_PTE_PXN;
3077+ __supported_pmd_mask |= PMD_PXNTABLE;
3078+ }
3079+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3080 (mmfr0 & 0x000000f0) == 0x00000020)
3081 cpu_arch = CPU_ARCH_ARMv6;
3082 else
3083@@ -479,7 +485,7 @@ static void __init setup_processor(void)
3084 __cpu_architecture = __get_cpu_architecture();
3085
3086 #ifdef MULTI_CPU
3087- processor = *list->proc;
3088+ memcpy((void *)&processor, list->proc, sizeof processor);
3089 #endif
3090 #ifdef MULTI_TLB
3091 cpu_tlb = *list->tlb;
3092diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3093index 5a42c12..a2bb7c6 100644
3094--- a/arch/arm/kernel/signal.c
3095+++ b/arch/arm/kernel/signal.c
3096@@ -45,8 +45,6 @@ static const unsigned long sigreturn_codes[7] = {
3097 MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
3098 };
3099
3100-static unsigned long signal_return_offset;
3101-
3102 #ifdef CONFIG_CRUNCH
3103 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3104 {
3105@@ -406,8 +404,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3106 * except when the MPU has protected the vectors
3107 * page from PL0
3108 */
3109- retcode = mm->context.sigpage + signal_return_offset +
3110- (idx << 2) + thumb;
3111+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3112 } else
3113 #endif
3114 {
3115@@ -611,33 +608,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3116 } while (thread_flags & _TIF_WORK_MASK);
3117 return 0;
3118 }
3119-
3120-struct page *get_signal_page(void)
3121-{
3122- unsigned long ptr;
3123- unsigned offset;
3124- struct page *page;
3125- void *addr;
3126-
3127- page = alloc_pages(GFP_KERNEL, 0);
3128-
3129- if (!page)
3130- return NULL;
3131-
3132- addr = page_address(page);
3133-
3134- /* Give the signal return code some randomness */
3135- offset = 0x200 + (get_random_int() & 0x7fc);
3136- signal_return_offset = offset;
3137-
3138- /*
3139- * Copy signal return handlers into the vector page, and
3140- * set sigreturn to be a pointer to these.
3141- */
3142- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3143-
3144- ptr = (unsigned long)addr + offset;
3145- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3146-
3147- return page;
3148-}
3149diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3150index 5919eb4..b5d6dfe 100644
3151--- a/arch/arm/kernel/smp.c
3152+++ b/arch/arm/kernel/smp.c
3153@@ -70,7 +70,7 @@ enum ipi_msg_type {
3154
3155 static DECLARE_COMPLETION(cpu_running);
3156
3157-static struct smp_operations smp_ops;
3158+static struct smp_operations smp_ops __read_only;
3159
3160 void __init smp_set_ops(struct smp_operations *ops)
3161 {
3162diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3163index 6b9567e..b8af2d6 100644
3164--- a/arch/arm/kernel/traps.c
3165+++ b/arch/arm/kernel/traps.c
3166@@ -55,7 +55,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3167 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3168 {
3169 #ifdef CONFIG_KALLSYMS
3170- printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3171+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3172 #else
3173 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3174 #endif
3175@@ -257,6 +257,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3176 static int die_owner = -1;
3177 static unsigned int die_nest_count;
3178
3179+extern void gr_handle_kernel_exploit(void);
3180+
3181 static unsigned long oops_begin(void)
3182 {
3183 int cpu;
3184@@ -299,6 +301,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3185 panic("Fatal exception in interrupt");
3186 if (panic_on_oops)
3187 panic("Fatal exception");
3188+
3189+ gr_handle_kernel_exploit();
3190+
3191 if (signr)
3192 do_exit(signr);
3193 }
3194@@ -592,7 +597,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
3195 * The user helper at 0xffff0fe0 must be used instead.
3196 * (see entry-armv.S for details)
3197 */
3198+ pax_open_kernel();
3199 *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
3200+ pax_close_kernel();
3201 }
3202 return 0;
3203
3204@@ -848,5 +855,9 @@ void __init early_trap_init(void *vectors_base)
3205 kuser_init(vectors_base);
3206
3207 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3208- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3209+
3210+#ifndef CONFIG_PAX_MEMORY_UDEREF
3211+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3212+#endif
3213+
3214 }
3215diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3216index 33f2ea3..0b91824 100644
3217--- a/arch/arm/kernel/vmlinux.lds.S
3218+++ b/arch/arm/kernel/vmlinux.lds.S
3219@@ -8,7 +8,11 @@
3220 #include <asm/thread_info.h>
3221 #include <asm/memory.h>
3222 #include <asm/page.h>
3223-
3224+
3225+#ifdef CONFIG_PAX_KERNEXEC
3226+#include <asm/pgtable.h>
3227+#endif
3228+
3229 #define PROC_INFO \
3230 . = ALIGN(4); \
3231 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3232@@ -94,6 +98,11 @@ SECTIONS
3233 _text = .;
3234 HEAD_TEXT
3235 }
3236+
3237+#ifdef CONFIG_PAX_KERNEXEC
3238+ . = ALIGN(1<<SECTION_SHIFT);
3239+#endif
3240+
3241 .text : { /* Real text segment */
3242 _stext = .; /* Text and read-only data */
3243 __exception_text_start = .;
3244@@ -116,6 +125,8 @@ SECTIONS
3245 ARM_CPU_KEEP(PROC_INFO)
3246 }
3247
3248+ _etext = .; /* End of text section */
3249+
3250 RO_DATA(PAGE_SIZE)
3251
3252 . = ALIGN(4);
3253@@ -146,7 +157,9 @@ SECTIONS
3254
3255 NOTES
3256
3257- _etext = .; /* End of text and rodata section */
3258+#ifdef CONFIG_PAX_KERNEXEC
3259+ . = ALIGN(1<<SECTION_SHIFT);
3260+#endif
3261
3262 #ifndef CONFIG_XIP_KERNEL
3263 . = ALIGN(PAGE_SIZE);
3264@@ -224,6 +237,11 @@ SECTIONS
3265 . = PAGE_OFFSET + TEXT_OFFSET;
3266 #else
3267 __init_end = .;
3268+
3269+#ifdef CONFIG_PAX_KERNEXEC
3270+ . = ALIGN(1<<SECTION_SHIFT);
3271+#endif
3272+
3273 . = ALIGN(THREAD_SIZE);
3274 __data_loc = .;
3275 #endif
3276diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3277index 14a0d98..7771a7d 100644
3278--- a/arch/arm/lib/clear_user.S
3279+++ b/arch/arm/lib/clear_user.S
3280@@ -12,14 +12,14 @@
3281
3282 .text
3283
3284-/* Prototype: int __clear_user(void *addr, size_t sz)
3285+/* Prototype: int ___clear_user(void *addr, size_t sz)
3286 * Purpose : clear some user memory
3287 * Params : addr - user memory address to clear
3288 * : sz - number of bytes to clear
3289 * Returns : number of bytes NOT cleared
3290 */
3291 ENTRY(__clear_user_std)
3292-WEAK(__clear_user)
3293+WEAK(___clear_user)
3294 stmfd sp!, {r1, lr}
3295 mov r2, #0
3296 cmp r1, #4
3297@@ -44,7 +44,7 @@ WEAK(__clear_user)
3298 USER( strnebt r2, [r0])
3299 mov r0, #0
3300 ldmfd sp!, {r1, pc}
3301-ENDPROC(__clear_user)
3302+ENDPROC(___clear_user)
3303 ENDPROC(__clear_user_std)
3304
3305 .pushsection .fixup,"ax"
3306diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3307index 66a477a..bee61d3 100644
3308--- a/arch/arm/lib/copy_from_user.S
3309+++ b/arch/arm/lib/copy_from_user.S
3310@@ -16,7 +16,7 @@
3311 /*
3312 * Prototype:
3313 *
3314- * size_t __copy_from_user(void *to, const void *from, size_t n)
3315+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3316 *
3317 * Purpose:
3318 *
3319@@ -84,11 +84,11 @@
3320
3321 .text
3322
3323-ENTRY(__copy_from_user)
3324+ENTRY(___copy_from_user)
3325
3326 #include "copy_template.S"
3327
3328-ENDPROC(__copy_from_user)
3329+ENDPROC(___copy_from_user)
3330
3331 .pushsection .fixup,"ax"
3332 .align 0
3333diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3334index 6ee2f67..d1cce76 100644
3335--- a/arch/arm/lib/copy_page.S
3336+++ b/arch/arm/lib/copy_page.S
3337@@ -10,6 +10,7 @@
3338 * ASM optimised string functions
3339 */
3340 #include <linux/linkage.h>
3341+#include <linux/const.h>
3342 #include <asm/assembler.h>
3343 #include <asm/asm-offsets.h>
3344 #include <asm/cache.h>
3345diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3346index d066df6..df28194 100644
3347--- a/arch/arm/lib/copy_to_user.S
3348+++ b/arch/arm/lib/copy_to_user.S
3349@@ -16,7 +16,7 @@
3350 /*
3351 * Prototype:
3352 *
3353- * size_t __copy_to_user(void *to, const void *from, size_t n)
3354+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3355 *
3356 * Purpose:
3357 *
3358@@ -88,11 +88,11 @@
3359 .text
3360
3361 ENTRY(__copy_to_user_std)
3362-WEAK(__copy_to_user)
3363+WEAK(___copy_to_user)
3364
3365 #include "copy_template.S"
3366
3367-ENDPROC(__copy_to_user)
3368+ENDPROC(___copy_to_user)
3369 ENDPROC(__copy_to_user_std)
3370
3371 .pushsection .fixup,"ax"
3372diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3373index 7d08b43..f7ca7ea 100644
3374--- a/arch/arm/lib/csumpartialcopyuser.S
3375+++ b/arch/arm/lib/csumpartialcopyuser.S
3376@@ -57,8 +57,8 @@
3377 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3378 */
3379
3380-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3381-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3382+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3383+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3384
3385 #include "csumpartialcopygeneric.S"
3386
3387diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3388index 64dbfa5..84a3fd9 100644
3389--- a/arch/arm/lib/delay.c
3390+++ b/arch/arm/lib/delay.c
3391@@ -28,7 +28,7 @@
3392 /*
3393 * Default to the loop-based delay implementation.
3394 */
3395-struct arm_delay_ops arm_delay_ops = {
3396+struct arm_delay_ops arm_delay_ops __read_only = {
3397 .delay = __loop_delay,
3398 .const_udelay = __loop_const_udelay,
3399 .udelay = __loop_udelay,
3400diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3401index 025f742..8432b08 100644
3402--- a/arch/arm/lib/uaccess_with_memcpy.c
3403+++ b/arch/arm/lib/uaccess_with_memcpy.c
3404@@ -104,7 +104,7 @@ out:
3405 }
3406
3407 unsigned long
3408-__copy_to_user(void __user *to, const void *from, unsigned long n)
3409+___copy_to_user(void __user *to, const void *from, unsigned long n)
3410 {
3411 /*
3412 * This test is stubbed out of the main function above to keep
3413diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
3414index f389228..592ef66 100644
3415--- a/arch/arm/mach-kirkwood/common.c
3416+++ b/arch/arm/mach-kirkwood/common.c
3417@@ -149,7 +149,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
3418 clk_gate_ops.disable(hw);
3419 }
3420
3421-static struct clk_ops clk_gate_fn_ops;
3422+static int clk_gate_fn_is_enabled(struct clk_hw *hw)
3423+{
3424+ return clk_gate_ops.is_enabled(hw);
3425+}
3426+
3427+static struct clk_ops clk_gate_fn_ops = {
3428+ .enable = clk_gate_fn_enable,
3429+ .disable = clk_gate_fn_disable,
3430+ .is_enabled = clk_gate_fn_is_enabled,
3431+};
3432
3433 static struct clk __init *clk_register_gate_fn(struct device *dev,
3434 const char *name,
3435@@ -183,14 +192,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
3436 gate_fn->fn_en = fn_en;
3437 gate_fn->fn_dis = fn_dis;
3438
3439- /* ops is the gate ops, but with our enable/disable functions */
3440- if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
3441- clk_gate_fn_ops.disable != clk_gate_fn_disable) {
3442- clk_gate_fn_ops = clk_gate_ops;
3443- clk_gate_fn_ops.enable = clk_gate_fn_enable;
3444- clk_gate_fn_ops.disable = clk_gate_fn_disable;
3445- }
3446-
3447 clk = clk_register(dev, &gate_fn->gate.hw);
3448
3449 if (IS_ERR(clk))
3450diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3451index f6eeb87..cc90868 100644
3452--- a/arch/arm/mach-omap2/board-n8x0.c
3453+++ b/arch/arm/mach-omap2/board-n8x0.c
3454@@ -631,7 +631,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3455 }
3456 #endif
3457
3458-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3459+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3460 .late_init = n8x0_menelaus_late_init,
3461 };
3462
3463diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3464index 6c4da12..d9ca72d 100644
3465--- a/arch/arm/mach-omap2/gpmc.c
3466+++ b/arch/arm/mach-omap2/gpmc.c
3467@@ -147,7 +147,6 @@ struct omap3_gpmc_regs {
3468 };
3469
3470 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3471-static struct irq_chip gpmc_irq_chip;
3472 static unsigned gpmc_irq_start;
3473
3474 static struct resource gpmc_mem_root;
3475@@ -711,6 +710,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3476
3477 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3478
3479+static struct irq_chip gpmc_irq_chip = {
3480+ .name = "gpmc",
3481+ .irq_startup = gpmc_irq_noop_ret,
3482+ .irq_enable = gpmc_irq_enable,
3483+ .irq_disable = gpmc_irq_disable,
3484+ .irq_shutdown = gpmc_irq_noop,
3485+ .irq_ack = gpmc_irq_noop,
3486+ .irq_mask = gpmc_irq_noop,
3487+ .irq_unmask = gpmc_irq_noop,
3488+
3489+};
3490+
3491 static int gpmc_setup_irq(void)
3492 {
3493 int i;
3494@@ -725,15 +736,6 @@ static int gpmc_setup_irq(void)
3495 return gpmc_irq_start;
3496 }
3497
3498- gpmc_irq_chip.name = "gpmc";
3499- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3500- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3501- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3502- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3503- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3504- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3505- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3506-
3507 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3508 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3509
3510diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3511index f8bb3b9..831e7b8 100644
3512--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3513+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3514@@ -339,7 +339,7 @@ static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,
3515 return NOTIFY_OK;
3516 }
3517
3518-static struct notifier_block __refdata irq_hotplug_notifier = {
3519+static struct notifier_block irq_hotplug_notifier = {
3520 .notifier_call = irq_cpu_hotplug_notify,
3521 };
3522
3523diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3524index e6d2307..d057195 100644
3525--- a/arch/arm/mach-omap2/omap_device.c
3526+++ b/arch/arm/mach-omap2/omap_device.c
3527@@ -499,7 +499,7 @@ void omap_device_delete(struct omap_device *od)
3528 struct platform_device __init *omap_device_build(const char *pdev_name,
3529 int pdev_id,
3530 struct omap_hwmod *oh,
3531- void *pdata, int pdata_len)
3532+ const void *pdata, int pdata_len)
3533 {
3534 struct omap_hwmod *ohs[] = { oh };
3535
3536@@ -527,7 +527,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3537 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3538 int pdev_id,
3539 struct omap_hwmod **ohs,
3540- int oh_cnt, void *pdata,
3541+ int oh_cnt, const void *pdata,
3542 int pdata_len)
3543 {
3544 int ret = -ENOMEM;
3545diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3546index 044c31d..2ee0861 100644
3547--- a/arch/arm/mach-omap2/omap_device.h
3548+++ b/arch/arm/mach-omap2/omap_device.h
3549@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3550 /* Core code interface */
3551
3552 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3553- struct omap_hwmod *oh, void *pdata,
3554+ struct omap_hwmod *oh, const void *pdata,
3555 int pdata_len);
3556
3557 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3558 struct omap_hwmod **oh, int oh_cnt,
3559- void *pdata, int pdata_len);
3560+ const void *pdata, int pdata_len);
3561
3562 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3563 struct omap_hwmod **ohs, int oh_cnt);
3564diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3565index 7341eff..fd75e34 100644
3566--- a/arch/arm/mach-omap2/omap_hwmod.c
3567+++ b/arch/arm/mach-omap2/omap_hwmod.c
3568@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3569 int (*init_clkdm)(struct omap_hwmod *oh);
3570 void (*update_context_lost)(struct omap_hwmod *oh);
3571 int (*get_context_lost)(struct omap_hwmod *oh);
3572-};
3573+} __no_const;
3574
3575 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3576-static struct omap_hwmod_soc_ops soc_ops;
3577+static struct omap_hwmod_soc_ops soc_ops __read_only;
3578
3579 /* omap_hwmod_list contains all registered struct omap_hwmods */
3580 static LIST_HEAD(omap_hwmod_list);
3581diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3582index d15c7bb..b2d1f0c 100644
3583--- a/arch/arm/mach-omap2/wd_timer.c
3584+++ b/arch/arm/mach-omap2/wd_timer.c
3585@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3586 struct omap_hwmod *oh;
3587 char *oh_name = "wd_timer2";
3588 char *dev_name = "omap_wdt";
3589- struct omap_wd_timer_platform_data pdata;
3590+ static struct omap_wd_timer_platform_data pdata = {
3591+ .read_reset_sources = prm_read_reset_sources
3592+ };
3593
3594 if (!cpu_class_is_omap2() || of_have_populated_dt())
3595 return 0;
3596@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3597 return -EINVAL;
3598 }
3599
3600- pdata.read_reset_sources = prm_read_reset_sources;
3601-
3602 pdev = omap_device_build(dev_name, id, oh, &pdata,
3603 sizeof(struct omap_wd_timer_platform_data));
3604 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3605diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3606index 0cdba8d..297993e 100644
3607--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3608+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3609@@ -181,7 +181,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3610 bool entered_lp2 = false;
3611
3612 if (tegra_pending_sgi())
3613- ACCESS_ONCE(abort_flag) = true;
3614+ ACCESS_ONCE_RW(abort_flag) = true;
3615
3616 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3617
3618diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3619index cad3ca86..1d79e0f 100644
3620--- a/arch/arm/mach-ux500/setup.h
3621+++ b/arch/arm/mach-ux500/setup.h
3622@@ -37,13 +37,6 @@ extern void ux500_timer_init(void);
3623 .type = MT_DEVICE, \
3624 }
3625
3626-#define __MEM_DEV_DESC(x, sz) { \
3627- .virtual = IO_ADDRESS(x), \
3628- .pfn = __phys_to_pfn(x), \
3629- .length = sz, \
3630- .type = MT_MEMORY, \
3631-}
3632-
3633 extern struct smp_operations ux500_smp_ops;
3634 extern void ux500_cpu_die(unsigned int cpu);
3635
3636diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3637index 2950082..d0f0782 100644
3638--- a/arch/arm/mm/Kconfig
3639+++ b/arch/arm/mm/Kconfig
3640@@ -436,7 +436,7 @@ config CPU_32v5
3641
3642 config CPU_32v6
3643 bool
3644- select CPU_USE_DOMAINS if CPU_V6 && MMU
3645+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3646 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3647
3648 config CPU_32v6K
3649@@ -585,6 +585,7 @@ config CPU_CP15_MPU
3650
3651 config CPU_USE_DOMAINS
3652 bool
3653+ depends on !ARM_LPAE && !PAX_KERNEXEC
3654 help
3655 This option enables or disables the use of domain switching
3656 via the set_fs() function.
3657@@ -780,6 +781,7 @@ config NEED_KUSER_HELPERS
3658 config KUSER_HELPERS
3659 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3660 default y
3661+ depends on !(CPU_V6 || CPU_V6K || CPU_V7)
3662 help
3663 Warning: disabling this option may break user programs.
3664
3665@@ -790,7 +792,7 @@ config KUSER_HELPERS
3666 run on ARMv4 through to ARMv7 without modification.
3667
3668 However, the fixed address nature of these helpers can be used
3669- by ROP (return orientated programming) authors when creating
3670+ by ROP (Return Oriented Programming) authors when creating
3671 exploits.
3672
3673 If all of the binaries and libraries which run on your platform
3674diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3675index 6f4585b..7b6f52b 100644
3676--- a/arch/arm/mm/alignment.c
3677+++ b/arch/arm/mm/alignment.c
3678@@ -211,10 +211,12 @@ union offset_union {
3679 #define __get16_unaligned_check(ins,val,addr) \
3680 do { \
3681 unsigned int err = 0, v, a = addr; \
3682+ pax_open_userland(); \
3683 __get8_unaligned_check(ins,v,a,err); \
3684 val = v << ((BE) ? 8 : 0); \
3685 __get8_unaligned_check(ins,v,a,err); \
3686 val |= v << ((BE) ? 0 : 8); \
3687+ pax_close_userland(); \
3688 if (err) \
3689 goto fault; \
3690 } while (0)
3691@@ -228,6 +230,7 @@ union offset_union {
3692 #define __get32_unaligned_check(ins,val,addr) \
3693 do { \
3694 unsigned int err = 0, v, a = addr; \
3695+ pax_open_userland(); \
3696 __get8_unaligned_check(ins,v,a,err); \
3697 val = v << ((BE) ? 24 : 0); \
3698 __get8_unaligned_check(ins,v,a,err); \
3699@@ -236,6 +239,7 @@ union offset_union {
3700 val |= v << ((BE) ? 8 : 16); \
3701 __get8_unaligned_check(ins,v,a,err); \
3702 val |= v << ((BE) ? 0 : 24); \
3703+ pax_close_userland(); \
3704 if (err) \
3705 goto fault; \
3706 } while (0)
3707@@ -249,6 +253,7 @@ union offset_union {
3708 #define __put16_unaligned_check(ins,val,addr) \
3709 do { \
3710 unsigned int err = 0, v = val, a = addr; \
3711+ pax_open_userland(); \
3712 __asm__( FIRST_BYTE_16 \
3713 ARM( "1: "ins" %1, [%2], #1\n" ) \
3714 THUMB( "1: "ins" %1, [%2]\n" ) \
3715@@ -268,6 +273,7 @@ union offset_union {
3716 " .popsection\n" \
3717 : "=r" (err), "=&r" (v), "=&r" (a) \
3718 : "0" (err), "1" (v), "2" (a)); \
3719+ pax_close_userland(); \
3720 if (err) \
3721 goto fault; \
3722 } while (0)
3723@@ -281,6 +287,7 @@ union offset_union {
3724 #define __put32_unaligned_check(ins,val,addr) \
3725 do { \
3726 unsigned int err = 0, v = val, a = addr; \
3727+ pax_open_userland(); \
3728 __asm__( FIRST_BYTE_32 \
3729 ARM( "1: "ins" %1, [%2], #1\n" ) \
3730 THUMB( "1: "ins" %1, [%2]\n" ) \
3731@@ -310,6 +317,7 @@ union offset_union {
3732 " .popsection\n" \
3733 : "=r" (err), "=&r" (v), "=&r" (a) \
3734 : "0" (err), "1" (v), "2" (a)); \
3735+ pax_close_userland(); \
3736 if (err) \
3737 goto fault; \
3738 } while (0)
3739diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3740index 5dbf13f..ee1ec24 100644
3741--- a/arch/arm/mm/fault.c
3742+++ b/arch/arm/mm/fault.c
3743@@ -25,6 +25,7 @@
3744 #include <asm/system_misc.h>
3745 #include <asm/system_info.h>
3746 #include <asm/tlbflush.h>
3747+#include <asm/sections.h>
3748
3749 #include "fault.h"
3750
3751@@ -138,6 +139,20 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3752 if (fixup_exception(regs))
3753 return;
3754
3755+#ifdef CONFIG_PAX_KERNEXEC
3756+ if ((fsr & FSR_WRITE) &&
3757+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3758+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3759+ {
3760+ if (current->signal->curr_ip)
3761+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3762+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3763+ else
3764+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3765+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3766+ }
3767+#endif
3768+
3769 /*
3770 * No handler, we'll have to terminate things with extreme prejudice.
3771 */
3772@@ -174,6 +189,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3773 }
3774 #endif
3775
3776+#ifdef CONFIG_PAX_PAGEEXEC
3777+ if (fsr & FSR_LNX_PF) {
3778+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3779+ do_group_exit(SIGKILL);
3780+ }
3781+#endif
3782+
3783 tsk->thread.address = addr;
3784 tsk->thread.error_code = fsr;
3785 tsk->thread.trap_no = 14;
3786@@ -398,6 +420,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3787 }
3788 #endif /* CONFIG_MMU */
3789
3790+#ifdef CONFIG_PAX_PAGEEXEC
3791+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3792+{
3793+ long i;
3794+
3795+ printk(KERN_ERR "PAX: bytes at PC: ");
3796+ for (i = 0; i < 20; i++) {
3797+ unsigned char c;
3798+ if (get_user(c, (__force unsigned char __user *)pc+i))
3799+ printk(KERN_CONT "?? ");
3800+ else
3801+ printk(KERN_CONT "%02x ", c);
3802+ }
3803+ printk("\n");
3804+
3805+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3806+ for (i = -1; i < 20; i++) {
3807+ unsigned long c;
3808+ if (get_user(c, (__force unsigned long __user *)sp+i))
3809+ printk(KERN_CONT "???????? ");
3810+ else
3811+ printk(KERN_CONT "%08lx ", c);
3812+ }
3813+ printk("\n");
3814+}
3815+#endif
3816+
3817 /*
3818 * First Level Translation Fault Handler
3819 *
3820@@ -543,9 +592,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3821 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3822 struct siginfo info;
3823
3824+#ifdef CONFIG_PAX_MEMORY_UDEREF
3825+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3826+ if (current->signal->curr_ip)
3827+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3828+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3829+ else
3830+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3831+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3832+ goto die;
3833+ }
3834+#endif
3835+
3836 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
3837 return;
3838
3839+die:
3840 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
3841 inf->name, fsr, addr);
3842
3843@@ -569,15 +631,67 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
3844 ifsr_info[nr].name = name;
3845 }
3846
3847+asmlinkage int sys_sigreturn(struct pt_regs *regs);
3848+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
3849+
3850 asmlinkage void __exception
3851 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
3852 {
3853 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
3854 struct siginfo info;
3855
3856+ if (user_mode(regs)) {
3857+ unsigned long sigpage = current->mm->context.sigpage;
3858+
3859+ if (sigpage <= addr && addr < sigpage + 7*4) {
3860+ if (addr < sigpage + 3*4)
3861+ sys_sigreturn(regs);
3862+ else
3863+ sys_rt_sigreturn(regs);
3864+ return;
3865+ }
3866+ if (addr == 0xffff0fe0UL) {
3867+ /*
3868+ * PaX: __kuser_get_tls emulation
3869+ */
3870+ regs->ARM_r0 = current_thread_info()->tp_value;
3871+ regs->ARM_pc = regs->ARM_lr;
3872+ return;
3873+ }
3874+ }
3875+
3876+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
3877+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
3878+ if (current->signal->curr_ip)
3879+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3880+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
3881+ addr >= TASK_SIZE ? "non-executable kernel" : "userland", addr);
3882+ else
3883+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
3884+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
3885+ addr >= TASK_SIZE ? "non-executable kernel" : "userland", addr);
3886+ goto die;
3887+ }
3888+#endif
3889+
3890+#ifdef CONFIG_PAX_REFCOUNT
3891+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
3892+ unsigned int bkpt;
3893+
3894+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
3895+ current->thread.error_code = ifsr;
3896+ current->thread.trap_no = 0;
3897+ pax_report_refcount_overflow(regs);
3898+ fixup_exception(regs);
3899+ return;
3900+ }
3901+ }
3902+#endif
3903+
3904 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
3905 return;
3906
3907+die:
3908 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
3909 inf->name, ifsr, addr);
3910
3911diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
3912index cf08bdf..772656c 100644
3913--- a/arch/arm/mm/fault.h
3914+++ b/arch/arm/mm/fault.h
3915@@ -3,6 +3,7 @@
3916
3917 /*
3918 * Fault status register encodings. We steal bit 31 for our own purposes.
3919+ * Set when the FSR value is from an instruction fault.
3920 */
3921 #define FSR_LNX_PF (1 << 31)
3922 #define FSR_WRITE (1 << 11)
3923@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
3924 }
3925 #endif
3926
3927+/* valid for LPAE and !LPAE */
3928+static inline int is_xn_fault(unsigned int fsr)
3929+{
3930+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
3931+}
3932+
3933+static inline int is_domain_fault(unsigned int fsr)
3934+{
3935+ return ((fsr_fs(fsr) & 0xD) == 0x9);
3936+}
3937+
3938 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
3939 unsigned long search_exception_table(unsigned long addr);
3940
3941diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
3942index 0ecc43f..190b956 100644
3943--- a/arch/arm/mm/init.c
3944+++ b/arch/arm/mm/init.c
3945@@ -30,6 +30,8 @@
3946 #include <asm/setup.h>
3947 #include <asm/tlb.h>
3948 #include <asm/fixmap.h>
3949+#include <asm/system_info.h>
3950+#include <asm/cp15.h>
3951
3952 #include <asm/mach/arch.h>
3953 #include <asm/mach/map.h>
3954@@ -726,7 +728,46 @@ void free_initmem(void)
3955 {
3956 #ifdef CONFIG_HAVE_TCM
3957 extern char __tcm_start, __tcm_end;
3958+#endif
3959
3960+#ifdef CONFIG_PAX_KERNEXEC
3961+ unsigned long addr;
3962+ pgd_t *pgd;
3963+ pud_t *pud;
3964+ pmd_t *pmd;
3965+ int cpu_arch = cpu_architecture();
3966+ unsigned int cr = get_cr();
3967+
3968+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
3969+ /* make pages tables, etc before .text NX */
3970+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
3971+ pgd = pgd_offset_k(addr);
3972+ pud = pud_offset(pgd, addr);
3973+ pmd = pmd_offset(pud, addr);
3974+ __section_update(pmd, addr, PMD_SECT_XN);
3975+ }
3976+ /* make init NX */
3977+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
3978+ pgd = pgd_offset_k(addr);
3979+ pud = pud_offset(pgd, addr);
3980+ pmd = pmd_offset(pud, addr);
3981+ __section_update(pmd, addr, PMD_SECT_XN);
3982+ }
3983+ /* make kernel code/rodata RX */
3984+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
3985+ pgd = pgd_offset_k(addr);
3986+ pud = pud_offset(pgd, addr);
3987+ pmd = pmd_offset(pud, addr);
3988+#ifdef CONFIG_ARM_LPAE
3989+ __section_update(pmd, addr, PMD_SECT_RDONLY);
3990+#else
3991+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
3992+#endif
3993+ }
3994+ }
3995+#endif
3996+
3997+#ifdef CONFIG_HAVE_TCM
3998 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
3999 free_reserved_area(&__tcm_start, &__tcm_end, 0, "TCM link");
4000 #endif
4001diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4002index 04d9006..c547d85 100644
4003--- a/arch/arm/mm/ioremap.c
4004+++ b/arch/arm/mm/ioremap.c
4005@@ -392,9 +392,9 @@ __arm_ioremap_exec(unsigned long phys_addr, size_t size, bool cached)
4006 unsigned int mtype;
4007
4008 if (cached)
4009- mtype = MT_MEMORY;
4010+ mtype = MT_MEMORY_RX;
4011 else
4012- mtype = MT_MEMORY_NONCACHED;
4013+ mtype = MT_MEMORY_NONCACHED_RX;
4014
4015 return __arm_ioremap_caller(phys_addr, size, mtype,
4016 __builtin_return_address(0));
4017diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4018index 10062ce..8695745 100644
4019--- a/arch/arm/mm/mmap.c
4020+++ b/arch/arm/mm/mmap.c
4021@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4022 struct vm_area_struct *vma;
4023 int do_align = 0;
4024 int aliasing = cache_is_vipt_aliasing();
4025+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4026 struct vm_unmapped_area_info info;
4027
4028 /*
4029@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4030 if (len > TASK_SIZE)
4031 return -ENOMEM;
4032
4033+#ifdef CONFIG_PAX_RANDMMAP
4034+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4035+#endif
4036+
4037 if (addr) {
4038 if (do_align)
4039 addr = COLOUR_ALIGN(addr, pgoff);
4040@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4041 addr = PAGE_ALIGN(addr);
4042
4043 vma = find_vma(mm, addr);
4044- if (TASK_SIZE - len >= addr &&
4045- (!vma || addr + len <= vma->vm_start))
4046+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4047 return addr;
4048 }
4049
4050@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4051 info.high_limit = TASK_SIZE;
4052 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4053 info.align_offset = pgoff << PAGE_SHIFT;
4054+ info.threadstack_offset = offset;
4055 return vm_unmapped_area(&info);
4056 }
4057
4058@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4059 unsigned long addr = addr0;
4060 int do_align = 0;
4061 int aliasing = cache_is_vipt_aliasing();
4062+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4063 struct vm_unmapped_area_info info;
4064
4065 /*
4066@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4067 return addr;
4068 }
4069
4070+#ifdef CONFIG_PAX_RANDMMAP
4071+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4072+#endif
4073+
4074 /* requesting a specific address */
4075 if (addr) {
4076 if (do_align)
4077@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4078 else
4079 addr = PAGE_ALIGN(addr);
4080 vma = find_vma(mm, addr);
4081- if (TASK_SIZE - len >= addr &&
4082- (!vma || addr + len <= vma->vm_start))
4083+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4084 return addr;
4085 }
4086
4087@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4088 info.high_limit = mm->mmap_base;
4089 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4090 info.align_offset = pgoff << PAGE_SHIFT;
4091+ info.threadstack_offset = offset;
4092 addr = vm_unmapped_area(&info);
4093
4094 /*
4095@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4096 {
4097 unsigned long random_factor = 0UL;
4098
4099+#ifdef CONFIG_PAX_RANDMMAP
4100+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4101+#endif
4102+
4103 /* 8 bits of randomness in 20 address space bits */
4104 if ((current->flags & PF_RANDOMIZE) &&
4105 !(current->personality & ADDR_NO_RANDOMIZE))
4106@@ -180,10 +194,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4107
4108 if (mmap_is_legacy()) {
4109 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4110+
4111+#ifdef CONFIG_PAX_RANDMMAP
4112+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4113+ mm->mmap_base += mm->delta_mmap;
4114+#endif
4115+
4116 mm->get_unmapped_area = arch_get_unmapped_area;
4117 mm->unmap_area = arch_unmap_area;
4118 } else {
4119 mm->mmap_base = mmap_base(random_factor);
4120+
4121+#ifdef CONFIG_PAX_RANDMMAP
4122+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4123+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4124+#endif
4125+
4126 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4127 mm->unmap_area = arch_unmap_area_topdown;
4128 }
4129diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4130index daf336f..4e6392c 100644
4131--- a/arch/arm/mm/mmu.c
4132+++ b/arch/arm/mm/mmu.c
4133@@ -36,6 +36,22 @@
4134 #include "mm.h"
4135 #include "tcm.h"
4136
4137+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4138+void modify_domain(unsigned int dom, unsigned int type)
4139+{
4140+ struct thread_info *thread = current_thread_info();
4141+ unsigned int domain = thread->cpu_domain;
4142+ /*
4143+ * DOMAIN_MANAGER might be defined to some other value,
4144+ * use the arch-defined constant
4145+ */
4146+ domain &= ~domain_val(dom, 3);
4147+ thread->cpu_domain = domain | domain_val(dom, type);
4148+ set_domain(thread->cpu_domain);
4149+}
4150+EXPORT_SYMBOL(modify_domain);
4151+#endif
4152+
4153 /*
4154 * empty_zero_page is a special page that is used for
4155 * zero-initialized data and COW.
4156@@ -228,10 +244,18 @@ __setup("noalign", noalign_setup);
4157
4158 #endif /* ifdef CONFIG_CPU_CP15 / else */
4159
4160-#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY|L_PTE_XN
4161+#define PROT_PTE_DEVICE L_PTE_PRESENT|L_PTE_YOUNG|L_PTE_DIRTY
4162 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4163
4164-static struct mem_type mem_types[] = {
4165+#ifdef CONFIG_PAX_KERNEXEC
4166+#define L_PTE_KERNEXEC L_PTE_RDONLY
4167+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4168+#else
4169+#define L_PTE_KERNEXEC L_PTE_DIRTY
4170+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4171+#endif
4172+
4173+static struct mem_type mem_types[] __read_only = {
4174 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4175 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4176 L_PTE_SHARED,
4177@@ -260,16 +284,16 @@ static struct mem_type mem_types[] = {
4178 [MT_UNCACHED] = {
4179 .prot_pte = PROT_PTE_DEVICE,
4180 .prot_l1 = PMD_TYPE_TABLE,
4181- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4182+ .prot_sect = PROT_SECT_DEVICE,
4183 .domain = DOMAIN_IO,
4184 },
4185 [MT_CACHECLEAN] = {
4186- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4187+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4188 .domain = DOMAIN_KERNEL,
4189 },
4190 #ifndef CONFIG_ARM_LPAE
4191 [MT_MINICLEAN] = {
4192- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4193+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_RDONLY,
4194 .domain = DOMAIN_KERNEL,
4195 },
4196 #endif
4197@@ -277,36 +301,54 @@ static struct mem_type mem_types[] = {
4198 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4199 L_PTE_RDONLY,
4200 .prot_l1 = PMD_TYPE_TABLE,
4201- .domain = DOMAIN_USER,
4202+ .domain = DOMAIN_VECTORS,
4203 },
4204 [MT_HIGH_VECTORS] = {
4205 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4206 L_PTE_USER | L_PTE_RDONLY,
4207 .prot_l1 = PMD_TYPE_TABLE,
4208- .domain = DOMAIN_USER,
4209+ .domain = DOMAIN_VECTORS,
4210 },
4211- [MT_MEMORY] = {
4212+ [MT_MEMORY_RWX] = {
4213 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4214 .prot_l1 = PMD_TYPE_TABLE,
4215 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4216 .domain = DOMAIN_KERNEL,
4217 },
4218+ [MT_MEMORY_RW] = {
4219+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4220+ .prot_l1 = PMD_TYPE_TABLE,
4221+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4222+ .domain = DOMAIN_KERNEL,
4223+ },
4224+ [MT_MEMORY_RX] = {
4225+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4226+ .prot_l1 = PMD_TYPE_TABLE,
4227+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4228+ .domain = DOMAIN_KERNEL,
4229+ },
4230 [MT_ROM] = {
4231- .prot_sect = PMD_TYPE_SECT,
4232+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4233 .domain = DOMAIN_KERNEL,
4234 },
4235- [MT_MEMORY_NONCACHED] = {
4236+ [MT_MEMORY_NONCACHED_RW] = {
4237 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4238 L_PTE_MT_BUFFERABLE,
4239 .prot_l1 = PMD_TYPE_TABLE,
4240 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4241 .domain = DOMAIN_KERNEL,
4242 },
4243+ [MT_MEMORY_NONCACHED_RX] = {
4244+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4245+ L_PTE_MT_BUFFERABLE,
4246+ .prot_l1 = PMD_TYPE_TABLE,
4247+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4248+ .domain = DOMAIN_KERNEL,
4249+ },
4250 [MT_MEMORY_DTCM] = {
4251- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4252- L_PTE_XN,
4253+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4254 .prot_l1 = PMD_TYPE_TABLE,
4255- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4256+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4257 .domain = DOMAIN_KERNEL,
4258 },
4259 [MT_MEMORY_ITCM] = {
4260@@ -316,10 +358,10 @@ static struct mem_type mem_types[] = {
4261 },
4262 [MT_MEMORY_SO] = {
4263 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4264- L_PTE_MT_UNCACHED | L_PTE_XN,
4265+ L_PTE_MT_UNCACHED,
4266 .prot_l1 = PMD_TYPE_TABLE,
4267 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S |
4268- PMD_SECT_UNCACHED | PMD_SECT_XN,
4269+ PMD_SECT_UNCACHED,
4270 .domain = DOMAIN_KERNEL,
4271 },
4272 [MT_MEMORY_DMA_READY] = {
4273@@ -405,9 +447,35 @@ static void __init build_mem_type_table(void)
4274 * to prevent speculative instruction fetches.
4275 */
4276 mem_types[MT_DEVICE].prot_sect |= PMD_SECT_XN;
4277+ mem_types[MT_DEVICE].prot_pte |= L_PTE_XN;
4278 mem_types[MT_DEVICE_NONSHARED].prot_sect |= PMD_SECT_XN;
4279+ mem_types[MT_DEVICE_NONSHARED].prot_pte |= L_PTE_XN;
4280 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_XN;
4281+ mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_XN;
4282 mem_types[MT_DEVICE_WC].prot_sect |= PMD_SECT_XN;
4283+ mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_XN;
4284+
4285+ /* Mark other regions on ARMv6+ as execute-never */
4286+
4287+#ifdef CONFIG_PAX_KERNEXEC
4288+ mem_types[MT_UNCACHED].prot_sect |= PMD_SECT_XN;
4289+ mem_types[MT_UNCACHED].prot_pte |= L_PTE_XN;
4290+ mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_XN;
4291+ mem_types[MT_CACHECLEAN].prot_pte |= L_PTE_XN;
4292+#ifndef CONFIG_ARM_LPAE
4293+ mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_XN;
4294+ mem_types[MT_MINICLEAN].prot_pte |= L_PTE_XN;
4295+#endif
4296+ mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_XN;
4297+ mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_XN;
4298+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_XN;
4299+ mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= PMD_SECT_XN;
4300+ mem_types[MT_MEMORY_DTCM].prot_sect |= PMD_SECT_XN;
4301+ mem_types[MT_MEMORY_DTCM].prot_pte |= L_PTE_XN;
4302+#endif
4303+
4304+ mem_types[MT_MEMORY_SO].prot_sect |= PMD_SECT_XN;
4305+ mem_types[MT_MEMORY_SO].prot_pte |= L_PTE_XN;
4306 }
4307 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4308 /*
4309@@ -468,6 +536,9 @@ static void __init build_mem_type_table(void)
4310 * from SVC mode and no access from userspace.
4311 */
4312 mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4313+#ifdef CONFIG_PAX_KERNEXEC
4314+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4315+#endif
4316 mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4317 mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4318 #endif
4319@@ -485,11 +556,17 @@ static void __init build_mem_type_table(void)
4320 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4321 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4322 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4323- mem_types[MT_MEMORY].prot_sect |= PMD_SECT_S;
4324- mem_types[MT_MEMORY].prot_pte |= L_PTE_SHARED;
4325+ mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4326+ mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4327+ mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4328+ mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4329+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4330+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4331 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4332- mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_S;
4333- mem_types[MT_MEMORY_NONCACHED].prot_pte |= L_PTE_SHARED;
4334+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_S;
4335+ mem_types[MT_MEMORY_NONCACHED_RW].prot_pte |= L_PTE_SHARED;
4336+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_S;
4337+ mem_types[MT_MEMORY_NONCACHED_RX].prot_pte |= L_PTE_SHARED;
4338 }
4339 }
4340
4341@@ -500,15 +577,20 @@ static void __init build_mem_type_table(void)
4342 if (cpu_arch >= CPU_ARCH_ARMv6) {
4343 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4344 /* Non-cacheable Normal is XCB = 001 */
4345- mem_types[MT_MEMORY_NONCACHED].prot_sect |=
4346+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
4347+ PMD_SECT_BUFFERED;
4348+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
4349 PMD_SECT_BUFFERED;
4350 } else {
4351 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4352- mem_types[MT_MEMORY_NONCACHED].prot_sect |=
4353+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |=
4354+ PMD_SECT_TEX(1);
4355+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |=
4356 PMD_SECT_TEX(1);
4357 }
4358 } else {
4359- mem_types[MT_MEMORY_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4360+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= PMD_SECT_BUFFERABLE;
4361+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= PMD_SECT_BUFFERABLE;
4362 }
4363
4364 #ifdef CONFIG_ARM_LPAE
4365@@ -524,6 +606,8 @@ static void __init build_mem_type_table(void)
4366 vecs_pgprot |= PTE_EXT_AF;
4367 #endif
4368
4369+ user_pgprot |= __supported_pte_mask;
4370+
4371 for (i = 0; i < 16; i++) {
4372 pteval_t v = pgprot_val(protection_map[i]);
4373 protection_map[i] = __pgprot(v | user_pgprot);
4374@@ -541,10 +625,15 @@ static void __init build_mem_type_table(void)
4375
4376 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4377 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4378- mem_types[MT_MEMORY].prot_sect |= ecc_mask | cp->pmd;
4379- mem_types[MT_MEMORY].prot_pte |= kern_pgprot;
4380+ mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4381+ mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4382+ mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4383+ mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4384+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4385+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4386 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4387- mem_types[MT_MEMORY_NONCACHED].prot_sect |= ecc_mask;
4388+ mem_types[MT_MEMORY_NONCACHED_RW].prot_sect |= ecc_mask;
4389+ mem_types[MT_MEMORY_NONCACHED_RX].prot_sect |= ecc_mask;
4390 mem_types[MT_ROM].prot_sect |= cp->pmd;
4391
4392 switch (cp->pmd) {
4393@@ -1166,18 +1255,15 @@ void __init arm_mm_memblock_reserve(void)
4394 * called function. This means you can't use any function or debugging
4395 * method which may touch any device, otherwise the kernel _will_ crash.
4396 */
4397+
4398+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4399+
4400 static void __init devicemaps_init(struct machine_desc *mdesc)
4401 {
4402 struct map_desc map;
4403 unsigned long addr;
4404- void *vectors;
4405
4406- /*
4407- * Allocate the vector page early.
4408- */
4409- vectors = early_alloc(PAGE_SIZE * 2);
4410-
4411- early_trap_init(vectors);
4412+ early_trap_init(&vectors);
4413
4414 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4415 pmd_clear(pmd_off_k(addr));
4416@@ -1217,7 +1303,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
4417 * location (0xffff0000). If we aren't using high-vectors, also
4418 * create a mapping at the low-vectors virtual address.
4419 */
4420- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4421+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4422 map.virtual = 0xffff0000;
4423 map.length = PAGE_SIZE;
4424 #ifdef CONFIG_KUSER_HELPERS
4425@@ -1287,8 +1373,39 @@ static void __init map_lowmem(void)
4426 map.pfn = __phys_to_pfn(start);
4427 map.virtual = __phys_to_virt(start);
4428 map.length = end - start;
4429- map.type = MT_MEMORY;
4430
4431+#ifdef CONFIG_PAX_KERNEXEC
4432+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4433+ struct map_desc kernel;
4434+ struct map_desc initmap;
4435+
4436+ /* when freeing initmem we will make this RW */
4437+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4438+ initmap.virtual = (unsigned long)__init_begin;
4439+ initmap.length = _sdata - __init_begin;
4440+ initmap.type = MT_MEMORY_RWX;
4441+ create_mapping(&initmap);
4442+
4443+ /* when freeing initmem we will make this RX */
4444+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4445+ kernel.virtual = (unsigned long)_stext;
4446+ kernel.length = __init_begin - _stext;
4447+ kernel.type = MT_MEMORY_RWX;
4448+ create_mapping(&kernel);
4449+
4450+ if (map.virtual < (unsigned long)_stext) {
4451+ map.length = (unsigned long)_stext - map.virtual;
4452+ map.type = MT_MEMORY_RWX;
4453+ create_mapping(&map);
4454+ }
4455+
4456+ map.pfn = __phys_to_pfn(__pa(_sdata));
4457+ map.virtual = (unsigned long)_sdata;
4458+ map.length = end - __pa(_sdata);
4459+ }
4460+#endif
4461+
4462+ map.type = MT_MEMORY_RW;
4463 create_mapping(&map);
4464 }
4465 }
4466diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4467index a5bc92d..0bb4730 100644
4468--- a/arch/arm/plat-omap/sram.c
4469+++ b/arch/arm/plat-omap/sram.c
4470@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4471 * Looks like we need to preserve some bootloader code at the
4472 * beginning of SRAM for jumping to flash for reboot to work...
4473 */
4474+ pax_open_kernel();
4475 memset_io(omap_sram_base + omap_sram_skip, 0,
4476 omap_sram_size - omap_sram_skip);
4477+ pax_close_kernel();
4478 }
4479diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4480index ce6d763..cfea917 100644
4481--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4482+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4483@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4484 int (*started)(unsigned ch);
4485 int (*flush)(unsigned ch);
4486 int (*stop)(unsigned ch);
4487-};
4488+} __no_const;
4489
4490 extern void *samsung_dmadev_get_ops(void);
4491 extern void *s3c_dma_get_ops(void);
4492diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
4493index f4726dc..39ed646 100644
4494--- a/arch/arm64/kernel/debug-monitors.c
4495+++ b/arch/arm64/kernel/debug-monitors.c
4496@@ -149,7 +149,7 @@ static int __cpuinit os_lock_notify(struct notifier_block *self,
4497 return NOTIFY_OK;
4498 }
4499
4500-static struct notifier_block __cpuinitdata os_lock_nb = {
4501+static struct notifier_block os_lock_nb = {
4502 .notifier_call = os_lock_notify,
4503 };
4504
4505diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
4506index 5ab825c..96aaec8 100644
4507--- a/arch/arm64/kernel/hw_breakpoint.c
4508+++ b/arch/arm64/kernel/hw_breakpoint.c
4509@@ -831,7 +831,7 @@ static int __cpuinit hw_breakpoint_reset_notify(struct notifier_block *self,
4510 return NOTIFY_OK;
4511 }
4512
4513-static struct notifier_block __cpuinitdata hw_breakpoint_reset_nb = {
4514+static struct notifier_block hw_breakpoint_reset_nb = {
4515 .notifier_call = hw_breakpoint_reset_notify,
4516 };
4517
4518diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4519index c3a58a1..78fbf54 100644
4520--- a/arch/avr32/include/asm/cache.h
4521+++ b/arch/avr32/include/asm/cache.h
4522@@ -1,8 +1,10 @@
4523 #ifndef __ASM_AVR32_CACHE_H
4524 #define __ASM_AVR32_CACHE_H
4525
4526+#include <linux/const.h>
4527+
4528 #define L1_CACHE_SHIFT 5
4529-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4530+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4531
4532 /*
4533 * Memory returned by kmalloc() may be used for DMA, so we must make
4534diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4535index d232888..87c8df1 100644
4536--- a/arch/avr32/include/asm/elf.h
4537+++ b/arch/avr32/include/asm/elf.h
4538@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4539 the loader. We need to make sure that it is out of the way of the program
4540 that it will "exec", and that there is sufficient room for the brk. */
4541
4542-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4543+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4544
4545+#ifdef CONFIG_PAX_ASLR
4546+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4547+
4548+#define PAX_DELTA_MMAP_LEN 15
4549+#define PAX_DELTA_STACK_LEN 15
4550+#endif
4551
4552 /* This yields a mask that user programs can use to figure out what
4553 instruction set this CPU supports. This could be done in user space,
4554diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4555index 479330b..53717a8 100644
4556--- a/arch/avr32/include/asm/kmap_types.h
4557+++ b/arch/avr32/include/asm/kmap_types.h
4558@@ -2,9 +2,9 @@
4559 #define __ASM_AVR32_KMAP_TYPES_H
4560
4561 #ifdef CONFIG_DEBUG_HIGHMEM
4562-# define KM_TYPE_NR 29
4563+# define KM_TYPE_NR 30
4564 #else
4565-# define KM_TYPE_NR 14
4566+# define KM_TYPE_NR 15
4567 #endif
4568
4569 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4570diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4571index b2f2d2d..d1c85cb 100644
4572--- a/arch/avr32/mm/fault.c
4573+++ b/arch/avr32/mm/fault.c
4574@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4575
4576 int exception_trace = 1;
4577
4578+#ifdef CONFIG_PAX_PAGEEXEC
4579+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4580+{
4581+ unsigned long i;
4582+
4583+ printk(KERN_ERR "PAX: bytes at PC: ");
4584+ for (i = 0; i < 20; i++) {
4585+ unsigned char c;
4586+ if (get_user(c, (unsigned char *)pc+i))
4587+ printk(KERN_CONT "???????? ");
4588+ else
4589+ printk(KERN_CONT "%02x ", c);
4590+ }
4591+ printk("\n");
4592+}
4593+#endif
4594+
4595 /*
4596 * This routine handles page faults. It determines the address and the
4597 * problem, and then passes it off to one of the appropriate routines.
4598@@ -174,6 +191,16 @@ bad_area:
4599 up_read(&mm->mmap_sem);
4600
4601 if (user_mode(regs)) {
4602+
4603+#ifdef CONFIG_PAX_PAGEEXEC
4604+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4605+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4606+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4607+ do_group_exit(SIGKILL);
4608+ }
4609+ }
4610+#endif
4611+
4612 if (exception_trace && printk_ratelimit())
4613 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4614 "sp %08lx ecr %lu\n",
4615diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4616index 568885a..f8008df 100644
4617--- a/arch/blackfin/include/asm/cache.h
4618+++ b/arch/blackfin/include/asm/cache.h
4619@@ -7,6 +7,7 @@
4620 #ifndef __ARCH_BLACKFIN_CACHE_H
4621 #define __ARCH_BLACKFIN_CACHE_H
4622
4623+#include <linux/const.h>
4624 #include <linux/linkage.h> /* for asmlinkage */
4625
4626 /*
4627@@ -14,7 +15,7 @@
4628 * Blackfin loads 32 bytes for cache
4629 */
4630 #define L1_CACHE_SHIFT 5
4631-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4632+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4633 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4634
4635 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4636diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4637index aea2718..3639a60 100644
4638--- a/arch/cris/include/arch-v10/arch/cache.h
4639+++ b/arch/cris/include/arch-v10/arch/cache.h
4640@@ -1,8 +1,9 @@
4641 #ifndef _ASM_ARCH_CACHE_H
4642 #define _ASM_ARCH_CACHE_H
4643
4644+#include <linux/const.h>
4645 /* Etrax 100LX have 32-byte cache-lines. */
4646-#define L1_CACHE_BYTES 32
4647 #define L1_CACHE_SHIFT 5
4648+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4649
4650 #endif /* _ASM_ARCH_CACHE_H */
4651diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4652index 7caf25d..ee65ac5 100644
4653--- a/arch/cris/include/arch-v32/arch/cache.h
4654+++ b/arch/cris/include/arch-v32/arch/cache.h
4655@@ -1,11 +1,12 @@
4656 #ifndef _ASM_CRIS_ARCH_CACHE_H
4657 #define _ASM_CRIS_ARCH_CACHE_H
4658
4659+#include <linux/const.h>
4660 #include <arch/hwregs/dma.h>
4661
4662 /* A cache-line is 32 bytes. */
4663-#define L1_CACHE_BYTES 32
4664 #define L1_CACHE_SHIFT 5
4665+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4666
4667 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4668
4669diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4670index b86329d..6709906 100644
4671--- a/arch/frv/include/asm/atomic.h
4672+++ b/arch/frv/include/asm/atomic.h
4673@@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
4674 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4675 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4676
4677+#define atomic64_read_unchecked(v) atomic64_read(v)
4678+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4679+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4680+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4681+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4682+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4683+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4684+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4685+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4686+
4687 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4688 {
4689 int c, old;
4690diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4691index 2797163..c2a401d 100644
4692--- a/arch/frv/include/asm/cache.h
4693+++ b/arch/frv/include/asm/cache.h
4694@@ -12,10 +12,11 @@
4695 #ifndef __ASM_CACHE_H
4696 #define __ASM_CACHE_H
4697
4698+#include <linux/const.h>
4699
4700 /* bytes per L1 cache line */
4701 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
4702-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4703+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4704
4705 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4706 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4707diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
4708index 43901f2..0d8b865 100644
4709--- a/arch/frv/include/asm/kmap_types.h
4710+++ b/arch/frv/include/asm/kmap_types.h
4711@@ -2,6 +2,6 @@
4712 #ifndef _ASM_KMAP_TYPES_H
4713 #define _ASM_KMAP_TYPES_H
4714
4715-#define KM_TYPE_NR 17
4716+#define KM_TYPE_NR 18
4717
4718 #endif
4719diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
4720index 836f147..4cf23f5 100644
4721--- a/arch/frv/mm/elf-fdpic.c
4722+++ b/arch/frv/mm/elf-fdpic.c
4723@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4724 {
4725 struct vm_area_struct *vma;
4726 struct vm_unmapped_area_info info;
4727+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
4728
4729 if (len > TASK_SIZE)
4730 return -ENOMEM;
4731@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4732 if (addr) {
4733 addr = PAGE_ALIGN(addr);
4734 vma = find_vma(current->mm, addr);
4735- if (TASK_SIZE - len >= addr &&
4736- (!vma || addr + len <= vma->vm_start))
4737+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4738 goto success;
4739 }
4740
4741@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
4742 info.high_limit = (current->mm->start_stack - 0x00200000);
4743 info.align_mask = 0;
4744 info.align_offset = 0;
4745+ info.threadstack_offset = offset;
4746 addr = vm_unmapped_area(&info);
4747 if (!(addr & ~PAGE_MASK))
4748 goto success;
4749diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
4750index f4ca594..adc72fd6 100644
4751--- a/arch/hexagon/include/asm/cache.h
4752+++ b/arch/hexagon/include/asm/cache.h
4753@@ -21,9 +21,11 @@
4754 #ifndef __ASM_CACHE_H
4755 #define __ASM_CACHE_H
4756
4757+#include <linux/const.h>
4758+
4759 /* Bytes per L1 cache line */
4760-#define L1_CACHE_SHIFT (5)
4761-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4762+#define L1_CACHE_SHIFT 5
4763+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4764
4765 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
4766 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
4767diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
4768index 6e6fe18..a6ae668 100644
4769--- a/arch/ia64/include/asm/atomic.h
4770+++ b/arch/ia64/include/asm/atomic.h
4771@@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
4772 #define atomic64_inc(v) atomic64_add(1, (v))
4773 #define atomic64_dec(v) atomic64_sub(1, (v))
4774
4775+#define atomic64_read_unchecked(v) atomic64_read(v)
4776+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4777+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4778+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4779+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4780+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4781+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4782+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4783+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4784+
4785 /* Atomic operations are already serializing */
4786 #define smp_mb__before_atomic_dec() barrier()
4787 #define smp_mb__after_atomic_dec() barrier()
4788diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
4789index 988254a..e1ee885 100644
4790--- a/arch/ia64/include/asm/cache.h
4791+++ b/arch/ia64/include/asm/cache.h
4792@@ -1,6 +1,7 @@
4793 #ifndef _ASM_IA64_CACHE_H
4794 #define _ASM_IA64_CACHE_H
4795
4796+#include <linux/const.h>
4797
4798 /*
4799 * Copyright (C) 1998-2000 Hewlett-Packard Co
4800@@ -9,7 +10,7 @@
4801
4802 /* Bytes per L1 (data) cache line. */
4803 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
4804-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4805+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4806
4807 #ifdef CONFIG_SMP
4808 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
4809diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
4810index 5a83c5c..4d7f553 100644
4811--- a/arch/ia64/include/asm/elf.h
4812+++ b/arch/ia64/include/asm/elf.h
4813@@ -42,6 +42,13 @@
4814 */
4815 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
4816
4817+#ifdef CONFIG_PAX_ASLR
4818+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
4819+
4820+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
4821+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
4822+#endif
4823+
4824 #define PT_IA_64_UNWIND 0x70000001
4825
4826 /* IA-64 relocations: */
4827diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
4828index 96a8d92..617a1cf 100644
4829--- a/arch/ia64/include/asm/pgalloc.h
4830+++ b/arch/ia64/include/asm/pgalloc.h
4831@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
4832 pgd_val(*pgd_entry) = __pa(pud);
4833 }
4834
4835+static inline void
4836+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
4837+{
4838+ pgd_populate(mm, pgd_entry, pud);
4839+}
4840+
4841 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
4842 {
4843 return quicklist_alloc(0, GFP_KERNEL, NULL);
4844@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
4845 pud_val(*pud_entry) = __pa(pmd);
4846 }
4847
4848+static inline void
4849+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
4850+{
4851+ pud_populate(mm, pud_entry, pmd);
4852+}
4853+
4854 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
4855 {
4856 return quicklist_alloc(0, GFP_KERNEL, NULL);
4857diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
4858index 815810c..d60bd4c 100644
4859--- a/arch/ia64/include/asm/pgtable.h
4860+++ b/arch/ia64/include/asm/pgtable.h
4861@@ -12,7 +12,7 @@
4862 * David Mosberger-Tang <davidm@hpl.hp.com>
4863 */
4864
4865-
4866+#include <linux/const.h>
4867 #include <asm/mman.h>
4868 #include <asm/page.h>
4869 #include <asm/processor.h>
4870@@ -142,6 +142,17 @@
4871 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4872 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4873 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
4874+
4875+#ifdef CONFIG_PAX_PAGEEXEC
4876+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
4877+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4878+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
4879+#else
4880+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4881+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4882+# define PAGE_COPY_NOEXEC PAGE_COPY
4883+#endif
4884+
4885 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
4886 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
4887 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
4888diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
4889index 54ff557..70c88b7 100644
4890--- a/arch/ia64/include/asm/spinlock.h
4891+++ b/arch/ia64/include/asm/spinlock.h
4892@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
4893 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
4894
4895 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
4896- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
4897+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
4898 }
4899
4900 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
4901diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
4902index 449c8c0..18965fb 100644
4903--- a/arch/ia64/include/asm/uaccess.h
4904+++ b/arch/ia64/include/asm/uaccess.h
4905@@ -240,12 +240,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
4906 static inline unsigned long
4907 __copy_to_user (void __user *to, const void *from, unsigned long count)
4908 {
4909+ if (count > INT_MAX)
4910+ return count;
4911+
4912+ if (!__builtin_constant_p(count))
4913+ check_object_size(from, count, true);
4914+
4915 return __copy_user(to, (__force void __user *) from, count);
4916 }
4917
4918 static inline unsigned long
4919 __copy_from_user (void *to, const void __user *from, unsigned long count)
4920 {
4921+ if (count > INT_MAX)
4922+ return count;
4923+
4924+ if (!__builtin_constant_p(count))
4925+ check_object_size(to, count, false);
4926+
4927 return __copy_user((__force void __user *) to, from, count);
4928 }
4929
4930@@ -255,10 +267,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
4931 ({ \
4932 void __user *__cu_to = (to); \
4933 const void *__cu_from = (from); \
4934- long __cu_len = (n); \
4935+ unsigned long __cu_len = (n); \
4936 \
4937- if (__access_ok(__cu_to, __cu_len, get_fs())) \
4938+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
4939+ if (!__builtin_constant_p(n)) \
4940+ check_object_size(__cu_from, __cu_len, true); \
4941 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
4942+ } \
4943 __cu_len; \
4944 })
4945
4946@@ -266,11 +281,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
4947 ({ \
4948 void *__cu_to = (to); \
4949 const void __user *__cu_from = (from); \
4950- long __cu_len = (n); \
4951+ unsigned long __cu_len = (n); \
4952 \
4953 __chk_user_ptr(__cu_from); \
4954- if (__access_ok(__cu_from, __cu_len, get_fs())) \
4955+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
4956+ if (!__builtin_constant_p(n)) \
4957+ check_object_size(__cu_to, __cu_len, false); \
4958 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
4959+ } \
4960 __cu_len; \
4961 })
4962
4963diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
4964index 2d67317..07d8bfa 100644
4965--- a/arch/ia64/kernel/err_inject.c
4966+++ b/arch/ia64/kernel/err_inject.c
4967@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
4968 return NOTIFY_OK;
4969 }
4970
4971-static struct notifier_block __cpuinitdata err_inject_cpu_notifier =
4972+static struct notifier_block err_inject_cpu_notifier =
4973 {
4974 .notifier_call = err_inject_cpu_callback,
4975 };
4976diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
4977index d7396db..b33e873 100644
4978--- a/arch/ia64/kernel/mca.c
4979+++ b/arch/ia64/kernel/mca.c
4980@@ -1922,7 +1922,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
4981 return NOTIFY_OK;
4982 }
4983
4984-static struct notifier_block mca_cpu_notifier __cpuinitdata = {
4985+static struct notifier_block mca_cpu_notifier = {
4986 .notifier_call = mca_cpu_callback
4987 };
4988
4989diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
4990index 24603be..948052d 100644
4991--- a/arch/ia64/kernel/module.c
4992+++ b/arch/ia64/kernel/module.c
4993@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
4994 void
4995 module_free (struct module *mod, void *module_region)
4996 {
4997- if (mod && mod->arch.init_unw_table &&
4998- module_region == mod->module_init) {
4999+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5000 unw_remove_unwind_table(mod->arch.init_unw_table);
5001 mod->arch.init_unw_table = NULL;
5002 }
5003@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5004 }
5005
5006 static inline int
5007+in_init_rx (const struct module *mod, uint64_t addr)
5008+{
5009+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5010+}
5011+
5012+static inline int
5013+in_init_rw (const struct module *mod, uint64_t addr)
5014+{
5015+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5016+}
5017+
5018+static inline int
5019 in_init (const struct module *mod, uint64_t addr)
5020 {
5021- return addr - (uint64_t) mod->module_init < mod->init_size;
5022+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5023+}
5024+
5025+static inline int
5026+in_core_rx (const struct module *mod, uint64_t addr)
5027+{
5028+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5029+}
5030+
5031+static inline int
5032+in_core_rw (const struct module *mod, uint64_t addr)
5033+{
5034+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5035 }
5036
5037 static inline int
5038 in_core (const struct module *mod, uint64_t addr)
5039 {
5040- return addr - (uint64_t) mod->module_core < mod->core_size;
5041+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5042 }
5043
5044 static inline int
5045@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5046 break;
5047
5048 case RV_BDREL:
5049- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5050+ if (in_init_rx(mod, val))
5051+ val -= (uint64_t) mod->module_init_rx;
5052+ else if (in_init_rw(mod, val))
5053+ val -= (uint64_t) mod->module_init_rw;
5054+ else if (in_core_rx(mod, val))
5055+ val -= (uint64_t) mod->module_core_rx;
5056+ else if (in_core_rw(mod, val))
5057+ val -= (uint64_t) mod->module_core_rw;
5058 break;
5059
5060 case RV_LTV:
5061@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5062 * addresses have been selected...
5063 */
5064 uint64_t gp;
5065- if (mod->core_size > MAX_LTOFF)
5066+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5067 /*
5068 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5069 * at the end of the module.
5070 */
5071- gp = mod->core_size - MAX_LTOFF / 2;
5072+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5073 else
5074- gp = mod->core_size / 2;
5075- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5076+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5077+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5078 mod->arch.gp = gp;
5079 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5080 }
5081diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5082index 2b3c2d7..a318d84 100644
5083--- a/arch/ia64/kernel/palinfo.c
5084+++ b/arch/ia64/kernel/palinfo.c
5085@@ -980,7 +980,7 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
5086 return NOTIFY_OK;
5087 }
5088
5089-static struct notifier_block __refdata palinfo_cpu_notifier =
5090+static struct notifier_block palinfo_cpu_notifier =
5091 {
5092 .notifier_call = palinfo_cpu_callback,
5093 .priority = 0,
5094diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
5095index 4bc580a..7767f24 100644
5096--- a/arch/ia64/kernel/salinfo.c
5097+++ b/arch/ia64/kernel/salinfo.c
5098@@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
5099 return NOTIFY_OK;
5100 }
5101
5102-static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
5103+static struct notifier_block salinfo_cpu_notifier =
5104 {
5105 .notifier_call = salinfo_cpu_callback,
5106 .priority = 0,
5107diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5108index 41e33f8..65180b2 100644
5109--- a/arch/ia64/kernel/sys_ia64.c
5110+++ b/arch/ia64/kernel/sys_ia64.c
5111@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5112 unsigned long align_mask = 0;
5113 struct mm_struct *mm = current->mm;
5114 struct vm_unmapped_area_info info;
5115+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5116
5117 if (len > RGN_MAP_LIMIT)
5118 return -ENOMEM;
5119@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5120 if (REGION_NUMBER(addr) == RGN_HPAGE)
5121 addr = 0;
5122 #endif
5123+
5124+#ifdef CONFIG_PAX_RANDMMAP
5125+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5126+ addr = mm->free_area_cache;
5127+ else
5128+#endif
5129+
5130 if (!addr)
5131 addr = TASK_UNMAPPED_BASE;
5132
5133@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5134 info.high_limit = TASK_SIZE;
5135 info.align_mask = align_mask;
5136 info.align_offset = 0;
5137+ info.threadstack_offset = offset;
5138 return vm_unmapped_area(&info);
5139 }
5140
5141diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
5142index dc00b2c..cce53c2 100644
5143--- a/arch/ia64/kernel/topology.c
5144+++ b/arch/ia64/kernel/topology.c
5145@@ -445,7 +445,7 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,
5146 return NOTIFY_OK;
5147 }
5148
5149-static struct notifier_block __cpuinitdata cache_cpu_notifier =
5150+static struct notifier_block cache_cpu_notifier =
5151 {
5152 .notifier_call = cache_cpu_callback
5153 };
5154diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5155index 0ccb28f..8992469 100644
5156--- a/arch/ia64/kernel/vmlinux.lds.S
5157+++ b/arch/ia64/kernel/vmlinux.lds.S
5158@@ -198,7 +198,7 @@ SECTIONS {
5159 /* Per-cpu data: */
5160 . = ALIGN(PERCPU_PAGE_SIZE);
5161 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5162- __phys_per_cpu_start = __per_cpu_load;
5163+ __phys_per_cpu_start = per_cpu_load;
5164 /*
5165 * ensure percpu data fits
5166 * into percpu page size
5167diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5168index 6cf0341..d352594 100644
5169--- a/arch/ia64/mm/fault.c
5170+++ b/arch/ia64/mm/fault.c
5171@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5172 return pte_present(pte);
5173 }
5174
5175+#ifdef CONFIG_PAX_PAGEEXEC
5176+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5177+{
5178+ unsigned long i;
5179+
5180+ printk(KERN_ERR "PAX: bytes at PC: ");
5181+ for (i = 0; i < 8; i++) {
5182+ unsigned int c;
5183+ if (get_user(c, (unsigned int *)pc+i))
5184+ printk(KERN_CONT "???????? ");
5185+ else
5186+ printk(KERN_CONT "%08x ", c);
5187+ }
5188+ printk("\n");
5189+}
5190+#endif
5191+
5192 # define VM_READ_BIT 0
5193 # define VM_WRITE_BIT 1
5194 # define VM_EXEC_BIT 2
5195@@ -149,8 +166,21 @@ retry:
5196 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5197 goto bad_area;
5198
5199- if ((vma->vm_flags & mask) != mask)
5200+ if ((vma->vm_flags & mask) != mask) {
5201+
5202+#ifdef CONFIG_PAX_PAGEEXEC
5203+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5204+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5205+ goto bad_area;
5206+
5207+ up_read(&mm->mmap_sem);
5208+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5209+ do_group_exit(SIGKILL);
5210+ }
5211+#endif
5212+
5213 goto bad_area;
5214+ }
5215
5216 /*
5217 * If for any reason at all we couldn't handle the fault, make
5218diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5219index 76069c1..c2aa816 100644
5220--- a/arch/ia64/mm/hugetlbpage.c
5221+++ b/arch/ia64/mm/hugetlbpage.c
5222@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5223 unsigned long pgoff, unsigned long flags)
5224 {
5225 struct vm_unmapped_area_info info;
5226+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5227
5228 if (len > RGN_MAP_LIMIT)
5229 return -ENOMEM;
5230@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5231 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5232 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5233 info.align_offset = 0;
5234+ info.threadstack_offset = offset;
5235 return vm_unmapped_area(&info);
5236 }
5237
5238diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5239index d1fe4b4..2628f37 100644
5240--- a/arch/ia64/mm/init.c
5241+++ b/arch/ia64/mm/init.c
5242@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5243 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5244 vma->vm_end = vma->vm_start + PAGE_SIZE;
5245 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5246+
5247+#ifdef CONFIG_PAX_PAGEEXEC
5248+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5249+ vma->vm_flags &= ~VM_EXEC;
5250+
5251+#ifdef CONFIG_PAX_MPROTECT
5252+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5253+ vma->vm_flags &= ~VM_MAYEXEC;
5254+#endif
5255+
5256+ }
5257+#endif
5258+
5259 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5260 down_write(&current->mm->mmap_sem);
5261 if (insert_vm_struct(current->mm, vma)) {
5262diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5263index 40b3ee9..8c2c112 100644
5264--- a/arch/m32r/include/asm/cache.h
5265+++ b/arch/m32r/include/asm/cache.h
5266@@ -1,8 +1,10 @@
5267 #ifndef _ASM_M32R_CACHE_H
5268 #define _ASM_M32R_CACHE_H
5269
5270+#include <linux/const.h>
5271+
5272 /* L1 cache line size */
5273 #define L1_CACHE_SHIFT 4
5274-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5275+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5276
5277 #endif /* _ASM_M32R_CACHE_H */
5278diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5279index 82abd15..d95ae5d 100644
5280--- a/arch/m32r/lib/usercopy.c
5281+++ b/arch/m32r/lib/usercopy.c
5282@@ -14,6 +14,9 @@
5283 unsigned long
5284 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5285 {
5286+ if ((long)n < 0)
5287+ return n;
5288+
5289 prefetch(from);
5290 if (access_ok(VERIFY_WRITE, to, n))
5291 __copy_user(to,from,n);
5292@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5293 unsigned long
5294 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5295 {
5296+ if ((long)n < 0)
5297+ return n;
5298+
5299 prefetchw(to);
5300 if (access_ok(VERIFY_READ, from, n))
5301 __copy_user_zeroing(to,from,n);
5302diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5303index 0395c51..5f26031 100644
5304--- a/arch/m68k/include/asm/cache.h
5305+++ b/arch/m68k/include/asm/cache.h
5306@@ -4,9 +4,11 @@
5307 #ifndef __ARCH_M68K_CACHE_H
5308 #define __ARCH_M68K_CACHE_H
5309
5310+#include <linux/const.h>
5311+
5312 /* bytes per L1 cache line */
5313 #define L1_CACHE_SHIFT 4
5314-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5315+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5316
5317 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5318
5319diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5320index 3c52fa6..11b2ad8 100644
5321--- a/arch/metag/mm/hugetlbpage.c
5322+++ b/arch/metag/mm/hugetlbpage.c
5323@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5324 info.high_limit = TASK_SIZE;
5325 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5326 info.align_offset = 0;
5327+ info.threadstack_offset = 0;
5328 return vm_unmapped_area(&info);
5329 }
5330
5331diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5332index 4efe96a..60e8699 100644
5333--- a/arch/microblaze/include/asm/cache.h
5334+++ b/arch/microblaze/include/asm/cache.h
5335@@ -13,11 +13,12 @@
5336 #ifndef _ASM_MICROBLAZE_CACHE_H
5337 #define _ASM_MICROBLAZE_CACHE_H
5338
5339+#include <linux/const.h>
5340 #include <asm/registers.h>
5341
5342 #define L1_CACHE_SHIFT 5
5343 /* word-granular cache in microblaze */
5344-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5345+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5346
5347 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5348
5349diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5350index 08b6079..eb272cf 100644
5351--- a/arch/mips/include/asm/atomic.h
5352+++ b/arch/mips/include/asm/atomic.h
5353@@ -21,6 +21,10 @@
5354 #include <asm/cmpxchg.h>
5355 #include <asm/war.h>
5356
5357+#ifdef CONFIG_GENERIC_ATOMIC64
5358+#include <asm-generic/atomic64.h>
5359+#endif
5360+
5361 #define ATOMIC_INIT(i) { (i) }
5362
5363 /*
5364@@ -759,6 +763,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
5365 */
5366 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
5367
5368+#define atomic64_read_unchecked(v) atomic64_read(v)
5369+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5370+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5371+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5372+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5373+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5374+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5375+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5376+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5377+
5378 #endif /* CONFIG_64BIT */
5379
5380 /*
5381diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
5382index b4db69f..8f3b093 100644
5383--- a/arch/mips/include/asm/cache.h
5384+++ b/arch/mips/include/asm/cache.h
5385@@ -9,10 +9,11 @@
5386 #ifndef _ASM_CACHE_H
5387 #define _ASM_CACHE_H
5388
5389+#include <linux/const.h>
5390 #include <kmalloc.h>
5391
5392 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
5393-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5394+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5395
5396 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5397 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5398diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
5399index cf3ae24..238d22f 100644
5400--- a/arch/mips/include/asm/elf.h
5401+++ b/arch/mips/include/asm/elf.h
5402@@ -372,13 +372,16 @@ extern const char *__elf_platform;
5403 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
5404 #endif
5405
5406+#ifdef CONFIG_PAX_ASLR
5407+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
5408+
5409+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
5410+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
5411+#endif
5412+
5413 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
5414 struct linux_binprm;
5415 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
5416 int uses_interp);
5417
5418-struct mm_struct;
5419-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
5420-#define arch_randomize_brk arch_randomize_brk
5421-
5422 #endif /* _ASM_ELF_H */
5423diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
5424index c1f6afa..38cc6e9 100644
5425--- a/arch/mips/include/asm/exec.h
5426+++ b/arch/mips/include/asm/exec.h
5427@@ -12,6 +12,6 @@
5428 #ifndef _ASM_EXEC_H
5429 #define _ASM_EXEC_H
5430
5431-extern unsigned long arch_align_stack(unsigned long sp);
5432+#define arch_align_stack(x) ((x) & ~0xfUL)
5433
5434 #endif /* _ASM_EXEC_H */
5435diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
5436index d44622c..64990d2 100644
5437--- a/arch/mips/include/asm/local.h
5438+++ b/arch/mips/include/asm/local.h
5439@@ -12,15 +12,25 @@ typedef struct
5440 atomic_long_t a;
5441 } local_t;
5442
5443+typedef struct {
5444+ atomic_long_unchecked_t a;
5445+} local_unchecked_t;
5446+
5447 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
5448
5449 #define local_read(l) atomic_long_read(&(l)->a)
5450+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
5451 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
5452+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
5453
5454 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
5455+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
5456 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
5457+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
5458 #define local_inc(l) atomic_long_inc(&(l)->a)
5459+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
5460 #define local_dec(l) atomic_long_dec(&(l)->a)
5461+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
5462
5463 /*
5464 * Same as above, but return the result value
5465@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
5466 return result;
5467 }
5468
5469+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
5470+{
5471+ unsigned long result;
5472+
5473+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5474+ unsigned long temp;
5475+
5476+ __asm__ __volatile__(
5477+ " .set mips3 \n"
5478+ "1:" __LL "%1, %2 # local_add_return \n"
5479+ " addu %0, %1, %3 \n"
5480+ __SC "%0, %2 \n"
5481+ " beqzl %0, 1b \n"
5482+ " addu %0, %1, %3 \n"
5483+ " .set mips0 \n"
5484+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
5485+ : "Ir" (i), "m" (l->a.counter)
5486+ : "memory");
5487+ } else if (kernel_uses_llsc) {
5488+ unsigned long temp;
5489+
5490+ __asm__ __volatile__(
5491+ " .set mips3 \n"
5492+ "1:" __LL "%1, %2 # local_add_return \n"
5493+ " addu %0, %1, %3 \n"
5494+ __SC "%0, %2 \n"
5495+ " beqz %0, 1b \n"
5496+ " addu %0, %1, %3 \n"
5497+ " .set mips0 \n"
5498+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
5499+ : "Ir" (i), "m" (l->a.counter)
5500+ : "memory");
5501+ } else {
5502+ unsigned long flags;
5503+
5504+ local_irq_save(flags);
5505+ result = l->a.counter;
5506+ result += i;
5507+ l->a.counter = result;
5508+ local_irq_restore(flags);
5509+ }
5510+
5511+ return result;
5512+}
5513+
5514 static __inline__ long local_sub_return(long i, local_t * l)
5515 {
5516 unsigned long result;
5517@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
5518
5519 #define local_cmpxchg(l, o, n) \
5520 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
5521+#define local_cmpxchg_unchecked(l, o, n) \
5522+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
5523 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
5524
5525 /**
5526diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
5527index f59552f..3abe9b9 100644
5528--- a/arch/mips/include/asm/page.h
5529+++ b/arch/mips/include/asm/page.h
5530@@ -95,7 +95,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
5531 #ifdef CONFIG_CPU_MIPS32
5532 typedef struct { unsigned long pte_low, pte_high; } pte_t;
5533 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
5534- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
5535+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
5536 #else
5537 typedef struct { unsigned long long pte; } pte_t;
5538 #define pte_val(x) ((x).pte)
5539diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
5540index 881d18b..cea38bc 100644
5541--- a/arch/mips/include/asm/pgalloc.h
5542+++ b/arch/mips/include/asm/pgalloc.h
5543@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
5544 {
5545 set_pud(pud, __pud((unsigned long)pmd));
5546 }
5547+
5548+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
5549+{
5550+ pud_populate(mm, pud, pmd);
5551+}
5552 #endif
5553
5554 /*
5555diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
5556index 895320e..bf63e10 100644
5557--- a/arch/mips/include/asm/thread_info.h
5558+++ b/arch/mips/include/asm/thread_info.h
5559@@ -115,6 +115,8 @@ static inline struct thread_info *current_thread_info(void)
5560 #define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */
5561 #define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */
5562 #define TIF_LOAD_WATCH 25 /* If set, load watch registers */
5563+/* li takes a 32bit immediate */
5564+#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
5565 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */
5566
5567 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
5568@@ -130,15 +132,18 @@ static inline struct thread_info *current_thread_info(void)
5569 #define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR)
5570 #define _TIF_FPUBOUND (1<<TIF_FPUBOUND)
5571 #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
5572+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
5573+
5574+#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
5575
5576 /* work to do in syscall_trace_leave() */
5577-#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
5578+#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
5579
5580 /* work to do on interrupt/exception return */
5581 #define _TIF_WORK_MASK \
5582 (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
5583 /* work to do on any return to u-space */
5584-#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT)
5585+#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
5586
5587 #endif /* __KERNEL__ */
5588
5589diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
5590index 1188e00..41cf144 100644
5591--- a/arch/mips/kernel/binfmt_elfn32.c
5592+++ b/arch/mips/kernel/binfmt_elfn32.c
5593@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
5594 #undef ELF_ET_DYN_BASE
5595 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
5596
5597+#ifdef CONFIG_PAX_ASLR
5598+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
5599+
5600+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
5601+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
5602+#endif
5603+
5604 #include <asm/processor.h>
5605 #include <linux/module.h>
5606 #include <linux/elfcore.h>
5607diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
5608index 202e581..689ca79 100644
5609--- a/arch/mips/kernel/binfmt_elfo32.c
5610+++ b/arch/mips/kernel/binfmt_elfo32.c
5611@@ -56,6 +56,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
5612 #undef ELF_ET_DYN_BASE
5613 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
5614
5615+#ifdef CONFIG_PAX_ASLR
5616+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
5617+
5618+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
5619+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
5620+#endif
5621+
5622 #include <asm/processor.h>
5623
5624 /*
5625diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
5626index c6a041d..b3e7318 100644
5627--- a/arch/mips/kernel/process.c
5628+++ b/arch/mips/kernel/process.c
5629@@ -563,15 +563,3 @@ unsigned long get_wchan(struct task_struct *task)
5630 out:
5631 return pc;
5632 }
5633-
5634-/*
5635- * Don't forget that the stack pointer must be aligned on a 8 bytes
5636- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
5637- */
5638-unsigned long arch_align_stack(unsigned long sp)
5639-{
5640- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
5641- sp -= get_random_int() & ~PAGE_MASK;
5642-
5643- return sp & ALMASK;
5644-}
5645diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
5646index 9c6299c..2fb4c22 100644
5647--- a/arch/mips/kernel/ptrace.c
5648+++ b/arch/mips/kernel/ptrace.c
5649@@ -528,6 +528,10 @@ static inline int audit_arch(void)
5650 return arch;
5651 }
5652
5653+#ifdef CONFIG_GRKERNSEC_SETXID
5654+extern void gr_delayed_cred_worker(void);
5655+#endif
5656+
5657 /*
5658 * Notification of system call entry/exit
5659 * - triggered by current->work.syscall_trace
5660@@ -537,6 +541,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
5661 /* do the secure computing check first */
5662 secure_computing_strict(regs->regs[2]);
5663
5664+#ifdef CONFIG_GRKERNSEC_SETXID
5665+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
5666+ gr_delayed_cred_worker();
5667+#endif
5668+
5669 if (!(current->ptrace & PT_PTRACED))
5670 goto out;
5671
5672diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
5673index 9b36424..e7f4154 100644
5674--- a/arch/mips/kernel/scall32-o32.S
5675+++ b/arch/mips/kernel/scall32-o32.S
5676@@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp)
5677
5678 stack_done:
5679 lw t0, TI_FLAGS($28) # syscall tracing enabled?
5680- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
5681+ li t1, _TIF_SYSCALL_WORK
5682 and t0, t1
5683 bnez t0, syscall_trace_entry # -> yes
5684
5685diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
5686index 97a5909..59622f8 100644
5687--- a/arch/mips/kernel/scall64-64.S
5688+++ b/arch/mips/kernel/scall64-64.S
5689@@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
5690
5691 sd a3, PT_R26(sp) # save a3 for syscall restarting
5692
5693- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
5694+ li t1, _TIF_SYSCALL_WORK
5695 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
5696 and t0, t1, t0
5697 bnez t0, syscall_trace_entry
5698diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
5699index edcb659..fb2ab09 100644
5700--- a/arch/mips/kernel/scall64-n32.S
5701+++ b/arch/mips/kernel/scall64-n32.S
5702@@ -47,7 +47,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
5703
5704 sd a3, PT_R26(sp) # save a3 for syscall restarting
5705
5706- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
5707+ li t1, _TIF_SYSCALL_WORK
5708 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
5709 and t0, t1, t0
5710 bnez t0, n32_syscall_trace_entry
5711diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
5712index 74f485d..47d2c38 100644
5713--- a/arch/mips/kernel/scall64-o32.S
5714+++ b/arch/mips/kernel/scall64-o32.S
5715@@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp)
5716 PTR 4b, bad_stack
5717 .previous
5718
5719- li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
5720+ li t1, _TIF_SYSCALL_WORK
5721 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
5722 and t0, t1, t0
5723 bnez t0, trace_a_syscall
5724diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
5725index 0fead53..eeb00a6 100644
5726--- a/arch/mips/mm/fault.c
5727+++ b/arch/mips/mm/fault.c
5728@@ -27,6 +27,23 @@
5729 #include <asm/highmem.h> /* For VMALLOC_END */
5730 #include <linux/kdebug.h>
5731
5732+#ifdef CONFIG_PAX_PAGEEXEC
5733+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5734+{
5735+ unsigned long i;
5736+
5737+ printk(KERN_ERR "PAX: bytes at PC: ");
5738+ for (i = 0; i < 5; i++) {
5739+ unsigned int c;
5740+ if (get_user(c, (unsigned int *)pc+i))
5741+ printk(KERN_CONT "???????? ");
5742+ else
5743+ printk(KERN_CONT "%08x ", c);
5744+ }
5745+ printk("\n");
5746+}
5747+#endif
5748+
5749 /*
5750 * This routine handles page faults. It determines the address,
5751 * and the problem, and then passes it off to one of the appropriate
5752@@ -196,6 +213,14 @@ bad_area:
5753 bad_area_nosemaphore:
5754 /* User mode accesses just cause a SIGSEGV */
5755 if (user_mode(regs)) {
5756+
5757+#ifdef CONFIG_PAX_PAGEEXEC
5758+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
5759+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
5760+ do_group_exit(SIGKILL);
5761+ }
5762+#endif
5763+
5764 tsk->thread.cp0_badvaddr = address;
5765 tsk->thread.error_code = write;
5766 #if 0
5767diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
5768index 7e5fe27..9656513 100644
5769--- a/arch/mips/mm/mmap.c
5770+++ b/arch/mips/mm/mmap.c
5771@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
5772 struct vm_area_struct *vma;
5773 unsigned long addr = addr0;
5774 int do_color_align;
5775+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5776 struct vm_unmapped_area_info info;
5777
5778 if (unlikely(len > TASK_SIZE))
5779@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
5780 do_color_align = 1;
5781
5782 /* requesting a specific address */
5783+
5784+#ifdef CONFIG_PAX_RANDMMAP
5785+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
5786+#endif
5787+
5788 if (addr) {
5789 if (do_color_align)
5790 addr = COLOUR_ALIGN(addr, pgoff);
5791@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
5792 addr = PAGE_ALIGN(addr);
5793
5794 vma = find_vma(mm, addr);
5795- if (TASK_SIZE - len >= addr &&
5796- (!vma || addr + len <= vma->vm_start))
5797+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len, offset))
5798 return addr;
5799 }
5800
5801 info.length = len;
5802 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
5803 info.align_offset = pgoff << PAGE_SHIFT;
5804+ info.threadstack_offset = offset;
5805
5806 if (dir == DOWN) {
5807 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
5808@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5809 {
5810 unsigned long random_factor = 0UL;
5811
5812+#ifdef CONFIG_PAX_RANDMMAP
5813+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5814+#endif
5815+
5816 if (current->flags & PF_RANDOMIZE) {
5817 random_factor = get_random_int();
5818 random_factor = random_factor << PAGE_SHIFT;
5819@@ -157,42 +167,27 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5820
5821 if (mmap_is_legacy()) {
5822 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5823+
5824+#ifdef CONFIG_PAX_RANDMMAP
5825+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5826+ mm->mmap_base += mm->delta_mmap;
5827+#endif
5828+
5829 mm->get_unmapped_area = arch_get_unmapped_area;
5830 mm->unmap_area = arch_unmap_area;
5831 } else {
5832 mm->mmap_base = mmap_base(random_factor);
5833+
5834+#ifdef CONFIG_PAX_RANDMMAP
5835+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5836+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5837+#endif
5838+
5839 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5840 mm->unmap_area = arch_unmap_area_topdown;
5841 }
5842 }
5843
5844-static inline unsigned long brk_rnd(void)
5845-{
5846- unsigned long rnd = get_random_int();
5847-
5848- rnd = rnd << PAGE_SHIFT;
5849- /* 8MB for 32bit, 256MB for 64bit */
5850- if (TASK_IS_32BIT_ADDR)
5851- rnd = rnd & 0x7ffffful;
5852- else
5853- rnd = rnd & 0xffffffful;
5854-
5855- return rnd;
5856-}
5857-
5858-unsigned long arch_randomize_brk(struct mm_struct *mm)
5859-{
5860- unsigned long base = mm->brk;
5861- unsigned long ret;
5862-
5863- ret = PAGE_ALIGN(base + brk_rnd());
5864-
5865- if (ret < mm->brk)
5866- return mm->brk;
5867-
5868- return ret;
5869-}
5870-
5871 int __virt_addr_valid(const volatile void *kaddr)
5872 {
5873 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
5874diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
5875index 967d144..db12197 100644
5876--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
5877+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
5878@@ -11,12 +11,14 @@
5879 #ifndef _ASM_PROC_CACHE_H
5880 #define _ASM_PROC_CACHE_H
5881
5882+#include <linux/const.h>
5883+
5884 /* L1 cache */
5885
5886 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
5887 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
5888-#define L1_CACHE_BYTES 16 /* bytes per entry */
5889 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
5890+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
5891 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
5892
5893 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
5894diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
5895index bcb5df2..84fabd2 100644
5896--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
5897+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
5898@@ -16,13 +16,15 @@
5899 #ifndef _ASM_PROC_CACHE_H
5900 #define _ASM_PROC_CACHE_H
5901
5902+#include <linux/const.h>
5903+
5904 /*
5905 * L1 cache
5906 */
5907 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
5908 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
5909-#define L1_CACHE_BYTES 32 /* bytes per entry */
5910 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
5911+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
5912 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
5913
5914 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
5915diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
5916index 4ce7a01..449202a 100644
5917--- a/arch/openrisc/include/asm/cache.h
5918+++ b/arch/openrisc/include/asm/cache.h
5919@@ -19,11 +19,13 @@
5920 #ifndef __ASM_OPENRISC_CACHE_H
5921 #define __ASM_OPENRISC_CACHE_H
5922
5923+#include <linux/const.h>
5924+
5925 /* FIXME: How can we replace these with values from the CPU...
5926 * they shouldn't be hard-coded!
5927 */
5928
5929-#define L1_CACHE_BYTES 16
5930 #define L1_CACHE_SHIFT 4
5931+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5932
5933 #endif /* __ASM_OPENRISC_CACHE_H */
5934diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
5935index 472886c..00e7df9 100644
5936--- a/arch/parisc/include/asm/atomic.h
5937+++ b/arch/parisc/include/asm/atomic.h
5938@@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
5939 return dec;
5940 }
5941
5942+#define atomic64_read_unchecked(v) atomic64_read(v)
5943+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5944+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5945+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5946+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5947+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5948+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5949+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5950+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5951+
5952 #endif /* !CONFIG_64BIT */
5953
5954
5955diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
5956index 47f11c7..3420df2 100644
5957--- a/arch/parisc/include/asm/cache.h
5958+++ b/arch/parisc/include/asm/cache.h
5959@@ -5,6 +5,7 @@
5960 #ifndef __ARCH_PARISC_CACHE_H
5961 #define __ARCH_PARISC_CACHE_H
5962
5963+#include <linux/const.h>
5964
5965 /*
5966 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
5967@@ -15,13 +16,13 @@
5968 * just ruin performance.
5969 */
5970 #ifdef CONFIG_PA20
5971-#define L1_CACHE_BYTES 64
5972 #define L1_CACHE_SHIFT 6
5973 #else
5974-#define L1_CACHE_BYTES 32
5975 #define L1_CACHE_SHIFT 5
5976 #endif
5977
5978+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5979+
5980 #ifndef __ASSEMBLY__
5981
5982 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5983diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
5984index ad2b503..bdf1651 100644
5985--- a/arch/parisc/include/asm/elf.h
5986+++ b/arch/parisc/include/asm/elf.h
5987@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
5988
5989 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
5990
5991+#ifdef CONFIG_PAX_ASLR
5992+#define PAX_ELF_ET_DYN_BASE 0x10000UL
5993+
5994+#define PAX_DELTA_MMAP_LEN 16
5995+#define PAX_DELTA_STACK_LEN 16
5996+#endif
5997+
5998 /* This yields a mask that user programs can use to figure out what
5999 instruction set this CPU supports. This could be done in user space,
6000 but it's not easy, and we've already done it here. */
6001diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
6002index fc987a1..6e068ef 100644
6003--- a/arch/parisc/include/asm/pgalloc.h
6004+++ b/arch/parisc/include/asm/pgalloc.h
6005@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
6006 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
6007 }
6008
6009+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
6010+{
6011+ pgd_populate(mm, pgd, pmd);
6012+}
6013+
6014 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
6015 {
6016 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
6017@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
6018 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
6019 #define pmd_free(mm, x) do { } while (0)
6020 #define pgd_populate(mm, pmd, pte) BUG()
6021+#define pgd_populate_kernel(mm, pmd, pte) BUG()
6022
6023 #endif
6024
6025diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
6026index 1e40d7f..a3eb445 100644
6027--- a/arch/parisc/include/asm/pgtable.h
6028+++ b/arch/parisc/include/asm/pgtable.h
6029@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
6030 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
6031 #define PAGE_COPY PAGE_EXECREAD
6032 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
6033+
6034+#ifdef CONFIG_PAX_PAGEEXEC
6035+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
6036+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
6037+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
6038+#else
6039+# define PAGE_SHARED_NOEXEC PAGE_SHARED
6040+# define PAGE_COPY_NOEXEC PAGE_COPY
6041+# define PAGE_READONLY_NOEXEC PAGE_READONLY
6042+#endif
6043+
6044 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
6045 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
6046 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
6047diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
6048index e0a8235..ce2f1e1 100644
6049--- a/arch/parisc/include/asm/uaccess.h
6050+++ b/arch/parisc/include/asm/uaccess.h
6051@@ -245,10 +245,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
6052 const void __user *from,
6053 unsigned long n)
6054 {
6055- int sz = __compiletime_object_size(to);
6056+ size_t sz = __compiletime_object_size(to);
6057 int ret = -EFAULT;
6058
6059- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
6060+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
6061 ret = __copy_from_user(to, from, n);
6062 else
6063 copy_from_user_overflow();
6064diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
6065index 2a625fb..9908930 100644
6066--- a/arch/parisc/kernel/module.c
6067+++ b/arch/parisc/kernel/module.c
6068@@ -98,16 +98,38 @@
6069
6070 /* three functions to determine where in the module core
6071 * or init pieces the location is */
6072+static inline int in_init_rx(struct module *me, void *loc)
6073+{
6074+ return (loc >= me->module_init_rx &&
6075+ loc < (me->module_init_rx + me->init_size_rx));
6076+}
6077+
6078+static inline int in_init_rw(struct module *me, void *loc)
6079+{
6080+ return (loc >= me->module_init_rw &&
6081+ loc < (me->module_init_rw + me->init_size_rw));
6082+}
6083+
6084 static inline int in_init(struct module *me, void *loc)
6085 {
6086- return (loc >= me->module_init &&
6087- loc <= (me->module_init + me->init_size));
6088+ return in_init_rx(me, loc) || in_init_rw(me, loc);
6089+}
6090+
6091+static inline int in_core_rx(struct module *me, void *loc)
6092+{
6093+ return (loc >= me->module_core_rx &&
6094+ loc < (me->module_core_rx + me->core_size_rx));
6095+}
6096+
6097+static inline int in_core_rw(struct module *me, void *loc)
6098+{
6099+ return (loc >= me->module_core_rw &&
6100+ loc < (me->module_core_rw + me->core_size_rw));
6101 }
6102
6103 static inline int in_core(struct module *me, void *loc)
6104 {
6105- return (loc >= me->module_core &&
6106- loc <= (me->module_core + me->core_size));
6107+ return in_core_rx(me, loc) || in_core_rw(me, loc);
6108 }
6109
6110 static inline int in_local(struct module *me, void *loc)
6111@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
6112 }
6113
6114 /* align things a bit */
6115- me->core_size = ALIGN(me->core_size, 16);
6116- me->arch.got_offset = me->core_size;
6117- me->core_size += gots * sizeof(struct got_entry);
6118+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
6119+ me->arch.got_offset = me->core_size_rw;
6120+ me->core_size_rw += gots * sizeof(struct got_entry);
6121
6122- me->core_size = ALIGN(me->core_size, 16);
6123- me->arch.fdesc_offset = me->core_size;
6124- me->core_size += fdescs * sizeof(Elf_Fdesc);
6125+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
6126+ me->arch.fdesc_offset = me->core_size_rw;
6127+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
6128
6129 me->arch.got_max = gots;
6130 me->arch.fdesc_max = fdescs;
6131@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
6132
6133 BUG_ON(value == 0);
6134
6135- got = me->module_core + me->arch.got_offset;
6136+ got = me->module_core_rw + me->arch.got_offset;
6137 for (i = 0; got[i].addr; i++)
6138 if (got[i].addr == value)
6139 goto out;
6140@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
6141 #ifdef CONFIG_64BIT
6142 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
6143 {
6144- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
6145+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
6146
6147 if (!value) {
6148 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
6149@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
6150
6151 /* Create new one */
6152 fdesc->addr = value;
6153- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
6154+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
6155 return (Elf_Addr)fdesc;
6156 }
6157 #endif /* CONFIG_64BIT */
6158@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
6159
6160 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
6161 end = table + sechdrs[me->arch.unwind_section].sh_size;
6162- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
6163+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
6164
6165 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
6166 me->arch.unwind_section, table, end, gp);
6167diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
6168index 5dfd248..64914ac 100644
6169--- a/arch/parisc/kernel/sys_parisc.c
6170+++ b/arch/parisc/kernel/sys_parisc.c
6171@@ -33,9 +33,11 @@
6172 #include <linux/utsname.h>
6173 #include <linux/personality.h>
6174
6175-static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
6176+static unsigned long get_unshared_area(struct file *filp, unsigned long addr, unsigned long len,
6177+ unsigned long flags)
6178 {
6179 struct vm_unmapped_area_info info;
6180+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
6181
6182 info.flags = 0;
6183 info.length = len;
6184@@ -43,6 +45,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
6185 info.high_limit = TASK_SIZE;
6186 info.align_mask = 0;
6187 info.align_offset = 0;
6188+ info.threadstack_offset = offset;
6189 return vm_unmapped_area(&info);
6190 }
6191
6192@@ -61,10 +64,11 @@ static int get_offset(struct address_space *mapping)
6193 return (unsigned long) mapping >> 8;
6194 }
6195
6196-static unsigned long get_shared_area(struct address_space *mapping,
6197- unsigned long addr, unsigned long len, unsigned long pgoff)
6198+static unsigned long get_shared_area(struct file *filp, struct address_space *mapping,
6199+ unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
6200 {
6201 struct vm_unmapped_area_info info;
6202+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
6203
6204 info.flags = 0;
6205 info.length = len;
6206@@ -72,6 +76,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
6207 info.high_limit = TASK_SIZE;
6208 info.align_mask = PAGE_MASK & (SHMLBA - 1);
6209 info.align_offset = (get_offset(mapping) + pgoff) << PAGE_SHIFT;
6210+ info.threadstack_offset = offset;
6211 return vm_unmapped_area(&info);
6212 }
6213
6214@@ -86,15 +91,22 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
6215 return -EINVAL;
6216 return addr;
6217 }
6218- if (!addr)
6219+ if (!addr) {
6220 addr = TASK_UNMAPPED_BASE;
6221
6222+#ifdef CONFIG_PAX_RANDMMAP
6223+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
6224+ addr += current->mm->delta_mmap;
6225+#endif
6226+
6227+ }
6228+
6229 if (filp) {
6230- addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
6231+ addr = get_shared_area(filp, filp->f_mapping, addr, len, pgoff, flags);
6232 } else if(flags & MAP_SHARED) {
6233- addr = get_shared_area(NULL, addr, len, pgoff);
6234+ addr = get_shared_area(filp, NULL, addr, len, pgoff, flags);
6235 } else {
6236- addr = get_unshared_area(addr, len);
6237+ addr = get_unshared_area(filp, addr, len, flags);
6238 }
6239 return addr;
6240 }
6241diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
6242index 04e47c6..7a8faf6 100644
6243--- a/arch/parisc/kernel/traps.c
6244+++ b/arch/parisc/kernel/traps.c
6245@@ -727,9 +727,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
6246
6247 down_read(&current->mm->mmap_sem);
6248 vma = find_vma(current->mm,regs->iaoq[0]);
6249- if (vma && (regs->iaoq[0] >= vma->vm_start)
6250- && (vma->vm_flags & VM_EXEC)) {
6251-
6252+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
6253 fault_address = regs->iaoq[0];
6254 fault_space = regs->iasq[0];
6255
6256diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
6257index f247a34..dc0f219 100644
6258--- a/arch/parisc/mm/fault.c
6259+++ b/arch/parisc/mm/fault.c
6260@@ -15,6 +15,7 @@
6261 #include <linux/sched.h>
6262 #include <linux/interrupt.h>
6263 #include <linux/module.h>
6264+#include <linux/unistd.h>
6265
6266 #include <asm/uaccess.h>
6267 #include <asm/traps.h>
6268@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
6269 static unsigned long
6270 parisc_acctyp(unsigned long code, unsigned int inst)
6271 {
6272- if (code == 6 || code == 16)
6273+ if (code == 6 || code == 7 || code == 16)
6274 return VM_EXEC;
6275
6276 switch (inst & 0xf0000000) {
6277@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
6278 }
6279 #endif
6280
6281+#ifdef CONFIG_PAX_PAGEEXEC
6282+/*
6283+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
6284+ *
6285+ * returns 1 when task should be killed
6286+ * 2 when rt_sigreturn trampoline was detected
6287+ * 3 when unpatched PLT trampoline was detected
6288+ */
6289+static int pax_handle_fetch_fault(struct pt_regs *regs)
6290+{
6291+
6292+#ifdef CONFIG_PAX_EMUPLT
6293+ int err;
6294+
6295+ do { /* PaX: unpatched PLT emulation */
6296+ unsigned int bl, depwi;
6297+
6298+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
6299+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
6300+
6301+ if (err)
6302+ break;
6303+
6304+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
6305+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
6306+
6307+ err = get_user(ldw, (unsigned int *)addr);
6308+ err |= get_user(bv, (unsigned int *)(addr+4));
6309+ err |= get_user(ldw2, (unsigned int *)(addr+8));
6310+
6311+ if (err)
6312+ break;
6313+
6314+ if (ldw == 0x0E801096U &&
6315+ bv == 0xEAC0C000U &&
6316+ ldw2 == 0x0E881095U)
6317+ {
6318+ unsigned int resolver, map;
6319+
6320+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
6321+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
6322+ if (err)
6323+ break;
6324+
6325+ regs->gr[20] = instruction_pointer(regs)+8;
6326+ regs->gr[21] = map;
6327+ regs->gr[22] = resolver;
6328+ regs->iaoq[0] = resolver | 3UL;
6329+ regs->iaoq[1] = regs->iaoq[0] + 4;
6330+ return 3;
6331+ }
6332+ }
6333+ } while (0);
6334+#endif
6335+
6336+#ifdef CONFIG_PAX_EMUTRAMP
6337+
6338+#ifndef CONFIG_PAX_EMUSIGRT
6339+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
6340+ return 1;
6341+#endif
6342+
6343+ do { /* PaX: rt_sigreturn emulation */
6344+ unsigned int ldi1, ldi2, bel, nop;
6345+
6346+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
6347+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
6348+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
6349+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
6350+
6351+ if (err)
6352+ break;
6353+
6354+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
6355+ ldi2 == 0x3414015AU &&
6356+ bel == 0xE4008200U &&
6357+ nop == 0x08000240U)
6358+ {
6359+ regs->gr[25] = (ldi1 & 2) >> 1;
6360+ regs->gr[20] = __NR_rt_sigreturn;
6361+ regs->gr[31] = regs->iaoq[1] + 16;
6362+ regs->sr[0] = regs->iasq[1];
6363+ regs->iaoq[0] = 0x100UL;
6364+ regs->iaoq[1] = regs->iaoq[0] + 4;
6365+ regs->iasq[0] = regs->sr[2];
6366+ regs->iasq[1] = regs->sr[2];
6367+ return 2;
6368+ }
6369+ } while (0);
6370+#endif
6371+
6372+ return 1;
6373+}
6374+
6375+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6376+{
6377+ unsigned long i;
6378+
6379+ printk(KERN_ERR "PAX: bytes at PC: ");
6380+ for (i = 0; i < 5; i++) {
6381+ unsigned int c;
6382+ if (get_user(c, (unsigned int *)pc+i))
6383+ printk(KERN_CONT "???????? ");
6384+ else
6385+ printk(KERN_CONT "%08x ", c);
6386+ }
6387+ printk("\n");
6388+}
6389+#endif
6390+
6391 int fixup_exception(struct pt_regs *regs)
6392 {
6393 const struct exception_table_entry *fix;
6394@@ -194,8 +305,33 @@ good_area:
6395
6396 acc_type = parisc_acctyp(code,regs->iir);
6397
6398- if ((vma->vm_flags & acc_type) != acc_type)
6399+ if ((vma->vm_flags & acc_type) != acc_type) {
6400+
6401+#ifdef CONFIG_PAX_PAGEEXEC
6402+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
6403+ (address & ~3UL) == instruction_pointer(regs))
6404+ {
6405+ up_read(&mm->mmap_sem);
6406+ switch (pax_handle_fetch_fault(regs)) {
6407+
6408+#ifdef CONFIG_PAX_EMUPLT
6409+ case 3:
6410+ return;
6411+#endif
6412+
6413+#ifdef CONFIG_PAX_EMUTRAMP
6414+ case 2:
6415+ return;
6416+#endif
6417+
6418+ }
6419+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
6420+ do_group_exit(SIGKILL);
6421+ }
6422+#endif
6423+
6424 goto bad_area;
6425+ }
6426
6427 /*
6428 * If for any reason at all we couldn't handle the fault, make
6429diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
6430index e3b1d41..8e81edf 100644
6431--- a/arch/powerpc/include/asm/atomic.h
6432+++ b/arch/powerpc/include/asm/atomic.h
6433@@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
6434 return t1;
6435 }
6436
6437+#define atomic64_read_unchecked(v) atomic64_read(v)
6438+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
6439+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
6440+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
6441+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
6442+#define atomic64_inc_unchecked(v) atomic64_inc(v)
6443+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
6444+#define atomic64_dec_unchecked(v) atomic64_dec(v)
6445+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
6446+
6447 #endif /* __powerpc64__ */
6448
6449 #endif /* __KERNEL__ */
6450diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
6451index 9e495c9..b6878e5 100644
6452--- a/arch/powerpc/include/asm/cache.h
6453+++ b/arch/powerpc/include/asm/cache.h
6454@@ -3,6 +3,7 @@
6455
6456 #ifdef __KERNEL__
6457
6458+#include <linux/const.h>
6459
6460 /* bytes per L1 cache line */
6461 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
6462@@ -22,7 +23,7 @@
6463 #define L1_CACHE_SHIFT 7
6464 #endif
6465
6466-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6467+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6468
6469 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6470
6471diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
6472index cc0655a..13eac2e 100644
6473--- a/arch/powerpc/include/asm/elf.h
6474+++ b/arch/powerpc/include/asm/elf.h
6475@@ -28,8 +28,19 @@
6476 the loader. We need to make sure that it is out of the way of the program
6477 that it will "exec", and that there is sufficient room for the brk. */
6478
6479-extern unsigned long randomize_et_dyn(unsigned long base);
6480-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
6481+#define ELF_ET_DYN_BASE (0x20000000)
6482+
6483+#ifdef CONFIG_PAX_ASLR
6484+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
6485+
6486+#ifdef __powerpc64__
6487+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
6488+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
6489+#else
6490+#define PAX_DELTA_MMAP_LEN 15
6491+#define PAX_DELTA_STACK_LEN 15
6492+#endif
6493+#endif
6494
6495 /*
6496 * Our registers are always unsigned longs, whether we're a 32 bit
6497@@ -123,10 +134,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6498 (0x7ff >> (PAGE_SHIFT - 12)) : \
6499 (0x3ffff >> (PAGE_SHIFT - 12)))
6500
6501-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6502-#define arch_randomize_brk arch_randomize_brk
6503-
6504-
6505 #ifdef CONFIG_SPU_BASE
6506 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
6507 #define NT_SPU 1
6508diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
6509index 8196e9c..d83a9f3 100644
6510--- a/arch/powerpc/include/asm/exec.h
6511+++ b/arch/powerpc/include/asm/exec.h
6512@@ -4,6 +4,6 @@
6513 #ifndef _ASM_POWERPC_EXEC_H
6514 #define _ASM_POWERPC_EXEC_H
6515
6516-extern unsigned long arch_align_stack(unsigned long sp);
6517+#define arch_align_stack(x) ((x) & ~0xfUL)
6518
6519 #endif /* _ASM_POWERPC_EXEC_H */
6520diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
6521index 5acabbd..7ea14fa 100644
6522--- a/arch/powerpc/include/asm/kmap_types.h
6523+++ b/arch/powerpc/include/asm/kmap_types.h
6524@@ -10,7 +10,7 @@
6525 * 2 of the License, or (at your option) any later version.
6526 */
6527
6528-#define KM_TYPE_NR 16
6529+#define KM_TYPE_NR 17
6530
6531 #endif /* __KERNEL__ */
6532 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
6533diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
6534index 8565c25..2865190 100644
6535--- a/arch/powerpc/include/asm/mman.h
6536+++ b/arch/powerpc/include/asm/mman.h
6537@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
6538 }
6539 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
6540
6541-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
6542+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
6543 {
6544 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
6545 }
6546diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
6547index 988c812..63c7d70 100644
6548--- a/arch/powerpc/include/asm/page.h
6549+++ b/arch/powerpc/include/asm/page.h
6550@@ -220,8 +220,9 @@ extern long long virt_phys_offset;
6551 * and needs to be executable. This means the whole heap ends
6552 * up being executable.
6553 */
6554-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
6555- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
6556+#define VM_DATA_DEFAULT_FLAGS32 \
6557+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
6558+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
6559
6560 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
6561 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
6562@@ -249,6 +250,9 @@ extern long long virt_phys_offset;
6563 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
6564 #endif
6565
6566+#define ktla_ktva(addr) (addr)
6567+#define ktva_ktla(addr) (addr)
6568+
6569 #ifndef CONFIG_PPC_BOOK3S_64
6570 /*
6571 * Use the top bit of the higher-level page table entries to indicate whether
6572diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
6573index 88693ce..ac6f9ab 100644
6574--- a/arch/powerpc/include/asm/page_64.h
6575+++ b/arch/powerpc/include/asm/page_64.h
6576@@ -153,15 +153,18 @@ do { \
6577 * stack by default, so in the absence of a PT_GNU_STACK program header
6578 * we turn execute permission off.
6579 */
6580-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
6581- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
6582+#define VM_STACK_DEFAULT_FLAGS32 \
6583+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
6584+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
6585
6586 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
6587 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
6588
6589+#ifndef CONFIG_PAX_PAGEEXEC
6590 #define VM_STACK_DEFAULT_FLAGS \
6591 (is_32bit_task() ? \
6592 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
6593+#endif
6594
6595 #include <asm-generic/getorder.h>
6596
6597diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
6598index b66ae72..4a378cd 100644
6599--- a/arch/powerpc/include/asm/pgalloc-64.h
6600+++ b/arch/powerpc/include/asm/pgalloc-64.h
6601@@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
6602 #ifndef CONFIG_PPC_64K_PAGES
6603
6604 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
6605+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
6606
6607 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
6608 {
6609@@ -70,6 +71,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6610 pud_set(pud, (unsigned long)pmd);
6611 }
6612
6613+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6614+{
6615+ pud_populate(mm, pud, pmd);
6616+}
6617+
6618 #define pmd_populate(mm, pmd, pte_page) \
6619 pmd_populate_kernel(mm, pmd, page_address(pte_page))
6620 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
6621@@ -171,6 +177,7 @@ extern void __tlb_remove_table(void *_table);
6622 #endif
6623
6624 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
6625+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
6626
6627 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
6628 pte_t *pte)
6629diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
6630index 7aeb955..19f748e 100644
6631--- a/arch/powerpc/include/asm/pgtable.h
6632+++ b/arch/powerpc/include/asm/pgtable.h
6633@@ -2,6 +2,7 @@
6634 #define _ASM_POWERPC_PGTABLE_H
6635 #ifdef __KERNEL__
6636
6637+#include <linux/const.h>
6638 #ifndef __ASSEMBLY__
6639 #include <asm/processor.h> /* For TASK_SIZE */
6640 #include <asm/mmu.h>
6641diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
6642index 4aad413..85d86bf 100644
6643--- a/arch/powerpc/include/asm/pte-hash32.h
6644+++ b/arch/powerpc/include/asm/pte-hash32.h
6645@@ -21,6 +21,7 @@
6646 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
6647 #define _PAGE_USER 0x004 /* usermode access allowed */
6648 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
6649+#define _PAGE_EXEC _PAGE_GUARDED
6650 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
6651 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
6652 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
6653diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
6654index e1fb161..2290d1d 100644
6655--- a/arch/powerpc/include/asm/reg.h
6656+++ b/arch/powerpc/include/asm/reg.h
6657@@ -234,6 +234,7 @@
6658 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
6659 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
6660 #define DSISR_NOHPTE 0x40000000 /* no translation found */
6661+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
6662 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
6663 #define DSISR_ISSTORE 0x02000000 /* access was a store */
6664 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
6665diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
6666index 48cfc85..891382f 100644
6667--- a/arch/powerpc/include/asm/smp.h
6668+++ b/arch/powerpc/include/asm/smp.h
6669@@ -50,7 +50,7 @@ struct smp_ops_t {
6670 int (*cpu_disable)(void);
6671 void (*cpu_die)(unsigned int nr);
6672 int (*cpu_bootable)(unsigned int nr);
6673-};
6674+} __no_const;
6675
6676 extern void smp_send_debugger_break(void);
6677 extern void start_secondary_resume(void);
6678diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
6679index ba7b197..d292e26 100644
6680--- a/arch/powerpc/include/asm/thread_info.h
6681+++ b/arch/powerpc/include/asm/thread_info.h
6682@@ -93,7 +93,6 @@ static inline struct thread_info *current_thread_info(void)
6683 #define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
6684 TIF_NEED_RESCHED */
6685 #define TIF_32BIT 4 /* 32 bit binary */
6686-#define TIF_PERFMON_WORK 5 /* work for pfm_handle_work() */
6687 #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */
6688 #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
6689 #define TIF_SINGLESTEP 8 /* singlestepping active */
6690@@ -107,6 +106,9 @@ static inline struct thread_info *current_thread_info(void)
6691 #define TIF_EMULATE_STACK_STORE 16 /* Is an instruction emulation
6692 for stack store? */
6693 #define TIF_MEMDIE 17 /* is terminating due to OOM killer */
6694+#define TIF_PERFMON_WORK 18 /* work for pfm_handle_work() */
6695+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
6696+#define TIF_GRSEC_SETXID 5 /* update credentials on syscall entry/exit */
6697
6698 /* as above, but as bit values */
6699 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
6700@@ -126,9 +128,10 @@ static inline struct thread_info *current_thread_info(void)
6701 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6702 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
6703 #define _TIF_NOHZ (1<<TIF_NOHZ)
6704+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6705 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
6706 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
6707- _TIF_NOHZ)
6708+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
6709
6710 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
6711 _TIF_NOTIFY_RESUME | _TIF_UPROBE)
6712diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
6713index 4db4959..aba5c41 100644
6714--- a/arch/powerpc/include/asm/uaccess.h
6715+++ b/arch/powerpc/include/asm/uaccess.h
6716@@ -318,52 +318,6 @@ do { \
6717 extern unsigned long __copy_tofrom_user(void __user *to,
6718 const void __user *from, unsigned long size);
6719
6720-#ifndef __powerpc64__
6721-
6722-static inline unsigned long copy_from_user(void *to,
6723- const void __user *from, unsigned long n)
6724-{
6725- unsigned long over;
6726-
6727- if (access_ok(VERIFY_READ, from, n))
6728- return __copy_tofrom_user((__force void __user *)to, from, n);
6729- if ((unsigned long)from < TASK_SIZE) {
6730- over = (unsigned long)from + n - TASK_SIZE;
6731- return __copy_tofrom_user((__force void __user *)to, from,
6732- n - over) + over;
6733- }
6734- return n;
6735-}
6736-
6737-static inline unsigned long copy_to_user(void __user *to,
6738- const void *from, unsigned long n)
6739-{
6740- unsigned long over;
6741-
6742- if (access_ok(VERIFY_WRITE, to, n))
6743- return __copy_tofrom_user(to, (__force void __user *)from, n);
6744- if ((unsigned long)to < TASK_SIZE) {
6745- over = (unsigned long)to + n - TASK_SIZE;
6746- return __copy_tofrom_user(to, (__force void __user *)from,
6747- n - over) + over;
6748- }
6749- return n;
6750-}
6751-
6752-#else /* __powerpc64__ */
6753-
6754-#define __copy_in_user(to, from, size) \
6755- __copy_tofrom_user((to), (from), (size))
6756-
6757-extern unsigned long copy_from_user(void *to, const void __user *from,
6758- unsigned long n);
6759-extern unsigned long copy_to_user(void __user *to, const void *from,
6760- unsigned long n);
6761-extern unsigned long copy_in_user(void __user *to, const void __user *from,
6762- unsigned long n);
6763-
6764-#endif /* __powerpc64__ */
6765-
6766 static inline unsigned long __copy_from_user_inatomic(void *to,
6767 const void __user *from, unsigned long n)
6768 {
6769@@ -387,6 +341,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
6770 if (ret == 0)
6771 return 0;
6772 }
6773+
6774+ if (!__builtin_constant_p(n))
6775+ check_object_size(to, n, false);
6776+
6777 return __copy_tofrom_user((__force void __user *)to, from, n);
6778 }
6779
6780@@ -413,6 +371,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
6781 if (ret == 0)
6782 return 0;
6783 }
6784+
6785+ if (!__builtin_constant_p(n))
6786+ check_object_size(from, n, true);
6787+
6788 return __copy_tofrom_user(to, (__force const void __user *)from, n);
6789 }
6790
6791@@ -430,6 +392,92 @@ static inline unsigned long __copy_to_user(void __user *to,
6792 return __copy_to_user_inatomic(to, from, size);
6793 }
6794
6795+#ifndef __powerpc64__
6796+
6797+static inline unsigned long __must_check copy_from_user(void *to,
6798+ const void __user *from, unsigned long n)
6799+{
6800+ unsigned long over;
6801+
6802+ if ((long)n < 0)
6803+ return n;
6804+
6805+ if (access_ok(VERIFY_READ, from, n)) {
6806+ if (!__builtin_constant_p(n))
6807+ check_object_size(to, n, false);
6808+ return __copy_tofrom_user((__force void __user *)to, from, n);
6809+ }
6810+ if ((unsigned long)from < TASK_SIZE) {
6811+ over = (unsigned long)from + n - TASK_SIZE;
6812+ if (!__builtin_constant_p(n - over))
6813+ check_object_size(to, n - over, false);
6814+ return __copy_tofrom_user((__force void __user *)to, from,
6815+ n - over) + over;
6816+ }
6817+ return n;
6818+}
6819+
6820+static inline unsigned long __must_check copy_to_user(void __user *to,
6821+ const void *from, unsigned long n)
6822+{
6823+ unsigned long over;
6824+
6825+ if ((long)n < 0)
6826+ return n;
6827+
6828+ if (access_ok(VERIFY_WRITE, to, n)) {
6829+ if (!__builtin_constant_p(n))
6830+ check_object_size(from, n, true);
6831+ return __copy_tofrom_user(to, (__force void __user *)from, n);
6832+ }
6833+ if ((unsigned long)to < TASK_SIZE) {
6834+ over = (unsigned long)to + n - TASK_SIZE;
6835+ if (!__builtin_constant_p(n))
6836+ check_object_size(from, n - over, true);
6837+ return __copy_tofrom_user(to, (__force void __user *)from,
6838+ n - over) + over;
6839+ }
6840+ return n;
6841+}
6842+
6843+#else /* __powerpc64__ */
6844+
6845+#define __copy_in_user(to, from, size) \
6846+ __copy_tofrom_user((to), (from), (size))
6847+
6848+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
6849+{
6850+ if ((long)n < 0 || n > INT_MAX)
6851+ return n;
6852+
6853+ if (!__builtin_constant_p(n))
6854+ check_object_size(to, n, false);
6855+
6856+ if (likely(access_ok(VERIFY_READ, from, n)))
6857+ n = __copy_from_user(to, from, n);
6858+ else
6859+ memset(to, 0, n);
6860+ return n;
6861+}
6862+
6863+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
6864+{
6865+ if ((long)n < 0 || n > INT_MAX)
6866+ return n;
6867+
6868+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
6869+ if (!__builtin_constant_p(n))
6870+ check_object_size(from, n, true);
6871+ n = __copy_to_user(to, from, n);
6872+ }
6873+ return n;
6874+}
6875+
6876+extern unsigned long copy_in_user(void __user *to, const void __user *from,
6877+ unsigned long n);
6878+
6879+#endif /* __powerpc64__ */
6880+
6881 extern unsigned long __clear_user(void __user *addr, unsigned long size);
6882
6883 static inline unsigned long clear_user(void __user *addr, unsigned long size)
6884diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
6885index 645170a..6cf0271 100644
6886--- a/arch/powerpc/kernel/exceptions-64e.S
6887+++ b/arch/powerpc/kernel/exceptions-64e.S
6888@@ -757,6 +757,7 @@ storage_fault_common:
6889 std r14,_DAR(r1)
6890 std r15,_DSISR(r1)
6891 addi r3,r1,STACK_FRAME_OVERHEAD
6892+ bl .save_nvgprs
6893 mr r4,r14
6894 mr r5,r15
6895 ld r14,PACA_EXGEN+EX_R14(r13)
6896@@ -765,8 +766,7 @@ storage_fault_common:
6897 cmpdi r3,0
6898 bne- 1f
6899 b .ret_from_except_lite
6900-1: bl .save_nvgprs
6901- mr r5,r3
6902+1: mr r5,r3
6903 addi r3,r1,STACK_FRAME_OVERHEAD
6904 ld r4,_DAR(r1)
6905 bl .bad_page_fault
6906diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
6907index 902ca3c..e942155 100644
6908--- a/arch/powerpc/kernel/exceptions-64s.S
6909+++ b/arch/powerpc/kernel/exceptions-64s.S
6910@@ -1357,10 +1357,10 @@ handle_page_fault:
6911 11: ld r4,_DAR(r1)
6912 ld r5,_DSISR(r1)
6913 addi r3,r1,STACK_FRAME_OVERHEAD
6914+ bl .save_nvgprs
6915 bl .do_page_fault
6916 cmpdi r3,0
6917 beq+ 12f
6918- bl .save_nvgprs
6919 mr r5,r3
6920 addi r3,r1,STACK_FRAME_OVERHEAD
6921 lwz r4,_DAR(r1)
6922diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
6923index 2e3200c..72095ce 100644
6924--- a/arch/powerpc/kernel/module_32.c
6925+++ b/arch/powerpc/kernel/module_32.c
6926@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
6927 me->arch.core_plt_section = i;
6928 }
6929 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
6930- printk("Module doesn't contain .plt or .init.plt sections.\n");
6931+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
6932 return -ENOEXEC;
6933 }
6934
6935@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
6936
6937 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
6938 /* Init, or core PLT? */
6939- if (location >= mod->module_core
6940- && location < mod->module_core + mod->core_size)
6941+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
6942+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
6943 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
6944- else
6945+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
6946+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
6947 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
6948+ else {
6949+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
6950+ return ~0UL;
6951+ }
6952
6953 /* Find this entry, or if that fails, the next avail. entry */
6954 while (entry->jump[0]) {
6955diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
6956index 7baa27b..f6b394a 100644
6957--- a/arch/powerpc/kernel/process.c
6958+++ b/arch/powerpc/kernel/process.c
6959@@ -884,8 +884,8 @@ void show_regs(struct pt_regs * regs)
6960 * Lookup NIP late so we have the best change of getting the
6961 * above info out without failing
6962 */
6963- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
6964- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
6965+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
6966+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
6967 #endif
6968 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
6969 printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
6970@@ -1345,10 +1345,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
6971 newsp = stack[0];
6972 ip = stack[STACK_FRAME_LR_SAVE];
6973 if (!firstframe || ip != lr) {
6974- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
6975+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
6976 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
6977 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
6978- printk(" (%pS)",
6979+ printk(" (%pA)",
6980 (void *)current->ret_stack[curr_frame].ret);
6981 curr_frame--;
6982 }
6983@@ -1368,7 +1368,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
6984 struct pt_regs *regs = (struct pt_regs *)
6985 (sp + STACK_FRAME_OVERHEAD);
6986 lr = regs->link;
6987- printk("--- Exception: %lx at %pS\n LR = %pS\n",
6988+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
6989 regs->trap, (void *)regs->nip, (void *)lr);
6990 firstframe = 1;
6991 }
6992@@ -1404,58 +1404,3 @@ void notrace __ppc64_runlatch_off(void)
6993 mtspr(SPRN_CTRLT, ctrl);
6994 }
6995 #endif /* CONFIG_PPC64 */
6996-
6997-unsigned long arch_align_stack(unsigned long sp)
6998-{
6999- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7000- sp -= get_random_int() & ~PAGE_MASK;
7001- return sp & ~0xf;
7002-}
7003-
7004-static inline unsigned long brk_rnd(void)
7005-{
7006- unsigned long rnd = 0;
7007-
7008- /* 8MB for 32bit, 1GB for 64bit */
7009- if (is_32bit_task())
7010- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
7011- else
7012- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
7013-
7014- return rnd << PAGE_SHIFT;
7015-}
7016-
7017-unsigned long arch_randomize_brk(struct mm_struct *mm)
7018-{
7019- unsigned long base = mm->brk;
7020- unsigned long ret;
7021-
7022-#ifdef CONFIG_PPC_STD_MMU_64
7023- /*
7024- * If we are using 1TB segments and we are allowed to randomise
7025- * the heap, we can put it above 1TB so it is backed by a 1TB
7026- * segment. Otherwise the heap will be in the bottom 1TB
7027- * which always uses 256MB segments and this may result in a
7028- * performance penalty.
7029- */
7030- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
7031- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
7032-#endif
7033-
7034- ret = PAGE_ALIGN(base + brk_rnd());
7035-
7036- if (ret < mm->brk)
7037- return mm->brk;
7038-
7039- return ret;
7040-}
7041-
7042-unsigned long randomize_et_dyn(unsigned long base)
7043-{
7044- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
7045-
7046- if (ret < base)
7047- return base;
7048-
7049- return ret;
7050-}
7051diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
7052index 64f7bd5..8dd550f 100644
7053--- a/arch/powerpc/kernel/ptrace.c
7054+++ b/arch/powerpc/kernel/ptrace.c
7055@@ -1783,6 +1783,10 @@ long arch_ptrace(struct task_struct *child, long request,
7056 return ret;
7057 }
7058
7059+#ifdef CONFIG_GRKERNSEC_SETXID
7060+extern void gr_delayed_cred_worker(void);
7061+#endif
7062+
7063 /*
7064 * We must return the syscall number to actually look up in the table.
7065 * This can be -1L to skip running any syscall at all.
7066@@ -1795,6 +1799,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
7067
7068 secure_computing_strict(regs->gpr[0]);
7069
7070+#ifdef CONFIG_GRKERNSEC_SETXID
7071+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
7072+ gr_delayed_cred_worker();
7073+#endif
7074+
7075 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
7076 tracehook_report_syscall_entry(regs))
7077 /*
7078@@ -1829,6 +1838,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
7079 {
7080 int step;
7081
7082+#ifdef CONFIG_GRKERNSEC_SETXID
7083+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
7084+ gr_delayed_cred_worker();
7085+#endif
7086+
7087 audit_syscall_exit(regs);
7088
7089 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
7090diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
7091index 0f83122..c0aca6a 100644
7092--- a/arch/powerpc/kernel/signal_32.c
7093+++ b/arch/powerpc/kernel/signal_32.c
7094@@ -987,7 +987,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
7095 /* Save user registers on the stack */
7096 frame = &rt_sf->uc.uc_mcontext;
7097 addr = frame;
7098- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
7099+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
7100 sigret = 0;
7101 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
7102 } else {
7103diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
7104index 887e99d..310bc11 100644
7105--- a/arch/powerpc/kernel/signal_64.c
7106+++ b/arch/powerpc/kernel/signal_64.c
7107@@ -751,7 +751,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
7108 #endif
7109
7110 /* Set up to return from userspace. */
7111- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
7112+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
7113 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
7114 } else {
7115 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
7116diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
7117index e68a845..8b140e6 100644
7118--- a/arch/powerpc/kernel/sysfs.c
7119+++ b/arch/powerpc/kernel/sysfs.c
7120@@ -522,7 +522,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
7121 return NOTIFY_OK;
7122 }
7123
7124-static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
7125+static struct notifier_block sysfs_cpu_nb = {
7126 .notifier_call = sysfs_cpu_notify,
7127 };
7128
7129diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
7130index 88929b1..bece8f8 100644
7131--- a/arch/powerpc/kernel/traps.c
7132+++ b/arch/powerpc/kernel/traps.c
7133@@ -141,6 +141,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
7134 return flags;
7135 }
7136
7137+extern void gr_handle_kernel_exploit(void);
7138+
7139 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
7140 int signr)
7141 {
7142@@ -190,6 +192,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
7143 panic("Fatal exception in interrupt");
7144 if (panic_on_oops)
7145 panic("Fatal exception");
7146+
7147+ gr_handle_kernel_exploit();
7148+
7149 do_exit(signr);
7150 }
7151
7152diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
7153index d4f463a..8fb7431 100644
7154--- a/arch/powerpc/kernel/vdso.c
7155+++ b/arch/powerpc/kernel/vdso.c
7156@@ -34,6 +34,7 @@
7157 #include <asm/firmware.h>
7158 #include <asm/vdso.h>
7159 #include <asm/vdso_datapage.h>
7160+#include <asm/mman.h>
7161
7162 #include "setup.h"
7163
7164@@ -222,7 +223,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
7165 vdso_base = VDSO32_MBASE;
7166 #endif
7167
7168- current->mm->context.vdso_base = 0;
7169+ current->mm->context.vdso_base = ~0UL;
7170
7171 /* vDSO has a problem and was disabled, just don't "enable" it for the
7172 * process
7173@@ -242,7 +243,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
7174 vdso_base = get_unmapped_area(NULL, vdso_base,
7175 (vdso_pages << PAGE_SHIFT) +
7176 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
7177- 0, 0);
7178+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
7179 if (IS_ERR_VALUE(vdso_base)) {
7180 rc = vdso_base;
7181 goto fail_mmapsem;
7182diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
7183index 5eea6f3..5d10396 100644
7184--- a/arch/powerpc/lib/usercopy_64.c
7185+++ b/arch/powerpc/lib/usercopy_64.c
7186@@ -9,22 +9,6 @@
7187 #include <linux/module.h>
7188 #include <asm/uaccess.h>
7189
7190-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
7191-{
7192- if (likely(access_ok(VERIFY_READ, from, n)))
7193- n = __copy_from_user(to, from, n);
7194- else
7195- memset(to, 0, n);
7196- return n;
7197-}
7198-
7199-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
7200-{
7201- if (likely(access_ok(VERIFY_WRITE, to, n)))
7202- n = __copy_to_user(to, from, n);
7203- return n;
7204-}
7205-
7206 unsigned long copy_in_user(void __user *to, const void __user *from,
7207 unsigned long n)
7208 {
7209@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
7210 return n;
7211 }
7212
7213-EXPORT_SYMBOL(copy_from_user);
7214-EXPORT_SYMBOL(copy_to_user);
7215 EXPORT_SYMBOL(copy_in_user);
7216
7217diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
7218index 8726779..a33c512 100644
7219--- a/arch/powerpc/mm/fault.c
7220+++ b/arch/powerpc/mm/fault.c
7221@@ -33,6 +33,10 @@
7222 #include <linux/magic.h>
7223 #include <linux/ratelimit.h>
7224 #include <linux/context_tracking.h>
7225+#include <linux/slab.h>
7226+#include <linux/pagemap.h>
7227+#include <linux/compiler.h>
7228+#include <linux/unistd.h>
7229
7230 #include <asm/firmware.h>
7231 #include <asm/page.h>
7232@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
7233 }
7234 #endif
7235
7236+#ifdef CONFIG_PAX_PAGEEXEC
7237+/*
7238+ * PaX: decide what to do with offenders (regs->nip = fault address)
7239+ *
7240+ * returns 1 when task should be killed
7241+ */
7242+static int pax_handle_fetch_fault(struct pt_regs *regs)
7243+{
7244+ return 1;
7245+}
7246+
7247+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7248+{
7249+ unsigned long i;
7250+
7251+ printk(KERN_ERR "PAX: bytes at PC: ");
7252+ for (i = 0; i < 5; i++) {
7253+ unsigned int c;
7254+ if (get_user(c, (unsigned int __user *)pc+i))
7255+ printk(KERN_CONT "???????? ");
7256+ else
7257+ printk(KERN_CONT "%08x ", c);
7258+ }
7259+ printk("\n");
7260+}
7261+#endif
7262+
7263 /*
7264 * Check whether the instruction at regs->nip is a store using
7265 * an update addressing form which will update r1.
7266@@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
7267 * indicate errors in DSISR but can validly be set in SRR1.
7268 */
7269 if (trap == 0x400)
7270- error_code &= 0x48200000;
7271+ error_code &= 0x58200000;
7272 else
7273 is_write = error_code & DSISR_ISSTORE;
7274 #else
7275@@ -371,7 +402,7 @@ good_area:
7276 * "undefined". Of those that can be set, this is the only
7277 * one which seems bad.
7278 */
7279- if (error_code & 0x10000000)
7280+ if (error_code & DSISR_GUARDED)
7281 /* Guarded storage error. */
7282 goto bad_area;
7283 #endif /* CONFIG_8xx */
7284@@ -386,7 +417,7 @@ good_area:
7285 * processors use the same I/D cache coherency mechanism
7286 * as embedded.
7287 */
7288- if (error_code & DSISR_PROTFAULT)
7289+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
7290 goto bad_area;
7291 #endif /* CONFIG_PPC_STD_MMU */
7292
7293@@ -471,6 +502,23 @@ bad_area:
7294 bad_area_nosemaphore:
7295 /* User mode accesses cause a SIGSEGV */
7296 if (user_mode(regs)) {
7297+
7298+#ifdef CONFIG_PAX_PAGEEXEC
7299+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
7300+#ifdef CONFIG_PPC_STD_MMU
7301+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
7302+#else
7303+ if (is_exec && regs->nip == address) {
7304+#endif
7305+ switch (pax_handle_fetch_fault(regs)) {
7306+ }
7307+
7308+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
7309+ do_group_exit(SIGKILL);
7310+ }
7311+ }
7312+#endif
7313+
7314 _exception(SIGSEGV, regs, code, address);
7315 goto bail;
7316 }
7317diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
7318index 67a42ed..cd463e0 100644
7319--- a/arch/powerpc/mm/mmap_64.c
7320+++ b/arch/powerpc/mm/mmap_64.c
7321@@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void)
7322 {
7323 unsigned long rnd = 0;
7324
7325+#ifdef CONFIG_PAX_RANDMMAP
7326+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7327+#endif
7328+
7329 if (current->flags & PF_RANDOMIZE) {
7330 /* 8MB for 32bit, 1GB for 64bit */
7331 if (is_32bit_task())
7332@@ -91,10 +95,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7333 */
7334 if (mmap_is_legacy()) {
7335 mm->mmap_base = TASK_UNMAPPED_BASE;
7336+
7337+#ifdef CONFIG_PAX_RANDMMAP
7338+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7339+ mm->mmap_base += mm->delta_mmap;
7340+#endif
7341+
7342 mm->get_unmapped_area = arch_get_unmapped_area;
7343 mm->unmap_area = arch_unmap_area;
7344 } else {
7345 mm->mmap_base = mmap_base();
7346+
7347+#ifdef CONFIG_PAX_RANDMMAP
7348+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7349+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7350+#endif
7351+
7352 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7353 mm->unmap_area = arch_unmap_area_topdown;
7354 }
7355diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
7356index e779642..e5bb889 100644
7357--- a/arch/powerpc/mm/mmu_context_nohash.c
7358+++ b/arch/powerpc/mm/mmu_context_nohash.c
7359@@ -363,7 +363,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
7360 return NOTIFY_OK;
7361 }
7362
7363-static struct notifier_block __cpuinitdata mmu_context_cpu_nb = {
7364+static struct notifier_block mmu_context_cpu_nb = {
7365 .notifier_call = mmu_context_cpu_notify,
7366 };
7367
7368diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
7369index cafad40..9cbc0fc 100644
7370--- a/arch/powerpc/mm/numa.c
7371+++ b/arch/powerpc/mm/numa.c
7372@@ -920,7 +920,7 @@ static void __init *careful_zallocation(int nid, unsigned long size,
7373 return ret;
7374 }
7375
7376-static struct notifier_block __cpuinitdata ppc64_numa_nb = {
7377+static struct notifier_block ppc64_numa_nb = {
7378 .notifier_call = cpu_numa_callback,
7379 .priority = 1 /* Must run before sched domains notifier. */
7380 };
7381diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
7382index 3e99c14..f00953c 100644
7383--- a/arch/powerpc/mm/slice.c
7384+++ b/arch/powerpc/mm/slice.c
7385@@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
7386 if ((mm->task_size - len) < addr)
7387 return 0;
7388 vma = find_vma(mm, addr);
7389- return (!vma || (addr + len) <= vma->vm_start);
7390+ return check_heap_stack_gap(vma, addr, len, 0);
7391 }
7392
7393 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
7394@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
7395 info.align_offset = 0;
7396
7397 addr = TASK_UNMAPPED_BASE;
7398+
7399+#ifdef CONFIG_PAX_RANDMMAP
7400+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7401+ addr += mm->delta_mmap;
7402+#endif
7403+
7404 while (addr < TASK_SIZE) {
7405 info.low_limit = addr;
7406 if (!slice_scan_available(addr, available, 1, &addr))
7407@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
7408 if (fixed && addr > (mm->task_size - len))
7409 return -EINVAL;
7410
7411+#ifdef CONFIG_PAX_RANDMMAP
7412+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
7413+ addr = 0;
7414+#endif
7415+
7416 /* If hint, make sure it matches our alignment restrictions */
7417 if (!fixed && addr) {
7418 addr = _ALIGN_UP(addr, 1ul << pshift);
7419diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
7420index 9098692..3d54cd1 100644
7421--- a/arch/powerpc/platforms/cell/spufs/file.c
7422+++ b/arch/powerpc/platforms/cell/spufs/file.c
7423@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
7424 return VM_FAULT_NOPAGE;
7425 }
7426
7427-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
7428+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
7429 unsigned long address,
7430- void *buf, int len, int write)
7431+ void *buf, size_t len, int write)
7432 {
7433 struct spu_context *ctx = vma->vm_file->private_data;
7434 unsigned long offset = address - vma->vm_start;
7435diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
7436index bdb738a..49c9f95 100644
7437--- a/arch/powerpc/platforms/powermac/smp.c
7438+++ b/arch/powerpc/platforms/powermac/smp.c
7439@@ -885,7 +885,7 @@ static int smp_core99_cpu_notify(struct notifier_block *self,
7440 return NOTIFY_OK;
7441 }
7442
7443-static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
7444+static struct notifier_block smp_core99_cpu_nb = {
7445 .notifier_call = smp_core99_cpu_notify,
7446 };
7447 #endif /* CONFIG_HOTPLUG_CPU */
7448diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
7449index c797832..ce575c8 100644
7450--- a/arch/s390/include/asm/atomic.h
7451+++ b/arch/s390/include/asm/atomic.h
7452@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
7453 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
7454 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
7455
7456+#define atomic64_read_unchecked(v) atomic64_read(v)
7457+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7458+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7459+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7460+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7461+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7462+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7463+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7464+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7465+
7466 #define smp_mb__before_atomic_dec() smp_mb()
7467 #define smp_mb__after_atomic_dec() smp_mb()
7468 #define smp_mb__before_atomic_inc() smp_mb()
7469diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
7470index 4d7ccac..d03d0ad 100644
7471--- a/arch/s390/include/asm/cache.h
7472+++ b/arch/s390/include/asm/cache.h
7473@@ -9,8 +9,10 @@
7474 #ifndef __ARCH_S390_CACHE_H
7475 #define __ARCH_S390_CACHE_H
7476
7477-#define L1_CACHE_BYTES 256
7478+#include <linux/const.h>
7479+
7480 #define L1_CACHE_SHIFT 8
7481+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7482 #define NET_SKB_PAD 32
7483
7484 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
7485diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
7486index 78f4f87..598ce39 100644
7487--- a/arch/s390/include/asm/elf.h
7488+++ b/arch/s390/include/asm/elf.h
7489@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
7490 the loader. We need to make sure that it is out of the way of the program
7491 that it will "exec", and that there is sufficient room for the brk. */
7492
7493-extern unsigned long randomize_et_dyn(unsigned long base);
7494-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
7495+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
7496+
7497+#ifdef CONFIG_PAX_ASLR
7498+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
7499+
7500+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
7501+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
7502+#endif
7503
7504 /* This yields a mask that user programs can use to figure out what
7505 instruction set this CPU supports. */
7506@@ -222,9 +228,6 @@ struct linux_binprm;
7507 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
7508 int arch_setup_additional_pages(struct linux_binprm *, int);
7509
7510-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
7511-#define arch_randomize_brk arch_randomize_brk
7512-
7513 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
7514
7515 #endif
7516diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
7517index c4a93d6..4d2a9b4 100644
7518--- a/arch/s390/include/asm/exec.h
7519+++ b/arch/s390/include/asm/exec.h
7520@@ -7,6 +7,6 @@
7521 #ifndef __ASM_EXEC_H
7522 #define __ASM_EXEC_H
7523
7524-extern unsigned long arch_align_stack(unsigned long sp);
7525+#define arch_align_stack(x) ((x) & ~0xfUL)
7526
7527 #endif /* __ASM_EXEC_H */
7528diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
7529index 9c33ed4..e40cbef 100644
7530--- a/arch/s390/include/asm/uaccess.h
7531+++ b/arch/s390/include/asm/uaccess.h
7532@@ -252,6 +252,10 @@ static inline unsigned long __must_check
7533 copy_to_user(void __user *to, const void *from, unsigned long n)
7534 {
7535 might_fault();
7536+
7537+ if ((long)n < 0)
7538+ return n;
7539+
7540 return __copy_to_user(to, from, n);
7541 }
7542
7543@@ -275,6 +279,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
7544 static inline unsigned long __must_check
7545 __copy_from_user(void *to, const void __user *from, unsigned long n)
7546 {
7547+ if ((long)n < 0)
7548+ return n;
7549+
7550 if (__builtin_constant_p(n) && (n <= 256))
7551 return uaccess.copy_from_user_small(n, from, to);
7552 else
7553@@ -306,10 +313,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
7554 static inline unsigned long __must_check
7555 copy_from_user(void *to, const void __user *from, unsigned long n)
7556 {
7557- unsigned int sz = __compiletime_object_size(to);
7558+ size_t sz = __compiletime_object_size(to);
7559
7560 might_fault();
7561- if (unlikely(sz != -1 && sz < n)) {
7562+
7563+ if ((long)n < 0)
7564+ return n;
7565+
7566+ if (unlikely(sz != (size_t)-1 && sz < n)) {
7567 copy_from_user_overflow();
7568 return n;
7569 }
7570diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
7571index 7845e15..59c4353 100644
7572--- a/arch/s390/kernel/module.c
7573+++ b/arch/s390/kernel/module.c
7574@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
7575
7576 /* Increase core size by size of got & plt and set start
7577 offsets for got and plt. */
7578- me->core_size = ALIGN(me->core_size, 4);
7579- me->arch.got_offset = me->core_size;
7580- me->core_size += me->arch.got_size;
7581- me->arch.plt_offset = me->core_size;
7582- me->core_size += me->arch.plt_size;
7583+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
7584+ me->arch.got_offset = me->core_size_rw;
7585+ me->core_size_rw += me->arch.got_size;
7586+ me->arch.plt_offset = me->core_size_rx;
7587+ me->core_size_rx += me->arch.plt_size;
7588 return 0;
7589 }
7590
7591@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
7592 if (info->got_initialized == 0) {
7593 Elf_Addr *gotent;
7594
7595- gotent = me->module_core + me->arch.got_offset +
7596+ gotent = me->module_core_rw + me->arch.got_offset +
7597 info->got_offset;
7598 *gotent = val;
7599 info->got_initialized = 1;
7600@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
7601 rc = apply_rela_bits(loc, val, 0, 64, 0);
7602 else if (r_type == R_390_GOTENT ||
7603 r_type == R_390_GOTPLTENT) {
7604- val += (Elf_Addr) me->module_core - loc;
7605+ val += (Elf_Addr) me->module_core_rw - loc;
7606 rc = apply_rela_bits(loc, val, 1, 32, 1);
7607 }
7608 break;
7609@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
7610 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
7611 if (info->plt_initialized == 0) {
7612 unsigned int *ip;
7613- ip = me->module_core + me->arch.plt_offset +
7614+ ip = me->module_core_rx + me->arch.plt_offset +
7615 info->plt_offset;
7616 #ifndef CONFIG_64BIT
7617 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
7618@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
7619 val - loc + 0xffffUL < 0x1ffffeUL) ||
7620 (r_type == R_390_PLT32DBL &&
7621 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
7622- val = (Elf_Addr) me->module_core +
7623+ val = (Elf_Addr) me->module_core_rx +
7624 me->arch.plt_offset +
7625 info->plt_offset;
7626 val += rela->r_addend - loc;
7627@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
7628 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
7629 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
7630 val = val + rela->r_addend -
7631- ((Elf_Addr) me->module_core + me->arch.got_offset);
7632+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
7633 if (r_type == R_390_GOTOFF16)
7634 rc = apply_rela_bits(loc, val, 0, 16, 0);
7635 else if (r_type == R_390_GOTOFF32)
7636@@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
7637 break;
7638 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
7639 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
7640- val = (Elf_Addr) me->module_core + me->arch.got_offset +
7641+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
7642 rela->r_addend - loc;
7643 if (r_type == R_390_GOTPC)
7644 rc = apply_rela_bits(loc, val, 1, 32, 0);
7645diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
7646index 2bc3edd..ab9d598 100644
7647--- a/arch/s390/kernel/process.c
7648+++ b/arch/s390/kernel/process.c
7649@@ -236,39 +236,3 @@ unsigned long get_wchan(struct task_struct *p)
7650 }
7651 return 0;
7652 }
7653-
7654-unsigned long arch_align_stack(unsigned long sp)
7655-{
7656- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7657- sp -= get_random_int() & ~PAGE_MASK;
7658- return sp & ~0xf;
7659-}
7660-
7661-static inline unsigned long brk_rnd(void)
7662-{
7663- /* 8MB for 32bit, 1GB for 64bit */
7664- if (is_32bit_task())
7665- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
7666- else
7667- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
7668-}
7669-
7670-unsigned long arch_randomize_brk(struct mm_struct *mm)
7671-{
7672- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
7673-
7674- if (ret < mm->brk)
7675- return mm->brk;
7676- return ret;
7677-}
7678-
7679-unsigned long randomize_et_dyn(unsigned long base)
7680-{
7681- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
7682-
7683- if (!(current->flags & PF_RANDOMIZE))
7684- return base;
7685- if (ret < base)
7686- return base;
7687- return ret;
7688-}
7689diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
7690index 06bafec..2bca531 100644
7691--- a/arch/s390/mm/mmap.c
7692+++ b/arch/s390/mm/mmap.c
7693@@ -90,10 +90,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7694 */
7695 if (mmap_is_legacy()) {
7696 mm->mmap_base = TASK_UNMAPPED_BASE;
7697+
7698+#ifdef CONFIG_PAX_RANDMMAP
7699+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7700+ mm->mmap_base += mm->delta_mmap;
7701+#endif
7702+
7703 mm->get_unmapped_area = arch_get_unmapped_area;
7704 mm->unmap_area = arch_unmap_area;
7705 } else {
7706 mm->mmap_base = mmap_base();
7707+
7708+#ifdef CONFIG_PAX_RANDMMAP
7709+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7710+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7711+#endif
7712+
7713 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7714 mm->unmap_area = arch_unmap_area_topdown;
7715 }
7716@@ -175,10 +187,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7717 */
7718 if (mmap_is_legacy()) {
7719 mm->mmap_base = TASK_UNMAPPED_BASE;
7720+
7721+#ifdef CONFIG_PAX_RANDMMAP
7722+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7723+ mm->mmap_base += mm->delta_mmap;
7724+#endif
7725+
7726 mm->get_unmapped_area = s390_get_unmapped_area;
7727 mm->unmap_area = arch_unmap_area;
7728 } else {
7729 mm->mmap_base = mmap_base();
7730+
7731+#ifdef CONFIG_PAX_RANDMMAP
7732+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7733+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7734+#endif
7735+
7736 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
7737 mm->unmap_area = arch_unmap_area_topdown;
7738 }
7739diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
7740index ae3d59f..f65f075 100644
7741--- a/arch/score/include/asm/cache.h
7742+++ b/arch/score/include/asm/cache.h
7743@@ -1,7 +1,9 @@
7744 #ifndef _ASM_SCORE_CACHE_H
7745 #define _ASM_SCORE_CACHE_H
7746
7747+#include <linux/const.h>
7748+
7749 #define L1_CACHE_SHIFT 4
7750-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7751+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7752
7753 #endif /* _ASM_SCORE_CACHE_H */
7754diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
7755index f9f3cd5..58ff438 100644
7756--- a/arch/score/include/asm/exec.h
7757+++ b/arch/score/include/asm/exec.h
7758@@ -1,6 +1,6 @@
7759 #ifndef _ASM_SCORE_EXEC_H
7760 #define _ASM_SCORE_EXEC_H
7761
7762-extern unsigned long arch_align_stack(unsigned long sp);
7763+#define arch_align_stack(x) (x)
7764
7765 #endif /* _ASM_SCORE_EXEC_H */
7766diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
7767index f4c6d02..e9355c3 100644
7768--- a/arch/score/kernel/process.c
7769+++ b/arch/score/kernel/process.c
7770@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
7771
7772 return task_pt_regs(task)->cp0_epc;
7773 }
7774-
7775-unsigned long arch_align_stack(unsigned long sp)
7776-{
7777- return sp;
7778-}
7779diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
7780index ef9e555..331bd29 100644
7781--- a/arch/sh/include/asm/cache.h
7782+++ b/arch/sh/include/asm/cache.h
7783@@ -9,10 +9,11 @@
7784 #define __ASM_SH_CACHE_H
7785 #ifdef __KERNEL__
7786
7787+#include <linux/const.h>
7788 #include <linux/init.h>
7789 #include <cpu/cache.h>
7790
7791-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7792+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7793
7794 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
7795
7796diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
7797index 03f2b55..b0270327 100644
7798--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
7799+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
7800@@ -143,7 +143,7 @@ shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
7801 return NOTIFY_OK;
7802 }
7803
7804-static struct notifier_block __cpuinitdata shx3_cpu_notifier = {
7805+static struct notifier_block shx3_cpu_notifier = {
7806 .notifier_call = shx3_cpu_callback,
7807 };
7808
7809diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
7810index 6777177..cb5e44f 100644
7811--- a/arch/sh/mm/mmap.c
7812+++ b/arch/sh/mm/mmap.c
7813@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7814 struct mm_struct *mm = current->mm;
7815 struct vm_area_struct *vma;
7816 int do_colour_align;
7817+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7818 struct vm_unmapped_area_info info;
7819
7820 if (flags & MAP_FIXED) {
7821@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7822 if (filp || (flags & MAP_SHARED))
7823 do_colour_align = 1;
7824
7825+#ifdef CONFIG_PAX_RANDMMAP
7826+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7827+#endif
7828+
7829 if (addr) {
7830 if (do_colour_align)
7831 addr = COLOUR_ALIGN(addr, pgoff);
7832@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7833 addr = PAGE_ALIGN(addr);
7834
7835 vma = find_vma(mm, addr);
7836- if (TASK_SIZE - len >= addr &&
7837- (!vma || addr + len <= vma->vm_start))
7838+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7839 return addr;
7840 }
7841
7842 info.flags = 0;
7843 info.length = len;
7844- info.low_limit = TASK_UNMAPPED_BASE;
7845+ info.low_limit = mm->mmap_base;
7846 info.high_limit = TASK_SIZE;
7847 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
7848 info.align_offset = pgoff << PAGE_SHIFT;
7849@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7850 struct mm_struct *mm = current->mm;
7851 unsigned long addr = addr0;
7852 int do_colour_align;
7853+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7854 struct vm_unmapped_area_info info;
7855
7856 if (flags & MAP_FIXED) {
7857@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7858 if (filp || (flags & MAP_SHARED))
7859 do_colour_align = 1;
7860
7861+#ifdef CONFIG_PAX_RANDMMAP
7862+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7863+#endif
7864+
7865 /* requesting a specific address */
7866 if (addr) {
7867 if (do_colour_align)
7868@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7869 addr = PAGE_ALIGN(addr);
7870
7871 vma = find_vma(mm, addr);
7872- if (TASK_SIZE - len >= addr &&
7873- (!vma || addr + len <= vma->vm_start))
7874+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7875 return addr;
7876 }
7877
7878@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7879 VM_BUG_ON(addr != -ENOMEM);
7880 info.flags = 0;
7881 info.low_limit = TASK_UNMAPPED_BASE;
7882+
7883+#ifdef CONFIG_PAX_RANDMMAP
7884+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7885+ info.low_limit += mm->delta_mmap;
7886+#endif
7887+
7888 info.high_limit = TASK_SIZE;
7889 addr = vm_unmapped_area(&info);
7890 }
7891diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
7892index be56a24..443328f 100644
7893--- a/arch/sparc/include/asm/atomic_64.h
7894+++ b/arch/sparc/include/asm/atomic_64.h
7895@@ -14,18 +14,40 @@
7896 #define ATOMIC64_INIT(i) { (i) }
7897
7898 #define atomic_read(v) (*(volatile int *)&(v)->counter)
7899+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
7900+{
7901+ return v->counter;
7902+}
7903 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
7904+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7905+{
7906+ return v->counter;
7907+}
7908
7909 #define atomic_set(v, i) (((v)->counter) = i)
7910+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7911+{
7912+ v->counter = i;
7913+}
7914 #define atomic64_set(v, i) (((v)->counter) = i)
7915+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7916+{
7917+ v->counter = i;
7918+}
7919
7920 extern void atomic_add(int, atomic_t *);
7921+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
7922 extern void atomic64_add(long, atomic64_t *);
7923+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
7924 extern void atomic_sub(int, atomic_t *);
7925+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
7926 extern void atomic64_sub(long, atomic64_t *);
7927+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
7928
7929 extern int atomic_add_ret(int, atomic_t *);
7930+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
7931 extern long atomic64_add_ret(long, atomic64_t *);
7932+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
7933 extern int atomic_sub_ret(int, atomic_t *);
7934 extern long atomic64_sub_ret(long, atomic64_t *);
7935
7936@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
7937 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
7938
7939 #define atomic_inc_return(v) atomic_add_ret(1, v)
7940+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7941+{
7942+ return atomic_add_ret_unchecked(1, v);
7943+}
7944 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
7945+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
7946+{
7947+ return atomic64_add_ret_unchecked(1, v);
7948+}
7949
7950 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
7951 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
7952
7953 #define atomic_add_return(i, v) atomic_add_ret(i, v)
7954+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
7955+{
7956+ return atomic_add_ret_unchecked(i, v);
7957+}
7958 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
7959+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
7960+{
7961+ return atomic64_add_ret_unchecked(i, v);
7962+}
7963
7964 /*
7965 * atomic_inc_and_test - increment and test
7966@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
7967 * other cases.
7968 */
7969 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7970+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7971+{
7972+ return atomic_inc_return_unchecked(v) == 0;
7973+}
7974 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
7975
7976 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
7977@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
7978 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
7979
7980 #define atomic_inc(v) atomic_add(1, v)
7981+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7982+{
7983+ atomic_add_unchecked(1, v);
7984+}
7985 #define atomic64_inc(v) atomic64_add(1, v)
7986+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
7987+{
7988+ atomic64_add_unchecked(1, v);
7989+}
7990
7991 #define atomic_dec(v) atomic_sub(1, v)
7992+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
7993+{
7994+ atomic_sub_unchecked(1, v);
7995+}
7996 #define atomic64_dec(v) atomic64_sub(1, v)
7997+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
7998+{
7999+ atomic64_sub_unchecked(1, v);
8000+}
8001
8002 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
8003 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
8004
8005 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8006+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8007+{
8008+ return cmpxchg(&v->counter, old, new);
8009+}
8010 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
8011+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
8012+{
8013+ return xchg(&v->counter, new);
8014+}
8015
8016 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
8017 {
8018- int c, old;
8019+ int c, old, new;
8020 c = atomic_read(v);
8021 for (;;) {
8022- if (unlikely(c == (u)))
8023+ if (unlikely(c == u))
8024 break;
8025- old = atomic_cmpxchg((v), c, c + (a));
8026+
8027+ asm volatile("addcc %2, %0, %0\n"
8028+
8029+#ifdef CONFIG_PAX_REFCOUNT
8030+ "tvs %%icc, 6\n"
8031+#endif
8032+
8033+ : "=r" (new)
8034+ : "0" (c), "ir" (a)
8035+ : "cc");
8036+
8037+ old = atomic_cmpxchg(v, c, new);
8038 if (likely(old == c))
8039 break;
8040 c = old;
8041@@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
8042 #define atomic64_cmpxchg(v, o, n) \
8043 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
8044 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8045+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8046+{
8047+ return xchg(&v->counter, new);
8048+}
8049
8050 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
8051 {
8052- long c, old;
8053+ long c, old, new;
8054 c = atomic64_read(v);
8055 for (;;) {
8056- if (unlikely(c == (u)))
8057+ if (unlikely(c == u))
8058 break;
8059- old = atomic64_cmpxchg((v), c, c + (a));
8060+
8061+ asm volatile("addcc %2, %0, %0\n"
8062+
8063+#ifdef CONFIG_PAX_REFCOUNT
8064+ "tvs %%xcc, 6\n"
8065+#endif
8066+
8067+ : "=r" (new)
8068+ : "0" (c), "ir" (a)
8069+ : "cc");
8070+
8071+ old = atomic64_cmpxchg(v, c, new);
8072 if (likely(old == c))
8073 break;
8074 c = old;
8075 }
8076- return c != (u);
8077+ return c != u;
8078 }
8079
8080 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
8081diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
8082index 5bb6991..5c2132e 100644
8083--- a/arch/sparc/include/asm/cache.h
8084+++ b/arch/sparc/include/asm/cache.h
8085@@ -7,10 +7,12 @@
8086 #ifndef _SPARC_CACHE_H
8087 #define _SPARC_CACHE_H
8088
8089+#include <linux/const.h>
8090+
8091 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
8092
8093 #define L1_CACHE_SHIFT 5
8094-#define L1_CACHE_BYTES 32
8095+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8096
8097 #ifdef CONFIG_SPARC32
8098 #define SMP_CACHE_BYTES_SHIFT 5
8099diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
8100index a24e41f..47677ff 100644
8101--- a/arch/sparc/include/asm/elf_32.h
8102+++ b/arch/sparc/include/asm/elf_32.h
8103@@ -114,6 +114,13 @@ typedef struct {
8104
8105 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
8106
8107+#ifdef CONFIG_PAX_ASLR
8108+#define PAX_ELF_ET_DYN_BASE 0x10000UL
8109+
8110+#define PAX_DELTA_MMAP_LEN 16
8111+#define PAX_DELTA_STACK_LEN 16
8112+#endif
8113+
8114 /* This yields a mask that user programs can use to figure out what
8115 instruction set this cpu supports. This can NOT be done in userspace
8116 on Sparc. */
8117diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
8118index 370ca1e..d4f4a98 100644
8119--- a/arch/sparc/include/asm/elf_64.h
8120+++ b/arch/sparc/include/asm/elf_64.h
8121@@ -189,6 +189,13 @@ typedef struct {
8122 #define ELF_ET_DYN_BASE 0x0000010000000000UL
8123 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
8124
8125+#ifdef CONFIG_PAX_ASLR
8126+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
8127+
8128+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
8129+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
8130+#endif
8131+
8132 extern unsigned long sparc64_elf_hwcap;
8133 #define ELF_HWCAP sparc64_elf_hwcap
8134
8135diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
8136index 9b1c36d..209298b 100644
8137--- a/arch/sparc/include/asm/pgalloc_32.h
8138+++ b/arch/sparc/include/asm/pgalloc_32.h
8139@@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
8140 }
8141
8142 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
8143+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
8144
8145 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
8146 unsigned long address)
8147diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
8148index bcfe063..b333142 100644
8149--- a/arch/sparc/include/asm/pgalloc_64.h
8150+++ b/arch/sparc/include/asm/pgalloc_64.h
8151@@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8152 }
8153
8154 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
8155+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
8156
8157 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
8158 {
8159diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
8160index 6fc1348..390c50a 100644
8161--- a/arch/sparc/include/asm/pgtable_32.h
8162+++ b/arch/sparc/include/asm/pgtable_32.h
8163@@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
8164 #define PAGE_SHARED SRMMU_PAGE_SHARED
8165 #define PAGE_COPY SRMMU_PAGE_COPY
8166 #define PAGE_READONLY SRMMU_PAGE_RDONLY
8167+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
8168+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
8169+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
8170 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
8171
8172 /* Top-level page directory - dummy used by init-mm.
8173@@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
8174
8175 /* xwr */
8176 #define __P000 PAGE_NONE
8177-#define __P001 PAGE_READONLY
8178-#define __P010 PAGE_COPY
8179-#define __P011 PAGE_COPY
8180+#define __P001 PAGE_READONLY_NOEXEC
8181+#define __P010 PAGE_COPY_NOEXEC
8182+#define __P011 PAGE_COPY_NOEXEC
8183 #define __P100 PAGE_READONLY
8184 #define __P101 PAGE_READONLY
8185 #define __P110 PAGE_COPY
8186 #define __P111 PAGE_COPY
8187
8188 #define __S000 PAGE_NONE
8189-#define __S001 PAGE_READONLY
8190-#define __S010 PAGE_SHARED
8191-#define __S011 PAGE_SHARED
8192+#define __S001 PAGE_READONLY_NOEXEC
8193+#define __S010 PAGE_SHARED_NOEXEC
8194+#define __S011 PAGE_SHARED_NOEXEC
8195 #define __S100 PAGE_READONLY
8196 #define __S101 PAGE_READONLY
8197 #define __S110 PAGE_SHARED
8198diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
8199index 79da178..c2eede8 100644
8200--- a/arch/sparc/include/asm/pgtsrmmu.h
8201+++ b/arch/sparc/include/asm/pgtsrmmu.h
8202@@ -115,6 +115,11 @@
8203 SRMMU_EXEC | SRMMU_REF)
8204 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
8205 SRMMU_EXEC | SRMMU_REF)
8206+
8207+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
8208+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
8209+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
8210+
8211 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
8212 SRMMU_DIRTY | SRMMU_REF)
8213
8214diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
8215index 9689176..63c18ea 100644
8216--- a/arch/sparc/include/asm/spinlock_64.h
8217+++ b/arch/sparc/include/asm/spinlock_64.h
8218@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
8219
8220 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
8221
8222-static void inline arch_read_lock(arch_rwlock_t *lock)
8223+static inline void arch_read_lock(arch_rwlock_t *lock)
8224 {
8225 unsigned long tmp1, tmp2;
8226
8227 __asm__ __volatile__ (
8228 "1: ldsw [%2], %0\n"
8229 " brlz,pn %0, 2f\n"
8230-"4: add %0, 1, %1\n"
8231+"4: addcc %0, 1, %1\n"
8232+
8233+#ifdef CONFIG_PAX_REFCOUNT
8234+" tvs %%icc, 6\n"
8235+#endif
8236+
8237 " cas [%2], %0, %1\n"
8238 " cmp %0, %1\n"
8239 " bne,pn %%icc, 1b\n"
8240@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
8241 " .previous"
8242 : "=&r" (tmp1), "=&r" (tmp2)
8243 : "r" (lock)
8244- : "memory");
8245+ : "memory", "cc");
8246 }
8247
8248-static int inline arch_read_trylock(arch_rwlock_t *lock)
8249+static inline int arch_read_trylock(arch_rwlock_t *lock)
8250 {
8251 int tmp1, tmp2;
8252
8253@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
8254 "1: ldsw [%2], %0\n"
8255 " brlz,a,pn %0, 2f\n"
8256 " mov 0, %0\n"
8257-" add %0, 1, %1\n"
8258+" addcc %0, 1, %1\n"
8259+
8260+#ifdef CONFIG_PAX_REFCOUNT
8261+" tvs %%icc, 6\n"
8262+#endif
8263+
8264 " cas [%2], %0, %1\n"
8265 " cmp %0, %1\n"
8266 " bne,pn %%icc, 1b\n"
8267@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
8268 return tmp1;
8269 }
8270
8271-static void inline arch_read_unlock(arch_rwlock_t *lock)
8272+static inline void arch_read_unlock(arch_rwlock_t *lock)
8273 {
8274 unsigned long tmp1, tmp2;
8275
8276 __asm__ __volatile__(
8277 "1: lduw [%2], %0\n"
8278-" sub %0, 1, %1\n"
8279+" subcc %0, 1, %1\n"
8280+
8281+#ifdef CONFIG_PAX_REFCOUNT
8282+" tvs %%icc, 6\n"
8283+#endif
8284+
8285 " cas [%2], %0, %1\n"
8286 " cmp %0, %1\n"
8287 " bne,pn %%xcc, 1b\n"
8288@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
8289 : "memory");
8290 }
8291
8292-static void inline arch_write_lock(arch_rwlock_t *lock)
8293+static inline void arch_write_lock(arch_rwlock_t *lock)
8294 {
8295 unsigned long mask, tmp1, tmp2;
8296
8297@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
8298 : "memory");
8299 }
8300
8301-static void inline arch_write_unlock(arch_rwlock_t *lock)
8302+static inline void arch_write_unlock(arch_rwlock_t *lock)
8303 {
8304 __asm__ __volatile__(
8305 " stw %%g0, [%0]"
8306@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
8307 : "memory");
8308 }
8309
8310-static int inline arch_write_trylock(arch_rwlock_t *lock)
8311+static inline int arch_write_trylock(arch_rwlock_t *lock)
8312 {
8313 unsigned long mask, tmp1, tmp2, result;
8314
8315diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
8316index dd38075..e7cac83 100644
8317--- a/arch/sparc/include/asm/thread_info_32.h
8318+++ b/arch/sparc/include/asm/thread_info_32.h
8319@@ -49,6 +49,8 @@ struct thread_info {
8320 unsigned long w_saved;
8321
8322 struct restart_block restart_block;
8323+
8324+ unsigned long lowest_stack;
8325 };
8326
8327 /*
8328diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
8329index d5e5042..9bfee76 100644
8330--- a/arch/sparc/include/asm/thread_info_64.h
8331+++ b/arch/sparc/include/asm/thread_info_64.h
8332@@ -63,6 +63,8 @@ struct thread_info {
8333 struct pt_regs *kern_una_regs;
8334 unsigned int kern_una_insn;
8335
8336+ unsigned long lowest_stack;
8337+
8338 unsigned long fpregs[0] __attribute__ ((aligned(64)));
8339 };
8340
8341@@ -192,10 +194,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
8342 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
8343 /* flag bit 6 is available */
8344 #define TIF_32BIT 7 /* 32-bit binary */
8345-/* flag bit 8 is available */
8346+#define TIF_GRSEC_SETXID 8 /* update credentials on syscall entry/exit */
8347 #define TIF_SECCOMP 9 /* secure computing */
8348 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
8349 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
8350+
8351 /* NOTE: Thread flags >= 12 should be ones we have no interest
8352 * in using in assembly, else we can't use the mask as
8353 * an immediate value in instructions such as andcc.
8354@@ -214,12 +217,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
8355 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
8356 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8357 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
8358+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8359
8360 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
8361 _TIF_DO_NOTIFY_RESUME_MASK | \
8362 _TIF_NEED_RESCHED)
8363 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
8364
8365+#define _TIF_WORK_SYSCALL \
8366+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
8367+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
8368+
8369+
8370 /*
8371 * Thread-synchronous status.
8372 *
8373diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
8374index 0167d26..767bb0c 100644
8375--- a/arch/sparc/include/asm/uaccess.h
8376+++ b/arch/sparc/include/asm/uaccess.h
8377@@ -1,5 +1,6 @@
8378 #ifndef ___ASM_SPARC_UACCESS_H
8379 #define ___ASM_SPARC_UACCESS_H
8380+
8381 #if defined(__sparc__) && defined(__arch64__)
8382 #include <asm/uaccess_64.h>
8383 #else
8384diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
8385index 53a28dd..50c38c3 100644
8386--- a/arch/sparc/include/asm/uaccess_32.h
8387+++ b/arch/sparc/include/asm/uaccess_32.h
8388@@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
8389
8390 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
8391 {
8392- if (n && __access_ok((unsigned long) to, n))
8393+ if ((long)n < 0)
8394+ return n;
8395+
8396+ if (n && __access_ok((unsigned long) to, n)) {
8397+ if (!__builtin_constant_p(n))
8398+ check_object_size(from, n, true);
8399 return __copy_user(to, (__force void __user *) from, n);
8400- else
8401+ } else
8402 return n;
8403 }
8404
8405 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
8406 {
8407+ if ((long)n < 0)
8408+ return n;
8409+
8410+ if (!__builtin_constant_p(n))
8411+ check_object_size(from, n, true);
8412+
8413 return __copy_user(to, (__force void __user *) from, n);
8414 }
8415
8416 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
8417 {
8418- if (n && __access_ok((unsigned long) from, n))
8419+ if ((long)n < 0)
8420+ return n;
8421+
8422+ if (n && __access_ok((unsigned long) from, n)) {
8423+ if (!__builtin_constant_p(n))
8424+ check_object_size(to, n, false);
8425 return __copy_user((__force void __user *) to, from, n);
8426- else
8427+ } else
8428 return n;
8429 }
8430
8431 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
8432 {
8433+ if ((long)n < 0)
8434+ return n;
8435+
8436 return __copy_user((__force void __user *) to, from, n);
8437 }
8438
8439diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
8440index e562d3c..191f176 100644
8441--- a/arch/sparc/include/asm/uaccess_64.h
8442+++ b/arch/sparc/include/asm/uaccess_64.h
8443@@ -10,6 +10,7 @@
8444 #include <linux/compiler.h>
8445 #include <linux/string.h>
8446 #include <linux/thread_info.h>
8447+#include <linux/kernel.h>
8448 #include <asm/asi.h>
8449 #include <asm/spitfire.h>
8450 #include <asm-generic/uaccess-unaligned.h>
8451@@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
8452 static inline unsigned long __must_check
8453 copy_from_user(void *to, const void __user *from, unsigned long size)
8454 {
8455- unsigned long ret = ___copy_from_user(to, from, size);
8456+ unsigned long ret;
8457
8458+ if ((long)size < 0 || size > INT_MAX)
8459+ return size;
8460+
8461+ if (!__builtin_constant_p(size))
8462+ check_object_size(to, size, false);
8463+
8464+ ret = ___copy_from_user(to, from, size);
8465 if (unlikely(ret))
8466 ret = copy_from_user_fixup(to, from, size);
8467
8468@@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
8469 static inline unsigned long __must_check
8470 copy_to_user(void __user *to, const void *from, unsigned long size)
8471 {
8472- unsigned long ret = ___copy_to_user(to, from, size);
8473+ unsigned long ret;
8474
8475+ if ((long)size < 0 || size > INT_MAX)
8476+ return size;
8477+
8478+ if (!__builtin_constant_p(size))
8479+ check_object_size(from, size, true);
8480+
8481+ ret = ___copy_to_user(to, from, size);
8482 if (unlikely(ret))
8483 ret = copy_to_user_fixup(to, from, size);
8484 return ret;
8485diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
8486index d432fb2..6056af1 100644
8487--- a/arch/sparc/kernel/Makefile
8488+++ b/arch/sparc/kernel/Makefile
8489@@ -3,7 +3,7 @@
8490 #
8491
8492 asflags-y := -ansi
8493-ccflags-y := -Werror
8494+#ccflags-y := -Werror
8495
8496 extra-y := head_$(BITS).o
8497
8498diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
8499index 5ef48da..11d460f 100644
8500--- a/arch/sparc/kernel/ds.c
8501+++ b/arch/sparc/kernel/ds.c
8502@@ -783,6 +783,16 @@ void ldom_set_var(const char *var, const char *value)
8503 char *base, *p;
8504 int msg_len, loops;
8505
8506+ if (strlen(var) + strlen(value) + 2 >
8507+ sizeof(pkt) - sizeof(pkt.header)) {
8508+ printk(KERN_ERR PFX
8509+ "contents length: %zu, which more than max: %lu,"
8510+ "so could not set (%s) variable to (%s).\n",
8511+ strlen(var) + strlen(value) + 2,
8512+ sizeof(pkt) - sizeof(pkt.header), var, value);
8513+ return;
8514+ }
8515+
8516 memset(&pkt, 0, sizeof(pkt));
8517 pkt.header.data.tag.type = DS_DATA;
8518 pkt.header.data.handle = cp->handle;
8519diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
8520index fdd819d..5af08c8 100644
8521--- a/arch/sparc/kernel/process_32.c
8522+++ b/arch/sparc/kernel/process_32.c
8523@@ -116,14 +116,14 @@ void show_regs(struct pt_regs *r)
8524
8525 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
8526 r->psr, r->pc, r->npc, r->y, print_tainted());
8527- printk("PC: <%pS>\n", (void *) r->pc);
8528+ printk("PC: <%pA>\n", (void *) r->pc);
8529 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
8530 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
8531 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
8532 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
8533 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
8534 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
8535- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
8536+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
8537
8538 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
8539 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
8540@@ -160,7 +160,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
8541 rw = (struct reg_window32 *) fp;
8542 pc = rw->ins[7];
8543 printk("[%08lx : ", pc);
8544- printk("%pS ] ", (void *) pc);
8545+ printk("%pA ] ", (void *) pc);
8546 fp = rw->ins[6];
8547 } while (++count < 16);
8548 printk("\n");
8549diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
8550index baebab2..9cd13b1 100644
8551--- a/arch/sparc/kernel/process_64.c
8552+++ b/arch/sparc/kernel/process_64.c
8553@@ -158,7 +158,7 @@ static void show_regwindow(struct pt_regs *regs)
8554 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
8555 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
8556 if (regs->tstate & TSTATE_PRIV)
8557- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
8558+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
8559 }
8560
8561 void show_regs(struct pt_regs *regs)
8562@@ -167,7 +167,7 @@ void show_regs(struct pt_regs *regs)
8563
8564 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
8565 regs->tpc, regs->tnpc, regs->y, print_tainted());
8566- printk("TPC: <%pS>\n", (void *) regs->tpc);
8567+ printk("TPC: <%pA>\n", (void *) regs->tpc);
8568 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
8569 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
8570 regs->u_regs[3]);
8571@@ -180,7 +180,7 @@ void show_regs(struct pt_regs *regs)
8572 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
8573 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
8574 regs->u_regs[15]);
8575- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
8576+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
8577 show_regwindow(regs);
8578 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
8579 }
8580@@ -269,7 +269,7 @@ void arch_trigger_all_cpu_backtrace(void)
8581 ((tp && tp->task) ? tp->task->pid : -1));
8582
8583 if (gp->tstate & TSTATE_PRIV) {
8584- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
8585+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
8586 (void *) gp->tpc,
8587 (void *) gp->o7,
8588 (void *) gp->i7,
8589diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
8590index 79cc0d1..ec62734 100644
8591--- a/arch/sparc/kernel/prom_common.c
8592+++ b/arch/sparc/kernel/prom_common.c
8593@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
8594
8595 unsigned int prom_early_allocated __initdata;
8596
8597-static struct of_pdt_ops prom_sparc_ops __initdata = {
8598+static struct of_pdt_ops prom_sparc_ops __initconst = {
8599 .nextprop = prom_common_nextprop,
8600 .getproplen = prom_getproplen,
8601 .getproperty = prom_getproperty,
8602diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
8603index 7ff45e4..a58f271 100644
8604--- a/arch/sparc/kernel/ptrace_64.c
8605+++ b/arch/sparc/kernel/ptrace_64.c
8606@@ -1057,6 +1057,10 @@ long arch_ptrace(struct task_struct *child, long request,
8607 return ret;
8608 }
8609
8610+#ifdef CONFIG_GRKERNSEC_SETXID
8611+extern void gr_delayed_cred_worker(void);
8612+#endif
8613+
8614 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
8615 {
8616 int ret = 0;
8617@@ -1064,6 +1068,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
8618 /* do the secure computing check first */
8619 secure_computing_strict(regs->u_regs[UREG_G1]);
8620
8621+#ifdef CONFIG_GRKERNSEC_SETXID
8622+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8623+ gr_delayed_cred_worker();
8624+#endif
8625+
8626 if (test_thread_flag(TIF_SYSCALL_TRACE))
8627 ret = tracehook_report_syscall_entry(regs);
8628
8629@@ -1084,6 +1093,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
8630
8631 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
8632 {
8633+#ifdef CONFIG_GRKERNSEC_SETXID
8634+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8635+ gr_delayed_cred_worker();
8636+#endif
8637+
8638 audit_syscall_exit(regs);
8639
8640 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
8641diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
8642index 3a8d184..49498a8 100644
8643--- a/arch/sparc/kernel/sys_sparc_32.c
8644+++ b/arch/sparc/kernel/sys_sparc_32.c
8645@@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
8646 if (len > TASK_SIZE - PAGE_SIZE)
8647 return -ENOMEM;
8648 if (!addr)
8649- addr = TASK_UNMAPPED_BASE;
8650+ addr = current->mm->mmap_base;
8651
8652 info.flags = 0;
8653 info.length = len;
8654diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
8655index 2daaaa6..4fb84dc 100644
8656--- a/arch/sparc/kernel/sys_sparc_64.c
8657+++ b/arch/sparc/kernel/sys_sparc_64.c
8658@@ -90,13 +90,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
8659 struct vm_area_struct * vma;
8660 unsigned long task_size = TASK_SIZE;
8661 int do_color_align;
8662+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
8663 struct vm_unmapped_area_info info;
8664
8665 if (flags & MAP_FIXED) {
8666 /* We do not accept a shared mapping if it would violate
8667 * cache aliasing constraints.
8668 */
8669- if ((flags & MAP_SHARED) &&
8670+ if ((filp || (flags & MAP_SHARED)) &&
8671 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
8672 return -EINVAL;
8673 return addr;
8674@@ -111,6 +112,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
8675 if (filp || (flags & MAP_SHARED))
8676 do_color_align = 1;
8677
8678+#ifdef CONFIG_PAX_RANDMMAP
8679+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8680+#endif
8681+
8682 if (addr) {
8683 if (do_color_align)
8684 addr = COLOR_ALIGN(addr, pgoff);
8685@@ -118,22 +123,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
8686 addr = PAGE_ALIGN(addr);
8687
8688 vma = find_vma(mm, addr);
8689- if (task_size - len >= addr &&
8690- (!vma || addr + len <= vma->vm_start))
8691+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
8692 return addr;
8693 }
8694
8695 info.flags = 0;
8696 info.length = len;
8697- info.low_limit = TASK_UNMAPPED_BASE;
8698+ info.low_limit = mm->mmap_base;
8699 info.high_limit = min(task_size, VA_EXCLUDE_START);
8700 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
8701 info.align_offset = pgoff << PAGE_SHIFT;
8702+ info.threadstack_offset = offset;
8703 addr = vm_unmapped_area(&info);
8704
8705 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
8706 VM_BUG_ON(addr != -ENOMEM);
8707 info.low_limit = VA_EXCLUDE_END;
8708+
8709+#ifdef CONFIG_PAX_RANDMMAP
8710+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8711+ info.low_limit += mm->delta_mmap;
8712+#endif
8713+
8714 info.high_limit = task_size;
8715 addr = vm_unmapped_area(&info);
8716 }
8717@@ -151,6 +162,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8718 unsigned long task_size = STACK_TOP32;
8719 unsigned long addr = addr0;
8720 int do_color_align;
8721+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
8722 struct vm_unmapped_area_info info;
8723
8724 /* This should only ever run for 32-bit processes. */
8725@@ -160,7 +172,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8726 /* We do not accept a shared mapping if it would violate
8727 * cache aliasing constraints.
8728 */
8729- if ((flags & MAP_SHARED) &&
8730+ if ((filp || (flags & MAP_SHARED)) &&
8731 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
8732 return -EINVAL;
8733 return addr;
8734@@ -173,6 +185,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8735 if (filp || (flags & MAP_SHARED))
8736 do_color_align = 1;
8737
8738+#ifdef CONFIG_PAX_RANDMMAP
8739+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8740+#endif
8741+
8742 /* requesting a specific address */
8743 if (addr) {
8744 if (do_color_align)
8745@@ -181,8 +197,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8746 addr = PAGE_ALIGN(addr);
8747
8748 vma = find_vma(mm, addr);
8749- if (task_size - len >= addr &&
8750- (!vma || addr + len <= vma->vm_start))
8751+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
8752 return addr;
8753 }
8754
8755@@ -192,6 +207,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8756 info.high_limit = mm->mmap_base;
8757 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
8758 info.align_offset = pgoff << PAGE_SHIFT;
8759+ info.threadstack_offset = offset;
8760 addr = vm_unmapped_area(&info);
8761
8762 /*
8763@@ -204,6 +220,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
8764 VM_BUG_ON(addr != -ENOMEM);
8765 info.flags = 0;
8766 info.low_limit = TASK_UNMAPPED_BASE;
8767+
8768+#ifdef CONFIG_PAX_RANDMMAP
8769+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8770+ info.low_limit += mm->delta_mmap;
8771+#endif
8772+
8773 info.high_limit = STACK_TOP32;
8774 addr = vm_unmapped_area(&info);
8775 }
8776@@ -260,10 +282,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
8777 EXPORT_SYMBOL(get_fb_unmapped_area);
8778
8779 /* Essentially the same as PowerPC. */
8780-static unsigned long mmap_rnd(void)
8781+static unsigned long mmap_rnd(struct mm_struct *mm)
8782 {
8783 unsigned long rnd = 0UL;
8784
8785+#ifdef CONFIG_PAX_RANDMMAP
8786+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
8787+#endif
8788+
8789 if (current->flags & PF_RANDOMIZE) {
8790 unsigned long val = get_random_int();
8791 if (test_thread_flag(TIF_32BIT))
8792@@ -276,7 +302,7 @@ static unsigned long mmap_rnd(void)
8793
8794 void arch_pick_mmap_layout(struct mm_struct *mm)
8795 {
8796- unsigned long random_factor = mmap_rnd();
8797+ unsigned long random_factor = mmap_rnd(mm);
8798 unsigned long gap;
8799
8800 /*
8801@@ -289,6 +315,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8802 gap == RLIM_INFINITY ||
8803 sysctl_legacy_va_layout) {
8804 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
8805+
8806+#ifdef CONFIG_PAX_RANDMMAP
8807+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8808+ mm->mmap_base += mm->delta_mmap;
8809+#endif
8810+
8811 mm->get_unmapped_area = arch_get_unmapped_area;
8812 mm->unmap_area = arch_unmap_area;
8813 } else {
8814@@ -301,6 +333,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
8815 gap = (task_size / 6 * 5);
8816
8817 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
8818+
8819+#ifdef CONFIG_PAX_RANDMMAP
8820+ if (mm->pax_flags & MF_PAX_RANDMMAP)
8821+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
8822+#endif
8823+
8824 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
8825 mm->unmap_area = arch_unmap_area_topdown;
8826 }
8827diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
8828index 22a1098..6255eb9 100644
8829--- a/arch/sparc/kernel/syscalls.S
8830+++ b/arch/sparc/kernel/syscalls.S
8831@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
8832 #endif
8833 .align 32
8834 1: ldx [%g6 + TI_FLAGS], %l5
8835- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
8836+ andcc %l5, _TIF_WORK_SYSCALL, %g0
8837 be,pt %icc, rtrap
8838 nop
8839 call syscall_trace_leave
8840@@ -184,7 +184,7 @@ linux_sparc_syscall32:
8841
8842 srl %i5, 0, %o5 ! IEU1
8843 srl %i2, 0, %o2 ! IEU0 Group
8844- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
8845+ andcc %l0, _TIF_WORK_SYSCALL, %g0
8846 bne,pn %icc, linux_syscall_trace32 ! CTI
8847 mov %i0, %l5 ! IEU1
8848 call %l7 ! CTI Group brk forced
8849@@ -207,7 +207,7 @@ linux_sparc_syscall:
8850
8851 mov %i3, %o3 ! IEU1
8852 mov %i4, %o4 ! IEU0 Group
8853- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
8854+ andcc %l0, _TIF_WORK_SYSCALL, %g0
8855 bne,pn %icc, linux_syscall_trace ! CTI Group
8856 mov %i0, %l5 ! IEU0
8857 2: call %l7 ! CTI Group brk forced
8858@@ -223,7 +223,7 @@ ret_sys_call:
8859
8860 cmp %o0, -ERESTART_RESTARTBLOCK
8861 bgeu,pn %xcc, 1f
8862- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
8863+ andcc %l0, _TIF_WORK_SYSCALL, %g0
8864 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
8865
8866 2:
8867diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
8868index 654e8aa..45f431b 100644
8869--- a/arch/sparc/kernel/sysfs.c
8870+++ b/arch/sparc/kernel/sysfs.c
8871@@ -266,7 +266,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
8872 return NOTIFY_OK;
8873 }
8874
8875-static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
8876+static struct notifier_block sysfs_cpu_nb = {
8877 .notifier_call = sysfs_cpu_notify,
8878 };
8879
8880diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
8881index 6629829..036032d 100644
8882--- a/arch/sparc/kernel/traps_32.c
8883+++ b/arch/sparc/kernel/traps_32.c
8884@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
8885 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
8886 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
8887
8888+extern void gr_handle_kernel_exploit(void);
8889+
8890 void die_if_kernel(char *str, struct pt_regs *regs)
8891 {
8892 static int die_counter;
8893@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
8894 count++ < 30 &&
8895 (((unsigned long) rw) >= PAGE_OFFSET) &&
8896 !(((unsigned long) rw) & 0x7)) {
8897- printk("Caller[%08lx]: %pS\n", rw->ins[7],
8898+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
8899 (void *) rw->ins[7]);
8900 rw = (struct reg_window32 *)rw->ins[6];
8901 }
8902 }
8903 printk("Instruction DUMP:");
8904 instruction_dump ((unsigned long *) regs->pc);
8905- if(regs->psr & PSR_PS)
8906+ if(regs->psr & PSR_PS) {
8907+ gr_handle_kernel_exploit();
8908 do_exit(SIGKILL);
8909+ }
8910 do_exit(SIGSEGV);
8911 }
8912
8913diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
8914index b3f833a..ac74b2d 100644
8915--- a/arch/sparc/kernel/traps_64.c
8916+++ b/arch/sparc/kernel/traps_64.c
8917@@ -76,7 +76,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
8918 i + 1,
8919 p->trapstack[i].tstate, p->trapstack[i].tpc,
8920 p->trapstack[i].tnpc, p->trapstack[i].tt);
8921- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
8922+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
8923 }
8924 }
8925
8926@@ -96,6 +96,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
8927
8928 lvl -= 0x100;
8929 if (regs->tstate & TSTATE_PRIV) {
8930+
8931+#ifdef CONFIG_PAX_REFCOUNT
8932+ if (lvl == 6)
8933+ pax_report_refcount_overflow(regs);
8934+#endif
8935+
8936 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
8937 die_if_kernel(buffer, regs);
8938 }
8939@@ -114,11 +120,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
8940 void bad_trap_tl1(struct pt_regs *regs, long lvl)
8941 {
8942 char buffer[32];
8943-
8944+
8945 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
8946 0, lvl, SIGTRAP) == NOTIFY_STOP)
8947 return;
8948
8949+#ifdef CONFIG_PAX_REFCOUNT
8950+ if (lvl == 6)
8951+ pax_report_refcount_overflow(regs);
8952+#endif
8953+
8954 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
8955
8956 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
8957@@ -1142,7 +1153,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
8958 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
8959 printk("%s" "ERROR(%d): ",
8960 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
8961- printk("TPC<%pS>\n", (void *) regs->tpc);
8962+ printk("TPC<%pA>\n", (void *) regs->tpc);
8963 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
8964 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
8965 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
8966@@ -1749,7 +1760,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
8967 smp_processor_id(),
8968 (type & 0x1) ? 'I' : 'D',
8969 regs->tpc);
8970- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
8971+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
8972 panic("Irrecoverable Cheetah+ parity error.");
8973 }
8974
8975@@ -1757,7 +1768,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
8976 smp_processor_id(),
8977 (type & 0x1) ? 'I' : 'D',
8978 regs->tpc);
8979- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
8980+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
8981 }
8982
8983 struct sun4v_error_entry {
8984@@ -2104,9 +2115,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
8985
8986 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
8987 regs->tpc, tl);
8988- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
8989+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
8990 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
8991- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
8992+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
8993 (void *) regs->u_regs[UREG_I7]);
8994 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
8995 "pte[%lx] error[%lx]\n",
8996@@ -2128,9 +2139,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
8997
8998 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
8999 regs->tpc, tl);
9000- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
9001+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
9002 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
9003- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
9004+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
9005 (void *) regs->u_regs[UREG_I7]);
9006 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
9007 "pte[%lx] error[%lx]\n",
9008@@ -2336,13 +2347,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
9009 fp = (unsigned long)sf->fp + STACK_BIAS;
9010 }
9011
9012- printk(" [%016lx] %pS\n", pc, (void *) pc);
9013+ printk(" [%016lx] %pA\n", pc, (void *) pc);
9014 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
9015 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
9016 int index = tsk->curr_ret_stack;
9017 if (tsk->ret_stack && index >= graph) {
9018 pc = tsk->ret_stack[index - graph].ret;
9019- printk(" [%016lx] %pS\n", pc, (void *) pc);
9020+ printk(" [%016lx] %pA\n", pc, (void *) pc);
9021 graph++;
9022 }
9023 }
9024@@ -2360,6 +2371,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
9025 return (struct reg_window *) (fp + STACK_BIAS);
9026 }
9027
9028+extern void gr_handle_kernel_exploit(void);
9029+
9030 void die_if_kernel(char *str, struct pt_regs *regs)
9031 {
9032 static int die_counter;
9033@@ -2388,7 +2401,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
9034 while (rw &&
9035 count++ < 30 &&
9036 kstack_valid(tp, (unsigned long) rw)) {
9037- printk("Caller[%016lx]: %pS\n", rw->ins[7],
9038+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
9039 (void *) rw->ins[7]);
9040
9041 rw = kernel_stack_up(rw);
9042@@ -2401,8 +2414,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
9043 }
9044 user_instruction_dump ((unsigned int __user *) regs->tpc);
9045 }
9046- if (regs->tstate & TSTATE_PRIV)
9047+ if (regs->tstate & TSTATE_PRIV) {
9048+ gr_handle_kernel_exploit();
9049 do_exit(SIGKILL);
9050+ }
9051 do_exit(SIGSEGV);
9052 }
9053 EXPORT_SYMBOL(die_if_kernel);
9054diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
9055index 8201c25e..072a2a7 100644
9056--- a/arch/sparc/kernel/unaligned_64.c
9057+++ b/arch/sparc/kernel/unaligned_64.c
9058@@ -286,7 +286,7 @@ static void log_unaligned(struct pt_regs *regs)
9059 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
9060
9061 if (__ratelimit(&ratelimit)) {
9062- printk("Kernel unaligned access at TPC[%lx] %pS\n",
9063+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
9064 regs->tpc, (void *) regs->tpc);
9065 }
9066 }
9067diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
9068index dbe119b..089c7c1 100644
9069--- a/arch/sparc/lib/Makefile
9070+++ b/arch/sparc/lib/Makefile
9071@@ -2,7 +2,7 @@
9072 #
9073
9074 asflags-y := -ansi -DST_DIV0=0x02
9075-ccflags-y := -Werror
9076+#ccflags-y := -Werror
9077
9078 lib-$(CONFIG_SPARC32) += ashrdi3.o
9079 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
9080diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
9081index 85c233d..68500e0 100644
9082--- a/arch/sparc/lib/atomic_64.S
9083+++ b/arch/sparc/lib/atomic_64.S
9084@@ -17,7 +17,12 @@
9085 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
9086 BACKOFF_SETUP(%o2)
9087 1: lduw [%o1], %g1
9088- add %g1, %o0, %g7
9089+ addcc %g1, %o0, %g7
9090+
9091+#ifdef CONFIG_PAX_REFCOUNT
9092+ tvs %icc, 6
9093+#endif
9094+
9095 cas [%o1], %g1, %g7
9096 cmp %g1, %g7
9097 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
9098@@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
9099 2: BACKOFF_SPIN(%o2, %o3, 1b)
9100 ENDPROC(atomic_add)
9101
9102+ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
9103+ BACKOFF_SETUP(%o2)
9104+1: lduw [%o1], %g1
9105+ add %g1, %o0, %g7
9106+ cas [%o1], %g1, %g7
9107+ cmp %g1, %g7
9108+ bne,pn %icc, 2f
9109+ nop
9110+ retl
9111+ nop
9112+2: BACKOFF_SPIN(%o2, %o3, 1b)
9113+ENDPROC(atomic_add_unchecked)
9114+
9115 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
9116 BACKOFF_SETUP(%o2)
9117 1: lduw [%o1], %g1
9118- sub %g1, %o0, %g7
9119+ subcc %g1, %o0, %g7
9120+
9121+#ifdef CONFIG_PAX_REFCOUNT
9122+ tvs %icc, 6
9123+#endif
9124+
9125 cas [%o1], %g1, %g7
9126 cmp %g1, %g7
9127 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
9128@@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
9129 2: BACKOFF_SPIN(%o2, %o3, 1b)
9130 ENDPROC(atomic_sub)
9131
9132+ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
9133+ BACKOFF_SETUP(%o2)
9134+1: lduw [%o1], %g1
9135+ sub %g1, %o0, %g7
9136+ cas [%o1], %g1, %g7
9137+ cmp %g1, %g7
9138+ bne,pn %icc, 2f
9139+ nop
9140+ retl
9141+ nop
9142+2: BACKOFF_SPIN(%o2, %o3, 1b)
9143+ENDPROC(atomic_sub_unchecked)
9144+
9145 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
9146 BACKOFF_SETUP(%o2)
9147 1: lduw [%o1], %g1
9148- add %g1, %o0, %g7
9149+ addcc %g1, %o0, %g7
9150+
9151+#ifdef CONFIG_PAX_REFCOUNT
9152+ tvs %icc, 6
9153+#endif
9154+
9155 cas [%o1], %g1, %g7
9156 cmp %g1, %g7
9157 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
9158@@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
9159 2: BACKOFF_SPIN(%o2, %o3, 1b)
9160 ENDPROC(atomic_add_ret)
9161
9162+ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
9163+ BACKOFF_SETUP(%o2)
9164+1: lduw [%o1], %g1
9165+ addcc %g1, %o0, %g7
9166+ cas [%o1], %g1, %g7
9167+ cmp %g1, %g7
9168+ bne,pn %icc, 2f
9169+ add %g7, %o0, %g7
9170+ sra %g7, 0, %o0
9171+ retl
9172+ nop
9173+2: BACKOFF_SPIN(%o2, %o3, 1b)
9174+ENDPROC(atomic_add_ret_unchecked)
9175+
9176 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
9177 BACKOFF_SETUP(%o2)
9178 1: lduw [%o1], %g1
9179- sub %g1, %o0, %g7
9180+ subcc %g1, %o0, %g7
9181+
9182+#ifdef CONFIG_PAX_REFCOUNT
9183+ tvs %icc, 6
9184+#endif
9185+
9186 cas [%o1], %g1, %g7
9187 cmp %g1, %g7
9188 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
9189@@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
9190 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
9191 BACKOFF_SETUP(%o2)
9192 1: ldx [%o1], %g1
9193- add %g1, %o0, %g7
9194+ addcc %g1, %o0, %g7
9195+
9196+#ifdef CONFIG_PAX_REFCOUNT
9197+ tvs %xcc, 6
9198+#endif
9199+
9200 casx [%o1], %g1, %g7
9201 cmp %g1, %g7
9202 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
9203@@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
9204 2: BACKOFF_SPIN(%o2, %o3, 1b)
9205 ENDPROC(atomic64_add)
9206
9207+ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
9208+ BACKOFF_SETUP(%o2)
9209+1: ldx [%o1], %g1
9210+ addcc %g1, %o0, %g7
9211+ casx [%o1], %g1, %g7
9212+ cmp %g1, %g7
9213+ bne,pn %xcc, 2f
9214+ nop
9215+ retl
9216+ nop
9217+2: BACKOFF_SPIN(%o2, %o3, 1b)
9218+ENDPROC(atomic64_add_unchecked)
9219+
9220 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
9221 BACKOFF_SETUP(%o2)
9222 1: ldx [%o1], %g1
9223- sub %g1, %o0, %g7
9224+ subcc %g1, %o0, %g7
9225+
9226+#ifdef CONFIG_PAX_REFCOUNT
9227+ tvs %xcc, 6
9228+#endif
9229+
9230 casx [%o1], %g1, %g7
9231 cmp %g1, %g7
9232 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
9233@@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
9234 2: BACKOFF_SPIN(%o2, %o3, 1b)
9235 ENDPROC(atomic64_sub)
9236
9237+ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
9238+ BACKOFF_SETUP(%o2)
9239+1: ldx [%o1], %g1
9240+ subcc %g1, %o0, %g7
9241+ casx [%o1], %g1, %g7
9242+ cmp %g1, %g7
9243+ bne,pn %xcc, 2f
9244+ nop
9245+ retl
9246+ nop
9247+2: BACKOFF_SPIN(%o2, %o3, 1b)
9248+ENDPROC(atomic64_sub_unchecked)
9249+
9250 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
9251 BACKOFF_SETUP(%o2)
9252 1: ldx [%o1], %g1
9253- add %g1, %o0, %g7
9254+ addcc %g1, %o0, %g7
9255+
9256+#ifdef CONFIG_PAX_REFCOUNT
9257+ tvs %xcc, 6
9258+#endif
9259+
9260 casx [%o1], %g1, %g7
9261 cmp %g1, %g7
9262 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
9263@@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
9264 2: BACKOFF_SPIN(%o2, %o3, 1b)
9265 ENDPROC(atomic64_add_ret)
9266
9267+ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
9268+ BACKOFF_SETUP(%o2)
9269+1: ldx [%o1], %g1
9270+ addcc %g1, %o0, %g7
9271+ casx [%o1], %g1, %g7
9272+ cmp %g1, %g7
9273+ bne,pn %xcc, 2f
9274+ add %g7, %o0, %g7
9275+ mov %g7, %o0
9276+ retl
9277+ nop
9278+2: BACKOFF_SPIN(%o2, %o3, 1b)
9279+ENDPROC(atomic64_add_ret_unchecked)
9280+
9281 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
9282 BACKOFF_SETUP(%o2)
9283 1: ldx [%o1], %g1
9284- sub %g1, %o0, %g7
9285+ subcc %g1, %o0, %g7
9286+
9287+#ifdef CONFIG_PAX_REFCOUNT
9288+ tvs %xcc, 6
9289+#endif
9290+
9291 casx [%o1], %g1, %g7
9292 cmp %g1, %g7
9293 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
9294diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
9295index 0c4e35e..745d3e4 100644
9296--- a/arch/sparc/lib/ksyms.c
9297+++ b/arch/sparc/lib/ksyms.c
9298@@ -109,12 +109,18 @@ EXPORT_SYMBOL(__downgrade_write);
9299
9300 /* Atomic counter implementation. */
9301 EXPORT_SYMBOL(atomic_add);
9302+EXPORT_SYMBOL(atomic_add_unchecked);
9303 EXPORT_SYMBOL(atomic_add_ret);
9304+EXPORT_SYMBOL(atomic_add_ret_unchecked);
9305 EXPORT_SYMBOL(atomic_sub);
9306+EXPORT_SYMBOL(atomic_sub_unchecked);
9307 EXPORT_SYMBOL(atomic_sub_ret);
9308 EXPORT_SYMBOL(atomic64_add);
9309+EXPORT_SYMBOL(atomic64_add_unchecked);
9310 EXPORT_SYMBOL(atomic64_add_ret);
9311+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
9312 EXPORT_SYMBOL(atomic64_sub);
9313+EXPORT_SYMBOL(atomic64_sub_unchecked);
9314 EXPORT_SYMBOL(atomic64_sub_ret);
9315 EXPORT_SYMBOL(atomic64_dec_if_positive);
9316
9317diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
9318index 30c3ecc..736f015 100644
9319--- a/arch/sparc/mm/Makefile
9320+++ b/arch/sparc/mm/Makefile
9321@@ -2,7 +2,7 @@
9322 #
9323
9324 asflags-y := -ansi
9325-ccflags-y := -Werror
9326+#ccflags-y := -Werror
9327
9328 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
9329 obj-y += fault_$(BITS).o
9330diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
9331index e98bfda..ea8d221 100644
9332--- a/arch/sparc/mm/fault_32.c
9333+++ b/arch/sparc/mm/fault_32.c
9334@@ -21,6 +21,9 @@
9335 #include <linux/perf_event.h>
9336 #include <linux/interrupt.h>
9337 #include <linux/kdebug.h>
9338+#include <linux/slab.h>
9339+#include <linux/pagemap.h>
9340+#include <linux/compiler.h>
9341
9342 #include <asm/page.h>
9343 #include <asm/pgtable.h>
9344@@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
9345 return safe_compute_effective_address(regs, insn);
9346 }
9347
9348+#ifdef CONFIG_PAX_PAGEEXEC
9349+#ifdef CONFIG_PAX_DLRESOLVE
9350+static void pax_emuplt_close(struct vm_area_struct *vma)
9351+{
9352+ vma->vm_mm->call_dl_resolve = 0UL;
9353+}
9354+
9355+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9356+{
9357+ unsigned int *kaddr;
9358+
9359+ vmf->page = alloc_page(GFP_HIGHUSER);
9360+ if (!vmf->page)
9361+ return VM_FAULT_OOM;
9362+
9363+ kaddr = kmap(vmf->page);
9364+ memset(kaddr, 0, PAGE_SIZE);
9365+ kaddr[0] = 0x9DE3BFA8U; /* save */
9366+ flush_dcache_page(vmf->page);
9367+ kunmap(vmf->page);
9368+ return VM_FAULT_MAJOR;
9369+}
9370+
9371+static const struct vm_operations_struct pax_vm_ops = {
9372+ .close = pax_emuplt_close,
9373+ .fault = pax_emuplt_fault
9374+};
9375+
9376+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
9377+{
9378+ int ret;
9379+
9380+ INIT_LIST_HEAD(&vma->anon_vma_chain);
9381+ vma->vm_mm = current->mm;
9382+ vma->vm_start = addr;
9383+ vma->vm_end = addr + PAGE_SIZE;
9384+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
9385+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
9386+ vma->vm_ops = &pax_vm_ops;
9387+
9388+ ret = insert_vm_struct(current->mm, vma);
9389+ if (ret)
9390+ return ret;
9391+
9392+ ++current->mm->total_vm;
9393+ return 0;
9394+}
9395+#endif
9396+
9397+/*
9398+ * PaX: decide what to do with offenders (regs->pc = fault address)
9399+ *
9400+ * returns 1 when task should be killed
9401+ * 2 when patched PLT trampoline was detected
9402+ * 3 when unpatched PLT trampoline was detected
9403+ */
9404+static int pax_handle_fetch_fault(struct pt_regs *regs)
9405+{
9406+
9407+#ifdef CONFIG_PAX_EMUPLT
9408+ int err;
9409+
9410+ do { /* PaX: patched PLT emulation #1 */
9411+ unsigned int sethi1, sethi2, jmpl;
9412+
9413+ err = get_user(sethi1, (unsigned int *)regs->pc);
9414+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
9415+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
9416+
9417+ if (err)
9418+ break;
9419+
9420+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
9421+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
9422+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
9423+ {
9424+ unsigned int addr;
9425+
9426+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
9427+ addr = regs->u_regs[UREG_G1];
9428+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
9429+ regs->pc = addr;
9430+ regs->npc = addr+4;
9431+ return 2;
9432+ }
9433+ } while (0);
9434+
9435+ do { /* PaX: patched PLT emulation #2 */
9436+ unsigned int ba;
9437+
9438+ err = get_user(ba, (unsigned int *)regs->pc);
9439+
9440+ if (err)
9441+ break;
9442+
9443+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
9444+ unsigned int addr;
9445+
9446+ if ((ba & 0xFFC00000U) == 0x30800000U)
9447+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
9448+ else
9449+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
9450+ regs->pc = addr;
9451+ regs->npc = addr+4;
9452+ return 2;
9453+ }
9454+ } while (0);
9455+
9456+ do { /* PaX: patched PLT emulation #3 */
9457+ unsigned int sethi, bajmpl, nop;
9458+
9459+ err = get_user(sethi, (unsigned int *)regs->pc);
9460+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
9461+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
9462+
9463+ if (err)
9464+ break;
9465+
9466+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9467+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
9468+ nop == 0x01000000U)
9469+ {
9470+ unsigned int addr;
9471+
9472+ addr = (sethi & 0x003FFFFFU) << 10;
9473+ regs->u_regs[UREG_G1] = addr;
9474+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
9475+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
9476+ else
9477+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
9478+ regs->pc = addr;
9479+ regs->npc = addr+4;
9480+ return 2;
9481+ }
9482+ } while (0);
9483+
9484+ do { /* PaX: unpatched PLT emulation step 1 */
9485+ unsigned int sethi, ba, nop;
9486+
9487+ err = get_user(sethi, (unsigned int *)regs->pc);
9488+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
9489+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
9490+
9491+ if (err)
9492+ break;
9493+
9494+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9495+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
9496+ nop == 0x01000000U)
9497+ {
9498+ unsigned int addr, save, call;
9499+
9500+ if ((ba & 0xFFC00000U) == 0x30800000U)
9501+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
9502+ else
9503+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
9504+
9505+ err = get_user(save, (unsigned int *)addr);
9506+ err |= get_user(call, (unsigned int *)(addr+4));
9507+ err |= get_user(nop, (unsigned int *)(addr+8));
9508+ if (err)
9509+ break;
9510+
9511+#ifdef CONFIG_PAX_DLRESOLVE
9512+ if (save == 0x9DE3BFA8U &&
9513+ (call & 0xC0000000U) == 0x40000000U &&
9514+ nop == 0x01000000U)
9515+ {
9516+ struct vm_area_struct *vma;
9517+ unsigned long call_dl_resolve;
9518+
9519+ down_read(&current->mm->mmap_sem);
9520+ call_dl_resolve = current->mm->call_dl_resolve;
9521+ up_read(&current->mm->mmap_sem);
9522+ if (likely(call_dl_resolve))
9523+ goto emulate;
9524+
9525+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
9526+
9527+ down_write(&current->mm->mmap_sem);
9528+ if (current->mm->call_dl_resolve) {
9529+ call_dl_resolve = current->mm->call_dl_resolve;
9530+ up_write(&current->mm->mmap_sem);
9531+ if (vma)
9532+ kmem_cache_free(vm_area_cachep, vma);
9533+ goto emulate;
9534+ }
9535+
9536+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
9537+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
9538+ up_write(&current->mm->mmap_sem);
9539+ if (vma)
9540+ kmem_cache_free(vm_area_cachep, vma);
9541+ return 1;
9542+ }
9543+
9544+ if (pax_insert_vma(vma, call_dl_resolve)) {
9545+ up_write(&current->mm->mmap_sem);
9546+ kmem_cache_free(vm_area_cachep, vma);
9547+ return 1;
9548+ }
9549+
9550+ current->mm->call_dl_resolve = call_dl_resolve;
9551+ up_write(&current->mm->mmap_sem);
9552+
9553+emulate:
9554+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
9555+ regs->pc = call_dl_resolve;
9556+ regs->npc = addr+4;
9557+ return 3;
9558+ }
9559+#endif
9560+
9561+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
9562+ if ((save & 0xFFC00000U) == 0x05000000U &&
9563+ (call & 0xFFFFE000U) == 0x85C0A000U &&
9564+ nop == 0x01000000U)
9565+ {
9566+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
9567+ regs->u_regs[UREG_G2] = addr + 4;
9568+ addr = (save & 0x003FFFFFU) << 10;
9569+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
9570+ regs->pc = addr;
9571+ regs->npc = addr+4;
9572+ return 3;
9573+ }
9574+ }
9575+ } while (0);
9576+
9577+ do { /* PaX: unpatched PLT emulation step 2 */
9578+ unsigned int save, call, nop;
9579+
9580+ err = get_user(save, (unsigned int *)(regs->pc-4));
9581+ err |= get_user(call, (unsigned int *)regs->pc);
9582+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
9583+ if (err)
9584+ break;
9585+
9586+ if (save == 0x9DE3BFA8U &&
9587+ (call & 0xC0000000U) == 0x40000000U &&
9588+ nop == 0x01000000U)
9589+ {
9590+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
9591+
9592+ regs->u_regs[UREG_RETPC] = regs->pc;
9593+ regs->pc = dl_resolve;
9594+ regs->npc = dl_resolve+4;
9595+ return 3;
9596+ }
9597+ } while (0);
9598+#endif
9599+
9600+ return 1;
9601+}
9602+
9603+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9604+{
9605+ unsigned long i;
9606+
9607+ printk(KERN_ERR "PAX: bytes at PC: ");
9608+ for (i = 0; i < 8; i++) {
9609+ unsigned int c;
9610+ if (get_user(c, (unsigned int *)pc+i))
9611+ printk(KERN_CONT "???????? ");
9612+ else
9613+ printk(KERN_CONT "%08x ", c);
9614+ }
9615+ printk("\n");
9616+}
9617+#endif
9618+
9619 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
9620 int text_fault)
9621 {
9622@@ -230,6 +504,24 @@ good_area:
9623 if (!(vma->vm_flags & VM_WRITE))
9624 goto bad_area;
9625 } else {
9626+
9627+#ifdef CONFIG_PAX_PAGEEXEC
9628+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
9629+ up_read(&mm->mmap_sem);
9630+ switch (pax_handle_fetch_fault(regs)) {
9631+
9632+#ifdef CONFIG_PAX_EMUPLT
9633+ case 2:
9634+ case 3:
9635+ return;
9636+#endif
9637+
9638+ }
9639+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
9640+ do_group_exit(SIGKILL);
9641+ }
9642+#endif
9643+
9644 /* Allow reads even for write-only mappings */
9645 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
9646 goto bad_area;
9647diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
9648index 5062ff3..e0b75f3 100644
9649--- a/arch/sparc/mm/fault_64.c
9650+++ b/arch/sparc/mm/fault_64.c
9651@@ -21,6 +21,9 @@
9652 #include <linux/kprobes.h>
9653 #include <linux/kdebug.h>
9654 #include <linux/percpu.h>
9655+#include <linux/slab.h>
9656+#include <linux/pagemap.h>
9657+#include <linux/compiler.h>
9658
9659 #include <asm/page.h>
9660 #include <asm/pgtable.h>
9661@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
9662 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
9663 regs->tpc);
9664 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
9665- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
9666+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
9667 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
9668 dump_stack();
9669 unhandled_fault(regs->tpc, current, regs);
9670@@ -270,6 +273,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
9671 show_regs(regs);
9672 }
9673
9674+#ifdef CONFIG_PAX_PAGEEXEC
9675+#ifdef CONFIG_PAX_DLRESOLVE
9676+static void pax_emuplt_close(struct vm_area_struct *vma)
9677+{
9678+ vma->vm_mm->call_dl_resolve = 0UL;
9679+}
9680+
9681+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9682+{
9683+ unsigned int *kaddr;
9684+
9685+ vmf->page = alloc_page(GFP_HIGHUSER);
9686+ if (!vmf->page)
9687+ return VM_FAULT_OOM;
9688+
9689+ kaddr = kmap(vmf->page);
9690+ memset(kaddr, 0, PAGE_SIZE);
9691+ kaddr[0] = 0x9DE3BFA8U; /* save */
9692+ flush_dcache_page(vmf->page);
9693+ kunmap(vmf->page);
9694+ return VM_FAULT_MAJOR;
9695+}
9696+
9697+static const struct vm_operations_struct pax_vm_ops = {
9698+ .close = pax_emuplt_close,
9699+ .fault = pax_emuplt_fault
9700+};
9701+
9702+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
9703+{
9704+ int ret;
9705+
9706+ INIT_LIST_HEAD(&vma->anon_vma_chain);
9707+ vma->vm_mm = current->mm;
9708+ vma->vm_start = addr;
9709+ vma->vm_end = addr + PAGE_SIZE;
9710+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
9711+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
9712+ vma->vm_ops = &pax_vm_ops;
9713+
9714+ ret = insert_vm_struct(current->mm, vma);
9715+ if (ret)
9716+ return ret;
9717+
9718+ ++current->mm->total_vm;
9719+ return 0;
9720+}
9721+#endif
9722+
9723+/*
9724+ * PaX: decide what to do with offenders (regs->tpc = fault address)
9725+ *
9726+ * returns 1 when task should be killed
9727+ * 2 when patched PLT trampoline was detected
9728+ * 3 when unpatched PLT trampoline was detected
9729+ */
9730+static int pax_handle_fetch_fault(struct pt_regs *regs)
9731+{
9732+
9733+#ifdef CONFIG_PAX_EMUPLT
9734+ int err;
9735+
9736+ do { /* PaX: patched PLT emulation #1 */
9737+ unsigned int sethi1, sethi2, jmpl;
9738+
9739+ err = get_user(sethi1, (unsigned int *)regs->tpc);
9740+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
9741+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
9742+
9743+ if (err)
9744+ break;
9745+
9746+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
9747+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
9748+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
9749+ {
9750+ unsigned long addr;
9751+
9752+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
9753+ addr = regs->u_regs[UREG_G1];
9754+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
9755+
9756+ if (test_thread_flag(TIF_32BIT))
9757+ addr &= 0xFFFFFFFFUL;
9758+
9759+ regs->tpc = addr;
9760+ regs->tnpc = addr+4;
9761+ return 2;
9762+ }
9763+ } while (0);
9764+
9765+ do { /* PaX: patched PLT emulation #2 */
9766+ unsigned int ba;
9767+
9768+ err = get_user(ba, (unsigned int *)regs->tpc);
9769+
9770+ if (err)
9771+ break;
9772+
9773+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
9774+ unsigned long addr;
9775+
9776+ if ((ba & 0xFFC00000U) == 0x30800000U)
9777+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
9778+ else
9779+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
9780+
9781+ if (test_thread_flag(TIF_32BIT))
9782+ addr &= 0xFFFFFFFFUL;
9783+
9784+ regs->tpc = addr;
9785+ regs->tnpc = addr+4;
9786+ return 2;
9787+ }
9788+ } while (0);
9789+
9790+ do { /* PaX: patched PLT emulation #3 */
9791+ unsigned int sethi, bajmpl, nop;
9792+
9793+ err = get_user(sethi, (unsigned int *)regs->tpc);
9794+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
9795+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
9796+
9797+ if (err)
9798+ break;
9799+
9800+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9801+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
9802+ nop == 0x01000000U)
9803+ {
9804+ unsigned long addr;
9805+
9806+ addr = (sethi & 0x003FFFFFU) << 10;
9807+ regs->u_regs[UREG_G1] = addr;
9808+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
9809+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
9810+ else
9811+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
9812+
9813+ if (test_thread_flag(TIF_32BIT))
9814+ addr &= 0xFFFFFFFFUL;
9815+
9816+ regs->tpc = addr;
9817+ regs->tnpc = addr+4;
9818+ return 2;
9819+ }
9820+ } while (0);
9821+
9822+ do { /* PaX: patched PLT emulation #4 */
9823+ unsigned int sethi, mov1, call, mov2;
9824+
9825+ err = get_user(sethi, (unsigned int *)regs->tpc);
9826+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
9827+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
9828+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
9829+
9830+ if (err)
9831+ break;
9832+
9833+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9834+ mov1 == 0x8210000FU &&
9835+ (call & 0xC0000000U) == 0x40000000U &&
9836+ mov2 == 0x9E100001U)
9837+ {
9838+ unsigned long addr;
9839+
9840+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
9841+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
9842+
9843+ if (test_thread_flag(TIF_32BIT))
9844+ addr &= 0xFFFFFFFFUL;
9845+
9846+ regs->tpc = addr;
9847+ regs->tnpc = addr+4;
9848+ return 2;
9849+ }
9850+ } while (0);
9851+
9852+ do { /* PaX: patched PLT emulation #5 */
9853+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
9854+
9855+ err = get_user(sethi, (unsigned int *)regs->tpc);
9856+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
9857+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
9858+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
9859+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
9860+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
9861+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
9862+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
9863+
9864+ if (err)
9865+ break;
9866+
9867+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9868+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
9869+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
9870+ (or1 & 0xFFFFE000U) == 0x82106000U &&
9871+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
9872+ sllx == 0x83287020U &&
9873+ jmpl == 0x81C04005U &&
9874+ nop == 0x01000000U)
9875+ {
9876+ unsigned long addr;
9877+
9878+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
9879+ regs->u_regs[UREG_G1] <<= 32;
9880+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
9881+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
9882+ regs->tpc = addr;
9883+ regs->tnpc = addr+4;
9884+ return 2;
9885+ }
9886+ } while (0);
9887+
9888+ do { /* PaX: patched PLT emulation #6 */
9889+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
9890+
9891+ err = get_user(sethi, (unsigned int *)regs->tpc);
9892+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
9893+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
9894+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
9895+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
9896+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
9897+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
9898+
9899+ if (err)
9900+ break;
9901+
9902+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9903+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
9904+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
9905+ sllx == 0x83287020U &&
9906+ (or & 0xFFFFE000U) == 0x8A116000U &&
9907+ jmpl == 0x81C04005U &&
9908+ nop == 0x01000000U)
9909+ {
9910+ unsigned long addr;
9911+
9912+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
9913+ regs->u_regs[UREG_G1] <<= 32;
9914+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
9915+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
9916+ regs->tpc = addr;
9917+ regs->tnpc = addr+4;
9918+ return 2;
9919+ }
9920+ } while (0);
9921+
9922+ do { /* PaX: unpatched PLT emulation step 1 */
9923+ unsigned int sethi, ba, nop;
9924+
9925+ err = get_user(sethi, (unsigned int *)regs->tpc);
9926+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
9927+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
9928+
9929+ if (err)
9930+ break;
9931+
9932+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
9933+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
9934+ nop == 0x01000000U)
9935+ {
9936+ unsigned long addr;
9937+ unsigned int save, call;
9938+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
9939+
9940+ if ((ba & 0xFFC00000U) == 0x30800000U)
9941+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
9942+ else
9943+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
9944+
9945+ if (test_thread_flag(TIF_32BIT))
9946+ addr &= 0xFFFFFFFFUL;
9947+
9948+ err = get_user(save, (unsigned int *)addr);
9949+ err |= get_user(call, (unsigned int *)(addr+4));
9950+ err |= get_user(nop, (unsigned int *)(addr+8));
9951+ if (err)
9952+ break;
9953+
9954+#ifdef CONFIG_PAX_DLRESOLVE
9955+ if (save == 0x9DE3BFA8U &&
9956+ (call & 0xC0000000U) == 0x40000000U &&
9957+ nop == 0x01000000U)
9958+ {
9959+ struct vm_area_struct *vma;
9960+ unsigned long call_dl_resolve;
9961+
9962+ down_read(&current->mm->mmap_sem);
9963+ call_dl_resolve = current->mm->call_dl_resolve;
9964+ up_read(&current->mm->mmap_sem);
9965+ if (likely(call_dl_resolve))
9966+ goto emulate;
9967+
9968+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
9969+
9970+ down_write(&current->mm->mmap_sem);
9971+ if (current->mm->call_dl_resolve) {
9972+ call_dl_resolve = current->mm->call_dl_resolve;
9973+ up_write(&current->mm->mmap_sem);
9974+ if (vma)
9975+ kmem_cache_free(vm_area_cachep, vma);
9976+ goto emulate;
9977+ }
9978+
9979+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
9980+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
9981+ up_write(&current->mm->mmap_sem);
9982+ if (vma)
9983+ kmem_cache_free(vm_area_cachep, vma);
9984+ return 1;
9985+ }
9986+
9987+ if (pax_insert_vma(vma, call_dl_resolve)) {
9988+ up_write(&current->mm->mmap_sem);
9989+ kmem_cache_free(vm_area_cachep, vma);
9990+ return 1;
9991+ }
9992+
9993+ current->mm->call_dl_resolve = call_dl_resolve;
9994+ up_write(&current->mm->mmap_sem);
9995+
9996+emulate:
9997+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
9998+ regs->tpc = call_dl_resolve;
9999+ regs->tnpc = addr+4;
10000+ return 3;
10001+ }
10002+#endif
10003+
10004+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
10005+ if ((save & 0xFFC00000U) == 0x05000000U &&
10006+ (call & 0xFFFFE000U) == 0x85C0A000U &&
10007+ nop == 0x01000000U)
10008+ {
10009+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
10010+ regs->u_regs[UREG_G2] = addr + 4;
10011+ addr = (save & 0x003FFFFFU) << 10;
10012+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
10013+
10014+ if (test_thread_flag(TIF_32BIT))
10015+ addr &= 0xFFFFFFFFUL;
10016+
10017+ regs->tpc = addr;
10018+ regs->tnpc = addr+4;
10019+ return 3;
10020+ }
10021+
10022+ /* PaX: 64-bit PLT stub */
10023+ err = get_user(sethi1, (unsigned int *)addr);
10024+ err |= get_user(sethi2, (unsigned int *)(addr+4));
10025+ err |= get_user(or1, (unsigned int *)(addr+8));
10026+ err |= get_user(or2, (unsigned int *)(addr+12));
10027+ err |= get_user(sllx, (unsigned int *)(addr+16));
10028+ err |= get_user(add, (unsigned int *)(addr+20));
10029+ err |= get_user(jmpl, (unsigned int *)(addr+24));
10030+ err |= get_user(nop, (unsigned int *)(addr+28));
10031+ if (err)
10032+ break;
10033+
10034+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
10035+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
10036+ (or1 & 0xFFFFE000U) == 0x88112000U &&
10037+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
10038+ sllx == 0x89293020U &&
10039+ add == 0x8A010005U &&
10040+ jmpl == 0x89C14000U &&
10041+ nop == 0x01000000U)
10042+ {
10043+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
10044+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
10045+ regs->u_regs[UREG_G4] <<= 32;
10046+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
10047+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
10048+ regs->u_regs[UREG_G4] = addr + 24;
10049+ addr = regs->u_regs[UREG_G5];
10050+ regs->tpc = addr;
10051+ regs->tnpc = addr+4;
10052+ return 3;
10053+ }
10054+ }
10055+ } while (0);
10056+
10057+#ifdef CONFIG_PAX_DLRESOLVE
10058+ do { /* PaX: unpatched PLT emulation step 2 */
10059+ unsigned int save, call, nop;
10060+
10061+ err = get_user(save, (unsigned int *)(regs->tpc-4));
10062+ err |= get_user(call, (unsigned int *)regs->tpc);
10063+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
10064+ if (err)
10065+ break;
10066+
10067+ if (save == 0x9DE3BFA8U &&
10068+ (call & 0xC0000000U) == 0x40000000U &&
10069+ nop == 0x01000000U)
10070+ {
10071+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
10072+
10073+ if (test_thread_flag(TIF_32BIT))
10074+ dl_resolve &= 0xFFFFFFFFUL;
10075+
10076+ regs->u_regs[UREG_RETPC] = regs->tpc;
10077+ regs->tpc = dl_resolve;
10078+ regs->tnpc = dl_resolve+4;
10079+ return 3;
10080+ }
10081+ } while (0);
10082+#endif
10083+
10084+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
10085+ unsigned int sethi, ba, nop;
10086+
10087+ err = get_user(sethi, (unsigned int *)regs->tpc);
10088+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
10089+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
10090+
10091+ if (err)
10092+ break;
10093+
10094+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
10095+ (ba & 0xFFF00000U) == 0x30600000U &&
10096+ nop == 0x01000000U)
10097+ {
10098+ unsigned long addr;
10099+
10100+ addr = (sethi & 0x003FFFFFU) << 10;
10101+ regs->u_regs[UREG_G1] = addr;
10102+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
10103+
10104+ if (test_thread_flag(TIF_32BIT))
10105+ addr &= 0xFFFFFFFFUL;
10106+
10107+ regs->tpc = addr;
10108+ regs->tnpc = addr+4;
10109+ return 2;
10110+ }
10111+ } while (0);
10112+
10113+#endif
10114+
10115+ return 1;
10116+}
10117+
10118+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
10119+{
10120+ unsigned long i;
10121+
10122+ printk(KERN_ERR "PAX: bytes at PC: ");
10123+ for (i = 0; i < 8; i++) {
10124+ unsigned int c;
10125+ if (get_user(c, (unsigned int *)pc+i))
10126+ printk(KERN_CONT "???????? ");
10127+ else
10128+ printk(KERN_CONT "%08x ", c);
10129+ }
10130+ printk("\n");
10131+}
10132+#endif
10133+
10134 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
10135 {
10136 struct mm_struct *mm = current->mm;
10137@@ -341,6 +804,29 @@ retry:
10138 if (!vma)
10139 goto bad_area;
10140
10141+#ifdef CONFIG_PAX_PAGEEXEC
10142+ /* PaX: detect ITLB misses on non-exec pages */
10143+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
10144+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
10145+ {
10146+ if (address != regs->tpc)
10147+ goto good_area;
10148+
10149+ up_read(&mm->mmap_sem);
10150+ switch (pax_handle_fetch_fault(regs)) {
10151+
10152+#ifdef CONFIG_PAX_EMUPLT
10153+ case 2:
10154+ case 3:
10155+ return;
10156+#endif
10157+
10158+ }
10159+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
10160+ do_group_exit(SIGKILL);
10161+ }
10162+#endif
10163+
10164 /* Pure DTLB misses do not tell us whether the fault causing
10165 * load/store/atomic was a write or not, it only says that there
10166 * was no match. So in such a case we (carefully) read the
10167diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
10168index d2b5944..d878f3c 100644
10169--- a/arch/sparc/mm/hugetlbpage.c
10170+++ b/arch/sparc/mm/hugetlbpage.c
10171@@ -28,7 +28,8 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
10172 unsigned long addr,
10173 unsigned long len,
10174 unsigned long pgoff,
10175- unsigned long flags)
10176+ unsigned long flags,
10177+ unsigned long offset)
10178 {
10179 unsigned long task_size = TASK_SIZE;
10180 struct vm_unmapped_area_info info;
10181@@ -38,15 +39,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
10182
10183 info.flags = 0;
10184 info.length = len;
10185- info.low_limit = TASK_UNMAPPED_BASE;
10186+ info.low_limit = mm->mmap_base;
10187 info.high_limit = min(task_size, VA_EXCLUDE_START);
10188 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
10189 info.align_offset = 0;
10190+ info.threadstack_offset = offset;
10191 addr = vm_unmapped_area(&info);
10192
10193 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10194 VM_BUG_ON(addr != -ENOMEM);
10195 info.low_limit = VA_EXCLUDE_END;
10196+
10197+#ifdef CONFIG_PAX_RANDMMAP
10198+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10199+ info.low_limit += mm->delta_mmap;
10200+#endif
10201+
10202 info.high_limit = task_size;
10203 addr = vm_unmapped_area(&info);
10204 }
10205@@ -58,7 +66,8 @@ static unsigned long
10206 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10207 const unsigned long len,
10208 const unsigned long pgoff,
10209- const unsigned long flags)
10210+ const unsigned long flags,
10211+ const unsigned long offset)
10212 {
10213 struct mm_struct *mm = current->mm;
10214 unsigned long addr = addr0;
10215@@ -73,6 +82,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10216 info.high_limit = mm->mmap_base;
10217 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
10218 info.align_offset = 0;
10219+ info.threadstack_offset = offset;
10220 addr = vm_unmapped_area(&info);
10221
10222 /*
10223@@ -85,6 +95,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10224 VM_BUG_ON(addr != -ENOMEM);
10225 info.flags = 0;
10226 info.low_limit = TASK_UNMAPPED_BASE;
10227+
10228+#ifdef CONFIG_PAX_RANDMMAP
10229+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10230+ info.low_limit += mm->delta_mmap;
10231+#endif
10232+
10233 info.high_limit = STACK_TOP32;
10234 addr = vm_unmapped_area(&info);
10235 }
10236@@ -99,6 +115,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
10237 struct mm_struct *mm = current->mm;
10238 struct vm_area_struct *vma;
10239 unsigned long task_size = TASK_SIZE;
10240+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
10241
10242 if (test_thread_flag(TIF_32BIT))
10243 task_size = STACK_TOP32;
10244@@ -114,19 +131,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
10245 return addr;
10246 }
10247
10248+#ifdef CONFIG_PAX_RANDMMAP
10249+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10250+#endif
10251+
10252 if (addr) {
10253 addr = ALIGN(addr, HPAGE_SIZE);
10254 vma = find_vma(mm, addr);
10255- if (task_size - len >= addr &&
10256- (!vma || addr + len <= vma->vm_start))
10257+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10258 return addr;
10259 }
10260 if (mm->get_unmapped_area == arch_get_unmapped_area)
10261 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
10262- pgoff, flags);
10263+ pgoff, flags, offset);
10264 else
10265 return hugetlb_get_unmapped_area_topdown(file, addr, len,
10266- pgoff, flags);
10267+ pgoff, flags, offset);
10268 }
10269
10270 pte_t *huge_pte_alloc(struct mm_struct *mm,
10271diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
10272index f4500c6..889656c 100644
10273--- a/arch/tile/include/asm/atomic_64.h
10274+++ b/arch/tile/include/asm/atomic_64.h
10275@@ -143,6 +143,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10276
10277 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10278
10279+#define atomic64_read_unchecked(v) atomic64_read(v)
10280+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
10281+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
10282+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
10283+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
10284+#define atomic64_inc_unchecked(v) atomic64_inc(v)
10285+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
10286+#define atomic64_dec_unchecked(v) atomic64_dec(v)
10287+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
10288+
10289 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
10290 #define smp_mb__before_atomic_dec() smp_mb()
10291 #define smp_mb__after_atomic_dec() smp_mb()
10292diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
10293index a9a5299..0fce79e 100644
10294--- a/arch/tile/include/asm/cache.h
10295+++ b/arch/tile/include/asm/cache.h
10296@@ -15,11 +15,12 @@
10297 #ifndef _ASM_TILE_CACHE_H
10298 #define _ASM_TILE_CACHE_H
10299
10300+#include <linux/const.h>
10301 #include <arch/chip.h>
10302
10303 /* bytes per L1 data cache line */
10304 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
10305-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
10306+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10307
10308 /* bytes per L2 cache line */
10309 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
10310diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
10311index 8a082bc..7a6bf87 100644
10312--- a/arch/tile/include/asm/uaccess.h
10313+++ b/arch/tile/include/asm/uaccess.h
10314@@ -408,9 +408,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
10315 const void __user *from,
10316 unsigned long n)
10317 {
10318- int sz = __compiletime_object_size(to);
10319+ size_t sz = __compiletime_object_size(to);
10320
10321- if (likely(sz == -1 || sz >= n))
10322+ if (likely(sz == (size_t)-1 || sz >= n))
10323 n = _copy_from_user(to, from, n);
10324 else
10325 copy_from_user_overflow();
10326diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
10327index 650ccff..45fe2d6 100644
10328--- a/arch/tile/mm/hugetlbpage.c
10329+++ b/arch/tile/mm/hugetlbpage.c
10330@@ -239,6 +239,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
10331 info.high_limit = TASK_SIZE;
10332 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
10333 info.align_offset = 0;
10334+ info.threadstack_offset = 0;
10335 return vm_unmapped_area(&info);
10336 }
10337
10338@@ -256,6 +257,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
10339 info.high_limit = current->mm->mmap_base;
10340 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
10341 info.align_offset = 0;
10342+ info.threadstack_offset = 0;
10343 addr = vm_unmapped_area(&info);
10344
10345 /*
10346diff --git a/arch/um/Makefile b/arch/um/Makefile
10347index 133f7de..1d6f2f1 100644
10348--- a/arch/um/Makefile
10349+++ b/arch/um/Makefile
10350@@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
10351 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
10352 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
10353
10354+ifdef CONSTIFY_PLUGIN
10355+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
10356+endif
10357+
10358 #This will adjust *FLAGS accordingly to the platform.
10359 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
10360
10361diff --git a/arch/um/defconfig b/arch/um/defconfig
10362index 08107a7..ab22afe 100644
10363--- a/arch/um/defconfig
10364+++ b/arch/um/defconfig
10365@@ -51,7 +51,6 @@ CONFIG_X86_CMPXCHG=y
10366 CONFIG_X86_L1_CACHE_SHIFT=5
10367 CONFIG_X86_XADD=y
10368 CONFIG_X86_PPRO_FENCE=y
10369-CONFIG_X86_WP_WORKS_OK=y
10370 CONFIG_X86_INVLPG=y
10371 CONFIG_X86_BSWAP=y
10372 CONFIG_X86_POPAD_OK=y
10373diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
10374index 19e1bdd..3665b77 100644
10375--- a/arch/um/include/asm/cache.h
10376+++ b/arch/um/include/asm/cache.h
10377@@ -1,6 +1,7 @@
10378 #ifndef __UM_CACHE_H
10379 #define __UM_CACHE_H
10380
10381+#include <linux/const.h>
10382
10383 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
10384 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
10385@@ -12,6 +13,6 @@
10386 # define L1_CACHE_SHIFT 5
10387 #endif
10388
10389-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
10390+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10391
10392 #endif
10393diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
10394index 2e0a6b1..a64d0f5 100644
10395--- a/arch/um/include/asm/kmap_types.h
10396+++ b/arch/um/include/asm/kmap_types.h
10397@@ -8,6 +8,6 @@
10398
10399 /* No more #include "asm/arch/kmap_types.h" ! */
10400
10401-#define KM_TYPE_NR 14
10402+#define KM_TYPE_NR 15
10403
10404 #endif
10405diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
10406index 5ff53d9..5850cdf 100644
10407--- a/arch/um/include/asm/page.h
10408+++ b/arch/um/include/asm/page.h
10409@@ -14,6 +14,9 @@
10410 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
10411 #define PAGE_MASK (~(PAGE_SIZE-1))
10412
10413+#define ktla_ktva(addr) (addr)
10414+#define ktva_ktla(addr) (addr)
10415+
10416 #ifndef __ASSEMBLY__
10417
10418 struct page;
10419diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
10420index 0032f92..cd151e0 100644
10421--- a/arch/um/include/asm/pgtable-3level.h
10422+++ b/arch/um/include/asm/pgtable-3level.h
10423@@ -58,6 +58,7 @@
10424 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
10425 #define pud_populate(mm, pud, pmd) \
10426 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
10427+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
10428
10429 #ifdef CONFIG_64BIT
10430 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
10431diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
10432index bbcef52..6a2a483 100644
10433--- a/arch/um/kernel/process.c
10434+++ b/arch/um/kernel/process.c
10435@@ -367,22 +367,6 @@ int singlestepping(void * t)
10436 return 2;
10437 }
10438
10439-/*
10440- * Only x86 and x86_64 have an arch_align_stack().
10441- * All other arches have "#define arch_align_stack(x) (x)"
10442- * in their asm/system.h
10443- * As this is included in UML from asm-um/system-generic.h,
10444- * we can use it to behave as the subarch does.
10445- */
10446-#ifndef arch_align_stack
10447-unsigned long arch_align_stack(unsigned long sp)
10448-{
10449- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
10450- sp -= get_random_int() % 8192;
10451- return sp & ~0xf;
10452-}
10453-#endif
10454-
10455 unsigned long get_wchan(struct task_struct *p)
10456 {
10457 unsigned long stack_page, sp, ip;
10458diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
10459index ad8f795..2c7eec6 100644
10460--- a/arch/unicore32/include/asm/cache.h
10461+++ b/arch/unicore32/include/asm/cache.h
10462@@ -12,8 +12,10 @@
10463 #ifndef __UNICORE_CACHE_H__
10464 #define __UNICORE_CACHE_H__
10465
10466-#define L1_CACHE_SHIFT (5)
10467-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
10468+#include <linux/const.h>
10469+
10470+#define L1_CACHE_SHIFT 5
10471+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10472
10473 /*
10474 * Memory returned by kmalloc() may be used for DMA, so we must make
10475diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
10476index fe120da..24177f7 100644
10477--- a/arch/x86/Kconfig
10478+++ b/arch/x86/Kconfig
10479@@ -239,7 +239,7 @@ config X86_HT
10480
10481 config X86_32_LAZY_GS
10482 def_bool y
10483- depends on X86_32 && !CC_STACKPROTECTOR
10484+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
10485
10486 config ARCH_HWEIGHT_CFLAGS
10487 string
10488@@ -1073,6 +1073,7 @@ config MICROCODE_EARLY
10489
10490 config X86_MSR
10491 tristate "/dev/cpu/*/msr - Model-specific register support"
10492+ depends on !GRKERNSEC_KMEM
10493 ---help---
10494 This device gives privileged processes access to the x86
10495 Model-Specific Registers (MSRs). It is a character device with
10496@@ -1096,7 +1097,7 @@ choice
10497
10498 config NOHIGHMEM
10499 bool "off"
10500- depends on !X86_NUMAQ
10501+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
10502 ---help---
10503 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
10504 However, the address space of 32-bit x86 processors is only 4
10505@@ -1133,7 +1134,7 @@ config NOHIGHMEM
10506
10507 config HIGHMEM4G
10508 bool "4GB"
10509- depends on !X86_NUMAQ
10510+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
10511 ---help---
10512 Select this if you have a 32-bit processor and between 1 and 4
10513 gigabytes of physical RAM.
10514@@ -1186,7 +1187,7 @@ config PAGE_OFFSET
10515 hex
10516 default 0xB0000000 if VMSPLIT_3G_OPT
10517 default 0x80000000 if VMSPLIT_2G
10518- default 0x78000000 if VMSPLIT_2G_OPT
10519+ default 0x70000000 if VMSPLIT_2G_OPT
10520 default 0x40000000 if VMSPLIT_1G
10521 default 0xC0000000
10522 depends on X86_32
10523@@ -1584,6 +1585,7 @@ config SECCOMP
10524
10525 config CC_STACKPROTECTOR
10526 bool "Enable -fstack-protector buffer overflow detection"
10527+ depends on X86_64 || !PAX_MEMORY_UDEREF
10528 ---help---
10529 This option turns on the -fstack-protector GCC feature. This
10530 feature puts, at the beginning of functions, a canary value on
10531@@ -1703,6 +1705,8 @@ config X86_NEED_RELOCS
10532 config PHYSICAL_ALIGN
10533 hex "Alignment value to which kernel should be aligned" if X86_32
10534 default "0x1000000"
10535+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
10536+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
10537 range 0x2000 0x1000000
10538 ---help---
10539 This value puts the alignment restrictions on physical address
10540@@ -1778,9 +1782,10 @@ config DEBUG_HOTPLUG_CPU0
10541 If unsure, say N.
10542
10543 config COMPAT_VDSO
10544- def_bool y
10545+ def_bool n
10546 prompt "Compat VDSO support"
10547 depends on X86_32 || IA32_EMULATION
10548+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
10549 ---help---
10550 Map the 32-bit VDSO to the predictable old-style address too.
10551
10552diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
10553index c026cca..14657ae 100644
10554--- a/arch/x86/Kconfig.cpu
10555+++ b/arch/x86/Kconfig.cpu
10556@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
10557
10558 config X86_F00F_BUG
10559 def_bool y
10560- depends on M586MMX || M586TSC || M586 || M486
10561+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
10562
10563 config X86_INVD_BUG
10564 def_bool y
10565@@ -327,7 +327,7 @@ config X86_INVD_BUG
10566
10567 config X86_ALIGNMENT_16
10568 def_bool y
10569- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
10570+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
10571
10572 config X86_INTEL_USERCOPY
10573 def_bool y
10574@@ -373,7 +373,7 @@ config X86_CMPXCHG64
10575 # generates cmov.
10576 config X86_CMOV
10577 def_bool y
10578- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
10579+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
10580
10581 config X86_MINIMUM_CPU_FAMILY
10582 int
10583diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
10584index c198b7e..63eea60 100644
10585--- a/arch/x86/Kconfig.debug
10586+++ b/arch/x86/Kconfig.debug
10587@@ -84,7 +84,7 @@ config X86_PTDUMP
10588 config DEBUG_RODATA
10589 bool "Write protect kernel read-only data structures"
10590 default y
10591- depends on DEBUG_KERNEL
10592+ depends on DEBUG_KERNEL && BROKEN
10593 ---help---
10594 Mark the kernel read-only data as write-protected in the pagetables,
10595 in order to catch accidental (and incorrect) writes to such const
10596@@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
10597
10598 config DEBUG_SET_MODULE_RONX
10599 bool "Set loadable kernel module data as NX and text as RO"
10600- depends on MODULES
10601+ depends on MODULES && BROKEN
10602 ---help---
10603 This option helps catch unintended modifications to loadable
10604 kernel module's text and read-only data. It also prevents execution
10605diff --git a/arch/x86/Makefile b/arch/x86/Makefile
10606index 5c47726..8c4fa67 100644
10607--- a/arch/x86/Makefile
10608+++ b/arch/x86/Makefile
10609@@ -54,6 +54,7 @@ else
10610 UTS_MACHINE := x86_64
10611 CHECKFLAGS += -D__x86_64__ -m64
10612
10613+ biarch := $(call cc-option,-m64)
10614 KBUILD_AFLAGS += -m64
10615 KBUILD_CFLAGS += -m64
10616
10617@@ -234,3 +235,12 @@ define archhelp
10618 echo ' FDARGS="..." arguments for the booted kernel'
10619 echo ' FDINITRD=file initrd for the booted kernel'
10620 endef
10621+
10622+define OLD_LD
10623+
10624+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
10625+*** Please upgrade your binutils to 2.18 or newer
10626+endef
10627+
10628+archprepare:
10629+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
10630diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
10631index 379814b..add62ce 100644
10632--- a/arch/x86/boot/Makefile
10633+++ b/arch/x86/boot/Makefile
10634@@ -65,6 +65,9 @@ KBUILD_CFLAGS := $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
10635 $(call cc-option, -fno-stack-protector) \
10636 $(call cc-option, -mpreferred-stack-boundary=2)
10637 KBUILD_CFLAGS += $(call cc-option, -m32)
10638+ifdef CONSTIFY_PLUGIN
10639+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
10640+endif
10641 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
10642 GCOV_PROFILE := n
10643
10644diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
10645index 878e4b9..20537ab 100644
10646--- a/arch/x86/boot/bitops.h
10647+++ b/arch/x86/boot/bitops.h
10648@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
10649 u8 v;
10650 const u32 *p = (const u32 *)addr;
10651
10652- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
10653+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
10654 return v;
10655 }
10656
10657@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
10658
10659 static inline void set_bit(int nr, void *addr)
10660 {
10661- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
10662+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
10663 }
10664
10665 #endif /* BOOT_BITOPS_H */
10666diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
10667index 5b75319..331a4ca 100644
10668--- a/arch/x86/boot/boot.h
10669+++ b/arch/x86/boot/boot.h
10670@@ -85,7 +85,7 @@ static inline void io_delay(void)
10671 static inline u16 ds(void)
10672 {
10673 u16 seg;
10674- asm("movw %%ds,%0" : "=rm" (seg));
10675+ asm volatile("movw %%ds,%0" : "=rm" (seg));
10676 return seg;
10677 }
10678
10679@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
10680 static inline int memcmp(const void *s1, const void *s2, size_t len)
10681 {
10682 u8 diff;
10683- asm("repe; cmpsb; setnz %0"
10684+ asm volatile("repe; cmpsb; setnz %0"
10685 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
10686 return diff;
10687 }
10688diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
10689index 5ef205c..342191d 100644
10690--- a/arch/x86/boot/compressed/Makefile
10691+++ b/arch/x86/boot/compressed/Makefile
10692@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
10693 KBUILD_CFLAGS += $(cflags-y)
10694 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
10695 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
10696+ifdef CONSTIFY_PLUGIN
10697+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
10698+endif
10699
10700 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
10701 GCOV_PROFILE := n
10702diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
10703index d606463..b887794 100644
10704--- a/arch/x86/boot/compressed/eboot.c
10705+++ b/arch/x86/boot/compressed/eboot.c
10706@@ -150,7 +150,6 @@ again:
10707 *addr = max_addr;
10708 }
10709
10710-free_pool:
10711 efi_call_phys1(sys_table->boottime->free_pool, map);
10712
10713 fail:
10714@@ -214,7 +213,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
10715 if (i == map_size / desc_size)
10716 status = EFI_NOT_FOUND;
10717
10718-free_pool:
10719 efi_call_phys1(sys_table->boottime->free_pool, map);
10720 fail:
10721 return status;
10722diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
10723index a53440e..c3dbf1e 100644
10724--- a/arch/x86/boot/compressed/efi_stub_32.S
10725+++ b/arch/x86/boot/compressed/efi_stub_32.S
10726@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
10727 * parameter 2, ..., param n. To make things easy, we save the return
10728 * address of efi_call_phys in a global variable.
10729 */
10730- popl %ecx
10731- movl %ecx, saved_return_addr(%edx)
10732- /* get the function pointer into ECX*/
10733- popl %ecx
10734- movl %ecx, efi_rt_function_ptr(%edx)
10735+ popl saved_return_addr(%edx)
10736+ popl efi_rt_function_ptr(%edx)
10737
10738 /*
10739 * 3. Call the physical function.
10740 */
10741- call *%ecx
10742+ call *efi_rt_function_ptr(%edx)
10743
10744 /*
10745 * 4. Balance the stack. And because EAX contain the return value,
10746@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
10747 1: popl %edx
10748 subl $1b, %edx
10749
10750- movl efi_rt_function_ptr(%edx), %ecx
10751- pushl %ecx
10752+ pushl efi_rt_function_ptr(%edx)
10753
10754 /*
10755 * 10. Push the saved return address onto the stack and return.
10756 */
10757- movl saved_return_addr(%edx), %ecx
10758- pushl %ecx
10759- ret
10760+ jmpl *saved_return_addr(%edx)
10761 ENDPROC(efi_call_phys)
10762 .previous
10763
10764diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
10765index 1e3184f..0d11e2e 100644
10766--- a/arch/x86/boot/compressed/head_32.S
10767+++ b/arch/x86/boot/compressed/head_32.S
10768@@ -118,7 +118,7 @@ preferred_addr:
10769 notl %eax
10770 andl %eax, %ebx
10771 #else
10772- movl $LOAD_PHYSICAL_ADDR, %ebx
10773+ movl $____LOAD_PHYSICAL_ADDR, %ebx
10774 #endif
10775
10776 /* Target address to relocate to for decompression */
10777@@ -204,7 +204,7 @@ relocated:
10778 * and where it was actually loaded.
10779 */
10780 movl %ebp, %ebx
10781- subl $LOAD_PHYSICAL_ADDR, %ebx
10782+ subl $____LOAD_PHYSICAL_ADDR, %ebx
10783 jz 2f /* Nothing to be done if loaded at compiled addr. */
10784 /*
10785 * Process relocations.
10786@@ -212,8 +212,7 @@ relocated:
10787
10788 1: subl $4, %edi
10789 movl (%edi), %ecx
10790- testl %ecx, %ecx
10791- jz 2f
10792+ jecxz 2f
10793 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
10794 jmp 1b
10795 2:
10796diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
10797index 16f24e6..47491a3 100644
10798--- a/arch/x86/boot/compressed/head_64.S
10799+++ b/arch/x86/boot/compressed/head_64.S
10800@@ -97,7 +97,7 @@ ENTRY(startup_32)
10801 notl %eax
10802 andl %eax, %ebx
10803 #else
10804- movl $LOAD_PHYSICAL_ADDR, %ebx
10805+ movl $____LOAD_PHYSICAL_ADDR, %ebx
10806 #endif
10807
10808 /* Target address to relocate to for decompression */
10809@@ -272,7 +272,7 @@ preferred_addr:
10810 notq %rax
10811 andq %rax, %rbp
10812 #else
10813- movq $LOAD_PHYSICAL_ADDR, %rbp
10814+ movq $____LOAD_PHYSICAL_ADDR, %rbp
10815 #endif
10816
10817 /* Target address to relocate to for decompression */
10818@@ -363,8 +363,8 @@ gdt:
10819 .long gdt
10820 .word 0
10821 .quad 0x0000000000000000 /* NULL descriptor */
10822- .quad 0x00af9a000000ffff /* __KERNEL_CS */
10823- .quad 0x00cf92000000ffff /* __KERNEL_DS */
10824+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
10825+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
10826 .quad 0x0080890000000000 /* TS descriptor */
10827 .quad 0x0000000000000000 /* TS continued */
10828 gdt_end:
10829diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
10830index 7cb56c6..d382d84 100644
10831--- a/arch/x86/boot/compressed/misc.c
10832+++ b/arch/x86/boot/compressed/misc.c
10833@@ -303,7 +303,7 @@ static void parse_elf(void *output)
10834 case PT_LOAD:
10835 #ifdef CONFIG_RELOCATABLE
10836 dest = output;
10837- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
10838+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
10839 #else
10840 dest = (void *)(phdr->p_paddr);
10841 #endif
10842@@ -354,7 +354,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
10843 error("Destination address too large");
10844 #endif
10845 #ifndef CONFIG_RELOCATABLE
10846- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
10847+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
10848 error("Wrong destination address");
10849 #endif
10850
10851diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
10852index 4d3ff03..e4972ff 100644
10853--- a/arch/x86/boot/cpucheck.c
10854+++ b/arch/x86/boot/cpucheck.c
10855@@ -74,7 +74,7 @@ static int has_fpu(void)
10856 u16 fcw = -1, fsw = -1;
10857 u32 cr0;
10858
10859- asm("movl %%cr0,%0" : "=r" (cr0));
10860+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
10861 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
10862 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
10863 asm volatile("movl %0,%%cr0" : : "r" (cr0));
10864@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
10865 {
10866 u32 f0, f1;
10867
10868- asm("pushfl ; "
10869+ asm volatile("pushfl ; "
10870 "pushfl ; "
10871 "popl %0 ; "
10872 "movl %0,%1 ; "
10873@@ -115,7 +115,7 @@ static void get_flags(void)
10874 set_bit(X86_FEATURE_FPU, cpu.flags);
10875
10876 if (has_eflag(X86_EFLAGS_ID)) {
10877- asm("cpuid"
10878+ asm volatile("cpuid"
10879 : "=a" (max_intel_level),
10880 "=b" (cpu_vendor[0]),
10881 "=d" (cpu_vendor[1]),
10882@@ -124,7 +124,7 @@ static void get_flags(void)
10883
10884 if (max_intel_level >= 0x00000001 &&
10885 max_intel_level <= 0x0000ffff) {
10886- asm("cpuid"
10887+ asm volatile("cpuid"
10888 : "=a" (tfms),
10889 "=c" (cpu.flags[4]),
10890 "=d" (cpu.flags[0])
10891@@ -136,7 +136,7 @@ static void get_flags(void)
10892 cpu.model += ((tfms >> 16) & 0xf) << 4;
10893 }
10894
10895- asm("cpuid"
10896+ asm volatile("cpuid"
10897 : "=a" (max_amd_level)
10898 : "a" (0x80000000)
10899 : "ebx", "ecx", "edx");
10900@@ -144,7 +144,7 @@ static void get_flags(void)
10901 if (max_amd_level >= 0x80000001 &&
10902 max_amd_level <= 0x8000ffff) {
10903 u32 eax = 0x80000001;
10904- asm("cpuid"
10905+ asm volatile("cpuid"
10906 : "+a" (eax),
10907 "=c" (cpu.flags[6]),
10908 "=d" (cpu.flags[1])
10909@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
10910 u32 ecx = MSR_K7_HWCR;
10911 u32 eax, edx;
10912
10913- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
10914+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
10915 eax &= ~(1 << 15);
10916- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
10917+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
10918
10919 get_flags(); /* Make sure it really did something */
10920 err = check_flags();
10921@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
10922 u32 ecx = MSR_VIA_FCR;
10923 u32 eax, edx;
10924
10925- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
10926+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
10927 eax |= (1<<1)|(1<<7);
10928- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
10929+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
10930
10931 set_bit(X86_FEATURE_CX8, cpu.flags);
10932 err = check_flags();
10933@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
10934 u32 eax, edx;
10935 u32 level = 1;
10936
10937- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
10938- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
10939- asm("cpuid"
10940+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
10941+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
10942+ asm volatile("cpuid"
10943 : "+a" (level), "=d" (cpu.flags[0])
10944 : : "ecx", "ebx");
10945- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
10946+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
10947
10948 err = check_flags();
10949 }
10950diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
10951index 9ec06a1..2c25e79 100644
10952--- a/arch/x86/boot/header.S
10953+++ b/arch/x86/boot/header.S
10954@@ -409,10 +409,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
10955 # single linked list of
10956 # struct setup_data
10957
10958-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
10959+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
10960
10961 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
10962+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
10963+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
10964+#else
10965 #define VO_INIT_SIZE (VO__end - VO__text)
10966+#endif
10967 #if ZO_INIT_SIZE > VO_INIT_SIZE
10968 #define INIT_SIZE ZO_INIT_SIZE
10969 #else
10970diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
10971index db75d07..8e6d0af 100644
10972--- a/arch/x86/boot/memory.c
10973+++ b/arch/x86/boot/memory.c
10974@@ -19,7 +19,7 @@
10975
10976 static int detect_memory_e820(void)
10977 {
10978- int count = 0;
10979+ unsigned int count = 0;
10980 struct biosregs ireg, oreg;
10981 struct e820entry *desc = boot_params.e820_map;
10982 static struct e820entry buf; /* static so it is zeroed */
10983diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
10984index 11e8c6e..fdbb1ed 100644
10985--- a/arch/x86/boot/video-vesa.c
10986+++ b/arch/x86/boot/video-vesa.c
10987@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
10988
10989 boot_params.screen_info.vesapm_seg = oreg.es;
10990 boot_params.screen_info.vesapm_off = oreg.di;
10991+ boot_params.screen_info.vesapm_size = oreg.cx;
10992 }
10993
10994 /*
10995diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
10996index 43eda28..5ab5fdb 100644
10997--- a/arch/x86/boot/video.c
10998+++ b/arch/x86/boot/video.c
10999@@ -96,7 +96,7 @@ static void store_mode_params(void)
11000 static unsigned int get_entry(void)
11001 {
11002 char entry_buf[4];
11003- int i, len = 0;
11004+ unsigned int i, len = 0;
11005 int key;
11006 unsigned int v;
11007
11008diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
11009index 9105655..5e37f27 100644
11010--- a/arch/x86/crypto/aes-x86_64-asm_64.S
11011+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
11012@@ -8,6 +8,8 @@
11013 * including this sentence is retained in full.
11014 */
11015
11016+#include <asm/alternative-asm.h>
11017+
11018 .extern crypto_ft_tab
11019 .extern crypto_it_tab
11020 .extern crypto_fl_tab
11021@@ -70,6 +72,8 @@
11022 je B192; \
11023 leaq 32(r9),r9;
11024
11025+#define ret pax_force_retaddr 0, 1; ret
11026+
11027 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
11028 movq r1,r2; \
11029 movq r3,r4; \
11030diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
11031index 477e9d7..3ab339f 100644
11032--- a/arch/x86/crypto/aesni-intel_asm.S
11033+++ b/arch/x86/crypto/aesni-intel_asm.S
11034@@ -31,6 +31,7 @@
11035
11036 #include <linux/linkage.h>
11037 #include <asm/inst.h>
11038+#include <asm/alternative-asm.h>
11039
11040 #ifdef __x86_64__
11041 .data
11042@@ -1441,6 +1442,7 @@ _return_T_done_decrypt:
11043 pop %r14
11044 pop %r13
11045 pop %r12
11046+ pax_force_retaddr 0, 1
11047 ret
11048 ENDPROC(aesni_gcm_dec)
11049
11050@@ -1705,6 +1707,7 @@ _return_T_done_encrypt:
11051 pop %r14
11052 pop %r13
11053 pop %r12
11054+ pax_force_retaddr 0, 1
11055 ret
11056 ENDPROC(aesni_gcm_enc)
11057
11058@@ -1722,6 +1725,7 @@ _key_expansion_256a:
11059 pxor %xmm1, %xmm0
11060 movaps %xmm0, (TKEYP)
11061 add $0x10, TKEYP
11062+ pax_force_retaddr_bts
11063 ret
11064 ENDPROC(_key_expansion_128)
11065 ENDPROC(_key_expansion_256a)
11066@@ -1748,6 +1752,7 @@ _key_expansion_192a:
11067 shufps $0b01001110, %xmm2, %xmm1
11068 movaps %xmm1, 0x10(TKEYP)
11069 add $0x20, TKEYP
11070+ pax_force_retaddr_bts
11071 ret
11072 ENDPROC(_key_expansion_192a)
11073
11074@@ -1768,6 +1773,7 @@ _key_expansion_192b:
11075
11076 movaps %xmm0, (TKEYP)
11077 add $0x10, TKEYP
11078+ pax_force_retaddr_bts
11079 ret
11080 ENDPROC(_key_expansion_192b)
11081
11082@@ -1781,6 +1787,7 @@ _key_expansion_256b:
11083 pxor %xmm1, %xmm2
11084 movaps %xmm2, (TKEYP)
11085 add $0x10, TKEYP
11086+ pax_force_retaddr_bts
11087 ret
11088 ENDPROC(_key_expansion_256b)
11089
11090@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
11091 #ifndef __x86_64__
11092 popl KEYP
11093 #endif
11094+ pax_force_retaddr 0, 1
11095 ret
11096 ENDPROC(aesni_set_key)
11097
11098@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
11099 popl KLEN
11100 popl KEYP
11101 #endif
11102+ pax_force_retaddr 0, 1
11103 ret
11104 ENDPROC(aesni_enc)
11105
11106@@ -1974,6 +1983,7 @@ _aesni_enc1:
11107 AESENC KEY STATE
11108 movaps 0x70(TKEYP), KEY
11109 AESENCLAST KEY STATE
11110+ pax_force_retaddr_bts
11111 ret
11112 ENDPROC(_aesni_enc1)
11113
11114@@ -2083,6 +2093,7 @@ _aesni_enc4:
11115 AESENCLAST KEY STATE2
11116 AESENCLAST KEY STATE3
11117 AESENCLAST KEY STATE4
11118+ pax_force_retaddr_bts
11119 ret
11120 ENDPROC(_aesni_enc4)
11121
11122@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
11123 popl KLEN
11124 popl KEYP
11125 #endif
11126+ pax_force_retaddr 0, 1
11127 ret
11128 ENDPROC(aesni_dec)
11129
11130@@ -2164,6 +2176,7 @@ _aesni_dec1:
11131 AESDEC KEY STATE
11132 movaps 0x70(TKEYP), KEY
11133 AESDECLAST KEY STATE
11134+ pax_force_retaddr_bts
11135 ret
11136 ENDPROC(_aesni_dec1)
11137
11138@@ -2273,6 +2286,7 @@ _aesni_dec4:
11139 AESDECLAST KEY STATE2
11140 AESDECLAST KEY STATE3
11141 AESDECLAST KEY STATE4
11142+ pax_force_retaddr_bts
11143 ret
11144 ENDPROC(_aesni_dec4)
11145
11146@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
11147 popl KEYP
11148 popl LEN
11149 #endif
11150+ pax_force_retaddr 0, 1
11151 ret
11152 ENDPROC(aesni_ecb_enc)
11153
11154@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
11155 popl KEYP
11156 popl LEN
11157 #endif
11158+ pax_force_retaddr 0, 1
11159 ret
11160 ENDPROC(aesni_ecb_dec)
11161
11162@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
11163 popl LEN
11164 popl IVP
11165 #endif
11166+ pax_force_retaddr 0, 1
11167 ret
11168 ENDPROC(aesni_cbc_enc)
11169
11170@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
11171 popl LEN
11172 popl IVP
11173 #endif
11174+ pax_force_retaddr 0, 1
11175 ret
11176 ENDPROC(aesni_cbc_dec)
11177
11178@@ -2550,6 +2568,7 @@ _aesni_inc_init:
11179 mov $1, TCTR_LOW
11180 MOVQ_R64_XMM TCTR_LOW INC
11181 MOVQ_R64_XMM CTR TCTR_LOW
11182+ pax_force_retaddr_bts
11183 ret
11184 ENDPROC(_aesni_inc_init)
11185
11186@@ -2579,6 +2598,7 @@ _aesni_inc:
11187 .Linc_low:
11188 movaps CTR, IV
11189 PSHUFB_XMM BSWAP_MASK IV
11190+ pax_force_retaddr_bts
11191 ret
11192 ENDPROC(_aesni_inc)
11193
11194@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
11195 .Lctr_enc_ret:
11196 movups IV, (IVP)
11197 .Lctr_enc_just_ret:
11198+ pax_force_retaddr 0, 1
11199 ret
11200 ENDPROC(aesni_ctr_enc)
11201
11202@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
11203 pxor INC, STATE4
11204 movdqu STATE4, 0x70(OUTP)
11205
11206+ pax_force_retaddr 0, 1
11207 ret
11208 ENDPROC(aesni_xts_crypt8)
11209
11210diff --git a/arch/x86/crypto/blowfish-avx2-asm_64.S b/arch/x86/crypto/blowfish-avx2-asm_64.S
11211index 784452e..46982c7 100644
11212--- a/arch/x86/crypto/blowfish-avx2-asm_64.S
11213+++ b/arch/x86/crypto/blowfish-avx2-asm_64.S
11214@@ -221,6 +221,7 @@ __blowfish_enc_blk32:
11215
11216 write_block(RXl, RXr);
11217
11218+ pax_force_retaddr 0, 1
11219 ret;
11220 ENDPROC(__blowfish_enc_blk32)
11221
11222@@ -250,6 +251,7 @@ __blowfish_dec_blk32:
11223
11224 write_block(RXl, RXr);
11225
11226+ pax_force_retaddr 0, 1
11227 ret;
11228 ENDPROC(__blowfish_dec_blk32)
11229
11230@@ -284,6 +286,7 @@ ENTRY(blowfish_ecb_enc_32way)
11231
11232 vzeroupper;
11233
11234+ pax_force_retaddr 0, 1
11235 ret;
11236 ENDPROC(blowfish_ecb_enc_32way)
11237
11238@@ -318,6 +321,7 @@ ENTRY(blowfish_ecb_dec_32way)
11239
11240 vzeroupper;
11241
11242+ pax_force_retaddr 0, 1
11243 ret;
11244 ENDPROC(blowfish_ecb_dec_32way)
11245
11246@@ -365,6 +369,7 @@ ENTRY(blowfish_cbc_dec_32way)
11247
11248 vzeroupper;
11249
11250+ pax_force_retaddr 0, 1
11251 ret;
11252 ENDPROC(blowfish_cbc_dec_32way)
11253
11254@@ -445,5 +450,6 @@ ENTRY(blowfish_ctr_32way)
11255
11256 vzeroupper;
11257
11258+ pax_force_retaddr 0, 1
11259 ret;
11260 ENDPROC(blowfish_ctr_32way)
11261diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
11262index 246c670..4d1ed00 100644
11263--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
11264+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
11265@@ -21,6 +21,7 @@
11266 */
11267
11268 #include <linux/linkage.h>
11269+#include <asm/alternative-asm.h>
11270
11271 .file "blowfish-x86_64-asm.S"
11272 .text
11273@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
11274 jnz .L__enc_xor;
11275
11276 write_block();
11277+ pax_force_retaddr 0, 1
11278 ret;
11279 .L__enc_xor:
11280 xor_block();
11281+ pax_force_retaddr 0, 1
11282 ret;
11283 ENDPROC(__blowfish_enc_blk)
11284
11285@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
11286
11287 movq %r11, %rbp;
11288
11289+ pax_force_retaddr 0, 1
11290 ret;
11291 ENDPROC(blowfish_dec_blk)
11292
11293@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
11294
11295 popq %rbx;
11296 popq %rbp;
11297+ pax_force_retaddr 0, 1
11298 ret;
11299
11300 .L__enc_xor4:
11301@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
11302
11303 popq %rbx;
11304 popq %rbp;
11305+ pax_force_retaddr 0, 1
11306 ret;
11307 ENDPROC(__blowfish_enc_blk_4way)
11308
11309@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
11310 popq %rbx;
11311 popq %rbp;
11312
11313+ pax_force_retaddr 0, 1
11314 ret;
11315 ENDPROC(blowfish_dec_blk_4way)
11316diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
11317index ce71f92..2dd5b1e 100644
11318--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
11319+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
11320@@ -16,6 +16,7 @@
11321 */
11322
11323 #include <linux/linkage.h>
11324+#include <asm/alternative-asm.h>
11325
11326 #define CAMELLIA_TABLE_BYTE_LEN 272
11327
11328@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
11329 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
11330 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
11331 %rcx, (%r9));
11332+ pax_force_retaddr_bts
11333 ret;
11334 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
11335
11336@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
11337 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
11338 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
11339 %rax, (%r9));
11340+ pax_force_retaddr_bts
11341 ret;
11342 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
11343
11344@@ -780,6 +783,7 @@ __camellia_enc_blk16:
11345 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
11346 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
11347
11348+ pax_force_retaddr_bts
11349 ret;
11350
11351 .align 8
11352@@ -865,6 +869,7 @@ __camellia_dec_blk16:
11353 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
11354 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
11355
11356+ pax_force_retaddr_bts
11357 ret;
11358
11359 .align 8
11360@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
11361 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
11362 %xmm8, %rsi);
11363
11364+ pax_force_retaddr 0, 1
11365 ret;
11366 ENDPROC(camellia_ecb_enc_16way)
11367
11368@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
11369 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
11370 %xmm8, %rsi);
11371
11372+ pax_force_retaddr 0, 1
11373 ret;
11374 ENDPROC(camellia_ecb_dec_16way)
11375
11376@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
11377 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
11378 %xmm8, %rsi);
11379
11380+ pax_force_retaddr 0, 1
11381 ret;
11382 ENDPROC(camellia_cbc_dec_16way)
11383
11384@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
11385 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
11386 %xmm8, %rsi);
11387
11388+ pax_force_retaddr 0, 1
11389 ret;
11390 ENDPROC(camellia_ctr_16way)
11391
11392@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
11393 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
11394 %xmm8, %rsi);
11395
11396+ pax_force_retaddr 0, 1
11397 ret;
11398 ENDPROC(camellia_xts_crypt_16way)
11399
11400diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
11401index 91a1878..bcf340a 100644
11402--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
11403+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
11404@@ -11,6 +11,7 @@
11405 */
11406
11407 #include <linux/linkage.h>
11408+#include <asm/alternative-asm.h>
11409
11410 #define CAMELLIA_TABLE_BYTE_LEN 272
11411
11412@@ -212,6 +213,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
11413 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
11414 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
11415 %rcx, (%r9));
11416+ pax_force_retaddr_bts
11417 ret;
11418 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
11419
11420@@ -220,6 +222,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
11421 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
11422 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
11423 %rax, (%r9));
11424+ pax_force_retaddr_bts
11425 ret;
11426 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
11427
11428@@ -802,6 +805,7 @@ __camellia_enc_blk32:
11429 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
11430 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
11431
11432+ pax_force_retaddr_bts
11433 ret;
11434
11435 .align 8
11436@@ -887,6 +891,7 @@ __camellia_dec_blk32:
11437 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
11438 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
11439
11440+ pax_force_retaddr_bts
11441 ret;
11442
11443 .align 8
11444@@ -930,6 +935,7 @@ ENTRY(camellia_ecb_enc_32way)
11445
11446 vzeroupper;
11447
11448+ pax_force_retaddr 0, 1
11449 ret;
11450 ENDPROC(camellia_ecb_enc_32way)
11451
11452@@ -962,6 +968,7 @@ ENTRY(camellia_ecb_dec_32way)
11453
11454 vzeroupper;
11455
11456+ pax_force_retaddr 0, 1
11457 ret;
11458 ENDPROC(camellia_ecb_dec_32way)
11459
11460@@ -1028,6 +1035,7 @@ ENTRY(camellia_cbc_dec_32way)
11461
11462 vzeroupper;
11463
11464+ pax_force_retaddr 0, 1
11465 ret;
11466 ENDPROC(camellia_cbc_dec_32way)
11467
11468@@ -1166,6 +1174,7 @@ ENTRY(camellia_ctr_32way)
11469
11470 vzeroupper;
11471
11472+ pax_force_retaddr 0, 1
11473 ret;
11474 ENDPROC(camellia_ctr_32way)
11475
11476@@ -1331,6 +1340,7 @@ camellia_xts_crypt_32way:
11477
11478 vzeroupper;
11479
11480+ pax_force_retaddr 0, 1
11481 ret;
11482 ENDPROC(camellia_xts_crypt_32way)
11483
11484diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
11485index 310319c..ce174a4 100644
11486--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
11487+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
11488@@ -21,6 +21,7 @@
11489 */
11490
11491 #include <linux/linkage.h>
11492+#include <asm/alternative-asm.h>
11493
11494 .file "camellia-x86_64-asm_64.S"
11495 .text
11496@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
11497 enc_outunpack(mov, RT1);
11498
11499 movq RRBP, %rbp;
11500+ pax_force_retaddr 0, 1
11501 ret;
11502
11503 .L__enc_xor:
11504 enc_outunpack(xor, RT1);
11505
11506 movq RRBP, %rbp;
11507+ pax_force_retaddr 0, 1
11508 ret;
11509 ENDPROC(__camellia_enc_blk)
11510
11511@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
11512 dec_outunpack();
11513
11514 movq RRBP, %rbp;
11515+ pax_force_retaddr 0, 1
11516 ret;
11517 ENDPROC(camellia_dec_blk)
11518
11519@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
11520
11521 movq RRBP, %rbp;
11522 popq %rbx;
11523+ pax_force_retaddr 0, 1
11524 ret;
11525
11526 .L__enc2_xor:
11527@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
11528
11529 movq RRBP, %rbp;
11530 popq %rbx;
11531+ pax_force_retaddr 0, 1
11532 ret;
11533 ENDPROC(__camellia_enc_blk_2way)
11534
11535@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
11536
11537 movq RRBP, %rbp;
11538 movq RXOR, %rbx;
11539+ pax_force_retaddr 0, 1
11540 ret;
11541 ENDPROC(camellia_dec_blk_2way)
11542diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
11543index c35fd5d..c1ee236 100644
11544--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
11545+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
11546@@ -24,6 +24,7 @@
11547 */
11548
11549 #include <linux/linkage.h>
11550+#include <asm/alternative-asm.h>
11551
11552 .file "cast5-avx-x86_64-asm_64.S"
11553
11554@@ -281,6 +282,7 @@ __cast5_enc_blk16:
11555 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
11556 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
11557
11558+ pax_force_retaddr 0, 1
11559 ret;
11560 ENDPROC(__cast5_enc_blk16)
11561
11562@@ -352,6 +354,7 @@ __cast5_dec_blk16:
11563 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
11564 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
11565
11566+ pax_force_retaddr 0, 1
11567 ret;
11568
11569 .L__skip_dec:
11570@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
11571 vmovdqu RR4, (6*4*4)(%r11);
11572 vmovdqu RL4, (7*4*4)(%r11);
11573
11574+ pax_force_retaddr
11575 ret;
11576 ENDPROC(cast5_ecb_enc_16way)
11577
11578@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
11579 vmovdqu RR4, (6*4*4)(%r11);
11580 vmovdqu RL4, (7*4*4)(%r11);
11581
11582+ pax_force_retaddr
11583 ret;
11584 ENDPROC(cast5_ecb_dec_16way)
11585
11586@@ -469,6 +474,7 @@ ENTRY(cast5_cbc_dec_16way)
11587
11588 popq %r12;
11589
11590+ pax_force_retaddr
11591 ret;
11592 ENDPROC(cast5_cbc_dec_16way)
11593
11594@@ -542,5 +548,6 @@ ENTRY(cast5_ctr_16way)
11595
11596 popq %r12;
11597
11598+ pax_force_retaddr
11599 ret;
11600 ENDPROC(cast5_ctr_16way)
11601diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
11602index e3531f8..18ded3a 100644
11603--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
11604+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
11605@@ -24,6 +24,7 @@
11606 */
11607
11608 #include <linux/linkage.h>
11609+#include <asm/alternative-asm.h>
11610 #include "glue_helper-asm-avx.S"
11611
11612 .file "cast6-avx-x86_64-asm_64.S"
11613@@ -295,6 +296,7 @@ __cast6_enc_blk8:
11614 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
11615 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
11616
11617+ pax_force_retaddr 0, 1
11618 ret;
11619 ENDPROC(__cast6_enc_blk8)
11620
11621@@ -340,6 +342,7 @@ __cast6_dec_blk8:
11622 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
11623 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
11624
11625+ pax_force_retaddr 0, 1
11626 ret;
11627 ENDPROC(__cast6_dec_blk8)
11628
11629@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
11630
11631 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11632
11633+ pax_force_retaddr
11634 ret;
11635 ENDPROC(cast6_ecb_enc_8way)
11636
11637@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
11638
11639 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11640
11641+ pax_force_retaddr
11642 ret;
11643 ENDPROC(cast6_ecb_dec_8way)
11644
11645@@ -399,6 +404,7 @@ ENTRY(cast6_cbc_dec_8way)
11646
11647 popq %r12;
11648
11649+ pax_force_retaddr
11650 ret;
11651 ENDPROC(cast6_cbc_dec_8way)
11652
11653@@ -424,6 +430,7 @@ ENTRY(cast6_ctr_8way)
11654
11655 popq %r12;
11656
11657+ pax_force_retaddr
11658 ret;
11659 ENDPROC(cast6_ctr_8way)
11660
11661@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
11662 /* dst <= regs xor IVs(in dst) */
11663 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11664
11665+ pax_force_retaddr
11666 ret;
11667 ENDPROC(cast6_xts_enc_8way)
11668
11669@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
11670 /* dst <= regs xor IVs(in dst) */
11671 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11672
11673+ pax_force_retaddr
11674 ret;
11675 ENDPROC(cast6_xts_dec_8way)
11676diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
11677index dbc4339..3d868c5 100644
11678--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
11679+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
11680@@ -45,6 +45,7 @@
11681
11682 #include <asm/inst.h>
11683 #include <linux/linkage.h>
11684+#include <asm/alternative-asm.h>
11685
11686 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
11687
11688@@ -312,6 +313,7 @@ do_return:
11689 popq %rsi
11690 popq %rdi
11691 popq %rbx
11692+ pax_force_retaddr 0, 1
11693 ret
11694
11695 ################################################################
11696diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
11697index 586f41a..d02851e 100644
11698--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
11699+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
11700@@ -18,6 +18,7 @@
11701
11702 #include <linux/linkage.h>
11703 #include <asm/inst.h>
11704+#include <asm/alternative-asm.h>
11705
11706 .data
11707
11708@@ -93,6 +94,7 @@ __clmul_gf128mul_ble:
11709 psrlq $1, T2
11710 pxor T2, T1
11711 pxor T1, DATA
11712+ pax_force_retaddr
11713 ret
11714 ENDPROC(__clmul_gf128mul_ble)
11715
11716@@ -105,6 +107,7 @@ ENTRY(clmul_ghash_mul)
11717 call __clmul_gf128mul_ble
11718 PSHUFB_XMM BSWAP DATA
11719 movups DATA, (%rdi)
11720+ pax_force_retaddr
11721 ret
11722 ENDPROC(clmul_ghash_mul)
11723
11724@@ -132,6 +135,7 @@ ENTRY(clmul_ghash_update)
11725 PSHUFB_XMM BSWAP DATA
11726 movups DATA, (%rdi)
11727 .Lupdate_just_ret:
11728+ pax_force_retaddr
11729 ret
11730 ENDPROC(clmul_ghash_update)
11731
11732@@ -157,5 +161,6 @@ ENTRY(clmul_ghash_setkey)
11733 pand .Lpoly, %xmm1
11734 pxor %xmm1, %xmm0
11735 movups %xmm0, (%rdi)
11736+ pax_force_retaddr
11737 ret
11738 ENDPROC(clmul_ghash_setkey)
11739diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
11740index 9279e0b..9270820 100644
11741--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
11742+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
11743@@ -1,4 +1,5 @@
11744 #include <linux/linkage.h>
11745+#include <asm/alternative-asm.h>
11746
11747 # enter salsa20_encrypt_bytes
11748 ENTRY(salsa20_encrypt_bytes)
11749@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
11750 add %r11,%rsp
11751 mov %rdi,%rax
11752 mov %rsi,%rdx
11753+ pax_force_retaddr 0, 1
11754 ret
11755 # bytesatleast65:
11756 ._bytesatleast65:
11757@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
11758 add %r11,%rsp
11759 mov %rdi,%rax
11760 mov %rsi,%rdx
11761+ pax_force_retaddr
11762 ret
11763 ENDPROC(salsa20_keysetup)
11764
11765@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
11766 add %r11,%rsp
11767 mov %rdi,%rax
11768 mov %rsi,%rdx
11769+ pax_force_retaddr
11770 ret
11771 ENDPROC(salsa20_ivsetup)
11772diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
11773index 2f202f4..d9164d6 100644
11774--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
11775+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
11776@@ -24,6 +24,7 @@
11777 */
11778
11779 #include <linux/linkage.h>
11780+#include <asm/alternative-asm.h>
11781 #include "glue_helper-asm-avx.S"
11782
11783 .file "serpent-avx-x86_64-asm_64.S"
11784@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
11785 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
11786 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
11787
11788+ pax_force_retaddr
11789 ret;
11790 ENDPROC(__serpent_enc_blk8_avx)
11791
11792@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
11793 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
11794 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
11795
11796+ pax_force_retaddr
11797 ret;
11798 ENDPROC(__serpent_dec_blk8_avx)
11799
11800@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
11801
11802 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11803
11804+ pax_force_retaddr
11805 ret;
11806 ENDPROC(serpent_ecb_enc_8way_avx)
11807
11808@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
11809
11810 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
11811
11812+ pax_force_retaddr
11813 ret;
11814 ENDPROC(serpent_ecb_dec_8way_avx)
11815
11816@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
11817
11818 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
11819
11820+ pax_force_retaddr
11821 ret;
11822 ENDPROC(serpent_cbc_dec_8way_avx)
11823
11824@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
11825
11826 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11827
11828+ pax_force_retaddr
11829 ret;
11830 ENDPROC(serpent_ctr_8way_avx)
11831
11832@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
11833 /* dst <= regs xor IVs(in dst) */
11834 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
11835
11836+ pax_force_retaddr
11837 ret;
11838 ENDPROC(serpent_xts_enc_8way_avx)
11839
11840@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
11841 /* dst <= regs xor IVs(in dst) */
11842 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
11843
11844+ pax_force_retaddr
11845 ret;
11846 ENDPROC(serpent_xts_dec_8way_avx)
11847diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
11848index b222085..abd483c 100644
11849--- a/arch/x86/crypto/serpent-avx2-asm_64.S
11850+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
11851@@ -15,6 +15,7 @@
11852 */
11853
11854 #include <linux/linkage.h>
11855+#include <asm/alternative-asm.h>
11856 #include "glue_helper-asm-avx2.S"
11857
11858 .file "serpent-avx2-asm_64.S"
11859@@ -610,6 +611,7 @@ __serpent_enc_blk16:
11860 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
11861 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
11862
11863+ pax_force_retaddr
11864 ret;
11865 ENDPROC(__serpent_enc_blk16)
11866
11867@@ -664,6 +666,7 @@ __serpent_dec_blk16:
11868 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
11869 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
11870
11871+ pax_force_retaddr
11872 ret;
11873 ENDPROC(__serpent_dec_blk16)
11874
11875@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
11876
11877 vzeroupper;
11878
11879+ pax_force_retaddr
11880 ret;
11881 ENDPROC(serpent_ecb_enc_16way)
11882
11883@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
11884
11885 vzeroupper;
11886
11887+ pax_force_retaddr
11888 ret;
11889 ENDPROC(serpent_ecb_dec_16way)
11890
11891@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
11892
11893 vzeroupper;
11894
11895+ pax_force_retaddr
11896 ret;
11897 ENDPROC(serpent_cbc_dec_16way)
11898
11899@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
11900
11901 vzeroupper;
11902
11903+ pax_force_retaddr
11904 ret;
11905 ENDPROC(serpent_ctr_16way)
11906
11907@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
11908
11909 vzeroupper;
11910
11911+ pax_force_retaddr
11912 ret;
11913 ENDPROC(serpent_xts_enc_16way)
11914
11915@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
11916
11917 vzeroupper;
11918
11919+ pax_force_retaddr
11920 ret;
11921 ENDPROC(serpent_xts_dec_16way)
11922diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
11923index acc066c..1559cc4 100644
11924--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
11925+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
11926@@ -25,6 +25,7 @@
11927 */
11928
11929 #include <linux/linkage.h>
11930+#include <asm/alternative-asm.h>
11931
11932 .file "serpent-sse2-x86_64-asm_64.S"
11933 .text
11934@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
11935 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
11936 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
11937
11938+ pax_force_retaddr
11939 ret;
11940
11941 .L__enc_xor8:
11942 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
11943 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
11944
11945+ pax_force_retaddr
11946 ret;
11947 ENDPROC(__serpent_enc_blk_8way)
11948
11949@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
11950 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
11951 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
11952
11953+ pax_force_retaddr
11954 ret;
11955 ENDPROC(serpent_dec_blk_8way)
11956diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
11957index a410950..3356d42 100644
11958--- a/arch/x86/crypto/sha1_ssse3_asm.S
11959+++ b/arch/x86/crypto/sha1_ssse3_asm.S
11960@@ -29,6 +29,7 @@
11961 */
11962
11963 #include <linux/linkage.h>
11964+#include <asm/alternative-asm.h>
11965
11966 #define CTX %rdi // arg1
11967 #define BUF %rsi // arg2
11968@@ -104,6 +105,7 @@
11969 pop %r12
11970 pop %rbp
11971 pop %rbx
11972+ pax_force_retaddr 0, 1
11973 ret
11974
11975 ENDPROC(\name)
11976diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
11977index 642f156..4ab07b9 100644
11978--- a/arch/x86/crypto/sha256-avx-asm.S
11979+++ b/arch/x86/crypto/sha256-avx-asm.S
11980@@ -49,6 +49,7 @@
11981
11982 #ifdef CONFIG_AS_AVX
11983 #include <linux/linkage.h>
11984+#include <asm/alternative-asm.h>
11985
11986 ## assume buffers not aligned
11987 #define VMOVDQ vmovdqu
11988@@ -460,6 +461,7 @@ done_hash:
11989 popq %r13
11990 popq %rbp
11991 popq %rbx
11992+ pax_force_retaddr 0, 1
11993 ret
11994 ENDPROC(sha256_transform_avx)
11995
11996diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
11997index 9e86944..2e7f95a 100644
11998--- a/arch/x86/crypto/sha256-avx2-asm.S
11999+++ b/arch/x86/crypto/sha256-avx2-asm.S
12000@@ -50,6 +50,7 @@
12001
12002 #ifdef CONFIG_AS_AVX2
12003 #include <linux/linkage.h>
12004+#include <asm/alternative-asm.h>
12005
12006 ## assume buffers not aligned
12007 #define VMOVDQ vmovdqu
12008@@ -720,6 +721,7 @@ done_hash:
12009 popq %r12
12010 popq %rbp
12011 popq %rbx
12012+ pax_force_retaddr 0, 1
12013 ret
12014 ENDPROC(sha256_transform_rorx)
12015
12016diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
12017index f833b74..c36ed14 100644
12018--- a/arch/x86/crypto/sha256-ssse3-asm.S
12019+++ b/arch/x86/crypto/sha256-ssse3-asm.S
12020@@ -47,6 +47,7 @@
12021 ########################################################################
12022
12023 #include <linux/linkage.h>
12024+#include <asm/alternative-asm.h>
12025
12026 ## assume buffers not aligned
12027 #define MOVDQ movdqu
12028@@ -471,6 +472,7 @@ done_hash:
12029 popq %rbp
12030 popq %rbx
12031
12032+ pax_force_retaddr 0, 1
12033 ret
12034 ENDPROC(sha256_transform_ssse3)
12035
12036diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
12037index 974dde9..4533d34 100644
12038--- a/arch/x86/crypto/sha512-avx-asm.S
12039+++ b/arch/x86/crypto/sha512-avx-asm.S
12040@@ -49,6 +49,7 @@
12041
12042 #ifdef CONFIG_AS_AVX
12043 #include <linux/linkage.h>
12044+#include <asm/alternative-asm.h>
12045
12046 .text
12047
12048@@ -364,6 +365,7 @@ updateblock:
12049 mov frame_RSPSAVE(%rsp), %rsp
12050
12051 nowork:
12052+ pax_force_retaddr 0, 1
12053 ret
12054 ENDPROC(sha512_transform_avx)
12055
12056diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
12057index 568b961..061ef1d 100644
12058--- a/arch/x86/crypto/sha512-avx2-asm.S
12059+++ b/arch/x86/crypto/sha512-avx2-asm.S
12060@@ -51,6 +51,7 @@
12061
12062 #ifdef CONFIG_AS_AVX2
12063 #include <linux/linkage.h>
12064+#include <asm/alternative-asm.h>
12065
12066 .text
12067
12068@@ -678,6 +679,7 @@ done_hash:
12069
12070 # Restore Stack Pointer
12071 mov frame_RSPSAVE(%rsp), %rsp
12072+ pax_force_retaddr 0, 1
12073 ret
12074 ENDPROC(sha512_transform_rorx)
12075
12076diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
12077index fb56855..e23914f 100644
12078--- a/arch/x86/crypto/sha512-ssse3-asm.S
12079+++ b/arch/x86/crypto/sha512-ssse3-asm.S
12080@@ -48,6 +48,7 @@
12081 ########################################################################
12082
12083 #include <linux/linkage.h>
12084+#include <asm/alternative-asm.h>
12085
12086 .text
12087
12088@@ -363,6 +364,7 @@ updateblock:
12089 mov frame_RSPSAVE(%rsp), %rsp
12090
12091 nowork:
12092+ pax_force_retaddr 0, 1
12093 ret
12094 ENDPROC(sha512_transform_ssse3)
12095
12096diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
12097index 0505813..63b1d00 100644
12098--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
12099+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
12100@@ -24,6 +24,7 @@
12101 */
12102
12103 #include <linux/linkage.h>
12104+#include <asm/alternative-asm.h>
12105 #include "glue_helper-asm-avx.S"
12106
12107 .file "twofish-avx-x86_64-asm_64.S"
12108@@ -284,6 +285,7 @@ __twofish_enc_blk8:
12109 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
12110 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
12111
12112+ pax_force_retaddr 0, 1
12113 ret;
12114 ENDPROC(__twofish_enc_blk8)
12115
12116@@ -324,6 +326,7 @@ __twofish_dec_blk8:
12117 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
12118 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
12119
12120+ pax_force_retaddr 0, 1
12121 ret;
12122 ENDPROC(__twofish_dec_blk8)
12123
12124@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
12125
12126 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
12127
12128+ pax_force_retaddr 0, 1
12129 ret;
12130 ENDPROC(twofish_ecb_enc_8way)
12131
12132@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
12133
12134 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
12135
12136+ pax_force_retaddr 0, 1
12137 ret;
12138 ENDPROC(twofish_ecb_dec_8way)
12139
12140@@ -383,6 +388,7 @@ ENTRY(twofish_cbc_dec_8way)
12141
12142 popq %r12;
12143
12144+ pax_force_retaddr 0, 1
12145 ret;
12146 ENDPROC(twofish_cbc_dec_8way)
12147
12148@@ -408,6 +414,7 @@ ENTRY(twofish_ctr_8way)
12149
12150 popq %r12;
12151
12152+ pax_force_retaddr 0, 1
12153 ret;
12154 ENDPROC(twofish_ctr_8way)
12155
12156@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
12157 /* dst <= regs xor IVs(in dst) */
12158 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
12159
12160+ pax_force_retaddr 0, 1
12161 ret;
12162 ENDPROC(twofish_xts_enc_8way)
12163
12164@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
12165 /* dst <= regs xor IVs(in dst) */
12166 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
12167
12168+ pax_force_retaddr 0, 1
12169 ret;
12170 ENDPROC(twofish_xts_dec_8way)
12171diff --git a/arch/x86/crypto/twofish-avx2-asm_64.S b/arch/x86/crypto/twofish-avx2-asm_64.S
12172index e1a83b9..33006b9 100644
12173--- a/arch/x86/crypto/twofish-avx2-asm_64.S
12174+++ b/arch/x86/crypto/twofish-avx2-asm_64.S
12175@@ -11,6 +11,7 @@
12176 */
12177
12178 #include <linux/linkage.h>
12179+#include <asm/alternative-asm.h>
12180 #include "glue_helper-asm-avx2.S"
12181
12182 .file "twofish-avx2-asm_64.S"
12183@@ -422,6 +423,7 @@ __twofish_enc_blk16:
12184 outunpack_enc16(RA, RB, RC, RD);
12185 write_blocks16(RA, RB, RC, RD);
12186
12187+ pax_force_retaddr_bts
12188 ret;
12189 ENDPROC(__twofish_enc_blk16)
12190
12191@@ -454,6 +456,7 @@ __twofish_dec_blk16:
12192 outunpack_dec16(RA, RB, RC, RD);
12193 write_blocks16(RA, RB, RC, RD);
12194
12195+ pax_force_retaddr_bts
12196 ret;
12197 ENDPROC(__twofish_dec_blk16)
12198
12199@@ -476,6 +479,7 @@ ENTRY(twofish_ecb_enc_16way)
12200 popq %r12;
12201 vzeroupper;
12202
12203+ pax_force_retaddr 0, 1
12204 ret;
12205 ENDPROC(twofish_ecb_enc_16way)
12206
12207@@ -498,6 +502,7 @@ ENTRY(twofish_ecb_dec_16way)
12208 popq %r12;
12209 vzeroupper;
12210
12211+ pax_force_retaddr 0, 1
12212 ret;
12213 ENDPROC(twofish_ecb_dec_16way)
12214
12215@@ -521,6 +526,7 @@ ENTRY(twofish_cbc_dec_16way)
12216 popq %r12;
12217 vzeroupper;
12218
12219+ pax_force_retaddr 0, 1
12220 ret;
12221 ENDPROC(twofish_cbc_dec_16way)
12222
12223@@ -546,6 +552,7 @@ ENTRY(twofish_ctr_16way)
12224 popq %r12;
12225 vzeroupper;
12226
12227+ pax_force_retaddr 0, 1
12228 ret;
12229 ENDPROC(twofish_ctr_16way)
12230
12231@@ -574,6 +581,7 @@ twofish_xts_crypt_16way:
12232 popq %r12;
12233 vzeroupper;
12234
12235+ pax_force_retaddr 0, 1
12236 ret;
12237 ENDPROC(twofish_xts_crypt_16way)
12238
12239diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
12240index 1c3b7ce..b365c5e 100644
12241--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
12242+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
12243@@ -21,6 +21,7 @@
12244 */
12245
12246 #include <linux/linkage.h>
12247+#include <asm/alternative-asm.h>
12248
12249 .file "twofish-x86_64-asm-3way.S"
12250 .text
12251@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
12252 popq %r13;
12253 popq %r14;
12254 popq %r15;
12255+ pax_force_retaddr 0, 1
12256 ret;
12257
12258 .L__enc_xor3:
12259@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
12260 popq %r13;
12261 popq %r14;
12262 popq %r15;
12263+ pax_force_retaddr 0, 1
12264 ret;
12265 ENDPROC(__twofish_enc_blk_3way)
12266
12267@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
12268 popq %r13;
12269 popq %r14;
12270 popq %r15;
12271+ pax_force_retaddr 0, 1
12272 ret;
12273 ENDPROC(twofish_dec_blk_3way)
12274diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
12275index a039d21..29e7615 100644
12276--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
12277+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
12278@@ -22,6 +22,7 @@
12279
12280 #include <linux/linkage.h>
12281 #include <asm/asm-offsets.h>
12282+#include <asm/alternative-asm.h>
12283
12284 #define a_offset 0
12285 #define b_offset 4
12286@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
12287
12288 popq R1
12289 movq $1,%rax
12290+ pax_force_retaddr 0, 1
12291 ret
12292 ENDPROC(twofish_enc_blk)
12293
12294@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
12295
12296 popq R1
12297 movq $1,%rax
12298+ pax_force_retaddr 0, 1
12299 ret
12300 ENDPROC(twofish_dec_blk)
12301diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
12302index 52ff81c..98af645 100644
12303--- a/arch/x86/ia32/ia32_aout.c
12304+++ b/arch/x86/ia32/ia32_aout.c
12305@@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
12306 unsigned long dump_start, dump_size;
12307 struct user32 dump;
12308
12309+ memset(&dump, 0, sizeof(dump));
12310+
12311 fs = get_fs();
12312 set_fs(KERNEL_DS);
12313 has_dumped = 1;
12314diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
12315index cf1a471..5ba2673 100644
12316--- a/arch/x86/ia32/ia32_signal.c
12317+++ b/arch/x86/ia32/ia32_signal.c
12318@@ -340,7 +340,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
12319 sp -= frame_size;
12320 /* Align the stack pointer according to the i386 ABI,
12321 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
12322- sp = ((sp + 4) & -16ul) - 4;
12323+ sp = ((sp - 12) & -16ul) - 4;
12324 return (void __user *) sp;
12325 }
12326
12327@@ -398,7 +398,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
12328 * These are actually not used anymore, but left because some
12329 * gdb versions depend on them as a marker.
12330 */
12331- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
12332+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
12333 } put_user_catch(err);
12334
12335 if (err)
12336@@ -440,7 +440,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
12337 0xb8,
12338 __NR_ia32_rt_sigreturn,
12339 0x80cd,
12340- 0,
12341+ 0
12342 };
12343
12344 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
12345@@ -459,20 +459,22 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
12346 else
12347 put_user_ex(0, &frame->uc.uc_flags);
12348 put_user_ex(0, &frame->uc.uc_link);
12349- err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp);
12350+ __compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);
12351
12352 if (ksig->ka.sa.sa_flags & SA_RESTORER)
12353 restorer = ksig->ka.sa.sa_restorer;
12354+ else if (current->mm->context.vdso)
12355+ /* Return stub is in 32bit vsyscall page */
12356+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
12357 else
12358- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
12359- rt_sigreturn);
12360+ restorer = &frame->retcode;
12361 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
12362
12363 /*
12364 * Not actually used anymore, but left because some gdb
12365 * versions need it.
12366 */
12367- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
12368+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
12369 } put_user_catch(err);
12370
12371 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
12372diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
12373index 474dc1b..9297c58 100644
12374--- a/arch/x86/ia32/ia32entry.S
12375+++ b/arch/x86/ia32/ia32entry.S
12376@@ -15,8 +15,10 @@
12377 #include <asm/irqflags.h>
12378 #include <asm/asm.h>
12379 #include <asm/smap.h>
12380+#include <asm/pgtable.h>
12381 #include <linux/linkage.h>
12382 #include <linux/err.h>
12383+#include <asm/alternative-asm.h>
12384
12385 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
12386 #include <linux/elf-em.h>
12387@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
12388 ENDPROC(native_irq_enable_sysexit)
12389 #endif
12390
12391+ .macro pax_enter_kernel_user
12392+ pax_set_fptr_mask
12393+#ifdef CONFIG_PAX_MEMORY_UDEREF
12394+ call pax_enter_kernel_user
12395+#endif
12396+ .endm
12397+
12398+ .macro pax_exit_kernel_user
12399+#ifdef CONFIG_PAX_MEMORY_UDEREF
12400+ call pax_exit_kernel_user
12401+#endif
12402+#ifdef CONFIG_PAX_RANDKSTACK
12403+ pushq %rax
12404+ pushq %r11
12405+ call pax_randomize_kstack
12406+ popq %r11
12407+ popq %rax
12408+#endif
12409+ .endm
12410+
12411+ .macro pax_erase_kstack
12412+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
12413+ call pax_erase_kstack
12414+#endif
12415+ .endm
12416+
12417 /*
12418 * 32bit SYSENTER instruction entry.
12419 *
12420@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
12421 CFI_REGISTER rsp,rbp
12422 SWAPGS_UNSAFE_STACK
12423 movq PER_CPU_VAR(kernel_stack), %rsp
12424- addq $(KERNEL_STACK_OFFSET),%rsp
12425- /*
12426- * No need to follow this irqs on/off section: the syscall
12427- * disabled irqs, here we enable it straight after entry:
12428- */
12429- ENABLE_INTERRUPTS(CLBR_NONE)
12430 movl %ebp,%ebp /* zero extension */
12431 pushq_cfi $__USER32_DS
12432 /*CFI_REL_OFFSET ss,0*/
12433@@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
12434 CFI_REL_OFFSET rsp,0
12435 pushfq_cfi
12436 /*CFI_REL_OFFSET rflags,0*/
12437- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
12438- CFI_REGISTER rip,r10
12439+ orl $X86_EFLAGS_IF,(%rsp)
12440+ GET_THREAD_INFO(%r11)
12441+ movl TI_sysenter_return(%r11), %r11d
12442+ CFI_REGISTER rip,r11
12443 pushq_cfi $__USER32_CS
12444 /*CFI_REL_OFFSET cs,0*/
12445 movl %eax, %eax
12446- pushq_cfi %r10
12447+ pushq_cfi %r11
12448 CFI_REL_OFFSET rip,0
12449 pushq_cfi %rax
12450 cld
12451 SAVE_ARGS 0,1,0
12452+ pax_enter_kernel_user
12453+
12454+#ifdef CONFIG_PAX_RANDKSTACK
12455+ pax_erase_kstack
12456+#endif
12457+
12458+ /*
12459+ * No need to follow this irqs on/off section: the syscall
12460+ * disabled irqs, here we enable it straight after entry:
12461+ */
12462+ ENABLE_INTERRUPTS(CLBR_NONE)
12463 /* no need to do an access_ok check here because rbp has been
12464 32bit zero extended */
12465+
12466+#ifdef CONFIG_PAX_MEMORY_UDEREF
12467+ addq pax_user_shadow_base,%rbp
12468+ ASM_PAX_OPEN_USERLAND
12469+#endif
12470+
12471 ASM_STAC
12472 1: movl (%rbp),%ebp
12473 _ASM_EXTABLE(1b,ia32_badarg)
12474 ASM_CLAC
12475- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12476- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12477+
12478+#ifdef CONFIG_PAX_MEMORY_UDEREF
12479+ ASM_PAX_CLOSE_USERLAND
12480+#endif
12481+
12482+ GET_THREAD_INFO(%r11)
12483+ orl $TS_COMPAT,TI_status(%r11)
12484+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
12485 CFI_REMEMBER_STATE
12486 jnz sysenter_tracesys
12487 cmpq $(IA32_NR_syscalls-1),%rax
12488@@ -162,12 +209,15 @@ sysenter_do_call:
12489 sysenter_dispatch:
12490 call *ia32_sys_call_table(,%rax,8)
12491 movq %rax,RAX-ARGOFFSET(%rsp)
12492+ GET_THREAD_INFO(%r11)
12493 DISABLE_INTERRUPTS(CLBR_NONE)
12494 TRACE_IRQS_OFF
12495- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12496+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
12497 jnz sysexit_audit
12498 sysexit_from_sys_call:
12499- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12500+ pax_exit_kernel_user
12501+ pax_erase_kstack
12502+ andl $~TS_COMPAT,TI_status(%r11)
12503 /* clear IF, that popfq doesn't enable interrupts early */
12504 andl $~0x200,EFLAGS-R11(%rsp)
12505 movl RIP-R11(%rsp),%edx /* User %eip */
12506@@ -193,6 +243,9 @@ sysexit_from_sys_call:
12507 movl %eax,%esi /* 2nd arg: syscall number */
12508 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
12509 call __audit_syscall_entry
12510+
12511+ pax_erase_kstack
12512+
12513 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
12514 cmpq $(IA32_NR_syscalls-1),%rax
12515 ja ia32_badsys
12516@@ -204,7 +257,7 @@ sysexit_from_sys_call:
12517 .endm
12518
12519 .macro auditsys_exit exit
12520- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12521+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
12522 jnz ia32_ret_from_sys_call
12523 TRACE_IRQS_ON
12524 ENABLE_INTERRUPTS(CLBR_NONE)
12525@@ -215,11 +268,12 @@ sysexit_from_sys_call:
12526 1: setbe %al /* 1 if error, 0 if not */
12527 movzbl %al,%edi /* zero-extend that into %edi */
12528 call __audit_syscall_exit
12529+ GET_THREAD_INFO(%r11)
12530 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
12531 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
12532 DISABLE_INTERRUPTS(CLBR_NONE)
12533 TRACE_IRQS_OFF
12534- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12535+ testl %edi,TI_flags(%r11)
12536 jz \exit
12537 CLEAR_RREGS -ARGOFFSET
12538 jmp int_with_check
12539@@ -237,7 +291,7 @@ sysexit_audit:
12540
12541 sysenter_tracesys:
12542 #ifdef CONFIG_AUDITSYSCALL
12543- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12544+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
12545 jz sysenter_auditsys
12546 #endif
12547 SAVE_REST
12548@@ -249,6 +303,9 @@ sysenter_tracesys:
12549 RESTORE_REST
12550 cmpq $(IA32_NR_syscalls-1),%rax
12551 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
12552+
12553+ pax_erase_kstack
12554+
12555 jmp sysenter_do_call
12556 CFI_ENDPROC
12557 ENDPROC(ia32_sysenter_target)
12558@@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
12559 ENTRY(ia32_cstar_target)
12560 CFI_STARTPROC32 simple
12561 CFI_SIGNAL_FRAME
12562- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
12563+ CFI_DEF_CFA rsp,0
12564 CFI_REGISTER rip,rcx
12565 /*CFI_REGISTER rflags,r11*/
12566 SWAPGS_UNSAFE_STACK
12567 movl %esp,%r8d
12568 CFI_REGISTER rsp,r8
12569 movq PER_CPU_VAR(kernel_stack),%rsp
12570+ SAVE_ARGS 8*6,0,0
12571+ pax_enter_kernel_user
12572+
12573+#ifdef CONFIG_PAX_RANDKSTACK
12574+ pax_erase_kstack
12575+#endif
12576+
12577 /*
12578 * No need to follow this irqs on/off section: the syscall
12579 * disabled irqs and here we enable it straight after entry:
12580 */
12581 ENABLE_INTERRUPTS(CLBR_NONE)
12582- SAVE_ARGS 8,0,0
12583 movl %eax,%eax /* zero extension */
12584 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
12585 movq %rcx,RIP-ARGOFFSET(%rsp)
12586@@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
12587 /* no need to do an access_ok check here because r8 has been
12588 32bit zero extended */
12589 /* hardware stack frame is complete now */
12590+
12591+#ifdef CONFIG_PAX_MEMORY_UDEREF
12592+ ASM_PAX_OPEN_USERLAND
12593+ movq pax_user_shadow_base,%r8
12594+ addq RSP-ARGOFFSET(%rsp),%r8
12595+#endif
12596+
12597 ASM_STAC
12598 1: movl (%r8),%r9d
12599 _ASM_EXTABLE(1b,ia32_badarg)
12600 ASM_CLAC
12601- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12602- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12603+
12604+#ifdef CONFIG_PAX_MEMORY_UDEREF
12605+ ASM_PAX_CLOSE_USERLAND
12606+#endif
12607+
12608+ GET_THREAD_INFO(%r11)
12609+ orl $TS_COMPAT,TI_status(%r11)
12610+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
12611 CFI_REMEMBER_STATE
12612 jnz cstar_tracesys
12613 cmpq $IA32_NR_syscalls-1,%rax
12614@@ -319,12 +395,15 @@ cstar_do_call:
12615 cstar_dispatch:
12616 call *ia32_sys_call_table(,%rax,8)
12617 movq %rax,RAX-ARGOFFSET(%rsp)
12618+ GET_THREAD_INFO(%r11)
12619 DISABLE_INTERRUPTS(CLBR_NONE)
12620 TRACE_IRQS_OFF
12621- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12622+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
12623 jnz sysretl_audit
12624 sysretl_from_sys_call:
12625- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12626+ pax_exit_kernel_user
12627+ pax_erase_kstack
12628+ andl $~TS_COMPAT,TI_status(%r11)
12629 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
12630 movl RIP-ARGOFFSET(%rsp),%ecx
12631 CFI_REGISTER rip,rcx
12632@@ -352,7 +431,7 @@ sysretl_audit:
12633
12634 cstar_tracesys:
12635 #ifdef CONFIG_AUDITSYSCALL
12636- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12637+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
12638 jz cstar_auditsys
12639 #endif
12640 xchgl %r9d,%ebp
12641@@ -366,11 +445,19 @@ cstar_tracesys:
12642 xchgl %ebp,%r9d
12643 cmpq $(IA32_NR_syscalls-1),%rax
12644 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
12645+
12646+ pax_erase_kstack
12647+
12648 jmp cstar_do_call
12649 END(ia32_cstar_target)
12650
12651 ia32_badarg:
12652 ASM_CLAC
12653+
12654+#ifdef CONFIG_PAX_MEMORY_UDEREF
12655+ ASM_PAX_CLOSE_USERLAND
12656+#endif
12657+
12658 movq $-EFAULT,%rax
12659 jmp ia32_sysret
12660 CFI_ENDPROC
12661@@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
12662 CFI_REL_OFFSET rip,RIP-RIP
12663 PARAVIRT_ADJUST_EXCEPTION_FRAME
12664 SWAPGS
12665- /*
12666- * No need to follow this irqs on/off section: the syscall
12667- * disabled irqs and here we enable it straight after entry:
12668- */
12669- ENABLE_INTERRUPTS(CLBR_NONE)
12670 movl %eax,%eax
12671 pushq_cfi %rax
12672 cld
12673 /* note the registers are not zero extended to the sf.
12674 this could be a problem. */
12675 SAVE_ARGS 0,1,0
12676- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12677- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
12678+ pax_enter_kernel_user
12679+
12680+#ifdef CONFIG_PAX_RANDKSTACK
12681+ pax_erase_kstack
12682+#endif
12683+
12684+ /*
12685+ * No need to follow this irqs on/off section: the syscall
12686+ * disabled irqs and here we enable it straight after entry:
12687+ */
12688+ ENABLE_INTERRUPTS(CLBR_NONE)
12689+ GET_THREAD_INFO(%r11)
12690+ orl $TS_COMPAT,TI_status(%r11)
12691+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
12692 jnz ia32_tracesys
12693 cmpq $(IA32_NR_syscalls-1),%rax
12694 ja ia32_badsys
12695@@ -442,6 +536,9 @@ ia32_tracesys:
12696 RESTORE_REST
12697 cmpq $(IA32_NR_syscalls-1),%rax
12698 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
12699+
12700+ pax_erase_kstack
12701+
12702 jmp ia32_do_call
12703 END(ia32_syscall)
12704
12705diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
12706index 8e0ceec..af13504 100644
12707--- a/arch/x86/ia32/sys_ia32.c
12708+++ b/arch/x86/ia32/sys_ia32.c
12709@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
12710 */
12711 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
12712 {
12713- typeof(ubuf->st_uid) uid = 0;
12714- typeof(ubuf->st_gid) gid = 0;
12715+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
12716+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
12717 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
12718 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
12719 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
12720diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
12721index 372231c..a5aa1a1 100644
12722--- a/arch/x86/include/asm/alternative-asm.h
12723+++ b/arch/x86/include/asm/alternative-asm.h
12724@@ -18,6 +18,45 @@
12725 .endm
12726 #endif
12727
12728+#ifdef KERNEXEC_PLUGIN
12729+ .macro pax_force_retaddr_bts rip=0
12730+ btsq $63,\rip(%rsp)
12731+ .endm
12732+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
12733+ .macro pax_force_retaddr rip=0, reload=0
12734+ btsq $63,\rip(%rsp)
12735+ .endm
12736+ .macro pax_force_fptr ptr
12737+ btsq $63,\ptr
12738+ .endm
12739+ .macro pax_set_fptr_mask
12740+ .endm
12741+#endif
12742+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
12743+ .macro pax_force_retaddr rip=0, reload=0
12744+ .if \reload
12745+ pax_set_fptr_mask
12746+ .endif
12747+ orq %r10,\rip(%rsp)
12748+ .endm
12749+ .macro pax_force_fptr ptr
12750+ orq %r10,\ptr
12751+ .endm
12752+ .macro pax_set_fptr_mask
12753+ movabs $0x8000000000000000,%r10
12754+ .endm
12755+#endif
12756+#else
12757+ .macro pax_force_retaddr rip=0, reload=0
12758+ .endm
12759+ .macro pax_force_fptr ptr
12760+ .endm
12761+ .macro pax_force_retaddr_bts rip=0
12762+ .endm
12763+ .macro pax_set_fptr_mask
12764+ .endm
12765+#endif
12766+
12767 .macro altinstruction_entry orig alt feature orig_len alt_len
12768 .long \orig - .
12769 .long \alt - .
12770diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
12771index 58ed6d9..f1cbe58 100644
12772--- a/arch/x86/include/asm/alternative.h
12773+++ b/arch/x86/include/asm/alternative.h
12774@@ -105,7 +105,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
12775 ".pushsection .discard,\"aw\",@progbits\n" \
12776 DISCARD_ENTRY(1) \
12777 ".popsection\n" \
12778- ".pushsection .altinstr_replacement, \"ax\"\n" \
12779+ ".pushsection .altinstr_replacement, \"a\"\n" \
12780 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
12781 ".popsection"
12782
12783@@ -119,7 +119,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
12784 DISCARD_ENTRY(1) \
12785 DISCARD_ENTRY(2) \
12786 ".popsection\n" \
12787- ".pushsection .altinstr_replacement, \"ax\"\n" \
12788+ ".pushsection .altinstr_replacement, \"a\"\n" \
12789 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
12790 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
12791 ".popsection"
12792diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
12793index 3388034..050f0b9 100644
12794--- a/arch/x86/include/asm/apic.h
12795+++ b/arch/x86/include/asm/apic.h
12796@@ -44,7 +44,7 @@ static inline void generic_apic_probe(void)
12797
12798 #ifdef CONFIG_X86_LOCAL_APIC
12799
12800-extern unsigned int apic_verbosity;
12801+extern int apic_verbosity;
12802 extern int local_apic_timer_c2_ok;
12803
12804 extern int disable_apic;
12805diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
12806index 20370c6..a2eb9b0 100644
12807--- a/arch/x86/include/asm/apm.h
12808+++ b/arch/x86/include/asm/apm.h
12809@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
12810 __asm__ __volatile__(APM_DO_ZERO_SEGS
12811 "pushl %%edi\n\t"
12812 "pushl %%ebp\n\t"
12813- "lcall *%%cs:apm_bios_entry\n\t"
12814+ "lcall *%%ss:apm_bios_entry\n\t"
12815 "setc %%al\n\t"
12816 "popl %%ebp\n\t"
12817 "popl %%edi\n\t"
12818@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
12819 __asm__ __volatile__(APM_DO_ZERO_SEGS
12820 "pushl %%edi\n\t"
12821 "pushl %%ebp\n\t"
12822- "lcall *%%cs:apm_bios_entry\n\t"
12823+ "lcall *%%ss:apm_bios_entry\n\t"
12824 "setc %%bl\n\t"
12825 "popl %%ebp\n\t"
12826 "popl %%edi\n\t"
12827diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
12828index 722aa3b..3a0bb27 100644
12829--- a/arch/x86/include/asm/atomic.h
12830+++ b/arch/x86/include/asm/atomic.h
12831@@ -22,7 +22,18 @@
12832 */
12833 static inline int atomic_read(const atomic_t *v)
12834 {
12835- return (*(volatile int *)&(v)->counter);
12836+ return (*(volatile const int *)&(v)->counter);
12837+}
12838+
12839+/**
12840+ * atomic_read_unchecked - read atomic variable
12841+ * @v: pointer of type atomic_unchecked_t
12842+ *
12843+ * Atomically reads the value of @v.
12844+ */
12845+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
12846+{
12847+ return (*(volatile const int *)&(v)->counter);
12848 }
12849
12850 /**
12851@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
12852 }
12853
12854 /**
12855+ * atomic_set_unchecked - set atomic variable
12856+ * @v: pointer of type atomic_unchecked_t
12857+ * @i: required value
12858+ *
12859+ * Atomically sets the value of @v to @i.
12860+ */
12861+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
12862+{
12863+ v->counter = i;
12864+}
12865+
12866+/**
12867 * atomic_add - add integer to atomic variable
12868 * @i: integer value to add
12869 * @v: pointer of type atomic_t
12870@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
12871 */
12872 static inline void atomic_add(int i, atomic_t *v)
12873 {
12874- asm volatile(LOCK_PREFIX "addl %1,%0"
12875+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
12876+
12877+#ifdef CONFIG_PAX_REFCOUNT
12878+ "jno 0f\n"
12879+ LOCK_PREFIX "subl %1,%0\n"
12880+ "int $4\n0:\n"
12881+ _ASM_EXTABLE(0b, 0b)
12882+#endif
12883+
12884+ : "+m" (v->counter)
12885+ : "ir" (i));
12886+}
12887+
12888+/**
12889+ * atomic_add_unchecked - add integer to atomic variable
12890+ * @i: integer value to add
12891+ * @v: pointer of type atomic_unchecked_t
12892+ *
12893+ * Atomically adds @i to @v.
12894+ */
12895+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
12896+{
12897+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
12898 : "+m" (v->counter)
12899 : "ir" (i));
12900 }
12901@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
12902 */
12903 static inline void atomic_sub(int i, atomic_t *v)
12904 {
12905- asm volatile(LOCK_PREFIX "subl %1,%0"
12906+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
12907+
12908+#ifdef CONFIG_PAX_REFCOUNT
12909+ "jno 0f\n"
12910+ LOCK_PREFIX "addl %1,%0\n"
12911+ "int $4\n0:\n"
12912+ _ASM_EXTABLE(0b, 0b)
12913+#endif
12914+
12915+ : "+m" (v->counter)
12916+ : "ir" (i));
12917+}
12918+
12919+/**
12920+ * atomic_sub_unchecked - subtract integer from atomic variable
12921+ * @i: integer value to subtract
12922+ * @v: pointer of type atomic_unchecked_t
12923+ *
12924+ * Atomically subtracts @i from @v.
12925+ */
12926+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
12927+{
12928+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
12929 : "+m" (v->counter)
12930 : "ir" (i));
12931 }
12932@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
12933 {
12934 unsigned char c;
12935
12936- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
12937+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
12938+
12939+#ifdef CONFIG_PAX_REFCOUNT
12940+ "jno 0f\n"
12941+ LOCK_PREFIX "addl %2,%0\n"
12942+ "int $4\n0:\n"
12943+ _ASM_EXTABLE(0b, 0b)
12944+#endif
12945+
12946+ "sete %1\n"
12947 : "+m" (v->counter), "=qm" (c)
12948 : "ir" (i) : "memory");
12949 return c;
12950@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
12951 */
12952 static inline void atomic_inc(atomic_t *v)
12953 {
12954- asm volatile(LOCK_PREFIX "incl %0"
12955+ asm volatile(LOCK_PREFIX "incl %0\n"
12956+
12957+#ifdef CONFIG_PAX_REFCOUNT
12958+ "jno 0f\n"
12959+ LOCK_PREFIX "decl %0\n"
12960+ "int $4\n0:\n"
12961+ _ASM_EXTABLE(0b, 0b)
12962+#endif
12963+
12964+ : "+m" (v->counter));
12965+}
12966+
12967+/**
12968+ * atomic_inc_unchecked - increment atomic variable
12969+ * @v: pointer of type atomic_unchecked_t
12970+ *
12971+ * Atomically increments @v by 1.
12972+ */
12973+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
12974+{
12975+ asm volatile(LOCK_PREFIX "incl %0\n"
12976 : "+m" (v->counter));
12977 }
12978
12979@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
12980 */
12981 static inline void atomic_dec(atomic_t *v)
12982 {
12983- asm volatile(LOCK_PREFIX "decl %0"
12984+ asm volatile(LOCK_PREFIX "decl %0\n"
12985+
12986+#ifdef CONFIG_PAX_REFCOUNT
12987+ "jno 0f\n"
12988+ LOCK_PREFIX "incl %0\n"
12989+ "int $4\n0:\n"
12990+ _ASM_EXTABLE(0b, 0b)
12991+#endif
12992+
12993+ : "+m" (v->counter));
12994+}
12995+
12996+/**
12997+ * atomic_dec_unchecked - decrement atomic variable
12998+ * @v: pointer of type atomic_unchecked_t
12999+ *
13000+ * Atomically decrements @v by 1.
13001+ */
13002+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
13003+{
13004+ asm volatile(LOCK_PREFIX "decl %0\n"
13005 : "+m" (v->counter));
13006 }
13007
13008@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
13009 {
13010 unsigned char c;
13011
13012- asm volatile(LOCK_PREFIX "decl %0; sete %1"
13013+ asm volatile(LOCK_PREFIX "decl %0\n"
13014+
13015+#ifdef CONFIG_PAX_REFCOUNT
13016+ "jno 0f\n"
13017+ LOCK_PREFIX "incl %0\n"
13018+ "int $4\n0:\n"
13019+ _ASM_EXTABLE(0b, 0b)
13020+#endif
13021+
13022+ "sete %1\n"
13023 : "+m" (v->counter), "=qm" (c)
13024 : : "memory");
13025 return c != 0;
13026@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
13027 {
13028 unsigned char c;
13029
13030- asm volatile(LOCK_PREFIX "incl %0; sete %1"
13031+ asm volatile(LOCK_PREFIX "incl %0\n"
13032+
13033+#ifdef CONFIG_PAX_REFCOUNT
13034+ "jno 0f\n"
13035+ LOCK_PREFIX "decl %0\n"
13036+ "int $4\n0:\n"
13037+ _ASM_EXTABLE(0b, 0b)
13038+#endif
13039+
13040+ "sete %1\n"
13041+ : "+m" (v->counter), "=qm" (c)
13042+ : : "memory");
13043+ return c != 0;
13044+}
13045+
13046+/**
13047+ * atomic_inc_and_test_unchecked - increment and test
13048+ * @v: pointer of type atomic_unchecked_t
13049+ *
13050+ * Atomically increments @v by 1
13051+ * and returns true if the result is zero, or false for all
13052+ * other cases.
13053+ */
13054+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
13055+{
13056+ unsigned char c;
13057+
13058+ asm volatile(LOCK_PREFIX "incl %0\n"
13059+ "sete %1\n"
13060 : "+m" (v->counter), "=qm" (c)
13061 : : "memory");
13062 return c != 0;
13063@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
13064 {
13065 unsigned char c;
13066
13067- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
13068+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
13069+
13070+#ifdef CONFIG_PAX_REFCOUNT
13071+ "jno 0f\n"
13072+ LOCK_PREFIX "subl %2,%0\n"
13073+ "int $4\n0:\n"
13074+ _ASM_EXTABLE(0b, 0b)
13075+#endif
13076+
13077+ "sets %1\n"
13078 : "+m" (v->counter), "=qm" (c)
13079 : "ir" (i) : "memory");
13080 return c;
13081@@ -172,6 +334,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
13082 */
13083 static inline int atomic_add_return(int i, atomic_t *v)
13084 {
13085+ return i + xadd_check_overflow(&v->counter, i);
13086+}
13087+
13088+/**
13089+ * atomic_add_return_unchecked - add integer and return
13090+ * @i: integer value to add
13091+ * @v: pointer of type atomic_unchecked_t
13092+ *
13093+ * Atomically adds @i to @v and returns @i + @v
13094+ */
13095+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
13096+{
13097 return i + xadd(&v->counter, i);
13098 }
13099
13100@@ -188,6 +362,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
13101 }
13102
13103 #define atomic_inc_return(v) (atomic_add_return(1, v))
13104+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
13105+{
13106+ return atomic_add_return_unchecked(1, v);
13107+}
13108 #define atomic_dec_return(v) (atomic_sub_return(1, v))
13109
13110 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
13111@@ -195,11 +373,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
13112 return cmpxchg(&v->counter, old, new);
13113 }
13114
13115+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
13116+{
13117+ return cmpxchg(&v->counter, old, new);
13118+}
13119+
13120 static inline int atomic_xchg(atomic_t *v, int new)
13121 {
13122 return xchg(&v->counter, new);
13123 }
13124
13125+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
13126+{
13127+ return xchg(&v->counter, new);
13128+}
13129+
13130 /**
13131 * __atomic_add_unless - add unless the number is already a given value
13132 * @v: pointer of type atomic_t
13133@@ -211,12 +399,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
13134 */
13135 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
13136 {
13137- int c, old;
13138+ int c, old, new;
13139 c = atomic_read(v);
13140 for (;;) {
13141- if (unlikely(c == (u)))
13142+ if (unlikely(c == u))
13143 break;
13144- old = atomic_cmpxchg((v), c, c + (a));
13145+
13146+ asm volatile("addl %2,%0\n"
13147+
13148+#ifdef CONFIG_PAX_REFCOUNT
13149+ "jno 0f\n"
13150+ "subl %2,%0\n"
13151+ "int $4\n0:\n"
13152+ _ASM_EXTABLE(0b, 0b)
13153+#endif
13154+
13155+ : "=r" (new)
13156+ : "0" (c), "ir" (a));
13157+
13158+ old = atomic_cmpxchg(v, c, new);
13159 if (likely(old == c))
13160 break;
13161 c = old;
13162@@ -225,6 +426,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
13163 }
13164
13165 /**
13166+ * atomic_inc_not_zero_hint - increment if not null
13167+ * @v: pointer of type atomic_t
13168+ * @hint: probable value of the atomic before the increment
13169+ *
13170+ * This version of atomic_inc_not_zero() gives a hint of probable
13171+ * value of the atomic. This helps processor to not read the memory
13172+ * before doing the atomic read/modify/write cycle, lowering
13173+ * number of bus transactions on some arches.
13174+ *
13175+ * Returns: 0 if increment was not done, 1 otherwise.
13176+ */
13177+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
13178+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
13179+{
13180+ int val, c = hint, new;
13181+
13182+ /* sanity test, should be removed by compiler if hint is a constant */
13183+ if (!hint)
13184+ return __atomic_add_unless(v, 1, 0);
13185+
13186+ do {
13187+ asm volatile("incl %0\n"
13188+
13189+#ifdef CONFIG_PAX_REFCOUNT
13190+ "jno 0f\n"
13191+ "decl %0\n"
13192+ "int $4\n0:\n"
13193+ _ASM_EXTABLE(0b, 0b)
13194+#endif
13195+
13196+ : "=r" (new)
13197+ : "0" (c));
13198+
13199+ val = atomic_cmpxchg(v, c, new);
13200+ if (val == c)
13201+ return 1;
13202+ c = val;
13203+ } while (c);
13204+
13205+ return 0;
13206+}
13207+
13208+/**
13209 * atomic_inc_short - increment of a short integer
13210 * @v: pointer to type int
13211 *
13212@@ -253,14 +497,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
13213 #endif
13214
13215 /* These are x86-specific, used by some header files */
13216-#define atomic_clear_mask(mask, addr) \
13217- asm volatile(LOCK_PREFIX "andl %0,%1" \
13218- : : "r" (~(mask)), "m" (*(addr)) : "memory")
13219+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
13220+{
13221+ asm volatile(LOCK_PREFIX "andl %1,%0"
13222+ : "+m" (v->counter)
13223+ : "r" (~(mask))
13224+ : "memory");
13225+}
13226
13227-#define atomic_set_mask(mask, addr) \
13228- asm volatile(LOCK_PREFIX "orl %0,%1" \
13229- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
13230- : "memory")
13231+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
13232+{
13233+ asm volatile(LOCK_PREFIX "andl %1,%0"
13234+ : "+m" (v->counter)
13235+ : "r" (~(mask))
13236+ : "memory");
13237+}
13238+
13239+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
13240+{
13241+ asm volatile(LOCK_PREFIX "orl %1,%0"
13242+ : "+m" (v->counter)
13243+ : "r" (mask)
13244+ : "memory");
13245+}
13246+
13247+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
13248+{
13249+ asm volatile(LOCK_PREFIX "orl %1,%0"
13250+ : "+m" (v->counter)
13251+ : "r" (mask)
13252+ : "memory");
13253+}
13254
13255 /* Atomic operations are already serializing on x86 */
13256 #define smp_mb__before_atomic_dec() barrier()
13257diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
13258index b154de7..aadebd8 100644
13259--- a/arch/x86/include/asm/atomic64_32.h
13260+++ b/arch/x86/include/asm/atomic64_32.h
13261@@ -12,6 +12,14 @@ typedef struct {
13262 u64 __aligned(8) counter;
13263 } atomic64_t;
13264
13265+#ifdef CONFIG_PAX_REFCOUNT
13266+typedef struct {
13267+ u64 __aligned(8) counter;
13268+} atomic64_unchecked_t;
13269+#else
13270+typedef atomic64_t atomic64_unchecked_t;
13271+#endif
13272+
13273 #define ATOMIC64_INIT(val) { (val) }
13274
13275 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
13276@@ -37,21 +45,31 @@ typedef struct {
13277 ATOMIC64_DECL_ONE(sym##_386)
13278
13279 ATOMIC64_DECL_ONE(add_386);
13280+ATOMIC64_DECL_ONE(add_unchecked_386);
13281 ATOMIC64_DECL_ONE(sub_386);
13282+ATOMIC64_DECL_ONE(sub_unchecked_386);
13283 ATOMIC64_DECL_ONE(inc_386);
13284+ATOMIC64_DECL_ONE(inc_unchecked_386);
13285 ATOMIC64_DECL_ONE(dec_386);
13286+ATOMIC64_DECL_ONE(dec_unchecked_386);
13287 #endif
13288
13289 #define alternative_atomic64(f, out, in...) \
13290 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
13291
13292 ATOMIC64_DECL(read);
13293+ATOMIC64_DECL(read_unchecked);
13294 ATOMIC64_DECL(set);
13295+ATOMIC64_DECL(set_unchecked);
13296 ATOMIC64_DECL(xchg);
13297 ATOMIC64_DECL(add_return);
13298+ATOMIC64_DECL(add_return_unchecked);
13299 ATOMIC64_DECL(sub_return);
13300+ATOMIC64_DECL(sub_return_unchecked);
13301 ATOMIC64_DECL(inc_return);
13302+ATOMIC64_DECL(inc_return_unchecked);
13303 ATOMIC64_DECL(dec_return);
13304+ATOMIC64_DECL(dec_return_unchecked);
13305 ATOMIC64_DECL(dec_if_positive);
13306 ATOMIC64_DECL(inc_not_zero);
13307 ATOMIC64_DECL(add_unless);
13308@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
13309 }
13310
13311 /**
13312+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
13313+ * @p: pointer to type atomic64_unchecked_t
13314+ * @o: expected value
13315+ * @n: new value
13316+ *
13317+ * Atomically sets @v to @n if it was equal to @o and returns
13318+ * the old value.
13319+ */
13320+
13321+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
13322+{
13323+ return cmpxchg64(&v->counter, o, n);
13324+}
13325+
13326+/**
13327 * atomic64_xchg - xchg atomic64 variable
13328 * @v: pointer to type atomic64_t
13329 * @n: value to assign
13330@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
13331 }
13332
13333 /**
13334+ * atomic64_set_unchecked - set atomic64 variable
13335+ * @v: pointer to type atomic64_unchecked_t
13336+ * @n: value to assign
13337+ *
13338+ * Atomically sets the value of @v to @n.
13339+ */
13340+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
13341+{
13342+ unsigned high = (unsigned)(i >> 32);
13343+ unsigned low = (unsigned)i;
13344+ alternative_atomic64(set, /* no output */,
13345+ "S" (v), "b" (low), "c" (high)
13346+ : "eax", "edx", "memory");
13347+}
13348+
13349+/**
13350 * atomic64_read - read atomic64 variable
13351 * @v: pointer to type atomic64_t
13352 *
13353@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
13354 }
13355
13356 /**
13357+ * atomic64_read_unchecked - read atomic64 variable
13358+ * @v: pointer to type atomic64_unchecked_t
13359+ *
13360+ * Atomically reads the value of @v and returns it.
13361+ */
13362+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
13363+{
13364+ long long r;
13365+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
13366+ return r;
13367+ }
13368+
13369+/**
13370 * atomic64_add_return - add and return
13371 * @i: integer value to add
13372 * @v: pointer to type atomic64_t
13373@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
13374 return i;
13375 }
13376
13377+/**
13378+ * atomic64_add_return_unchecked - add and return
13379+ * @i: integer value to add
13380+ * @v: pointer to type atomic64_unchecked_t
13381+ *
13382+ * Atomically adds @i to @v and returns @i + *@v
13383+ */
13384+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
13385+{
13386+ alternative_atomic64(add_return_unchecked,
13387+ ASM_OUTPUT2("+A" (i), "+c" (v)),
13388+ ASM_NO_INPUT_CLOBBER("memory"));
13389+ return i;
13390+}
13391+
13392 /*
13393 * Other variants with different arithmetic operators:
13394 */
13395@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
13396 return a;
13397 }
13398
13399+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
13400+{
13401+ long long a;
13402+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
13403+ "S" (v) : "memory", "ecx");
13404+ return a;
13405+}
13406+
13407 static inline long long atomic64_dec_return(atomic64_t *v)
13408 {
13409 long long a;
13410@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
13411 }
13412
13413 /**
13414+ * atomic64_add_unchecked - add integer to atomic64 variable
13415+ * @i: integer value to add
13416+ * @v: pointer to type atomic64_unchecked_t
13417+ *
13418+ * Atomically adds @i to @v.
13419+ */
13420+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
13421+{
13422+ __alternative_atomic64(add_unchecked, add_return_unchecked,
13423+ ASM_OUTPUT2("+A" (i), "+c" (v)),
13424+ ASM_NO_INPUT_CLOBBER("memory"));
13425+ return i;
13426+}
13427+
13428+/**
13429 * atomic64_sub - subtract the atomic64 variable
13430 * @i: integer value to subtract
13431 * @v: pointer to type atomic64_t
13432diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
13433index 0e1cbfc..5623683 100644
13434--- a/arch/x86/include/asm/atomic64_64.h
13435+++ b/arch/x86/include/asm/atomic64_64.h
13436@@ -18,7 +18,19 @@
13437 */
13438 static inline long atomic64_read(const atomic64_t *v)
13439 {
13440- return (*(volatile long *)&(v)->counter);
13441+ return (*(volatile const long *)&(v)->counter);
13442+}
13443+
13444+/**
13445+ * atomic64_read_unchecked - read atomic64 variable
13446+ * @v: pointer of type atomic64_unchecked_t
13447+ *
13448+ * Atomically reads the value of @v.
13449+ * Doesn't imply a read memory barrier.
13450+ */
13451+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
13452+{
13453+ return (*(volatile const long *)&(v)->counter);
13454 }
13455
13456 /**
13457@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
13458 }
13459
13460 /**
13461+ * atomic64_set_unchecked - set atomic64 variable
13462+ * @v: pointer to type atomic64_unchecked_t
13463+ * @i: required value
13464+ *
13465+ * Atomically sets the value of @v to @i.
13466+ */
13467+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
13468+{
13469+ v->counter = i;
13470+}
13471+
13472+/**
13473 * atomic64_add - add integer to atomic64 variable
13474 * @i: integer value to add
13475 * @v: pointer to type atomic64_t
13476@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
13477 */
13478 static inline void atomic64_add(long i, atomic64_t *v)
13479 {
13480+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
13481+
13482+#ifdef CONFIG_PAX_REFCOUNT
13483+ "jno 0f\n"
13484+ LOCK_PREFIX "subq %1,%0\n"
13485+ "int $4\n0:\n"
13486+ _ASM_EXTABLE(0b, 0b)
13487+#endif
13488+
13489+ : "=m" (v->counter)
13490+ : "er" (i), "m" (v->counter));
13491+}
13492+
13493+/**
13494+ * atomic64_add_unchecked - add integer to atomic64 variable
13495+ * @i: integer value to add
13496+ * @v: pointer to type atomic64_unchecked_t
13497+ *
13498+ * Atomically adds @i to @v.
13499+ */
13500+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
13501+{
13502 asm volatile(LOCK_PREFIX "addq %1,%0"
13503 : "=m" (v->counter)
13504 : "er" (i), "m" (v->counter));
13505@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
13506 */
13507 static inline void atomic64_sub(long i, atomic64_t *v)
13508 {
13509- asm volatile(LOCK_PREFIX "subq %1,%0"
13510+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
13511+
13512+#ifdef CONFIG_PAX_REFCOUNT
13513+ "jno 0f\n"
13514+ LOCK_PREFIX "addq %1,%0\n"
13515+ "int $4\n0:\n"
13516+ _ASM_EXTABLE(0b, 0b)
13517+#endif
13518+
13519+ : "=m" (v->counter)
13520+ : "er" (i), "m" (v->counter));
13521+}
13522+
13523+/**
13524+ * atomic64_sub_unchecked - subtract the atomic64 variable
13525+ * @i: integer value to subtract
13526+ * @v: pointer to type atomic64_unchecked_t
13527+ *
13528+ * Atomically subtracts @i from @v.
13529+ */
13530+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
13531+{
13532+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
13533 : "=m" (v->counter)
13534 : "er" (i), "m" (v->counter));
13535 }
13536@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
13537 {
13538 unsigned char c;
13539
13540- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
13541+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
13542+
13543+#ifdef CONFIG_PAX_REFCOUNT
13544+ "jno 0f\n"
13545+ LOCK_PREFIX "addq %2,%0\n"
13546+ "int $4\n0:\n"
13547+ _ASM_EXTABLE(0b, 0b)
13548+#endif
13549+
13550+ "sete %1\n"
13551 : "=m" (v->counter), "=qm" (c)
13552 : "er" (i), "m" (v->counter) : "memory");
13553 return c;
13554@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
13555 */
13556 static inline void atomic64_inc(atomic64_t *v)
13557 {
13558+ asm volatile(LOCK_PREFIX "incq %0\n"
13559+
13560+#ifdef CONFIG_PAX_REFCOUNT
13561+ "jno 0f\n"
13562+ LOCK_PREFIX "decq %0\n"
13563+ "int $4\n0:\n"
13564+ _ASM_EXTABLE(0b, 0b)
13565+#endif
13566+
13567+ : "=m" (v->counter)
13568+ : "m" (v->counter));
13569+}
13570+
13571+/**
13572+ * atomic64_inc_unchecked - increment atomic64 variable
13573+ * @v: pointer to type atomic64_unchecked_t
13574+ *
13575+ * Atomically increments @v by 1.
13576+ */
13577+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
13578+{
13579 asm volatile(LOCK_PREFIX "incq %0"
13580 : "=m" (v->counter)
13581 : "m" (v->counter));
13582@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
13583 */
13584 static inline void atomic64_dec(atomic64_t *v)
13585 {
13586- asm volatile(LOCK_PREFIX "decq %0"
13587+ asm volatile(LOCK_PREFIX "decq %0\n"
13588+
13589+#ifdef CONFIG_PAX_REFCOUNT
13590+ "jno 0f\n"
13591+ LOCK_PREFIX "incq %0\n"
13592+ "int $4\n0:\n"
13593+ _ASM_EXTABLE(0b, 0b)
13594+#endif
13595+
13596+ : "=m" (v->counter)
13597+ : "m" (v->counter));
13598+}
13599+
13600+/**
13601+ * atomic64_dec_unchecked - decrement atomic64 variable
13602+ * @v: pointer to type atomic64_t
13603+ *
13604+ * Atomically decrements @v by 1.
13605+ */
13606+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
13607+{
13608+ asm volatile(LOCK_PREFIX "decq %0\n"
13609 : "=m" (v->counter)
13610 : "m" (v->counter));
13611 }
13612@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
13613 {
13614 unsigned char c;
13615
13616- asm volatile(LOCK_PREFIX "decq %0; sete %1"
13617+ asm volatile(LOCK_PREFIX "decq %0\n"
13618+
13619+#ifdef CONFIG_PAX_REFCOUNT
13620+ "jno 0f\n"
13621+ LOCK_PREFIX "incq %0\n"
13622+ "int $4\n0:\n"
13623+ _ASM_EXTABLE(0b, 0b)
13624+#endif
13625+
13626+ "sete %1\n"
13627 : "=m" (v->counter), "=qm" (c)
13628 : "m" (v->counter) : "memory");
13629 return c != 0;
13630@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
13631 {
13632 unsigned char c;
13633
13634- asm volatile(LOCK_PREFIX "incq %0; sete %1"
13635+ asm volatile(LOCK_PREFIX "incq %0\n"
13636+
13637+#ifdef CONFIG_PAX_REFCOUNT
13638+ "jno 0f\n"
13639+ LOCK_PREFIX "decq %0\n"
13640+ "int $4\n0:\n"
13641+ _ASM_EXTABLE(0b, 0b)
13642+#endif
13643+
13644+ "sete %1\n"
13645 : "=m" (v->counter), "=qm" (c)
13646 : "m" (v->counter) : "memory");
13647 return c != 0;
13648@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
13649 {
13650 unsigned char c;
13651
13652- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
13653+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
13654+
13655+#ifdef CONFIG_PAX_REFCOUNT
13656+ "jno 0f\n"
13657+ LOCK_PREFIX "subq %2,%0\n"
13658+ "int $4\n0:\n"
13659+ _ASM_EXTABLE(0b, 0b)
13660+#endif
13661+
13662+ "sets %1\n"
13663 : "=m" (v->counter), "=qm" (c)
13664 : "er" (i), "m" (v->counter) : "memory");
13665 return c;
13666@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
13667 */
13668 static inline long atomic64_add_return(long i, atomic64_t *v)
13669 {
13670+ return i + xadd_check_overflow(&v->counter, i);
13671+}
13672+
13673+/**
13674+ * atomic64_add_return_unchecked - add and return
13675+ * @i: integer value to add
13676+ * @v: pointer to type atomic64_unchecked_t
13677+ *
13678+ * Atomically adds @i to @v and returns @i + @v
13679+ */
13680+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
13681+{
13682 return i + xadd(&v->counter, i);
13683 }
13684
13685@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
13686 }
13687
13688 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
13689+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
13690+{
13691+ return atomic64_add_return_unchecked(1, v);
13692+}
13693 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
13694
13695 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
13696@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
13697 return cmpxchg(&v->counter, old, new);
13698 }
13699
13700+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
13701+{
13702+ return cmpxchg(&v->counter, old, new);
13703+}
13704+
13705 static inline long atomic64_xchg(atomic64_t *v, long new)
13706 {
13707 return xchg(&v->counter, new);
13708@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
13709 */
13710 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
13711 {
13712- long c, old;
13713+ long c, old, new;
13714 c = atomic64_read(v);
13715 for (;;) {
13716- if (unlikely(c == (u)))
13717+ if (unlikely(c == u))
13718 break;
13719- old = atomic64_cmpxchg((v), c, c + (a));
13720+
13721+ asm volatile("add %2,%0\n"
13722+
13723+#ifdef CONFIG_PAX_REFCOUNT
13724+ "jno 0f\n"
13725+ "sub %2,%0\n"
13726+ "int $4\n0:\n"
13727+ _ASM_EXTABLE(0b, 0b)
13728+#endif
13729+
13730+ : "=r" (new)
13731+ : "0" (c), "ir" (a));
13732+
13733+ old = atomic64_cmpxchg(v, c, new);
13734 if (likely(old == c))
13735 break;
13736 c = old;
13737 }
13738- return c != (u);
13739+ return c != u;
13740 }
13741
13742 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
13743diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
13744index 6dfd019..28e188d 100644
13745--- a/arch/x86/include/asm/bitops.h
13746+++ b/arch/x86/include/asm/bitops.h
13747@@ -40,7 +40,7 @@
13748 * a mask operation on a byte.
13749 */
13750 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
13751-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
13752+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
13753 #define CONST_MASK(nr) (1 << ((nr) & 7))
13754
13755 /**
13756@@ -486,7 +486,7 @@ static inline int fls(int x)
13757 * at position 64.
13758 */
13759 #ifdef CONFIG_X86_64
13760-static __always_inline int fls64(__u64 x)
13761+static __always_inline long fls64(__u64 x)
13762 {
13763 int bitpos = -1;
13764 /*
13765diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
13766index 4fa687a..60f2d39 100644
13767--- a/arch/x86/include/asm/boot.h
13768+++ b/arch/x86/include/asm/boot.h
13769@@ -6,10 +6,15 @@
13770 #include <uapi/asm/boot.h>
13771
13772 /* Physical address where kernel should be loaded. */
13773-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
13774+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
13775 + (CONFIG_PHYSICAL_ALIGN - 1)) \
13776 & ~(CONFIG_PHYSICAL_ALIGN - 1))
13777
13778+#ifndef __ASSEMBLY__
13779+extern unsigned char __LOAD_PHYSICAL_ADDR[];
13780+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
13781+#endif
13782+
13783 /* Minimum kernel alignment, as a power of two */
13784 #ifdef CONFIG_X86_64
13785 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
13786diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
13787index 48f99f1..d78ebf9 100644
13788--- a/arch/x86/include/asm/cache.h
13789+++ b/arch/x86/include/asm/cache.h
13790@@ -5,12 +5,13 @@
13791
13792 /* L1 cache line size */
13793 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
13794-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
13795+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
13796
13797 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
13798+#define __read_only __attribute__((__section__(".data..read_only")))
13799
13800 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
13801-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
13802+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
13803
13804 #ifdef CONFIG_X86_VSMP
13805 #ifdef CONFIG_SMP
13806diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
13807index 9863ee3..4a1f8e1 100644
13808--- a/arch/x86/include/asm/cacheflush.h
13809+++ b/arch/x86/include/asm/cacheflush.h
13810@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
13811 unsigned long pg_flags = pg->flags & _PGMT_MASK;
13812
13813 if (pg_flags == _PGMT_DEFAULT)
13814- return -1;
13815+ return ~0UL;
13816 else if (pg_flags == _PGMT_WC)
13817 return _PAGE_CACHE_WC;
13818 else if (pg_flags == _PGMT_UC_MINUS)
13819diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
13820index 46fc474..b02b0f9 100644
13821--- a/arch/x86/include/asm/checksum_32.h
13822+++ b/arch/x86/include/asm/checksum_32.h
13823@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
13824 int len, __wsum sum,
13825 int *src_err_ptr, int *dst_err_ptr);
13826
13827+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
13828+ int len, __wsum sum,
13829+ int *src_err_ptr, int *dst_err_ptr);
13830+
13831+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
13832+ int len, __wsum sum,
13833+ int *src_err_ptr, int *dst_err_ptr);
13834+
13835 /*
13836 * Note: when you get a NULL pointer exception here this means someone
13837 * passed in an incorrect kernel address to one of these functions.
13838@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
13839 int *err_ptr)
13840 {
13841 might_sleep();
13842- return csum_partial_copy_generic((__force void *)src, dst,
13843+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
13844 len, sum, err_ptr, NULL);
13845 }
13846
13847@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
13848 {
13849 might_sleep();
13850 if (access_ok(VERIFY_WRITE, dst, len))
13851- return csum_partial_copy_generic(src, (__force void *)dst,
13852+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
13853 len, sum, NULL, err_ptr);
13854
13855 if (len)
13856diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
13857index d47786a..ce1b05d 100644
13858--- a/arch/x86/include/asm/cmpxchg.h
13859+++ b/arch/x86/include/asm/cmpxchg.h
13860@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
13861 __compiletime_error("Bad argument size for cmpxchg");
13862 extern void __xadd_wrong_size(void)
13863 __compiletime_error("Bad argument size for xadd");
13864+extern void __xadd_check_overflow_wrong_size(void)
13865+ __compiletime_error("Bad argument size for xadd_check_overflow");
13866 extern void __add_wrong_size(void)
13867 __compiletime_error("Bad argument size for add");
13868+extern void __add_check_overflow_wrong_size(void)
13869+ __compiletime_error("Bad argument size for add_check_overflow");
13870
13871 /*
13872 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
13873@@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
13874 __ret; \
13875 })
13876
13877+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
13878+ ({ \
13879+ __typeof__ (*(ptr)) __ret = (arg); \
13880+ switch (sizeof(*(ptr))) { \
13881+ case __X86_CASE_L: \
13882+ asm volatile (lock #op "l %0, %1\n" \
13883+ "jno 0f\n" \
13884+ "mov %0,%1\n" \
13885+ "int $4\n0:\n" \
13886+ _ASM_EXTABLE(0b, 0b) \
13887+ : "+r" (__ret), "+m" (*(ptr)) \
13888+ : : "memory", "cc"); \
13889+ break; \
13890+ case __X86_CASE_Q: \
13891+ asm volatile (lock #op "q %q0, %1\n" \
13892+ "jno 0f\n" \
13893+ "mov %0,%1\n" \
13894+ "int $4\n0:\n" \
13895+ _ASM_EXTABLE(0b, 0b) \
13896+ : "+r" (__ret), "+m" (*(ptr)) \
13897+ : : "memory", "cc"); \
13898+ break; \
13899+ default: \
13900+ __ ## op ## _check_overflow_wrong_size(); \
13901+ } \
13902+ __ret; \
13903+ })
13904+
13905 /*
13906 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
13907 * Since this is generally used to protect other memory information, we
13908@@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
13909 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
13910 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
13911
13912+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
13913+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
13914+
13915 #define __add(ptr, inc, lock) \
13916 ({ \
13917 __typeof__ (*(ptr)) __ret = (inc); \
13918diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
13919index 59c6c40..5e0b22c 100644
13920--- a/arch/x86/include/asm/compat.h
13921+++ b/arch/x86/include/asm/compat.h
13922@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
13923 typedef u32 compat_uint_t;
13924 typedef u32 compat_ulong_t;
13925 typedef u64 __attribute__((aligned(4))) compat_u64;
13926-typedef u32 compat_uptr_t;
13927+typedef u32 __user compat_uptr_t;
13928
13929 struct compat_timespec {
13930 compat_time_t tv_sec;
13931diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
13932index e99ac27..10d834e 100644
13933--- a/arch/x86/include/asm/cpufeature.h
13934+++ b/arch/x86/include/asm/cpufeature.h
13935@@ -203,7 +203,7 @@
13936 #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
13937 #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
13938 #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
13939-
13940+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
13941
13942 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
13943 #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
13944@@ -211,7 +211,7 @@
13945 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
13946 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
13947 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
13948-#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
13949+#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
13950 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
13951 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
13952 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
13953@@ -353,6 +353,7 @@ extern const char * const x86_power_flags[32];
13954 #undef cpu_has_centaur_mcr
13955 #define cpu_has_centaur_mcr 0
13956
13957+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
13958 #endif /* CONFIG_X86_64 */
13959
13960 #if __GNUC__ >= 4
13961@@ -394,7 +395,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
13962 ".section .discard,\"aw\",@progbits\n"
13963 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
13964 ".previous\n"
13965- ".section .altinstr_replacement,\"ax\"\n"
13966+ ".section .altinstr_replacement,\"a\"\n"
13967 "3: movb $1,%0\n"
13968 "4:\n"
13969 ".previous\n"
13970diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
13971index 8bf1c06..b6ae785 100644
13972--- a/arch/x86/include/asm/desc.h
13973+++ b/arch/x86/include/asm/desc.h
13974@@ -4,6 +4,7 @@
13975 #include <asm/desc_defs.h>
13976 #include <asm/ldt.h>
13977 #include <asm/mmu.h>
13978+#include <asm/pgtable.h>
13979
13980 #include <linux/smp.h>
13981 #include <linux/percpu.h>
13982@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
13983
13984 desc->type = (info->read_exec_only ^ 1) << 1;
13985 desc->type |= info->contents << 2;
13986+ desc->type |= info->seg_not_present ^ 1;
13987
13988 desc->s = 1;
13989 desc->dpl = 0x3;
13990@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
13991 }
13992
13993 extern struct desc_ptr idt_descr;
13994-extern gate_desc idt_table[];
13995 extern struct desc_ptr nmi_idt_descr;
13996-extern gate_desc nmi_idt_table[];
13997-
13998-struct gdt_page {
13999- struct desc_struct gdt[GDT_ENTRIES];
14000-} __attribute__((aligned(PAGE_SIZE)));
14001-
14002-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
14003+extern gate_desc idt_table[256];
14004+extern gate_desc nmi_idt_table[256];
14005
14006+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
14007 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
14008 {
14009- return per_cpu(gdt_page, cpu).gdt;
14010+ return cpu_gdt_table[cpu];
14011 }
14012
14013 #ifdef CONFIG_X86_64
14014@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
14015 unsigned long base, unsigned dpl, unsigned flags,
14016 unsigned short seg)
14017 {
14018- gate->a = (seg << 16) | (base & 0xffff);
14019- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
14020+ gate->gate.offset_low = base;
14021+ gate->gate.seg = seg;
14022+ gate->gate.reserved = 0;
14023+ gate->gate.type = type;
14024+ gate->gate.s = 0;
14025+ gate->gate.dpl = dpl;
14026+ gate->gate.p = 1;
14027+ gate->gate.offset_high = base >> 16;
14028 }
14029
14030 #endif
14031@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
14032
14033 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
14034 {
14035+ pax_open_kernel();
14036 memcpy(&idt[entry], gate, sizeof(*gate));
14037+ pax_close_kernel();
14038 }
14039
14040 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
14041 {
14042+ pax_open_kernel();
14043 memcpy(&ldt[entry], desc, 8);
14044+ pax_close_kernel();
14045 }
14046
14047 static inline void
14048@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
14049 default: size = sizeof(*gdt); break;
14050 }
14051
14052+ pax_open_kernel();
14053 memcpy(&gdt[entry], desc, size);
14054+ pax_close_kernel();
14055 }
14056
14057 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
14058@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
14059
14060 static inline void native_load_tr_desc(void)
14061 {
14062+ pax_open_kernel();
14063 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
14064+ pax_close_kernel();
14065 }
14066
14067 static inline void native_load_gdt(const struct desc_ptr *dtr)
14068@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
14069 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
14070 unsigned int i;
14071
14072+ pax_open_kernel();
14073 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
14074 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
14075+ pax_close_kernel();
14076 }
14077
14078 #define _LDT_empty(info) \
14079@@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
14080 preempt_enable();
14081 }
14082
14083-static inline unsigned long get_desc_base(const struct desc_struct *desc)
14084+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
14085 {
14086 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
14087 }
14088@@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
14089 }
14090
14091 #ifdef CONFIG_X86_64
14092-static inline void set_nmi_gate(int gate, void *addr)
14093+static inline void set_nmi_gate(int gate, const void *addr)
14094 {
14095 gate_desc s;
14096
14097@@ -320,7 +333,7 @@ static inline void set_nmi_gate(int gate, void *addr)
14098 }
14099 #endif
14100
14101-static inline void _set_gate(int gate, unsigned type, void *addr,
14102+static inline void _set_gate(int gate, unsigned type, const void *addr,
14103 unsigned dpl, unsigned ist, unsigned seg)
14104 {
14105 gate_desc s;
14106@@ -339,7 +352,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
14107 * Pentium F0 0F bugfix can have resulted in the mapped
14108 * IDT being write-protected.
14109 */
14110-static inline void set_intr_gate(unsigned int n, void *addr)
14111+static inline void set_intr_gate(unsigned int n, const void *addr)
14112 {
14113 BUG_ON((unsigned)n > 0xFF);
14114 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
14115@@ -369,19 +382,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
14116 /*
14117 * This routine sets up an interrupt gate at directory privilege level 3.
14118 */
14119-static inline void set_system_intr_gate(unsigned int n, void *addr)
14120+static inline void set_system_intr_gate(unsigned int n, const void *addr)
14121 {
14122 BUG_ON((unsigned)n > 0xFF);
14123 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
14124 }
14125
14126-static inline void set_system_trap_gate(unsigned int n, void *addr)
14127+static inline void set_system_trap_gate(unsigned int n, const void *addr)
14128 {
14129 BUG_ON((unsigned)n > 0xFF);
14130 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
14131 }
14132
14133-static inline void set_trap_gate(unsigned int n, void *addr)
14134+static inline void set_trap_gate(unsigned int n, const void *addr)
14135 {
14136 BUG_ON((unsigned)n > 0xFF);
14137 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
14138@@ -390,19 +403,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
14139 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
14140 {
14141 BUG_ON((unsigned)n > 0xFF);
14142- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
14143+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
14144 }
14145
14146-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
14147+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
14148 {
14149 BUG_ON((unsigned)n > 0xFF);
14150 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
14151 }
14152
14153-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
14154+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
14155 {
14156 BUG_ON((unsigned)n > 0xFF);
14157 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
14158 }
14159
14160+#ifdef CONFIG_X86_32
14161+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
14162+{
14163+ struct desc_struct d;
14164+
14165+ if (likely(limit))
14166+ limit = (limit - 1UL) >> PAGE_SHIFT;
14167+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
14168+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
14169+}
14170+#endif
14171+
14172 #endif /* _ASM_X86_DESC_H */
14173diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
14174index 278441f..b95a174 100644
14175--- a/arch/x86/include/asm/desc_defs.h
14176+++ b/arch/x86/include/asm/desc_defs.h
14177@@ -31,6 +31,12 @@ struct desc_struct {
14178 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
14179 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
14180 };
14181+ struct {
14182+ u16 offset_low;
14183+ u16 seg;
14184+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
14185+ unsigned offset_high: 16;
14186+ } gate;
14187 };
14188 } __attribute__((packed));
14189
14190diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
14191index ced283a..ffe04cc 100644
14192--- a/arch/x86/include/asm/div64.h
14193+++ b/arch/x86/include/asm/div64.h
14194@@ -39,7 +39,7 @@
14195 __mod; \
14196 })
14197
14198-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
14199+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
14200 {
14201 union {
14202 u64 v64;
14203diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
14204index 9c999c1..3860cb8 100644
14205--- a/arch/x86/include/asm/elf.h
14206+++ b/arch/x86/include/asm/elf.h
14207@@ -243,7 +243,25 @@ extern int force_personality32;
14208 the loader. We need to make sure that it is out of the way of the program
14209 that it will "exec", and that there is sufficient room for the brk. */
14210
14211+#ifdef CONFIG_PAX_SEGMEXEC
14212+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
14213+#else
14214 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
14215+#endif
14216+
14217+#ifdef CONFIG_PAX_ASLR
14218+#ifdef CONFIG_X86_32
14219+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
14220+
14221+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
14222+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
14223+#else
14224+#define PAX_ELF_ET_DYN_BASE 0x400000UL
14225+
14226+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
14227+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
14228+#endif
14229+#endif
14230
14231 /* This yields a mask that user programs can use to figure out what
14232 instruction set this CPU supports. This could be done in user space,
14233@@ -296,16 +314,12 @@ do { \
14234
14235 #define ARCH_DLINFO \
14236 do { \
14237- if (vdso_enabled) \
14238- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
14239- (unsigned long)current->mm->context.vdso); \
14240+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
14241 } while (0)
14242
14243 #define ARCH_DLINFO_X32 \
14244 do { \
14245- if (vdso_enabled) \
14246- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
14247- (unsigned long)current->mm->context.vdso); \
14248+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
14249 } while (0)
14250
14251 #define AT_SYSINFO 32
14252@@ -320,7 +334,7 @@ else \
14253
14254 #endif /* !CONFIG_X86_32 */
14255
14256-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
14257+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
14258
14259 #define VDSO_ENTRY \
14260 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
14261@@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
14262 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
14263 #define compat_arch_setup_additional_pages syscall32_setup_pages
14264
14265-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
14266-#define arch_randomize_brk arch_randomize_brk
14267-
14268 /*
14269 * True on X86_32 or when emulating IA32 on X86_64
14270 */
14271diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
14272index 75ce3f4..882e801 100644
14273--- a/arch/x86/include/asm/emergency-restart.h
14274+++ b/arch/x86/include/asm/emergency-restart.h
14275@@ -13,6 +13,6 @@ enum reboot_type {
14276
14277 extern enum reboot_type reboot_type;
14278
14279-extern void machine_emergency_restart(void);
14280+extern void machine_emergency_restart(void) __noreturn;
14281
14282 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
14283diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
14284index e25cc33..7d3ec01 100644
14285--- a/arch/x86/include/asm/fpu-internal.h
14286+++ b/arch/x86/include/asm/fpu-internal.h
14287@@ -126,8 +126,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
14288 #define user_insn(insn, output, input...) \
14289 ({ \
14290 int err; \
14291+ pax_open_userland(); \
14292 asm volatile(ASM_STAC "\n" \
14293- "1:" #insn "\n\t" \
14294+ "1:" \
14295+ __copyuser_seg \
14296+ #insn "\n\t" \
14297 "2: " ASM_CLAC "\n" \
14298 ".section .fixup,\"ax\"\n" \
14299 "3: movl $-1,%[err]\n" \
14300@@ -136,6 +139,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
14301 _ASM_EXTABLE(1b, 3b) \
14302 : [err] "=r" (err), output \
14303 : "0"(0), input); \
14304+ pax_close_userland(); \
14305 err; \
14306 })
14307
14308@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
14309 "emms\n\t" /* clear stack tags */
14310 "fildl %P[addr]", /* set F?P to defined value */
14311 X86_FEATURE_FXSAVE_LEAK,
14312- [addr] "m" (tsk->thread.fpu.has_fpu));
14313+ [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
14314
14315 return fpu_restore_checking(&tsk->thread.fpu);
14316 }
14317diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
14318index be27ba1..04a8801 100644
14319--- a/arch/x86/include/asm/futex.h
14320+++ b/arch/x86/include/asm/futex.h
14321@@ -12,6 +12,7 @@
14322 #include <asm/smap.h>
14323
14324 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
14325+ typecheck(u32 __user *, uaddr); \
14326 asm volatile("\t" ASM_STAC "\n" \
14327 "1:\t" insn "\n" \
14328 "2:\t" ASM_CLAC "\n" \
14329@@ -20,15 +21,16 @@
14330 "\tjmp\t2b\n" \
14331 "\t.previous\n" \
14332 _ASM_EXTABLE(1b, 3b) \
14333- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
14334+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
14335 : "i" (-EFAULT), "0" (oparg), "1" (0))
14336
14337 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
14338+ typecheck(u32 __user *, uaddr); \
14339 asm volatile("\t" ASM_STAC "\n" \
14340 "1:\tmovl %2, %0\n" \
14341 "\tmovl\t%0, %3\n" \
14342 "\t" insn "\n" \
14343- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
14344+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
14345 "\tjnz\t1b\n" \
14346 "3:\t" ASM_CLAC "\n" \
14347 "\t.section .fixup,\"ax\"\n" \
14348@@ -38,7 +40,7 @@
14349 _ASM_EXTABLE(1b, 4b) \
14350 _ASM_EXTABLE(2b, 4b) \
14351 : "=&a" (oldval), "=&r" (ret), \
14352- "+m" (*uaddr), "=&r" (tem) \
14353+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
14354 : "r" (oparg), "i" (-EFAULT), "1" (0))
14355
14356 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
14357@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
14358
14359 pagefault_disable();
14360
14361+ pax_open_userland();
14362 switch (op) {
14363 case FUTEX_OP_SET:
14364- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
14365+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
14366 break;
14367 case FUTEX_OP_ADD:
14368- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
14369+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
14370 uaddr, oparg);
14371 break;
14372 case FUTEX_OP_OR:
14373@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
14374 default:
14375 ret = -ENOSYS;
14376 }
14377+ pax_close_userland();
14378
14379 pagefault_enable();
14380
14381@@ -115,18 +119,20 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
14382 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
14383 return -EFAULT;
14384
14385+ pax_open_userland();
14386 asm volatile("\t" ASM_STAC "\n"
14387- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
14388+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
14389 "2:\t" ASM_CLAC "\n"
14390 "\t.section .fixup, \"ax\"\n"
14391 "3:\tmov %3, %0\n"
14392 "\tjmp 2b\n"
14393 "\t.previous\n"
14394 _ASM_EXTABLE(1b, 3b)
14395- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
14396+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
14397 : "i" (-EFAULT), "r" (newval), "1" (oldval)
14398 : "memory"
14399 );
14400+ pax_close_userland();
14401
14402 *uval = oldval;
14403 return ret;
14404diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
14405index 1da97ef..9c2ebff 100644
14406--- a/arch/x86/include/asm/hw_irq.h
14407+++ b/arch/x86/include/asm/hw_irq.h
14408@@ -148,8 +148,8 @@ extern void setup_ioapic_dest(void);
14409 extern void enable_IO_APIC(void);
14410
14411 /* Statistics */
14412-extern atomic_t irq_err_count;
14413-extern atomic_t irq_mis_count;
14414+extern atomic_unchecked_t irq_err_count;
14415+extern atomic_unchecked_t irq_mis_count;
14416
14417 /* EISA */
14418 extern void eisa_set_level_irq(unsigned int irq);
14419diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
14420index a203659..9889f1c 100644
14421--- a/arch/x86/include/asm/i8259.h
14422+++ b/arch/x86/include/asm/i8259.h
14423@@ -62,7 +62,7 @@ struct legacy_pic {
14424 void (*init)(int auto_eoi);
14425 int (*irq_pending)(unsigned int irq);
14426 void (*make_irq)(unsigned int irq);
14427-};
14428+} __do_const;
14429
14430 extern struct legacy_pic *legacy_pic;
14431 extern struct legacy_pic null_legacy_pic;
14432diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
14433index d8e8eef..1765f78 100644
14434--- a/arch/x86/include/asm/io.h
14435+++ b/arch/x86/include/asm/io.h
14436@@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
14437 "m" (*(volatile type __force *)addr) barrier); }
14438
14439 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
14440-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
14441-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
14442+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
14443+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
14444
14445 build_mmio_read(__readb, "b", unsigned char, "=q", )
14446-build_mmio_read(__readw, "w", unsigned short, "=r", )
14447-build_mmio_read(__readl, "l", unsigned int, "=r", )
14448+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
14449+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
14450
14451 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
14452 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
14453@@ -184,7 +184,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
14454 return ioremap_nocache(offset, size);
14455 }
14456
14457-extern void iounmap(volatile void __iomem *addr);
14458+extern void iounmap(const volatile void __iomem *addr);
14459
14460 extern void set_iounmap_nonlazy(void);
14461
14462@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
14463
14464 #include <linux/vmalloc.h>
14465
14466+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
14467+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
14468+{
14469+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
14470+}
14471+
14472+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
14473+{
14474+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
14475+}
14476+
14477 /*
14478 * Convert a virtual cached pointer to an uncached pointer
14479 */
14480diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
14481index bba3cf8..06bc8da 100644
14482--- a/arch/x86/include/asm/irqflags.h
14483+++ b/arch/x86/include/asm/irqflags.h
14484@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
14485 sti; \
14486 sysexit
14487
14488+#define GET_CR0_INTO_RDI mov %cr0, %rdi
14489+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
14490+#define GET_CR3_INTO_RDI mov %cr3, %rdi
14491+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
14492+
14493 #else
14494 #define INTERRUPT_RETURN iret
14495 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
14496diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
14497index 5a6d287..f815789 100644
14498--- a/arch/x86/include/asm/kprobes.h
14499+++ b/arch/x86/include/asm/kprobes.h
14500@@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
14501 #define RELATIVEJUMP_SIZE 5
14502 #define RELATIVECALL_OPCODE 0xe8
14503 #define RELATIVE_ADDR_SIZE 4
14504-#define MAX_STACK_SIZE 64
14505-#define MIN_STACK_SIZE(ADDR) \
14506- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
14507- THREAD_SIZE - (unsigned long)(ADDR))) \
14508- ? (MAX_STACK_SIZE) \
14509- : (((unsigned long)current_thread_info()) + \
14510- THREAD_SIZE - (unsigned long)(ADDR)))
14511+#define MAX_STACK_SIZE 64UL
14512+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
14513
14514 #define flush_insn_slot(p) do { } while (0)
14515
14516diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
14517index 2d89e39..baee879 100644
14518--- a/arch/x86/include/asm/local.h
14519+++ b/arch/x86/include/asm/local.h
14520@@ -10,33 +10,97 @@ typedef struct {
14521 atomic_long_t a;
14522 } local_t;
14523
14524+typedef struct {
14525+ atomic_long_unchecked_t a;
14526+} local_unchecked_t;
14527+
14528 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
14529
14530 #define local_read(l) atomic_long_read(&(l)->a)
14531+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
14532 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
14533+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
14534
14535 static inline void local_inc(local_t *l)
14536 {
14537- asm volatile(_ASM_INC "%0"
14538+ asm volatile(_ASM_INC "%0\n"
14539+
14540+#ifdef CONFIG_PAX_REFCOUNT
14541+ "jno 0f\n"
14542+ _ASM_DEC "%0\n"
14543+ "int $4\n0:\n"
14544+ _ASM_EXTABLE(0b, 0b)
14545+#endif
14546+
14547+ : "+m" (l->a.counter));
14548+}
14549+
14550+static inline void local_inc_unchecked(local_unchecked_t *l)
14551+{
14552+ asm volatile(_ASM_INC "%0\n"
14553 : "+m" (l->a.counter));
14554 }
14555
14556 static inline void local_dec(local_t *l)
14557 {
14558- asm volatile(_ASM_DEC "%0"
14559+ asm volatile(_ASM_DEC "%0\n"
14560+
14561+#ifdef CONFIG_PAX_REFCOUNT
14562+ "jno 0f\n"
14563+ _ASM_INC "%0\n"
14564+ "int $4\n0:\n"
14565+ _ASM_EXTABLE(0b, 0b)
14566+#endif
14567+
14568+ : "+m" (l->a.counter));
14569+}
14570+
14571+static inline void local_dec_unchecked(local_unchecked_t *l)
14572+{
14573+ asm volatile(_ASM_DEC "%0\n"
14574 : "+m" (l->a.counter));
14575 }
14576
14577 static inline void local_add(long i, local_t *l)
14578 {
14579- asm volatile(_ASM_ADD "%1,%0"
14580+ asm volatile(_ASM_ADD "%1,%0\n"
14581+
14582+#ifdef CONFIG_PAX_REFCOUNT
14583+ "jno 0f\n"
14584+ _ASM_SUB "%1,%0\n"
14585+ "int $4\n0:\n"
14586+ _ASM_EXTABLE(0b, 0b)
14587+#endif
14588+
14589+ : "+m" (l->a.counter)
14590+ : "ir" (i));
14591+}
14592+
14593+static inline void local_add_unchecked(long i, local_unchecked_t *l)
14594+{
14595+ asm volatile(_ASM_ADD "%1,%0\n"
14596 : "+m" (l->a.counter)
14597 : "ir" (i));
14598 }
14599
14600 static inline void local_sub(long i, local_t *l)
14601 {
14602- asm volatile(_ASM_SUB "%1,%0"
14603+ asm volatile(_ASM_SUB "%1,%0\n"
14604+
14605+#ifdef CONFIG_PAX_REFCOUNT
14606+ "jno 0f\n"
14607+ _ASM_ADD "%1,%0\n"
14608+ "int $4\n0:\n"
14609+ _ASM_EXTABLE(0b, 0b)
14610+#endif
14611+
14612+ : "+m" (l->a.counter)
14613+ : "ir" (i));
14614+}
14615+
14616+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
14617+{
14618+ asm volatile(_ASM_SUB "%1,%0\n"
14619 : "+m" (l->a.counter)
14620 : "ir" (i));
14621 }
14622@@ -54,7 +118,16 @@ static inline int local_sub_and_test(long i, local_t *l)
14623 {
14624 unsigned char c;
14625
14626- asm volatile(_ASM_SUB "%2,%0; sete %1"
14627+ asm volatile(_ASM_SUB "%2,%0\n"
14628+
14629+#ifdef CONFIG_PAX_REFCOUNT
14630+ "jno 0f\n"
14631+ _ASM_ADD "%2,%0\n"
14632+ "int $4\n0:\n"
14633+ _ASM_EXTABLE(0b, 0b)
14634+#endif
14635+
14636+ "sete %1\n"
14637 : "+m" (l->a.counter), "=qm" (c)
14638 : "ir" (i) : "memory");
14639 return c;
14640@@ -72,7 +145,16 @@ static inline int local_dec_and_test(local_t *l)
14641 {
14642 unsigned char c;
14643
14644- asm volatile(_ASM_DEC "%0; sete %1"
14645+ asm volatile(_ASM_DEC "%0\n"
14646+
14647+#ifdef CONFIG_PAX_REFCOUNT
14648+ "jno 0f\n"
14649+ _ASM_INC "%0\n"
14650+ "int $4\n0:\n"
14651+ _ASM_EXTABLE(0b, 0b)
14652+#endif
14653+
14654+ "sete %1\n"
14655 : "+m" (l->a.counter), "=qm" (c)
14656 : : "memory");
14657 return c != 0;
14658@@ -90,7 +172,16 @@ static inline int local_inc_and_test(local_t *l)
14659 {
14660 unsigned char c;
14661
14662- asm volatile(_ASM_INC "%0; sete %1"
14663+ asm volatile(_ASM_INC "%0\n"
14664+
14665+#ifdef CONFIG_PAX_REFCOUNT
14666+ "jno 0f\n"
14667+ _ASM_DEC "%0\n"
14668+ "int $4\n0:\n"
14669+ _ASM_EXTABLE(0b, 0b)
14670+#endif
14671+
14672+ "sete %1\n"
14673 : "+m" (l->a.counter), "=qm" (c)
14674 : : "memory");
14675 return c != 0;
14676@@ -109,7 +200,16 @@ static inline int local_add_negative(long i, local_t *l)
14677 {
14678 unsigned char c;
14679
14680- asm volatile(_ASM_ADD "%2,%0; sets %1"
14681+ asm volatile(_ASM_ADD "%2,%0\n"
14682+
14683+#ifdef CONFIG_PAX_REFCOUNT
14684+ "jno 0f\n"
14685+ _ASM_SUB "%2,%0\n"
14686+ "int $4\n0:\n"
14687+ _ASM_EXTABLE(0b, 0b)
14688+#endif
14689+
14690+ "sets %1\n"
14691 : "+m" (l->a.counter), "=qm" (c)
14692 : "ir" (i) : "memory");
14693 return c;
14694@@ -125,6 +225,30 @@ static inline int local_add_negative(long i, local_t *l)
14695 static inline long local_add_return(long i, local_t *l)
14696 {
14697 long __i = i;
14698+ asm volatile(_ASM_XADD "%0, %1\n"
14699+
14700+#ifdef CONFIG_PAX_REFCOUNT
14701+ "jno 0f\n"
14702+ _ASM_MOV "%0,%1\n"
14703+ "int $4\n0:\n"
14704+ _ASM_EXTABLE(0b, 0b)
14705+#endif
14706+
14707+ : "+r" (i), "+m" (l->a.counter)
14708+ : : "memory");
14709+ return i + __i;
14710+}
14711+
14712+/**
14713+ * local_add_return_unchecked - add and return
14714+ * @i: integer value to add
14715+ * @l: pointer to type local_unchecked_t
14716+ *
14717+ * Atomically adds @i to @l and returns @i + @l
14718+ */
14719+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
14720+{
14721+ long __i = i;
14722 asm volatile(_ASM_XADD "%0, %1;"
14723 : "+r" (i), "+m" (l->a.counter)
14724 : : "memory");
14725@@ -141,6 +265,8 @@ static inline long local_sub_return(long i, local_t *l)
14726
14727 #define local_cmpxchg(l, o, n) \
14728 (cmpxchg_local(&((l)->a.counter), (o), (n)))
14729+#define local_cmpxchg_unchecked(l, o, n) \
14730+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
14731 /* Always has a lock prefix */
14732 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
14733
14734diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
14735new file mode 100644
14736index 0000000..2bfd3ba
14737--- /dev/null
14738+++ b/arch/x86/include/asm/mman.h
14739@@ -0,0 +1,15 @@
14740+#ifndef _X86_MMAN_H
14741+#define _X86_MMAN_H
14742+
14743+#include <uapi/asm/mman.h>
14744+
14745+#ifdef __KERNEL__
14746+#ifndef __ASSEMBLY__
14747+#ifdef CONFIG_X86_32
14748+#define arch_mmap_check i386_mmap_check
14749+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
14750+#endif
14751+#endif
14752+#endif
14753+
14754+#endif /* X86_MMAN_H */
14755diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
14756index 5f55e69..e20bfb1 100644
14757--- a/arch/x86/include/asm/mmu.h
14758+++ b/arch/x86/include/asm/mmu.h
14759@@ -9,7 +9,7 @@
14760 * we put the segment information here.
14761 */
14762 typedef struct {
14763- void *ldt;
14764+ struct desc_struct *ldt;
14765 int size;
14766
14767 #ifdef CONFIG_X86_64
14768@@ -18,7 +18,19 @@ typedef struct {
14769 #endif
14770
14771 struct mutex lock;
14772- void *vdso;
14773+ unsigned long vdso;
14774+
14775+#ifdef CONFIG_X86_32
14776+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
14777+ unsigned long user_cs_base;
14778+ unsigned long user_cs_limit;
14779+
14780+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
14781+ cpumask_t cpu_user_cs_mask;
14782+#endif
14783+
14784+#endif
14785+#endif
14786 } mm_context_t;
14787
14788 #ifdef CONFIG_SMP
14789diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
14790index cdbf367..4c73c9e 100644
14791--- a/arch/x86/include/asm/mmu_context.h
14792+++ b/arch/x86/include/asm/mmu_context.h
14793@@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
14794
14795 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
14796 {
14797+
14798+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
14799+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
14800+ unsigned int i;
14801+ pgd_t *pgd;
14802+
14803+ pax_open_kernel();
14804+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
14805+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
14806+ set_pgd_batched(pgd+i, native_make_pgd(0));
14807+ pax_close_kernel();
14808+ }
14809+#endif
14810+
14811 #ifdef CONFIG_SMP
14812 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
14813 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
14814@@ -34,16 +48,55 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
14815 struct task_struct *tsk)
14816 {
14817 unsigned cpu = smp_processor_id();
14818+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
14819+ int tlbstate = TLBSTATE_OK;
14820+#endif
14821
14822 if (likely(prev != next)) {
14823 #ifdef CONFIG_SMP
14824+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
14825+ tlbstate = this_cpu_read(cpu_tlbstate.state);
14826+#endif
14827 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
14828 this_cpu_write(cpu_tlbstate.active_mm, next);
14829 #endif
14830 cpumask_set_cpu(cpu, mm_cpumask(next));
14831
14832 /* Re-load page tables */
14833+#ifdef CONFIG_PAX_PER_CPU_PGD
14834+ pax_open_kernel();
14835+
14836+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
14837+ if (static_cpu_has(X86_FEATURE_PCID))
14838+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
14839+ else
14840+#endif
14841+
14842+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
14843+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
14844+ pax_close_kernel();
14845+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
14846+
14847+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
14848+ if (static_cpu_has(X86_FEATURE_PCID)) {
14849+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
14850+ unsigned long descriptor[2];
14851+ descriptor[0] = PCID_USER;
14852+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
14853+ } else {
14854+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
14855+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
14856+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
14857+ else
14858+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
14859+ }
14860+ } else
14861+#endif
14862+
14863+ load_cr3(get_cpu_pgd(cpu, kernel));
14864+#else
14865 load_cr3(next->pgd);
14866+#endif
14867
14868 /* stop flush ipis for the previous mm */
14869 cpumask_clear_cpu(cpu, mm_cpumask(prev));
14870@@ -53,9 +106,63 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
14871 */
14872 if (unlikely(prev->context.ldt != next->context.ldt))
14873 load_LDT_nolock(&next->context);
14874- }
14875+
14876+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
14877+ if (!(__supported_pte_mask & _PAGE_NX)) {
14878+ smp_mb__before_clear_bit();
14879+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
14880+ smp_mb__after_clear_bit();
14881+ cpu_set(cpu, next->context.cpu_user_cs_mask);
14882+ }
14883+#endif
14884+
14885+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
14886+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
14887+ prev->context.user_cs_limit != next->context.user_cs_limit))
14888+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
14889 #ifdef CONFIG_SMP
14890+ else if (unlikely(tlbstate != TLBSTATE_OK))
14891+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
14892+#endif
14893+#endif
14894+
14895+ }
14896 else {
14897+
14898+#ifdef CONFIG_PAX_PER_CPU_PGD
14899+ pax_open_kernel();
14900+
14901+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
14902+ if (static_cpu_has(X86_FEATURE_PCID))
14903+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
14904+ else
14905+#endif
14906+
14907+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
14908+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
14909+ pax_close_kernel();
14910+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
14911+
14912+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
14913+ if (static_cpu_has(X86_FEATURE_PCID)) {
14914+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
14915+ unsigned long descriptor[2];
14916+ descriptor[0] = PCID_USER;
14917+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
14918+ } else {
14919+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
14920+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
14921+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
14922+ else
14923+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
14924+ }
14925+ } else
14926+#endif
14927+
14928+ load_cr3(get_cpu_pgd(cpu, kernel));
14929+#endif
14930+
14931+#ifdef CONFIG_SMP
14932 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
14933 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
14934
14935@@ -64,11 +171,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
14936 * tlb flush IPI delivery. We must reload CR3
14937 * to make sure to use no freed page tables.
14938 */
14939+
14940+#ifndef CONFIG_PAX_PER_CPU_PGD
14941 load_cr3(next->pgd);
14942+#endif
14943+
14944 load_LDT_nolock(&next->context);
14945+
14946+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
14947+ if (!(__supported_pte_mask & _PAGE_NX))
14948+ cpu_set(cpu, next->context.cpu_user_cs_mask);
14949+#endif
14950+
14951+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
14952+#ifdef CONFIG_PAX_PAGEEXEC
14953+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
14954+#endif
14955+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
14956+#endif
14957+
14958 }
14959+#endif
14960 }
14961-#endif
14962 }
14963
14964 #define activate_mm(prev, next) \
14965diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
14966index e3b7819..b257c64 100644
14967--- a/arch/x86/include/asm/module.h
14968+++ b/arch/x86/include/asm/module.h
14969@@ -5,6 +5,7 @@
14970
14971 #ifdef CONFIG_X86_64
14972 /* X86_64 does not define MODULE_PROC_FAMILY */
14973+#define MODULE_PROC_FAMILY ""
14974 #elif defined CONFIG_M486
14975 #define MODULE_PROC_FAMILY "486 "
14976 #elif defined CONFIG_M586
14977@@ -57,8 +58,20 @@
14978 #error unknown processor family
14979 #endif
14980
14981-#ifdef CONFIG_X86_32
14982-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
14983+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
14984+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
14985+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
14986+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
14987+#else
14988+#define MODULE_PAX_KERNEXEC ""
14989 #endif
14990
14991+#ifdef CONFIG_PAX_MEMORY_UDEREF
14992+#define MODULE_PAX_UDEREF "UDEREF "
14993+#else
14994+#define MODULE_PAX_UDEREF ""
14995+#endif
14996+
14997+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
14998+
14999 #endif /* _ASM_X86_MODULE_H */
15000diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
15001index 86f9301..b365cda 100644
15002--- a/arch/x86/include/asm/nmi.h
15003+++ b/arch/x86/include/asm/nmi.h
15004@@ -40,11 +40,11 @@ struct nmiaction {
15005 nmi_handler_t handler;
15006 unsigned long flags;
15007 const char *name;
15008-};
15009+} __do_const;
15010
15011 #define register_nmi_handler(t, fn, fg, n, init...) \
15012 ({ \
15013- static struct nmiaction init fn##_na = { \
15014+ static const struct nmiaction init fn##_na = { \
15015 .handler = (fn), \
15016 .name = (n), \
15017 .flags = (fg), \
15018@@ -52,7 +52,7 @@ struct nmiaction {
15019 __register_nmi_handler((t), &fn##_na); \
15020 })
15021
15022-int __register_nmi_handler(unsigned int, struct nmiaction *);
15023+int __register_nmi_handler(unsigned int, const struct nmiaction *);
15024
15025 void unregister_nmi_handler(unsigned int, const char *);
15026
15027diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
15028index c878924..21f4889 100644
15029--- a/arch/x86/include/asm/page.h
15030+++ b/arch/x86/include/asm/page.h
15031@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
15032 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
15033
15034 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
15035+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
15036
15037 #define __boot_va(x) __va(x)
15038 #define __boot_pa(x) __pa(x)
15039diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
15040index 0f1ddee..e2fc3d1 100644
15041--- a/arch/x86/include/asm/page_64.h
15042+++ b/arch/x86/include/asm/page_64.h
15043@@ -7,9 +7,9 @@
15044
15045 /* duplicated to the one in bootmem.h */
15046 extern unsigned long max_pfn;
15047-extern unsigned long phys_base;
15048+extern const unsigned long phys_base;
15049
15050-static inline unsigned long __phys_addr_nodebug(unsigned long x)
15051+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
15052 {
15053 unsigned long y = x - __START_KERNEL_map;
15054
15055diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
15056index cfdc9ee..3f7b5d6 100644
15057--- a/arch/x86/include/asm/paravirt.h
15058+++ b/arch/x86/include/asm/paravirt.h
15059@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
15060 return (pmd_t) { ret };
15061 }
15062
15063-static inline pmdval_t pmd_val(pmd_t pmd)
15064+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
15065 {
15066 pmdval_t ret;
15067
15068@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
15069 val);
15070 }
15071
15072+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
15073+{
15074+ pgdval_t val = native_pgd_val(pgd);
15075+
15076+ if (sizeof(pgdval_t) > sizeof(long))
15077+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
15078+ val, (u64)val >> 32);
15079+ else
15080+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
15081+ val);
15082+}
15083+
15084 static inline void pgd_clear(pgd_t *pgdp)
15085 {
15086 set_pgd(pgdp, __pgd(0));
15087@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
15088 pv_mmu_ops.set_fixmap(idx, phys, flags);
15089 }
15090
15091+#ifdef CONFIG_PAX_KERNEXEC
15092+static inline unsigned long pax_open_kernel(void)
15093+{
15094+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
15095+}
15096+
15097+static inline unsigned long pax_close_kernel(void)
15098+{
15099+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
15100+}
15101+#else
15102+static inline unsigned long pax_open_kernel(void) { return 0; }
15103+static inline unsigned long pax_close_kernel(void) { return 0; }
15104+#endif
15105+
15106 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
15107
15108 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
15109@@ -926,7 +953,7 @@ extern void default_banner(void);
15110
15111 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
15112 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
15113-#define PARA_INDIRECT(addr) *%cs:addr
15114+#define PARA_INDIRECT(addr) *%ss:addr
15115 #endif
15116
15117 #define INTERRUPT_RETURN \
15118@@ -1001,6 +1028,21 @@ extern void default_banner(void);
15119 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
15120 CLBR_NONE, \
15121 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
15122+
15123+#define GET_CR0_INTO_RDI \
15124+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
15125+ mov %rax,%rdi
15126+
15127+#define SET_RDI_INTO_CR0 \
15128+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
15129+
15130+#define GET_CR3_INTO_RDI \
15131+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
15132+ mov %rax,%rdi
15133+
15134+#define SET_RDI_INTO_CR3 \
15135+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
15136+
15137 #endif /* CONFIG_X86_32 */
15138
15139 #endif /* __ASSEMBLY__ */
15140diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
15141index 0db1fca..52310cc 100644
15142--- a/arch/x86/include/asm/paravirt_types.h
15143+++ b/arch/x86/include/asm/paravirt_types.h
15144@@ -84,7 +84,7 @@ struct pv_init_ops {
15145 */
15146 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
15147 unsigned long addr, unsigned len);
15148-};
15149+} __no_const;
15150
15151
15152 struct pv_lazy_ops {
15153@@ -98,7 +98,7 @@ struct pv_time_ops {
15154 unsigned long long (*sched_clock)(void);
15155 unsigned long long (*steal_clock)(int cpu);
15156 unsigned long (*get_tsc_khz)(void);
15157-};
15158+} __no_const;
15159
15160 struct pv_cpu_ops {
15161 /* hooks for various privileged instructions */
15162@@ -192,7 +192,7 @@ struct pv_cpu_ops {
15163
15164 void (*start_context_switch)(struct task_struct *prev);
15165 void (*end_context_switch)(struct task_struct *next);
15166-};
15167+} __no_const;
15168
15169 struct pv_irq_ops {
15170 /*
15171@@ -223,7 +223,7 @@ struct pv_apic_ops {
15172 unsigned long start_eip,
15173 unsigned long start_esp);
15174 #endif
15175-};
15176+} __no_const;
15177
15178 struct pv_mmu_ops {
15179 unsigned long (*read_cr2)(void);
15180@@ -313,6 +313,7 @@ struct pv_mmu_ops {
15181 struct paravirt_callee_save make_pud;
15182
15183 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
15184+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
15185 #endif /* PAGETABLE_LEVELS == 4 */
15186 #endif /* PAGETABLE_LEVELS >= 3 */
15187
15188@@ -324,6 +325,12 @@ struct pv_mmu_ops {
15189 an mfn. We can tell which is which from the index. */
15190 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
15191 phys_addr_t phys, pgprot_t flags);
15192+
15193+#ifdef CONFIG_PAX_KERNEXEC
15194+ unsigned long (*pax_open_kernel)(void);
15195+ unsigned long (*pax_close_kernel)(void);
15196+#endif
15197+
15198 };
15199
15200 struct arch_spinlock;
15201@@ -334,7 +341,7 @@ struct pv_lock_ops {
15202 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
15203 int (*spin_trylock)(struct arch_spinlock *lock);
15204 void (*spin_unlock)(struct arch_spinlock *lock);
15205-};
15206+} __no_const;
15207
15208 /* This contains all the paravirt structures: we get a convenient
15209 * number for each function using the offset which we use to indicate
15210diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
15211index b4389a4..7024269 100644
15212--- a/arch/x86/include/asm/pgalloc.h
15213+++ b/arch/x86/include/asm/pgalloc.h
15214@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
15215 pmd_t *pmd, pte_t *pte)
15216 {
15217 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
15218+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
15219+}
15220+
15221+static inline void pmd_populate_user(struct mm_struct *mm,
15222+ pmd_t *pmd, pte_t *pte)
15223+{
15224+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
15225 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
15226 }
15227
15228@@ -99,12 +106,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
15229
15230 #ifdef CONFIG_X86_PAE
15231 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
15232+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
15233+{
15234+ pud_populate(mm, pudp, pmd);
15235+}
15236 #else /* !CONFIG_X86_PAE */
15237 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
15238 {
15239 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
15240 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
15241 }
15242+
15243+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
15244+{
15245+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
15246+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
15247+}
15248 #endif /* CONFIG_X86_PAE */
15249
15250 #if PAGETABLE_LEVELS > 3
15251@@ -114,6 +131,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
15252 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
15253 }
15254
15255+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
15256+{
15257+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
15258+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
15259+}
15260+
15261 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
15262 {
15263 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
15264diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
15265index f2b489c..4f7e2e5 100644
15266--- a/arch/x86/include/asm/pgtable-2level.h
15267+++ b/arch/x86/include/asm/pgtable-2level.h
15268@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
15269
15270 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
15271 {
15272+ pax_open_kernel();
15273 *pmdp = pmd;
15274+ pax_close_kernel();
15275 }
15276
15277 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
15278diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
15279index 4cc9f2b..5fd9226 100644
15280--- a/arch/x86/include/asm/pgtable-3level.h
15281+++ b/arch/x86/include/asm/pgtable-3level.h
15282@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
15283
15284 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
15285 {
15286+ pax_open_kernel();
15287 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
15288+ pax_close_kernel();
15289 }
15290
15291 static inline void native_set_pud(pud_t *pudp, pud_t pud)
15292 {
15293+ pax_open_kernel();
15294 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
15295+ pax_close_kernel();
15296 }
15297
15298 /*
15299diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
15300index 1e67223..92a9585 100644
15301--- a/arch/x86/include/asm/pgtable.h
15302+++ b/arch/x86/include/asm/pgtable.h
15303@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
15304
15305 #ifndef __PAGETABLE_PUD_FOLDED
15306 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
15307+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
15308 #define pgd_clear(pgd) native_pgd_clear(pgd)
15309 #endif
15310
15311@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
15312
15313 #define arch_end_context_switch(prev) do {} while(0)
15314
15315+#define pax_open_kernel() native_pax_open_kernel()
15316+#define pax_close_kernel() native_pax_close_kernel()
15317 #endif /* CONFIG_PARAVIRT */
15318
15319+#define __HAVE_ARCH_PAX_OPEN_KERNEL
15320+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
15321+
15322+#ifdef CONFIG_PAX_KERNEXEC
15323+static inline unsigned long native_pax_open_kernel(void)
15324+{
15325+ unsigned long cr0;
15326+
15327+ preempt_disable();
15328+ barrier();
15329+ cr0 = read_cr0() ^ X86_CR0_WP;
15330+ BUG_ON(cr0 & X86_CR0_WP);
15331+ write_cr0(cr0);
15332+ return cr0 ^ X86_CR0_WP;
15333+}
15334+
15335+static inline unsigned long native_pax_close_kernel(void)
15336+{
15337+ unsigned long cr0;
15338+
15339+ cr0 = read_cr0() ^ X86_CR0_WP;
15340+ BUG_ON(!(cr0 & X86_CR0_WP));
15341+ write_cr0(cr0);
15342+ barrier();
15343+ preempt_enable_no_resched();
15344+ return cr0 ^ X86_CR0_WP;
15345+}
15346+#else
15347+static inline unsigned long native_pax_open_kernel(void) { return 0; }
15348+static inline unsigned long native_pax_close_kernel(void) { return 0; }
15349+#endif
15350+
15351 /*
15352 * The following only work if pte_present() is true.
15353 * Undefined behaviour if not..
15354 */
15355+static inline int pte_user(pte_t pte)
15356+{
15357+ return pte_val(pte) & _PAGE_USER;
15358+}
15359+
15360 static inline int pte_dirty(pte_t pte)
15361 {
15362 return pte_flags(pte) & _PAGE_DIRTY;
15363@@ -147,6 +187,11 @@ static inline unsigned long pud_pfn(pud_t pud)
15364 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
15365 }
15366
15367+static inline unsigned long pgd_pfn(pgd_t pgd)
15368+{
15369+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
15370+}
15371+
15372 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
15373
15374 static inline int pmd_large(pmd_t pte)
15375@@ -200,9 +245,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
15376 return pte_clear_flags(pte, _PAGE_RW);
15377 }
15378
15379+static inline pte_t pte_mkread(pte_t pte)
15380+{
15381+ return __pte(pte_val(pte) | _PAGE_USER);
15382+}
15383+
15384 static inline pte_t pte_mkexec(pte_t pte)
15385 {
15386- return pte_clear_flags(pte, _PAGE_NX);
15387+#ifdef CONFIG_X86_PAE
15388+ if (__supported_pte_mask & _PAGE_NX)
15389+ return pte_clear_flags(pte, _PAGE_NX);
15390+ else
15391+#endif
15392+ return pte_set_flags(pte, _PAGE_USER);
15393+}
15394+
15395+static inline pte_t pte_exprotect(pte_t pte)
15396+{
15397+#ifdef CONFIG_X86_PAE
15398+ if (__supported_pte_mask & _PAGE_NX)
15399+ return pte_set_flags(pte, _PAGE_NX);
15400+ else
15401+#endif
15402+ return pte_clear_flags(pte, _PAGE_USER);
15403 }
15404
15405 static inline pte_t pte_mkdirty(pte_t pte)
15406@@ -394,6 +459,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
15407 #endif
15408
15409 #ifndef __ASSEMBLY__
15410+
15411+#ifdef CONFIG_PAX_PER_CPU_PGD
15412+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
15413+enum cpu_pgd_type {kernel = 0, user = 1};
15414+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
15415+{
15416+ return cpu_pgd[cpu][type];
15417+}
15418+#endif
15419+
15420 #include <linux/mm_types.h>
15421 #include <linux/log2.h>
15422
15423@@ -529,7 +604,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
15424 * Currently stuck as a macro due to indirect forward reference to
15425 * linux/mmzone.h's __section_mem_map_addr() definition:
15426 */
15427-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
15428+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
15429
15430 /* Find an entry in the second-level page table.. */
15431 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
15432@@ -569,7 +644,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
15433 * Currently stuck as a macro due to indirect forward reference to
15434 * linux/mmzone.h's __section_mem_map_addr() definition:
15435 */
15436-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
15437+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
15438
15439 /* to find an entry in a page-table-directory. */
15440 static inline unsigned long pud_index(unsigned long address)
15441@@ -584,7 +659,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
15442
15443 static inline int pgd_bad(pgd_t pgd)
15444 {
15445- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
15446+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
15447 }
15448
15449 static inline int pgd_none(pgd_t pgd)
15450@@ -607,7 +682,12 @@ static inline int pgd_none(pgd_t pgd)
15451 * pgd_offset() returns a (pgd_t *)
15452 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
15453 */
15454-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
15455+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
15456+
15457+#ifdef CONFIG_PAX_PER_CPU_PGD
15458+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
15459+#endif
15460+
15461 /*
15462 * a shortcut which implies the use of the kernel's pgd, instead
15463 * of a process's
15464@@ -618,6 +698,23 @@ static inline int pgd_none(pgd_t pgd)
15465 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
15466 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
15467
15468+#ifdef CONFIG_X86_32
15469+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
15470+#else
15471+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
15472+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
15473+
15474+#ifdef CONFIG_PAX_MEMORY_UDEREF
15475+#ifdef __ASSEMBLY__
15476+#define pax_user_shadow_base pax_user_shadow_base(%rip)
15477+#else
15478+extern unsigned long pax_user_shadow_base;
15479+extern pgdval_t clone_pgd_mask;
15480+#endif
15481+#endif
15482+
15483+#endif
15484+
15485 #ifndef __ASSEMBLY__
15486
15487 extern int direct_gbpages;
15488@@ -784,11 +881,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
15489 * dst and src can be on the same page, but the range must not overlap,
15490 * and must not cross a page boundary.
15491 */
15492-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
15493+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
15494 {
15495- memcpy(dst, src, count * sizeof(pgd_t));
15496+ pax_open_kernel();
15497+ while (count--)
15498+ *dst++ = *src++;
15499+ pax_close_kernel();
15500 }
15501
15502+#ifdef CONFIG_PAX_PER_CPU_PGD
15503+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
15504+#endif
15505+
15506+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
15507+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
15508+#else
15509+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
15510+#endif
15511+
15512 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
15513 static inline int page_level_shift(enum pg_level level)
15514 {
15515diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
15516index 9ee3221..b979c6b 100644
15517--- a/arch/x86/include/asm/pgtable_32.h
15518+++ b/arch/x86/include/asm/pgtable_32.h
15519@@ -25,9 +25,6 @@
15520 struct mm_struct;
15521 struct vm_area_struct;
15522
15523-extern pgd_t swapper_pg_dir[1024];
15524-extern pgd_t initial_page_table[1024];
15525-
15526 static inline void pgtable_cache_init(void) { }
15527 static inline void check_pgt_cache(void) { }
15528 void paging_init(void);
15529@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
15530 # include <asm/pgtable-2level.h>
15531 #endif
15532
15533+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
15534+extern pgd_t initial_page_table[PTRS_PER_PGD];
15535+#ifdef CONFIG_X86_PAE
15536+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
15537+#endif
15538+
15539 #if defined(CONFIG_HIGHPTE)
15540 #define pte_offset_map(dir, address) \
15541 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
15542@@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
15543 /* Clear a kernel PTE and flush it from the TLB */
15544 #define kpte_clear_flush(ptep, vaddr) \
15545 do { \
15546+ pax_open_kernel(); \
15547 pte_clear(&init_mm, (vaddr), (ptep)); \
15548+ pax_close_kernel(); \
15549 __flush_tlb_one((vaddr)); \
15550 } while (0)
15551
15552 #endif /* !__ASSEMBLY__ */
15553
15554+#define HAVE_ARCH_UNMAPPED_AREA
15555+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
15556+
15557 /*
15558 * kern_addr_valid() is (1) for FLATMEM and (0) for
15559 * SPARSEMEM and DISCONTIGMEM
15560diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
15561index ed5903b..c7fe163 100644
15562--- a/arch/x86/include/asm/pgtable_32_types.h
15563+++ b/arch/x86/include/asm/pgtable_32_types.h
15564@@ -8,7 +8,7 @@
15565 */
15566 #ifdef CONFIG_X86_PAE
15567 # include <asm/pgtable-3level_types.h>
15568-# define PMD_SIZE (1UL << PMD_SHIFT)
15569+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
15570 # define PMD_MASK (~(PMD_SIZE - 1))
15571 #else
15572 # include <asm/pgtable-2level_types.h>
15573@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
15574 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
15575 #endif
15576
15577+#ifdef CONFIG_PAX_KERNEXEC
15578+#ifndef __ASSEMBLY__
15579+extern unsigned char MODULES_EXEC_VADDR[];
15580+extern unsigned char MODULES_EXEC_END[];
15581+#endif
15582+#include <asm/boot.h>
15583+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
15584+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
15585+#else
15586+#define ktla_ktva(addr) (addr)
15587+#define ktva_ktla(addr) (addr)
15588+#endif
15589+
15590 #define MODULES_VADDR VMALLOC_START
15591 #define MODULES_END VMALLOC_END
15592 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
15593diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
15594index e22c1db..23a625a 100644
15595--- a/arch/x86/include/asm/pgtable_64.h
15596+++ b/arch/x86/include/asm/pgtable_64.h
15597@@ -16,10 +16,14 @@
15598
15599 extern pud_t level3_kernel_pgt[512];
15600 extern pud_t level3_ident_pgt[512];
15601+extern pud_t level3_vmalloc_start_pgt[512];
15602+extern pud_t level3_vmalloc_end_pgt[512];
15603+extern pud_t level3_vmemmap_pgt[512];
15604+extern pud_t level2_vmemmap_pgt[512];
15605 extern pmd_t level2_kernel_pgt[512];
15606 extern pmd_t level2_fixmap_pgt[512];
15607-extern pmd_t level2_ident_pgt[512];
15608-extern pgd_t init_level4_pgt[];
15609+extern pmd_t level2_ident_pgt[512*2];
15610+extern pgd_t init_level4_pgt[512];
15611
15612 #define swapper_pg_dir init_level4_pgt
15613
15614@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
15615
15616 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
15617 {
15618+ pax_open_kernel();
15619 *pmdp = pmd;
15620+ pax_close_kernel();
15621 }
15622
15623 static inline void native_pmd_clear(pmd_t *pmd)
15624@@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
15625
15626 static inline void native_set_pud(pud_t *pudp, pud_t pud)
15627 {
15628+ pax_open_kernel();
15629 *pudp = pud;
15630+ pax_close_kernel();
15631 }
15632
15633 static inline void native_pud_clear(pud_t *pud)
15634@@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
15635
15636 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
15637 {
15638+ pax_open_kernel();
15639+ *pgdp = pgd;
15640+ pax_close_kernel();
15641+}
15642+
15643+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
15644+{
15645 *pgdp = pgd;
15646 }
15647
15648diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
15649index 2d88344..4679fc3 100644
15650--- a/arch/x86/include/asm/pgtable_64_types.h
15651+++ b/arch/x86/include/asm/pgtable_64_types.h
15652@@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
15653 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
15654 #define MODULES_END _AC(0xffffffffff000000, UL)
15655 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
15656+#define MODULES_EXEC_VADDR MODULES_VADDR
15657+#define MODULES_EXEC_END MODULES_END
15658+
15659+#define ktla_ktva(addr) (addr)
15660+#define ktva_ktla(addr) (addr)
15661
15662 #define EARLY_DYNAMIC_PAGE_TABLES 64
15663
15664diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
15665index e642300..0ef8f31 100644
15666--- a/arch/x86/include/asm/pgtable_types.h
15667+++ b/arch/x86/include/asm/pgtable_types.h
15668@@ -16,13 +16,12 @@
15669 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
15670 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
15671 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
15672-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
15673+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
15674 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
15675 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
15676 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
15677-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
15678-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
15679-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
15680+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
15681+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
15682 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
15683
15684 /* If _PAGE_BIT_PRESENT is clear, we use these: */
15685@@ -40,7 +39,6 @@
15686 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
15687 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
15688 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
15689-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
15690 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
15691 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
15692 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
15693@@ -57,8 +55,10 @@
15694
15695 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
15696 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
15697-#else
15698+#elif defined(CONFIG_KMEMCHECK)
15699 #define _PAGE_NX (_AT(pteval_t, 0))
15700+#else
15701+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
15702 #endif
15703
15704 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
15705@@ -116,6 +116,9 @@
15706 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
15707 _PAGE_ACCESSED)
15708
15709+#define PAGE_READONLY_NOEXEC PAGE_READONLY
15710+#define PAGE_SHARED_NOEXEC PAGE_SHARED
15711+
15712 #define __PAGE_KERNEL_EXEC \
15713 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
15714 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
15715@@ -126,7 +129,7 @@
15716 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
15717 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
15718 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
15719-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
15720+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
15721 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
15722 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
15723 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
15724@@ -188,8 +191,8 @@
15725 * bits are combined, this will alow user to access the high address mapped
15726 * VDSO in the presence of CONFIG_COMPAT_VDSO
15727 */
15728-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
15729-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
15730+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
15731+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
15732 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
15733 #endif
15734
15735@@ -227,7 +230,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
15736 {
15737 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
15738 }
15739+#endif
15740
15741+#if PAGETABLE_LEVELS == 3
15742+#include <asm-generic/pgtable-nopud.h>
15743+#endif
15744+
15745+#if PAGETABLE_LEVELS == 2
15746+#include <asm-generic/pgtable-nopmd.h>
15747+#endif
15748+
15749+#ifndef __ASSEMBLY__
15750 #if PAGETABLE_LEVELS > 3
15751 typedef struct { pudval_t pud; } pud_t;
15752
15753@@ -241,8 +254,6 @@ static inline pudval_t native_pud_val(pud_t pud)
15754 return pud.pud;
15755 }
15756 #else
15757-#include <asm-generic/pgtable-nopud.h>
15758-
15759 static inline pudval_t native_pud_val(pud_t pud)
15760 {
15761 return native_pgd_val(pud.pgd);
15762@@ -262,8 +273,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
15763 return pmd.pmd;
15764 }
15765 #else
15766-#include <asm-generic/pgtable-nopmd.h>
15767-
15768 static inline pmdval_t native_pmd_val(pmd_t pmd)
15769 {
15770 return native_pgd_val(pmd.pud.pgd);
15771@@ -303,7 +312,6 @@ typedef struct page *pgtable_t;
15772
15773 extern pteval_t __supported_pte_mask;
15774 extern void set_nx(void);
15775-extern int nx_enabled;
15776
15777 #define pgprot_writecombine pgprot_writecombine
15778 extern pgprot_t pgprot_writecombine(pgprot_t prot);
15779diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
15780index 22224b3..b3a2f90 100644
15781--- a/arch/x86/include/asm/processor.h
15782+++ b/arch/x86/include/asm/processor.h
15783@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
15784 : "memory");
15785 }
15786
15787+/* invpcid (%rdx),%rax */
15788+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
15789+
15790+#define INVPCID_SINGLE_ADDRESS 0UL
15791+#define INVPCID_SINGLE_CONTEXT 1UL
15792+#define INVPCID_ALL_GLOBAL 2UL
15793+#define INVPCID_ALL_MONGLOBAL 3UL
15794+
15795+#define PCID_KERNEL 0UL
15796+#define PCID_USER 1UL
15797+#define PCID_NOFLUSH (1UL << 63)
15798+
15799 static inline void load_cr3(pgd_t *pgdir)
15800 {
15801- write_cr3(__pa(pgdir));
15802+ write_cr3(__pa(pgdir) | PCID_KERNEL);
15803 }
15804
15805 #ifdef CONFIG_X86_32
15806@@ -282,7 +294,7 @@ struct tss_struct {
15807
15808 } ____cacheline_aligned;
15809
15810-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
15811+extern struct tss_struct init_tss[NR_CPUS];
15812
15813 /*
15814 * Save the original ist values for checking stack pointers during debugging
15815@@ -452,6 +464,7 @@ struct thread_struct {
15816 unsigned short ds;
15817 unsigned short fsindex;
15818 unsigned short gsindex;
15819+ unsigned short ss;
15820 #endif
15821 #ifdef CONFIG_X86_32
15822 unsigned long ip;
15823@@ -552,29 +565,8 @@ static inline void load_sp0(struct tss_struct *tss,
15824 extern unsigned long mmu_cr4_features;
15825 extern u32 *trampoline_cr4_features;
15826
15827-static inline void set_in_cr4(unsigned long mask)
15828-{
15829- unsigned long cr4;
15830-
15831- mmu_cr4_features |= mask;
15832- if (trampoline_cr4_features)
15833- *trampoline_cr4_features = mmu_cr4_features;
15834- cr4 = read_cr4();
15835- cr4 |= mask;
15836- write_cr4(cr4);
15837-}
15838-
15839-static inline void clear_in_cr4(unsigned long mask)
15840-{
15841- unsigned long cr4;
15842-
15843- mmu_cr4_features &= ~mask;
15844- if (trampoline_cr4_features)
15845- *trampoline_cr4_features = mmu_cr4_features;
15846- cr4 = read_cr4();
15847- cr4 &= ~mask;
15848- write_cr4(cr4);
15849-}
15850+extern void set_in_cr4(unsigned long mask);
15851+extern void clear_in_cr4(unsigned long mask);
15852
15853 typedef struct {
15854 unsigned long seg;
15855@@ -823,11 +815,18 @@ static inline void spin_lock_prefetch(const void *x)
15856 */
15857 #define TASK_SIZE PAGE_OFFSET
15858 #define TASK_SIZE_MAX TASK_SIZE
15859+
15860+#ifdef CONFIG_PAX_SEGMEXEC
15861+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
15862+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
15863+#else
15864 #define STACK_TOP TASK_SIZE
15865-#define STACK_TOP_MAX STACK_TOP
15866+#endif
15867+
15868+#define STACK_TOP_MAX TASK_SIZE
15869
15870 #define INIT_THREAD { \
15871- .sp0 = sizeof(init_stack) + (long)&init_stack, \
15872+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
15873 .vm86_info = NULL, \
15874 .sysenter_cs = __KERNEL_CS, \
15875 .io_bitmap_ptr = NULL, \
15876@@ -841,7 +840,7 @@ static inline void spin_lock_prefetch(const void *x)
15877 */
15878 #define INIT_TSS { \
15879 .x86_tss = { \
15880- .sp0 = sizeof(init_stack) + (long)&init_stack, \
15881+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
15882 .ss0 = __KERNEL_DS, \
15883 .ss1 = __KERNEL_CS, \
15884 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
15885@@ -852,11 +851,7 @@ static inline void spin_lock_prefetch(const void *x)
15886 extern unsigned long thread_saved_pc(struct task_struct *tsk);
15887
15888 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
15889-#define KSTK_TOP(info) \
15890-({ \
15891- unsigned long *__ptr = (unsigned long *)(info); \
15892- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
15893-})
15894+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
15895
15896 /*
15897 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
15898@@ -871,7 +866,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
15899 #define task_pt_regs(task) \
15900 ({ \
15901 struct pt_regs *__regs__; \
15902- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
15903+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
15904 __regs__ - 1; \
15905 })
15906
15907@@ -881,13 +876,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
15908 /*
15909 * User space process size. 47bits minus one guard page.
15910 */
15911-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
15912+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
15913
15914 /* This decides where the kernel will search for a free chunk of vm
15915 * space during mmap's.
15916 */
15917 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
15918- 0xc0000000 : 0xFFFFe000)
15919+ 0xc0000000 : 0xFFFFf000)
15920
15921 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
15922 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
15923@@ -898,11 +893,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
15924 #define STACK_TOP_MAX TASK_SIZE_MAX
15925
15926 #define INIT_THREAD { \
15927- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
15928+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
15929 }
15930
15931 #define INIT_TSS { \
15932- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
15933+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
15934 }
15935
15936 /*
15937@@ -930,6 +925,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
15938 */
15939 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
15940
15941+#ifdef CONFIG_PAX_SEGMEXEC
15942+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
15943+#endif
15944+
15945 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
15946
15947 /* Get/set a process' ability to use the timestamp counter instruction */
15948@@ -942,7 +941,8 @@ extern int set_tsc_mode(unsigned int val);
15949 extern u16 amd_get_nb_id(int cpu);
15950
15951 struct aperfmperf {
15952- u64 aperf, mperf;
15953+ u64 aperf __intentional_overflow(0);
15954+ u64 mperf __intentional_overflow(0);
15955 };
15956
15957 static inline void get_aperfmperf(struct aperfmperf *am)
15958@@ -970,7 +970,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,
15959 return ratio;
15960 }
15961
15962-extern unsigned long arch_align_stack(unsigned long sp);
15963+#define arch_align_stack(x) ((x) & ~0xfUL)
15964 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
15965
15966 void default_idle(void);
15967@@ -980,6 +980,6 @@ bool xen_set_default_idle(void);
15968 #define xen_set_default_idle 0
15969 #endif
15970
15971-void stop_this_cpu(void *dummy);
15972+void stop_this_cpu(void *dummy) __noreturn;
15973
15974 #endif /* _ASM_X86_PROCESSOR_H */
15975diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
15976index 942a086..6c26446 100644
15977--- a/arch/x86/include/asm/ptrace.h
15978+++ b/arch/x86/include/asm/ptrace.h
15979@@ -85,28 +85,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
15980 }
15981
15982 /*
15983- * user_mode_vm(regs) determines whether a register set came from user mode.
15984+ * user_mode(regs) determines whether a register set came from user mode.
15985 * This is true if V8086 mode was enabled OR if the register set was from
15986 * protected mode with RPL-3 CS value. This tricky test checks that with
15987 * one comparison. Many places in the kernel can bypass this full check
15988- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
15989+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
15990+ * be used.
15991 */
15992-static inline int user_mode(struct pt_regs *regs)
15993+static inline int user_mode_novm(struct pt_regs *regs)
15994 {
15995 #ifdef CONFIG_X86_32
15996 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
15997 #else
15998- return !!(regs->cs & 3);
15999+ return !!(regs->cs & SEGMENT_RPL_MASK);
16000 #endif
16001 }
16002
16003-static inline int user_mode_vm(struct pt_regs *regs)
16004+static inline int user_mode(struct pt_regs *regs)
16005 {
16006 #ifdef CONFIG_X86_32
16007 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
16008 USER_RPL;
16009 #else
16010- return user_mode(regs);
16011+ return user_mode_novm(regs);
16012 #endif
16013 }
16014
16015@@ -122,15 +123,16 @@ static inline int v8086_mode(struct pt_regs *regs)
16016 #ifdef CONFIG_X86_64
16017 static inline bool user_64bit_mode(struct pt_regs *regs)
16018 {
16019+ unsigned long cs = regs->cs & 0xffff;
16020 #ifndef CONFIG_PARAVIRT
16021 /*
16022 * On non-paravirt systems, this is the only long mode CPL 3
16023 * selector. We do not allow long mode selectors in the LDT.
16024 */
16025- return regs->cs == __USER_CS;
16026+ return cs == __USER_CS;
16027 #else
16028 /* Headers are too twisted for this to go in paravirt.h. */
16029- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
16030+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
16031 #endif
16032 }
16033
16034@@ -181,9 +183,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
16035 * Traps from the kernel do not save sp and ss.
16036 * Use the helper function to retrieve sp.
16037 */
16038- if (offset == offsetof(struct pt_regs, sp) &&
16039- regs->cs == __KERNEL_CS)
16040- return kernel_stack_pointer(regs);
16041+ if (offset == offsetof(struct pt_regs, sp)) {
16042+ unsigned long cs = regs->cs & 0xffff;
16043+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
16044+ return kernel_stack_pointer(regs);
16045+ }
16046 #endif
16047 return *(unsigned long *)((unsigned long)regs + offset);
16048 }
16049diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
16050index 9c6b890..5305f53 100644
16051--- a/arch/x86/include/asm/realmode.h
16052+++ b/arch/x86/include/asm/realmode.h
16053@@ -22,16 +22,14 @@ struct real_mode_header {
16054 #endif
16055 /* APM/BIOS reboot */
16056 u32 machine_real_restart_asm;
16057-#ifdef CONFIG_X86_64
16058 u32 machine_real_restart_seg;
16059-#endif
16060 };
16061
16062 /* This must match data at trampoline_32/64.S */
16063 struct trampoline_header {
16064 #ifdef CONFIG_X86_32
16065 u32 start;
16066- u16 gdt_pad;
16067+ u16 boot_cs;
16068 u16 gdt_limit;
16069 u32 gdt_base;
16070 #else
16071diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
16072index a82c4f1..ac45053 100644
16073--- a/arch/x86/include/asm/reboot.h
16074+++ b/arch/x86/include/asm/reboot.h
16075@@ -6,13 +6,13 @@
16076 struct pt_regs;
16077
16078 struct machine_ops {
16079- void (*restart)(char *cmd);
16080- void (*halt)(void);
16081- void (*power_off)(void);
16082+ void (* __noreturn restart)(char *cmd);
16083+ void (* __noreturn halt)(void);
16084+ void (* __noreturn power_off)(void);
16085 void (*shutdown)(void);
16086 void (*crash_shutdown)(struct pt_regs *);
16087- void (*emergency_restart)(void);
16088-};
16089+ void (* __noreturn emergency_restart)(void);
16090+} __no_const;
16091
16092 extern struct machine_ops machine_ops;
16093
16094diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
16095index cad82c9..2e5c5c1 100644
16096--- a/arch/x86/include/asm/rwsem.h
16097+++ b/arch/x86/include/asm/rwsem.h
16098@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
16099 {
16100 asm volatile("# beginning down_read\n\t"
16101 LOCK_PREFIX _ASM_INC "(%1)\n\t"
16102+
16103+#ifdef CONFIG_PAX_REFCOUNT
16104+ "jno 0f\n"
16105+ LOCK_PREFIX _ASM_DEC "(%1)\n"
16106+ "int $4\n0:\n"
16107+ _ASM_EXTABLE(0b, 0b)
16108+#endif
16109+
16110 /* adds 0x00000001 */
16111 " jns 1f\n"
16112 " call call_rwsem_down_read_failed\n"
16113@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
16114 "1:\n\t"
16115 " mov %1,%2\n\t"
16116 " add %3,%2\n\t"
16117+
16118+#ifdef CONFIG_PAX_REFCOUNT
16119+ "jno 0f\n"
16120+ "sub %3,%2\n"
16121+ "int $4\n0:\n"
16122+ _ASM_EXTABLE(0b, 0b)
16123+#endif
16124+
16125 " jle 2f\n\t"
16126 LOCK_PREFIX " cmpxchg %2,%0\n\t"
16127 " jnz 1b\n\t"
16128@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
16129 long tmp;
16130 asm volatile("# beginning down_write\n\t"
16131 LOCK_PREFIX " xadd %1,(%2)\n\t"
16132+
16133+#ifdef CONFIG_PAX_REFCOUNT
16134+ "jno 0f\n"
16135+ "mov %1,(%2)\n"
16136+ "int $4\n0:\n"
16137+ _ASM_EXTABLE(0b, 0b)
16138+#endif
16139+
16140 /* adds 0xffff0001, returns the old value */
16141 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
16142 /* was the active mask 0 before? */
16143@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
16144 long tmp;
16145 asm volatile("# beginning __up_read\n\t"
16146 LOCK_PREFIX " xadd %1,(%2)\n\t"
16147+
16148+#ifdef CONFIG_PAX_REFCOUNT
16149+ "jno 0f\n"
16150+ "mov %1,(%2)\n"
16151+ "int $4\n0:\n"
16152+ _ASM_EXTABLE(0b, 0b)
16153+#endif
16154+
16155 /* subtracts 1, returns the old value */
16156 " jns 1f\n\t"
16157 " call call_rwsem_wake\n" /* expects old value in %edx */
16158@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
16159 long tmp;
16160 asm volatile("# beginning __up_write\n\t"
16161 LOCK_PREFIX " xadd %1,(%2)\n\t"
16162+
16163+#ifdef CONFIG_PAX_REFCOUNT
16164+ "jno 0f\n"
16165+ "mov %1,(%2)\n"
16166+ "int $4\n0:\n"
16167+ _ASM_EXTABLE(0b, 0b)
16168+#endif
16169+
16170 /* subtracts 0xffff0001, returns the old value */
16171 " jns 1f\n\t"
16172 " call call_rwsem_wake\n" /* expects old value in %edx */
16173@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
16174 {
16175 asm volatile("# beginning __downgrade_write\n\t"
16176 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
16177+
16178+#ifdef CONFIG_PAX_REFCOUNT
16179+ "jno 0f\n"
16180+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
16181+ "int $4\n0:\n"
16182+ _ASM_EXTABLE(0b, 0b)
16183+#endif
16184+
16185 /*
16186 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
16187 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
16188@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
16189 */
16190 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
16191 {
16192- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
16193+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
16194+
16195+#ifdef CONFIG_PAX_REFCOUNT
16196+ "jno 0f\n"
16197+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
16198+ "int $4\n0:\n"
16199+ _ASM_EXTABLE(0b, 0b)
16200+#endif
16201+
16202 : "+m" (sem->count)
16203 : "er" (delta));
16204 }
16205@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
16206 */
16207 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
16208 {
16209- return delta + xadd(&sem->count, delta);
16210+ return delta + xadd_check_overflow(&sem->count, delta);
16211 }
16212
16213 #endif /* __KERNEL__ */
16214diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
16215index c48a950..bc40804 100644
16216--- a/arch/x86/include/asm/segment.h
16217+++ b/arch/x86/include/asm/segment.h
16218@@ -64,10 +64,15 @@
16219 * 26 - ESPFIX small SS
16220 * 27 - per-cpu [ offset to per-cpu data area ]
16221 * 28 - stack_canary-20 [ for stack protector ]
16222- * 29 - unused
16223- * 30 - unused
16224+ * 29 - PCI BIOS CS
16225+ * 30 - PCI BIOS DS
16226 * 31 - TSS for double fault handler
16227 */
16228+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
16229+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
16230+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
16231+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
16232+
16233 #define GDT_ENTRY_TLS_MIN 6
16234 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
16235
16236@@ -79,6 +84,8 @@
16237
16238 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
16239
16240+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
16241+
16242 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
16243
16244 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
16245@@ -104,6 +111,12 @@
16246 #define __KERNEL_STACK_CANARY 0
16247 #endif
16248
16249+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
16250+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
16251+
16252+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
16253+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
16254+
16255 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
16256
16257 /*
16258@@ -141,7 +154,7 @@
16259 */
16260
16261 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
16262-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
16263+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
16264
16265
16266 #else
16267@@ -165,6 +178,8 @@
16268 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
16269 #define __USER32_DS __USER_DS
16270
16271+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
16272+
16273 #define GDT_ENTRY_TSS 8 /* needs two entries */
16274 #define GDT_ENTRY_LDT 10 /* needs two entries */
16275 #define GDT_ENTRY_TLS_MIN 12
16276@@ -173,6 +188,8 @@
16277 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
16278 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
16279
16280+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
16281+
16282 /* TLS indexes for 64bit - hardcoded in arch_prctl */
16283 #define FS_TLS 0
16284 #define GS_TLS 1
16285@@ -180,12 +197,14 @@
16286 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
16287 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
16288
16289-#define GDT_ENTRIES 16
16290+#define GDT_ENTRIES 17
16291
16292 #endif
16293
16294 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
16295+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
16296 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
16297+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
16298 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
16299 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
16300 #ifndef CONFIG_PARAVIRT
16301@@ -265,7 +284,7 @@ static inline unsigned long get_limit(unsigned long segment)
16302 {
16303 unsigned long __limit;
16304 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
16305- return __limit + 1;
16306+ return __limit;
16307 }
16308
16309 #endif /* !__ASSEMBLY__ */
16310diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
16311index 8d3120f..352b440 100644
16312--- a/arch/x86/include/asm/smap.h
16313+++ b/arch/x86/include/asm/smap.h
16314@@ -25,11 +25,40 @@
16315
16316 #include <asm/alternative-asm.h>
16317
16318+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16319+#define ASM_PAX_OPEN_USERLAND \
16320+ 661: jmp 663f; \
16321+ .pushsection .altinstr_replacement, "a" ; \
16322+ 662: pushq %rax; nop; \
16323+ .popsection ; \
16324+ .pushsection .altinstructions, "a" ; \
16325+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
16326+ .popsection ; \
16327+ call __pax_open_userland; \
16328+ popq %rax; \
16329+ 663:
16330+
16331+#define ASM_PAX_CLOSE_USERLAND \
16332+ 661: jmp 663f; \
16333+ .pushsection .altinstr_replacement, "a" ; \
16334+ 662: pushq %rax; nop; \
16335+ .popsection; \
16336+ .pushsection .altinstructions, "a" ; \
16337+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
16338+ .popsection; \
16339+ call __pax_close_userland; \
16340+ popq %rax; \
16341+ 663:
16342+#else
16343+#define ASM_PAX_OPEN_USERLAND
16344+#define ASM_PAX_CLOSE_USERLAND
16345+#endif
16346+
16347 #ifdef CONFIG_X86_SMAP
16348
16349 #define ASM_CLAC \
16350 661: ASM_NOP3 ; \
16351- .pushsection .altinstr_replacement, "ax" ; \
16352+ .pushsection .altinstr_replacement, "a" ; \
16353 662: __ASM_CLAC ; \
16354 .popsection ; \
16355 .pushsection .altinstructions, "a" ; \
16356@@ -38,7 +67,7 @@
16357
16358 #define ASM_STAC \
16359 661: ASM_NOP3 ; \
16360- .pushsection .altinstr_replacement, "ax" ; \
16361+ .pushsection .altinstr_replacement, "a" ; \
16362 662: __ASM_STAC ; \
16363 .popsection ; \
16364 .pushsection .altinstructions, "a" ; \
16365@@ -56,6 +85,37 @@
16366
16367 #include <asm/alternative.h>
16368
16369+#define __HAVE_ARCH_PAX_OPEN_USERLAND
16370+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
16371+
16372+extern void __pax_open_userland(void);
16373+static __always_inline unsigned long pax_open_userland(void)
16374+{
16375+
16376+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16377+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
16378+ :
16379+ : [open] "i" (__pax_open_userland)
16380+ : "memory", "rax");
16381+#endif
16382+
16383+ return 0;
16384+}
16385+
16386+extern void __pax_close_userland(void);
16387+static __always_inline unsigned long pax_close_userland(void)
16388+{
16389+
16390+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16391+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
16392+ :
16393+ : [close] "i" (__pax_close_userland)
16394+ : "memory", "rax");
16395+#endif
16396+
16397+ return 0;
16398+}
16399+
16400 #ifdef CONFIG_X86_SMAP
16401
16402 static __always_inline void clac(void)
16403diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
16404index b073aae..39f9bdd 100644
16405--- a/arch/x86/include/asm/smp.h
16406+++ b/arch/x86/include/asm/smp.h
16407@@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
16408 /* cpus sharing the last level cache: */
16409 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
16410 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
16411-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
16412+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
16413
16414 static inline struct cpumask *cpu_sibling_mask(int cpu)
16415 {
16416@@ -79,7 +79,7 @@ struct smp_ops {
16417
16418 void (*send_call_func_ipi)(const struct cpumask *mask);
16419 void (*send_call_func_single_ipi)(int cpu);
16420-};
16421+} __no_const;
16422
16423 /* Globals due to paravirt */
16424 extern void set_cpu_sibling_map(int cpu);
16425@@ -191,14 +191,8 @@ extern unsigned disabled_cpus __cpuinitdata;
16426 extern int safe_smp_processor_id(void);
16427
16428 #elif defined(CONFIG_X86_64_SMP)
16429-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
16430-
16431-#define stack_smp_processor_id() \
16432-({ \
16433- struct thread_info *ti; \
16434- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
16435- ti->cpu; \
16436-})
16437+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
16438+#define stack_smp_processor_id() raw_smp_processor_id()
16439 #define safe_smp_processor_id() smp_processor_id()
16440
16441 #endif
16442diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
16443index 33692ea..350a534 100644
16444--- a/arch/x86/include/asm/spinlock.h
16445+++ b/arch/x86/include/asm/spinlock.h
16446@@ -172,6 +172,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
16447 static inline void arch_read_lock(arch_rwlock_t *rw)
16448 {
16449 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
16450+
16451+#ifdef CONFIG_PAX_REFCOUNT
16452+ "jno 0f\n"
16453+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
16454+ "int $4\n0:\n"
16455+ _ASM_EXTABLE(0b, 0b)
16456+#endif
16457+
16458 "jns 1f\n"
16459 "call __read_lock_failed\n\t"
16460 "1:\n"
16461@@ -181,6 +189,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
16462 static inline void arch_write_lock(arch_rwlock_t *rw)
16463 {
16464 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
16465+
16466+#ifdef CONFIG_PAX_REFCOUNT
16467+ "jno 0f\n"
16468+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
16469+ "int $4\n0:\n"
16470+ _ASM_EXTABLE(0b, 0b)
16471+#endif
16472+
16473 "jz 1f\n"
16474 "call __write_lock_failed\n\t"
16475 "1:\n"
16476@@ -210,13 +226,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
16477
16478 static inline void arch_read_unlock(arch_rwlock_t *rw)
16479 {
16480- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
16481+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
16482+
16483+#ifdef CONFIG_PAX_REFCOUNT
16484+ "jno 0f\n"
16485+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
16486+ "int $4\n0:\n"
16487+ _ASM_EXTABLE(0b, 0b)
16488+#endif
16489+
16490 :"+m" (rw->lock) : : "memory");
16491 }
16492
16493 static inline void arch_write_unlock(arch_rwlock_t *rw)
16494 {
16495- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
16496+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
16497+
16498+#ifdef CONFIG_PAX_REFCOUNT
16499+ "jno 0f\n"
16500+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
16501+ "int $4\n0:\n"
16502+ _ASM_EXTABLE(0b, 0b)
16503+#endif
16504+
16505 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
16506 }
16507
16508diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
16509index 6a99859..03cb807 100644
16510--- a/arch/x86/include/asm/stackprotector.h
16511+++ b/arch/x86/include/asm/stackprotector.h
16512@@ -47,7 +47,7 @@
16513 * head_32 for boot CPU and setup_per_cpu_areas() for others.
16514 */
16515 #define GDT_STACK_CANARY_INIT \
16516- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
16517+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
16518
16519 /*
16520 * Initialize the stackprotector canary value.
16521@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
16522
16523 static inline void load_stack_canary_segment(void)
16524 {
16525-#ifdef CONFIG_X86_32
16526+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
16527 asm volatile ("mov %0, %%gs" : : "r" (0));
16528 #endif
16529 }
16530diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
16531index 70bbe39..4ae2bd4 100644
16532--- a/arch/x86/include/asm/stacktrace.h
16533+++ b/arch/x86/include/asm/stacktrace.h
16534@@ -11,28 +11,20 @@
16535
16536 extern int kstack_depth_to_print;
16537
16538-struct thread_info;
16539+struct task_struct;
16540 struct stacktrace_ops;
16541
16542-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
16543- unsigned long *stack,
16544- unsigned long bp,
16545- const struct stacktrace_ops *ops,
16546- void *data,
16547- unsigned long *end,
16548- int *graph);
16549+typedef unsigned long walk_stack_t(struct task_struct *task,
16550+ void *stack_start,
16551+ unsigned long *stack,
16552+ unsigned long bp,
16553+ const struct stacktrace_ops *ops,
16554+ void *data,
16555+ unsigned long *end,
16556+ int *graph);
16557
16558-extern unsigned long
16559-print_context_stack(struct thread_info *tinfo,
16560- unsigned long *stack, unsigned long bp,
16561- const struct stacktrace_ops *ops, void *data,
16562- unsigned long *end, int *graph);
16563-
16564-extern unsigned long
16565-print_context_stack_bp(struct thread_info *tinfo,
16566- unsigned long *stack, unsigned long bp,
16567- const struct stacktrace_ops *ops, void *data,
16568- unsigned long *end, int *graph);
16569+extern walk_stack_t print_context_stack;
16570+extern walk_stack_t print_context_stack_bp;
16571
16572 /* Generic stack tracer with callbacks */
16573
16574@@ -40,7 +32,7 @@ struct stacktrace_ops {
16575 void (*address)(void *data, unsigned long address, int reliable);
16576 /* On negative return stop dumping */
16577 int (*stack)(void *data, char *name);
16578- walk_stack_t walk_stack;
16579+ walk_stack_t *walk_stack;
16580 };
16581
16582 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
16583diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
16584index 4ec45b3..a4f0a8a 100644
16585--- a/arch/x86/include/asm/switch_to.h
16586+++ b/arch/x86/include/asm/switch_to.h
16587@@ -108,7 +108,7 @@ do { \
16588 "call __switch_to\n\t" \
16589 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
16590 __switch_canary \
16591- "movq %P[thread_info](%%rsi),%%r8\n\t" \
16592+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
16593 "movq %%rax,%%rdi\n\t" \
16594 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
16595 "jnz ret_from_fork\n\t" \
16596@@ -119,7 +119,7 @@ do { \
16597 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
16598 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
16599 [_tif_fork] "i" (_TIF_FORK), \
16600- [thread_info] "i" (offsetof(struct task_struct, stack)), \
16601+ [thread_info] "m" (current_tinfo), \
16602 [current_task] "m" (current_task) \
16603 __switch_canary_iparam \
16604 : "memory", "cc" __EXTRA_CLOBBER)
16605diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
16606index a1df6e8..e002940 100644
16607--- a/arch/x86/include/asm/thread_info.h
16608+++ b/arch/x86/include/asm/thread_info.h
16609@@ -10,6 +10,7 @@
16610 #include <linux/compiler.h>
16611 #include <asm/page.h>
16612 #include <asm/types.h>
16613+#include <asm/percpu.h>
16614
16615 /*
16616 * low level task data that entry.S needs immediate access to
16617@@ -23,7 +24,6 @@ struct exec_domain;
16618 #include <linux/atomic.h>
16619
16620 struct thread_info {
16621- struct task_struct *task; /* main task structure */
16622 struct exec_domain *exec_domain; /* execution domain */
16623 __u32 flags; /* low level flags */
16624 __u32 status; /* thread synchronous flags */
16625@@ -33,19 +33,13 @@ struct thread_info {
16626 mm_segment_t addr_limit;
16627 struct restart_block restart_block;
16628 void __user *sysenter_return;
16629-#ifdef CONFIG_X86_32
16630- unsigned long previous_esp; /* ESP of the previous stack in
16631- case of nested (IRQ) stacks
16632- */
16633- __u8 supervisor_stack[0];
16634-#endif
16635+ unsigned long lowest_stack;
16636 unsigned int sig_on_uaccess_error:1;
16637 unsigned int uaccess_err:1; /* uaccess failed */
16638 };
16639
16640-#define INIT_THREAD_INFO(tsk) \
16641+#define INIT_THREAD_INFO \
16642 { \
16643- .task = &tsk, \
16644 .exec_domain = &default_exec_domain, \
16645 .flags = 0, \
16646 .cpu = 0, \
16647@@ -56,7 +50,7 @@ struct thread_info {
16648 }, \
16649 }
16650
16651-#define init_thread_info (init_thread_union.thread_info)
16652+#define init_thread_info (init_thread_union.stack)
16653 #define init_stack (init_thread_union.stack)
16654
16655 #else /* !__ASSEMBLY__ */
16656@@ -97,6 +91,7 @@ struct thread_info {
16657 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
16658 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
16659 #define TIF_X32 30 /* 32-bit native x86-64 binary */
16660+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
16661
16662 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
16663 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
16664@@ -121,17 +116,18 @@ struct thread_info {
16665 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
16666 #define _TIF_ADDR32 (1 << TIF_ADDR32)
16667 #define _TIF_X32 (1 << TIF_X32)
16668+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
16669
16670 /* work to do in syscall_trace_enter() */
16671 #define _TIF_WORK_SYSCALL_ENTRY \
16672 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
16673 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
16674- _TIF_NOHZ)
16675+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
16676
16677 /* work to do in syscall_trace_leave() */
16678 #define _TIF_WORK_SYSCALL_EXIT \
16679 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
16680- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
16681+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
16682
16683 /* work to do on interrupt/exception return */
16684 #define _TIF_WORK_MASK \
16685@@ -142,7 +138,7 @@ struct thread_info {
16686 /* work to do on any return to user space */
16687 #define _TIF_ALLWORK_MASK \
16688 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
16689- _TIF_NOHZ)
16690+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
16691
16692 /* Only used for 64 bit */
16693 #define _TIF_DO_NOTIFY_MASK \
16694@@ -158,45 +154,40 @@ struct thread_info {
16695
16696 #define PREEMPT_ACTIVE 0x10000000
16697
16698-#ifdef CONFIG_X86_32
16699-
16700-#define STACK_WARN (THREAD_SIZE/8)
16701-/*
16702- * macros/functions for gaining access to the thread information structure
16703- *
16704- * preempt_count needs to be 1 initially, until the scheduler is functional.
16705- */
16706-#ifndef __ASSEMBLY__
16707-
16708-
16709-/* how to get the current stack pointer from C */
16710-register unsigned long current_stack_pointer asm("esp") __used;
16711-
16712-/* how to get the thread information struct from C */
16713-static inline struct thread_info *current_thread_info(void)
16714-{
16715- return (struct thread_info *)
16716- (current_stack_pointer & ~(THREAD_SIZE - 1));
16717-}
16718-
16719-#else /* !__ASSEMBLY__ */
16720-
16721+#ifdef __ASSEMBLY__
16722 /* how to get the thread information struct from ASM */
16723 #define GET_THREAD_INFO(reg) \
16724- movl $-THREAD_SIZE, reg; \
16725- andl %esp, reg
16726+ mov PER_CPU_VAR(current_tinfo), reg
16727
16728 /* use this one if reg already contains %esp */
16729-#define GET_THREAD_INFO_WITH_ESP(reg) \
16730- andl $-THREAD_SIZE, reg
16731+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
16732+#else
16733+/* how to get the thread information struct from C */
16734+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
16735+
16736+static __always_inline struct thread_info *current_thread_info(void)
16737+{
16738+ return this_cpu_read_stable(current_tinfo);
16739+}
16740+#endif
16741+
16742+#ifdef CONFIG_X86_32
16743+
16744+#define STACK_WARN (THREAD_SIZE/8)
16745+/*
16746+ * macros/functions for gaining access to the thread information structure
16747+ *
16748+ * preempt_count needs to be 1 initially, until the scheduler is functional.
16749+ */
16750+#ifndef __ASSEMBLY__
16751+
16752+/* how to get the current stack pointer from C */
16753+register unsigned long current_stack_pointer asm("esp") __used;
16754
16755 #endif
16756
16757 #else /* X86_32 */
16758
16759-#include <asm/percpu.h>
16760-#define KERNEL_STACK_OFFSET (5*8)
16761-
16762 /*
16763 * macros/functions for gaining access to the thread information structure
16764 * preempt_count needs to be 1 initially, until the scheduler is functional.
16765@@ -204,27 +195,8 @@ static inline struct thread_info *current_thread_info(void)
16766 #ifndef __ASSEMBLY__
16767 DECLARE_PER_CPU(unsigned long, kernel_stack);
16768
16769-static inline struct thread_info *current_thread_info(void)
16770-{
16771- struct thread_info *ti;
16772- ti = (void *)(this_cpu_read_stable(kernel_stack) +
16773- KERNEL_STACK_OFFSET - THREAD_SIZE);
16774- return ti;
16775-}
16776-
16777-#else /* !__ASSEMBLY__ */
16778-
16779-/* how to get the thread information struct from ASM */
16780-#define GET_THREAD_INFO(reg) \
16781- movq PER_CPU_VAR(kernel_stack),reg ; \
16782- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
16783-
16784-/*
16785- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
16786- * a certain register (to be used in assembler memory operands).
16787- */
16788-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
16789-
16790+/* how to get the current stack pointer from C */
16791+register unsigned long current_stack_pointer asm("rsp") __used;
16792 #endif
16793
16794 #endif /* !X86_32 */
16795@@ -283,5 +255,12 @@ static inline bool is_ia32_task(void)
16796 extern void arch_task_cache_init(void);
16797 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
16798 extern void arch_release_task_struct(struct task_struct *tsk);
16799+
16800+#define __HAVE_THREAD_FUNCTIONS
16801+#define task_thread_info(task) (&(task)->tinfo)
16802+#define task_stack_page(task) ((task)->stack)
16803+#define setup_thread_stack(p, org) do {} while (0)
16804+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
16805+
16806 #endif
16807 #endif /* _ASM_X86_THREAD_INFO_H */
16808diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
16809index 50a7fc0..7c437a7 100644
16810--- a/arch/x86/include/asm/tlbflush.h
16811+++ b/arch/x86/include/asm/tlbflush.h
16812@@ -17,18 +17,40 @@
16813
16814 static inline void __native_flush_tlb(void)
16815 {
16816+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
16817+ unsigned long descriptor[2];
16818+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
16819+ return;
16820+ }
16821+
16822+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16823+ if (static_cpu_has(X86_FEATURE_PCID)) {
16824+ unsigned int cpu = raw_get_cpu();
16825+
16826+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
16827+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
16828+ raw_put_cpu_no_resched();
16829+ return;
16830+ }
16831+#endif
16832+
16833 native_write_cr3(native_read_cr3());
16834 }
16835
16836 static inline void __native_flush_tlb_global_irq_disabled(void)
16837 {
16838- unsigned long cr4;
16839+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
16840+ unsigned long descriptor[2];
16841+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
16842+ } else {
16843+ unsigned long cr4;
16844
16845- cr4 = native_read_cr4();
16846- /* clear PGE */
16847- native_write_cr4(cr4 & ~X86_CR4_PGE);
16848- /* write old PGE again and flush TLBs */
16849- native_write_cr4(cr4);
16850+ cr4 = native_read_cr4();
16851+ /* clear PGE */
16852+ native_write_cr4(cr4 & ~X86_CR4_PGE);
16853+ /* write old PGE again and flush TLBs */
16854+ native_write_cr4(cr4);
16855+ }
16856 }
16857
16858 static inline void __native_flush_tlb_global(void)
16859@@ -49,6 +71,42 @@ static inline void __native_flush_tlb_global(void)
16860
16861 static inline void __native_flush_tlb_single(unsigned long addr)
16862 {
16863+
16864+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
16865+ unsigned long descriptor[2];
16866+
16867+ descriptor[0] = PCID_KERNEL;
16868+ descriptor[1] = addr;
16869+
16870+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16871+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
16872+ if (addr < TASK_SIZE_MAX)
16873+ descriptor[1] += pax_user_shadow_base;
16874+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
16875+ }
16876+
16877+ descriptor[0] = PCID_USER;
16878+ descriptor[1] = addr;
16879+#endif
16880+
16881+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
16882+ return;
16883+ }
16884+
16885+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
16886+ if (static_cpu_has(X86_FEATURE_PCID)) {
16887+ unsigned int cpu = raw_get_cpu();
16888+
16889+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
16890+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
16891+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
16892+ raw_put_cpu_no_resched();
16893+
16894+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
16895+ addr += pax_user_shadow_base;
16896+ }
16897+#endif
16898+
16899 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
16900 }
16901
16902diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
16903index 5ee2687..74590b9 100644
16904--- a/arch/x86/include/asm/uaccess.h
16905+++ b/arch/x86/include/asm/uaccess.h
16906@@ -7,6 +7,7 @@
16907 #include <linux/compiler.h>
16908 #include <linux/thread_info.h>
16909 #include <linux/string.h>
16910+#include <linux/sched.h>
16911 #include <asm/asm.h>
16912 #include <asm/page.h>
16913 #include <asm/smap.h>
16914@@ -29,7 +30,12 @@
16915
16916 #define get_ds() (KERNEL_DS)
16917 #define get_fs() (current_thread_info()->addr_limit)
16918+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
16919+void __set_fs(mm_segment_t x);
16920+void set_fs(mm_segment_t x);
16921+#else
16922 #define set_fs(x) (current_thread_info()->addr_limit = (x))
16923+#endif
16924
16925 #define segment_eq(a, b) ((a).seg == (b).seg)
16926
16927@@ -77,8 +83,33 @@
16928 * checks that the pointer is in the user space range - after calling
16929 * this function, memory access functions may still return -EFAULT.
16930 */
16931-#define access_ok(type, addr, size) \
16932- (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
16933+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
16934+#define access_ok(type, addr, size) \
16935+({ \
16936+ long __size = size; \
16937+ unsigned long __addr = (unsigned long)addr; \
16938+ unsigned long __addr_ao = __addr & PAGE_MASK; \
16939+ unsigned long __end_ao = __addr + __size - 1; \
16940+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
16941+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
16942+ while(__addr_ao <= __end_ao) { \
16943+ char __c_ao; \
16944+ __addr_ao += PAGE_SIZE; \
16945+ if (__size > PAGE_SIZE) \
16946+ cond_resched(); \
16947+ if (__get_user(__c_ao, (char __user *)__addr)) \
16948+ break; \
16949+ if (type != VERIFY_WRITE) { \
16950+ __addr = __addr_ao; \
16951+ continue; \
16952+ } \
16953+ if (__put_user(__c_ao, (char __user *)__addr)) \
16954+ break; \
16955+ __addr = __addr_ao; \
16956+ } \
16957+ } \
16958+ __ret_ao; \
16959+})
16960
16961 /*
16962 * The exception table consists of pairs of addresses relative to the
16963@@ -165,10 +196,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
16964 register __inttype(*(ptr)) __val_gu asm("%edx"); \
16965 __chk_user_ptr(ptr); \
16966 might_fault(); \
16967+ pax_open_userland(); \
16968 asm volatile("call __get_user_%P3" \
16969 : "=a" (__ret_gu), "=r" (__val_gu) \
16970 : "0" (ptr), "i" (sizeof(*(ptr)))); \
16971 (x) = (__typeof__(*(ptr))) __val_gu; \
16972+ pax_close_userland(); \
16973 __ret_gu; \
16974 })
16975
16976@@ -176,13 +209,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
16977 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
16978 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
16979
16980-
16981+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
16982+#define __copyuser_seg "gs;"
16983+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
16984+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
16985+#else
16986+#define __copyuser_seg
16987+#define __COPYUSER_SET_ES
16988+#define __COPYUSER_RESTORE_ES
16989+#endif
16990
16991 #ifdef CONFIG_X86_32
16992 #define __put_user_asm_u64(x, addr, err, errret) \
16993 asm volatile(ASM_STAC "\n" \
16994- "1: movl %%eax,0(%2)\n" \
16995- "2: movl %%edx,4(%2)\n" \
16996+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
16997+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
16998 "3: " ASM_CLAC "\n" \
16999 ".section .fixup,\"ax\"\n" \
17000 "4: movl %3,%0\n" \
17001@@ -195,8 +236,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
17002
17003 #define __put_user_asm_ex_u64(x, addr) \
17004 asm volatile(ASM_STAC "\n" \
17005- "1: movl %%eax,0(%1)\n" \
17006- "2: movl %%edx,4(%1)\n" \
17007+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
17008+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
17009 "3: " ASM_CLAC "\n" \
17010 _ASM_EXTABLE_EX(1b, 2b) \
17011 _ASM_EXTABLE_EX(2b, 3b) \
17012@@ -246,7 +287,8 @@ extern void __put_user_8(void);
17013 __typeof__(*(ptr)) __pu_val; \
17014 __chk_user_ptr(ptr); \
17015 might_fault(); \
17016- __pu_val = x; \
17017+ __pu_val = (x); \
17018+ pax_open_userland(); \
17019 switch (sizeof(*(ptr))) { \
17020 case 1: \
17021 __put_user_x(1, __pu_val, ptr, __ret_pu); \
17022@@ -264,6 +306,7 @@ extern void __put_user_8(void);
17023 __put_user_x(X, __pu_val, ptr, __ret_pu); \
17024 break; \
17025 } \
17026+ pax_close_userland(); \
17027 __ret_pu; \
17028 })
17029
17030@@ -344,8 +387,10 @@ do { \
17031 } while (0)
17032
17033 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
17034+do { \
17035+ pax_open_userland(); \
17036 asm volatile(ASM_STAC "\n" \
17037- "1: mov"itype" %2,%"rtype"1\n" \
17038+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
17039 "2: " ASM_CLAC "\n" \
17040 ".section .fixup,\"ax\"\n" \
17041 "3: mov %3,%0\n" \
17042@@ -353,8 +398,10 @@ do { \
17043 " jmp 2b\n" \
17044 ".previous\n" \
17045 _ASM_EXTABLE(1b, 3b) \
17046- : "=r" (err), ltype(x) \
17047- : "m" (__m(addr)), "i" (errret), "0" (err))
17048+ : "=r" (err), ltype (x) \
17049+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
17050+ pax_close_userland(); \
17051+} while (0)
17052
17053 #define __get_user_size_ex(x, ptr, size) \
17054 do { \
17055@@ -378,7 +425,7 @@ do { \
17056 } while (0)
17057
17058 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
17059- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
17060+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
17061 "2:\n" \
17062 _ASM_EXTABLE_EX(1b, 2b) \
17063 : ltype(x) : "m" (__m(addr)))
17064@@ -395,13 +442,24 @@ do { \
17065 int __gu_err; \
17066 unsigned long __gu_val; \
17067 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
17068- (x) = (__force __typeof__(*(ptr)))__gu_val; \
17069+ (x) = (__typeof__(*(ptr)))__gu_val; \
17070 __gu_err; \
17071 })
17072
17073 /* FIXME: this hack is definitely wrong -AK */
17074 struct __large_struct { unsigned long buf[100]; };
17075-#define __m(x) (*(struct __large_struct __user *)(x))
17076+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17077+#define ____m(x) \
17078+({ \
17079+ unsigned long ____x = (unsigned long)(x); \
17080+ if (____x < pax_user_shadow_base) \
17081+ ____x += pax_user_shadow_base; \
17082+ (typeof(x))____x; \
17083+})
17084+#else
17085+#define ____m(x) (x)
17086+#endif
17087+#define __m(x) (*(struct __large_struct __user *)____m(x))
17088
17089 /*
17090 * Tell gcc we read from memory instead of writing: this is because
17091@@ -409,8 +467,10 @@ struct __large_struct { unsigned long buf[100]; };
17092 * aliasing issues.
17093 */
17094 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
17095+do { \
17096+ pax_open_userland(); \
17097 asm volatile(ASM_STAC "\n" \
17098- "1: mov"itype" %"rtype"1,%2\n" \
17099+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
17100 "2: " ASM_CLAC "\n" \
17101 ".section .fixup,\"ax\"\n" \
17102 "3: mov %3,%0\n" \
17103@@ -418,10 +478,12 @@ struct __large_struct { unsigned long buf[100]; };
17104 ".previous\n" \
17105 _ASM_EXTABLE(1b, 3b) \
17106 : "=r"(err) \
17107- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
17108+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
17109+ pax_close_userland(); \
17110+} while (0)
17111
17112 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
17113- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
17114+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
17115 "2:\n" \
17116 _ASM_EXTABLE_EX(1b, 2b) \
17117 : : ltype(x), "m" (__m(addr)))
17118@@ -431,11 +493,13 @@ struct __large_struct { unsigned long buf[100]; };
17119 */
17120 #define uaccess_try do { \
17121 current_thread_info()->uaccess_err = 0; \
17122+ pax_open_userland(); \
17123 stac(); \
17124 barrier();
17125
17126 #define uaccess_catch(err) \
17127 clac(); \
17128+ pax_close_userland(); \
17129 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
17130 } while (0)
17131
17132@@ -460,8 +524,12 @@ struct __large_struct { unsigned long buf[100]; };
17133 * On error, the variable @x is set to zero.
17134 */
17135
17136+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17137+#define __get_user(x, ptr) get_user((x), (ptr))
17138+#else
17139 #define __get_user(x, ptr) \
17140 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
17141+#endif
17142
17143 /**
17144 * __put_user: - Write a simple value into user space, with less checking.
17145@@ -483,8 +551,12 @@ struct __large_struct { unsigned long buf[100]; };
17146 * Returns zero on success, or -EFAULT on error.
17147 */
17148
17149+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17150+#define __put_user(x, ptr) put_user((x), (ptr))
17151+#else
17152 #define __put_user(x, ptr) \
17153 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
17154+#endif
17155
17156 #define __get_user_unaligned __get_user
17157 #define __put_user_unaligned __put_user
17158@@ -502,7 +574,7 @@ struct __large_struct { unsigned long buf[100]; };
17159 #define get_user_ex(x, ptr) do { \
17160 unsigned long __gue_val; \
17161 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
17162- (x) = (__force __typeof__(*(ptr)))__gue_val; \
17163+ (x) = (__typeof__(*(ptr)))__gue_val; \
17164 } while (0)
17165
17166 #define put_user_try uaccess_try
17167@@ -519,8 +591,8 @@ strncpy_from_user(char *dst, const char __user *src, long count);
17168 extern __must_check long strlen_user(const char __user *str);
17169 extern __must_check long strnlen_user(const char __user *str, long n);
17170
17171-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
17172-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
17173+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
17174+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
17175
17176 /*
17177 * movsl can be slow when source and dest are not both 8-byte aligned
17178diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
17179index 7f760a9..04b1c65 100644
17180--- a/arch/x86/include/asm/uaccess_32.h
17181+++ b/arch/x86/include/asm/uaccess_32.h
17182@@ -11,15 +11,15 @@
17183 #include <asm/page.h>
17184
17185 unsigned long __must_check __copy_to_user_ll
17186- (void __user *to, const void *from, unsigned long n);
17187+ (void __user *to, const void *from, unsigned long n) __size_overflow(3);
17188 unsigned long __must_check __copy_from_user_ll
17189- (void *to, const void __user *from, unsigned long n);
17190+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
17191 unsigned long __must_check __copy_from_user_ll_nozero
17192- (void *to, const void __user *from, unsigned long n);
17193+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
17194 unsigned long __must_check __copy_from_user_ll_nocache
17195- (void *to, const void __user *from, unsigned long n);
17196+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
17197 unsigned long __must_check __copy_from_user_ll_nocache_nozero
17198- (void *to, const void __user *from, unsigned long n);
17199+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
17200
17201 /**
17202 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
17203@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
17204 static __always_inline unsigned long __must_check
17205 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
17206 {
17207+ if ((long)n < 0)
17208+ return n;
17209+
17210+ check_object_size(from, n, true);
17211+
17212 if (__builtin_constant_p(n)) {
17213 unsigned long ret;
17214
17215@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
17216 __copy_to_user(void __user *to, const void *from, unsigned long n)
17217 {
17218 might_fault();
17219+
17220 return __copy_to_user_inatomic(to, from, n);
17221 }
17222
17223 static __always_inline unsigned long
17224 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
17225 {
17226+ if ((long)n < 0)
17227+ return n;
17228+
17229 /* Avoid zeroing the tail if the copy fails..
17230 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
17231 * but as the zeroing behaviour is only significant when n is not
17232@@ -137,6 +146,12 @@ static __always_inline unsigned long
17233 __copy_from_user(void *to, const void __user *from, unsigned long n)
17234 {
17235 might_fault();
17236+
17237+ if ((long)n < 0)
17238+ return n;
17239+
17240+ check_object_size(to, n, false);
17241+
17242 if (__builtin_constant_p(n)) {
17243 unsigned long ret;
17244
17245@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
17246 const void __user *from, unsigned long n)
17247 {
17248 might_fault();
17249+
17250+ if ((long)n < 0)
17251+ return n;
17252+
17253 if (__builtin_constant_p(n)) {
17254 unsigned long ret;
17255
17256@@ -181,15 +200,19 @@ static __always_inline unsigned long
17257 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
17258 unsigned long n)
17259 {
17260- return __copy_from_user_ll_nocache_nozero(to, from, n);
17261+ if ((long)n < 0)
17262+ return n;
17263+
17264+ return __copy_from_user_ll_nocache_nozero(to, from, n);
17265 }
17266
17267-unsigned long __must_check copy_to_user(void __user *to,
17268- const void *from, unsigned long n);
17269-unsigned long __must_check _copy_from_user(void *to,
17270- const void __user *from,
17271- unsigned long n);
17272-
17273+extern void copy_to_user_overflow(void)
17274+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
17275+ __compiletime_error("copy_to_user() buffer size is not provably correct")
17276+#else
17277+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
17278+#endif
17279+;
17280
17281 extern void copy_from_user_overflow(void)
17282 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
17283@@ -199,17 +222,60 @@ extern void copy_from_user_overflow(void)
17284 #endif
17285 ;
17286
17287-static inline unsigned long __must_check copy_from_user(void *to,
17288- const void __user *from,
17289- unsigned long n)
17290+/**
17291+ * copy_to_user: - Copy a block of data into user space.
17292+ * @to: Destination address, in user space.
17293+ * @from: Source address, in kernel space.
17294+ * @n: Number of bytes to copy.
17295+ *
17296+ * Context: User context only. This function may sleep.
17297+ *
17298+ * Copy data from kernel space to user space.
17299+ *
17300+ * Returns number of bytes that could not be copied.
17301+ * On success, this will be zero.
17302+ */
17303+static inline unsigned long __must_check
17304+copy_to_user(void __user *to, const void *from, unsigned long n)
17305 {
17306- int sz = __compiletime_object_size(to);
17307+ size_t sz = __compiletime_object_size(from);
17308
17309- if (likely(sz == -1 || sz >= n))
17310- n = _copy_from_user(to, from, n);
17311- else
17312+ if (unlikely(sz != (size_t)-1 && sz < n))
17313+ copy_to_user_overflow();
17314+ else if (access_ok(VERIFY_WRITE, to, n))
17315+ n = __copy_to_user(to, from, n);
17316+ return n;
17317+}
17318+
17319+/**
17320+ * copy_from_user: - Copy a block of data from user space.
17321+ * @to: Destination address, in kernel space.
17322+ * @from: Source address, in user space.
17323+ * @n: Number of bytes to copy.
17324+ *
17325+ * Context: User context only. This function may sleep.
17326+ *
17327+ * Copy data from user space to kernel space.
17328+ *
17329+ * Returns number of bytes that could not be copied.
17330+ * On success, this will be zero.
17331+ *
17332+ * If some data could not be copied, this function will pad the copied
17333+ * data to the requested size using zero bytes.
17334+ */
17335+static inline unsigned long __must_check
17336+copy_from_user(void *to, const void __user *from, unsigned long n)
17337+{
17338+ size_t sz = __compiletime_object_size(to);
17339+
17340+ check_object_size(to, n, false);
17341+
17342+ if (unlikely(sz != (size_t)-1 && sz < n))
17343 copy_from_user_overflow();
17344-
17345+ else if (access_ok(VERIFY_READ, from, n))
17346+ n = __copy_from_user(to, from, n);
17347+ else if ((long)n > 0)
17348+ memset(to, 0, n);
17349 return n;
17350 }
17351
17352diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
17353index 142810c..1f2a0a7 100644
17354--- a/arch/x86/include/asm/uaccess_64.h
17355+++ b/arch/x86/include/asm/uaccess_64.h
17356@@ -10,6 +10,9 @@
17357 #include <asm/alternative.h>
17358 #include <asm/cpufeature.h>
17359 #include <asm/page.h>
17360+#include <asm/pgtable.h>
17361+
17362+#define set_fs(x) (current_thread_info()->addr_limit = (x))
17363
17364 /*
17365 * Copy To/From Userspace
17366@@ -17,13 +20,13 @@
17367
17368 /* Handles exceptions in both to and from, but doesn't do access_ok */
17369 __must_check unsigned long
17370-copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
17371+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
17372 __must_check unsigned long
17373-copy_user_generic_string(void *to, const void *from, unsigned len);
17374+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
17375 __must_check unsigned long
17376-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
17377+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
17378
17379-static __always_inline __must_check unsigned long
17380+static __always_inline __must_check __size_overflow(3) unsigned long
17381 copy_user_generic(void *to, const void *from, unsigned len)
17382 {
17383 unsigned ret;
17384@@ -41,142 +44,204 @@ copy_user_generic(void *to, const void *from, unsigned len)
17385 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
17386 "=d" (len)),
17387 "1" (to), "2" (from), "3" (len)
17388- : "memory", "rcx", "r8", "r9", "r10", "r11");
17389+ : "memory", "rcx", "r8", "r9", "r11");
17390 return ret;
17391 }
17392
17393+static __always_inline __must_check unsigned long
17394+__copy_to_user(void __user *to, const void *from, unsigned long len);
17395+static __always_inline __must_check unsigned long
17396+__copy_from_user(void *to, const void __user *from, unsigned long len);
17397 __must_check unsigned long
17398-_copy_to_user(void __user *to, const void *from, unsigned len);
17399-__must_check unsigned long
17400-_copy_from_user(void *to, const void __user *from, unsigned len);
17401-__must_check unsigned long
17402-copy_in_user(void __user *to, const void __user *from, unsigned len);
17403+copy_in_user(void __user *to, const void __user *from, unsigned long len);
17404+
17405+extern void copy_to_user_overflow(void)
17406+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
17407+ __compiletime_error("copy_to_user() buffer size is not provably correct")
17408+#else
17409+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
17410+#endif
17411+;
17412+
17413+extern void copy_from_user_overflow(void)
17414+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
17415+ __compiletime_error("copy_from_user() buffer size is not provably correct")
17416+#else
17417+ __compiletime_warning("copy_from_user() buffer size is not provably correct")
17418+#endif
17419+;
17420
17421 static inline unsigned long __must_check copy_from_user(void *to,
17422 const void __user *from,
17423 unsigned long n)
17424 {
17425- int sz = __compiletime_object_size(to);
17426-
17427 might_fault();
17428- if (likely(sz == -1 || sz >= n))
17429- n = _copy_from_user(to, from, n);
17430-#ifdef CONFIG_DEBUG_VM
17431- else
17432- WARN(1, "Buffer overflow detected!\n");
17433-#endif
17434+
17435+ check_object_size(to, n, false);
17436+
17437+ if (access_ok(VERIFY_READ, from, n))
17438+ n = __copy_from_user(to, from, n);
17439+ else if (n < INT_MAX)
17440+ memset(to, 0, n);
17441 return n;
17442 }
17443
17444 static __always_inline __must_check
17445-int copy_to_user(void __user *dst, const void *src, unsigned size)
17446+int copy_to_user(void __user *dst, const void *src, unsigned long size)
17447 {
17448 might_fault();
17449
17450- return _copy_to_user(dst, src, size);
17451+ if (access_ok(VERIFY_WRITE, dst, size))
17452+ size = __copy_to_user(dst, src, size);
17453+ return size;
17454 }
17455
17456 static __always_inline __must_check
17457-int __copy_from_user(void *dst, const void __user *src, unsigned size)
17458+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
17459 {
17460- int ret = 0;
17461+ size_t sz = __compiletime_object_size(dst);
17462+ unsigned ret = 0;
17463
17464 might_fault();
17465+
17466+ if (size > INT_MAX)
17467+ return size;
17468+
17469+ check_object_size(dst, size, false);
17470+
17471+#ifdef CONFIG_PAX_MEMORY_UDEREF
17472+ if (!__access_ok(VERIFY_READ, src, size))
17473+ return size;
17474+#endif
17475+
17476+ if (unlikely(sz != (size_t)-1 && sz < size)) {
17477+ copy_from_user_overflow();
17478+ return size;
17479+ }
17480+
17481 if (!__builtin_constant_p(size))
17482- return copy_user_generic(dst, (__force void *)src, size);
17483+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
17484 switch (size) {
17485- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
17486+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
17487 ret, "b", "b", "=q", 1);
17488 return ret;
17489- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
17490+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
17491 ret, "w", "w", "=r", 2);
17492 return ret;
17493- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
17494+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
17495 ret, "l", "k", "=r", 4);
17496 return ret;
17497- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
17498+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
17499 ret, "q", "", "=r", 8);
17500 return ret;
17501 case 10:
17502- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
17503+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
17504 ret, "q", "", "=r", 10);
17505 if (unlikely(ret))
17506 return ret;
17507 __get_user_asm(*(u16 *)(8 + (char *)dst),
17508- (u16 __user *)(8 + (char __user *)src),
17509+ (const u16 __user *)(8 + (const char __user *)src),
17510 ret, "w", "w", "=r", 2);
17511 return ret;
17512 case 16:
17513- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
17514+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
17515 ret, "q", "", "=r", 16);
17516 if (unlikely(ret))
17517 return ret;
17518 __get_user_asm(*(u64 *)(8 + (char *)dst),
17519- (u64 __user *)(8 + (char __user *)src),
17520+ (const u64 __user *)(8 + (const char __user *)src),
17521 ret, "q", "", "=r", 8);
17522 return ret;
17523 default:
17524- return copy_user_generic(dst, (__force void *)src, size);
17525+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
17526 }
17527 }
17528
17529 static __always_inline __must_check
17530-int __copy_to_user(void __user *dst, const void *src, unsigned size)
17531+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
17532 {
17533- int ret = 0;
17534+ size_t sz = __compiletime_object_size(src);
17535+ unsigned ret = 0;
17536
17537 might_fault();
17538+
17539+ if (size > INT_MAX)
17540+ return size;
17541+
17542+ check_object_size(src, size, true);
17543+
17544+#ifdef CONFIG_PAX_MEMORY_UDEREF
17545+ if (!__access_ok(VERIFY_WRITE, dst, size))
17546+ return size;
17547+#endif
17548+
17549+ if (unlikely(sz != (size_t)-1 && sz < size)) {
17550+ copy_to_user_overflow();
17551+ return size;
17552+ }
17553+
17554 if (!__builtin_constant_p(size))
17555- return copy_user_generic((__force void *)dst, src, size);
17556+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
17557 switch (size) {
17558- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
17559+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
17560 ret, "b", "b", "iq", 1);
17561 return ret;
17562- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
17563+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
17564 ret, "w", "w", "ir", 2);
17565 return ret;
17566- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
17567+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
17568 ret, "l", "k", "ir", 4);
17569 return ret;
17570- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
17571+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
17572 ret, "q", "", "er", 8);
17573 return ret;
17574 case 10:
17575- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
17576+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
17577 ret, "q", "", "er", 10);
17578 if (unlikely(ret))
17579 return ret;
17580 asm("":::"memory");
17581- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
17582+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
17583 ret, "w", "w", "ir", 2);
17584 return ret;
17585 case 16:
17586- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
17587+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
17588 ret, "q", "", "er", 16);
17589 if (unlikely(ret))
17590 return ret;
17591 asm("":::"memory");
17592- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
17593+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
17594 ret, "q", "", "er", 8);
17595 return ret;
17596 default:
17597- return copy_user_generic((__force void *)dst, src, size);
17598+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
17599 }
17600 }
17601
17602 static __always_inline __must_check
17603-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
17604+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
17605 {
17606- int ret = 0;
17607+ unsigned ret = 0;
17608
17609 might_fault();
17610+
17611+ if (size > INT_MAX)
17612+ return size;
17613+
17614+#ifdef CONFIG_PAX_MEMORY_UDEREF
17615+ if (!__access_ok(VERIFY_READ, src, size))
17616+ return size;
17617+ if (!__access_ok(VERIFY_WRITE, dst, size))
17618+ return size;
17619+#endif
17620+
17621 if (!__builtin_constant_p(size))
17622- return copy_user_generic((__force void *)dst,
17623- (__force void *)src, size);
17624+ return copy_user_generic((__force_kernel void *)____m(dst),
17625+ (__force_kernel const void *)____m(src), size);
17626 switch (size) {
17627 case 1: {
17628 u8 tmp;
17629- __get_user_asm(tmp, (u8 __user *)src,
17630+ __get_user_asm(tmp, (const u8 __user *)src,
17631 ret, "b", "b", "=q", 1);
17632 if (likely(!ret))
17633 __put_user_asm(tmp, (u8 __user *)dst,
17634@@ -185,7 +250,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
17635 }
17636 case 2: {
17637 u16 tmp;
17638- __get_user_asm(tmp, (u16 __user *)src,
17639+ __get_user_asm(tmp, (const u16 __user *)src,
17640 ret, "w", "w", "=r", 2);
17641 if (likely(!ret))
17642 __put_user_asm(tmp, (u16 __user *)dst,
17643@@ -195,7 +260,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
17644
17645 case 4: {
17646 u32 tmp;
17647- __get_user_asm(tmp, (u32 __user *)src,
17648+ __get_user_asm(tmp, (const u32 __user *)src,
17649 ret, "l", "k", "=r", 4);
17650 if (likely(!ret))
17651 __put_user_asm(tmp, (u32 __user *)dst,
17652@@ -204,7 +269,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
17653 }
17654 case 8: {
17655 u64 tmp;
17656- __get_user_asm(tmp, (u64 __user *)src,
17657+ __get_user_asm(tmp, (const u64 __user *)src,
17658 ret, "q", "", "=r", 8);
17659 if (likely(!ret))
17660 __put_user_asm(tmp, (u64 __user *)dst,
17661@@ -212,41 +277,72 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
17662 return ret;
17663 }
17664 default:
17665- return copy_user_generic((__force void *)dst,
17666- (__force void *)src, size);
17667+ return copy_user_generic((__force_kernel void *)____m(dst),
17668+ (__force_kernel const void *)____m(src), size);
17669 }
17670 }
17671
17672 static __must_check __always_inline int
17673-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
17674+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
17675 {
17676- return copy_user_generic(dst, (__force const void *)src, size);
17677+ if (size > INT_MAX)
17678+ return size;
17679+
17680+#ifdef CONFIG_PAX_MEMORY_UDEREF
17681+ if (!__access_ok(VERIFY_READ, src, size))
17682+ return size;
17683+#endif
17684+
17685+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
17686 }
17687
17688-static __must_check __always_inline int
17689-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
17690+static __must_check __always_inline unsigned long
17691+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
17692 {
17693- return copy_user_generic((__force void *)dst, src, size);
17694+ if (size > INT_MAX)
17695+ return size;
17696+
17697+#ifdef CONFIG_PAX_MEMORY_UDEREF
17698+ if (!__access_ok(VERIFY_WRITE, dst, size))
17699+ return size;
17700+#endif
17701+
17702+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
17703 }
17704
17705-extern long __copy_user_nocache(void *dst, const void __user *src,
17706- unsigned size, int zerorest);
17707+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
17708+ unsigned long size, int zerorest) __size_overflow(3);
17709
17710-static inline int
17711-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
17712+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
17713 {
17714 might_sleep();
17715+
17716+ if (size > INT_MAX)
17717+ return size;
17718+
17719+#ifdef CONFIG_PAX_MEMORY_UDEREF
17720+ if (!__access_ok(VERIFY_READ, src, size))
17721+ return size;
17722+#endif
17723+
17724 return __copy_user_nocache(dst, src, size, 1);
17725 }
17726
17727-static inline int
17728-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
17729- unsigned size)
17730+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
17731+ unsigned long size)
17732 {
17733+ if (size > INT_MAX)
17734+ return size;
17735+
17736+#ifdef CONFIG_PAX_MEMORY_UDEREF
17737+ if (!__access_ok(VERIFY_READ, src, size))
17738+ return size;
17739+#endif
17740+
17741 return __copy_user_nocache(dst, src, size, 0);
17742 }
17743
17744-unsigned long
17745-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
17746+extern unsigned long
17747+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
17748
17749 #endif /* _ASM_X86_UACCESS_64_H */
17750diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
17751index 5b238981..77fdd78 100644
17752--- a/arch/x86/include/asm/word-at-a-time.h
17753+++ b/arch/x86/include/asm/word-at-a-time.h
17754@@ -11,7 +11,7 @@
17755 * and shift, for example.
17756 */
17757 struct word_at_a_time {
17758- const unsigned long one_bits, high_bits;
17759+ unsigned long one_bits, high_bits;
17760 };
17761
17762 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
17763diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
17764index d8d9922..bf6cecb 100644
17765--- a/arch/x86/include/asm/x86_init.h
17766+++ b/arch/x86/include/asm/x86_init.h
17767@@ -129,7 +129,7 @@ struct x86_init_ops {
17768 struct x86_init_timers timers;
17769 struct x86_init_iommu iommu;
17770 struct x86_init_pci pci;
17771-};
17772+} __no_const;
17773
17774 /**
17775 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
17776@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
17777 void (*setup_percpu_clockev)(void);
17778 void (*early_percpu_clock_init)(void);
17779 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
17780-};
17781+} __no_const;
17782
17783 /**
17784 * struct x86_platform_ops - platform specific runtime functions
17785@@ -166,7 +166,7 @@ struct x86_platform_ops {
17786 void (*save_sched_clock_state)(void);
17787 void (*restore_sched_clock_state)(void);
17788 void (*apic_post_init)(void);
17789-};
17790+} __no_const;
17791
17792 struct pci_dev;
17793 struct msi_msg;
17794@@ -180,7 +180,7 @@ struct x86_msi_ops {
17795 void (*teardown_msi_irqs)(struct pci_dev *dev);
17796 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
17797 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
17798-};
17799+} __no_const;
17800
17801 struct IO_APIC_route_entry;
17802 struct io_apic_irq_attr;
17803@@ -201,7 +201,7 @@ struct x86_io_apic_ops {
17804 unsigned int destination, int vector,
17805 struct io_apic_irq_attr *attr);
17806 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
17807-};
17808+} __no_const;
17809
17810 extern struct x86_init_ops x86_init;
17811 extern struct x86_cpuinit_ops x86_cpuinit;
17812diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
17813index 0415cda..3b22adc 100644
17814--- a/arch/x86/include/asm/xsave.h
17815+++ b/arch/x86/include/asm/xsave.h
17816@@ -70,8 +70,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
17817 if (unlikely(err))
17818 return -EFAULT;
17819
17820+ pax_open_userland();
17821 __asm__ __volatile__(ASM_STAC "\n"
17822- "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
17823+ "1:"
17824+ __copyuser_seg
17825+ ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
17826 "2: " ASM_CLAC "\n"
17827 ".section .fixup,\"ax\"\n"
17828 "3: movl $-1,%[err]\n"
17829@@ -81,18 +84,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
17830 : [err] "=r" (err)
17831 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
17832 : "memory");
17833+ pax_close_userland();
17834 return err;
17835 }
17836
17837 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
17838 {
17839 int err;
17840- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
17841+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
17842 u32 lmask = mask;
17843 u32 hmask = mask >> 32;
17844
17845+ pax_open_userland();
17846 __asm__ __volatile__(ASM_STAC "\n"
17847- "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
17848+ "1:"
17849+ __copyuser_seg
17850+ ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
17851 "2: " ASM_CLAC "\n"
17852 ".section .fixup,\"ax\"\n"
17853 "3: movl $-1,%[err]\n"
17854@@ -102,6 +109,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
17855 : [err] "=r" (err)
17856 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
17857 : "memory"); /* memory required? */
17858+ pax_close_userland();
17859 return err;
17860 }
17861
17862diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
17863index bbae024..e1528f9 100644
17864--- a/arch/x86/include/uapi/asm/e820.h
17865+++ b/arch/x86/include/uapi/asm/e820.h
17866@@ -63,7 +63,7 @@ struct e820map {
17867 #define ISA_START_ADDRESS 0xa0000
17868 #define ISA_END_ADDRESS 0x100000
17869
17870-#define BIOS_BEGIN 0x000a0000
17871+#define BIOS_BEGIN 0x000c0000
17872 #define BIOS_END 0x00100000
17873
17874 #define BIOS_ROM_BASE 0xffe00000
17875diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
17876index 7bd3bd3..5dac791 100644
17877--- a/arch/x86/kernel/Makefile
17878+++ b/arch/x86/kernel/Makefile
17879@@ -22,7 +22,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
17880 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
17881 obj-$(CONFIG_IRQ_WORK) += irq_work.o
17882 obj-y += probe_roms.o
17883-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
17884+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
17885 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
17886 obj-y += syscall_$(BITS).o
17887 obj-$(CONFIG_X86_64) += vsyscall_64.o
17888diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
17889index 230c8ea..f915130 100644
17890--- a/arch/x86/kernel/acpi/boot.c
17891+++ b/arch/x86/kernel/acpi/boot.c
17892@@ -1361,7 +1361,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
17893 * If your system is blacklisted here, but you find that acpi=force
17894 * works for you, please contact linux-acpi@vger.kernel.org
17895 */
17896-static struct dmi_system_id __initdata acpi_dmi_table[] = {
17897+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
17898 /*
17899 * Boxes that need ACPI disabled
17900 */
17901@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
17902 };
17903
17904 /* second table for DMI checks that should run after early-quirks */
17905-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
17906+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
17907 /*
17908 * HP laptops which use a DSDT reporting as HP/SB400/10000,
17909 * which includes some code which overrides all temperature
17910diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
17911index ec94e11..7fbbec0 100644
17912--- a/arch/x86/kernel/acpi/sleep.c
17913+++ b/arch/x86/kernel/acpi/sleep.c
17914@@ -88,8 +88,12 @@ int acpi_suspend_lowlevel(void)
17915 #else /* CONFIG_64BIT */
17916 #ifdef CONFIG_SMP
17917 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
17918+
17919+ pax_open_kernel();
17920 early_gdt_descr.address =
17921 (unsigned long)get_cpu_gdt_table(smp_processor_id());
17922+ pax_close_kernel();
17923+
17924 initial_gs = per_cpu_offset(smp_processor_id());
17925 #endif
17926 initial_code = (unsigned long)wakeup_long64;
17927diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
17928index d1daa66..59fecba 100644
17929--- a/arch/x86/kernel/acpi/wakeup_32.S
17930+++ b/arch/x86/kernel/acpi/wakeup_32.S
17931@@ -29,13 +29,11 @@ wakeup_pmode_return:
17932 # and restore the stack ... but you need gdt for this to work
17933 movl saved_context_esp, %esp
17934
17935- movl %cs:saved_magic, %eax
17936- cmpl $0x12345678, %eax
17937+ cmpl $0x12345678, saved_magic
17938 jne bogus_magic
17939
17940 # jump to place where we left off
17941- movl saved_eip, %eax
17942- jmp *%eax
17943+ jmp *(saved_eip)
17944
17945 bogus_magic:
17946 jmp bogus_magic
17947diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
17948index c15cf9a..0e63558 100644
17949--- a/arch/x86/kernel/alternative.c
17950+++ b/arch/x86/kernel/alternative.c
17951@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
17952 */
17953 for (a = start; a < end; a++) {
17954 instr = (u8 *)&a->instr_offset + a->instr_offset;
17955+
17956+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17957+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
17958+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
17959+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
17960+#endif
17961+
17962 replacement = (u8 *)&a->repl_offset + a->repl_offset;
17963 BUG_ON(a->replacementlen > a->instrlen);
17964 BUG_ON(a->instrlen > sizeof(insnbuf));
17965@@ -299,10 +306,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
17966 for (poff = start; poff < end; poff++) {
17967 u8 *ptr = (u8 *)poff + *poff;
17968
17969+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17970+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
17971+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
17972+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
17973+#endif
17974+
17975 if (!*poff || ptr < text || ptr >= text_end)
17976 continue;
17977 /* turn DS segment override prefix into lock prefix */
17978- if (*ptr == 0x3e)
17979+ if (*ktla_ktva(ptr) == 0x3e)
17980 text_poke(ptr, ((unsigned char []){0xf0}), 1);
17981 }
17982 mutex_unlock(&text_mutex);
17983@@ -317,10 +330,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
17984 for (poff = start; poff < end; poff++) {
17985 u8 *ptr = (u8 *)poff + *poff;
17986
17987+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17988+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
17989+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
17990+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
17991+#endif
17992+
17993 if (!*poff || ptr < text || ptr >= text_end)
17994 continue;
17995 /* turn lock prefix into DS segment override prefix */
17996- if (*ptr == 0xf0)
17997+ if (*ktla_ktva(ptr) == 0xf0)
17998 text_poke(ptr, ((unsigned char []){0x3E}), 1);
17999 }
18000 mutex_unlock(&text_mutex);
18001@@ -468,7 +487,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
18002
18003 BUG_ON(p->len > MAX_PATCH_LEN);
18004 /* prep the buffer with the original instructions */
18005- memcpy(insnbuf, p->instr, p->len);
18006+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
18007 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
18008 (unsigned long)p->instr, p->len);
18009
18010@@ -515,7 +534,7 @@ void __init alternative_instructions(void)
18011 if (!uniproc_patched || num_possible_cpus() == 1)
18012 free_init_pages("SMP alternatives",
18013 (unsigned long)__smp_locks,
18014- (unsigned long)__smp_locks_end);
18015+ PAGE_ALIGN((unsigned long)__smp_locks_end));
18016 #endif
18017
18018 apply_paravirt(__parainstructions, __parainstructions_end);
18019@@ -535,13 +554,17 @@ void __init alternative_instructions(void)
18020 * instructions. And on the local CPU you need to be protected again NMI or MCE
18021 * handlers seeing an inconsistent instruction while you patch.
18022 */
18023-void *__init_or_module text_poke_early(void *addr, const void *opcode,
18024+void *__kprobes text_poke_early(void *addr, const void *opcode,
18025 size_t len)
18026 {
18027 unsigned long flags;
18028 local_irq_save(flags);
18029- memcpy(addr, opcode, len);
18030+
18031+ pax_open_kernel();
18032+ memcpy(ktla_ktva(addr), opcode, len);
18033 sync_core();
18034+ pax_close_kernel();
18035+
18036 local_irq_restore(flags);
18037 /* Could also do a CLFLUSH here to speed up CPU recovery; but
18038 that causes hangs on some VIA CPUs. */
18039@@ -563,36 +586,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
18040 */
18041 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
18042 {
18043- unsigned long flags;
18044- char *vaddr;
18045+ unsigned char *vaddr = ktla_ktva(addr);
18046 struct page *pages[2];
18047- int i;
18048+ size_t i;
18049
18050 if (!core_kernel_text((unsigned long)addr)) {
18051- pages[0] = vmalloc_to_page(addr);
18052- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
18053+ pages[0] = vmalloc_to_page(vaddr);
18054+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
18055 } else {
18056- pages[0] = virt_to_page(addr);
18057+ pages[0] = virt_to_page(vaddr);
18058 WARN_ON(!PageReserved(pages[0]));
18059- pages[1] = virt_to_page(addr + PAGE_SIZE);
18060+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
18061 }
18062 BUG_ON(!pages[0]);
18063- local_irq_save(flags);
18064- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
18065- if (pages[1])
18066- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
18067- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
18068- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
18069- clear_fixmap(FIX_TEXT_POKE0);
18070- if (pages[1])
18071- clear_fixmap(FIX_TEXT_POKE1);
18072- local_flush_tlb();
18073- sync_core();
18074- /* Could also do a CLFLUSH here to speed up CPU recovery; but
18075- that causes hangs on some VIA CPUs. */
18076+ text_poke_early(addr, opcode, len);
18077 for (i = 0; i < len; i++)
18078- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
18079- local_irq_restore(flags);
18080+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
18081 return addr;
18082 }
18083
18084diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
18085index 904611b..004dde6 100644
18086--- a/arch/x86/kernel/apic/apic.c
18087+++ b/arch/x86/kernel/apic/apic.c
18088@@ -189,7 +189,7 @@ int first_system_vector = 0xfe;
18089 /*
18090 * Debug level, exported for io_apic.c
18091 */
18092-unsigned int apic_verbosity;
18093+int apic_verbosity;
18094
18095 int pic_mode;
18096
18097@@ -1955,7 +1955,7 @@ void smp_error_interrupt(struct pt_regs *regs)
18098 apic_write(APIC_ESR, 0);
18099 v1 = apic_read(APIC_ESR);
18100 ack_APIC_irq();
18101- atomic_inc(&irq_err_count);
18102+ atomic_inc_unchecked(&irq_err_count);
18103
18104 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
18105 smp_processor_id(), v0 , v1);
18106diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
18107index 00c77cf..2dc6a2d 100644
18108--- a/arch/x86/kernel/apic/apic_flat_64.c
18109+++ b/arch/x86/kernel/apic/apic_flat_64.c
18110@@ -157,7 +157,7 @@ static int flat_probe(void)
18111 return 1;
18112 }
18113
18114-static struct apic apic_flat = {
18115+static struct apic apic_flat __read_only = {
18116 .name = "flat",
18117 .probe = flat_probe,
18118 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
18119@@ -271,7 +271,7 @@ static int physflat_probe(void)
18120 return 0;
18121 }
18122
18123-static struct apic apic_physflat = {
18124+static struct apic apic_physflat __read_only = {
18125
18126 .name = "physical flat",
18127 .probe = physflat_probe,
18128diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
18129index e145f28..2752888 100644
18130--- a/arch/x86/kernel/apic/apic_noop.c
18131+++ b/arch/x86/kernel/apic/apic_noop.c
18132@@ -119,7 +119,7 @@ static void noop_apic_write(u32 reg, u32 v)
18133 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
18134 }
18135
18136-struct apic apic_noop = {
18137+struct apic apic_noop __read_only = {
18138 .name = "noop",
18139 .probe = noop_probe,
18140 .acpi_madt_oem_check = NULL,
18141diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
18142index d50e364..543bee3 100644
18143--- a/arch/x86/kernel/apic/bigsmp_32.c
18144+++ b/arch/x86/kernel/apic/bigsmp_32.c
18145@@ -152,7 +152,7 @@ static int probe_bigsmp(void)
18146 return dmi_bigsmp;
18147 }
18148
18149-static struct apic apic_bigsmp = {
18150+static struct apic apic_bigsmp __read_only = {
18151
18152 .name = "bigsmp",
18153 .probe = probe_bigsmp,
18154diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
18155index 0874799..a7a7892 100644
18156--- a/arch/x86/kernel/apic/es7000_32.c
18157+++ b/arch/x86/kernel/apic/es7000_32.c
18158@@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
18159 return ret && es7000_apic_is_cluster();
18160 }
18161
18162-/* We've been warned by a false positive warning.Use __refdata to keep calm. */
18163-static struct apic __refdata apic_es7000_cluster = {
18164+static struct apic apic_es7000_cluster __read_only = {
18165
18166 .name = "es7000",
18167 .probe = probe_es7000,
18168@@ -675,7 +674,7 @@ static struct apic __refdata apic_es7000_cluster = {
18169 .x86_32_early_logical_apicid = es7000_early_logical_apicid,
18170 };
18171
18172-static struct apic __refdata apic_es7000 = {
18173+static struct apic apic_es7000 __read_only = {
18174
18175 .name = "es7000",
18176 .probe = probe_es7000,
18177diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
18178index 9ed796c..e930fe4 100644
18179--- a/arch/x86/kernel/apic/io_apic.c
18180+++ b/arch/x86/kernel/apic/io_apic.c
18181@@ -1060,7 +1060,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
18182 }
18183 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
18184
18185-void lock_vector_lock(void)
18186+void lock_vector_lock(void) __acquires(vector_lock)
18187 {
18188 /* Used to the online set of cpus does not change
18189 * during assign_irq_vector.
18190@@ -1068,7 +1068,7 @@ void lock_vector_lock(void)
18191 raw_spin_lock(&vector_lock);
18192 }
18193
18194-void unlock_vector_lock(void)
18195+void unlock_vector_lock(void) __releases(vector_lock)
18196 {
18197 raw_spin_unlock(&vector_lock);
18198 }
18199@@ -2362,7 +2362,7 @@ static void ack_apic_edge(struct irq_data *data)
18200 ack_APIC_irq();
18201 }
18202
18203-atomic_t irq_mis_count;
18204+atomic_unchecked_t irq_mis_count;
18205
18206 #ifdef CONFIG_GENERIC_PENDING_IRQ
18207 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
18208@@ -2503,7 +2503,7 @@ static void ack_apic_level(struct irq_data *data)
18209 * at the cpu.
18210 */
18211 if (!(v & (1 << (i & 0x1f)))) {
18212- atomic_inc(&irq_mis_count);
18213+ atomic_inc_unchecked(&irq_mis_count);
18214
18215 eoi_ioapic_irq(irq, cfg);
18216 }
18217diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
18218index d661ee9..791fd33 100644
18219--- a/arch/x86/kernel/apic/numaq_32.c
18220+++ b/arch/x86/kernel/apic/numaq_32.c
18221@@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
18222 (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
18223 }
18224
18225-/* Use __refdata to keep false positive warning calm. */
18226-static struct apic __refdata apic_numaq = {
18227+static struct apic apic_numaq __read_only = {
18228
18229 .name = "NUMAQ",
18230 .probe = probe_numaq,
18231diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
18232index eb35ef9..f184a21 100644
18233--- a/arch/x86/kernel/apic/probe_32.c
18234+++ b/arch/x86/kernel/apic/probe_32.c
18235@@ -72,7 +72,7 @@ static int probe_default(void)
18236 return 1;
18237 }
18238
18239-static struct apic apic_default = {
18240+static struct apic apic_default __read_only = {
18241
18242 .name = "default",
18243 .probe = probe_default,
18244diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
18245index 77c95c0..434f8a4 100644
18246--- a/arch/x86/kernel/apic/summit_32.c
18247+++ b/arch/x86/kernel/apic/summit_32.c
18248@@ -486,7 +486,7 @@ void setup_summit(void)
18249 }
18250 #endif
18251
18252-static struct apic apic_summit = {
18253+static struct apic apic_summit __read_only = {
18254
18255 .name = "summit",
18256 .probe = probe_summit,
18257diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
18258index c88baa4..757aee1 100644
18259--- a/arch/x86/kernel/apic/x2apic_cluster.c
18260+++ b/arch/x86/kernel/apic/x2apic_cluster.c
18261@@ -183,7 +183,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
18262 return notifier_from_errno(err);
18263 }
18264
18265-static struct notifier_block __refdata x2apic_cpu_notifier = {
18266+static struct notifier_block x2apic_cpu_notifier = {
18267 .notifier_call = update_clusterinfo,
18268 };
18269
18270@@ -235,7 +235,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
18271 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
18272 }
18273
18274-static struct apic apic_x2apic_cluster = {
18275+static struct apic apic_x2apic_cluster __read_only = {
18276
18277 .name = "cluster x2apic",
18278 .probe = x2apic_cluster_probe,
18279diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
18280index 562a76d..a003c0f 100644
18281--- a/arch/x86/kernel/apic/x2apic_phys.c
18282+++ b/arch/x86/kernel/apic/x2apic_phys.c
18283@@ -89,7 +89,7 @@ static int x2apic_phys_probe(void)
18284 return apic == &apic_x2apic_phys;
18285 }
18286
18287-static struct apic apic_x2apic_phys = {
18288+static struct apic apic_x2apic_phys __read_only = {
18289
18290 .name = "physical x2apic",
18291 .probe = x2apic_phys_probe,
18292diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
18293index 794f6eb..67e1db2 100644
18294--- a/arch/x86/kernel/apic/x2apic_uv_x.c
18295+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
18296@@ -342,7 +342,7 @@ static int uv_probe(void)
18297 return apic == &apic_x2apic_uv_x;
18298 }
18299
18300-static struct apic __refdata apic_x2apic_uv_x = {
18301+static struct apic apic_x2apic_uv_x __read_only = {
18302
18303 .name = "UV large system",
18304 .probe = uv_probe,
18305diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
18306index 53a4e27..038760a 100644
18307--- a/arch/x86/kernel/apm_32.c
18308+++ b/arch/x86/kernel/apm_32.c
18309@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
18310 * This is for buggy BIOS's that refer to (real mode) segment 0x40
18311 * even though they are called in protected mode.
18312 */
18313-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
18314+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
18315 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
18316
18317 static const char driver_version[] = "1.16ac"; /* no spaces */
18318@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
18319 BUG_ON(cpu != 0);
18320 gdt = get_cpu_gdt_table(cpu);
18321 save_desc_40 = gdt[0x40 / 8];
18322+
18323+ pax_open_kernel();
18324 gdt[0x40 / 8] = bad_bios_desc;
18325+ pax_close_kernel();
18326
18327 apm_irq_save(flags);
18328 APM_DO_SAVE_SEGS;
18329@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
18330 &call->esi);
18331 APM_DO_RESTORE_SEGS;
18332 apm_irq_restore(flags);
18333+
18334+ pax_open_kernel();
18335 gdt[0x40 / 8] = save_desc_40;
18336+ pax_close_kernel();
18337+
18338 put_cpu();
18339
18340 return call->eax & 0xff;
18341@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
18342 BUG_ON(cpu != 0);
18343 gdt = get_cpu_gdt_table(cpu);
18344 save_desc_40 = gdt[0x40 / 8];
18345+
18346+ pax_open_kernel();
18347 gdt[0x40 / 8] = bad_bios_desc;
18348+ pax_close_kernel();
18349
18350 apm_irq_save(flags);
18351 APM_DO_SAVE_SEGS;
18352@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
18353 &call->eax);
18354 APM_DO_RESTORE_SEGS;
18355 apm_irq_restore(flags);
18356+
18357+ pax_open_kernel();
18358 gdt[0x40 / 8] = save_desc_40;
18359+ pax_close_kernel();
18360+
18361 put_cpu();
18362 return error;
18363 }
18364@@ -2362,12 +2376,15 @@ static int __init apm_init(void)
18365 * code to that CPU.
18366 */
18367 gdt = get_cpu_gdt_table(0);
18368+
18369+ pax_open_kernel();
18370 set_desc_base(&gdt[APM_CS >> 3],
18371 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
18372 set_desc_base(&gdt[APM_CS_16 >> 3],
18373 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
18374 set_desc_base(&gdt[APM_DS >> 3],
18375 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
18376+ pax_close_kernel();
18377
18378 proc_create("apm", 0, NULL, &apm_file_ops);
18379
18380diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
18381index 2861082..6d4718e 100644
18382--- a/arch/x86/kernel/asm-offsets.c
18383+++ b/arch/x86/kernel/asm-offsets.c
18384@@ -33,6 +33,8 @@ void common(void) {
18385 OFFSET(TI_status, thread_info, status);
18386 OFFSET(TI_addr_limit, thread_info, addr_limit);
18387 OFFSET(TI_preempt_count, thread_info, preempt_count);
18388+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
18389+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
18390
18391 BLANK();
18392 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
18393@@ -53,8 +55,26 @@ void common(void) {
18394 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
18395 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
18396 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
18397+
18398+#ifdef CONFIG_PAX_KERNEXEC
18399+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
18400 #endif
18401
18402+#ifdef CONFIG_PAX_MEMORY_UDEREF
18403+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
18404+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
18405+#ifdef CONFIG_X86_64
18406+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
18407+#endif
18408+#endif
18409+
18410+#endif
18411+
18412+ BLANK();
18413+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
18414+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
18415+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
18416+
18417 #ifdef CONFIG_XEN
18418 BLANK();
18419 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
18420diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
18421index e7c798b..2b2019b 100644
18422--- a/arch/x86/kernel/asm-offsets_64.c
18423+++ b/arch/x86/kernel/asm-offsets_64.c
18424@@ -77,6 +77,7 @@ int main(void)
18425 BLANK();
18426 #undef ENTRY
18427
18428+ DEFINE(TSS_size, sizeof(struct tss_struct));
18429 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
18430 BLANK();
18431
18432diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
18433index b0684e4..22ccfd7 100644
18434--- a/arch/x86/kernel/cpu/Makefile
18435+++ b/arch/x86/kernel/cpu/Makefile
18436@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
18437 CFLAGS_REMOVE_perf_event.o = -pg
18438 endif
18439
18440-# Make sure load_percpu_segment has no stackprotector
18441-nostackp := $(call cc-option, -fno-stack-protector)
18442-CFLAGS_common.o := $(nostackp)
18443-
18444 obj-y := intel_cacheinfo.o scattered.o topology.o
18445 obj-y += proc.o capflags.o powerflags.o common.o
18446 obj-y += rdrand.o
18447diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
18448index 5013a48..0782c53 100644
18449--- a/arch/x86/kernel/cpu/amd.c
18450+++ b/arch/x86/kernel/cpu/amd.c
18451@@ -744,7 +744,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
18452 unsigned int size)
18453 {
18454 /* AMD errata T13 (order #21922) */
18455- if ((c->x86 == 6)) {
18456+ if (c->x86 == 6) {
18457 /* Duron Rev A0 */
18458 if (c->x86_model == 3 && c->x86_mask == 0)
18459 size = 64;
18460diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
18461index 22018f7..df77e23 100644
18462--- a/arch/x86/kernel/cpu/common.c
18463+++ b/arch/x86/kernel/cpu/common.c
18464@@ -88,60 +88,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
18465
18466 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
18467
18468-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
18469-#ifdef CONFIG_X86_64
18470- /*
18471- * We need valid kernel segments for data and code in long mode too
18472- * IRET will check the segment types kkeil 2000/10/28
18473- * Also sysret mandates a special GDT layout
18474- *
18475- * TLS descriptors are currently at a different place compared to i386.
18476- * Hopefully nobody expects them at a fixed place (Wine?)
18477- */
18478- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
18479- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
18480- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
18481- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
18482- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
18483- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
18484-#else
18485- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
18486- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
18487- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
18488- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
18489- /*
18490- * Segments used for calling PnP BIOS have byte granularity.
18491- * They code segments and data segments have fixed 64k limits,
18492- * the transfer segment sizes are set at run time.
18493- */
18494- /* 32-bit code */
18495- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
18496- /* 16-bit code */
18497- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
18498- /* 16-bit data */
18499- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
18500- /* 16-bit data */
18501- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
18502- /* 16-bit data */
18503- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
18504- /*
18505- * The APM segments have byte granularity and their bases
18506- * are set at run time. All have 64k limits.
18507- */
18508- /* 32-bit code */
18509- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
18510- /* 16-bit code */
18511- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
18512- /* data */
18513- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
18514-
18515- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
18516- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
18517- GDT_STACK_CANARY_INIT
18518-#endif
18519-} };
18520-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
18521-
18522 static int __init x86_xsave_setup(char *s)
18523 {
18524 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
18525@@ -288,6 +234,57 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
18526 set_in_cr4(X86_CR4_SMAP);
18527 }
18528
18529+#ifdef CONFIG_X86_64
18530+static __init int setup_disable_pcid(char *arg)
18531+{
18532+ setup_clear_cpu_cap(X86_FEATURE_PCID);
18533+
18534+#ifdef CONFIG_PAX_MEMORY_UDEREF
18535+ if (clone_pgd_mask != ~(pgdval_t)0UL)
18536+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
18537+#endif
18538+
18539+ return 1;
18540+}
18541+__setup("nopcid", setup_disable_pcid);
18542+
18543+static void setup_pcid(struct cpuinfo_x86 *c)
18544+{
18545+ if (!cpu_has(c, X86_FEATURE_PCID)) {
18546+
18547+#ifdef CONFIG_PAX_MEMORY_UDEREF
18548+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
18549+ pax_open_kernel();
18550+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
18551+ pax_close_kernel();
18552+ printk("PAX: slow and weak UDEREF enabled\n");
18553+ } else
18554+ printk("PAX: UDEREF disabled\n");
18555+#endif
18556+
18557+ return;
18558+ }
18559+
18560+ printk("PAX: PCID detected\n");
18561+ set_in_cr4(X86_CR4_PCIDE);
18562+
18563+#ifdef CONFIG_PAX_MEMORY_UDEREF
18564+ pax_open_kernel();
18565+ clone_pgd_mask = ~(pgdval_t)0UL;
18566+ pax_close_kernel();
18567+ if (pax_user_shadow_base)
18568+ printk("PAX: weak UDEREF enabled\n");
18569+ else {
18570+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
18571+ printk("PAX: strong UDEREF enabled\n");
18572+ }
18573+#endif
18574+
18575+ if (cpu_has(c, X86_FEATURE_INVPCID))
18576+ printk("PAX: INVPCID detected\n");
18577+}
18578+#endif
18579+
18580 /*
18581 * Some CPU features depend on higher CPUID levels, which may not always
18582 * be available due to CPUID level capping or broken virtualization
18583@@ -386,7 +383,7 @@ void switch_to_new_gdt(int cpu)
18584 {
18585 struct desc_ptr gdt_descr;
18586
18587- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
18588+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
18589 gdt_descr.size = GDT_SIZE - 1;
18590 load_gdt(&gdt_descr);
18591 /* Reload the per-cpu base */
18592@@ -874,6 +871,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
18593 setup_smep(c);
18594 setup_smap(c);
18595
18596+#ifdef CONFIG_X86_64
18597+ setup_pcid(c);
18598+#endif
18599+
18600 /*
18601 * The vendor-specific functions might have changed features.
18602 * Now we do "generic changes."
18603@@ -882,6 +883,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
18604 /* Filter out anything that depends on CPUID levels we don't have */
18605 filter_cpuid_features(c, true);
18606
18607+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18608+ setup_clear_cpu_cap(X86_FEATURE_SEP);
18609+#endif
18610+
18611 /* If the model name is still unset, do table lookup. */
18612 if (!c->x86_model_id[0]) {
18613 const char *p;
18614@@ -1069,10 +1074,12 @@ static __init int setup_disablecpuid(char *arg)
18615 }
18616 __setup("clearcpuid=", setup_disablecpuid);
18617
18618+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
18619+EXPORT_PER_CPU_SYMBOL(current_tinfo);
18620+
18621 #ifdef CONFIG_X86_64
18622 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
18623-struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
18624- (unsigned long) nmi_idt_table };
18625+struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table };
18626
18627 DEFINE_PER_CPU_FIRST(union irq_stack_union,
18628 irq_stack_union) __aligned(PAGE_SIZE);
18629@@ -1086,7 +1093,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
18630 EXPORT_PER_CPU_SYMBOL(current_task);
18631
18632 DEFINE_PER_CPU(unsigned long, kernel_stack) =
18633- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
18634+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
18635 EXPORT_PER_CPU_SYMBOL(kernel_stack);
18636
18637 DEFINE_PER_CPU(char *, irq_stack_ptr) =
18638@@ -1231,7 +1238,7 @@ void __cpuinit cpu_init(void)
18639 load_ucode_ap();
18640
18641 cpu = stack_smp_processor_id();
18642- t = &per_cpu(init_tss, cpu);
18643+ t = init_tss + cpu;
18644 oist = &per_cpu(orig_ist, cpu);
18645
18646 #ifdef CONFIG_NUMA
18647@@ -1257,7 +1264,7 @@ void __cpuinit cpu_init(void)
18648 switch_to_new_gdt(cpu);
18649 loadsegment(fs, 0);
18650
18651- load_idt((const struct desc_ptr *)&idt_descr);
18652+ load_idt(&idt_descr);
18653
18654 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
18655 syscall_init();
18656@@ -1266,7 +1273,6 @@ void __cpuinit cpu_init(void)
18657 wrmsrl(MSR_KERNEL_GS_BASE, 0);
18658 barrier();
18659
18660- x86_configure_nx();
18661 enable_x2apic();
18662
18663 /*
18664@@ -1318,7 +1324,7 @@ void __cpuinit cpu_init(void)
18665 {
18666 int cpu = smp_processor_id();
18667 struct task_struct *curr = current;
18668- struct tss_struct *t = &per_cpu(init_tss, cpu);
18669+ struct tss_struct *t = init_tss + cpu;
18670 struct thread_struct *thread = &curr->thread;
18671
18672 show_ucode_info_early();
18673diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
18674index 7c6f7d5..8cac382 100644
18675--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
18676+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
18677@@ -1017,6 +1017,22 @@ static struct attribute *default_attrs[] = {
18678 };
18679
18680 #ifdef CONFIG_AMD_NB
18681+static struct attribute *default_attrs_amd_nb[] = {
18682+ &type.attr,
18683+ &level.attr,
18684+ &coherency_line_size.attr,
18685+ &physical_line_partition.attr,
18686+ &ways_of_associativity.attr,
18687+ &number_of_sets.attr,
18688+ &size.attr,
18689+ &shared_cpu_map.attr,
18690+ &shared_cpu_list.attr,
18691+ NULL,
18692+ NULL,
18693+ NULL,
18694+ NULL
18695+};
18696+
18697 static struct attribute ** __cpuinit amd_l3_attrs(void)
18698 {
18699 static struct attribute **attrs;
18700@@ -1027,18 +1043,7 @@ static struct attribute ** __cpuinit amd_l3_attrs(void)
18701
18702 n = ARRAY_SIZE(default_attrs);
18703
18704- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
18705- n += 2;
18706-
18707- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
18708- n += 1;
18709-
18710- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
18711- if (attrs == NULL)
18712- return attrs = default_attrs;
18713-
18714- for (n = 0; default_attrs[n]; n++)
18715- attrs[n] = default_attrs[n];
18716+ attrs = default_attrs_amd_nb;
18717
18718 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
18719 attrs[n++] = &cache_disable_0.attr;
18720@@ -1089,6 +1094,13 @@ static struct kobj_type ktype_cache = {
18721 .default_attrs = default_attrs,
18722 };
18723
18724+#ifdef CONFIG_AMD_NB
18725+static struct kobj_type ktype_cache_amd_nb = {
18726+ .sysfs_ops = &sysfs_ops,
18727+ .default_attrs = default_attrs_amd_nb,
18728+};
18729+#endif
18730+
18731 static struct kobj_type ktype_percpu_entry = {
18732 .sysfs_ops = &sysfs_ops,
18733 };
18734@@ -1154,20 +1166,26 @@ static int __cpuinit cache_add_dev(struct device *dev)
18735 return retval;
18736 }
18737
18738+#ifdef CONFIG_AMD_NB
18739+ amd_l3_attrs();
18740+#endif
18741+
18742 for (i = 0; i < num_cache_leaves; i++) {
18743+ struct kobj_type *ktype;
18744+
18745 this_object = INDEX_KOBJECT_PTR(cpu, i);
18746 this_object->cpu = cpu;
18747 this_object->index = i;
18748
18749 this_leaf = CPUID4_INFO_IDX(cpu, i);
18750
18751- ktype_cache.default_attrs = default_attrs;
18752+ ktype = &ktype_cache;
18753 #ifdef CONFIG_AMD_NB
18754 if (this_leaf->base.nb)
18755- ktype_cache.default_attrs = amd_l3_attrs();
18756+ ktype = &ktype_cache_amd_nb;
18757 #endif
18758 retval = kobject_init_and_add(&(this_object->kobj),
18759- &ktype_cache,
18760+ ktype,
18761 per_cpu(ici_cache_kobject, cpu),
18762 "index%1lu", i);
18763 if (unlikely(retval)) {
18764@@ -1222,7 +1240,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
18765 return NOTIFY_OK;
18766 }
18767
18768-static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
18769+static struct notifier_block cacheinfo_cpu_notifier = {
18770 .notifier_call = cacheinfo_cpu_callback,
18771 };
18772
18773diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
18774index 9239504..b2471ce 100644
18775--- a/arch/x86/kernel/cpu/mcheck/mce.c
18776+++ b/arch/x86/kernel/cpu/mcheck/mce.c
18777@@ -45,6 +45,7 @@
18778 #include <asm/processor.h>
18779 #include <asm/mce.h>
18780 #include <asm/msr.h>
18781+#include <asm/local.h>
18782
18783 #include "mce-internal.h"
18784
18785@@ -246,7 +247,7 @@ static void print_mce(struct mce *m)
18786 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
18787 m->cs, m->ip);
18788
18789- if (m->cs == __KERNEL_CS)
18790+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
18791 print_symbol("{%s}", m->ip);
18792 pr_cont("\n");
18793 }
18794@@ -279,10 +280,10 @@ static void print_mce(struct mce *m)
18795
18796 #define PANIC_TIMEOUT 5 /* 5 seconds */
18797
18798-static atomic_t mce_paniced;
18799+static atomic_unchecked_t mce_paniced;
18800
18801 static int fake_panic;
18802-static atomic_t mce_fake_paniced;
18803+static atomic_unchecked_t mce_fake_paniced;
18804
18805 /* Panic in progress. Enable interrupts and wait for final IPI */
18806 static void wait_for_panic(void)
18807@@ -306,7 +307,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
18808 /*
18809 * Make sure only one CPU runs in machine check panic
18810 */
18811- if (atomic_inc_return(&mce_paniced) > 1)
18812+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
18813 wait_for_panic();
18814 barrier();
18815
18816@@ -314,7 +315,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
18817 console_verbose();
18818 } else {
18819 /* Don't log too much for fake panic */
18820- if (atomic_inc_return(&mce_fake_paniced) > 1)
18821+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
18822 return;
18823 }
18824 /* First print corrected ones that are still unlogged */
18825@@ -353,7 +354,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
18826 if (!fake_panic) {
18827 if (panic_timeout == 0)
18828 panic_timeout = mca_cfg.panic_timeout;
18829- panic(msg);
18830+ panic("%s", msg);
18831 } else
18832 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
18833 }
18834@@ -683,7 +684,7 @@ static int mce_timed_out(u64 *t)
18835 * might have been modified by someone else.
18836 */
18837 rmb();
18838- if (atomic_read(&mce_paniced))
18839+ if (atomic_read_unchecked(&mce_paniced))
18840 wait_for_panic();
18841 if (!mca_cfg.monarch_timeout)
18842 goto out;
18843@@ -1654,7 +1655,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
18844 }
18845
18846 /* Call the installed machine check handler for this CPU setup. */
18847-void (*machine_check_vector)(struct pt_regs *, long error_code) =
18848+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
18849 unexpected_machine_check;
18850
18851 /*
18852@@ -1677,7 +1678,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
18853 return;
18854 }
18855
18856+ pax_open_kernel();
18857 machine_check_vector = do_machine_check;
18858+ pax_close_kernel();
18859
18860 __mcheck_cpu_init_generic();
18861 __mcheck_cpu_init_vendor(c);
18862@@ -1691,7 +1694,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
18863 */
18864
18865 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
18866-static int mce_chrdev_open_count; /* #times opened */
18867+static local_t mce_chrdev_open_count; /* #times opened */
18868 static int mce_chrdev_open_exclu; /* already open exclusive? */
18869
18870 static int mce_chrdev_open(struct inode *inode, struct file *file)
18871@@ -1699,7 +1702,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
18872 spin_lock(&mce_chrdev_state_lock);
18873
18874 if (mce_chrdev_open_exclu ||
18875- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
18876+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
18877 spin_unlock(&mce_chrdev_state_lock);
18878
18879 return -EBUSY;
18880@@ -1707,7 +1710,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
18881
18882 if (file->f_flags & O_EXCL)
18883 mce_chrdev_open_exclu = 1;
18884- mce_chrdev_open_count++;
18885+ local_inc(&mce_chrdev_open_count);
18886
18887 spin_unlock(&mce_chrdev_state_lock);
18888
18889@@ -1718,7 +1721,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
18890 {
18891 spin_lock(&mce_chrdev_state_lock);
18892
18893- mce_chrdev_open_count--;
18894+ local_dec(&mce_chrdev_open_count);
18895 mce_chrdev_open_exclu = 0;
18896
18897 spin_unlock(&mce_chrdev_state_lock);
18898@@ -2364,7 +2367,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
18899 return NOTIFY_OK;
18900 }
18901
18902-static struct notifier_block mce_cpu_notifier __cpuinitdata = {
18903+static struct notifier_block mce_cpu_notifier = {
18904 .notifier_call = mce_cpu_callback,
18905 };
18906
18907@@ -2374,7 +2377,7 @@ static __init void mce_init_banks(void)
18908
18909 for (i = 0; i < mca_cfg.banks; i++) {
18910 struct mce_bank *b = &mce_banks[i];
18911- struct device_attribute *a = &b->attr;
18912+ device_attribute_no_const *a = &b->attr;
18913
18914 sysfs_attr_init(&a->attr);
18915 a->attr.name = b->attrname;
18916@@ -2442,7 +2445,7 @@ struct dentry *mce_get_debugfs_dir(void)
18917 static void mce_reset(void)
18918 {
18919 cpu_missing = 0;
18920- atomic_set(&mce_fake_paniced, 0);
18921+ atomic_set_unchecked(&mce_fake_paniced, 0);
18922 atomic_set(&mce_executing, 0);
18923 atomic_set(&mce_callin, 0);
18924 atomic_set(&global_nwo, 0);
18925diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
18926index 1c044b1..37a2a43 100644
18927--- a/arch/x86/kernel/cpu/mcheck/p5.c
18928+++ b/arch/x86/kernel/cpu/mcheck/p5.c
18929@@ -11,6 +11,7 @@
18930 #include <asm/processor.h>
18931 #include <asm/mce.h>
18932 #include <asm/msr.h>
18933+#include <asm/pgtable.h>
18934
18935 /* By default disabled */
18936 int mce_p5_enabled __read_mostly;
18937@@ -49,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
18938 if (!cpu_has(c, X86_FEATURE_MCE))
18939 return;
18940
18941+ pax_open_kernel();
18942 machine_check_vector = pentium_machine_check;
18943+ pax_close_kernel();
18944 /* Make sure the vector pointer is visible before we enable MCEs: */
18945 wmb();
18946
18947diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
18948index 47a1870..8c019a7 100644
18949--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
18950+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
18951@@ -288,7 +288,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
18952 return notifier_from_errno(err);
18953 }
18954
18955-static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =
18956+static struct notifier_block thermal_throttle_cpu_notifier =
18957 {
18958 .notifier_call = thermal_throttle_cpu_callback,
18959 };
18960diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
18961index e9a701a..35317d6 100644
18962--- a/arch/x86/kernel/cpu/mcheck/winchip.c
18963+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
18964@@ -10,6 +10,7 @@
18965 #include <asm/processor.h>
18966 #include <asm/mce.h>
18967 #include <asm/msr.h>
18968+#include <asm/pgtable.h>
18969
18970 /* Machine check handler for WinChip C6: */
18971 static void winchip_machine_check(struct pt_regs *regs, long error_code)
18972@@ -23,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
18973 {
18974 u32 lo, hi;
18975
18976+ pax_open_kernel();
18977 machine_check_vector = winchip_machine_check;
18978+ pax_close_kernel();
18979 /* Make sure the vector pointer is visible before we enable MCEs: */
18980 wmb();
18981
18982diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
18983index ca22b73..9987afe 100644
18984--- a/arch/x86/kernel/cpu/mtrr/main.c
18985+++ b/arch/x86/kernel/cpu/mtrr/main.c
18986@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
18987 u64 size_or_mask, size_and_mask;
18988 static bool mtrr_aps_delayed_init;
18989
18990-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
18991+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
18992
18993 const struct mtrr_ops *mtrr_if;
18994
18995diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
18996index df5e41f..816c719 100644
18997--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
18998+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
18999@@ -25,7 +25,7 @@ struct mtrr_ops {
19000 int (*validate_add_page)(unsigned long base, unsigned long size,
19001 unsigned int type);
19002 int (*have_wrcomb)(void);
19003-};
19004+} __do_const;
19005
19006 extern int generic_get_free_region(unsigned long base, unsigned long size,
19007 int replace_reg);
19008diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
19009index 1025f3c..824f677 100644
19010--- a/arch/x86/kernel/cpu/perf_event.c
19011+++ b/arch/x86/kernel/cpu/perf_event.c
19012@@ -1311,7 +1311,7 @@ static void __init pmu_check_apic(void)
19013 pr_info("no hardware sampling interrupt available.\n");
19014 }
19015
19016-static struct attribute_group x86_pmu_format_group = {
19017+static attribute_group_no_const x86_pmu_format_group = {
19018 .name = "format",
19019 .attrs = NULL,
19020 };
19021@@ -1410,7 +1410,7 @@ static struct attribute *events_attr[] = {
19022 NULL,
19023 };
19024
19025-static struct attribute_group x86_pmu_events_group = {
19026+static attribute_group_no_const x86_pmu_events_group = {
19027 .name = "events",
19028 .attrs = events_attr,
19029 };
19030@@ -1920,7 +1920,7 @@ static unsigned long get_segment_base(unsigned int segment)
19031 if (idx > GDT_ENTRIES)
19032 return 0;
19033
19034- desc = __this_cpu_ptr(&gdt_page.gdt[0]);
19035+ desc = get_cpu_gdt_table(smp_processor_id());
19036 }
19037
19038 return get_desc_base(desc + idx);
19039@@ -2010,7 +2010,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
19040 break;
19041
19042 perf_callchain_store(entry, frame.return_address);
19043- fp = frame.next_frame;
19044+ fp = (const void __force_user *)frame.next_frame;
19045 }
19046 }
19047
19048diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
19049index a9e2207..d70c83a 100644
19050--- a/arch/x86/kernel/cpu/perf_event_intel.c
19051+++ b/arch/x86/kernel/cpu/perf_event_intel.c
19052@@ -2022,10 +2022,10 @@ __init int intel_pmu_init(void)
19053 * v2 and above have a perf capabilities MSR
19054 */
19055 if (version > 1) {
19056- u64 capabilities;
19057+ u64 capabilities = x86_pmu.intel_cap.capabilities;
19058
19059- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
19060- x86_pmu.intel_cap.capabilities = capabilities;
19061+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
19062+ x86_pmu.intel_cap.capabilities = capabilities;
19063 }
19064
19065 intel_ds_init();
19066diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
19067index 8aac56b..588fb13 100644
19068--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
19069+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
19070@@ -3093,7 +3093,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
19071 static int __init uncore_type_init(struct intel_uncore_type *type)
19072 {
19073 struct intel_uncore_pmu *pmus;
19074- struct attribute_group *attr_group;
19075+ attribute_group_no_const *attr_group;
19076 struct attribute **attrs;
19077 int i, j;
19078
19079@@ -3518,7 +3518,7 @@ static int
19080 return NOTIFY_OK;
19081 }
19082
19083-static struct notifier_block uncore_cpu_nb __cpuinitdata = {
19084+static struct notifier_block uncore_cpu_nb = {
19085 .notifier_call = uncore_cpu_notifier,
19086 /*
19087 * to migrate uncore events, our notifier should be executed
19088diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
19089index f952891..4722ad4 100644
19090--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
19091+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
19092@@ -488,7 +488,7 @@ struct intel_uncore_box {
19093 struct uncore_event_desc {
19094 struct kobj_attribute attr;
19095 const char *config;
19096-};
19097+} __do_const;
19098
19099 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
19100 { \
19101diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
19102index 1e4dbcf..b9a34c2 100644
19103--- a/arch/x86/kernel/cpuid.c
19104+++ b/arch/x86/kernel/cpuid.c
19105@@ -171,7 +171,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
19106 return notifier_from_errno(err);
19107 }
19108
19109-static struct notifier_block __refdata cpuid_class_cpu_notifier =
19110+static struct notifier_block cpuid_class_cpu_notifier =
19111 {
19112 .notifier_call = cpuid_class_cpu_callback,
19113 };
19114diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
19115index 74467fe..18793d5 100644
19116--- a/arch/x86/kernel/crash.c
19117+++ b/arch/x86/kernel/crash.c
19118@@ -58,10 +58,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
19119 {
19120 #ifdef CONFIG_X86_32
19121 struct pt_regs fixed_regs;
19122-#endif
19123
19124-#ifdef CONFIG_X86_32
19125- if (!user_mode_vm(regs)) {
19126+ if (!user_mode(regs)) {
19127 crash_fixup_ss_esp(&fixed_regs, regs);
19128 regs = &fixed_regs;
19129 }
19130diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
19131index afa64ad..dce67dd 100644
19132--- a/arch/x86/kernel/crash_dump_64.c
19133+++ b/arch/x86/kernel/crash_dump_64.c
19134@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
19135 return -ENOMEM;
19136
19137 if (userbuf) {
19138- if (copy_to_user(buf, vaddr + offset, csize)) {
19139+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
19140 iounmap(vaddr);
19141 return -EFAULT;
19142 }
19143diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
19144index 155a13f..1672b9b 100644
19145--- a/arch/x86/kernel/doublefault_32.c
19146+++ b/arch/x86/kernel/doublefault_32.c
19147@@ -11,7 +11,7 @@
19148
19149 #define DOUBLEFAULT_STACKSIZE (1024)
19150 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
19151-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
19152+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
19153
19154 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
19155
19156@@ -21,7 +21,7 @@ static void doublefault_fn(void)
19157 unsigned long gdt, tss;
19158
19159 native_store_gdt(&gdt_desc);
19160- gdt = gdt_desc.address;
19161+ gdt = (unsigned long)gdt_desc.address;
19162
19163 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
19164
19165@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
19166 /* 0x2 bit is always set */
19167 .flags = X86_EFLAGS_SF | 0x2,
19168 .sp = STACK_START,
19169- .es = __USER_DS,
19170+ .es = __KERNEL_DS,
19171 .cs = __KERNEL_CS,
19172 .ss = __KERNEL_DS,
19173- .ds = __USER_DS,
19174+ .ds = __KERNEL_DS,
19175 .fs = __KERNEL_PERCPU,
19176
19177 .__cr3 = __pa_nodebug(swapper_pg_dir),
19178diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
19179index deb6421..76bbc12 100644
19180--- a/arch/x86/kernel/dumpstack.c
19181+++ b/arch/x86/kernel/dumpstack.c
19182@@ -2,6 +2,9 @@
19183 * Copyright (C) 1991, 1992 Linus Torvalds
19184 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
19185 */
19186+#ifdef CONFIG_GRKERNSEC_HIDESYM
19187+#define __INCLUDED_BY_HIDESYM 1
19188+#endif
19189 #include <linux/kallsyms.h>
19190 #include <linux/kprobes.h>
19191 #include <linux/uaccess.h>
19192@@ -35,16 +38,14 @@ void printk_address(unsigned long address, int reliable)
19193 static void
19194 print_ftrace_graph_addr(unsigned long addr, void *data,
19195 const struct stacktrace_ops *ops,
19196- struct thread_info *tinfo, int *graph)
19197+ struct task_struct *task, int *graph)
19198 {
19199- struct task_struct *task;
19200 unsigned long ret_addr;
19201 int index;
19202
19203 if (addr != (unsigned long)return_to_handler)
19204 return;
19205
19206- task = tinfo->task;
19207 index = task->curr_ret_stack;
19208
19209 if (!task->ret_stack || index < *graph)
19210@@ -61,7 +62,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
19211 static inline void
19212 print_ftrace_graph_addr(unsigned long addr, void *data,
19213 const struct stacktrace_ops *ops,
19214- struct thread_info *tinfo, int *graph)
19215+ struct task_struct *task, int *graph)
19216 { }
19217 #endif
19218
19219@@ -72,10 +73,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
19220 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
19221 */
19222
19223-static inline int valid_stack_ptr(struct thread_info *tinfo,
19224- void *p, unsigned int size, void *end)
19225+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
19226 {
19227- void *t = tinfo;
19228 if (end) {
19229 if (p < end && p >= (end-THREAD_SIZE))
19230 return 1;
19231@@ -86,14 +85,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
19232 }
19233
19234 unsigned long
19235-print_context_stack(struct thread_info *tinfo,
19236+print_context_stack(struct task_struct *task, void *stack_start,
19237 unsigned long *stack, unsigned long bp,
19238 const struct stacktrace_ops *ops, void *data,
19239 unsigned long *end, int *graph)
19240 {
19241 struct stack_frame *frame = (struct stack_frame *)bp;
19242
19243- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
19244+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
19245 unsigned long addr;
19246
19247 addr = *stack;
19248@@ -105,7 +104,7 @@ print_context_stack(struct thread_info *tinfo,
19249 } else {
19250 ops->address(data, addr, 0);
19251 }
19252- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
19253+ print_ftrace_graph_addr(addr, data, ops, task, graph);
19254 }
19255 stack++;
19256 }
19257@@ -114,7 +113,7 @@ print_context_stack(struct thread_info *tinfo,
19258 EXPORT_SYMBOL_GPL(print_context_stack);
19259
19260 unsigned long
19261-print_context_stack_bp(struct thread_info *tinfo,
19262+print_context_stack_bp(struct task_struct *task, void *stack_start,
19263 unsigned long *stack, unsigned long bp,
19264 const struct stacktrace_ops *ops, void *data,
19265 unsigned long *end, int *graph)
19266@@ -122,7 +121,7 @@ print_context_stack_bp(struct thread_info *tinfo,
19267 struct stack_frame *frame = (struct stack_frame *)bp;
19268 unsigned long *ret_addr = &frame->return_address;
19269
19270- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
19271+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
19272 unsigned long addr = *ret_addr;
19273
19274 if (!__kernel_text_address(addr))
19275@@ -131,7 +130,7 @@ print_context_stack_bp(struct thread_info *tinfo,
19276 ops->address(data, addr, 1);
19277 frame = frame->next_frame;
19278 ret_addr = &frame->return_address;
19279- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
19280+ print_ftrace_graph_addr(addr, data, ops, task, graph);
19281 }
19282
19283 return (unsigned long)frame;
19284@@ -150,7 +149,7 @@ static int print_trace_stack(void *data, char *name)
19285 static void print_trace_address(void *data, unsigned long addr, int reliable)
19286 {
19287 touch_nmi_watchdog();
19288- printk(data);
19289+ printk("%s", (char *)data);
19290 printk_address(addr, reliable);
19291 }
19292
19293@@ -219,6 +218,8 @@ unsigned __kprobes long oops_begin(void)
19294 }
19295 EXPORT_SYMBOL_GPL(oops_begin);
19296
19297+extern void gr_handle_kernel_exploit(void);
19298+
19299 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
19300 {
19301 if (regs && kexec_should_crash(current))
19302@@ -240,7 +241,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
19303 panic("Fatal exception in interrupt");
19304 if (panic_on_oops)
19305 panic("Fatal exception");
19306- do_exit(signr);
19307+
19308+ gr_handle_kernel_exploit();
19309+
19310+ do_group_exit(signr);
19311 }
19312
19313 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
19314@@ -268,7 +272,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
19315 print_modules();
19316 show_regs(regs);
19317 #ifdef CONFIG_X86_32
19318- if (user_mode_vm(regs)) {
19319+ if (user_mode(regs)) {
19320 sp = regs->sp;
19321 ss = regs->ss & 0xffff;
19322 } else {
19323@@ -296,7 +300,7 @@ void die(const char *str, struct pt_regs *regs, long err)
19324 unsigned long flags = oops_begin();
19325 int sig = SIGSEGV;
19326
19327- if (!user_mode_vm(regs))
19328+ if (!user_mode(regs))
19329 report_bug(regs->ip, regs);
19330
19331 if (__die(str, regs, err))
19332diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
19333index f2a1770..540657f 100644
19334--- a/arch/x86/kernel/dumpstack_32.c
19335+++ b/arch/x86/kernel/dumpstack_32.c
19336@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19337 bp = stack_frame(task, regs);
19338
19339 for (;;) {
19340- struct thread_info *context;
19341+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
19342
19343- context = (struct thread_info *)
19344- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
19345- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
19346+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
19347
19348- stack = (unsigned long *)context->previous_esp;
19349- if (!stack)
19350+ if (stack_start == task_stack_page(task))
19351 break;
19352+ stack = *(unsigned long **)stack_start;
19353 if (ops->stack(data, "IRQ") < 0)
19354 break;
19355 touch_nmi_watchdog();
19356@@ -87,27 +85,28 @@ void show_regs(struct pt_regs *regs)
19357 int i;
19358
19359 show_regs_print_info(KERN_EMERG);
19360- __show_regs(regs, !user_mode_vm(regs));
19361+ __show_regs(regs, !user_mode(regs));
19362
19363 /*
19364 * When in-kernel, we also print out the stack and code at the
19365 * time of the fault..
19366 */
19367- if (!user_mode_vm(regs)) {
19368+ if (!user_mode(regs)) {
19369 unsigned int code_prologue = code_bytes * 43 / 64;
19370 unsigned int code_len = code_bytes;
19371 unsigned char c;
19372 u8 *ip;
19373+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
19374
19375 pr_emerg("Stack:\n");
19376 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
19377
19378 pr_emerg("Code:");
19379
19380- ip = (u8 *)regs->ip - code_prologue;
19381+ ip = (u8 *)regs->ip - code_prologue + cs_base;
19382 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
19383 /* try starting at IP */
19384- ip = (u8 *)regs->ip;
19385+ ip = (u8 *)regs->ip + cs_base;
19386 code_len = code_len - code_prologue + 1;
19387 }
19388 for (i = 0; i < code_len; i++, ip++) {
19389@@ -116,7 +115,7 @@ void show_regs(struct pt_regs *regs)
19390 pr_cont(" Bad EIP value.");
19391 break;
19392 }
19393- if (ip == (u8 *)regs->ip)
19394+ if (ip == (u8 *)regs->ip + cs_base)
19395 pr_cont(" <%02x>", c);
19396 else
19397 pr_cont(" %02x", c);
19398@@ -129,6 +128,7 @@ int is_valid_bugaddr(unsigned long ip)
19399 {
19400 unsigned short ud2;
19401
19402+ ip = ktla_ktva(ip);
19403 if (ip < PAGE_OFFSET)
19404 return 0;
19405 if (probe_kernel_address((unsigned short *)ip, ud2))
19406@@ -136,3 +136,15 @@ int is_valid_bugaddr(unsigned long ip)
19407
19408 return ud2 == 0x0b0f;
19409 }
19410+
19411+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
19412+void pax_check_alloca(unsigned long size)
19413+{
19414+ unsigned long sp = (unsigned long)&sp, stack_left;
19415+
19416+ /* all kernel stacks are of the same size */
19417+ stack_left = sp & (THREAD_SIZE - 1);
19418+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
19419+}
19420+EXPORT_SYMBOL(pax_check_alloca);
19421+#endif
19422diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
19423index addb207..99635fa 100644
19424--- a/arch/x86/kernel/dumpstack_64.c
19425+++ b/arch/x86/kernel/dumpstack_64.c
19426@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19427 unsigned long *irq_stack_end =
19428 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
19429 unsigned used = 0;
19430- struct thread_info *tinfo;
19431 int graph = 0;
19432 unsigned long dummy;
19433+ void *stack_start;
19434
19435 if (!task)
19436 task = current;
19437@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19438 * current stack address. If the stacks consist of nested
19439 * exceptions
19440 */
19441- tinfo = task_thread_info(task);
19442 for (;;) {
19443 char *id;
19444 unsigned long *estack_end;
19445+
19446 estack_end = in_exception_stack(cpu, (unsigned long)stack,
19447 &used, &id);
19448
19449@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19450 if (ops->stack(data, id) < 0)
19451 break;
19452
19453- bp = ops->walk_stack(tinfo, stack, bp, ops,
19454+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
19455 data, estack_end, &graph);
19456 ops->stack(data, "<EOE>");
19457 /*
19458@@ -161,6 +161,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19459 * second-to-last pointer (index -2 to end) in the
19460 * exception stack:
19461 */
19462+ if ((u16)estack_end[-1] != __KERNEL_DS)
19463+ goto out;
19464 stack = (unsigned long *) estack_end[-2];
19465 continue;
19466 }
19467@@ -172,7 +174,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19468 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
19469 if (ops->stack(data, "IRQ") < 0)
19470 break;
19471- bp = ops->walk_stack(tinfo, stack, bp,
19472+ bp = ops->walk_stack(task, irq_stack, stack, bp,
19473 ops, data, irq_stack_end, &graph);
19474 /*
19475 * We link to the next stack (which would be
19476@@ -191,7 +193,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
19477 /*
19478 * This handles the process stack:
19479 */
19480- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
19481+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
19482+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
19483+out:
19484 put_cpu();
19485 }
19486 EXPORT_SYMBOL(dump_trace);
19487@@ -300,3 +304,50 @@ int is_valid_bugaddr(unsigned long ip)
19488
19489 return ud2 == 0x0b0f;
19490 }
19491+
19492+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
19493+void pax_check_alloca(unsigned long size)
19494+{
19495+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
19496+ unsigned cpu, used;
19497+ char *id;
19498+
19499+ /* check the process stack first */
19500+ stack_start = (unsigned long)task_stack_page(current);
19501+ stack_end = stack_start + THREAD_SIZE;
19502+ if (likely(stack_start <= sp && sp < stack_end)) {
19503+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
19504+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
19505+ return;
19506+ }
19507+
19508+ cpu = get_cpu();
19509+
19510+ /* check the irq stacks */
19511+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
19512+ stack_start = stack_end - IRQ_STACK_SIZE;
19513+ if (stack_start <= sp && sp < stack_end) {
19514+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
19515+ put_cpu();
19516+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
19517+ return;
19518+ }
19519+
19520+ /* check the exception stacks */
19521+ used = 0;
19522+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
19523+ stack_start = stack_end - EXCEPTION_STKSZ;
19524+ if (stack_end && stack_start <= sp && sp < stack_end) {
19525+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
19526+ put_cpu();
19527+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
19528+ return;
19529+ }
19530+
19531+ put_cpu();
19532+
19533+ /* unknown stack */
19534+ BUG();
19535+}
19536+EXPORT_SYMBOL(pax_check_alloca);
19537+#endif
19538diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
19539index d32abea..74daf4f 100644
19540--- a/arch/x86/kernel/e820.c
19541+++ b/arch/x86/kernel/e820.c
19542@@ -800,8 +800,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
19543
19544 static void early_panic(char *msg)
19545 {
19546- early_printk(msg);
19547- panic(msg);
19548+ early_printk("%s", msg);
19549+ panic("%s", msg);
19550 }
19551
19552 static int userdef __initdata;
19553diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
19554index d15f575..d692043 100644
19555--- a/arch/x86/kernel/early_printk.c
19556+++ b/arch/x86/kernel/early_printk.c
19557@@ -7,6 +7,7 @@
19558 #include <linux/pci_regs.h>
19559 #include <linux/pci_ids.h>
19560 #include <linux/errno.h>
19561+#include <linux/sched.h>
19562 #include <asm/io.h>
19563 #include <asm/processor.h>
19564 #include <asm/fcntl.h>
19565diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
19566index 8f3e2de..6b71e39 100644
19567--- a/arch/x86/kernel/entry_32.S
19568+++ b/arch/x86/kernel/entry_32.S
19569@@ -177,13 +177,153 @@
19570 /*CFI_REL_OFFSET gs, PT_GS*/
19571 .endm
19572 .macro SET_KERNEL_GS reg
19573+
19574+#ifdef CONFIG_CC_STACKPROTECTOR
19575 movl $(__KERNEL_STACK_CANARY), \reg
19576+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
19577+ movl $(__USER_DS), \reg
19578+#else
19579+ xorl \reg, \reg
19580+#endif
19581+
19582 movl \reg, %gs
19583 .endm
19584
19585 #endif /* CONFIG_X86_32_LAZY_GS */
19586
19587-.macro SAVE_ALL
19588+.macro pax_enter_kernel
19589+#ifdef CONFIG_PAX_KERNEXEC
19590+ call pax_enter_kernel
19591+#endif
19592+.endm
19593+
19594+.macro pax_exit_kernel
19595+#ifdef CONFIG_PAX_KERNEXEC
19596+ call pax_exit_kernel
19597+#endif
19598+.endm
19599+
19600+#ifdef CONFIG_PAX_KERNEXEC
19601+ENTRY(pax_enter_kernel)
19602+#ifdef CONFIG_PARAVIRT
19603+ pushl %eax
19604+ pushl %ecx
19605+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
19606+ mov %eax, %esi
19607+#else
19608+ mov %cr0, %esi
19609+#endif
19610+ bts $16, %esi
19611+ jnc 1f
19612+ mov %cs, %esi
19613+ cmp $__KERNEL_CS, %esi
19614+ jz 3f
19615+ ljmp $__KERNEL_CS, $3f
19616+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
19617+2:
19618+#ifdef CONFIG_PARAVIRT
19619+ mov %esi, %eax
19620+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
19621+#else
19622+ mov %esi, %cr0
19623+#endif
19624+3:
19625+#ifdef CONFIG_PARAVIRT
19626+ popl %ecx
19627+ popl %eax
19628+#endif
19629+ ret
19630+ENDPROC(pax_enter_kernel)
19631+
19632+ENTRY(pax_exit_kernel)
19633+#ifdef CONFIG_PARAVIRT
19634+ pushl %eax
19635+ pushl %ecx
19636+#endif
19637+ mov %cs, %esi
19638+ cmp $__KERNEXEC_KERNEL_CS, %esi
19639+ jnz 2f
19640+#ifdef CONFIG_PARAVIRT
19641+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
19642+ mov %eax, %esi
19643+#else
19644+ mov %cr0, %esi
19645+#endif
19646+ btr $16, %esi
19647+ ljmp $__KERNEL_CS, $1f
19648+1:
19649+#ifdef CONFIG_PARAVIRT
19650+ mov %esi, %eax
19651+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
19652+#else
19653+ mov %esi, %cr0
19654+#endif
19655+2:
19656+#ifdef CONFIG_PARAVIRT
19657+ popl %ecx
19658+ popl %eax
19659+#endif
19660+ ret
19661+ENDPROC(pax_exit_kernel)
19662+#endif
19663+
19664+ .macro pax_erase_kstack
19665+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
19666+ call pax_erase_kstack
19667+#endif
19668+ .endm
19669+
19670+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
19671+/*
19672+ * ebp: thread_info
19673+ */
19674+ENTRY(pax_erase_kstack)
19675+ pushl %edi
19676+ pushl %ecx
19677+ pushl %eax
19678+
19679+ mov TI_lowest_stack(%ebp), %edi
19680+ mov $-0xBEEF, %eax
19681+ std
19682+
19683+1: mov %edi, %ecx
19684+ and $THREAD_SIZE_asm - 1, %ecx
19685+ shr $2, %ecx
19686+ repne scasl
19687+ jecxz 2f
19688+
19689+ cmp $2*16, %ecx
19690+ jc 2f
19691+
19692+ mov $2*16, %ecx
19693+ repe scasl
19694+ jecxz 2f
19695+ jne 1b
19696+
19697+2: cld
19698+ mov %esp, %ecx
19699+ sub %edi, %ecx
19700+
19701+ cmp $THREAD_SIZE_asm, %ecx
19702+ jb 3f
19703+ ud2
19704+3:
19705+
19706+ shr $2, %ecx
19707+ rep stosl
19708+
19709+ mov TI_task_thread_sp0(%ebp), %edi
19710+ sub $128, %edi
19711+ mov %edi, TI_lowest_stack(%ebp)
19712+
19713+ popl %eax
19714+ popl %ecx
19715+ popl %edi
19716+ ret
19717+ENDPROC(pax_erase_kstack)
19718+#endif
19719+
19720+.macro __SAVE_ALL _DS
19721 cld
19722 PUSH_GS
19723 pushl_cfi %fs
19724@@ -206,7 +346,7 @@
19725 CFI_REL_OFFSET ecx, 0
19726 pushl_cfi %ebx
19727 CFI_REL_OFFSET ebx, 0
19728- movl $(__USER_DS), %edx
19729+ movl $\_DS, %edx
19730 movl %edx, %ds
19731 movl %edx, %es
19732 movl $(__KERNEL_PERCPU), %edx
19733@@ -214,6 +354,15 @@
19734 SET_KERNEL_GS %edx
19735 .endm
19736
19737+.macro SAVE_ALL
19738+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
19739+ __SAVE_ALL __KERNEL_DS
19740+ pax_enter_kernel
19741+#else
19742+ __SAVE_ALL __USER_DS
19743+#endif
19744+.endm
19745+
19746 .macro RESTORE_INT_REGS
19747 popl_cfi %ebx
19748 CFI_RESTORE ebx
19749@@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
19750 popfl_cfi
19751 jmp syscall_exit
19752 CFI_ENDPROC
19753-END(ret_from_fork)
19754+ENDPROC(ret_from_fork)
19755
19756 ENTRY(ret_from_kernel_thread)
19757 CFI_STARTPROC
19758@@ -344,7 +493,15 @@ ret_from_intr:
19759 andl $SEGMENT_RPL_MASK, %eax
19760 #endif
19761 cmpl $USER_RPL, %eax
19762+
19763+#ifdef CONFIG_PAX_KERNEXEC
19764+ jae resume_userspace
19765+
19766+ pax_exit_kernel
19767+ jmp resume_kernel
19768+#else
19769 jb resume_kernel # not returning to v8086 or userspace
19770+#endif
19771
19772 ENTRY(resume_userspace)
19773 LOCKDEP_SYS_EXIT
19774@@ -356,8 +513,8 @@ ENTRY(resume_userspace)
19775 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
19776 # int/exception return?
19777 jne work_pending
19778- jmp restore_all
19779-END(ret_from_exception)
19780+ jmp restore_all_pax
19781+ENDPROC(ret_from_exception)
19782
19783 #ifdef CONFIG_PREEMPT
19784 ENTRY(resume_kernel)
19785@@ -372,7 +529,7 @@ need_resched:
19786 jz restore_all
19787 call preempt_schedule_irq
19788 jmp need_resched
19789-END(resume_kernel)
19790+ENDPROC(resume_kernel)
19791 #endif
19792 CFI_ENDPROC
19793 /*
19794@@ -406,30 +563,45 @@ sysenter_past_esp:
19795 /*CFI_REL_OFFSET cs, 0*/
19796 /*
19797 * Push current_thread_info()->sysenter_return to the stack.
19798- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
19799- * pushed above; +8 corresponds to copy_thread's esp0 setting.
19800 */
19801- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
19802+ pushl_cfi $0
19803 CFI_REL_OFFSET eip, 0
19804
19805 pushl_cfi %eax
19806 SAVE_ALL
19807+ GET_THREAD_INFO(%ebp)
19808+ movl TI_sysenter_return(%ebp),%ebp
19809+ movl %ebp,PT_EIP(%esp)
19810 ENABLE_INTERRUPTS(CLBR_NONE)
19811
19812 /*
19813 * Load the potential sixth argument from user stack.
19814 * Careful about security.
19815 */
19816+ movl PT_OLDESP(%esp),%ebp
19817+
19818+#ifdef CONFIG_PAX_MEMORY_UDEREF
19819+ mov PT_OLDSS(%esp),%ds
19820+1: movl %ds:(%ebp),%ebp
19821+ push %ss
19822+ pop %ds
19823+#else
19824 cmpl $__PAGE_OFFSET-3,%ebp
19825 jae syscall_fault
19826 ASM_STAC
19827 1: movl (%ebp),%ebp
19828 ASM_CLAC
19829+#endif
19830+
19831 movl %ebp,PT_EBP(%esp)
19832 _ASM_EXTABLE(1b,syscall_fault)
19833
19834 GET_THREAD_INFO(%ebp)
19835
19836+#ifdef CONFIG_PAX_RANDKSTACK
19837+ pax_erase_kstack
19838+#endif
19839+
19840 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
19841 jnz sysenter_audit
19842 sysenter_do_call:
19843@@ -444,12 +616,24 @@ sysenter_do_call:
19844 testl $_TIF_ALLWORK_MASK, %ecx
19845 jne sysexit_audit
19846 sysenter_exit:
19847+
19848+#ifdef CONFIG_PAX_RANDKSTACK
19849+ pushl_cfi %eax
19850+ movl %esp, %eax
19851+ call pax_randomize_kstack
19852+ popl_cfi %eax
19853+#endif
19854+
19855+ pax_erase_kstack
19856+
19857 /* if something modifies registers it must also disable sysexit */
19858 movl PT_EIP(%esp), %edx
19859 movl PT_OLDESP(%esp), %ecx
19860 xorl %ebp,%ebp
19861 TRACE_IRQS_ON
19862 1: mov PT_FS(%esp), %fs
19863+2: mov PT_DS(%esp), %ds
19864+3: mov PT_ES(%esp), %es
19865 PTGS_TO_GS
19866 ENABLE_INTERRUPTS_SYSEXIT
19867
19868@@ -466,6 +650,9 @@ sysenter_audit:
19869 movl %eax,%edx /* 2nd arg: syscall number */
19870 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
19871 call __audit_syscall_entry
19872+
19873+ pax_erase_kstack
19874+
19875 pushl_cfi %ebx
19876 movl PT_EAX(%esp),%eax /* reload syscall number */
19877 jmp sysenter_do_call
19878@@ -491,10 +678,16 @@ sysexit_audit:
19879
19880 CFI_ENDPROC
19881 .pushsection .fixup,"ax"
19882-2: movl $0,PT_FS(%esp)
19883+4: movl $0,PT_FS(%esp)
19884+ jmp 1b
19885+5: movl $0,PT_DS(%esp)
19886+ jmp 1b
19887+6: movl $0,PT_ES(%esp)
19888 jmp 1b
19889 .popsection
19890- _ASM_EXTABLE(1b,2b)
19891+ _ASM_EXTABLE(1b,4b)
19892+ _ASM_EXTABLE(2b,5b)
19893+ _ASM_EXTABLE(3b,6b)
19894 PTGS_TO_GS_EX
19895 ENDPROC(ia32_sysenter_target)
19896
19897@@ -509,6 +702,11 @@ ENTRY(system_call)
19898 pushl_cfi %eax # save orig_eax
19899 SAVE_ALL
19900 GET_THREAD_INFO(%ebp)
19901+
19902+#ifdef CONFIG_PAX_RANDKSTACK
19903+ pax_erase_kstack
19904+#endif
19905+
19906 # system call tracing in operation / emulation
19907 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
19908 jnz syscall_trace_entry
19909@@ -527,6 +725,15 @@ syscall_exit:
19910 testl $_TIF_ALLWORK_MASK, %ecx # current->work
19911 jne syscall_exit_work
19912
19913+restore_all_pax:
19914+
19915+#ifdef CONFIG_PAX_RANDKSTACK
19916+ movl %esp, %eax
19917+ call pax_randomize_kstack
19918+#endif
19919+
19920+ pax_erase_kstack
19921+
19922 restore_all:
19923 TRACE_IRQS_IRET
19924 restore_all_notrace:
19925@@ -583,14 +790,34 @@ ldt_ss:
19926 * compensating for the offset by changing to the ESPFIX segment with
19927 * a base address that matches for the difference.
19928 */
19929-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
19930+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
19931 mov %esp, %edx /* load kernel esp */
19932 mov PT_OLDESP(%esp), %eax /* load userspace esp */
19933 mov %dx, %ax /* eax: new kernel esp */
19934 sub %eax, %edx /* offset (low word is 0) */
19935+#ifdef CONFIG_SMP
19936+ movl PER_CPU_VAR(cpu_number), %ebx
19937+ shll $PAGE_SHIFT_asm, %ebx
19938+ addl $cpu_gdt_table, %ebx
19939+#else
19940+ movl $cpu_gdt_table, %ebx
19941+#endif
19942 shr $16, %edx
19943- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
19944- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
19945+
19946+#ifdef CONFIG_PAX_KERNEXEC
19947+ mov %cr0, %esi
19948+ btr $16, %esi
19949+ mov %esi, %cr0
19950+#endif
19951+
19952+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
19953+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
19954+
19955+#ifdef CONFIG_PAX_KERNEXEC
19956+ bts $16, %esi
19957+ mov %esi, %cr0
19958+#endif
19959+
19960 pushl_cfi $__ESPFIX_SS
19961 pushl_cfi %eax /* new kernel esp */
19962 /* Disable interrupts, but do not irqtrace this section: we
19963@@ -619,20 +846,18 @@ work_resched:
19964 movl TI_flags(%ebp), %ecx
19965 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
19966 # than syscall tracing?
19967- jz restore_all
19968+ jz restore_all_pax
19969 testb $_TIF_NEED_RESCHED, %cl
19970 jnz work_resched
19971
19972 work_notifysig: # deal with pending signals and
19973 # notify-resume requests
19974+ movl %esp, %eax
19975 #ifdef CONFIG_VM86
19976 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
19977- movl %esp, %eax
19978 jne work_notifysig_v86 # returning to kernel-space or
19979 # vm86-space
19980 1:
19981-#else
19982- movl %esp, %eax
19983 #endif
19984 TRACE_IRQS_ON
19985 ENABLE_INTERRUPTS(CLBR_NONE)
19986@@ -653,7 +878,7 @@ work_notifysig_v86:
19987 movl %eax, %esp
19988 jmp 1b
19989 #endif
19990-END(work_pending)
19991+ENDPROC(work_pending)
19992
19993 # perform syscall exit tracing
19994 ALIGN
19995@@ -661,11 +886,14 @@ syscall_trace_entry:
19996 movl $-ENOSYS,PT_EAX(%esp)
19997 movl %esp, %eax
19998 call syscall_trace_enter
19999+
20000+ pax_erase_kstack
20001+
20002 /* What it returned is what we'll actually use. */
20003 cmpl $(NR_syscalls), %eax
20004 jnae syscall_call
20005 jmp syscall_exit
20006-END(syscall_trace_entry)
20007+ENDPROC(syscall_trace_entry)
20008
20009 # perform syscall exit tracing
20010 ALIGN
20011@@ -678,21 +906,25 @@ syscall_exit_work:
20012 movl %esp, %eax
20013 call syscall_trace_leave
20014 jmp resume_userspace
20015-END(syscall_exit_work)
20016+ENDPROC(syscall_exit_work)
20017 CFI_ENDPROC
20018
20019 RING0_INT_FRAME # can't unwind into user space anyway
20020 syscall_fault:
20021+#ifdef CONFIG_PAX_MEMORY_UDEREF
20022+ push %ss
20023+ pop %ds
20024+#endif
20025 ASM_CLAC
20026 GET_THREAD_INFO(%ebp)
20027 movl $-EFAULT,PT_EAX(%esp)
20028 jmp resume_userspace
20029-END(syscall_fault)
20030+ENDPROC(syscall_fault)
20031
20032 syscall_badsys:
20033 movl $-ENOSYS,PT_EAX(%esp)
20034 jmp resume_userspace
20035-END(syscall_badsys)
20036+ENDPROC(syscall_badsys)
20037 CFI_ENDPROC
20038 /*
20039 * End of kprobes section
20040@@ -708,8 +940,15 @@ END(syscall_badsys)
20041 * normal stack and adjusts ESP with the matching offset.
20042 */
20043 /* fixup the stack */
20044- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
20045- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
20046+#ifdef CONFIG_SMP
20047+ movl PER_CPU_VAR(cpu_number), %ebx
20048+ shll $PAGE_SHIFT_asm, %ebx
20049+ addl $cpu_gdt_table, %ebx
20050+#else
20051+ movl $cpu_gdt_table, %ebx
20052+#endif
20053+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
20054+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
20055 shl $16, %eax
20056 addl %esp, %eax /* the adjusted stack pointer */
20057 pushl_cfi $__KERNEL_DS
20058@@ -762,7 +1001,7 @@ vector=vector+1
20059 .endr
20060 2: jmp common_interrupt
20061 .endr
20062-END(irq_entries_start)
20063+ENDPROC(irq_entries_start)
20064
20065 .previous
20066 END(interrupt)
20067@@ -813,7 +1052,7 @@ ENTRY(coprocessor_error)
20068 pushl_cfi $do_coprocessor_error
20069 jmp error_code
20070 CFI_ENDPROC
20071-END(coprocessor_error)
20072+ENDPROC(coprocessor_error)
20073
20074 ENTRY(simd_coprocessor_error)
20075 RING0_INT_FRAME
20076@@ -826,7 +1065,7 @@ ENTRY(simd_coprocessor_error)
20077 .section .altinstructions,"a"
20078 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
20079 .previous
20080-.section .altinstr_replacement,"ax"
20081+.section .altinstr_replacement,"a"
20082 663: pushl $do_simd_coprocessor_error
20083 664:
20084 .previous
20085@@ -835,7 +1074,7 @@ ENTRY(simd_coprocessor_error)
20086 #endif
20087 jmp error_code
20088 CFI_ENDPROC
20089-END(simd_coprocessor_error)
20090+ENDPROC(simd_coprocessor_error)
20091
20092 ENTRY(device_not_available)
20093 RING0_INT_FRAME
20094@@ -844,18 +1083,18 @@ ENTRY(device_not_available)
20095 pushl_cfi $do_device_not_available
20096 jmp error_code
20097 CFI_ENDPROC
20098-END(device_not_available)
20099+ENDPROC(device_not_available)
20100
20101 #ifdef CONFIG_PARAVIRT
20102 ENTRY(native_iret)
20103 iret
20104 _ASM_EXTABLE(native_iret, iret_exc)
20105-END(native_iret)
20106+ENDPROC(native_iret)
20107
20108 ENTRY(native_irq_enable_sysexit)
20109 sti
20110 sysexit
20111-END(native_irq_enable_sysexit)
20112+ENDPROC(native_irq_enable_sysexit)
20113 #endif
20114
20115 ENTRY(overflow)
20116@@ -865,7 +1104,7 @@ ENTRY(overflow)
20117 pushl_cfi $do_overflow
20118 jmp error_code
20119 CFI_ENDPROC
20120-END(overflow)
20121+ENDPROC(overflow)
20122
20123 ENTRY(bounds)
20124 RING0_INT_FRAME
20125@@ -874,7 +1113,7 @@ ENTRY(bounds)
20126 pushl_cfi $do_bounds
20127 jmp error_code
20128 CFI_ENDPROC
20129-END(bounds)
20130+ENDPROC(bounds)
20131
20132 ENTRY(invalid_op)
20133 RING0_INT_FRAME
20134@@ -883,7 +1122,7 @@ ENTRY(invalid_op)
20135 pushl_cfi $do_invalid_op
20136 jmp error_code
20137 CFI_ENDPROC
20138-END(invalid_op)
20139+ENDPROC(invalid_op)
20140
20141 ENTRY(coprocessor_segment_overrun)
20142 RING0_INT_FRAME
20143@@ -892,7 +1131,7 @@ ENTRY(coprocessor_segment_overrun)
20144 pushl_cfi $do_coprocessor_segment_overrun
20145 jmp error_code
20146 CFI_ENDPROC
20147-END(coprocessor_segment_overrun)
20148+ENDPROC(coprocessor_segment_overrun)
20149
20150 ENTRY(invalid_TSS)
20151 RING0_EC_FRAME
20152@@ -900,7 +1139,7 @@ ENTRY(invalid_TSS)
20153 pushl_cfi $do_invalid_TSS
20154 jmp error_code
20155 CFI_ENDPROC
20156-END(invalid_TSS)
20157+ENDPROC(invalid_TSS)
20158
20159 ENTRY(segment_not_present)
20160 RING0_EC_FRAME
20161@@ -908,7 +1147,7 @@ ENTRY(segment_not_present)
20162 pushl_cfi $do_segment_not_present
20163 jmp error_code
20164 CFI_ENDPROC
20165-END(segment_not_present)
20166+ENDPROC(segment_not_present)
20167
20168 ENTRY(stack_segment)
20169 RING0_EC_FRAME
20170@@ -916,7 +1155,7 @@ ENTRY(stack_segment)
20171 pushl_cfi $do_stack_segment
20172 jmp error_code
20173 CFI_ENDPROC
20174-END(stack_segment)
20175+ENDPROC(stack_segment)
20176
20177 ENTRY(alignment_check)
20178 RING0_EC_FRAME
20179@@ -924,7 +1163,7 @@ ENTRY(alignment_check)
20180 pushl_cfi $do_alignment_check
20181 jmp error_code
20182 CFI_ENDPROC
20183-END(alignment_check)
20184+ENDPROC(alignment_check)
20185
20186 ENTRY(divide_error)
20187 RING0_INT_FRAME
20188@@ -933,7 +1172,7 @@ ENTRY(divide_error)
20189 pushl_cfi $do_divide_error
20190 jmp error_code
20191 CFI_ENDPROC
20192-END(divide_error)
20193+ENDPROC(divide_error)
20194
20195 #ifdef CONFIG_X86_MCE
20196 ENTRY(machine_check)
20197@@ -943,7 +1182,7 @@ ENTRY(machine_check)
20198 pushl_cfi machine_check_vector
20199 jmp error_code
20200 CFI_ENDPROC
20201-END(machine_check)
20202+ENDPROC(machine_check)
20203 #endif
20204
20205 ENTRY(spurious_interrupt_bug)
20206@@ -953,7 +1192,7 @@ ENTRY(spurious_interrupt_bug)
20207 pushl_cfi $do_spurious_interrupt_bug
20208 jmp error_code
20209 CFI_ENDPROC
20210-END(spurious_interrupt_bug)
20211+ENDPROC(spurious_interrupt_bug)
20212 /*
20213 * End of kprobes section
20214 */
20215@@ -1063,7 +1302,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
20216
20217 ENTRY(mcount)
20218 ret
20219-END(mcount)
20220+ENDPROC(mcount)
20221
20222 ENTRY(ftrace_caller)
20223 cmpl $0, function_trace_stop
20224@@ -1096,7 +1335,7 @@ ftrace_graph_call:
20225 .globl ftrace_stub
20226 ftrace_stub:
20227 ret
20228-END(ftrace_caller)
20229+ENDPROC(ftrace_caller)
20230
20231 ENTRY(ftrace_regs_caller)
20232 pushf /* push flags before compare (in cs location) */
20233@@ -1197,7 +1436,7 @@ trace:
20234 popl %ecx
20235 popl %eax
20236 jmp ftrace_stub
20237-END(mcount)
20238+ENDPROC(mcount)
20239 #endif /* CONFIG_DYNAMIC_FTRACE */
20240 #endif /* CONFIG_FUNCTION_TRACER */
20241
20242@@ -1215,7 +1454,7 @@ ENTRY(ftrace_graph_caller)
20243 popl %ecx
20244 popl %eax
20245 ret
20246-END(ftrace_graph_caller)
20247+ENDPROC(ftrace_graph_caller)
20248
20249 .globl return_to_handler
20250 return_to_handler:
20251@@ -1271,15 +1510,18 @@ error_code:
20252 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
20253 REG_TO_PTGS %ecx
20254 SET_KERNEL_GS %ecx
20255- movl $(__USER_DS), %ecx
20256+ movl $(__KERNEL_DS), %ecx
20257 movl %ecx, %ds
20258 movl %ecx, %es
20259+
20260+ pax_enter_kernel
20261+
20262 TRACE_IRQS_OFF
20263 movl %esp,%eax # pt_regs pointer
20264 call *%edi
20265 jmp ret_from_exception
20266 CFI_ENDPROC
20267-END(page_fault)
20268+ENDPROC(page_fault)
20269
20270 /*
20271 * Debug traps and NMI can happen at the one SYSENTER instruction
20272@@ -1322,7 +1564,7 @@ debug_stack_correct:
20273 call do_debug
20274 jmp ret_from_exception
20275 CFI_ENDPROC
20276-END(debug)
20277+ENDPROC(debug)
20278
20279 /*
20280 * NMI is doubly nasty. It can happen _while_ we're handling
20281@@ -1360,6 +1602,9 @@ nmi_stack_correct:
20282 xorl %edx,%edx # zero error code
20283 movl %esp,%eax # pt_regs pointer
20284 call do_nmi
20285+
20286+ pax_exit_kernel
20287+
20288 jmp restore_all_notrace
20289 CFI_ENDPROC
20290
20291@@ -1396,12 +1641,15 @@ nmi_espfix_stack:
20292 FIXUP_ESPFIX_STACK # %eax == %esp
20293 xorl %edx,%edx # zero error code
20294 call do_nmi
20295+
20296+ pax_exit_kernel
20297+
20298 RESTORE_REGS
20299 lss 12+4(%esp), %esp # back to espfix stack
20300 CFI_ADJUST_CFA_OFFSET -24
20301 jmp irq_return
20302 CFI_ENDPROC
20303-END(nmi)
20304+ENDPROC(nmi)
20305
20306 ENTRY(int3)
20307 RING0_INT_FRAME
20308@@ -1414,14 +1662,14 @@ ENTRY(int3)
20309 call do_int3
20310 jmp ret_from_exception
20311 CFI_ENDPROC
20312-END(int3)
20313+ENDPROC(int3)
20314
20315 ENTRY(general_protection)
20316 RING0_EC_FRAME
20317 pushl_cfi $do_general_protection
20318 jmp error_code
20319 CFI_ENDPROC
20320-END(general_protection)
20321+ENDPROC(general_protection)
20322
20323 #ifdef CONFIG_KVM_GUEST
20324 ENTRY(async_page_fault)
20325@@ -1430,7 +1678,7 @@ ENTRY(async_page_fault)
20326 pushl_cfi $do_async_page_fault
20327 jmp error_code
20328 CFI_ENDPROC
20329-END(async_page_fault)
20330+ENDPROC(async_page_fault)
20331 #endif
20332
20333 /*
20334diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
20335index 7272089..0b74104 100644
20336--- a/arch/x86/kernel/entry_64.S
20337+++ b/arch/x86/kernel/entry_64.S
20338@@ -59,6 +59,8 @@
20339 #include <asm/context_tracking.h>
20340 #include <asm/smap.h>
20341 #include <linux/err.h>
20342+#include <asm/pgtable.h>
20343+#include <asm/alternative-asm.h>
20344
20345 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
20346 #include <linux/elf-em.h>
20347@@ -80,8 +82,9 @@
20348 #ifdef CONFIG_DYNAMIC_FTRACE
20349
20350 ENTRY(function_hook)
20351+ pax_force_retaddr
20352 retq
20353-END(function_hook)
20354+ENDPROC(function_hook)
20355
20356 /* skip is set if stack has been adjusted */
20357 .macro ftrace_caller_setup skip=0
20358@@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
20359 #endif
20360
20361 GLOBAL(ftrace_stub)
20362+ pax_force_retaddr
20363 retq
20364-END(ftrace_caller)
20365+ENDPROC(ftrace_caller)
20366
20367 ENTRY(ftrace_regs_caller)
20368 /* Save the current flags before compare (in SS location)*/
20369@@ -191,7 +195,7 @@ ftrace_restore_flags:
20370 popfq
20371 jmp ftrace_stub
20372
20373-END(ftrace_regs_caller)
20374+ENDPROC(ftrace_regs_caller)
20375
20376
20377 #else /* ! CONFIG_DYNAMIC_FTRACE */
20378@@ -212,6 +216,7 @@ ENTRY(function_hook)
20379 #endif
20380
20381 GLOBAL(ftrace_stub)
20382+ pax_force_retaddr
20383 retq
20384
20385 trace:
20386@@ -225,12 +230,13 @@ trace:
20387 #endif
20388 subq $MCOUNT_INSN_SIZE, %rdi
20389
20390+ pax_force_fptr ftrace_trace_function
20391 call *ftrace_trace_function
20392
20393 MCOUNT_RESTORE_FRAME
20394
20395 jmp ftrace_stub
20396-END(function_hook)
20397+ENDPROC(function_hook)
20398 #endif /* CONFIG_DYNAMIC_FTRACE */
20399 #endif /* CONFIG_FUNCTION_TRACER */
20400
20401@@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
20402
20403 MCOUNT_RESTORE_FRAME
20404
20405+ pax_force_retaddr
20406 retq
20407-END(ftrace_graph_caller)
20408+ENDPROC(ftrace_graph_caller)
20409
20410 GLOBAL(return_to_handler)
20411 subq $24, %rsp
20412@@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
20413 movq 8(%rsp), %rdx
20414 movq (%rsp), %rax
20415 addq $24, %rsp
20416+ pax_force_fptr %rdi
20417 jmp *%rdi
20418+ENDPROC(return_to_handler)
20419 #endif
20420
20421
20422@@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
20423 ENDPROC(native_usergs_sysret64)
20424 #endif /* CONFIG_PARAVIRT */
20425
20426+ .macro ljmpq sel, off
20427+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
20428+ .byte 0x48; ljmp *1234f(%rip)
20429+ .pushsection .rodata
20430+ .align 16
20431+ 1234: .quad \off; .word \sel
20432+ .popsection
20433+#else
20434+ pushq $\sel
20435+ pushq $\off
20436+ lretq
20437+#endif
20438+ .endm
20439+
20440+ .macro pax_enter_kernel
20441+ pax_set_fptr_mask
20442+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
20443+ call pax_enter_kernel
20444+#endif
20445+ .endm
20446+
20447+ .macro pax_exit_kernel
20448+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
20449+ call pax_exit_kernel
20450+#endif
20451+
20452+ .endm
20453+
20454+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
20455+ENTRY(pax_enter_kernel)
20456+ pushq %rdi
20457+
20458+#ifdef CONFIG_PARAVIRT
20459+ PV_SAVE_REGS(CLBR_RDI)
20460+#endif
20461+
20462+#ifdef CONFIG_PAX_KERNEXEC
20463+ GET_CR0_INTO_RDI
20464+ bts $16,%rdi
20465+ jnc 3f
20466+ mov %cs,%edi
20467+ cmp $__KERNEL_CS,%edi
20468+ jnz 2f
20469+1:
20470+#endif
20471+
20472+#ifdef CONFIG_PAX_MEMORY_UDEREF
20473+ 661: jmp 111f
20474+ .pushsection .altinstr_replacement, "a"
20475+ 662: ASM_NOP2
20476+ .popsection
20477+ .pushsection .altinstructions, "a"
20478+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
20479+ .popsection
20480+ GET_CR3_INTO_RDI
20481+ cmp $0,%dil
20482+ jnz 112f
20483+ mov $__KERNEL_DS,%edi
20484+ mov %edi,%ss
20485+ jmp 111f
20486+112: cmp $1,%dil
20487+ jz 113f
20488+ ud2
20489+113: sub $4097,%rdi
20490+ bts $63,%rdi
20491+ SET_RDI_INTO_CR3
20492+ mov $__UDEREF_KERNEL_DS,%edi
20493+ mov %edi,%ss
20494+111:
20495+#endif
20496+
20497+#ifdef CONFIG_PARAVIRT
20498+ PV_RESTORE_REGS(CLBR_RDI)
20499+#endif
20500+
20501+ popq %rdi
20502+ pax_force_retaddr
20503+ retq
20504+
20505+#ifdef CONFIG_PAX_KERNEXEC
20506+2: ljmpq __KERNEL_CS,1b
20507+3: ljmpq __KERNEXEC_KERNEL_CS,4f
20508+4: SET_RDI_INTO_CR0
20509+ jmp 1b
20510+#endif
20511+ENDPROC(pax_enter_kernel)
20512+
20513+ENTRY(pax_exit_kernel)
20514+ pushq %rdi
20515+
20516+#ifdef CONFIG_PARAVIRT
20517+ PV_SAVE_REGS(CLBR_RDI)
20518+#endif
20519+
20520+#ifdef CONFIG_PAX_KERNEXEC
20521+ mov %cs,%rdi
20522+ cmp $__KERNEXEC_KERNEL_CS,%edi
20523+ jz 2f
20524+ GET_CR0_INTO_RDI
20525+ bts $16,%rdi
20526+ jnc 4f
20527+1:
20528+#endif
20529+
20530+#ifdef CONFIG_PAX_MEMORY_UDEREF
20531+ 661: jmp 111f
20532+ .pushsection .altinstr_replacement, "a"
20533+ 662: ASM_NOP2
20534+ .popsection
20535+ .pushsection .altinstructions, "a"
20536+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
20537+ .popsection
20538+ mov %ss,%edi
20539+ cmp $__UDEREF_KERNEL_DS,%edi
20540+ jnz 111f
20541+ GET_CR3_INTO_RDI
20542+ cmp $0,%dil
20543+ jz 112f
20544+ ud2
20545+112: add $4097,%rdi
20546+ bts $63,%rdi
20547+ SET_RDI_INTO_CR3
20548+ mov $__KERNEL_DS,%edi
20549+ mov %edi,%ss
20550+111:
20551+#endif
20552+
20553+#ifdef CONFIG_PARAVIRT
20554+ PV_RESTORE_REGS(CLBR_RDI);
20555+#endif
20556+
20557+ popq %rdi
20558+ pax_force_retaddr
20559+ retq
20560+
20561+#ifdef CONFIG_PAX_KERNEXEC
20562+2: GET_CR0_INTO_RDI
20563+ btr $16,%rdi
20564+ jnc 4f
20565+ ljmpq __KERNEL_CS,3f
20566+3: SET_RDI_INTO_CR0
20567+ jmp 1b
20568+4: ud2
20569+ jmp 4b
20570+#endif
20571+ENDPROC(pax_exit_kernel)
20572+#endif
20573+
20574+ .macro pax_enter_kernel_user
20575+ pax_set_fptr_mask
20576+#ifdef CONFIG_PAX_MEMORY_UDEREF
20577+ call pax_enter_kernel_user
20578+#endif
20579+ .endm
20580+
20581+ .macro pax_exit_kernel_user
20582+#ifdef CONFIG_PAX_MEMORY_UDEREF
20583+ call pax_exit_kernel_user
20584+#endif
20585+#ifdef CONFIG_PAX_RANDKSTACK
20586+ pushq %rax
20587+ pushq %r11
20588+ call pax_randomize_kstack
20589+ popq %r11
20590+ popq %rax
20591+#endif
20592+ .endm
20593+
20594+#ifdef CONFIG_PAX_MEMORY_UDEREF
20595+ENTRY(pax_enter_kernel_user)
20596+ pushq %rdi
20597+ pushq %rbx
20598+
20599+#ifdef CONFIG_PARAVIRT
20600+ PV_SAVE_REGS(CLBR_RDI)
20601+#endif
20602+
20603+ 661: jmp 111f
20604+ .pushsection .altinstr_replacement, "a"
20605+ 662: ASM_NOP2
20606+ .popsection
20607+ .pushsection .altinstructions, "a"
20608+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
20609+ .popsection
20610+ GET_CR3_INTO_RDI
20611+ cmp $1,%dil
20612+ jnz 4f
20613+ sub $4097,%rdi
20614+ bts $63,%rdi
20615+ SET_RDI_INTO_CR3
20616+ jmp 3f
20617+111:
20618+
20619+ GET_CR3_INTO_RDI
20620+ mov %rdi,%rbx
20621+ add $__START_KERNEL_map,%rbx
20622+ sub phys_base(%rip),%rbx
20623+
20624+#ifdef CONFIG_PARAVIRT
20625+ cmpl $0, pv_info+PARAVIRT_enabled
20626+ jz 1f
20627+ pushq %rdi
20628+ i = 0
20629+ .rept USER_PGD_PTRS
20630+ mov i*8(%rbx),%rsi
20631+ mov $0,%sil
20632+ lea i*8(%rbx),%rdi
20633+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
20634+ i = i + 1
20635+ .endr
20636+ popq %rdi
20637+ jmp 2f
20638+1:
20639+#endif
20640+
20641+ i = 0
20642+ .rept USER_PGD_PTRS
20643+ movb $0,i*8(%rbx)
20644+ i = i + 1
20645+ .endr
20646+
20647+2: SET_RDI_INTO_CR3
20648+
20649+#ifdef CONFIG_PAX_KERNEXEC
20650+ GET_CR0_INTO_RDI
20651+ bts $16,%rdi
20652+ SET_RDI_INTO_CR0
20653+#endif
20654+
20655+3:
20656+
20657+#ifdef CONFIG_PARAVIRT
20658+ PV_RESTORE_REGS(CLBR_RDI)
20659+#endif
20660+
20661+ popq %rbx
20662+ popq %rdi
20663+ pax_force_retaddr
20664+ retq
20665+4: ud2
20666+ENDPROC(pax_enter_kernel_user)
20667+
20668+ENTRY(pax_exit_kernel_user)
20669+ pushq %rdi
20670+ pushq %rbx
20671+
20672+#ifdef CONFIG_PARAVIRT
20673+ PV_SAVE_REGS(CLBR_RDI)
20674+#endif
20675+
20676+ GET_CR3_INTO_RDI
20677+ 661: jmp 1f
20678+ .pushsection .altinstr_replacement, "a"
20679+ 662: ASM_NOP2
20680+ .popsection
20681+ .pushsection .altinstructions, "a"
20682+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
20683+ .popsection
20684+ cmp $0,%dil
20685+ jnz 3f
20686+ add $4097,%rdi
20687+ bts $63,%rdi
20688+ SET_RDI_INTO_CR3
20689+ jmp 2f
20690+1:
20691+
20692+ mov %rdi,%rbx
20693+
20694+#ifdef CONFIG_PAX_KERNEXEC
20695+ GET_CR0_INTO_RDI
20696+ btr $16,%rdi
20697+ jnc 3f
20698+ SET_RDI_INTO_CR0
20699+#endif
20700+
20701+ add $__START_KERNEL_map,%rbx
20702+ sub phys_base(%rip),%rbx
20703+
20704+#ifdef CONFIG_PARAVIRT
20705+ cmpl $0, pv_info+PARAVIRT_enabled
20706+ jz 1f
20707+ i = 0
20708+ .rept USER_PGD_PTRS
20709+ mov i*8(%rbx),%rsi
20710+ mov $0x67,%sil
20711+ lea i*8(%rbx),%rdi
20712+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
20713+ i = i + 1
20714+ .endr
20715+ jmp 2f
20716+1:
20717+#endif
20718+
20719+ i = 0
20720+ .rept USER_PGD_PTRS
20721+ movb $0x67,i*8(%rbx)
20722+ i = i + 1
20723+ .endr
20724+2:
20725+
20726+#ifdef CONFIG_PARAVIRT
20727+ PV_RESTORE_REGS(CLBR_RDI)
20728+#endif
20729+
20730+ popq %rbx
20731+ popq %rdi
20732+ pax_force_retaddr
20733+ retq
20734+3: ud2
20735+ENDPROC(pax_exit_kernel_user)
20736+#endif
20737+
20738+ .macro pax_enter_kernel_nmi
20739+ pax_set_fptr_mask
20740+
20741+#ifdef CONFIG_PAX_KERNEXEC
20742+ GET_CR0_INTO_RDI
20743+ bts $16,%rdi
20744+ jc 110f
20745+ SET_RDI_INTO_CR0
20746+ or $2,%ebx
20747+110:
20748+#endif
20749+
20750+#ifdef CONFIG_PAX_MEMORY_UDEREF
20751+ 661: jmp 111f
20752+ .pushsection .altinstr_replacement, "a"
20753+ 662: ASM_NOP2
20754+ .popsection
20755+ .pushsection .altinstructions, "a"
20756+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
20757+ .popsection
20758+ GET_CR3_INTO_RDI
20759+ cmp $0,%dil
20760+ jz 111f
20761+ sub $4097,%rdi
20762+ or $4,%ebx
20763+ bts $63,%rdi
20764+ SET_RDI_INTO_CR3
20765+ mov $__UDEREF_KERNEL_DS,%edi
20766+ mov %edi,%ss
20767+111:
20768+#endif
20769+ .endm
20770+
20771+ .macro pax_exit_kernel_nmi
20772+#ifdef CONFIG_PAX_KERNEXEC
20773+ btr $1,%ebx
20774+ jnc 110f
20775+ GET_CR0_INTO_RDI
20776+ btr $16,%rdi
20777+ SET_RDI_INTO_CR0
20778+110:
20779+#endif
20780+
20781+#ifdef CONFIG_PAX_MEMORY_UDEREF
20782+ btr $2,%ebx
20783+ jnc 111f
20784+ GET_CR3_INTO_RDI
20785+ add $4097,%rdi
20786+ bts $63,%rdi
20787+ SET_RDI_INTO_CR3
20788+ mov $__KERNEL_DS,%edi
20789+ mov %edi,%ss
20790+111:
20791+#endif
20792+ .endm
20793+
20794+ .macro pax_erase_kstack
20795+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
20796+ call pax_erase_kstack
20797+#endif
20798+ .endm
20799+
20800+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
20801+ENTRY(pax_erase_kstack)
20802+ pushq %rdi
20803+ pushq %rcx
20804+ pushq %rax
20805+ pushq %r11
20806+
20807+ GET_THREAD_INFO(%r11)
20808+ mov TI_lowest_stack(%r11), %rdi
20809+ mov $-0xBEEF, %rax
20810+ std
20811+
20812+1: mov %edi, %ecx
20813+ and $THREAD_SIZE_asm - 1, %ecx
20814+ shr $3, %ecx
20815+ repne scasq
20816+ jecxz 2f
20817+
20818+ cmp $2*8, %ecx
20819+ jc 2f
20820+
20821+ mov $2*8, %ecx
20822+ repe scasq
20823+ jecxz 2f
20824+ jne 1b
20825+
20826+2: cld
20827+ mov %esp, %ecx
20828+ sub %edi, %ecx
20829+
20830+ cmp $THREAD_SIZE_asm, %rcx
20831+ jb 3f
20832+ ud2
20833+3:
20834+
20835+ shr $3, %ecx
20836+ rep stosq
20837+
20838+ mov TI_task_thread_sp0(%r11), %rdi
20839+ sub $256, %rdi
20840+ mov %rdi, TI_lowest_stack(%r11)
20841+
20842+ popq %r11
20843+ popq %rax
20844+ popq %rcx
20845+ popq %rdi
20846+ pax_force_retaddr
20847+ ret
20848+ENDPROC(pax_erase_kstack)
20849+#endif
20850
20851 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
20852 #ifdef CONFIG_TRACE_IRQFLAGS
20853@@ -375,8 +808,8 @@ ENDPROC(native_usergs_sysret64)
20854 .endm
20855
20856 .macro UNFAKE_STACK_FRAME
20857- addq $8*6, %rsp
20858- CFI_ADJUST_CFA_OFFSET -(6*8)
20859+ addq $8*6 + ARG_SKIP, %rsp
20860+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
20861 .endm
20862
20863 /*
20864@@ -463,7 +896,7 @@ ENDPROC(native_usergs_sysret64)
20865 movq %rsp, %rsi
20866
20867 leaq -RBP(%rsp),%rdi /* arg1 for handler */
20868- testl $3, CS-RBP(%rsi)
20869+ testb $3, CS-RBP(%rsi)
20870 je 1f
20871 SWAPGS
20872 /*
20873@@ -498,9 +931,10 @@ ENTRY(save_rest)
20874 movq_cfi r15, R15+16
20875 movq %r11, 8(%rsp) /* return address */
20876 FIXUP_TOP_OF_STACK %r11, 16
20877+ pax_force_retaddr
20878 ret
20879 CFI_ENDPROC
20880-END(save_rest)
20881+ENDPROC(save_rest)
20882
20883 /* save complete stack frame */
20884 .pushsection .kprobes.text, "ax"
20885@@ -529,9 +963,10 @@ ENTRY(save_paranoid)
20886 js 1f /* negative -> in kernel */
20887 SWAPGS
20888 xorl %ebx,%ebx
20889-1: ret
20890+1: pax_force_retaddr_bts
20891+ ret
20892 CFI_ENDPROC
20893-END(save_paranoid)
20894+ENDPROC(save_paranoid)
20895 .popsection
20896
20897 /*
20898@@ -553,7 +988,7 @@ ENTRY(ret_from_fork)
20899
20900 RESTORE_REST
20901
20902- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
20903+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
20904 jz 1f
20905
20906 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
20907@@ -571,7 +1006,7 @@ ENTRY(ret_from_fork)
20908 RESTORE_REST
20909 jmp int_ret_from_sys_call
20910 CFI_ENDPROC
20911-END(ret_from_fork)
20912+ENDPROC(ret_from_fork)
20913
20914 /*
20915 * System call entry. Up to 6 arguments in registers are supported.
20916@@ -608,7 +1043,7 @@ END(ret_from_fork)
20917 ENTRY(system_call)
20918 CFI_STARTPROC simple
20919 CFI_SIGNAL_FRAME
20920- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
20921+ CFI_DEF_CFA rsp,0
20922 CFI_REGISTER rip,rcx
20923 /*CFI_REGISTER rflags,r11*/
20924 SWAPGS_UNSAFE_STACK
20925@@ -621,16 +1056,23 @@ GLOBAL(system_call_after_swapgs)
20926
20927 movq %rsp,PER_CPU_VAR(old_rsp)
20928 movq PER_CPU_VAR(kernel_stack),%rsp
20929+ SAVE_ARGS 8*6,0
20930+ pax_enter_kernel_user
20931+
20932+#ifdef CONFIG_PAX_RANDKSTACK
20933+ pax_erase_kstack
20934+#endif
20935+
20936 /*
20937 * No need to follow this irqs off/on section - it's straight
20938 * and short:
20939 */
20940 ENABLE_INTERRUPTS(CLBR_NONE)
20941- SAVE_ARGS 8,0
20942 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
20943 movq %rcx,RIP-ARGOFFSET(%rsp)
20944 CFI_REL_OFFSET rip,RIP-ARGOFFSET
20945- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
20946+ GET_THREAD_INFO(%rcx)
20947+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
20948 jnz tracesys
20949 system_call_fastpath:
20950 #if __SYSCALL_MASK == ~0
20951@@ -640,7 +1082,7 @@ system_call_fastpath:
20952 cmpl $__NR_syscall_max,%eax
20953 #endif
20954 ja badsys
20955- movq %r10,%rcx
20956+ movq R10-ARGOFFSET(%rsp),%rcx
20957 call *sys_call_table(,%rax,8) # XXX: rip relative
20958 movq %rax,RAX-ARGOFFSET(%rsp)
20959 /*
20960@@ -654,10 +1096,13 @@ sysret_check:
20961 LOCKDEP_SYS_EXIT
20962 DISABLE_INTERRUPTS(CLBR_NONE)
20963 TRACE_IRQS_OFF
20964- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
20965+ GET_THREAD_INFO(%rcx)
20966+ movl TI_flags(%rcx),%edx
20967 andl %edi,%edx
20968 jnz sysret_careful
20969 CFI_REMEMBER_STATE
20970+ pax_exit_kernel_user
20971+ pax_erase_kstack
20972 /*
20973 * sysretq will re-enable interrupts:
20974 */
20975@@ -709,14 +1154,18 @@ badsys:
20976 * jump back to the normal fast path.
20977 */
20978 auditsys:
20979- movq %r10,%r9 /* 6th arg: 4th syscall arg */
20980+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
20981 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
20982 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
20983 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
20984 movq %rax,%rsi /* 2nd arg: syscall number */
20985 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
20986 call __audit_syscall_entry
20987+
20988+ pax_erase_kstack
20989+
20990 LOAD_ARGS 0 /* reload call-clobbered registers */
20991+ pax_set_fptr_mask
20992 jmp system_call_fastpath
20993
20994 /*
20995@@ -737,7 +1186,7 @@ sysret_audit:
20996 /* Do syscall tracing */
20997 tracesys:
20998 #ifdef CONFIG_AUDITSYSCALL
20999- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
21000+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
21001 jz auditsys
21002 #endif
21003 SAVE_REST
21004@@ -745,12 +1194,16 @@ tracesys:
21005 FIXUP_TOP_OF_STACK %rdi
21006 movq %rsp,%rdi
21007 call syscall_trace_enter
21008+
21009+ pax_erase_kstack
21010+
21011 /*
21012 * Reload arg registers from stack in case ptrace changed them.
21013 * We don't reload %rax because syscall_trace_enter() returned
21014 * the value it wants us to use in the table lookup.
21015 */
21016 LOAD_ARGS ARGOFFSET, 1
21017+ pax_set_fptr_mask
21018 RESTORE_REST
21019 #if __SYSCALL_MASK == ~0
21020 cmpq $__NR_syscall_max,%rax
21021@@ -759,7 +1212,7 @@ tracesys:
21022 cmpl $__NR_syscall_max,%eax
21023 #endif
21024 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
21025- movq %r10,%rcx /* fixup for C */
21026+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
21027 call *sys_call_table(,%rax,8)
21028 movq %rax,RAX-ARGOFFSET(%rsp)
21029 /* Use IRET because user could have changed frame */
21030@@ -780,7 +1233,9 @@ GLOBAL(int_with_check)
21031 andl %edi,%edx
21032 jnz int_careful
21033 andl $~TS_COMPAT,TI_status(%rcx)
21034- jmp retint_swapgs
21035+ pax_exit_kernel_user
21036+ pax_erase_kstack
21037+ jmp retint_swapgs_pax
21038
21039 /* Either reschedule or signal or syscall exit tracking needed. */
21040 /* First do a reschedule test. */
21041@@ -826,7 +1281,7 @@ int_restore_rest:
21042 TRACE_IRQS_OFF
21043 jmp int_with_check
21044 CFI_ENDPROC
21045-END(system_call)
21046+ENDPROC(system_call)
21047
21048 .macro FORK_LIKE func
21049 ENTRY(stub_\func)
21050@@ -839,9 +1294,10 @@ ENTRY(stub_\func)
21051 DEFAULT_FRAME 0 8 /* offset 8: return address */
21052 call sys_\func
21053 RESTORE_TOP_OF_STACK %r11, 8
21054+ pax_force_retaddr
21055 ret $REST_SKIP /* pop extended registers */
21056 CFI_ENDPROC
21057-END(stub_\func)
21058+ENDPROC(stub_\func)
21059 .endm
21060
21061 .macro FIXED_FRAME label,func
21062@@ -851,9 +1307,10 @@ ENTRY(\label)
21063 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
21064 call \func
21065 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
21066+ pax_force_retaddr
21067 ret
21068 CFI_ENDPROC
21069-END(\label)
21070+ENDPROC(\label)
21071 .endm
21072
21073 FORK_LIKE clone
21074@@ -870,9 +1327,10 @@ ENTRY(ptregscall_common)
21075 movq_cfi_restore R12+8, r12
21076 movq_cfi_restore RBP+8, rbp
21077 movq_cfi_restore RBX+8, rbx
21078+ pax_force_retaddr
21079 ret $REST_SKIP /* pop extended registers */
21080 CFI_ENDPROC
21081-END(ptregscall_common)
21082+ENDPROC(ptregscall_common)
21083
21084 ENTRY(stub_execve)
21085 CFI_STARTPROC
21086@@ -885,7 +1343,7 @@ ENTRY(stub_execve)
21087 RESTORE_REST
21088 jmp int_ret_from_sys_call
21089 CFI_ENDPROC
21090-END(stub_execve)
21091+ENDPROC(stub_execve)
21092
21093 /*
21094 * sigreturn is special because it needs to restore all registers on return.
21095@@ -902,7 +1360,7 @@ ENTRY(stub_rt_sigreturn)
21096 RESTORE_REST
21097 jmp int_ret_from_sys_call
21098 CFI_ENDPROC
21099-END(stub_rt_sigreturn)
21100+ENDPROC(stub_rt_sigreturn)
21101
21102 #ifdef CONFIG_X86_X32_ABI
21103 ENTRY(stub_x32_rt_sigreturn)
21104@@ -916,7 +1374,7 @@ ENTRY(stub_x32_rt_sigreturn)
21105 RESTORE_REST
21106 jmp int_ret_from_sys_call
21107 CFI_ENDPROC
21108-END(stub_x32_rt_sigreturn)
21109+ENDPROC(stub_x32_rt_sigreturn)
21110
21111 ENTRY(stub_x32_execve)
21112 CFI_STARTPROC
21113@@ -930,7 +1388,7 @@ ENTRY(stub_x32_execve)
21114 RESTORE_REST
21115 jmp int_ret_from_sys_call
21116 CFI_ENDPROC
21117-END(stub_x32_execve)
21118+ENDPROC(stub_x32_execve)
21119
21120 #endif
21121
21122@@ -967,7 +1425,7 @@ vector=vector+1
21123 2: jmp common_interrupt
21124 .endr
21125 CFI_ENDPROC
21126-END(irq_entries_start)
21127+ENDPROC(irq_entries_start)
21128
21129 .previous
21130 END(interrupt)
21131@@ -987,6 +1445,16 @@ END(interrupt)
21132 subq $ORIG_RAX-RBP, %rsp
21133 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
21134 SAVE_ARGS_IRQ
21135+#ifdef CONFIG_PAX_MEMORY_UDEREF
21136+ testb $3, CS(%rdi)
21137+ jnz 1f
21138+ pax_enter_kernel
21139+ jmp 2f
21140+1: pax_enter_kernel_user
21141+2:
21142+#else
21143+ pax_enter_kernel
21144+#endif
21145 call \func
21146 .endm
21147
21148@@ -1019,7 +1487,7 @@ ret_from_intr:
21149
21150 exit_intr:
21151 GET_THREAD_INFO(%rcx)
21152- testl $3,CS-ARGOFFSET(%rsp)
21153+ testb $3,CS-ARGOFFSET(%rsp)
21154 je retint_kernel
21155
21156 /* Interrupt came from user space */
21157@@ -1041,12 +1509,16 @@ retint_swapgs: /* return to user-space */
21158 * The iretq could re-enable interrupts:
21159 */
21160 DISABLE_INTERRUPTS(CLBR_ANY)
21161+ pax_exit_kernel_user
21162+retint_swapgs_pax:
21163 TRACE_IRQS_IRETQ
21164 SWAPGS
21165 jmp restore_args
21166
21167 retint_restore_args: /* return to kernel space */
21168 DISABLE_INTERRUPTS(CLBR_ANY)
21169+ pax_exit_kernel
21170+ pax_force_retaddr (RIP-ARGOFFSET)
21171 /*
21172 * The iretq could re-enable interrupts:
21173 */
21174@@ -1129,7 +1601,7 @@ ENTRY(retint_kernel)
21175 #endif
21176
21177 CFI_ENDPROC
21178-END(common_interrupt)
21179+ENDPROC(common_interrupt)
21180 /*
21181 * End of kprobes section
21182 */
21183@@ -1147,7 +1619,7 @@ ENTRY(\sym)
21184 interrupt \do_sym
21185 jmp ret_from_intr
21186 CFI_ENDPROC
21187-END(\sym)
21188+ENDPROC(\sym)
21189 .endm
21190
21191 #ifdef CONFIG_SMP
21192@@ -1208,12 +1680,22 @@ ENTRY(\sym)
21193 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
21194 call error_entry
21195 DEFAULT_FRAME 0
21196+#ifdef CONFIG_PAX_MEMORY_UDEREF
21197+ testb $3, CS(%rsp)
21198+ jnz 1f
21199+ pax_enter_kernel
21200+ jmp 2f
21201+1: pax_enter_kernel_user
21202+2:
21203+#else
21204+ pax_enter_kernel
21205+#endif
21206 movq %rsp,%rdi /* pt_regs pointer */
21207 xorl %esi,%esi /* no error code */
21208 call \do_sym
21209 jmp error_exit /* %ebx: no swapgs flag */
21210 CFI_ENDPROC
21211-END(\sym)
21212+ENDPROC(\sym)
21213 .endm
21214
21215 .macro paranoidzeroentry sym do_sym
21216@@ -1226,15 +1708,25 @@ ENTRY(\sym)
21217 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
21218 call save_paranoid
21219 TRACE_IRQS_OFF
21220+#ifdef CONFIG_PAX_MEMORY_UDEREF
21221+ testb $3, CS(%rsp)
21222+ jnz 1f
21223+ pax_enter_kernel
21224+ jmp 2f
21225+1: pax_enter_kernel_user
21226+2:
21227+#else
21228+ pax_enter_kernel
21229+#endif
21230 movq %rsp,%rdi /* pt_regs pointer */
21231 xorl %esi,%esi /* no error code */
21232 call \do_sym
21233 jmp paranoid_exit /* %ebx: no swapgs flag */
21234 CFI_ENDPROC
21235-END(\sym)
21236+ENDPROC(\sym)
21237 .endm
21238
21239-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
21240+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
21241 .macro paranoidzeroentry_ist sym do_sym ist
21242 ENTRY(\sym)
21243 INTR_FRAME
21244@@ -1245,14 +1737,30 @@ ENTRY(\sym)
21245 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
21246 call save_paranoid
21247 TRACE_IRQS_OFF_DEBUG
21248+#ifdef CONFIG_PAX_MEMORY_UDEREF
21249+ testb $3, CS(%rsp)
21250+ jnz 1f
21251+ pax_enter_kernel
21252+ jmp 2f
21253+1: pax_enter_kernel_user
21254+2:
21255+#else
21256+ pax_enter_kernel
21257+#endif
21258 movq %rsp,%rdi /* pt_regs pointer */
21259 xorl %esi,%esi /* no error code */
21260+#ifdef CONFIG_SMP
21261+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
21262+ lea init_tss(%r12), %r12
21263+#else
21264+ lea init_tss(%rip), %r12
21265+#endif
21266 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
21267 call \do_sym
21268 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
21269 jmp paranoid_exit /* %ebx: no swapgs flag */
21270 CFI_ENDPROC
21271-END(\sym)
21272+ENDPROC(\sym)
21273 .endm
21274
21275 .macro errorentry sym do_sym
21276@@ -1264,13 +1772,23 @@ ENTRY(\sym)
21277 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
21278 call error_entry
21279 DEFAULT_FRAME 0
21280+#ifdef CONFIG_PAX_MEMORY_UDEREF
21281+ testb $3, CS(%rsp)
21282+ jnz 1f
21283+ pax_enter_kernel
21284+ jmp 2f
21285+1: pax_enter_kernel_user
21286+2:
21287+#else
21288+ pax_enter_kernel
21289+#endif
21290 movq %rsp,%rdi /* pt_regs pointer */
21291 movq ORIG_RAX(%rsp),%rsi /* get error code */
21292 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
21293 call \do_sym
21294 jmp error_exit /* %ebx: no swapgs flag */
21295 CFI_ENDPROC
21296-END(\sym)
21297+ENDPROC(\sym)
21298 .endm
21299
21300 /* error code is on the stack already */
21301@@ -1284,13 +1802,23 @@ ENTRY(\sym)
21302 call save_paranoid
21303 DEFAULT_FRAME 0
21304 TRACE_IRQS_OFF
21305+#ifdef CONFIG_PAX_MEMORY_UDEREF
21306+ testb $3, CS(%rsp)
21307+ jnz 1f
21308+ pax_enter_kernel
21309+ jmp 2f
21310+1: pax_enter_kernel_user
21311+2:
21312+#else
21313+ pax_enter_kernel
21314+#endif
21315 movq %rsp,%rdi /* pt_regs pointer */
21316 movq ORIG_RAX(%rsp),%rsi /* get error code */
21317 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
21318 call \do_sym
21319 jmp paranoid_exit /* %ebx: no swapgs flag */
21320 CFI_ENDPROC
21321-END(\sym)
21322+ENDPROC(\sym)
21323 .endm
21324
21325 zeroentry divide_error do_divide_error
21326@@ -1320,9 +1848,10 @@ gs_change:
21327 2: mfence /* workaround */
21328 SWAPGS
21329 popfq_cfi
21330+ pax_force_retaddr
21331 ret
21332 CFI_ENDPROC
21333-END(native_load_gs_index)
21334+ENDPROC(native_load_gs_index)
21335
21336 _ASM_EXTABLE(gs_change,bad_gs)
21337 .section .fixup,"ax"
21338@@ -1350,9 +1879,10 @@ ENTRY(call_softirq)
21339 CFI_DEF_CFA_REGISTER rsp
21340 CFI_ADJUST_CFA_OFFSET -8
21341 decl PER_CPU_VAR(irq_count)
21342+ pax_force_retaddr
21343 ret
21344 CFI_ENDPROC
21345-END(call_softirq)
21346+ENDPROC(call_softirq)
21347
21348 #ifdef CONFIG_XEN
21349 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
21350@@ -1390,7 +1920,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
21351 decl PER_CPU_VAR(irq_count)
21352 jmp error_exit
21353 CFI_ENDPROC
21354-END(xen_do_hypervisor_callback)
21355+ENDPROC(xen_do_hypervisor_callback)
21356
21357 /*
21358 * Hypervisor uses this for application faults while it executes.
21359@@ -1449,7 +1979,7 @@ ENTRY(xen_failsafe_callback)
21360 SAVE_ALL
21361 jmp error_exit
21362 CFI_ENDPROC
21363-END(xen_failsafe_callback)
21364+ENDPROC(xen_failsafe_callback)
21365
21366 apicinterrupt HYPERVISOR_CALLBACK_VECTOR \
21367 xen_hvm_callback_vector xen_evtchn_do_upcall
21368@@ -1501,18 +2031,33 @@ ENTRY(paranoid_exit)
21369 DEFAULT_FRAME
21370 DISABLE_INTERRUPTS(CLBR_NONE)
21371 TRACE_IRQS_OFF_DEBUG
21372- testl %ebx,%ebx /* swapgs needed? */
21373+ testl $1,%ebx /* swapgs needed? */
21374 jnz paranoid_restore
21375- testl $3,CS(%rsp)
21376+ testb $3,CS(%rsp)
21377 jnz paranoid_userspace
21378+#ifdef CONFIG_PAX_MEMORY_UDEREF
21379+ pax_exit_kernel
21380+ TRACE_IRQS_IRETQ 0
21381+ SWAPGS_UNSAFE_STACK
21382+ RESTORE_ALL 8
21383+ pax_force_retaddr_bts
21384+ jmp irq_return
21385+#endif
21386 paranoid_swapgs:
21387+#ifdef CONFIG_PAX_MEMORY_UDEREF
21388+ pax_exit_kernel_user
21389+#else
21390+ pax_exit_kernel
21391+#endif
21392 TRACE_IRQS_IRETQ 0
21393 SWAPGS_UNSAFE_STACK
21394 RESTORE_ALL 8
21395 jmp irq_return
21396 paranoid_restore:
21397+ pax_exit_kernel
21398 TRACE_IRQS_IRETQ_DEBUG 0
21399 RESTORE_ALL 8
21400+ pax_force_retaddr_bts
21401 jmp irq_return
21402 paranoid_userspace:
21403 GET_THREAD_INFO(%rcx)
21404@@ -1541,7 +2086,7 @@ paranoid_schedule:
21405 TRACE_IRQS_OFF
21406 jmp paranoid_userspace
21407 CFI_ENDPROC
21408-END(paranoid_exit)
21409+ENDPROC(paranoid_exit)
21410
21411 /*
21412 * Exception entry point. This expects an error code/orig_rax on the stack.
21413@@ -1568,12 +2113,13 @@ ENTRY(error_entry)
21414 movq_cfi r14, R14+8
21415 movq_cfi r15, R15+8
21416 xorl %ebx,%ebx
21417- testl $3,CS+8(%rsp)
21418+ testb $3,CS+8(%rsp)
21419 je error_kernelspace
21420 error_swapgs:
21421 SWAPGS
21422 error_sti:
21423 TRACE_IRQS_OFF
21424+ pax_force_retaddr_bts
21425 ret
21426
21427 /*
21428@@ -1600,7 +2146,7 @@ bstep_iret:
21429 movq %rcx,RIP+8(%rsp)
21430 jmp error_swapgs
21431 CFI_ENDPROC
21432-END(error_entry)
21433+ENDPROC(error_entry)
21434
21435
21436 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
21437@@ -1611,7 +2157,7 @@ ENTRY(error_exit)
21438 DISABLE_INTERRUPTS(CLBR_NONE)
21439 TRACE_IRQS_OFF
21440 GET_THREAD_INFO(%rcx)
21441- testl %eax,%eax
21442+ testl $1,%eax
21443 jne retint_kernel
21444 LOCKDEP_SYS_EXIT_IRQ
21445 movl TI_flags(%rcx),%edx
21446@@ -1620,7 +2166,7 @@ ENTRY(error_exit)
21447 jnz retint_careful
21448 jmp retint_swapgs
21449 CFI_ENDPROC
21450-END(error_exit)
21451+ENDPROC(error_exit)
21452
21453 /*
21454 * Test if a given stack is an NMI stack or not.
21455@@ -1678,9 +2224,11 @@ ENTRY(nmi)
21456 * If %cs was not the kernel segment, then the NMI triggered in user
21457 * space, which means it is definitely not nested.
21458 */
21459+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
21460+ je 1f
21461 cmpl $__KERNEL_CS, 16(%rsp)
21462 jne first_nmi
21463-
21464+1:
21465 /*
21466 * Check the special variable on the stack to see if NMIs are
21467 * executing.
21468@@ -1714,8 +2262,7 @@ nested_nmi:
21469
21470 1:
21471 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
21472- leaq -1*8(%rsp), %rdx
21473- movq %rdx, %rsp
21474+ subq $8, %rsp
21475 CFI_ADJUST_CFA_OFFSET 1*8
21476 leaq -10*8(%rsp), %rdx
21477 pushq_cfi $__KERNEL_DS
21478@@ -1733,6 +2280,7 @@ nested_nmi_out:
21479 CFI_RESTORE rdx
21480
21481 /* No need to check faults here */
21482+# pax_force_retaddr_bts
21483 INTERRUPT_RETURN
21484
21485 CFI_RESTORE_STATE
21486@@ -1849,6 +2397,8 @@ end_repeat_nmi:
21487 */
21488 movq %cr2, %r12
21489
21490+ pax_enter_kernel_nmi
21491+
21492 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
21493 movq %rsp,%rdi
21494 movq $-1,%rsi
21495@@ -1861,26 +2411,31 @@ end_repeat_nmi:
21496 movq %r12, %cr2
21497 1:
21498
21499- testl %ebx,%ebx /* swapgs needed? */
21500+ testl $1,%ebx /* swapgs needed? */
21501 jnz nmi_restore
21502 nmi_swapgs:
21503 SWAPGS_UNSAFE_STACK
21504 nmi_restore:
21505+ pax_exit_kernel_nmi
21506 /* Pop the extra iret frame at once */
21507 RESTORE_ALL 6*8
21508+ testb $3, 8(%rsp)
21509+ jnz 1f
21510+ pax_force_retaddr_bts
21511+1:
21512
21513 /* Clear the NMI executing stack variable */
21514 movq $0, 5*8(%rsp)
21515 jmp irq_return
21516 CFI_ENDPROC
21517-END(nmi)
21518+ENDPROC(nmi)
21519
21520 ENTRY(ignore_sysret)
21521 CFI_STARTPROC
21522 mov $-ENOSYS,%eax
21523 sysret
21524 CFI_ENDPROC
21525-END(ignore_sysret)
21526+ENDPROC(ignore_sysret)
21527
21528 /*
21529 * End of kprobes section
21530diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
21531index 42a392a..fbbd930 100644
21532--- a/arch/x86/kernel/ftrace.c
21533+++ b/arch/x86/kernel/ftrace.c
21534@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
21535 {
21536 unsigned char replaced[MCOUNT_INSN_SIZE];
21537
21538+ ip = ktla_ktva(ip);
21539+
21540 /*
21541 * Note: Due to modules and __init, code can
21542 * disappear and change, we need to protect against faulting
21543@@ -227,7 +229,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
21544 unsigned char old[MCOUNT_INSN_SIZE], *new;
21545 int ret;
21546
21547- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
21548+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
21549 new = ftrace_call_replace(ip, (unsigned long)func);
21550
21551 /* See comment above by declaration of modifying_ftrace_code */
21552@@ -238,7 +240,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
21553 /* Also update the regs callback function */
21554 if (!ret) {
21555 ip = (unsigned long)(&ftrace_regs_call);
21556- memcpy(old, &ftrace_regs_call, MCOUNT_INSN_SIZE);
21557+ memcpy(old, ktla_ktva((void *)&ftrace_regs_call), MCOUNT_INSN_SIZE);
21558 new = ftrace_call_replace(ip, (unsigned long)func);
21559 ret = ftrace_modify_code(ip, old, new);
21560 }
21561@@ -279,7 +281,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
21562 * kernel identity mapping to modify code.
21563 */
21564 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
21565- ip = (unsigned long)__va(__pa_symbol(ip));
21566+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
21567
21568 return probe_kernel_write((void *)ip, val, size);
21569 }
21570@@ -289,7 +291,7 @@ static int add_break(unsigned long ip, const char *old)
21571 unsigned char replaced[MCOUNT_INSN_SIZE];
21572 unsigned char brk = BREAKPOINT_INSTRUCTION;
21573
21574- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
21575+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
21576 return -EFAULT;
21577
21578 /* Make sure it is what we expect it to be */
21579@@ -637,7 +639,7 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
21580 return ret;
21581
21582 fail_update:
21583- probe_kernel_write((void *)ip, &old_code[0], 1);
21584+ probe_kernel_write((void *)ktla_ktva(ip), &old_code[0], 1);
21585 goto out;
21586 }
21587
21588@@ -670,6 +672,8 @@ static int ftrace_mod_jmp(unsigned long ip,
21589 {
21590 unsigned char code[MCOUNT_INSN_SIZE];
21591
21592+ ip = ktla_ktva(ip);
21593+
21594 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
21595 return -EFAULT;
21596
21597diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
21598index 55b6761..a6456fc 100644
21599--- a/arch/x86/kernel/head64.c
21600+++ b/arch/x86/kernel/head64.c
21601@@ -67,12 +67,12 @@ again:
21602 pgd = *pgd_p;
21603
21604 /*
21605- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
21606- * critical -- __PAGE_OFFSET would point us back into the dynamic
21607+ * The use of __early_va rather than __va here is critical:
21608+ * __va would point us back into the dynamic
21609 * range and we might end up looping forever...
21610 */
21611 if (pgd)
21612- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
21613+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
21614 else {
21615 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
21616 reset_early_page_tables();
21617@@ -82,13 +82,13 @@ again:
21618 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
21619 for (i = 0; i < PTRS_PER_PUD; i++)
21620 pud_p[i] = 0;
21621- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
21622+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
21623 }
21624 pud_p += pud_index(address);
21625 pud = *pud_p;
21626
21627 if (pud)
21628- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
21629+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
21630 else {
21631 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
21632 reset_early_page_tables();
21633@@ -98,7 +98,7 @@ again:
21634 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
21635 for (i = 0; i < PTRS_PER_PMD; i++)
21636 pmd_p[i] = 0;
21637- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
21638+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
21639 }
21640 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
21641 pmd_p[pmd_index(address)] = pmd;
21642@@ -175,7 +175,6 @@ void __init x86_64_start_kernel(char * real_mode_data)
21643 if (console_loglevel == 10)
21644 early_printk("Kernel alive\n");
21645
21646- clear_page(init_level4_pgt);
21647 /* set init_level4_pgt kernel high mapping*/
21648 init_level4_pgt[511] = early_level4_pgt[511];
21649
21650diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
21651index 73afd11..0ef46f2 100644
21652--- a/arch/x86/kernel/head_32.S
21653+++ b/arch/x86/kernel/head_32.S
21654@@ -26,6 +26,12 @@
21655 /* Physical address */
21656 #define pa(X) ((X) - __PAGE_OFFSET)
21657
21658+#ifdef CONFIG_PAX_KERNEXEC
21659+#define ta(X) (X)
21660+#else
21661+#define ta(X) ((X) - __PAGE_OFFSET)
21662+#endif
21663+
21664 /*
21665 * References to members of the new_cpu_data structure.
21666 */
21667@@ -55,11 +61,7 @@
21668 * and small than max_low_pfn, otherwise will waste some page table entries
21669 */
21670
21671-#if PTRS_PER_PMD > 1
21672-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
21673-#else
21674-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
21675-#endif
21676+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
21677
21678 /* Number of possible pages in the lowmem region */
21679 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
21680@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
21681 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
21682
21683 /*
21684+ * Real beginning of normal "text" segment
21685+ */
21686+ENTRY(stext)
21687+ENTRY(_stext)
21688+
21689+/*
21690 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
21691 * %esi points to the real-mode code as a 32-bit pointer.
21692 * CS and DS must be 4 GB flat segments, but we don't depend on
21693@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
21694 * can.
21695 */
21696 __HEAD
21697+
21698+#ifdef CONFIG_PAX_KERNEXEC
21699+ jmp startup_32
21700+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
21701+.fill PAGE_SIZE-5,1,0xcc
21702+#endif
21703+
21704 ENTRY(startup_32)
21705 movl pa(stack_start),%ecx
21706
21707@@ -106,6 +121,59 @@ ENTRY(startup_32)
21708 2:
21709 leal -__PAGE_OFFSET(%ecx),%esp
21710
21711+#ifdef CONFIG_SMP
21712+ movl $pa(cpu_gdt_table),%edi
21713+ movl $__per_cpu_load,%eax
21714+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
21715+ rorl $16,%eax
21716+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
21717+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
21718+ movl $__per_cpu_end - 1,%eax
21719+ subl $__per_cpu_start,%eax
21720+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
21721+#endif
21722+
21723+#ifdef CONFIG_PAX_MEMORY_UDEREF
21724+ movl $NR_CPUS,%ecx
21725+ movl $pa(cpu_gdt_table),%edi
21726+1:
21727+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
21728+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
21729+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
21730+ addl $PAGE_SIZE_asm,%edi
21731+ loop 1b
21732+#endif
21733+
21734+#ifdef CONFIG_PAX_KERNEXEC
21735+ movl $pa(boot_gdt),%edi
21736+ movl $__LOAD_PHYSICAL_ADDR,%eax
21737+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
21738+ rorl $16,%eax
21739+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
21740+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
21741+ rorl $16,%eax
21742+
21743+ ljmp $(__BOOT_CS),$1f
21744+1:
21745+
21746+ movl $NR_CPUS,%ecx
21747+ movl $pa(cpu_gdt_table),%edi
21748+ addl $__PAGE_OFFSET,%eax
21749+1:
21750+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
21751+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
21752+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
21753+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
21754+ rorl $16,%eax
21755+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
21756+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
21757+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
21758+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
21759+ rorl $16,%eax
21760+ addl $PAGE_SIZE_asm,%edi
21761+ loop 1b
21762+#endif
21763+
21764 /*
21765 * Clear BSS first so that there are no surprises...
21766 */
21767@@ -201,8 +269,11 @@ ENTRY(startup_32)
21768 movl %eax, pa(max_pfn_mapped)
21769
21770 /* Do early initialization of the fixmap area */
21771- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
21772- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
21773+#ifdef CONFIG_COMPAT_VDSO
21774+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
21775+#else
21776+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
21777+#endif
21778 #else /* Not PAE */
21779
21780 page_pde_offset = (__PAGE_OFFSET >> 20);
21781@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
21782 movl %eax, pa(max_pfn_mapped)
21783
21784 /* Do early initialization of the fixmap area */
21785- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
21786- movl %eax,pa(initial_page_table+0xffc)
21787+#ifdef CONFIG_COMPAT_VDSO
21788+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
21789+#else
21790+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
21791+#endif
21792 #endif
21793
21794 #ifdef CONFIG_PARAVIRT
21795@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
21796 cmpl $num_subarch_entries, %eax
21797 jae bad_subarch
21798
21799- movl pa(subarch_entries)(,%eax,4), %eax
21800- subl $__PAGE_OFFSET, %eax
21801- jmp *%eax
21802+ jmp *pa(subarch_entries)(,%eax,4)
21803
21804 bad_subarch:
21805 WEAK(lguest_entry)
21806@@ -261,10 +333,10 @@ WEAK(xen_entry)
21807 __INITDATA
21808
21809 subarch_entries:
21810- .long default_entry /* normal x86/PC */
21811- .long lguest_entry /* lguest hypervisor */
21812- .long xen_entry /* Xen hypervisor */
21813- .long default_entry /* Moorestown MID */
21814+ .long ta(default_entry) /* normal x86/PC */
21815+ .long ta(lguest_entry) /* lguest hypervisor */
21816+ .long ta(xen_entry) /* Xen hypervisor */
21817+ .long ta(default_entry) /* Moorestown MID */
21818 num_subarch_entries = (. - subarch_entries) / 4
21819 .previous
21820 #else
21821@@ -355,6 +427,7 @@ default_entry:
21822 movl pa(mmu_cr4_features),%eax
21823 movl %eax,%cr4
21824
21825+#ifdef CONFIG_X86_PAE
21826 testb $X86_CR4_PAE, %al # check if PAE is enabled
21827 jz enable_paging
21828
21829@@ -383,6 +456,9 @@ default_entry:
21830 /* Make changes effective */
21831 wrmsr
21832
21833+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
21834+#endif
21835+
21836 enable_paging:
21837
21838 /*
21839@@ -451,14 +527,20 @@ is486:
21840 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
21841 movl %eax,%ss # after changing gdt.
21842
21843- movl $(__USER_DS),%eax # DS/ES contains default USER segment
21844+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
21845 movl %eax,%ds
21846 movl %eax,%es
21847
21848 movl $(__KERNEL_PERCPU), %eax
21849 movl %eax,%fs # set this cpu's percpu
21850
21851+#ifdef CONFIG_CC_STACKPROTECTOR
21852 movl $(__KERNEL_STACK_CANARY),%eax
21853+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
21854+ movl $(__USER_DS),%eax
21855+#else
21856+ xorl %eax,%eax
21857+#endif
21858 movl %eax,%gs
21859
21860 xorl %eax,%eax # Clear LDT
21861@@ -534,8 +616,11 @@ setup_once:
21862 * relocation. Manually set base address in stack canary
21863 * segment descriptor.
21864 */
21865- movl $gdt_page,%eax
21866+ movl $cpu_gdt_table,%eax
21867 movl $stack_canary,%ecx
21868+#ifdef CONFIG_SMP
21869+ addl $__per_cpu_load,%ecx
21870+#endif
21871 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
21872 shrl $16, %ecx
21873 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
21874@@ -566,7 +651,7 @@ ENDPROC(early_idt_handlers)
21875 /* This is global to keep gas from relaxing the jumps */
21876 ENTRY(early_idt_handler)
21877 cld
21878- cmpl $2,%ss:early_recursion_flag
21879+ cmpl $1,%ss:early_recursion_flag
21880 je hlt_loop
21881 incl %ss:early_recursion_flag
21882
21883@@ -604,8 +689,8 @@ ENTRY(early_idt_handler)
21884 pushl (20+6*4)(%esp) /* trapno */
21885 pushl $fault_msg
21886 call printk
21887-#endif
21888 call dump_stack
21889+#endif
21890 hlt_loop:
21891 hlt
21892 jmp hlt_loop
21893@@ -624,8 +709,11 @@ ENDPROC(early_idt_handler)
21894 /* This is the default interrupt "handler" :-) */
21895 ALIGN
21896 ignore_int:
21897- cld
21898 #ifdef CONFIG_PRINTK
21899+ cmpl $2,%ss:early_recursion_flag
21900+ je hlt_loop
21901+ incl %ss:early_recursion_flag
21902+ cld
21903 pushl %eax
21904 pushl %ecx
21905 pushl %edx
21906@@ -634,9 +722,6 @@ ignore_int:
21907 movl $(__KERNEL_DS),%eax
21908 movl %eax,%ds
21909 movl %eax,%es
21910- cmpl $2,early_recursion_flag
21911- je hlt_loop
21912- incl early_recursion_flag
21913 pushl 16(%esp)
21914 pushl 24(%esp)
21915 pushl 32(%esp)
21916@@ -670,29 +755,43 @@ ENTRY(setup_once_ref)
21917 /*
21918 * BSS section
21919 */
21920-__PAGE_ALIGNED_BSS
21921- .align PAGE_SIZE
21922 #ifdef CONFIG_X86_PAE
21923+.section .initial_pg_pmd,"a",@progbits
21924 initial_pg_pmd:
21925 .fill 1024*KPMDS,4,0
21926 #else
21927+.section .initial_page_table,"a",@progbits
21928 ENTRY(initial_page_table)
21929 .fill 1024,4,0
21930 #endif
21931+.section .initial_pg_fixmap,"a",@progbits
21932 initial_pg_fixmap:
21933 .fill 1024,4,0
21934+.section .empty_zero_page,"a",@progbits
21935 ENTRY(empty_zero_page)
21936 .fill 4096,1,0
21937+.section .swapper_pg_dir,"a",@progbits
21938 ENTRY(swapper_pg_dir)
21939+#ifdef CONFIG_X86_PAE
21940+ .fill 4,8,0
21941+#else
21942 .fill 1024,4,0
21943+#endif
21944+
21945+/*
21946+ * The IDT has to be page-aligned to simplify the Pentium
21947+ * F0 0F bug workaround.. We have a special link segment
21948+ * for this.
21949+ */
21950+.section .idt,"a",@progbits
21951+ENTRY(idt_table)
21952+ .fill 256,8,0
21953
21954 /*
21955 * This starts the data section.
21956 */
21957 #ifdef CONFIG_X86_PAE
21958-__PAGE_ALIGNED_DATA
21959- /* Page-aligned for the benefit of paravirt? */
21960- .align PAGE_SIZE
21961+.section .initial_page_table,"a",@progbits
21962 ENTRY(initial_page_table)
21963 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
21964 # if KPMDS == 3
21965@@ -711,12 +810,20 @@ ENTRY(initial_page_table)
21966 # error "Kernel PMDs should be 1, 2 or 3"
21967 # endif
21968 .align PAGE_SIZE /* needs to be page-sized too */
21969+
21970+#ifdef CONFIG_PAX_PER_CPU_PGD
21971+ENTRY(cpu_pgd)
21972+ .rept 2*NR_CPUS
21973+ .fill 4,8,0
21974+ .endr
21975+#endif
21976+
21977 #endif
21978
21979 .data
21980 .balign 4
21981 ENTRY(stack_start)
21982- .long init_thread_union+THREAD_SIZE
21983+ .long init_thread_union+THREAD_SIZE-8
21984
21985 __INITRODATA
21986 int_msg:
21987@@ -744,7 +851,7 @@ fault_msg:
21988 * segment size, and 32-bit linear address value:
21989 */
21990
21991- .data
21992+.section .rodata,"a",@progbits
21993 .globl boot_gdt_descr
21994 .globl idt_descr
21995
21996@@ -753,7 +860,7 @@ fault_msg:
21997 .word 0 # 32 bit align gdt_desc.address
21998 boot_gdt_descr:
21999 .word __BOOT_DS+7
22000- .long boot_gdt - __PAGE_OFFSET
22001+ .long pa(boot_gdt)
22002
22003 .word 0 # 32-bit align idt_desc.address
22004 idt_descr:
22005@@ -764,7 +871,7 @@ idt_descr:
22006 .word 0 # 32 bit align gdt_desc.address
22007 ENTRY(early_gdt_descr)
22008 .word GDT_ENTRIES*8-1
22009- .long gdt_page /* Overwritten for secondary CPUs */
22010+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
22011
22012 /*
22013 * The boot_gdt must mirror the equivalent in setup.S and is
22014@@ -773,5 +880,65 @@ ENTRY(early_gdt_descr)
22015 .align L1_CACHE_BYTES
22016 ENTRY(boot_gdt)
22017 .fill GDT_ENTRY_BOOT_CS,8,0
22018- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
22019- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
22020+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
22021+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
22022+
22023+ .align PAGE_SIZE_asm
22024+ENTRY(cpu_gdt_table)
22025+ .rept NR_CPUS
22026+ .quad 0x0000000000000000 /* NULL descriptor */
22027+ .quad 0x0000000000000000 /* 0x0b reserved */
22028+ .quad 0x0000000000000000 /* 0x13 reserved */
22029+ .quad 0x0000000000000000 /* 0x1b reserved */
22030+
22031+#ifdef CONFIG_PAX_KERNEXEC
22032+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
22033+#else
22034+ .quad 0x0000000000000000 /* 0x20 unused */
22035+#endif
22036+
22037+ .quad 0x0000000000000000 /* 0x28 unused */
22038+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
22039+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
22040+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
22041+ .quad 0x0000000000000000 /* 0x4b reserved */
22042+ .quad 0x0000000000000000 /* 0x53 reserved */
22043+ .quad 0x0000000000000000 /* 0x5b reserved */
22044+
22045+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
22046+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
22047+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
22048+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
22049+
22050+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
22051+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
22052+
22053+ /*
22054+ * Segments used for calling PnP BIOS have byte granularity.
22055+ * The code segments and data segments have fixed 64k limits,
22056+ * the transfer segment sizes are set at run time.
22057+ */
22058+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
22059+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
22060+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
22061+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
22062+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
22063+
22064+ /*
22065+ * The APM segments have byte granularity and their bases
22066+ * are set at run time. All have 64k limits.
22067+ */
22068+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
22069+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
22070+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
22071+
22072+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
22073+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
22074+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
22075+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
22076+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
22077+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
22078+
22079+ /* Be sure this is zeroed to avoid false validations in Xen */
22080+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
22081+ .endr
22082diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
22083index a836860..1b5c665 100644
22084--- a/arch/x86/kernel/head_64.S
22085+++ b/arch/x86/kernel/head_64.S
22086@@ -20,6 +20,8 @@
22087 #include <asm/processor-flags.h>
22088 #include <asm/percpu.h>
22089 #include <asm/nops.h>
22090+#include <asm/cpufeature.h>
22091+#include <asm/alternative-asm.h>
22092
22093 #ifdef CONFIG_PARAVIRT
22094 #include <asm/asm-offsets.h>
22095@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
22096 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
22097 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
22098 L3_START_KERNEL = pud_index(__START_KERNEL_map)
22099+L4_VMALLOC_START = pgd_index(VMALLOC_START)
22100+L3_VMALLOC_START = pud_index(VMALLOC_START)
22101+L4_VMALLOC_END = pgd_index(VMALLOC_END)
22102+L3_VMALLOC_END = pud_index(VMALLOC_END)
22103+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
22104+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
22105
22106 .text
22107 __HEAD
22108@@ -89,11 +97,23 @@ startup_64:
22109 * Fixup the physical addresses in the page table
22110 */
22111 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
22112+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
22113+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
22114+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
22115+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
22116+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
22117
22118- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
22119- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
22120+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
22121+#ifndef CONFIG_XEN
22122+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
22123+#endif
22124
22125- addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
22126+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
22127+
22128+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
22129+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
22130+
22131+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
22132
22133 /*
22134 * Set up the identity mapping for the switchover. These
22135@@ -177,8 +197,8 @@ ENTRY(secondary_startup_64)
22136 movq $(init_level4_pgt - __START_KERNEL_map), %rax
22137 1:
22138
22139- /* Enable PAE mode and PGE */
22140- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
22141+ /* Enable PAE mode and PSE/PGE */
22142+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
22143 movq %rcx, %cr4
22144
22145 /* Setup early boot stage 4 level pagetables. */
22146@@ -199,10 +219,18 @@ ENTRY(secondary_startup_64)
22147 movl $MSR_EFER, %ecx
22148 rdmsr
22149 btsl $_EFER_SCE, %eax /* Enable System Call */
22150- btl $20,%edi /* No Execute supported? */
22151+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
22152 jnc 1f
22153 btsl $_EFER_NX, %eax
22154 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
22155+ leaq init_level4_pgt(%rip), %rdi
22156+#ifndef CONFIG_EFI
22157+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
22158+#endif
22159+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
22160+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
22161+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
22162+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
22163 1: wrmsr /* Make changes effective */
22164
22165 /* Setup cr0 */
22166@@ -282,6 +310,7 @@ ENTRY(secondary_startup_64)
22167 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
22168 * address given in m16:64.
22169 */
22170+ pax_set_fptr_mask
22171 movq initial_code(%rip),%rax
22172 pushq $0 # fake return address to stop unwinder
22173 pushq $__KERNEL_CS # set correct cs
22174@@ -388,7 +417,7 @@ ENTRY(early_idt_handler)
22175 call dump_stack
22176 #ifdef CONFIG_KALLSYMS
22177 leaq early_idt_ripmsg(%rip),%rdi
22178- movq 40(%rsp),%rsi # %rip again
22179+ movq 88(%rsp),%rsi # %rip again
22180 call __print_symbol
22181 #endif
22182 #endif /* EARLY_PRINTK */
22183@@ -416,6 +445,7 @@ ENDPROC(early_idt_handler)
22184 early_recursion_flag:
22185 .long 0
22186
22187+ .section .rodata,"a",@progbits
22188 #ifdef CONFIG_EARLY_PRINTK
22189 early_idt_msg:
22190 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
22191@@ -443,29 +473,52 @@ NEXT_PAGE(early_level4_pgt)
22192 NEXT_PAGE(early_dynamic_pgts)
22193 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
22194
22195- .data
22196+ .section .rodata,"a",@progbits
22197
22198-#ifndef CONFIG_XEN
22199 NEXT_PAGE(init_level4_pgt)
22200- .fill 512,8,0
22201-#else
22202-NEXT_PAGE(init_level4_pgt)
22203- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
22204 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
22205 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
22206+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
22207+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
22208+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
22209+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
22210+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
22211+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
22212 .org init_level4_pgt + L4_START_KERNEL*8, 0
22213 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
22214 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
22215
22216+#ifdef CONFIG_PAX_PER_CPU_PGD
22217+NEXT_PAGE(cpu_pgd)
22218+ .rept 2*NR_CPUS
22219+ .fill 512,8,0
22220+ .endr
22221+#endif
22222+
22223 NEXT_PAGE(level3_ident_pgt)
22224 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
22225+#ifdef CONFIG_XEN
22226 .fill 511, 8, 0
22227+#else
22228+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
22229+ .fill 510,8,0
22230+#endif
22231+
22232+NEXT_PAGE(level3_vmalloc_start_pgt)
22233+ .fill 512,8,0
22234+
22235+NEXT_PAGE(level3_vmalloc_end_pgt)
22236+ .fill 512,8,0
22237+
22238+NEXT_PAGE(level3_vmemmap_pgt)
22239+ .fill L3_VMEMMAP_START,8,0
22240+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
22241+
22242 NEXT_PAGE(level2_ident_pgt)
22243- /* Since I easily can, map the first 1G.
22244+ /* Since I easily can, map the first 2G.
22245 * Don't set NX because code runs from these pages.
22246 */
22247- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
22248-#endif
22249+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
22250
22251 NEXT_PAGE(level3_kernel_pgt)
22252 .fill L3_START_KERNEL,8,0
22253@@ -473,6 +526,9 @@ NEXT_PAGE(level3_kernel_pgt)
22254 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
22255 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
22256
22257+NEXT_PAGE(level2_vmemmap_pgt)
22258+ .fill 512,8,0
22259+
22260 NEXT_PAGE(level2_kernel_pgt)
22261 /*
22262 * 512 MB kernel mapping. We spend a full page on this pagetable
22263@@ -488,39 +544,70 @@ NEXT_PAGE(level2_kernel_pgt)
22264 KERNEL_IMAGE_SIZE/PMD_SIZE)
22265
22266 NEXT_PAGE(level2_fixmap_pgt)
22267- .fill 506,8,0
22268- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
22269- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
22270- .fill 5,8,0
22271+ .fill 507,8,0
22272+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
22273+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
22274+ .fill 4,8,0
22275
22276-NEXT_PAGE(level1_fixmap_pgt)
22277+NEXT_PAGE(level1_vsyscall_pgt)
22278 .fill 512,8,0
22279
22280 #undef PMDS
22281
22282- .data
22283+ .align PAGE_SIZE
22284+ENTRY(cpu_gdt_table)
22285+ .rept NR_CPUS
22286+ .quad 0x0000000000000000 /* NULL descriptor */
22287+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
22288+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
22289+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
22290+ .quad 0x00cffb000000ffff /* __USER32_CS */
22291+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
22292+ .quad 0x00affb000000ffff /* __USER_CS */
22293+
22294+#ifdef CONFIG_PAX_KERNEXEC
22295+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
22296+#else
22297+ .quad 0x0 /* unused */
22298+#endif
22299+
22300+ .quad 0,0 /* TSS */
22301+ .quad 0,0 /* LDT */
22302+ .quad 0,0,0 /* three TLS descriptors */
22303+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
22304+ /* asm/segment.h:GDT_ENTRIES must match this */
22305+
22306+#ifdef CONFIG_PAX_MEMORY_UDEREF
22307+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
22308+#else
22309+ .quad 0x0 /* unused */
22310+#endif
22311+
22312+ /* zero the remaining page */
22313+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
22314+ .endr
22315+
22316 .align 16
22317 .globl early_gdt_descr
22318 early_gdt_descr:
22319 .word GDT_ENTRIES*8-1
22320 early_gdt_descr_base:
22321- .quad INIT_PER_CPU_VAR(gdt_page)
22322+ .quad cpu_gdt_table
22323
22324 ENTRY(phys_base)
22325 /* This must match the first entry in level2_kernel_pgt */
22326 .quad 0x0000000000000000
22327
22328 #include "../../x86/xen/xen-head.S"
22329-
22330- .section .bss, "aw", @nobits
22331+
22332+ .section .rodata,"a",@progbits
22333+NEXT_PAGE(empty_zero_page)
22334+ .skip PAGE_SIZE
22335+
22336 .align PAGE_SIZE
22337 ENTRY(idt_table)
22338- .skip IDT_ENTRIES * 16
22339+ .fill 512,8,0
22340
22341 .align L1_CACHE_BYTES
22342 ENTRY(nmi_idt_table)
22343- .skip IDT_ENTRIES * 16
22344-
22345- __PAGE_ALIGNED_BSS
22346-NEXT_PAGE(empty_zero_page)
22347- .skip PAGE_SIZE
22348+ .fill 512,8,0
22349diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
22350index 0fa6912..b37438b 100644
22351--- a/arch/x86/kernel/i386_ksyms_32.c
22352+++ b/arch/x86/kernel/i386_ksyms_32.c
22353@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
22354 EXPORT_SYMBOL(cmpxchg8b_emu);
22355 #endif
22356
22357+EXPORT_SYMBOL_GPL(cpu_gdt_table);
22358+
22359 /* Networking helper routines. */
22360 EXPORT_SYMBOL(csum_partial_copy_generic);
22361+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
22362+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
22363
22364 EXPORT_SYMBOL(__get_user_1);
22365 EXPORT_SYMBOL(__get_user_2);
22366@@ -37,3 +41,11 @@ EXPORT_SYMBOL(strstr);
22367
22368 EXPORT_SYMBOL(csum_partial);
22369 EXPORT_SYMBOL(empty_zero_page);
22370+
22371+#ifdef CONFIG_PAX_KERNEXEC
22372+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
22373+#endif
22374+
22375+#ifdef CONFIG_PAX_PER_CPU_PGD
22376+EXPORT_SYMBOL(cpu_pgd);
22377+#endif
22378diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
22379index f7ea30d..6318acc 100644
22380--- a/arch/x86/kernel/i387.c
22381+++ b/arch/x86/kernel/i387.c
22382@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
22383 static inline bool interrupted_user_mode(void)
22384 {
22385 struct pt_regs *regs = get_irq_regs();
22386- return regs && user_mode_vm(regs);
22387+ return regs && user_mode(regs);
22388 }
22389
22390 /*
22391diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
22392index 9a5c460..84868423 100644
22393--- a/arch/x86/kernel/i8259.c
22394+++ b/arch/x86/kernel/i8259.c
22395@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
22396 static void make_8259A_irq(unsigned int irq)
22397 {
22398 disable_irq_nosync(irq);
22399- io_apic_irqs &= ~(1<<irq);
22400+ io_apic_irqs &= ~(1UL<<irq);
22401 irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
22402 i8259A_chip.name);
22403 enable_irq(irq);
22404@@ -209,7 +209,7 @@ spurious_8259A_irq:
22405 "spurious 8259A interrupt: IRQ%d.\n", irq);
22406 spurious_irq_mask |= irqmask;
22407 }
22408- atomic_inc(&irq_err_count);
22409+ atomic_inc_unchecked(&irq_err_count);
22410 /*
22411 * Theoretically we do not have to handle this IRQ,
22412 * but in Linux this does not cause problems and is
22413@@ -333,14 +333,16 @@ static void init_8259A(int auto_eoi)
22414 /* (slave's support for AEOI in flat mode is to be investigated) */
22415 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
22416
22417+ pax_open_kernel();
22418 if (auto_eoi)
22419 /*
22420 * In AEOI mode we just have to mask the interrupt
22421 * when acking.
22422 */
22423- i8259A_chip.irq_mask_ack = disable_8259A_irq;
22424+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
22425 else
22426- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
22427+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
22428+ pax_close_kernel();
22429
22430 udelay(100); /* wait for 8259A to initialize */
22431
22432diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
22433index a979b5b..1d6db75 100644
22434--- a/arch/x86/kernel/io_delay.c
22435+++ b/arch/x86/kernel/io_delay.c
22436@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
22437 * Quirk table for systems that misbehave (lock up, etc.) if port
22438 * 0x80 is used:
22439 */
22440-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
22441+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
22442 {
22443 .callback = dmi_io_delay_0xed_port,
22444 .ident = "Compaq Presario V6000",
22445diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
22446index 4ddaf66..6292f4e 100644
22447--- a/arch/x86/kernel/ioport.c
22448+++ b/arch/x86/kernel/ioport.c
22449@@ -6,6 +6,7 @@
22450 #include <linux/sched.h>
22451 #include <linux/kernel.h>
22452 #include <linux/capability.h>
22453+#include <linux/security.h>
22454 #include <linux/errno.h>
22455 #include <linux/types.h>
22456 #include <linux/ioport.h>
22457@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
22458
22459 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
22460 return -EINVAL;
22461+#ifdef CONFIG_GRKERNSEC_IO
22462+ if (turn_on && grsec_disable_privio) {
22463+ gr_handle_ioperm();
22464+ return -EPERM;
22465+ }
22466+#endif
22467 if (turn_on && !capable(CAP_SYS_RAWIO))
22468 return -EPERM;
22469
22470@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
22471 * because the ->io_bitmap_max value must match the bitmap
22472 * contents:
22473 */
22474- tss = &per_cpu(init_tss, get_cpu());
22475+ tss = init_tss + get_cpu();
22476
22477 if (turn_on)
22478 bitmap_clear(t->io_bitmap_ptr, from, num);
22479@@ -103,6 +110,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
22480 return -EINVAL;
22481 /* Trying to gain more privileges? */
22482 if (level > old) {
22483+#ifdef CONFIG_GRKERNSEC_IO
22484+ if (grsec_disable_privio) {
22485+ gr_handle_iopl();
22486+ return -EPERM;
22487+ }
22488+#endif
22489 if (!capable(CAP_SYS_RAWIO))
22490 return -EPERM;
22491 }
22492diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
22493index ac0631d..ff7cb62 100644
22494--- a/arch/x86/kernel/irq.c
22495+++ b/arch/x86/kernel/irq.c
22496@@ -18,7 +18,7 @@
22497 #include <asm/mce.h>
22498 #include <asm/hw_irq.h>
22499
22500-atomic_t irq_err_count;
22501+atomic_unchecked_t irq_err_count;
22502
22503 /* Function pointer for generic interrupt vector handling */
22504 void (*x86_platform_ipi_callback)(void) = NULL;
22505@@ -122,9 +122,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
22506 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
22507 seq_printf(p, " Machine check polls\n");
22508 #endif
22509- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
22510+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
22511 #if defined(CONFIG_X86_IO_APIC)
22512- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
22513+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
22514 #endif
22515 return 0;
22516 }
22517@@ -164,7 +164,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
22518
22519 u64 arch_irq_stat(void)
22520 {
22521- u64 sum = atomic_read(&irq_err_count);
22522+ u64 sum = atomic_read_unchecked(&irq_err_count);
22523 return sum;
22524 }
22525
22526diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
22527index 344faf8..355f60d 100644
22528--- a/arch/x86/kernel/irq_32.c
22529+++ b/arch/x86/kernel/irq_32.c
22530@@ -39,7 +39,7 @@ static int check_stack_overflow(void)
22531 __asm__ __volatile__("andl %%esp,%0" :
22532 "=r" (sp) : "0" (THREAD_SIZE - 1));
22533
22534- return sp < (sizeof(struct thread_info) + STACK_WARN);
22535+ return sp < STACK_WARN;
22536 }
22537
22538 static void print_stack_overflow(void)
22539@@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
22540 * per-CPU IRQ handling contexts (thread information and stack)
22541 */
22542 union irq_ctx {
22543- struct thread_info tinfo;
22544- u32 stack[THREAD_SIZE/sizeof(u32)];
22545+ unsigned long previous_esp;
22546+ u32 stack[THREAD_SIZE/sizeof(u32)];
22547 } __attribute__((aligned(THREAD_SIZE)));
22548
22549 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
22550@@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
22551 static inline int
22552 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
22553 {
22554- union irq_ctx *curctx, *irqctx;
22555+ union irq_ctx *irqctx;
22556 u32 *isp, arg1, arg2;
22557
22558- curctx = (union irq_ctx *) current_thread_info();
22559 irqctx = __this_cpu_read(hardirq_ctx);
22560
22561 /*
22562@@ -92,16 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
22563 * handler) we can't do that and just have to keep using the
22564 * current stack (which is the irq stack already after all)
22565 */
22566- if (unlikely(curctx == irqctx))
22567+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
22568 return 0;
22569
22570 /* build the stack frame on the IRQ stack */
22571- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
22572- irqctx->tinfo.task = curctx->tinfo.task;
22573- irqctx->tinfo.previous_esp = current_stack_pointer;
22574+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
22575+ irqctx->previous_esp = current_stack_pointer;
22576
22577- /* Copy the preempt_count so that the [soft]irq checks work. */
22578- irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
22579+#ifdef CONFIG_PAX_MEMORY_UDEREF
22580+ __set_fs(MAKE_MM_SEG(0));
22581+#endif
22582
22583 if (unlikely(overflow))
22584 call_on_stack(print_stack_overflow, isp);
22585@@ -113,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
22586 : "0" (irq), "1" (desc), "2" (isp),
22587 "D" (desc->handle_irq)
22588 : "memory", "cc", "ecx");
22589+
22590+#ifdef CONFIG_PAX_MEMORY_UDEREF
22591+ __set_fs(current_thread_info()->addr_limit);
22592+#endif
22593+
22594 return 1;
22595 }
22596
22597@@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
22598 */
22599 void __cpuinit irq_ctx_init(int cpu)
22600 {
22601- union irq_ctx *irqctx;
22602-
22603 if (per_cpu(hardirq_ctx, cpu))
22604 return;
22605
22606- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
22607- THREADINFO_GFP,
22608- THREAD_SIZE_ORDER));
22609- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
22610- irqctx->tinfo.cpu = cpu;
22611- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
22612- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
22613-
22614- per_cpu(hardirq_ctx, cpu) = irqctx;
22615-
22616- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
22617- THREADINFO_GFP,
22618- THREAD_SIZE_ORDER));
22619- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
22620- irqctx->tinfo.cpu = cpu;
22621- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
22622-
22623- per_cpu(softirq_ctx, cpu) = irqctx;
22624+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
22625+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
22626+
22627+ printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
22628+ cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
22629
22630 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
22631 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
22632@@ -152,7 +141,6 @@ void __cpuinit irq_ctx_init(int cpu)
22633 asmlinkage void do_softirq(void)
22634 {
22635 unsigned long flags;
22636- struct thread_info *curctx;
22637 union irq_ctx *irqctx;
22638 u32 *isp;
22639
22640@@ -162,15 +150,22 @@ asmlinkage void do_softirq(void)
22641 local_irq_save(flags);
22642
22643 if (local_softirq_pending()) {
22644- curctx = current_thread_info();
22645 irqctx = __this_cpu_read(softirq_ctx);
22646- irqctx->tinfo.task = curctx->task;
22647- irqctx->tinfo.previous_esp = current_stack_pointer;
22648+ irqctx->previous_esp = current_stack_pointer;
22649
22650 /* build the stack frame on the softirq stack */
22651- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
22652+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
22653+
22654+#ifdef CONFIG_PAX_MEMORY_UDEREF
22655+ __set_fs(MAKE_MM_SEG(0));
22656+#endif
22657
22658 call_on_stack(__do_softirq, isp);
22659+
22660+#ifdef CONFIG_PAX_MEMORY_UDEREF
22661+ __set_fs(current_thread_info()->addr_limit);
22662+#endif
22663+
22664 /*
22665 * Shouldn't happen, we returned above if in_interrupt():
22666 */
22667@@ -191,7 +186,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
22668 if (unlikely(!desc))
22669 return false;
22670
22671- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
22672+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
22673 if (unlikely(overflow))
22674 print_stack_overflow();
22675 desc->handle_irq(irq, desc);
22676diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
22677index d04d3ec..ea4b374 100644
22678--- a/arch/x86/kernel/irq_64.c
22679+++ b/arch/x86/kernel/irq_64.c
22680@@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
22681 u64 estack_top, estack_bottom;
22682 u64 curbase = (u64)task_stack_page(current);
22683
22684- if (user_mode_vm(regs))
22685+ if (user_mode(regs))
22686 return;
22687
22688 if (regs->sp >= curbase + sizeof(struct thread_info) +
22689diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
22690index dc1404b..bbc43e7 100644
22691--- a/arch/x86/kernel/kdebugfs.c
22692+++ b/arch/x86/kernel/kdebugfs.c
22693@@ -27,7 +27,7 @@ struct setup_data_node {
22694 u32 len;
22695 };
22696
22697-static ssize_t setup_data_read(struct file *file, char __user *user_buf,
22698+static ssize_t __size_overflow(3) setup_data_read(struct file *file, char __user *user_buf,
22699 size_t count, loff_t *ppos)
22700 {
22701 struct setup_data_node *node = file->private_data;
22702diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
22703index 836f832..a8bda67 100644
22704--- a/arch/x86/kernel/kgdb.c
22705+++ b/arch/x86/kernel/kgdb.c
22706@@ -127,11 +127,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
22707 #ifdef CONFIG_X86_32
22708 switch (regno) {
22709 case GDB_SS:
22710- if (!user_mode_vm(regs))
22711+ if (!user_mode(regs))
22712 *(unsigned long *)mem = __KERNEL_DS;
22713 break;
22714 case GDB_SP:
22715- if (!user_mode_vm(regs))
22716+ if (!user_mode(regs))
22717 *(unsigned long *)mem = kernel_stack_pointer(regs);
22718 break;
22719 case GDB_GS:
22720@@ -229,7 +229,10 @@ static void kgdb_correct_hw_break(void)
22721 bp->attr.bp_addr = breakinfo[breakno].addr;
22722 bp->attr.bp_len = breakinfo[breakno].len;
22723 bp->attr.bp_type = breakinfo[breakno].type;
22724- info->address = breakinfo[breakno].addr;
22725+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
22726+ info->address = ktla_ktva(breakinfo[breakno].addr);
22727+ else
22728+ info->address = breakinfo[breakno].addr;
22729 info->len = breakinfo[breakno].len;
22730 info->type = breakinfo[breakno].type;
22731 val = arch_install_hw_breakpoint(bp);
22732@@ -476,12 +479,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
22733 case 'k':
22734 /* clear the trace bit */
22735 linux_regs->flags &= ~X86_EFLAGS_TF;
22736- atomic_set(&kgdb_cpu_doing_single_step, -1);
22737+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
22738
22739 /* set the trace bit if we're stepping */
22740 if (remcomInBuffer[0] == 's') {
22741 linux_regs->flags |= X86_EFLAGS_TF;
22742- atomic_set(&kgdb_cpu_doing_single_step,
22743+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
22744 raw_smp_processor_id());
22745 }
22746
22747@@ -546,7 +549,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
22748
22749 switch (cmd) {
22750 case DIE_DEBUG:
22751- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
22752+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
22753 if (user_mode(regs))
22754 return single_step_cont(regs, args);
22755 break;
22756@@ -751,11 +754,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
22757 #endif /* CONFIG_DEBUG_RODATA */
22758
22759 bpt->type = BP_BREAKPOINT;
22760- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
22761+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
22762 BREAK_INSTR_SIZE);
22763 if (err)
22764 return err;
22765- err = probe_kernel_write((char *)bpt->bpt_addr,
22766+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
22767 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
22768 #ifdef CONFIG_DEBUG_RODATA
22769 if (!err)
22770@@ -768,7 +771,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
22771 return -EBUSY;
22772 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
22773 BREAK_INSTR_SIZE);
22774- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
22775+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
22776 if (err)
22777 return err;
22778 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
22779@@ -793,13 +796,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
22780 if (mutex_is_locked(&text_mutex))
22781 goto knl_write;
22782 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
22783- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
22784+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
22785 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
22786 goto knl_write;
22787 return err;
22788 knl_write:
22789 #endif /* CONFIG_DEBUG_RODATA */
22790- return probe_kernel_write((char *)bpt->bpt_addr,
22791+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
22792 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
22793 }
22794
22795diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
22796index 211bce4..6e2580a 100644
22797--- a/arch/x86/kernel/kprobes/core.c
22798+++ b/arch/x86/kernel/kprobes/core.c
22799@@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
22800 s32 raddr;
22801 } __packed *insn;
22802
22803- insn = (struct __arch_relative_insn *)from;
22804+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
22805+
22806+ pax_open_kernel();
22807 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
22808 insn->op = op;
22809+ pax_close_kernel();
22810 }
22811
22812 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
22813@@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
22814 kprobe_opcode_t opcode;
22815 kprobe_opcode_t *orig_opcodes = opcodes;
22816
22817- if (search_exception_tables((unsigned long)opcodes))
22818+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
22819 return 0; /* Page fault may occur on this address. */
22820
22821 retry:
22822@@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
22823 * for the first byte, we can recover the original instruction
22824 * from it and kp->opcode.
22825 */
22826- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
22827+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
22828 buf[0] = kp->opcode;
22829- return (unsigned long)buf;
22830+ return ktva_ktla((unsigned long)buf);
22831 }
22832
22833 /*
22834@@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
22835 /* Another subsystem puts a breakpoint, failed to recover */
22836 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
22837 return 0;
22838+ pax_open_kernel();
22839 memcpy(dest, insn.kaddr, insn.length);
22840+ pax_close_kernel();
22841
22842 #ifdef CONFIG_X86_64
22843 if (insn_rip_relative(&insn)) {
22844@@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
22845 return 0;
22846 }
22847 disp = (u8 *) dest + insn_offset_displacement(&insn);
22848+ pax_open_kernel();
22849 *(s32 *) disp = (s32) newdisp;
22850+ pax_close_kernel();
22851 }
22852 #endif
22853 return insn.length;
22854@@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
22855 * nor set current_kprobe, because it doesn't use single
22856 * stepping.
22857 */
22858- regs->ip = (unsigned long)p->ainsn.insn;
22859+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
22860 preempt_enable_no_resched();
22861 return;
22862 }
22863@@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
22864 regs->flags &= ~X86_EFLAGS_IF;
22865 /* single step inline if the instruction is an int3 */
22866 if (p->opcode == BREAKPOINT_INSTRUCTION)
22867- regs->ip = (unsigned long)p->addr;
22868+ regs->ip = ktla_ktva((unsigned long)p->addr);
22869 else
22870- regs->ip = (unsigned long)p->ainsn.insn;
22871+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
22872 }
22873
22874 /*
22875@@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
22876 setup_singlestep(p, regs, kcb, 0);
22877 return 1;
22878 }
22879- } else if (*addr != BREAKPOINT_INSTRUCTION) {
22880+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
22881 /*
22882 * The breakpoint instruction was removed right
22883 * after we hit it. Another cpu has removed
22884@@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
22885 " movq %rax, 152(%rsp)\n"
22886 RESTORE_REGS_STRING
22887 " popfq\n"
22888+#ifdef KERNEXEC_PLUGIN
22889+ " btsq $63,(%rsp)\n"
22890+#endif
22891 #else
22892 " pushf\n"
22893 SAVE_REGS_STRING
22894@@ -779,7 +789,7 @@ static void __kprobes
22895 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
22896 {
22897 unsigned long *tos = stack_addr(regs);
22898- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
22899+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
22900 unsigned long orig_ip = (unsigned long)p->addr;
22901 kprobe_opcode_t *insn = p->ainsn.insn;
22902
22903@@ -961,7 +971,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
22904 struct die_args *args = data;
22905 int ret = NOTIFY_DONE;
22906
22907- if (args->regs && user_mode_vm(args->regs))
22908+ if (args->regs && user_mode(args->regs))
22909 return ret;
22910
22911 switch (val) {
22912diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
22913index 76dc6f0..66bdfc3 100644
22914--- a/arch/x86/kernel/kprobes/opt.c
22915+++ b/arch/x86/kernel/kprobes/opt.c
22916@@ -79,6 +79,7 @@ found:
22917 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
22918 static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
22919 {
22920+ pax_open_kernel();
22921 #ifdef CONFIG_X86_64
22922 *addr++ = 0x48;
22923 *addr++ = 0xbf;
22924@@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
22925 *addr++ = 0xb8;
22926 #endif
22927 *(unsigned long *)addr = val;
22928+ pax_close_kernel();
22929 }
22930
22931 static void __used __kprobes kprobes_optinsn_template_holder(void)
22932@@ -338,7 +340,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
22933 * Verify if the address gap is in 2GB range, because this uses
22934 * a relative jump.
22935 */
22936- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
22937+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
22938 if (abs(rel) > 0x7fffffff)
22939 return -ERANGE;
22940
22941@@ -353,16 +355,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
22942 op->optinsn.size = ret;
22943
22944 /* Copy arch-dep-instance from template */
22945- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
22946+ pax_open_kernel();
22947+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
22948+ pax_close_kernel();
22949
22950 /* Set probe information */
22951 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
22952
22953 /* Set probe function call */
22954- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
22955+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
22956
22957 /* Set returning jmp instruction at the tail of out-of-line buffer */
22958- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
22959+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
22960 (u8 *)op->kp.addr + op->optinsn.size);
22961
22962 flush_icache_range((unsigned long) buf,
22963@@ -385,7 +389,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
22964 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
22965
22966 /* Backup instructions which will be replaced by jump address */
22967- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
22968+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
22969 RELATIVE_ADDR_SIZE);
22970
22971 insn_buf[0] = RELATIVEJUMP_OPCODE;
22972@@ -483,7 +487,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
22973 /* This kprobe is really able to run optimized path. */
22974 op = container_of(p, struct optimized_kprobe, kp);
22975 /* Detour through copied instructions */
22976- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
22977+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
22978 if (!reenter)
22979 reset_current_kprobe();
22980 preempt_enable_no_resched();
22981diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
22982index cd6d9a5..16245a4 100644
22983--- a/arch/x86/kernel/kvm.c
22984+++ b/arch/x86/kernel/kvm.c
22985@@ -455,7 +455,7 @@ static int __cpuinit kvm_cpu_notify(struct notifier_block *self,
22986 return NOTIFY_OK;
22987 }
22988
22989-static struct notifier_block __cpuinitdata kvm_cpu_notifier = {
22990+static struct notifier_block kvm_cpu_notifier = {
22991 .notifier_call = kvm_cpu_notify,
22992 };
22993 #endif
22994diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
22995index ebc9873..1b9724b 100644
22996--- a/arch/x86/kernel/ldt.c
22997+++ b/arch/x86/kernel/ldt.c
22998@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
22999 if (reload) {
23000 #ifdef CONFIG_SMP
23001 preempt_disable();
23002- load_LDT(pc);
23003+ load_LDT_nolock(pc);
23004 if (!cpumask_equal(mm_cpumask(current->mm),
23005 cpumask_of(smp_processor_id())))
23006 smp_call_function(flush_ldt, current->mm, 1);
23007 preempt_enable();
23008 #else
23009- load_LDT(pc);
23010+ load_LDT_nolock(pc);
23011 #endif
23012 }
23013 if (oldsize) {
23014@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
23015 return err;
23016
23017 for (i = 0; i < old->size; i++)
23018- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
23019+ write_ldt_entry(new->ldt, i, old->ldt + i);
23020 return 0;
23021 }
23022
23023@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
23024 retval = copy_ldt(&mm->context, &old_mm->context);
23025 mutex_unlock(&old_mm->context.lock);
23026 }
23027+
23028+ if (tsk == current) {
23029+ mm->context.vdso = 0;
23030+
23031+#ifdef CONFIG_X86_32
23032+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23033+ mm->context.user_cs_base = 0UL;
23034+ mm->context.user_cs_limit = ~0UL;
23035+
23036+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
23037+ cpus_clear(mm->context.cpu_user_cs_mask);
23038+#endif
23039+
23040+#endif
23041+#endif
23042+
23043+ }
23044+
23045 return retval;
23046 }
23047
23048@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
23049 }
23050 }
23051
23052+#ifdef CONFIG_PAX_SEGMEXEC
23053+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
23054+ error = -EINVAL;
23055+ goto out_unlock;
23056+ }
23057+#endif
23058+
23059 fill_ldt(&ldt, &ldt_info);
23060 if (oldmode)
23061 ldt.avl = 0;
23062diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
23063index 5b19e4d..6476a76 100644
23064--- a/arch/x86/kernel/machine_kexec_32.c
23065+++ b/arch/x86/kernel/machine_kexec_32.c
23066@@ -26,7 +26,7 @@
23067 #include <asm/cacheflush.h>
23068 #include <asm/debugreg.h>
23069
23070-static void set_idt(void *newidt, __u16 limit)
23071+static void set_idt(struct desc_struct *newidt, __u16 limit)
23072 {
23073 struct desc_ptr curidt;
23074
23075@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
23076 }
23077
23078
23079-static void set_gdt(void *newgdt, __u16 limit)
23080+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
23081 {
23082 struct desc_ptr curgdt;
23083
23084@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
23085 }
23086
23087 control_page = page_address(image->control_code_page);
23088- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
23089+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
23090
23091 relocate_kernel_ptr = control_page;
23092 page_list[PA_CONTROL_PAGE] = __pa(control_page);
23093diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
23094index 22db92b..d546bec 100644
23095--- a/arch/x86/kernel/microcode_core.c
23096+++ b/arch/x86/kernel/microcode_core.c
23097@@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
23098 return NOTIFY_OK;
23099 }
23100
23101-static struct notifier_block __refdata mc_cpu_notifier = {
23102+static struct notifier_block mc_cpu_notifier = {
23103 .notifier_call = mc_cpu_callback,
23104 };
23105
23106diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
23107index 5fb2ceb..3ae90bb 100644
23108--- a/arch/x86/kernel/microcode_intel.c
23109+++ b/arch/x86/kernel/microcode_intel.c
23110@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
23111
23112 static int get_ucode_user(void *to, const void *from, size_t n)
23113 {
23114- return copy_from_user(to, from, n);
23115+ return copy_from_user(to, (const void __force_user *)from, n);
23116 }
23117
23118 static enum ucode_state
23119 request_microcode_user(int cpu, const void __user *buf, size_t size)
23120 {
23121- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
23122+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
23123 }
23124
23125 static void microcode_fini_cpu(int cpu)
23126diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
23127index 216a4d7..228255a 100644
23128--- a/arch/x86/kernel/module.c
23129+++ b/arch/x86/kernel/module.c
23130@@ -43,15 +43,60 @@ do { \
23131 } while (0)
23132 #endif
23133
23134-void *module_alloc(unsigned long size)
23135+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
23136 {
23137- if (PAGE_ALIGN(size) > MODULES_LEN)
23138+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
23139 return NULL;
23140 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
23141- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
23142+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
23143 -1, __builtin_return_address(0));
23144 }
23145
23146+void *module_alloc(unsigned long size)
23147+{
23148+
23149+#ifdef CONFIG_PAX_KERNEXEC
23150+ return __module_alloc(size, PAGE_KERNEL);
23151+#else
23152+ return __module_alloc(size, PAGE_KERNEL_EXEC);
23153+#endif
23154+
23155+}
23156+
23157+#ifdef CONFIG_PAX_KERNEXEC
23158+#ifdef CONFIG_X86_32
23159+void *module_alloc_exec(unsigned long size)
23160+{
23161+ struct vm_struct *area;
23162+
23163+ if (size == 0)
23164+ return NULL;
23165+
23166+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
23167+ return area ? area->addr : NULL;
23168+}
23169+EXPORT_SYMBOL(module_alloc_exec);
23170+
23171+void module_free_exec(struct module *mod, void *module_region)
23172+{
23173+ vunmap(module_region);
23174+}
23175+EXPORT_SYMBOL(module_free_exec);
23176+#else
23177+void module_free_exec(struct module *mod, void *module_region)
23178+{
23179+ module_free(mod, module_region);
23180+}
23181+EXPORT_SYMBOL(module_free_exec);
23182+
23183+void *module_alloc_exec(unsigned long size)
23184+{
23185+ return __module_alloc(size, PAGE_KERNEL_RX);
23186+}
23187+EXPORT_SYMBOL(module_alloc_exec);
23188+#endif
23189+#endif
23190+
23191 #ifdef CONFIG_X86_32
23192 int apply_relocate(Elf32_Shdr *sechdrs,
23193 const char *strtab,
23194@@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
23195 unsigned int i;
23196 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
23197 Elf32_Sym *sym;
23198- uint32_t *location;
23199+ uint32_t *plocation, location;
23200
23201 DEBUGP("Applying relocate section %u to %u\n",
23202 relsec, sechdrs[relsec].sh_info);
23203 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
23204 /* This is where to make the change */
23205- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
23206- + rel[i].r_offset;
23207+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
23208+ location = (uint32_t)plocation;
23209+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
23210+ plocation = ktla_ktva((void *)plocation);
23211 /* This is the symbol it is referring to. Note that all
23212 undefined symbols have been resolved. */
23213 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
23214@@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
23215 switch (ELF32_R_TYPE(rel[i].r_info)) {
23216 case R_386_32:
23217 /* We add the value into the location given */
23218- *location += sym->st_value;
23219+ pax_open_kernel();
23220+ *plocation += sym->st_value;
23221+ pax_close_kernel();
23222 break;
23223 case R_386_PC32:
23224 /* Add the value, subtract its position */
23225- *location += sym->st_value - (uint32_t)location;
23226+ pax_open_kernel();
23227+ *plocation += sym->st_value - location;
23228+ pax_close_kernel();
23229 break;
23230 default:
23231 pr_err("%s: Unknown relocation: %u\n",
23232@@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
23233 case R_X86_64_NONE:
23234 break;
23235 case R_X86_64_64:
23236+ pax_open_kernel();
23237 *(u64 *)loc = val;
23238+ pax_close_kernel();
23239 break;
23240 case R_X86_64_32:
23241+ pax_open_kernel();
23242 *(u32 *)loc = val;
23243+ pax_close_kernel();
23244 if (val != *(u32 *)loc)
23245 goto overflow;
23246 break;
23247 case R_X86_64_32S:
23248+ pax_open_kernel();
23249 *(s32 *)loc = val;
23250+ pax_close_kernel();
23251 if ((s64)val != *(s32 *)loc)
23252 goto overflow;
23253 break;
23254 case R_X86_64_PC32:
23255 val -= (u64)loc;
23256+ pax_open_kernel();
23257 *(u32 *)loc = val;
23258+ pax_close_kernel();
23259+
23260 #if 0
23261 if ((s64)val != *(s32 *)loc)
23262 goto overflow;
23263diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
23264index ce13049..e2e9c3c 100644
23265--- a/arch/x86/kernel/msr.c
23266+++ b/arch/x86/kernel/msr.c
23267@@ -233,7 +233,7 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
23268 return notifier_from_errno(err);
23269 }
23270
23271-static struct notifier_block __refdata msr_class_cpu_notifier = {
23272+static struct notifier_block msr_class_cpu_notifier = {
23273 .notifier_call = msr_class_cpu_callback,
23274 };
23275
23276diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
23277index 6030805..2d33f21 100644
23278--- a/arch/x86/kernel/nmi.c
23279+++ b/arch/x86/kernel/nmi.c
23280@@ -105,7 +105,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
23281 return handled;
23282 }
23283
23284-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
23285+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
23286 {
23287 struct nmi_desc *desc = nmi_to_desc(type);
23288 unsigned long flags;
23289@@ -129,9 +129,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
23290 * event confuses some handlers (kdump uses this flag)
23291 */
23292 if (action->flags & NMI_FLAG_FIRST)
23293- list_add_rcu(&action->list, &desc->head);
23294+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
23295 else
23296- list_add_tail_rcu(&action->list, &desc->head);
23297+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
23298
23299 spin_unlock_irqrestore(&desc->lock, flags);
23300 return 0;
23301@@ -154,7 +154,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
23302 if (!strcmp(n->name, name)) {
23303 WARN(in_nmi(),
23304 "Trying to free NMI (%s) from NMI context!\n", n->name);
23305- list_del_rcu(&n->list);
23306+ pax_list_del_rcu((struct list_head *)&n->list);
23307 break;
23308 }
23309 }
23310@@ -479,6 +479,17 @@ static inline void nmi_nesting_postprocess(void)
23311 dotraplinkage notrace __kprobes void
23312 do_nmi(struct pt_regs *regs, long error_code)
23313 {
23314+
23315+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
23316+ if (!user_mode(regs)) {
23317+ unsigned long cs = regs->cs & 0xFFFF;
23318+ unsigned long ip = ktva_ktla(regs->ip);
23319+
23320+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
23321+ regs->ip = ip;
23322+ }
23323+#endif
23324+
23325 nmi_nesting_preprocess(regs);
23326
23327 nmi_enter();
23328diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
23329index 6d9582e..f746287 100644
23330--- a/arch/x86/kernel/nmi_selftest.c
23331+++ b/arch/x86/kernel/nmi_selftest.c
23332@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
23333 {
23334 /* trap all the unknown NMIs we may generate */
23335 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
23336- __initdata);
23337+ __initconst);
23338 }
23339
23340 static void __init cleanup_nmi_testsuite(void)
23341@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
23342 unsigned long timeout;
23343
23344 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
23345- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
23346+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
23347 nmi_fail = FAILURE;
23348 return;
23349 }
23350diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
23351index 676b8c7..870ba04 100644
23352--- a/arch/x86/kernel/paravirt-spinlocks.c
23353+++ b/arch/x86/kernel/paravirt-spinlocks.c
23354@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
23355 arch_spin_lock(lock);
23356 }
23357
23358-struct pv_lock_ops pv_lock_ops = {
23359+struct pv_lock_ops pv_lock_ops __read_only = {
23360 #ifdef CONFIG_SMP
23361 .spin_is_locked = __ticket_spin_is_locked,
23362 .spin_is_contended = __ticket_spin_is_contended,
23363diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
23364index cd6de64..27c6af0 100644
23365--- a/arch/x86/kernel/paravirt.c
23366+++ b/arch/x86/kernel/paravirt.c
23367@@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
23368 {
23369 return x;
23370 }
23371+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
23372+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
23373+#endif
23374
23375 void __init default_banner(void)
23376 {
23377@@ -147,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
23378 if (opfunc == NULL)
23379 /* If there's no function, patch it with a ud2a (BUG) */
23380 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
23381- else if (opfunc == _paravirt_nop)
23382+ else if (opfunc == (void *)_paravirt_nop)
23383 /* If the operation is a nop, then nop the callsite */
23384 ret = paravirt_patch_nop();
23385
23386 /* identity functions just return their single argument */
23387- else if (opfunc == _paravirt_ident_32)
23388+ else if (opfunc == (void *)_paravirt_ident_32)
23389 ret = paravirt_patch_ident_32(insnbuf, len);
23390- else if (opfunc == _paravirt_ident_64)
23391+ else if (opfunc == (void *)_paravirt_ident_64)
23392 ret = paravirt_patch_ident_64(insnbuf, len);
23393+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
23394+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
23395+ ret = paravirt_patch_ident_64(insnbuf, len);
23396+#endif
23397
23398 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
23399 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
23400@@ -180,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
23401 if (insn_len > len || start == NULL)
23402 insn_len = len;
23403 else
23404- memcpy(insnbuf, start, insn_len);
23405+ memcpy(insnbuf, ktla_ktva(start), insn_len);
23406
23407 return insn_len;
23408 }
23409@@ -304,7 +311,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
23410 return this_cpu_read(paravirt_lazy_mode);
23411 }
23412
23413-struct pv_info pv_info = {
23414+struct pv_info pv_info __read_only = {
23415 .name = "bare hardware",
23416 .paravirt_enabled = 0,
23417 .kernel_rpl = 0,
23418@@ -315,16 +322,16 @@ struct pv_info pv_info = {
23419 #endif
23420 };
23421
23422-struct pv_init_ops pv_init_ops = {
23423+struct pv_init_ops pv_init_ops __read_only = {
23424 .patch = native_patch,
23425 };
23426
23427-struct pv_time_ops pv_time_ops = {
23428+struct pv_time_ops pv_time_ops __read_only = {
23429 .sched_clock = native_sched_clock,
23430 .steal_clock = native_steal_clock,
23431 };
23432
23433-struct pv_irq_ops pv_irq_ops = {
23434+struct pv_irq_ops pv_irq_ops __read_only = {
23435 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
23436 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
23437 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
23438@@ -336,7 +343,7 @@ struct pv_irq_ops pv_irq_ops = {
23439 #endif
23440 };
23441
23442-struct pv_cpu_ops pv_cpu_ops = {
23443+struct pv_cpu_ops pv_cpu_ops __read_only = {
23444 .cpuid = native_cpuid,
23445 .get_debugreg = native_get_debugreg,
23446 .set_debugreg = native_set_debugreg,
23447@@ -394,21 +401,26 @@ struct pv_cpu_ops pv_cpu_ops = {
23448 .end_context_switch = paravirt_nop,
23449 };
23450
23451-struct pv_apic_ops pv_apic_ops = {
23452+struct pv_apic_ops pv_apic_ops __read_only= {
23453 #ifdef CONFIG_X86_LOCAL_APIC
23454 .startup_ipi_hook = paravirt_nop,
23455 #endif
23456 };
23457
23458-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
23459+#ifdef CONFIG_X86_32
23460+#ifdef CONFIG_X86_PAE
23461+/* 64-bit pagetable entries */
23462+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
23463+#else
23464 /* 32-bit pagetable entries */
23465 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
23466+#endif
23467 #else
23468 /* 64-bit pagetable entries */
23469 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
23470 #endif
23471
23472-struct pv_mmu_ops pv_mmu_ops = {
23473+struct pv_mmu_ops pv_mmu_ops __read_only = {
23474
23475 .read_cr2 = native_read_cr2,
23476 .write_cr2 = native_write_cr2,
23477@@ -458,6 +470,7 @@ struct pv_mmu_ops pv_mmu_ops = {
23478 .make_pud = PTE_IDENT,
23479
23480 .set_pgd = native_set_pgd,
23481+ .set_pgd_batched = native_set_pgd_batched,
23482 #endif
23483 #endif /* PAGETABLE_LEVELS >= 3 */
23484
23485@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
23486 },
23487
23488 .set_fixmap = native_set_fixmap,
23489+
23490+#ifdef CONFIG_PAX_KERNEXEC
23491+ .pax_open_kernel = native_pax_open_kernel,
23492+ .pax_close_kernel = native_pax_close_kernel,
23493+#endif
23494+
23495 };
23496
23497 EXPORT_SYMBOL_GPL(pv_time_ops);
23498diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
23499index 299d493..2ccb0ee 100644
23500--- a/arch/x86/kernel/pci-calgary_64.c
23501+++ b/arch/x86/kernel/pci-calgary_64.c
23502@@ -1339,7 +1339,7 @@ static void __init get_tce_space_from_tar(void)
23503 tce_space = be64_to_cpu(readq(target));
23504 tce_space = tce_space & TAR_SW_BITS;
23505
23506- tce_space = tce_space & (~specified_table_size);
23507+ tce_space = tce_space & (~(unsigned long)specified_table_size);
23508 info->tce_space = (u64 *)__va(tce_space);
23509 }
23510 }
23511diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
23512index 35ccf75..7a15747 100644
23513--- a/arch/x86/kernel/pci-iommu_table.c
23514+++ b/arch/x86/kernel/pci-iommu_table.c
23515@@ -2,7 +2,7 @@
23516 #include <asm/iommu_table.h>
23517 #include <linux/string.h>
23518 #include <linux/kallsyms.h>
23519-
23520+#include <linux/sched.h>
23521
23522 #define DEBUG 1
23523
23524diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
23525index 6c483ba..d10ce2f 100644
23526--- a/arch/x86/kernel/pci-swiotlb.c
23527+++ b/arch/x86/kernel/pci-swiotlb.c
23528@@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
23529 void *vaddr, dma_addr_t dma_addr,
23530 struct dma_attrs *attrs)
23531 {
23532- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
23533+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
23534 }
23535
23536 static struct dma_map_ops swiotlb_dma_ops = {
23537diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
23538index 81a5f5e..20f8b58 100644
23539--- a/arch/x86/kernel/process.c
23540+++ b/arch/x86/kernel/process.c
23541@@ -36,7 +36,8 @@
23542 * section. Since TSS's are completely CPU-local, we want them
23543 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
23544 */
23545-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
23546+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
23547+EXPORT_SYMBOL(init_tss);
23548
23549 #ifdef CONFIG_X86_64
23550 static DEFINE_PER_CPU(unsigned char, is_idle);
23551@@ -92,7 +93,7 @@ void arch_task_cache_init(void)
23552 task_xstate_cachep =
23553 kmem_cache_create("task_xstate", xstate_size,
23554 __alignof__(union thread_xstate),
23555- SLAB_PANIC | SLAB_NOTRACK, NULL);
23556+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
23557 }
23558
23559 /*
23560@@ -105,7 +106,7 @@ void exit_thread(void)
23561 unsigned long *bp = t->io_bitmap_ptr;
23562
23563 if (bp) {
23564- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
23565+ struct tss_struct *tss = init_tss + get_cpu();
23566
23567 t->io_bitmap_ptr = NULL;
23568 clear_thread_flag(TIF_IO_BITMAP);
23569@@ -125,6 +126,9 @@ void flush_thread(void)
23570 {
23571 struct task_struct *tsk = current;
23572
23573+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
23574+ loadsegment(gs, 0);
23575+#endif
23576 flush_ptrace_hw_breakpoint(tsk);
23577 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
23578 drop_init_fpu(tsk);
23579@@ -271,7 +275,7 @@ static void __exit_idle(void)
23580 void exit_idle(void)
23581 {
23582 /* idle loop has pid 0 */
23583- if (current->pid)
23584+ if (task_pid_nr(current))
23585 return;
23586 __exit_idle();
23587 }
23588@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
23589 return ret;
23590 }
23591 #endif
23592-void stop_this_cpu(void *dummy)
23593+__noreturn void stop_this_cpu(void *dummy)
23594 {
23595 local_irq_disable();
23596 /*
23597@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
23598 }
23599 early_param("idle", idle_setup);
23600
23601-unsigned long arch_align_stack(unsigned long sp)
23602+#ifdef CONFIG_PAX_RANDKSTACK
23603+void pax_randomize_kstack(struct pt_regs *regs)
23604 {
23605- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
23606- sp -= get_random_int() % 8192;
23607- return sp & ~0xf;
23608-}
23609+ struct thread_struct *thread = &current->thread;
23610+ unsigned long time;
23611
23612-unsigned long arch_randomize_brk(struct mm_struct *mm)
23613-{
23614- unsigned long range_end = mm->brk + 0x02000000;
23615- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
23616-}
23617+ if (!randomize_va_space)
23618+ return;
23619+
23620+ if (v8086_mode(regs))
23621+ return;
23622
23623+ rdtscl(time);
23624+
23625+ /* P4 seems to return a 0 LSB, ignore it */
23626+#ifdef CONFIG_MPENTIUM4
23627+ time &= 0x3EUL;
23628+ time <<= 2;
23629+#elif defined(CONFIG_X86_64)
23630+ time &= 0xFUL;
23631+ time <<= 4;
23632+#else
23633+ time &= 0x1FUL;
23634+ time <<= 3;
23635+#endif
23636+
23637+ thread->sp0 ^= time;
23638+ load_sp0(init_tss + smp_processor_id(), thread);
23639+
23640+#ifdef CONFIG_X86_64
23641+ this_cpu_write(kernel_stack, thread->sp0);
23642+#endif
23643+}
23644+#endif
23645diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
23646index 7305f7d..22f73d6 100644
23647--- a/arch/x86/kernel/process_32.c
23648+++ b/arch/x86/kernel/process_32.c
23649@@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
23650 unsigned long thread_saved_pc(struct task_struct *tsk)
23651 {
23652 return ((unsigned long *)tsk->thread.sp)[3];
23653+//XXX return tsk->thread.eip;
23654 }
23655
23656 void __show_regs(struct pt_regs *regs, int all)
23657@@ -74,19 +75,18 @@ void __show_regs(struct pt_regs *regs, int all)
23658 unsigned long sp;
23659 unsigned short ss, gs;
23660
23661- if (user_mode_vm(regs)) {
23662+ if (user_mode(regs)) {
23663 sp = regs->sp;
23664 ss = regs->ss & 0xffff;
23665- gs = get_user_gs(regs);
23666 } else {
23667 sp = kernel_stack_pointer(regs);
23668 savesegment(ss, ss);
23669- savesegment(gs, gs);
23670 }
23671+ gs = get_user_gs(regs);
23672
23673 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
23674 (u16)regs->cs, regs->ip, regs->flags,
23675- smp_processor_id());
23676+ raw_smp_processor_id());
23677 print_symbol("EIP is at %s\n", regs->ip);
23678
23679 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
23680@@ -128,20 +128,21 @@ void release_thread(struct task_struct *dead_task)
23681 int copy_thread(unsigned long clone_flags, unsigned long sp,
23682 unsigned long arg, struct task_struct *p)
23683 {
23684- struct pt_regs *childregs = task_pt_regs(p);
23685+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
23686 struct task_struct *tsk;
23687 int err;
23688
23689 p->thread.sp = (unsigned long) childregs;
23690 p->thread.sp0 = (unsigned long) (childregs+1);
23691+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
23692
23693 if (unlikely(p->flags & PF_KTHREAD)) {
23694 /* kernel thread */
23695 memset(childregs, 0, sizeof(struct pt_regs));
23696 p->thread.ip = (unsigned long) ret_from_kernel_thread;
23697- task_user_gs(p) = __KERNEL_STACK_CANARY;
23698- childregs->ds = __USER_DS;
23699- childregs->es = __USER_DS;
23700+ savesegment(gs, childregs->gs);
23701+ childregs->ds = __KERNEL_DS;
23702+ childregs->es = __KERNEL_DS;
23703 childregs->fs = __KERNEL_PERCPU;
23704 childregs->bx = sp; /* function */
23705 childregs->bp = arg;
23706@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23707 struct thread_struct *prev = &prev_p->thread,
23708 *next = &next_p->thread;
23709 int cpu = smp_processor_id();
23710- struct tss_struct *tss = &per_cpu(init_tss, cpu);
23711+ struct tss_struct *tss = init_tss + cpu;
23712 fpu_switch_t fpu;
23713
23714 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
23715@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23716 */
23717 lazy_save_gs(prev->gs);
23718
23719+#ifdef CONFIG_PAX_MEMORY_UDEREF
23720+ __set_fs(task_thread_info(next_p)->addr_limit);
23721+#endif
23722+
23723 /*
23724 * Load the per-thread Thread-Local Storage descriptor.
23725 */
23726@@ -302,6 +307,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23727 */
23728 arch_end_context_switch(next_p);
23729
23730+ this_cpu_write(current_task, next_p);
23731+ this_cpu_write(current_tinfo, &next_p->tinfo);
23732+
23733 /*
23734 * Restore %gs if needed (which is common)
23735 */
23736@@ -310,8 +318,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23737
23738 switch_fpu_finish(next_p, fpu);
23739
23740- this_cpu_write(current_task, next_p);
23741-
23742 return prev_p;
23743 }
23744
23745@@ -341,4 +347,3 @@ unsigned long get_wchan(struct task_struct *p)
23746 } while (count++ < 16);
23747 return 0;
23748 }
23749-
23750diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
23751index 355ae06..560fbbe 100644
23752--- a/arch/x86/kernel/process_64.c
23753+++ b/arch/x86/kernel/process_64.c
23754@@ -151,10 +151,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
23755 struct pt_regs *childregs;
23756 struct task_struct *me = current;
23757
23758- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
23759+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
23760 childregs = task_pt_regs(p);
23761 p->thread.sp = (unsigned long) childregs;
23762 p->thread.usersp = me->thread.usersp;
23763+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
23764 set_tsk_thread_flag(p, TIF_FORK);
23765 p->fpu_counter = 0;
23766 p->thread.io_bitmap_ptr = NULL;
23767@@ -165,6 +166,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
23768 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
23769 savesegment(es, p->thread.es);
23770 savesegment(ds, p->thread.ds);
23771+ savesegment(ss, p->thread.ss);
23772+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
23773 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
23774
23775 if (unlikely(p->flags & PF_KTHREAD)) {
23776@@ -273,7 +276,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23777 struct thread_struct *prev = &prev_p->thread;
23778 struct thread_struct *next = &next_p->thread;
23779 int cpu = smp_processor_id();
23780- struct tss_struct *tss = &per_cpu(init_tss, cpu);
23781+ struct tss_struct *tss = init_tss + cpu;
23782 unsigned fsindex, gsindex;
23783 fpu_switch_t fpu;
23784
23785@@ -296,6 +299,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23786 if (unlikely(next->ds | prev->ds))
23787 loadsegment(ds, next->ds);
23788
23789+ savesegment(ss, prev->ss);
23790+ if (unlikely(next->ss != prev->ss))
23791+ loadsegment(ss, next->ss);
23792
23793 /* We must save %fs and %gs before load_TLS() because
23794 * %fs and %gs may be cleared by load_TLS().
23795@@ -355,10 +361,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
23796 prev->usersp = this_cpu_read(old_rsp);
23797 this_cpu_write(old_rsp, next->usersp);
23798 this_cpu_write(current_task, next_p);
23799+ this_cpu_write(current_tinfo, &next_p->tinfo);
23800
23801- this_cpu_write(kernel_stack,
23802- (unsigned long)task_stack_page(next_p) +
23803- THREAD_SIZE - KERNEL_STACK_OFFSET);
23804+ this_cpu_write(kernel_stack, next->sp0);
23805
23806 /*
23807 * Now maybe reload the debug registers and handle I/O bitmaps
23808@@ -427,12 +432,11 @@ unsigned long get_wchan(struct task_struct *p)
23809 if (!p || p == current || p->state == TASK_RUNNING)
23810 return 0;
23811 stack = (unsigned long)task_stack_page(p);
23812- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
23813+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
23814 return 0;
23815 fp = *(u64 *)(p->thread.sp);
23816 do {
23817- if (fp < (unsigned long)stack ||
23818- fp >= (unsigned long)stack+THREAD_SIZE)
23819+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
23820 return 0;
23821 ip = *(u64 *)(fp+8);
23822 if (!in_sched_functions(ip))
23823diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
23824index 29a8120..a50b5ee 100644
23825--- a/arch/x86/kernel/ptrace.c
23826+++ b/arch/x86/kernel/ptrace.c
23827@@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
23828 {
23829 unsigned long context = (unsigned long)regs & ~(THREAD_SIZE - 1);
23830 unsigned long sp = (unsigned long)&regs->sp;
23831- struct thread_info *tinfo;
23832
23833- if (context == (sp & ~(THREAD_SIZE - 1)))
23834+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
23835 return sp;
23836
23837- tinfo = (struct thread_info *)context;
23838- if (tinfo->previous_esp)
23839- return tinfo->previous_esp;
23840+ sp = *(unsigned long *)context;
23841+ if (sp)
23842+ return sp;
23843
23844 return (unsigned long)regs;
23845 }
23846@@ -588,7 +587,7 @@ static void ptrace_triggered(struct perf_event *bp,
23847 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
23848 {
23849 int i;
23850- int dr7 = 0;
23851+ unsigned long dr7 = 0;
23852 struct arch_hw_breakpoint *info;
23853
23854 for (i = 0; i < HBP_NUM; i++) {
23855@@ -856,7 +855,7 @@ long arch_ptrace(struct task_struct *child, long request,
23856 unsigned long addr, unsigned long data)
23857 {
23858 int ret;
23859- unsigned long __user *datap = (unsigned long __user *)data;
23860+ unsigned long __user *datap = (__force unsigned long __user *)data;
23861
23862 switch (request) {
23863 /* read the word at location addr in the USER area. */
23864@@ -941,14 +940,14 @@ long arch_ptrace(struct task_struct *child, long request,
23865 if ((int) addr < 0)
23866 return -EIO;
23867 ret = do_get_thread_area(child, addr,
23868- (struct user_desc __user *)data);
23869+ (__force struct user_desc __user *) data);
23870 break;
23871
23872 case PTRACE_SET_THREAD_AREA:
23873 if ((int) addr < 0)
23874 return -EIO;
23875 ret = do_set_thread_area(child, addr,
23876- (struct user_desc __user *)data, 0);
23877+ (__force struct user_desc __user *) data, 0);
23878 break;
23879 #endif
23880
23881@@ -1326,7 +1325,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
23882
23883 #ifdef CONFIG_X86_64
23884
23885-static struct user_regset x86_64_regsets[] __read_mostly = {
23886+static user_regset_no_const x86_64_regsets[] __read_only = {
23887 [REGSET_GENERAL] = {
23888 .core_note_type = NT_PRSTATUS,
23889 .n = sizeof(struct user_regs_struct) / sizeof(long),
23890@@ -1367,7 +1366,7 @@ static const struct user_regset_view user_x86_64_view = {
23891 #endif /* CONFIG_X86_64 */
23892
23893 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
23894-static struct user_regset x86_32_regsets[] __read_mostly = {
23895+static user_regset_no_const x86_32_regsets[] __read_only = {
23896 [REGSET_GENERAL] = {
23897 .core_note_type = NT_PRSTATUS,
23898 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
23899@@ -1420,7 +1419,7 @@ static const struct user_regset_view user_x86_32_view = {
23900 */
23901 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
23902
23903-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
23904+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
23905 {
23906 #ifdef CONFIG_X86_64
23907 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
23908@@ -1455,7 +1454,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
23909 memset(info, 0, sizeof(*info));
23910 info->si_signo = SIGTRAP;
23911 info->si_code = si_code;
23912- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
23913+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
23914 }
23915
23916 void user_single_step_siginfo(struct task_struct *tsk,
23917@@ -1484,6 +1483,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
23918 # define IS_IA32 0
23919 #endif
23920
23921+#ifdef CONFIG_GRKERNSEC_SETXID
23922+extern void gr_delayed_cred_worker(void);
23923+#endif
23924+
23925 /*
23926 * We must return the syscall number to actually look up in the table.
23927 * This can be -1L to skip running any syscall at all.
23928@@ -1494,6 +1497,11 @@ long syscall_trace_enter(struct pt_regs *regs)
23929
23930 user_exit();
23931
23932+#ifdef CONFIG_GRKERNSEC_SETXID
23933+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
23934+ gr_delayed_cred_worker();
23935+#endif
23936+
23937 /*
23938 * If we stepped into a sysenter/syscall insn, it trapped in
23939 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
23940@@ -1549,6 +1557,11 @@ void syscall_trace_leave(struct pt_regs *regs)
23941 */
23942 user_exit();
23943
23944+#ifdef CONFIG_GRKERNSEC_SETXID
23945+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
23946+ gr_delayed_cred_worker();
23947+#endif
23948+
23949 audit_syscall_exit(regs);
23950
23951 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
23952diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
23953index 2cb9470..ff1fd80 100644
23954--- a/arch/x86/kernel/pvclock.c
23955+++ b/arch/x86/kernel/pvclock.c
23956@@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
23957 return pv_tsc_khz;
23958 }
23959
23960-static atomic64_t last_value = ATOMIC64_INIT(0);
23961+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
23962
23963 void pvclock_resume(void)
23964 {
23965- atomic64_set(&last_value, 0);
23966+ atomic64_set_unchecked(&last_value, 0);
23967 }
23968
23969 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
23970@@ -92,11 +92,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
23971 * updating at the same time, and one of them could be slightly behind,
23972 * making the assumption that last_value always go forward fail to hold.
23973 */
23974- last = atomic64_read(&last_value);
23975+ last = atomic64_read_unchecked(&last_value);
23976 do {
23977 if (ret < last)
23978 return last;
23979- last = atomic64_cmpxchg(&last_value, last, ret);
23980+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
23981 } while (unlikely(last != ret));
23982
23983 return ret;
23984diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
23985index 76fa1e9..abf09ea 100644
23986--- a/arch/x86/kernel/reboot.c
23987+++ b/arch/x86/kernel/reboot.c
23988@@ -36,7 +36,7 @@ void (*pm_power_off)(void);
23989 EXPORT_SYMBOL(pm_power_off);
23990
23991 static const struct desc_ptr no_idt = {};
23992-static int reboot_mode;
23993+static unsigned short reboot_mode;
23994 enum reboot_type reboot_type = BOOT_ACPI;
23995 int reboot_force;
23996
23997@@ -157,6 +157,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
23998
23999 void __noreturn machine_real_restart(unsigned int type)
24000 {
24001+
24002+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
24003+ struct desc_struct *gdt;
24004+#endif
24005+
24006 local_irq_disable();
24007
24008 /*
24009@@ -184,7 +189,29 @@ void __noreturn machine_real_restart(unsigned int type)
24010
24011 /* Jump to the identity-mapped low memory code */
24012 #ifdef CONFIG_X86_32
24013- asm volatile("jmpl *%0" : :
24014+
24015+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24016+ gdt = get_cpu_gdt_table(smp_processor_id());
24017+ pax_open_kernel();
24018+#ifdef CONFIG_PAX_MEMORY_UDEREF
24019+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
24020+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
24021+ loadsegment(ds, __KERNEL_DS);
24022+ loadsegment(es, __KERNEL_DS);
24023+ loadsegment(ss, __KERNEL_DS);
24024+#endif
24025+#ifdef CONFIG_PAX_KERNEXEC
24026+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
24027+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
24028+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
24029+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
24030+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
24031+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
24032+#endif
24033+ pax_close_kernel();
24034+#endif
24035+
24036+ asm volatile("ljmpl *%0" : :
24037 "rm" (real_mode_header->machine_real_restart_asm),
24038 "a" (type));
24039 #else
24040@@ -531,7 +558,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
24041 * try to force a triple fault and then cycle between hitting the keyboard
24042 * controller and doing that
24043 */
24044-static void native_machine_emergency_restart(void)
24045+static void __noreturn native_machine_emergency_restart(void)
24046 {
24047 int i;
24048 int attempt = 0;
24049@@ -654,13 +681,13 @@ void native_machine_shutdown(void)
24050 #endif
24051 }
24052
24053-static void __machine_emergency_restart(int emergency)
24054+static void __noreturn __machine_emergency_restart(int emergency)
24055 {
24056 reboot_emergency = emergency;
24057 machine_ops.emergency_restart();
24058 }
24059
24060-static void native_machine_restart(char *__unused)
24061+static void __noreturn native_machine_restart(char *__unused)
24062 {
24063 pr_notice("machine restart\n");
24064
24065@@ -669,7 +696,7 @@ static void native_machine_restart(char *__unused)
24066 __machine_emergency_restart(0);
24067 }
24068
24069-static void native_machine_halt(void)
24070+static void __noreturn native_machine_halt(void)
24071 {
24072 /* Stop other cpus and apics */
24073 machine_shutdown();
24074@@ -679,7 +706,7 @@ static void native_machine_halt(void)
24075 stop_this_cpu(NULL);
24076 }
24077
24078-static void native_machine_power_off(void)
24079+static void __noreturn native_machine_power_off(void)
24080 {
24081 if (pm_power_off) {
24082 if (!reboot_force)
24083@@ -688,9 +715,10 @@ static void native_machine_power_off(void)
24084 }
24085 /* A fallback in case there is no PM info available */
24086 tboot_shutdown(TB_SHUTDOWN_HALT);
24087+ unreachable();
24088 }
24089
24090-struct machine_ops machine_ops = {
24091+struct machine_ops machine_ops __read_only = {
24092 .power_off = native_machine_power_off,
24093 .shutdown = native_machine_shutdown,
24094 .emergency_restart = native_machine_emergency_restart,
24095diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
24096index c8e41e9..64049ef 100644
24097--- a/arch/x86/kernel/reboot_fixups_32.c
24098+++ b/arch/x86/kernel/reboot_fixups_32.c
24099@@ -57,7 +57,7 @@ struct device_fixup {
24100 unsigned int vendor;
24101 unsigned int device;
24102 void (*reboot_fixup)(struct pci_dev *);
24103-};
24104+} __do_const;
24105
24106 /*
24107 * PCI ids solely used for fixups_table go here
24108diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
24109index f2bb9c9..bed145d7 100644
24110--- a/arch/x86/kernel/relocate_kernel_64.S
24111+++ b/arch/x86/kernel/relocate_kernel_64.S
24112@@ -11,6 +11,7 @@
24113 #include <asm/kexec.h>
24114 #include <asm/processor-flags.h>
24115 #include <asm/pgtable_types.h>
24116+#include <asm/alternative-asm.h>
24117
24118 /*
24119 * Must be relocatable PIC code callable as a C function
24120@@ -167,6 +168,7 @@ identity_mapped:
24121 xorq %r14, %r14
24122 xorq %r15, %r15
24123
24124+ pax_force_retaddr 0, 1
24125 ret
24126
24127 1:
24128diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
24129index 56f7fcf..2cfe4f1 100644
24130--- a/arch/x86/kernel/setup.c
24131+++ b/arch/x86/kernel/setup.c
24132@@ -110,6 +110,7 @@
24133 #include <asm/mce.h>
24134 #include <asm/alternative.h>
24135 #include <asm/prom.h>
24136+#include <asm/boot.h>
24137
24138 /*
24139 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
24140@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
24141 #endif
24142
24143
24144-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
24145-unsigned long mmu_cr4_features;
24146+#ifdef CONFIG_X86_64
24147+unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
24148+#elif defined(CONFIG_X86_PAE)
24149+unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
24150 #else
24151-unsigned long mmu_cr4_features = X86_CR4_PAE;
24152+unsigned long mmu_cr4_features __read_only;
24153 #endif
24154
24155+void set_in_cr4(unsigned long mask)
24156+{
24157+ unsigned long cr4 = read_cr4();
24158+
24159+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
24160+ return;
24161+
24162+ pax_open_kernel();
24163+ mmu_cr4_features |= mask;
24164+ pax_close_kernel();
24165+
24166+ if (trampoline_cr4_features)
24167+ *trampoline_cr4_features = mmu_cr4_features;
24168+ cr4 |= mask;
24169+ write_cr4(cr4);
24170+}
24171+EXPORT_SYMBOL(set_in_cr4);
24172+
24173+void clear_in_cr4(unsigned long mask)
24174+{
24175+ unsigned long cr4 = read_cr4();
24176+
24177+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
24178+ return;
24179+
24180+ pax_open_kernel();
24181+ mmu_cr4_features &= ~mask;
24182+ pax_close_kernel();
24183+
24184+ if (trampoline_cr4_features)
24185+ *trampoline_cr4_features = mmu_cr4_features;
24186+ cr4 &= ~mask;
24187+ write_cr4(cr4);
24188+}
24189+EXPORT_SYMBOL(clear_in_cr4);
24190+
24191 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
24192 int bootloader_type, bootloader_version;
24193
24194@@ -444,7 +483,7 @@ static void __init parse_setup_data(void)
24195
24196 switch (data->type) {
24197 case SETUP_E820_EXT:
24198- parse_e820_ext(data);
24199+ parse_e820_ext((struct setup_data __force_kernel *)data);
24200 break;
24201 case SETUP_DTB:
24202 add_dtb(pa_data);
24203@@ -771,7 +810,7 @@ static void __init trim_bios_range(void)
24204 * area (640->1Mb) as ram even though it is not.
24205 * take them out.
24206 */
24207- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
24208+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
24209
24210 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
24211 }
24212@@ -779,7 +818,7 @@ static void __init trim_bios_range(void)
24213 /* called before trim_bios_range() to spare extra sanitize */
24214 static void __init e820_add_kernel_range(void)
24215 {
24216- u64 start = __pa_symbol(_text);
24217+ u64 start = __pa_symbol(ktla_ktva(_text));
24218 u64 size = __pa_symbol(_end) - start;
24219
24220 /*
24221@@ -841,8 +880,12 @@ static void __init trim_low_memory_range(void)
24222
24223 void __init setup_arch(char **cmdline_p)
24224 {
24225+#ifdef CONFIG_X86_32
24226+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
24227+#else
24228 memblock_reserve(__pa_symbol(_text),
24229 (unsigned long)__bss_stop - (unsigned long)_text);
24230+#endif
24231
24232 early_reserve_initrd();
24233
24234@@ -934,14 +977,14 @@ void __init setup_arch(char **cmdline_p)
24235
24236 if (!boot_params.hdr.root_flags)
24237 root_mountflags &= ~MS_RDONLY;
24238- init_mm.start_code = (unsigned long) _text;
24239- init_mm.end_code = (unsigned long) _etext;
24240+ init_mm.start_code = ktla_ktva((unsigned long) _text);
24241+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
24242 init_mm.end_data = (unsigned long) _edata;
24243 init_mm.brk = _brk_end;
24244
24245- code_resource.start = __pa_symbol(_text);
24246- code_resource.end = __pa_symbol(_etext)-1;
24247- data_resource.start = __pa_symbol(_etext);
24248+ code_resource.start = __pa_symbol(ktla_ktva(_text));
24249+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
24250+ data_resource.start = __pa_symbol(_sdata);
24251 data_resource.end = __pa_symbol(_edata)-1;
24252 bss_resource.start = __pa_symbol(__bss_start);
24253 bss_resource.end = __pa_symbol(__bss_stop)-1;
24254diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
24255index 5cdff03..80fa283 100644
24256--- a/arch/x86/kernel/setup_percpu.c
24257+++ b/arch/x86/kernel/setup_percpu.c
24258@@ -21,19 +21,17 @@
24259 #include <asm/cpu.h>
24260 #include <asm/stackprotector.h>
24261
24262-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
24263+#ifdef CONFIG_SMP
24264+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
24265 EXPORT_PER_CPU_SYMBOL(cpu_number);
24266+#endif
24267
24268-#ifdef CONFIG_X86_64
24269 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
24270-#else
24271-#define BOOT_PERCPU_OFFSET 0
24272-#endif
24273
24274 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
24275 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
24276
24277-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
24278+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
24279 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
24280 };
24281 EXPORT_SYMBOL(__per_cpu_offset);
24282@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
24283 {
24284 #ifdef CONFIG_NEED_MULTIPLE_NODES
24285 pg_data_t *last = NULL;
24286- unsigned int cpu;
24287+ int cpu;
24288
24289 for_each_possible_cpu(cpu) {
24290 int node = early_cpu_to_node(cpu);
24291@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
24292 {
24293 #ifdef CONFIG_X86_32
24294 struct desc_struct gdt;
24295+ unsigned long base = per_cpu_offset(cpu);
24296
24297- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
24298- 0x2 | DESCTYPE_S, 0x8);
24299- gdt.s = 1;
24300+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
24301+ 0x83 | DESCTYPE_S, 0xC);
24302 write_gdt_entry(get_cpu_gdt_table(cpu),
24303 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
24304 #endif
24305@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
24306 /* alrighty, percpu areas up and running */
24307 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
24308 for_each_possible_cpu(cpu) {
24309+#ifdef CONFIG_CC_STACKPROTECTOR
24310+#ifdef CONFIG_X86_32
24311+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
24312+#endif
24313+#endif
24314 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
24315 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
24316 per_cpu(cpu_number, cpu) = cpu;
24317@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
24318 */
24319 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
24320 #endif
24321+#ifdef CONFIG_CC_STACKPROTECTOR
24322+#ifdef CONFIG_X86_32
24323+ if (!cpu)
24324+ per_cpu(stack_canary.canary, cpu) = canary;
24325+#endif
24326+#endif
24327 /*
24328 * Up to this point, the boot CPU has been using .init.data
24329 * area. Reload any changed state for the boot CPU.
24330diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
24331index 6956299..18126ec4 100644
24332--- a/arch/x86/kernel/signal.c
24333+++ b/arch/x86/kernel/signal.c
24334@@ -196,7 +196,7 @@ static unsigned long align_sigframe(unsigned long sp)
24335 * Align the stack pointer according to the i386 ABI,
24336 * i.e. so that on function entry ((sp + 4) & 15) == 0.
24337 */
24338- sp = ((sp + 4) & -16ul) - 4;
24339+ sp = ((sp - 12) & -16ul) - 4;
24340 #else /* !CONFIG_X86_32 */
24341 sp = round_down(sp, 16) - 8;
24342 #endif
24343@@ -304,9 +304,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
24344 }
24345
24346 if (current->mm->context.vdso)
24347- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
24348+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
24349 else
24350- restorer = &frame->retcode;
24351+ restorer = (void __user *)&frame->retcode;
24352 if (ksig->ka.sa.sa_flags & SA_RESTORER)
24353 restorer = ksig->ka.sa.sa_restorer;
24354
24355@@ -320,7 +320,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
24356 * reasons and because gdb uses it as a signature to notice
24357 * signal handler stack frames.
24358 */
24359- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
24360+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
24361
24362 if (err)
24363 return -EFAULT;
24364@@ -364,10 +364,13 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
24365 else
24366 put_user_ex(0, &frame->uc.uc_flags);
24367 put_user_ex(0, &frame->uc.uc_link);
24368- err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
24369+ __save_altstack_ex(&frame->uc.uc_stack, regs->sp);
24370
24371 /* Set up to return from userspace. */
24372- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
24373+ if (current->mm->context.vdso)
24374+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
24375+ else
24376+ restorer = (void __user *)&frame->retcode;
24377 if (ksig->ka.sa.sa_flags & SA_RESTORER)
24378 restorer = ksig->ka.sa.sa_restorer;
24379 put_user_ex(restorer, &frame->pretcode);
24380@@ -379,7 +382,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
24381 * reasons and because gdb uses it as a signature to notice
24382 * signal handler stack frames.
24383 */
24384- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
24385+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
24386 } put_user_catch(err);
24387
24388 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
24389@@ -429,7 +432,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
24390 else
24391 put_user_ex(0, &frame->uc.uc_flags);
24392 put_user_ex(0, &frame->uc.uc_link);
24393- err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
24394+ __save_altstack_ex(&frame->uc.uc_stack, regs->sp);
24395
24396 /* Set up to return from userspace. If provided, use a stub
24397 already in userspace. */
24398@@ -615,7 +618,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
24399 {
24400 int usig = signr_convert(ksig->sig);
24401 sigset_t *set = sigmask_to_save();
24402- compat_sigset_t *cset = (compat_sigset_t *) set;
24403+ sigset_t sigcopy;
24404+ compat_sigset_t *cset;
24405+
24406+ sigcopy = *set;
24407+
24408+ cset = (compat_sigset_t *) &sigcopy;
24409
24410 /* Set up the stack frame */
24411 if (is_ia32_frame()) {
24412@@ -626,7 +634,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
24413 } else if (is_x32_frame()) {
24414 return x32_setup_rt_frame(ksig, cset, regs);
24415 } else {
24416- return __setup_rt_frame(ksig->sig, ksig, set, regs);
24417+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
24418 }
24419 }
24420
24421diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
24422index 48d2b7d..90d328a 100644
24423--- a/arch/x86/kernel/smp.c
24424+++ b/arch/x86/kernel/smp.c
24425@@ -285,7 +285,7 @@ static int __init nonmi_ipi_setup(char *str)
24426
24427 __setup("nonmi_ipi", nonmi_ipi_setup);
24428
24429-struct smp_ops smp_ops = {
24430+struct smp_ops smp_ops __read_only = {
24431 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
24432 .smp_prepare_cpus = native_smp_prepare_cpus,
24433 .smp_cpus_done = native_smp_cpus_done,
24434diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
24435index bfd348e..914f323 100644
24436--- a/arch/x86/kernel/smpboot.c
24437+++ b/arch/x86/kernel/smpboot.c
24438@@ -251,14 +251,18 @@ notrace static void __cpuinit start_secondary(void *unused)
24439
24440 enable_start_cpu0 = 0;
24441
24442-#ifdef CONFIG_X86_32
24443- /* switch away from the initial page table */
24444- load_cr3(swapper_pg_dir);
24445- __flush_tlb_all();
24446-#endif
24447-
24448 /* otherwise gcc will move up smp_processor_id before the cpu_init */
24449 barrier();
24450+
24451+ /* switch away from the initial page table */
24452+#ifdef CONFIG_PAX_PER_CPU_PGD
24453+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
24454+ __flush_tlb_all();
24455+#elif defined(CONFIG_X86_32)
24456+ load_cr3(swapper_pg_dir);
24457+ __flush_tlb_all();
24458+#endif
24459+
24460 /*
24461 * Check TSC synchronization with the BP:
24462 */
24463@@ -748,6 +752,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
24464 idle->thread.sp = (unsigned long) (((struct pt_regs *)
24465 (THREAD_SIZE + task_stack_page(idle))) - 1);
24466 per_cpu(current_task, cpu) = idle;
24467+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
24468
24469 #ifdef CONFIG_X86_32
24470 /* Stack for startup_32 can be just as for start_secondary onwards */
24471@@ -755,11 +760,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
24472 #else
24473 clear_tsk_thread_flag(idle, TIF_FORK);
24474 initial_gs = per_cpu_offset(cpu);
24475- per_cpu(kernel_stack, cpu) =
24476- (unsigned long)task_stack_page(idle) -
24477- KERNEL_STACK_OFFSET + THREAD_SIZE;
24478+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
24479 #endif
24480+
24481+ pax_open_kernel();
24482 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
24483+ pax_close_kernel();
24484+
24485 initial_code = (unsigned long)start_secondary;
24486 stack_start = idle->thread.sp;
24487
24488@@ -908,6 +915,15 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
24489 /* the FPU context is blank, nobody can own it */
24490 __cpu_disable_lazy_restore(cpu);
24491
24492+#ifdef CONFIG_PAX_PER_CPU_PGD
24493+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
24494+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24495+ KERNEL_PGD_PTRS);
24496+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
24497+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24498+ KERNEL_PGD_PTRS);
24499+#endif
24500+
24501 err = do_boot_cpu(apicid, cpu, tidle);
24502 if (err) {
24503 pr_debug("do_boot_cpu failed %d\n", err);
24504diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
24505index 9b4d51d..5d28b58 100644
24506--- a/arch/x86/kernel/step.c
24507+++ b/arch/x86/kernel/step.c
24508@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
24509 struct desc_struct *desc;
24510 unsigned long base;
24511
24512- seg &= ~7UL;
24513+ seg >>= 3;
24514
24515 mutex_lock(&child->mm->context.lock);
24516- if (unlikely((seg >> 3) >= child->mm->context.size))
24517+ if (unlikely(seg >= child->mm->context.size))
24518 addr = -1L; /* bogus selector, access would fault */
24519 else {
24520 desc = child->mm->context.ldt + seg;
24521@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
24522 addr += base;
24523 }
24524 mutex_unlock(&child->mm->context.lock);
24525- }
24526+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
24527+ addr = ktla_ktva(addr);
24528
24529 return addr;
24530 }
24531@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
24532 unsigned char opcode[15];
24533 unsigned long addr = convert_ip_to_linear(child, regs);
24534
24535+ if (addr == -EINVAL)
24536+ return 0;
24537+
24538 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
24539 for (i = 0; i < copied; i++) {
24540 switch (opcode[i]) {
24541diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
24542new file mode 100644
24543index 0000000..5877189
24544--- /dev/null
24545+++ b/arch/x86/kernel/sys_i386_32.c
24546@@ -0,0 +1,189 @@
24547+/*
24548+ * This file contains various random system calls that
24549+ * have a non-standard calling sequence on the Linux/i386
24550+ * platform.
24551+ */
24552+
24553+#include <linux/errno.h>
24554+#include <linux/sched.h>
24555+#include <linux/mm.h>
24556+#include <linux/fs.h>
24557+#include <linux/smp.h>
24558+#include <linux/sem.h>
24559+#include <linux/msg.h>
24560+#include <linux/shm.h>
24561+#include <linux/stat.h>
24562+#include <linux/syscalls.h>
24563+#include <linux/mman.h>
24564+#include <linux/file.h>
24565+#include <linux/utsname.h>
24566+#include <linux/ipc.h>
24567+#include <linux/elf.h>
24568+
24569+#include <linux/uaccess.h>
24570+#include <linux/unistd.h>
24571+
24572+#include <asm/syscalls.h>
24573+
24574+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
24575+{
24576+ unsigned long pax_task_size = TASK_SIZE;
24577+
24578+#ifdef CONFIG_PAX_SEGMEXEC
24579+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
24580+ pax_task_size = SEGMEXEC_TASK_SIZE;
24581+#endif
24582+
24583+ if (flags & MAP_FIXED)
24584+ if (len > pax_task_size || addr > pax_task_size - len)
24585+ return -EINVAL;
24586+
24587+ return 0;
24588+}
24589+
24590+/*
24591+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
24592+ */
24593+static unsigned long get_align_mask(void)
24594+{
24595+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
24596+ return 0;
24597+
24598+ if (!(current->flags & PF_RANDOMIZE))
24599+ return 0;
24600+
24601+ return va_align.mask;
24602+}
24603+
24604+unsigned long
24605+arch_get_unmapped_area(struct file *filp, unsigned long addr,
24606+ unsigned long len, unsigned long pgoff, unsigned long flags)
24607+{
24608+ struct mm_struct *mm = current->mm;
24609+ struct vm_area_struct *vma;
24610+ unsigned long pax_task_size = TASK_SIZE;
24611+ struct vm_unmapped_area_info info;
24612+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
24613+
24614+#ifdef CONFIG_PAX_SEGMEXEC
24615+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24616+ pax_task_size = SEGMEXEC_TASK_SIZE;
24617+#endif
24618+
24619+ pax_task_size -= PAGE_SIZE;
24620+
24621+ if (len > pax_task_size)
24622+ return -ENOMEM;
24623+
24624+ if (flags & MAP_FIXED)
24625+ return addr;
24626+
24627+#ifdef CONFIG_PAX_RANDMMAP
24628+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
24629+#endif
24630+
24631+ if (addr) {
24632+ addr = PAGE_ALIGN(addr);
24633+ if (pax_task_size - len >= addr) {
24634+ vma = find_vma(mm, addr);
24635+ if (check_heap_stack_gap(vma, addr, len, offset))
24636+ return addr;
24637+ }
24638+ }
24639+
24640+ info.flags = 0;
24641+ info.length = len;
24642+ info.align_mask = filp ? get_align_mask() : 0;
24643+ info.align_offset = pgoff << PAGE_SHIFT;
24644+ info.threadstack_offset = offset;
24645+
24646+#ifdef CONFIG_PAX_PAGEEXEC
24647+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
24648+ info.low_limit = 0x00110000UL;
24649+ info.high_limit = mm->start_code;
24650+
24651+#ifdef CONFIG_PAX_RANDMMAP
24652+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24653+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
24654+#endif
24655+
24656+ if (info.low_limit < info.high_limit) {
24657+ addr = vm_unmapped_area(&info);
24658+ if (!IS_ERR_VALUE(addr))
24659+ return addr;
24660+ }
24661+ } else
24662+#endif
24663+
24664+ info.low_limit = mm->mmap_base;
24665+ info.high_limit = pax_task_size;
24666+
24667+ return vm_unmapped_area(&info);
24668+}
24669+
24670+unsigned long
24671+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
24672+ const unsigned long len, const unsigned long pgoff,
24673+ const unsigned long flags)
24674+{
24675+ struct vm_area_struct *vma;
24676+ struct mm_struct *mm = current->mm;
24677+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
24678+ struct vm_unmapped_area_info info;
24679+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
24680+
24681+#ifdef CONFIG_PAX_SEGMEXEC
24682+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24683+ pax_task_size = SEGMEXEC_TASK_SIZE;
24684+#endif
24685+
24686+ pax_task_size -= PAGE_SIZE;
24687+
24688+ /* requested length too big for entire address space */
24689+ if (len > pax_task_size)
24690+ return -ENOMEM;
24691+
24692+ if (flags & MAP_FIXED)
24693+ return addr;
24694+
24695+#ifdef CONFIG_PAX_PAGEEXEC
24696+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
24697+ goto bottomup;
24698+#endif
24699+
24700+#ifdef CONFIG_PAX_RANDMMAP
24701+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
24702+#endif
24703+
24704+ /* requesting a specific address */
24705+ if (addr) {
24706+ addr = PAGE_ALIGN(addr);
24707+ if (pax_task_size - len >= addr) {
24708+ vma = find_vma(mm, addr);
24709+ if (check_heap_stack_gap(vma, addr, len, offset))
24710+ return addr;
24711+ }
24712+ }
24713+
24714+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
24715+ info.length = len;
24716+ info.low_limit = PAGE_SIZE;
24717+ info.high_limit = mm->mmap_base;
24718+ info.align_mask = filp ? get_align_mask() : 0;
24719+ info.align_offset = pgoff << PAGE_SHIFT;
24720+ info.threadstack_offset = offset;
24721+
24722+ addr = vm_unmapped_area(&info);
24723+ if (!(addr & ~PAGE_MASK))
24724+ return addr;
24725+ VM_BUG_ON(addr != -ENOMEM);
24726+
24727+bottomup:
24728+ /*
24729+ * A failed mmap() very likely causes application failure,
24730+ * so fall back to the bottom-up function here. This scenario
24731+ * can happen with large stack limits and large mmap()
24732+ * allocations.
24733+ */
24734+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
24735+}
24736diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
24737index 48f8375..ace2781 100644
24738--- a/arch/x86/kernel/sys_x86_64.c
24739+++ b/arch/x86/kernel/sys_x86_64.c
24740@@ -81,8 +81,8 @@ out:
24741 return error;
24742 }
24743
24744-static void find_start_end(unsigned long flags, unsigned long *begin,
24745- unsigned long *end)
24746+static void find_start_end(struct mm_struct *mm, unsigned long flags,
24747+ unsigned long *begin, unsigned long *end)
24748 {
24749 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
24750 unsigned long new_begin;
24751@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
24752 *begin = new_begin;
24753 }
24754 } else {
24755- *begin = mmap_legacy_base();
24756+ *begin = mm->mmap_base;
24757 *end = TASK_SIZE;
24758 }
24759 }
24760@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
24761 struct vm_area_struct *vma;
24762 struct vm_unmapped_area_info info;
24763 unsigned long begin, end;
24764+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
24765
24766 if (flags & MAP_FIXED)
24767 return addr;
24768
24769- find_start_end(flags, &begin, &end);
24770+ find_start_end(mm, flags, &begin, &end);
24771
24772 if (len > end)
24773 return -ENOMEM;
24774
24775+#ifdef CONFIG_PAX_RANDMMAP
24776+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
24777+#endif
24778+
24779 if (addr) {
24780 addr = PAGE_ALIGN(addr);
24781 vma = find_vma(mm, addr);
24782- if (end - len >= addr &&
24783- (!vma || addr + len <= vma->vm_start))
24784+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
24785 return addr;
24786 }
24787
24788@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
24789 info.high_limit = end;
24790 info.align_mask = filp ? get_align_mask() : 0;
24791 info.align_offset = pgoff << PAGE_SHIFT;
24792+ info.threadstack_offset = offset;
24793 return vm_unmapped_area(&info);
24794 }
24795
24796@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
24797 struct mm_struct *mm = current->mm;
24798 unsigned long addr = addr0;
24799 struct vm_unmapped_area_info info;
24800+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
24801
24802 /* requested length too big for entire address space */
24803 if (len > TASK_SIZE)
24804@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
24805 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
24806 goto bottomup;
24807
24808+#ifdef CONFIG_PAX_RANDMMAP
24809+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
24810+#endif
24811+
24812 /* requesting a specific address */
24813 if (addr) {
24814 addr = PAGE_ALIGN(addr);
24815 vma = find_vma(mm, addr);
24816- if (TASK_SIZE - len >= addr &&
24817- (!vma || addr + len <= vma->vm_start))
24818+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
24819 return addr;
24820 }
24821
24822@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
24823 info.high_limit = mm->mmap_base;
24824 info.align_mask = filp ? get_align_mask() : 0;
24825 info.align_offset = pgoff << PAGE_SHIFT;
24826+ info.threadstack_offset = offset;
24827 addr = vm_unmapped_area(&info);
24828 if (!(addr & ~PAGE_MASK))
24829 return addr;
24830diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
24831index f84fe00..f41d9f1 100644
24832--- a/arch/x86/kernel/tboot.c
24833+++ b/arch/x86/kernel/tboot.c
24834@@ -220,7 +220,7 @@ static int tboot_setup_sleep(void)
24835
24836 void tboot_shutdown(u32 shutdown_type)
24837 {
24838- void (*shutdown)(void);
24839+ void (* __noreturn shutdown)(void);
24840
24841 if (!tboot_enabled())
24842 return;
24843@@ -242,7 +242,7 @@ void tboot_shutdown(u32 shutdown_type)
24844
24845 switch_to_tboot_pt();
24846
24847- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
24848+ shutdown = (void *)tboot->shutdown_entry;
24849 shutdown();
24850
24851 /* should not reach here */
24852@@ -300,7 +300,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
24853 return 0;
24854 }
24855
24856-static atomic_t ap_wfs_count;
24857+static atomic_unchecked_t ap_wfs_count;
24858
24859 static int tboot_wait_for_aps(int num_aps)
24860 {
24861@@ -324,16 +324,16 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
24862 {
24863 switch (action) {
24864 case CPU_DYING:
24865- atomic_inc(&ap_wfs_count);
24866+ atomic_inc_unchecked(&ap_wfs_count);
24867 if (num_online_cpus() == 1)
24868- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
24869+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
24870 return NOTIFY_BAD;
24871 break;
24872 }
24873 return NOTIFY_OK;
24874 }
24875
24876-static struct notifier_block tboot_cpu_notifier __cpuinitdata =
24877+static struct notifier_block tboot_cpu_notifier =
24878 {
24879 .notifier_call = tboot_cpu_callback,
24880 };
24881@@ -345,7 +345,7 @@ static __init int tboot_late_init(void)
24882
24883 tboot_create_trampoline();
24884
24885- atomic_set(&ap_wfs_count, 0);
24886+ atomic_set_unchecked(&ap_wfs_count, 0);
24887 register_hotcpu_notifier(&tboot_cpu_notifier);
24888
24889 acpi_os_set_prepare_sleep(&tboot_sleep);
24890diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
24891index 24d3c91..d06b473 100644
24892--- a/arch/x86/kernel/time.c
24893+++ b/arch/x86/kernel/time.c
24894@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
24895 {
24896 unsigned long pc = instruction_pointer(regs);
24897
24898- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
24899+ if (!user_mode(regs) && in_lock_functions(pc)) {
24900 #ifdef CONFIG_FRAME_POINTER
24901- return *(unsigned long *)(regs->bp + sizeof(long));
24902+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
24903 #else
24904 unsigned long *sp =
24905 (unsigned long *)kernel_stack_pointer(regs);
24906@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
24907 * or above a saved flags. Eflags has bits 22-31 zero,
24908 * kernel addresses don't.
24909 */
24910+
24911+#ifdef CONFIG_PAX_KERNEXEC
24912+ return ktla_ktva(sp[0]);
24913+#else
24914 if (sp[0] >> 22)
24915 return sp[0];
24916 if (sp[1] >> 22)
24917 return sp[1];
24918 #endif
24919+
24920+#endif
24921 }
24922 return pc;
24923 }
24924diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
24925index f7fec09..9991981 100644
24926--- a/arch/x86/kernel/tls.c
24927+++ b/arch/x86/kernel/tls.c
24928@@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
24929 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
24930 return -EINVAL;
24931
24932+#ifdef CONFIG_PAX_SEGMEXEC
24933+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
24934+ return -EINVAL;
24935+#endif
24936+
24937 set_tls_desc(p, idx, &info, 1);
24938
24939 return 0;
24940@@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
24941
24942 if (kbuf)
24943 info = kbuf;
24944- else if (__copy_from_user(infobuf, ubuf, count))
24945+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
24946 return -EFAULT;
24947 else
24948 info = infobuf;
24949diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
24950index 772e2a8..bad5bf6 100644
24951--- a/arch/x86/kernel/traps.c
24952+++ b/arch/x86/kernel/traps.c
24953@@ -68,12 +68,6 @@
24954 #include <asm/setup.h>
24955
24956 asmlinkage int system_call(void);
24957-
24958-/*
24959- * The IDT has to be page-aligned to simplify the Pentium
24960- * F0 0F bug workaround.
24961- */
24962-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
24963 #endif
24964
24965 DECLARE_BITMAP(used_vectors, NR_VECTORS);
24966@@ -106,11 +100,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
24967 }
24968
24969 static int __kprobes
24970-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
24971+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
24972 struct pt_regs *regs, long error_code)
24973 {
24974 #ifdef CONFIG_X86_32
24975- if (regs->flags & X86_VM_MASK) {
24976+ if (v8086_mode(regs)) {
24977 /*
24978 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
24979 * On nmi (interrupt 2), do_trap should not be called.
24980@@ -123,12 +117,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
24981 return -1;
24982 }
24983 #endif
24984- if (!user_mode(regs)) {
24985+ if (!user_mode_novm(regs)) {
24986 if (!fixup_exception(regs)) {
24987 tsk->thread.error_code = error_code;
24988 tsk->thread.trap_nr = trapnr;
24989+
24990+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
24991+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
24992+ str = "PAX: suspicious stack segment fault";
24993+#endif
24994+
24995 die(str, regs, error_code);
24996 }
24997+
24998+#ifdef CONFIG_PAX_REFCOUNT
24999+ if (trapnr == 4)
25000+ pax_report_refcount_overflow(regs);
25001+#endif
25002+
25003 return 0;
25004 }
25005
25006@@ -136,7 +142,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
25007 }
25008
25009 static void __kprobes
25010-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
25011+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
25012 long error_code, siginfo_t *info)
25013 {
25014 struct task_struct *tsk = current;
25015@@ -160,7 +166,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
25016 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
25017 printk_ratelimit()) {
25018 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
25019- tsk->comm, tsk->pid, str,
25020+ tsk->comm, task_pid_nr(tsk), str,
25021 regs->ip, regs->sp, error_code);
25022 print_vma_addr(" in ", regs->ip);
25023 pr_cont("\n");
25024@@ -273,7 +279,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
25025 conditional_sti(regs);
25026
25027 #ifdef CONFIG_X86_32
25028- if (regs->flags & X86_VM_MASK) {
25029+ if (v8086_mode(regs)) {
25030 local_irq_enable();
25031 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
25032 goto exit;
25033@@ -281,18 +287,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
25034 #endif
25035
25036 tsk = current;
25037- if (!user_mode(regs)) {
25038+ if (!user_mode_novm(regs)) {
25039 if (fixup_exception(regs))
25040 goto exit;
25041
25042 tsk->thread.error_code = error_code;
25043 tsk->thread.trap_nr = X86_TRAP_GP;
25044 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
25045- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
25046+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
25047+
25048+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25049+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
25050+ die("PAX: suspicious general protection fault", regs, error_code);
25051+ else
25052+#endif
25053+
25054 die("general protection fault", regs, error_code);
25055+ }
25056 goto exit;
25057 }
25058
25059+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
25060+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
25061+ struct mm_struct *mm = tsk->mm;
25062+ unsigned long limit;
25063+
25064+ down_write(&mm->mmap_sem);
25065+ limit = mm->context.user_cs_limit;
25066+ if (limit < TASK_SIZE) {
25067+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
25068+ up_write(&mm->mmap_sem);
25069+ return;
25070+ }
25071+ up_write(&mm->mmap_sem);
25072+ }
25073+#endif
25074+
25075 tsk->thread.error_code = error_code;
25076 tsk->thread.trap_nr = X86_TRAP_GP;
25077
25078@@ -450,7 +480,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
25079 /* It's safe to allow irq's after DR6 has been saved */
25080 preempt_conditional_sti(regs);
25081
25082- if (regs->flags & X86_VM_MASK) {
25083+ if (v8086_mode(regs)) {
25084 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
25085 X86_TRAP_DB);
25086 preempt_conditional_cli(regs);
25087@@ -465,7 +495,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
25088 * We already checked v86 mode above, so we can check for kernel mode
25089 * by just checking the CPL of CS.
25090 */
25091- if ((dr6 & DR_STEP) && !user_mode(regs)) {
25092+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
25093 tsk->thread.debugreg6 &= ~DR_STEP;
25094 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
25095 regs->flags &= ~X86_EFLAGS_TF;
25096@@ -497,7 +527,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
25097 return;
25098 conditional_sti(regs);
25099
25100- if (!user_mode_vm(regs))
25101+ if (!user_mode(regs))
25102 {
25103 if (!fixup_exception(regs)) {
25104 task->thread.error_code = error_code;
25105diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
25106index 2ed8459..7cf329f 100644
25107--- a/arch/x86/kernel/uprobes.c
25108+++ b/arch/x86/kernel/uprobes.c
25109@@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
25110 int ret = NOTIFY_DONE;
25111
25112 /* We are only interested in userspace traps */
25113- if (regs && !user_mode_vm(regs))
25114+ if (regs && !user_mode(regs))
25115 return NOTIFY_DONE;
25116
25117 switch (val) {
25118@@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
25119
25120 if (ncopied != rasize) {
25121 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
25122- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
25123+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
25124
25125 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
25126 }
25127diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
25128index b9242ba..50c5edd 100644
25129--- a/arch/x86/kernel/verify_cpu.S
25130+++ b/arch/x86/kernel/verify_cpu.S
25131@@ -20,6 +20,7 @@
25132 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
25133 * arch/x86/kernel/trampoline_64.S: secondary processor verification
25134 * arch/x86/kernel/head_32.S: processor startup
25135+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
25136 *
25137 * verify_cpu, returns the status of longmode and SSE in register %eax.
25138 * 0: Success 1: Failure
25139diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
25140index e8edcf5..27f9344 100644
25141--- a/arch/x86/kernel/vm86_32.c
25142+++ b/arch/x86/kernel/vm86_32.c
25143@@ -44,6 +44,7 @@
25144 #include <linux/ptrace.h>
25145 #include <linux/audit.h>
25146 #include <linux/stddef.h>
25147+#include <linux/grsecurity.h>
25148
25149 #include <asm/uaccess.h>
25150 #include <asm/io.h>
25151@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
25152 do_exit(SIGSEGV);
25153 }
25154
25155- tss = &per_cpu(init_tss, get_cpu());
25156+ tss = init_tss + get_cpu();
25157 current->thread.sp0 = current->thread.saved_sp0;
25158 current->thread.sysenter_cs = __KERNEL_CS;
25159 load_sp0(tss, &current->thread);
25160@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
25161
25162 if (tsk->thread.saved_sp0)
25163 return -EPERM;
25164+
25165+#ifdef CONFIG_GRKERNSEC_VM86
25166+ if (!capable(CAP_SYS_RAWIO)) {
25167+ gr_handle_vm86();
25168+ return -EPERM;
25169+ }
25170+#endif
25171+
25172 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
25173 offsetof(struct kernel_vm86_struct, vm86plus) -
25174 sizeof(info.regs));
25175@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
25176 int tmp;
25177 struct vm86plus_struct __user *v86;
25178
25179+#ifdef CONFIG_GRKERNSEC_VM86
25180+ if (!capable(CAP_SYS_RAWIO)) {
25181+ gr_handle_vm86();
25182+ return -EPERM;
25183+ }
25184+#endif
25185+
25186 tsk = current;
25187 switch (cmd) {
25188 case VM86_REQUEST_IRQ:
25189@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
25190 tsk->thread.saved_fs = info->regs32->fs;
25191 tsk->thread.saved_gs = get_user_gs(info->regs32);
25192
25193- tss = &per_cpu(init_tss, get_cpu());
25194+ tss = init_tss + get_cpu();
25195 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
25196 if (cpu_has_sep)
25197 tsk->thread.sysenter_cs = 0;
25198@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
25199 goto cannot_handle;
25200 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
25201 goto cannot_handle;
25202- intr_ptr = (unsigned long __user *) (i << 2);
25203+ intr_ptr = (__force unsigned long __user *) (i << 2);
25204 if (get_user(segoffs, intr_ptr))
25205 goto cannot_handle;
25206 if ((segoffs >> 16) == BIOSSEG)
25207diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
25208index 10c4f30..57377c2 100644
25209--- a/arch/x86/kernel/vmlinux.lds.S
25210+++ b/arch/x86/kernel/vmlinux.lds.S
25211@@ -26,6 +26,13 @@
25212 #include <asm/page_types.h>
25213 #include <asm/cache.h>
25214 #include <asm/boot.h>
25215+#include <asm/segment.h>
25216+
25217+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25218+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
25219+#else
25220+#define __KERNEL_TEXT_OFFSET 0
25221+#endif
25222
25223 #undef i386 /* in case the preprocessor is a 32bit one */
25224
25225@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
25226
25227 PHDRS {
25228 text PT_LOAD FLAGS(5); /* R_E */
25229+#ifdef CONFIG_X86_32
25230+ module PT_LOAD FLAGS(5); /* R_E */
25231+#endif
25232+#ifdef CONFIG_XEN
25233+ rodata PT_LOAD FLAGS(5); /* R_E */
25234+#else
25235+ rodata PT_LOAD FLAGS(4); /* R__ */
25236+#endif
25237 data PT_LOAD FLAGS(6); /* RW_ */
25238-#ifdef CONFIG_X86_64
25239+ init.begin PT_LOAD FLAGS(6); /* RW_ */
25240 #ifdef CONFIG_SMP
25241 percpu PT_LOAD FLAGS(6); /* RW_ */
25242 #endif
25243+ text.init PT_LOAD FLAGS(5); /* R_E */
25244+ text.exit PT_LOAD FLAGS(5); /* R_E */
25245 init PT_LOAD FLAGS(7); /* RWE */
25246-#endif
25247 note PT_NOTE FLAGS(0); /* ___ */
25248 }
25249
25250 SECTIONS
25251 {
25252 #ifdef CONFIG_X86_32
25253- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
25254- phys_startup_32 = startup_32 - LOAD_OFFSET;
25255+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
25256 #else
25257- . = __START_KERNEL;
25258- phys_startup_64 = startup_64 - LOAD_OFFSET;
25259+ . = __START_KERNEL;
25260 #endif
25261
25262 /* Text and read-only data */
25263- .text : AT(ADDR(.text) - LOAD_OFFSET) {
25264- _text = .;
25265+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
25266 /* bootstrapping code */
25267+#ifdef CONFIG_X86_32
25268+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
25269+#else
25270+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
25271+#endif
25272+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
25273+ _text = .;
25274 HEAD_TEXT
25275 . = ALIGN(8);
25276 _stext = .;
25277@@ -104,13 +124,48 @@ SECTIONS
25278 IRQENTRY_TEXT
25279 *(.fixup)
25280 *(.gnu.warning)
25281- /* End of text section */
25282- _etext = .;
25283 } :text = 0x9090
25284
25285- NOTES :text :note
25286+ . += __KERNEL_TEXT_OFFSET;
25287
25288- EXCEPTION_TABLE(16) :text = 0x9090
25289+#ifdef CONFIG_X86_32
25290+ . = ALIGN(PAGE_SIZE);
25291+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
25292+
25293+#ifdef CONFIG_PAX_KERNEXEC
25294+ MODULES_EXEC_VADDR = .;
25295+ BYTE(0)
25296+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
25297+ . = ALIGN(HPAGE_SIZE) - 1;
25298+ MODULES_EXEC_END = .;
25299+#endif
25300+
25301+ } :module
25302+#endif
25303+
25304+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
25305+ /* End of text section */
25306+ BYTE(0)
25307+ _etext = . - __KERNEL_TEXT_OFFSET;
25308+ }
25309+
25310+#ifdef CONFIG_X86_32
25311+ . = ALIGN(PAGE_SIZE);
25312+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
25313+ *(.idt)
25314+ . = ALIGN(PAGE_SIZE);
25315+ *(.empty_zero_page)
25316+ *(.initial_pg_fixmap)
25317+ *(.initial_pg_pmd)
25318+ *(.initial_page_table)
25319+ *(.swapper_pg_dir)
25320+ } :rodata
25321+#endif
25322+
25323+ . = ALIGN(PAGE_SIZE);
25324+ NOTES :rodata :note
25325+
25326+ EXCEPTION_TABLE(16) :rodata
25327
25328 #if defined(CONFIG_DEBUG_RODATA)
25329 /* .text should occupy whole number of pages */
25330@@ -122,16 +177,20 @@ SECTIONS
25331
25332 /* Data */
25333 .data : AT(ADDR(.data) - LOAD_OFFSET) {
25334+
25335+#ifdef CONFIG_PAX_KERNEXEC
25336+ . = ALIGN(HPAGE_SIZE);
25337+#else
25338+ . = ALIGN(PAGE_SIZE);
25339+#endif
25340+
25341 /* Start of data section */
25342 _sdata = .;
25343
25344 /* init_task */
25345 INIT_TASK_DATA(THREAD_SIZE)
25346
25347-#ifdef CONFIG_X86_32
25348- /* 32 bit has nosave before _edata */
25349 NOSAVE_DATA
25350-#endif
25351
25352 PAGE_ALIGNED_DATA(PAGE_SIZE)
25353
25354@@ -172,12 +231,19 @@ SECTIONS
25355 #endif /* CONFIG_X86_64 */
25356
25357 /* Init code and data - will be freed after init */
25358- . = ALIGN(PAGE_SIZE);
25359 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
25360+ BYTE(0)
25361+
25362+#ifdef CONFIG_PAX_KERNEXEC
25363+ . = ALIGN(HPAGE_SIZE);
25364+#else
25365+ . = ALIGN(PAGE_SIZE);
25366+#endif
25367+
25368 __init_begin = .; /* paired with __init_end */
25369- }
25370+ } :init.begin
25371
25372-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
25373+#ifdef CONFIG_SMP
25374 /*
25375 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
25376 * output PHDR, so the next output section - .init.text - should
25377@@ -186,12 +252,27 @@ SECTIONS
25378 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
25379 #endif
25380
25381- INIT_TEXT_SECTION(PAGE_SIZE)
25382-#ifdef CONFIG_X86_64
25383- :init
25384-#endif
25385+ . = ALIGN(PAGE_SIZE);
25386+ init_begin = .;
25387+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
25388+ VMLINUX_SYMBOL(_sinittext) = .;
25389+ INIT_TEXT
25390+ VMLINUX_SYMBOL(_einittext) = .;
25391+ . = ALIGN(PAGE_SIZE);
25392+ } :text.init
25393
25394- INIT_DATA_SECTION(16)
25395+ /*
25396+ * .exit.text is discard at runtime, not link time, to deal with
25397+ * references from .altinstructions and .eh_frame
25398+ */
25399+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
25400+ EXIT_TEXT
25401+ . = ALIGN(16);
25402+ } :text.exit
25403+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
25404+
25405+ . = ALIGN(PAGE_SIZE);
25406+ INIT_DATA_SECTION(16) :init
25407
25408 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
25409 __x86_cpu_dev_start = .;
25410@@ -253,19 +334,12 @@ SECTIONS
25411 }
25412
25413 . = ALIGN(8);
25414- /*
25415- * .exit.text is discard at runtime, not link time, to deal with
25416- * references from .altinstructions and .eh_frame
25417- */
25418- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
25419- EXIT_TEXT
25420- }
25421
25422 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
25423 EXIT_DATA
25424 }
25425
25426-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
25427+#ifndef CONFIG_SMP
25428 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
25429 #endif
25430
25431@@ -284,16 +358,10 @@ SECTIONS
25432 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
25433 __smp_locks = .;
25434 *(.smp_locks)
25435- . = ALIGN(PAGE_SIZE);
25436 __smp_locks_end = .;
25437+ . = ALIGN(PAGE_SIZE);
25438 }
25439
25440-#ifdef CONFIG_X86_64
25441- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
25442- NOSAVE_DATA
25443- }
25444-#endif
25445-
25446 /* BSS */
25447 . = ALIGN(PAGE_SIZE);
25448 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
25449@@ -309,6 +377,7 @@ SECTIONS
25450 __brk_base = .;
25451 . += 64 * 1024; /* 64k alignment slop space */
25452 *(.brk_reservation) /* areas brk users have reserved */
25453+ . = ALIGN(HPAGE_SIZE);
25454 __brk_limit = .;
25455 }
25456
25457@@ -335,13 +404,12 @@ SECTIONS
25458 * for the boot processor.
25459 */
25460 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
25461-INIT_PER_CPU(gdt_page);
25462 INIT_PER_CPU(irq_stack_union);
25463
25464 /*
25465 * Build-time check on the image size:
25466 */
25467-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
25468+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
25469 "kernel image bigger than KERNEL_IMAGE_SIZE");
25470
25471 #ifdef CONFIG_SMP
25472diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
25473index 9a907a6..f83f921 100644
25474--- a/arch/x86/kernel/vsyscall_64.c
25475+++ b/arch/x86/kernel/vsyscall_64.c
25476@@ -56,15 +56,13 @@
25477 DEFINE_VVAR(int, vgetcpu_mode);
25478 DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
25479
25480-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
25481+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
25482
25483 static int __init vsyscall_setup(char *str)
25484 {
25485 if (str) {
25486 if (!strcmp("emulate", str))
25487 vsyscall_mode = EMULATE;
25488- else if (!strcmp("native", str))
25489- vsyscall_mode = NATIVE;
25490 else if (!strcmp("none", str))
25491 vsyscall_mode = NONE;
25492 else
25493@@ -323,8 +321,7 @@ do_ret:
25494 return true;
25495
25496 sigsegv:
25497- force_sig(SIGSEGV, current);
25498- return true;
25499+ do_group_exit(SIGKILL);
25500 }
25501
25502 /*
25503@@ -377,10 +374,7 @@ void __init map_vsyscall(void)
25504 extern char __vvar_page;
25505 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
25506
25507- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
25508- vsyscall_mode == NATIVE
25509- ? PAGE_KERNEL_VSYSCALL
25510- : PAGE_KERNEL_VVAR);
25511+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
25512 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
25513 (unsigned long)VSYSCALL_START);
25514
25515diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
25516index b014d94..e775258 100644
25517--- a/arch/x86/kernel/x8664_ksyms_64.c
25518+++ b/arch/x86/kernel/x8664_ksyms_64.c
25519@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
25520 EXPORT_SYMBOL(copy_user_generic_unrolled);
25521 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
25522 EXPORT_SYMBOL(__copy_user_nocache);
25523-EXPORT_SYMBOL(_copy_from_user);
25524-EXPORT_SYMBOL(_copy_to_user);
25525
25526 EXPORT_SYMBOL(copy_page);
25527 EXPORT_SYMBOL(clear_page);
25528@@ -66,3 +64,7 @@ EXPORT_SYMBOL(empty_zero_page);
25529 #ifndef CONFIG_PARAVIRT
25530 EXPORT_SYMBOL(native_load_gs_index);
25531 #endif
25532+
25533+#ifdef CONFIG_PAX_PER_CPU_PGD
25534+EXPORT_SYMBOL(cpu_pgd);
25535+#endif
25536diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
25537index 45a14db..075bb9b 100644
25538--- a/arch/x86/kernel/x86_init.c
25539+++ b/arch/x86/kernel/x86_init.c
25540@@ -85,7 +85,7 @@ struct x86_init_ops x86_init __initdata = {
25541 },
25542 };
25543
25544-struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
25545+struct x86_cpuinit_ops x86_cpuinit __cpuinitconst = {
25546 .early_percpu_clock_init = x86_init_noop,
25547 .setup_percpu_clockev = setup_secondary_APIC_clock,
25548 };
25549@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
25550 static void default_nmi_init(void) { };
25551 static int default_i8042_detect(void) { return 1; };
25552
25553-struct x86_platform_ops x86_platform = {
25554+struct x86_platform_ops x86_platform __read_only = {
25555 .calibrate_tsc = native_calibrate_tsc,
25556 .get_wallclock = mach_get_cmos_time,
25557 .set_wallclock = mach_set_rtc_mmss,
25558@@ -107,7 +107,7 @@ struct x86_platform_ops x86_platform = {
25559 };
25560
25561 EXPORT_SYMBOL_GPL(x86_platform);
25562-struct x86_msi_ops x86_msi = {
25563+struct x86_msi_ops x86_msi __read_only = {
25564 .setup_msi_irqs = native_setup_msi_irqs,
25565 .compose_msi_msg = native_compose_msi_msg,
25566 .teardown_msi_irq = native_teardown_msi_irq,
25567@@ -116,7 +116,7 @@ struct x86_msi_ops x86_msi = {
25568 .setup_hpet_msi = default_setup_hpet_msi,
25569 };
25570
25571-struct x86_io_apic_ops x86_io_apic_ops = {
25572+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
25573 .init = native_io_apic_init_mappings,
25574 .read = native_io_apic_read,
25575 .write = native_io_apic_write,
25576diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
25577index ada87a3..afea76d 100644
25578--- a/arch/x86/kernel/xsave.c
25579+++ b/arch/x86/kernel/xsave.c
25580@@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
25581 {
25582 int err;
25583
25584+ buf = (struct xsave_struct __user *)____m(buf);
25585 if (use_xsave())
25586 err = xsave_user(buf);
25587 else if (use_fxsr())
25588@@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
25589 */
25590 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
25591 {
25592+ buf = (void __user *)____m(buf);
25593 if (use_xsave()) {
25594 if ((unsigned long)buf % 64 || fx_only) {
25595 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
25596diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
25597index a20ecb5..d0e2194 100644
25598--- a/arch/x86/kvm/cpuid.c
25599+++ b/arch/x86/kvm/cpuid.c
25600@@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
25601 struct kvm_cpuid2 *cpuid,
25602 struct kvm_cpuid_entry2 __user *entries)
25603 {
25604- int r;
25605+ int r, i;
25606
25607 r = -E2BIG;
25608 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
25609 goto out;
25610 r = -EFAULT;
25611- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
25612- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
25613+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
25614 goto out;
25615+ for (i = 0; i < cpuid->nent; ++i) {
25616+ struct kvm_cpuid_entry2 cpuid_entry;
25617+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
25618+ goto out;
25619+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
25620+ }
25621 vcpu->arch.cpuid_nent = cpuid->nent;
25622 kvm_apic_set_version(vcpu);
25623 kvm_x86_ops->cpuid_update(vcpu);
25624@@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
25625 struct kvm_cpuid2 *cpuid,
25626 struct kvm_cpuid_entry2 __user *entries)
25627 {
25628- int r;
25629+ int r, i;
25630
25631 r = -E2BIG;
25632 if (cpuid->nent < vcpu->arch.cpuid_nent)
25633 goto out;
25634 r = -EFAULT;
25635- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
25636- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
25637+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
25638 goto out;
25639+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
25640+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
25641+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
25642+ goto out;
25643+ }
25644 return 0;
25645
25646 out:
25647diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
25648index 5953dce..f11a7d2 100644
25649--- a/arch/x86/kvm/emulate.c
25650+++ b/arch/x86/kvm/emulate.c
25651@@ -329,6 +329,7 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
25652
25653 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
25654 do { \
25655+ unsigned long _tmp; \
25656 __asm__ __volatile__ ( \
25657 _PRE_EFLAGS("0", "4", "2") \
25658 _op _suffix " %"_x"3,%1; " \
25659@@ -343,8 +344,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
25660 /* Raw emulation: instruction has two explicit operands. */
25661 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
25662 do { \
25663- unsigned long _tmp; \
25664- \
25665 switch ((ctxt)->dst.bytes) { \
25666 case 2: \
25667 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
25668@@ -360,7 +359,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
25669
25670 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
25671 do { \
25672- unsigned long _tmp; \
25673 switch ((ctxt)->dst.bytes) { \
25674 case 1: \
25675 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
25676diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
25677index 0eee2c8..94a32c3 100644
25678--- a/arch/x86/kvm/lapic.c
25679+++ b/arch/x86/kvm/lapic.c
25680@@ -55,7 +55,7 @@
25681 #define APIC_BUS_CYCLE_NS 1
25682
25683 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
25684-#define apic_debug(fmt, arg...)
25685+#define apic_debug(fmt, arg...) do {} while (0)
25686
25687 #define APIC_LVT_NUM 6
25688 /* 14 is the version for Xeon and Pentium 8.4.8*/
25689diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
25690index da20860..d19fdf5 100644
25691--- a/arch/x86/kvm/paging_tmpl.h
25692+++ b/arch/x86/kvm/paging_tmpl.h
25693@@ -208,7 +208,7 @@ retry_walk:
25694 if (unlikely(kvm_is_error_hva(host_addr)))
25695 goto error;
25696
25697- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
25698+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
25699 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
25700 goto error;
25701 walker->ptep_user[walker->level - 1] = ptep_user;
25702diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
25703index a14a6ea..dc86cf0 100644
25704--- a/arch/x86/kvm/svm.c
25705+++ b/arch/x86/kvm/svm.c
25706@@ -3493,7 +3493,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
25707 int cpu = raw_smp_processor_id();
25708
25709 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
25710+
25711+ pax_open_kernel();
25712 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
25713+ pax_close_kernel();
25714+
25715 load_TR_desc();
25716 }
25717
25718@@ -3894,6 +3898,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
25719 #endif
25720 #endif
25721
25722+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
25723+ __set_fs(current_thread_info()->addr_limit);
25724+#endif
25725+
25726 reload_tss(vcpu);
25727
25728 local_irq_disable();
25729diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
25730index 5402c94..c3bdeee 100644
25731--- a/arch/x86/kvm/vmx.c
25732+++ b/arch/x86/kvm/vmx.c
25733@@ -1311,12 +1311,12 @@ static void vmcs_write64(unsigned long field, u64 value)
25734 #endif
25735 }
25736
25737-static void vmcs_clear_bits(unsigned long field, u32 mask)
25738+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
25739 {
25740 vmcs_writel(field, vmcs_readl(field) & ~mask);
25741 }
25742
25743-static void vmcs_set_bits(unsigned long field, u32 mask)
25744+static void vmcs_set_bits(unsigned long field, unsigned long mask)
25745 {
25746 vmcs_writel(field, vmcs_readl(field) | mask);
25747 }
25748@@ -1517,7 +1517,11 @@ static void reload_tss(void)
25749 struct desc_struct *descs;
25750
25751 descs = (void *)gdt->address;
25752+
25753+ pax_open_kernel();
25754 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
25755+ pax_close_kernel();
25756+
25757 load_TR_desc();
25758 }
25759
25760@@ -1741,6 +1745,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
25761 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
25762 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
25763
25764+#ifdef CONFIG_PAX_PER_CPU_PGD
25765+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
25766+#endif
25767+
25768 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
25769 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
25770 vmx->loaded_vmcs->cpu = cpu;
25771@@ -2935,8 +2943,11 @@ static __init int hardware_setup(void)
25772 if (!cpu_has_vmx_flexpriority())
25773 flexpriority_enabled = 0;
25774
25775- if (!cpu_has_vmx_tpr_shadow())
25776- kvm_x86_ops->update_cr8_intercept = NULL;
25777+ if (!cpu_has_vmx_tpr_shadow()) {
25778+ pax_open_kernel();
25779+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
25780+ pax_close_kernel();
25781+ }
25782
25783 if (enable_ept && !cpu_has_vmx_ept_2m_page())
25784 kvm_disable_largepages();
25785@@ -2947,13 +2958,15 @@ static __init int hardware_setup(void)
25786 if (!cpu_has_vmx_apicv())
25787 enable_apicv = 0;
25788
25789+ pax_open_kernel();
25790 if (enable_apicv)
25791- kvm_x86_ops->update_cr8_intercept = NULL;
25792+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
25793 else {
25794- kvm_x86_ops->hwapic_irr_update = NULL;
25795- kvm_x86_ops->deliver_posted_interrupt = NULL;
25796- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
25797+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
25798+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
25799+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
25800 }
25801+ pax_close_kernel();
25802
25803 if (nested)
25804 nested_vmx_setup_ctls_msrs();
25805@@ -4076,7 +4089,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
25806
25807 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
25808 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
25809+
25810+#ifndef CONFIG_PAX_PER_CPU_PGD
25811 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
25812+#endif
25813
25814 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
25815 #ifdef CONFIG_X86_64
25816@@ -4098,7 +4114,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
25817 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
25818 vmx->host_idt_base = dt.address;
25819
25820- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
25821+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
25822
25823 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
25824 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
25825@@ -7030,6 +7046,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
25826 "jmp 2f \n\t"
25827 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
25828 "2: "
25829+
25830+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25831+ "ljmp %[cs],$3f\n\t"
25832+ "3: "
25833+#endif
25834+
25835 /* Save guest registers, load host registers, keep flags */
25836 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
25837 "pop %0 \n\t"
25838@@ -7082,6 +7104,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
25839 #endif
25840 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
25841 [wordsize]"i"(sizeof(ulong))
25842+
25843+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25844+ ,[cs]"i"(__KERNEL_CS)
25845+#endif
25846+
25847 : "cc", "memory"
25848 #ifdef CONFIG_X86_64
25849 , "rax", "rbx", "rdi", "rsi"
25850@@ -7095,7 +7122,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
25851 if (debugctlmsr)
25852 update_debugctlmsr(debugctlmsr);
25853
25854-#ifndef CONFIG_X86_64
25855+#ifdef CONFIG_X86_32
25856 /*
25857 * The sysexit path does not restore ds/es, so we must set them to
25858 * a reasonable value ourselves.
25859@@ -7104,8 +7131,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
25860 * may be executed in interrupt context, which saves and restore segments
25861 * around it, nullifying its effect.
25862 */
25863- loadsegment(ds, __USER_DS);
25864- loadsegment(es, __USER_DS);
25865+ loadsegment(ds, __KERNEL_DS);
25866+ loadsegment(es, __KERNEL_DS);
25867+ loadsegment(ss, __KERNEL_DS);
25868+
25869+#ifdef CONFIG_PAX_KERNEXEC
25870+ loadsegment(fs, __KERNEL_PERCPU);
25871+#endif
25872+
25873+#ifdef CONFIG_PAX_MEMORY_UDEREF
25874+ __set_fs(current_thread_info()->addr_limit);
25875+#endif
25876+
25877 #endif
25878
25879 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
25880diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
25881index e8ba99c..ee9d7d9 100644
25882--- a/arch/x86/kvm/x86.c
25883+++ b/arch/x86/kvm/x86.c
25884@@ -1725,8 +1725,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
25885 {
25886 struct kvm *kvm = vcpu->kvm;
25887 int lm = is_long_mode(vcpu);
25888- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
25889- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
25890+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
25891+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
25892 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
25893 : kvm->arch.xen_hvm_config.blob_size_32;
25894 u32 page_num = data & ~PAGE_MASK;
25895@@ -2609,6 +2609,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
25896 if (n < msr_list.nmsrs)
25897 goto out;
25898 r = -EFAULT;
25899+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
25900+ goto out;
25901 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
25902 num_msrs_to_save * sizeof(u32)))
25903 goto out;
25904@@ -5297,7 +5299,7 @@ static struct notifier_block pvclock_gtod_notifier = {
25905 };
25906 #endif
25907
25908-int kvm_arch_init(void *opaque)
25909+int kvm_arch_init(const void *opaque)
25910 {
25911 int r;
25912 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
25913diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
25914index 7114c63..a1018fc 100644
25915--- a/arch/x86/lguest/boot.c
25916+++ b/arch/x86/lguest/boot.c
25917@@ -1201,9 +1201,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
25918 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
25919 * Launcher to reboot us.
25920 */
25921-static void lguest_restart(char *reason)
25922+static __noreturn void lguest_restart(char *reason)
25923 {
25924 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
25925+ BUG();
25926 }
25927
25928 /*G:050
25929diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
25930index 00933d5..3a64af9 100644
25931--- a/arch/x86/lib/atomic64_386_32.S
25932+++ b/arch/x86/lib/atomic64_386_32.S
25933@@ -48,6 +48,10 @@ BEGIN(read)
25934 movl (v), %eax
25935 movl 4(v), %edx
25936 RET_ENDP
25937+BEGIN(read_unchecked)
25938+ movl (v), %eax
25939+ movl 4(v), %edx
25940+RET_ENDP
25941 #undef v
25942
25943 #define v %esi
25944@@ -55,6 +59,10 @@ BEGIN(set)
25945 movl %ebx, (v)
25946 movl %ecx, 4(v)
25947 RET_ENDP
25948+BEGIN(set_unchecked)
25949+ movl %ebx, (v)
25950+ movl %ecx, 4(v)
25951+RET_ENDP
25952 #undef v
25953
25954 #define v %esi
25955@@ -70,6 +78,20 @@ RET_ENDP
25956 BEGIN(add)
25957 addl %eax, (v)
25958 adcl %edx, 4(v)
25959+
25960+#ifdef CONFIG_PAX_REFCOUNT
25961+ jno 0f
25962+ subl %eax, (v)
25963+ sbbl %edx, 4(v)
25964+ int $4
25965+0:
25966+ _ASM_EXTABLE(0b, 0b)
25967+#endif
25968+
25969+RET_ENDP
25970+BEGIN(add_unchecked)
25971+ addl %eax, (v)
25972+ adcl %edx, 4(v)
25973 RET_ENDP
25974 #undef v
25975
25976@@ -77,6 +99,24 @@ RET_ENDP
25977 BEGIN(add_return)
25978 addl (v), %eax
25979 adcl 4(v), %edx
25980+
25981+#ifdef CONFIG_PAX_REFCOUNT
25982+ into
25983+1234:
25984+ _ASM_EXTABLE(1234b, 2f)
25985+#endif
25986+
25987+ movl %eax, (v)
25988+ movl %edx, 4(v)
25989+
25990+#ifdef CONFIG_PAX_REFCOUNT
25991+2:
25992+#endif
25993+
25994+RET_ENDP
25995+BEGIN(add_return_unchecked)
25996+ addl (v), %eax
25997+ adcl 4(v), %edx
25998 movl %eax, (v)
25999 movl %edx, 4(v)
26000 RET_ENDP
26001@@ -86,6 +126,20 @@ RET_ENDP
26002 BEGIN(sub)
26003 subl %eax, (v)
26004 sbbl %edx, 4(v)
26005+
26006+#ifdef CONFIG_PAX_REFCOUNT
26007+ jno 0f
26008+ addl %eax, (v)
26009+ adcl %edx, 4(v)
26010+ int $4
26011+0:
26012+ _ASM_EXTABLE(0b, 0b)
26013+#endif
26014+
26015+RET_ENDP
26016+BEGIN(sub_unchecked)
26017+ subl %eax, (v)
26018+ sbbl %edx, 4(v)
26019 RET_ENDP
26020 #undef v
26021
26022@@ -96,6 +150,27 @@ BEGIN(sub_return)
26023 sbbl $0, %edx
26024 addl (v), %eax
26025 adcl 4(v), %edx
26026+
26027+#ifdef CONFIG_PAX_REFCOUNT
26028+ into
26029+1234:
26030+ _ASM_EXTABLE(1234b, 2f)
26031+#endif
26032+
26033+ movl %eax, (v)
26034+ movl %edx, 4(v)
26035+
26036+#ifdef CONFIG_PAX_REFCOUNT
26037+2:
26038+#endif
26039+
26040+RET_ENDP
26041+BEGIN(sub_return_unchecked)
26042+ negl %edx
26043+ negl %eax
26044+ sbbl $0, %edx
26045+ addl (v), %eax
26046+ adcl 4(v), %edx
26047 movl %eax, (v)
26048 movl %edx, 4(v)
26049 RET_ENDP
26050@@ -105,6 +180,20 @@ RET_ENDP
26051 BEGIN(inc)
26052 addl $1, (v)
26053 adcl $0, 4(v)
26054+
26055+#ifdef CONFIG_PAX_REFCOUNT
26056+ jno 0f
26057+ subl $1, (v)
26058+ sbbl $0, 4(v)
26059+ int $4
26060+0:
26061+ _ASM_EXTABLE(0b, 0b)
26062+#endif
26063+
26064+RET_ENDP
26065+BEGIN(inc_unchecked)
26066+ addl $1, (v)
26067+ adcl $0, 4(v)
26068 RET_ENDP
26069 #undef v
26070
26071@@ -114,6 +203,26 @@ BEGIN(inc_return)
26072 movl 4(v), %edx
26073 addl $1, %eax
26074 adcl $0, %edx
26075+
26076+#ifdef CONFIG_PAX_REFCOUNT
26077+ into
26078+1234:
26079+ _ASM_EXTABLE(1234b, 2f)
26080+#endif
26081+
26082+ movl %eax, (v)
26083+ movl %edx, 4(v)
26084+
26085+#ifdef CONFIG_PAX_REFCOUNT
26086+2:
26087+#endif
26088+
26089+RET_ENDP
26090+BEGIN(inc_return_unchecked)
26091+ movl (v), %eax
26092+ movl 4(v), %edx
26093+ addl $1, %eax
26094+ adcl $0, %edx
26095 movl %eax, (v)
26096 movl %edx, 4(v)
26097 RET_ENDP
26098@@ -123,6 +232,20 @@ RET_ENDP
26099 BEGIN(dec)
26100 subl $1, (v)
26101 sbbl $0, 4(v)
26102+
26103+#ifdef CONFIG_PAX_REFCOUNT
26104+ jno 0f
26105+ addl $1, (v)
26106+ adcl $0, 4(v)
26107+ int $4
26108+0:
26109+ _ASM_EXTABLE(0b, 0b)
26110+#endif
26111+
26112+RET_ENDP
26113+BEGIN(dec_unchecked)
26114+ subl $1, (v)
26115+ sbbl $0, 4(v)
26116 RET_ENDP
26117 #undef v
26118
26119@@ -132,6 +255,26 @@ BEGIN(dec_return)
26120 movl 4(v), %edx
26121 subl $1, %eax
26122 sbbl $0, %edx
26123+
26124+#ifdef CONFIG_PAX_REFCOUNT
26125+ into
26126+1234:
26127+ _ASM_EXTABLE(1234b, 2f)
26128+#endif
26129+
26130+ movl %eax, (v)
26131+ movl %edx, 4(v)
26132+
26133+#ifdef CONFIG_PAX_REFCOUNT
26134+2:
26135+#endif
26136+
26137+RET_ENDP
26138+BEGIN(dec_return_unchecked)
26139+ movl (v), %eax
26140+ movl 4(v), %edx
26141+ subl $1, %eax
26142+ sbbl $0, %edx
26143 movl %eax, (v)
26144 movl %edx, 4(v)
26145 RET_ENDP
26146@@ -143,6 +286,13 @@ BEGIN(add_unless)
26147 adcl %edx, %edi
26148 addl (v), %eax
26149 adcl 4(v), %edx
26150+
26151+#ifdef CONFIG_PAX_REFCOUNT
26152+ into
26153+1234:
26154+ _ASM_EXTABLE(1234b, 2f)
26155+#endif
26156+
26157 cmpl %eax, %ecx
26158 je 3f
26159 1:
26160@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
26161 1:
26162 addl $1, %eax
26163 adcl $0, %edx
26164+
26165+#ifdef CONFIG_PAX_REFCOUNT
26166+ into
26167+1234:
26168+ _ASM_EXTABLE(1234b, 2f)
26169+#endif
26170+
26171 movl %eax, (v)
26172 movl %edx, 4(v)
26173 movl $1, %eax
26174@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
26175 movl 4(v), %edx
26176 subl $1, %eax
26177 sbbl $0, %edx
26178+
26179+#ifdef CONFIG_PAX_REFCOUNT
26180+ into
26181+1234:
26182+ _ASM_EXTABLE(1234b, 1f)
26183+#endif
26184+
26185 js 1f
26186 movl %eax, (v)
26187 movl %edx, 4(v)
26188diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
26189index f5cc9eb..51fa319 100644
26190--- a/arch/x86/lib/atomic64_cx8_32.S
26191+++ b/arch/x86/lib/atomic64_cx8_32.S
26192@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
26193 CFI_STARTPROC
26194
26195 read64 %ecx
26196+ pax_force_retaddr
26197 ret
26198 CFI_ENDPROC
26199 ENDPROC(atomic64_read_cx8)
26200
26201+ENTRY(atomic64_read_unchecked_cx8)
26202+ CFI_STARTPROC
26203+
26204+ read64 %ecx
26205+ pax_force_retaddr
26206+ ret
26207+ CFI_ENDPROC
26208+ENDPROC(atomic64_read_unchecked_cx8)
26209+
26210 ENTRY(atomic64_set_cx8)
26211 CFI_STARTPROC
26212
26213@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
26214 cmpxchg8b (%esi)
26215 jne 1b
26216
26217+ pax_force_retaddr
26218 ret
26219 CFI_ENDPROC
26220 ENDPROC(atomic64_set_cx8)
26221
26222+ENTRY(atomic64_set_unchecked_cx8)
26223+ CFI_STARTPROC
26224+
26225+1:
26226+/* we don't need LOCK_PREFIX since aligned 64-bit writes
26227+ * are atomic on 586 and newer */
26228+ cmpxchg8b (%esi)
26229+ jne 1b
26230+
26231+ pax_force_retaddr
26232+ ret
26233+ CFI_ENDPROC
26234+ENDPROC(atomic64_set_unchecked_cx8)
26235+
26236 ENTRY(atomic64_xchg_cx8)
26237 CFI_STARTPROC
26238
26239@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
26240 cmpxchg8b (%esi)
26241 jne 1b
26242
26243+ pax_force_retaddr
26244 ret
26245 CFI_ENDPROC
26246 ENDPROC(atomic64_xchg_cx8)
26247
26248-.macro addsub_return func ins insc
26249-ENTRY(atomic64_\func\()_return_cx8)
26250+.macro addsub_return func ins insc unchecked=""
26251+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
26252 CFI_STARTPROC
26253 SAVE ebp
26254 SAVE ebx
26255@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
26256 movl %edx, %ecx
26257 \ins\()l %esi, %ebx
26258 \insc\()l %edi, %ecx
26259+
26260+.ifb \unchecked
26261+#ifdef CONFIG_PAX_REFCOUNT
26262+ into
26263+2:
26264+ _ASM_EXTABLE(2b, 3f)
26265+#endif
26266+.endif
26267+
26268 LOCK_PREFIX
26269 cmpxchg8b (%ebp)
26270 jne 1b
26271-
26272-10:
26273 movl %ebx, %eax
26274 movl %ecx, %edx
26275+
26276+.ifb \unchecked
26277+#ifdef CONFIG_PAX_REFCOUNT
26278+3:
26279+#endif
26280+.endif
26281+
26282 RESTORE edi
26283 RESTORE esi
26284 RESTORE ebx
26285 RESTORE ebp
26286+ pax_force_retaddr
26287 ret
26288 CFI_ENDPROC
26289-ENDPROC(atomic64_\func\()_return_cx8)
26290+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
26291 .endm
26292
26293 addsub_return add add adc
26294 addsub_return sub sub sbb
26295+addsub_return add add adc _unchecked
26296+addsub_return sub sub sbb _unchecked
26297
26298-.macro incdec_return func ins insc
26299-ENTRY(atomic64_\func\()_return_cx8)
26300+.macro incdec_return func ins insc unchecked=""
26301+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
26302 CFI_STARTPROC
26303 SAVE ebx
26304
26305@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
26306 movl %edx, %ecx
26307 \ins\()l $1, %ebx
26308 \insc\()l $0, %ecx
26309+
26310+.ifb \unchecked
26311+#ifdef CONFIG_PAX_REFCOUNT
26312+ into
26313+2:
26314+ _ASM_EXTABLE(2b, 3f)
26315+#endif
26316+.endif
26317+
26318 LOCK_PREFIX
26319 cmpxchg8b (%esi)
26320 jne 1b
26321
26322-10:
26323 movl %ebx, %eax
26324 movl %ecx, %edx
26325+
26326+.ifb \unchecked
26327+#ifdef CONFIG_PAX_REFCOUNT
26328+3:
26329+#endif
26330+.endif
26331+
26332 RESTORE ebx
26333+ pax_force_retaddr
26334 ret
26335 CFI_ENDPROC
26336-ENDPROC(atomic64_\func\()_return_cx8)
26337+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
26338 .endm
26339
26340 incdec_return inc add adc
26341 incdec_return dec sub sbb
26342+incdec_return inc add adc _unchecked
26343+incdec_return dec sub sbb _unchecked
26344
26345 ENTRY(atomic64_dec_if_positive_cx8)
26346 CFI_STARTPROC
26347@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
26348 movl %edx, %ecx
26349 subl $1, %ebx
26350 sbb $0, %ecx
26351+
26352+#ifdef CONFIG_PAX_REFCOUNT
26353+ into
26354+1234:
26355+ _ASM_EXTABLE(1234b, 2f)
26356+#endif
26357+
26358 js 2f
26359 LOCK_PREFIX
26360 cmpxchg8b (%esi)
26361@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
26362 movl %ebx, %eax
26363 movl %ecx, %edx
26364 RESTORE ebx
26365+ pax_force_retaddr
26366 ret
26367 CFI_ENDPROC
26368 ENDPROC(atomic64_dec_if_positive_cx8)
26369@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
26370 movl %edx, %ecx
26371 addl %ebp, %ebx
26372 adcl %edi, %ecx
26373+
26374+#ifdef CONFIG_PAX_REFCOUNT
26375+ into
26376+1234:
26377+ _ASM_EXTABLE(1234b, 3f)
26378+#endif
26379+
26380 LOCK_PREFIX
26381 cmpxchg8b (%esi)
26382 jne 1b
26383@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
26384 CFI_ADJUST_CFA_OFFSET -8
26385 RESTORE ebx
26386 RESTORE ebp
26387+ pax_force_retaddr
26388 ret
26389 4:
26390 cmpl %edx, 4(%esp)
26391@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
26392 xorl %ecx, %ecx
26393 addl $1, %ebx
26394 adcl %edx, %ecx
26395+
26396+#ifdef CONFIG_PAX_REFCOUNT
26397+ into
26398+1234:
26399+ _ASM_EXTABLE(1234b, 3f)
26400+#endif
26401+
26402 LOCK_PREFIX
26403 cmpxchg8b (%esi)
26404 jne 1b
26405@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
26406 movl $1, %eax
26407 3:
26408 RESTORE ebx
26409+ pax_force_retaddr
26410 ret
26411 CFI_ENDPROC
26412 ENDPROC(atomic64_inc_not_zero_cx8)
26413diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
26414index e78b8ee..7e173a8 100644
26415--- a/arch/x86/lib/checksum_32.S
26416+++ b/arch/x86/lib/checksum_32.S
26417@@ -29,7 +29,8 @@
26418 #include <asm/dwarf2.h>
26419 #include <asm/errno.h>
26420 #include <asm/asm.h>
26421-
26422+#include <asm/segment.h>
26423+
26424 /*
26425 * computes a partial checksum, e.g. for TCP/UDP fragments
26426 */
26427@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
26428
26429 #define ARGBASE 16
26430 #define FP 12
26431-
26432-ENTRY(csum_partial_copy_generic)
26433+
26434+ENTRY(csum_partial_copy_generic_to_user)
26435 CFI_STARTPROC
26436+
26437+#ifdef CONFIG_PAX_MEMORY_UDEREF
26438+ pushl_cfi %gs
26439+ popl_cfi %es
26440+ jmp csum_partial_copy_generic
26441+#endif
26442+
26443+ENTRY(csum_partial_copy_generic_from_user)
26444+
26445+#ifdef CONFIG_PAX_MEMORY_UDEREF
26446+ pushl_cfi %gs
26447+ popl_cfi %ds
26448+#endif
26449+
26450+ENTRY(csum_partial_copy_generic)
26451 subl $4,%esp
26452 CFI_ADJUST_CFA_OFFSET 4
26453 pushl_cfi %edi
26454@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
26455 jmp 4f
26456 SRC(1: movw (%esi), %bx )
26457 addl $2, %esi
26458-DST( movw %bx, (%edi) )
26459+DST( movw %bx, %es:(%edi) )
26460 addl $2, %edi
26461 addw %bx, %ax
26462 adcl $0, %eax
26463@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
26464 SRC(1: movl (%esi), %ebx )
26465 SRC( movl 4(%esi), %edx )
26466 adcl %ebx, %eax
26467-DST( movl %ebx, (%edi) )
26468+DST( movl %ebx, %es:(%edi) )
26469 adcl %edx, %eax
26470-DST( movl %edx, 4(%edi) )
26471+DST( movl %edx, %es:4(%edi) )
26472
26473 SRC( movl 8(%esi), %ebx )
26474 SRC( movl 12(%esi), %edx )
26475 adcl %ebx, %eax
26476-DST( movl %ebx, 8(%edi) )
26477+DST( movl %ebx, %es:8(%edi) )
26478 adcl %edx, %eax
26479-DST( movl %edx, 12(%edi) )
26480+DST( movl %edx, %es:12(%edi) )
26481
26482 SRC( movl 16(%esi), %ebx )
26483 SRC( movl 20(%esi), %edx )
26484 adcl %ebx, %eax
26485-DST( movl %ebx, 16(%edi) )
26486+DST( movl %ebx, %es:16(%edi) )
26487 adcl %edx, %eax
26488-DST( movl %edx, 20(%edi) )
26489+DST( movl %edx, %es:20(%edi) )
26490
26491 SRC( movl 24(%esi), %ebx )
26492 SRC( movl 28(%esi), %edx )
26493 adcl %ebx, %eax
26494-DST( movl %ebx, 24(%edi) )
26495+DST( movl %ebx, %es:24(%edi) )
26496 adcl %edx, %eax
26497-DST( movl %edx, 28(%edi) )
26498+DST( movl %edx, %es:28(%edi) )
26499
26500 lea 32(%esi), %esi
26501 lea 32(%edi), %edi
26502@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
26503 shrl $2, %edx # This clears CF
26504 SRC(3: movl (%esi), %ebx )
26505 adcl %ebx, %eax
26506-DST( movl %ebx, (%edi) )
26507+DST( movl %ebx, %es:(%edi) )
26508 lea 4(%esi), %esi
26509 lea 4(%edi), %edi
26510 dec %edx
26511@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
26512 jb 5f
26513 SRC( movw (%esi), %cx )
26514 leal 2(%esi), %esi
26515-DST( movw %cx, (%edi) )
26516+DST( movw %cx, %es:(%edi) )
26517 leal 2(%edi), %edi
26518 je 6f
26519 shll $16,%ecx
26520 SRC(5: movb (%esi), %cl )
26521-DST( movb %cl, (%edi) )
26522+DST( movb %cl, %es:(%edi) )
26523 6: addl %ecx, %eax
26524 adcl $0, %eax
26525 7:
26526@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
26527
26528 6001:
26529 movl ARGBASE+20(%esp), %ebx # src_err_ptr
26530- movl $-EFAULT, (%ebx)
26531+ movl $-EFAULT, %ss:(%ebx)
26532
26533 # zero the complete destination - computing the rest
26534 # is too much work
26535@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
26536
26537 6002:
26538 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
26539- movl $-EFAULT,(%ebx)
26540+ movl $-EFAULT,%ss:(%ebx)
26541 jmp 5000b
26542
26543 .previous
26544
26545+ pushl_cfi %ss
26546+ popl_cfi %ds
26547+ pushl_cfi %ss
26548+ popl_cfi %es
26549 popl_cfi %ebx
26550 CFI_RESTORE ebx
26551 popl_cfi %esi
26552@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
26553 popl_cfi %ecx # equivalent to addl $4,%esp
26554 ret
26555 CFI_ENDPROC
26556-ENDPROC(csum_partial_copy_generic)
26557+ENDPROC(csum_partial_copy_generic_to_user)
26558
26559 #else
26560
26561 /* Version for PentiumII/PPro */
26562
26563 #define ROUND1(x) \
26564+ nop; nop; nop; \
26565 SRC(movl x(%esi), %ebx ) ; \
26566 addl %ebx, %eax ; \
26567- DST(movl %ebx, x(%edi) ) ;
26568+ DST(movl %ebx, %es:x(%edi)) ;
26569
26570 #define ROUND(x) \
26571+ nop; nop; nop; \
26572 SRC(movl x(%esi), %ebx ) ; \
26573 adcl %ebx, %eax ; \
26574- DST(movl %ebx, x(%edi) ) ;
26575+ DST(movl %ebx, %es:x(%edi)) ;
26576
26577 #define ARGBASE 12
26578-
26579-ENTRY(csum_partial_copy_generic)
26580+
26581+ENTRY(csum_partial_copy_generic_to_user)
26582 CFI_STARTPROC
26583+
26584+#ifdef CONFIG_PAX_MEMORY_UDEREF
26585+ pushl_cfi %gs
26586+ popl_cfi %es
26587+ jmp csum_partial_copy_generic
26588+#endif
26589+
26590+ENTRY(csum_partial_copy_generic_from_user)
26591+
26592+#ifdef CONFIG_PAX_MEMORY_UDEREF
26593+ pushl_cfi %gs
26594+ popl_cfi %ds
26595+#endif
26596+
26597+ENTRY(csum_partial_copy_generic)
26598 pushl_cfi %ebx
26599 CFI_REL_OFFSET ebx, 0
26600 pushl_cfi %edi
26601@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
26602 subl %ebx, %edi
26603 lea -1(%esi),%edx
26604 andl $-32,%edx
26605- lea 3f(%ebx,%ebx), %ebx
26606+ lea 3f(%ebx,%ebx,2), %ebx
26607 testl %esi, %esi
26608 jmp *%ebx
26609 1: addl $64,%esi
26610@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
26611 jb 5f
26612 SRC( movw (%esi), %dx )
26613 leal 2(%esi), %esi
26614-DST( movw %dx, (%edi) )
26615+DST( movw %dx, %es:(%edi) )
26616 leal 2(%edi), %edi
26617 je 6f
26618 shll $16,%edx
26619 5:
26620 SRC( movb (%esi), %dl )
26621-DST( movb %dl, (%edi) )
26622+DST( movb %dl, %es:(%edi) )
26623 6: addl %edx, %eax
26624 adcl $0, %eax
26625 7:
26626 .section .fixup, "ax"
26627 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
26628- movl $-EFAULT, (%ebx)
26629+ movl $-EFAULT, %ss:(%ebx)
26630 # zero the complete destination (computing the rest is too much work)
26631 movl ARGBASE+8(%esp),%edi # dst
26632 movl ARGBASE+12(%esp),%ecx # len
26633@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
26634 rep; stosb
26635 jmp 7b
26636 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
26637- movl $-EFAULT, (%ebx)
26638+ movl $-EFAULT, %ss:(%ebx)
26639 jmp 7b
26640 .previous
26641
26642+#ifdef CONFIG_PAX_MEMORY_UDEREF
26643+ pushl_cfi %ss
26644+ popl_cfi %ds
26645+ pushl_cfi %ss
26646+ popl_cfi %es
26647+#endif
26648+
26649 popl_cfi %esi
26650 CFI_RESTORE esi
26651 popl_cfi %edi
26652@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
26653 CFI_RESTORE ebx
26654 ret
26655 CFI_ENDPROC
26656-ENDPROC(csum_partial_copy_generic)
26657+ENDPROC(csum_partial_copy_generic_to_user)
26658
26659 #undef ROUND
26660 #undef ROUND1
26661diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
26662index f2145cf..cea889d 100644
26663--- a/arch/x86/lib/clear_page_64.S
26664+++ b/arch/x86/lib/clear_page_64.S
26665@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
26666 movl $4096/8,%ecx
26667 xorl %eax,%eax
26668 rep stosq
26669+ pax_force_retaddr
26670 ret
26671 CFI_ENDPROC
26672 ENDPROC(clear_page_c)
26673@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
26674 movl $4096,%ecx
26675 xorl %eax,%eax
26676 rep stosb
26677+ pax_force_retaddr
26678 ret
26679 CFI_ENDPROC
26680 ENDPROC(clear_page_c_e)
26681@@ -43,6 +45,7 @@ ENTRY(clear_page)
26682 leaq 64(%rdi),%rdi
26683 jnz .Lloop
26684 nop
26685+ pax_force_retaddr
26686 ret
26687 CFI_ENDPROC
26688 .Lclear_page_end:
26689@@ -58,7 +61,7 @@ ENDPROC(clear_page)
26690
26691 #include <asm/cpufeature.h>
26692
26693- .section .altinstr_replacement,"ax"
26694+ .section .altinstr_replacement,"a"
26695 1: .byte 0xeb /* jmp <disp8> */
26696 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
26697 2: .byte 0xeb /* jmp <disp8> */
26698diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
26699index 1e572c5..2a162cd 100644
26700--- a/arch/x86/lib/cmpxchg16b_emu.S
26701+++ b/arch/x86/lib/cmpxchg16b_emu.S
26702@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
26703
26704 popf
26705 mov $1, %al
26706+ pax_force_retaddr
26707 ret
26708
26709 not_same:
26710 popf
26711 xor %al,%al
26712+ pax_force_retaddr
26713 ret
26714
26715 CFI_ENDPROC
26716diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
26717index 176cca6..1166c50 100644
26718--- a/arch/x86/lib/copy_page_64.S
26719+++ b/arch/x86/lib/copy_page_64.S
26720@@ -9,6 +9,7 @@ copy_page_rep:
26721 CFI_STARTPROC
26722 movl $4096/8, %ecx
26723 rep movsq
26724+ pax_force_retaddr
26725 ret
26726 CFI_ENDPROC
26727 ENDPROC(copy_page_rep)
26728@@ -20,12 +21,14 @@ ENDPROC(copy_page_rep)
26729
26730 ENTRY(copy_page)
26731 CFI_STARTPROC
26732- subq $2*8, %rsp
26733- CFI_ADJUST_CFA_OFFSET 2*8
26734+ subq $3*8, %rsp
26735+ CFI_ADJUST_CFA_OFFSET 3*8
26736 movq %rbx, (%rsp)
26737 CFI_REL_OFFSET rbx, 0
26738 movq %r12, 1*8(%rsp)
26739 CFI_REL_OFFSET r12, 1*8
26740+ movq %r13, 2*8(%rsp)
26741+ CFI_REL_OFFSET r13, 2*8
26742
26743 movl $(4096/64)-5, %ecx
26744 .p2align 4
26745@@ -36,7 +39,7 @@ ENTRY(copy_page)
26746 movq 0x8*2(%rsi), %rdx
26747 movq 0x8*3(%rsi), %r8
26748 movq 0x8*4(%rsi), %r9
26749- movq 0x8*5(%rsi), %r10
26750+ movq 0x8*5(%rsi), %r13
26751 movq 0x8*6(%rsi), %r11
26752 movq 0x8*7(%rsi), %r12
26753
26754@@ -47,7 +50,7 @@ ENTRY(copy_page)
26755 movq %rdx, 0x8*2(%rdi)
26756 movq %r8, 0x8*3(%rdi)
26757 movq %r9, 0x8*4(%rdi)
26758- movq %r10, 0x8*5(%rdi)
26759+ movq %r13, 0x8*5(%rdi)
26760 movq %r11, 0x8*6(%rdi)
26761 movq %r12, 0x8*7(%rdi)
26762
26763@@ -66,7 +69,7 @@ ENTRY(copy_page)
26764 movq 0x8*2(%rsi), %rdx
26765 movq 0x8*3(%rsi), %r8
26766 movq 0x8*4(%rsi), %r9
26767- movq 0x8*5(%rsi), %r10
26768+ movq 0x8*5(%rsi), %r13
26769 movq 0x8*6(%rsi), %r11
26770 movq 0x8*7(%rsi), %r12
26771
26772@@ -75,7 +78,7 @@ ENTRY(copy_page)
26773 movq %rdx, 0x8*2(%rdi)
26774 movq %r8, 0x8*3(%rdi)
26775 movq %r9, 0x8*4(%rdi)
26776- movq %r10, 0x8*5(%rdi)
26777+ movq %r13, 0x8*5(%rdi)
26778 movq %r11, 0x8*6(%rdi)
26779 movq %r12, 0x8*7(%rdi)
26780
26781@@ -87,8 +90,11 @@ ENTRY(copy_page)
26782 CFI_RESTORE rbx
26783 movq 1*8(%rsp), %r12
26784 CFI_RESTORE r12
26785- addq $2*8, %rsp
26786- CFI_ADJUST_CFA_OFFSET -2*8
26787+ movq 2*8(%rsp), %r13
26788+ CFI_RESTORE r13
26789+ addq $3*8, %rsp
26790+ CFI_ADJUST_CFA_OFFSET -3*8
26791+ pax_force_retaddr
26792 ret
26793 .Lcopy_page_end:
26794 CFI_ENDPROC
26795@@ -99,7 +105,7 @@ ENDPROC(copy_page)
26796
26797 #include <asm/cpufeature.h>
26798
26799- .section .altinstr_replacement,"ax"
26800+ .section .altinstr_replacement,"a"
26801 1: .byte 0xeb /* jmp <disp8> */
26802 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
26803 2:
26804diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
26805index a30ca15..6b3f4e1 100644
26806--- a/arch/x86/lib/copy_user_64.S
26807+++ b/arch/x86/lib/copy_user_64.S
26808@@ -18,31 +18,7 @@
26809 #include <asm/alternative-asm.h>
26810 #include <asm/asm.h>
26811 #include <asm/smap.h>
26812-
26813-/*
26814- * By placing feature2 after feature1 in altinstructions section, we logically
26815- * implement:
26816- * If CPU has feature2, jmp to alt2 is used
26817- * else if CPU has feature1, jmp to alt1 is used
26818- * else jmp to orig is used.
26819- */
26820- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
26821-0:
26822- .byte 0xe9 /* 32bit jump */
26823- .long \orig-1f /* by default jump to orig */
26824-1:
26825- .section .altinstr_replacement,"ax"
26826-2: .byte 0xe9 /* near jump with 32bit immediate */
26827- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
26828-3: .byte 0xe9 /* near jump with 32bit immediate */
26829- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
26830- .previous
26831-
26832- .section .altinstructions,"a"
26833- altinstruction_entry 0b,2b,\feature1,5,5
26834- altinstruction_entry 0b,3b,\feature2,5,5
26835- .previous
26836- .endm
26837+#include <asm/pgtable.h>
26838
26839 .macro ALIGN_DESTINATION
26840 #ifdef FIX_ALIGNMENT
26841@@ -70,52 +46,6 @@
26842 #endif
26843 .endm
26844
26845-/* Standard copy_to_user with segment limit checking */
26846-ENTRY(_copy_to_user)
26847- CFI_STARTPROC
26848- GET_THREAD_INFO(%rax)
26849- movq %rdi,%rcx
26850- addq %rdx,%rcx
26851- jc bad_to_user
26852- cmpq TI_addr_limit(%rax),%rcx
26853- ja bad_to_user
26854- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
26855- copy_user_generic_unrolled,copy_user_generic_string, \
26856- copy_user_enhanced_fast_string
26857- CFI_ENDPROC
26858-ENDPROC(_copy_to_user)
26859-
26860-/* Standard copy_from_user with segment limit checking */
26861-ENTRY(_copy_from_user)
26862- CFI_STARTPROC
26863- GET_THREAD_INFO(%rax)
26864- movq %rsi,%rcx
26865- addq %rdx,%rcx
26866- jc bad_from_user
26867- cmpq TI_addr_limit(%rax),%rcx
26868- ja bad_from_user
26869- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
26870- copy_user_generic_unrolled,copy_user_generic_string, \
26871- copy_user_enhanced_fast_string
26872- CFI_ENDPROC
26873-ENDPROC(_copy_from_user)
26874-
26875- .section .fixup,"ax"
26876- /* must zero dest */
26877-ENTRY(bad_from_user)
26878-bad_from_user:
26879- CFI_STARTPROC
26880- movl %edx,%ecx
26881- xorl %eax,%eax
26882- rep
26883- stosb
26884-bad_to_user:
26885- movl %edx,%eax
26886- ret
26887- CFI_ENDPROC
26888-ENDPROC(bad_from_user)
26889- .previous
26890-
26891 /*
26892 * copy_user_generic_unrolled - memory copy with exception handling.
26893 * This version is for CPUs like P4 that don't have efficient micro
26894@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
26895 */
26896 ENTRY(copy_user_generic_unrolled)
26897 CFI_STARTPROC
26898+ ASM_PAX_OPEN_USERLAND
26899 ASM_STAC
26900 cmpl $8,%edx
26901 jb 20f /* less then 8 bytes, go to byte copy loop */
26902@@ -141,19 +72,19 @@ ENTRY(copy_user_generic_unrolled)
26903 jz 17f
26904 1: movq (%rsi),%r8
26905 2: movq 1*8(%rsi),%r9
26906-3: movq 2*8(%rsi),%r10
26907+3: movq 2*8(%rsi),%rax
26908 4: movq 3*8(%rsi),%r11
26909 5: movq %r8,(%rdi)
26910 6: movq %r9,1*8(%rdi)
26911-7: movq %r10,2*8(%rdi)
26912+7: movq %rax,2*8(%rdi)
26913 8: movq %r11,3*8(%rdi)
26914 9: movq 4*8(%rsi),%r8
26915 10: movq 5*8(%rsi),%r9
26916-11: movq 6*8(%rsi),%r10
26917+11: movq 6*8(%rsi),%rax
26918 12: movq 7*8(%rsi),%r11
26919 13: movq %r8,4*8(%rdi)
26920 14: movq %r9,5*8(%rdi)
26921-15: movq %r10,6*8(%rdi)
26922+15: movq %rax,6*8(%rdi)
26923 16: movq %r11,7*8(%rdi)
26924 leaq 64(%rsi),%rsi
26925 leaq 64(%rdi),%rdi
26926@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
26927 jnz 21b
26928 23: xor %eax,%eax
26929 ASM_CLAC
26930+ ASM_PAX_CLOSE_USERLAND
26931+ pax_force_retaddr
26932 ret
26933
26934 .section .fixup,"ax"
26935@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
26936 */
26937 ENTRY(copy_user_generic_string)
26938 CFI_STARTPROC
26939+ ASM_PAX_OPEN_USERLAND
26940 ASM_STAC
26941 andl %edx,%edx
26942 jz 4f
26943@@ -251,6 +185,8 @@ ENTRY(copy_user_generic_string)
26944 movsb
26945 4: xorl %eax,%eax
26946 ASM_CLAC
26947+ ASM_PAX_CLOSE_USERLAND
26948+ pax_force_retaddr
26949 ret
26950
26951 .section .fixup,"ax"
26952@@ -278,6 +214,7 @@ ENDPROC(copy_user_generic_string)
26953 */
26954 ENTRY(copy_user_enhanced_fast_string)
26955 CFI_STARTPROC
26956+ ASM_PAX_OPEN_USERLAND
26957 ASM_STAC
26958 andl %edx,%edx
26959 jz 2f
26960@@ -286,6 +223,8 @@ ENTRY(copy_user_enhanced_fast_string)
26961 movsb
26962 2: xorl %eax,%eax
26963 ASM_CLAC
26964+ ASM_PAX_CLOSE_USERLAND
26965+ pax_force_retaddr
26966 ret
26967
26968 .section .fixup,"ax"
26969diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
26970index 6a4f43c..55d26f2 100644
26971--- a/arch/x86/lib/copy_user_nocache_64.S
26972+++ b/arch/x86/lib/copy_user_nocache_64.S
26973@@ -8,6 +8,7 @@
26974
26975 #include <linux/linkage.h>
26976 #include <asm/dwarf2.h>
26977+#include <asm/alternative-asm.h>
26978
26979 #define FIX_ALIGNMENT 1
26980
26981@@ -16,6 +17,7 @@
26982 #include <asm/thread_info.h>
26983 #include <asm/asm.h>
26984 #include <asm/smap.h>
26985+#include <asm/pgtable.h>
26986
26987 .macro ALIGN_DESTINATION
26988 #ifdef FIX_ALIGNMENT
26989@@ -49,6 +51,16 @@
26990 */
26991 ENTRY(__copy_user_nocache)
26992 CFI_STARTPROC
26993+
26994+#ifdef CONFIG_PAX_MEMORY_UDEREF
26995+ mov pax_user_shadow_base,%rcx
26996+ cmp %rcx,%rsi
26997+ jae 1f
26998+ add %rcx,%rsi
26999+1:
27000+#endif
27001+
27002+ ASM_PAX_OPEN_USERLAND
27003 ASM_STAC
27004 cmpl $8,%edx
27005 jb 20f /* less then 8 bytes, go to byte copy loop */
27006@@ -59,19 +71,19 @@ ENTRY(__copy_user_nocache)
27007 jz 17f
27008 1: movq (%rsi),%r8
27009 2: movq 1*8(%rsi),%r9
27010-3: movq 2*8(%rsi),%r10
27011+3: movq 2*8(%rsi),%rax
27012 4: movq 3*8(%rsi),%r11
27013 5: movnti %r8,(%rdi)
27014 6: movnti %r9,1*8(%rdi)
27015-7: movnti %r10,2*8(%rdi)
27016+7: movnti %rax,2*8(%rdi)
27017 8: movnti %r11,3*8(%rdi)
27018 9: movq 4*8(%rsi),%r8
27019 10: movq 5*8(%rsi),%r9
27020-11: movq 6*8(%rsi),%r10
27021+11: movq 6*8(%rsi),%rax
27022 12: movq 7*8(%rsi),%r11
27023 13: movnti %r8,4*8(%rdi)
27024 14: movnti %r9,5*8(%rdi)
27025-15: movnti %r10,6*8(%rdi)
27026+15: movnti %rax,6*8(%rdi)
27027 16: movnti %r11,7*8(%rdi)
27028 leaq 64(%rsi),%rsi
27029 leaq 64(%rdi),%rdi
27030@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
27031 jnz 21b
27032 23: xorl %eax,%eax
27033 ASM_CLAC
27034+ ASM_PAX_CLOSE_USERLAND
27035 sfence
27036+ pax_force_retaddr
27037 ret
27038
27039 .section .fixup,"ax"
27040diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
27041index 2419d5f..953ee51 100644
27042--- a/arch/x86/lib/csum-copy_64.S
27043+++ b/arch/x86/lib/csum-copy_64.S
27044@@ -9,6 +9,7 @@
27045 #include <asm/dwarf2.h>
27046 #include <asm/errno.h>
27047 #include <asm/asm.h>
27048+#include <asm/alternative-asm.h>
27049
27050 /*
27051 * Checksum copy with exception handling.
27052@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
27053 CFI_RESTORE rbp
27054 addq $7*8, %rsp
27055 CFI_ADJUST_CFA_OFFSET -7*8
27056+ pax_force_retaddr 0, 1
27057 ret
27058 CFI_RESTORE_STATE
27059
27060diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
27061index 25b7ae8..c40113e 100644
27062--- a/arch/x86/lib/csum-wrappers_64.c
27063+++ b/arch/x86/lib/csum-wrappers_64.c
27064@@ -52,8 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
27065 len -= 2;
27066 }
27067 }
27068- isum = csum_partial_copy_generic((__force const void *)src,
27069+ pax_open_userland();
27070+ stac();
27071+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
27072 dst, len, isum, errp, NULL);
27073+ clac();
27074+ pax_close_userland();
27075 if (unlikely(*errp))
27076 goto out_err;
27077
27078@@ -105,8 +109,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
27079 }
27080
27081 *errp = 0;
27082- return csum_partial_copy_generic(src, (void __force *)dst,
27083+ pax_open_userland();
27084+ stac();
27085+ isum = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
27086 len, isum, NULL, errp);
27087+ clac();
27088+ pax_close_userland();
27089+ return isum;
27090 }
27091 EXPORT_SYMBOL(csum_partial_copy_to_user);
27092
27093diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
27094index a451235..1daa956 100644
27095--- a/arch/x86/lib/getuser.S
27096+++ b/arch/x86/lib/getuser.S
27097@@ -33,17 +33,40 @@
27098 #include <asm/thread_info.h>
27099 #include <asm/asm.h>
27100 #include <asm/smap.h>
27101+#include <asm/segment.h>
27102+#include <asm/pgtable.h>
27103+#include <asm/alternative-asm.h>
27104+
27105+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
27106+#define __copyuser_seg gs;
27107+#else
27108+#define __copyuser_seg
27109+#endif
27110
27111 .text
27112 ENTRY(__get_user_1)
27113 CFI_STARTPROC
27114+
27115+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
27116 GET_THREAD_INFO(%_ASM_DX)
27117 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
27118 jae bad_get_user
27119 ASM_STAC
27120-1: movzbl (%_ASM_AX),%edx
27121+
27122+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
27123+ mov pax_user_shadow_base,%_ASM_DX
27124+ cmp %_ASM_DX,%_ASM_AX
27125+ jae 1234f
27126+ add %_ASM_DX,%_ASM_AX
27127+1234:
27128+#endif
27129+
27130+#endif
27131+
27132+1: __copyuser_seg movzbl (%_ASM_AX),%edx
27133 xor %eax,%eax
27134 ASM_CLAC
27135+ pax_force_retaddr
27136 ret
27137 CFI_ENDPROC
27138 ENDPROC(__get_user_1)
27139@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
27140 ENTRY(__get_user_2)
27141 CFI_STARTPROC
27142 add $1,%_ASM_AX
27143+
27144+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
27145 jc bad_get_user
27146 GET_THREAD_INFO(%_ASM_DX)
27147 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
27148 jae bad_get_user
27149 ASM_STAC
27150-2: movzwl -1(%_ASM_AX),%edx
27151+
27152+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
27153+ mov pax_user_shadow_base,%_ASM_DX
27154+ cmp %_ASM_DX,%_ASM_AX
27155+ jae 1234f
27156+ add %_ASM_DX,%_ASM_AX
27157+1234:
27158+#endif
27159+
27160+#endif
27161+
27162+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
27163 xor %eax,%eax
27164 ASM_CLAC
27165+ pax_force_retaddr
27166 ret
27167 CFI_ENDPROC
27168 ENDPROC(__get_user_2)
27169@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
27170 ENTRY(__get_user_4)
27171 CFI_STARTPROC
27172 add $3,%_ASM_AX
27173+
27174+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
27175 jc bad_get_user
27176 GET_THREAD_INFO(%_ASM_DX)
27177 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
27178 jae bad_get_user
27179 ASM_STAC
27180-3: movl -3(%_ASM_AX),%edx
27181+
27182+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
27183+ mov pax_user_shadow_base,%_ASM_DX
27184+ cmp %_ASM_DX,%_ASM_AX
27185+ jae 1234f
27186+ add %_ASM_DX,%_ASM_AX
27187+1234:
27188+#endif
27189+
27190+#endif
27191+
27192+3: __copyuser_seg movl -3(%_ASM_AX),%edx
27193 xor %eax,%eax
27194 ASM_CLAC
27195+ pax_force_retaddr
27196 ret
27197 CFI_ENDPROC
27198 ENDPROC(__get_user_4)
27199@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
27200 GET_THREAD_INFO(%_ASM_DX)
27201 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
27202 jae bad_get_user
27203+
27204+#ifdef CONFIG_PAX_MEMORY_UDEREF
27205+ mov pax_user_shadow_base,%_ASM_DX
27206+ cmp %_ASM_DX,%_ASM_AX
27207+ jae 1234f
27208+ add %_ASM_DX,%_ASM_AX
27209+1234:
27210+#endif
27211+
27212 ASM_STAC
27213 4: movq -7(%_ASM_AX),%rdx
27214 xor %eax,%eax
27215 ASM_CLAC
27216+ pax_force_retaddr
27217 ret
27218 #else
27219 add $7,%_ASM_AX
27220@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
27221 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
27222 jae bad_get_user_8
27223 ASM_STAC
27224-4: movl -7(%_ASM_AX),%edx
27225-5: movl -3(%_ASM_AX),%ecx
27226+4: __copyuser_seg movl -7(%_ASM_AX),%edx
27227+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
27228 xor %eax,%eax
27229 ASM_CLAC
27230+ pax_force_retaddr
27231 ret
27232 #endif
27233 CFI_ENDPROC
27234@@ -113,6 +175,7 @@ bad_get_user:
27235 xor %edx,%edx
27236 mov $(-EFAULT),%_ASM_AX
27237 ASM_CLAC
27238+ pax_force_retaddr
27239 ret
27240 CFI_ENDPROC
27241 END(bad_get_user)
27242@@ -124,6 +187,7 @@ bad_get_user_8:
27243 xor %ecx,%ecx
27244 mov $(-EFAULT),%_ASM_AX
27245 ASM_CLAC
27246+ pax_force_retaddr
27247 ret
27248 CFI_ENDPROC
27249 END(bad_get_user_8)
27250diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
27251index 54fcffe..7be149e 100644
27252--- a/arch/x86/lib/insn.c
27253+++ b/arch/x86/lib/insn.c
27254@@ -20,8 +20,10 @@
27255
27256 #ifdef __KERNEL__
27257 #include <linux/string.h>
27258+#include <asm/pgtable_types.h>
27259 #else
27260 #include <string.h>
27261+#define ktla_ktva(addr) addr
27262 #endif
27263 #include <asm/inat.h>
27264 #include <asm/insn.h>
27265@@ -53,8 +55,8 @@
27266 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
27267 {
27268 memset(insn, 0, sizeof(*insn));
27269- insn->kaddr = kaddr;
27270- insn->next_byte = kaddr;
27271+ insn->kaddr = ktla_ktva(kaddr);
27272+ insn->next_byte = ktla_ktva(kaddr);
27273 insn->x86_64 = x86_64 ? 1 : 0;
27274 insn->opnd_bytes = 4;
27275 if (x86_64)
27276diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
27277index 05a95e7..326f2fa 100644
27278--- a/arch/x86/lib/iomap_copy_64.S
27279+++ b/arch/x86/lib/iomap_copy_64.S
27280@@ -17,6 +17,7 @@
27281
27282 #include <linux/linkage.h>
27283 #include <asm/dwarf2.h>
27284+#include <asm/alternative-asm.h>
27285
27286 /*
27287 * override generic version in lib/iomap_copy.c
27288@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
27289 CFI_STARTPROC
27290 movl %edx,%ecx
27291 rep movsd
27292+ pax_force_retaddr
27293 ret
27294 CFI_ENDPROC
27295 ENDPROC(__iowrite32_copy)
27296diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
27297index 56313a3..9b59269 100644
27298--- a/arch/x86/lib/memcpy_64.S
27299+++ b/arch/x86/lib/memcpy_64.S
27300@@ -24,7 +24,7 @@
27301 * This gets patched over the unrolled variant (below) via the
27302 * alternative instructions framework:
27303 */
27304- .section .altinstr_replacement, "ax", @progbits
27305+ .section .altinstr_replacement, "a", @progbits
27306 .Lmemcpy_c:
27307 movq %rdi, %rax
27308 movq %rdx, %rcx
27309@@ -33,6 +33,7 @@
27310 rep movsq
27311 movl %edx, %ecx
27312 rep movsb
27313+ pax_force_retaddr
27314 ret
27315 .Lmemcpy_e:
27316 .previous
27317@@ -44,11 +45,12 @@
27318 * This gets patched over the unrolled variant (below) via the
27319 * alternative instructions framework:
27320 */
27321- .section .altinstr_replacement, "ax", @progbits
27322+ .section .altinstr_replacement, "a", @progbits
27323 .Lmemcpy_c_e:
27324 movq %rdi, %rax
27325 movq %rdx, %rcx
27326 rep movsb
27327+ pax_force_retaddr
27328 ret
27329 .Lmemcpy_e_e:
27330 .previous
27331@@ -76,13 +78,13 @@ ENTRY(memcpy)
27332 */
27333 movq 0*8(%rsi), %r8
27334 movq 1*8(%rsi), %r9
27335- movq 2*8(%rsi), %r10
27336+ movq 2*8(%rsi), %rcx
27337 movq 3*8(%rsi), %r11
27338 leaq 4*8(%rsi), %rsi
27339
27340 movq %r8, 0*8(%rdi)
27341 movq %r9, 1*8(%rdi)
27342- movq %r10, 2*8(%rdi)
27343+ movq %rcx, 2*8(%rdi)
27344 movq %r11, 3*8(%rdi)
27345 leaq 4*8(%rdi), %rdi
27346 jae .Lcopy_forward_loop
27347@@ -105,12 +107,12 @@ ENTRY(memcpy)
27348 subq $0x20, %rdx
27349 movq -1*8(%rsi), %r8
27350 movq -2*8(%rsi), %r9
27351- movq -3*8(%rsi), %r10
27352+ movq -3*8(%rsi), %rcx
27353 movq -4*8(%rsi), %r11
27354 leaq -4*8(%rsi), %rsi
27355 movq %r8, -1*8(%rdi)
27356 movq %r9, -2*8(%rdi)
27357- movq %r10, -3*8(%rdi)
27358+ movq %rcx, -3*8(%rdi)
27359 movq %r11, -4*8(%rdi)
27360 leaq -4*8(%rdi), %rdi
27361 jae .Lcopy_backward_loop
27362@@ -130,12 +132,13 @@ ENTRY(memcpy)
27363 */
27364 movq 0*8(%rsi), %r8
27365 movq 1*8(%rsi), %r9
27366- movq -2*8(%rsi, %rdx), %r10
27367+ movq -2*8(%rsi, %rdx), %rcx
27368 movq -1*8(%rsi, %rdx), %r11
27369 movq %r8, 0*8(%rdi)
27370 movq %r9, 1*8(%rdi)
27371- movq %r10, -2*8(%rdi, %rdx)
27372+ movq %rcx, -2*8(%rdi, %rdx)
27373 movq %r11, -1*8(%rdi, %rdx)
27374+ pax_force_retaddr
27375 retq
27376 .p2align 4
27377 .Lless_16bytes:
27378@@ -148,6 +151,7 @@ ENTRY(memcpy)
27379 movq -1*8(%rsi, %rdx), %r9
27380 movq %r8, 0*8(%rdi)
27381 movq %r9, -1*8(%rdi, %rdx)
27382+ pax_force_retaddr
27383 retq
27384 .p2align 4
27385 .Lless_8bytes:
27386@@ -161,6 +165,7 @@ ENTRY(memcpy)
27387 movl -4(%rsi, %rdx), %r8d
27388 movl %ecx, (%rdi)
27389 movl %r8d, -4(%rdi, %rdx)
27390+ pax_force_retaddr
27391 retq
27392 .p2align 4
27393 .Lless_3bytes:
27394@@ -179,6 +184,7 @@ ENTRY(memcpy)
27395 movb %cl, (%rdi)
27396
27397 .Lend:
27398+ pax_force_retaddr
27399 retq
27400 CFI_ENDPROC
27401 ENDPROC(memcpy)
27402diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
27403index 65268a6..5aa7815 100644
27404--- a/arch/x86/lib/memmove_64.S
27405+++ b/arch/x86/lib/memmove_64.S
27406@@ -61,13 +61,13 @@ ENTRY(memmove)
27407 5:
27408 sub $0x20, %rdx
27409 movq 0*8(%rsi), %r11
27410- movq 1*8(%rsi), %r10
27411+ movq 1*8(%rsi), %rcx
27412 movq 2*8(%rsi), %r9
27413 movq 3*8(%rsi), %r8
27414 leaq 4*8(%rsi), %rsi
27415
27416 movq %r11, 0*8(%rdi)
27417- movq %r10, 1*8(%rdi)
27418+ movq %rcx, 1*8(%rdi)
27419 movq %r9, 2*8(%rdi)
27420 movq %r8, 3*8(%rdi)
27421 leaq 4*8(%rdi), %rdi
27422@@ -81,10 +81,10 @@ ENTRY(memmove)
27423 4:
27424 movq %rdx, %rcx
27425 movq -8(%rsi, %rdx), %r11
27426- lea -8(%rdi, %rdx), %r10
27427+ lea -8(%rdi, %rdx), %r9
27428 shrq $3, %rcx
27429 rep movsq
27430- movq %r11, (%r10)
27431+ movq %r11, (%r9)
27432 jmp 13f
27433 .Lmemmove_end_forward:
27434
27435@@ -95,14 +95,14 @@ ENTRY(memmove)
27436 7:
27437 movq %rdx, %rcx
27438 movq (%rsi), %r11
27439- movq %rdi, %r10
27440+ movq %rdi, %r9
27441 leaq -8(%rsi, %rdx), %rsi
27442 leaq -8(%rdi, %rdx), %rdi
27443 shrq $3, %rcx
27444 std
27445 rep movsq
27446 cld
27447- movq %r11, (%r10)
27448+ movq %r11, (%r9)
27449 jmp 13f
27450
27451 /*
27452@@ -127,13 +127,13 @@ ENTRY(memmove)
27453 8:
27454 subq $0x20, %rdx
27455 movq -1*8(%rsi), %r11
27456- movq -2*8(%rsi), %r10
27457+ movq -2*8(%rsi), %rcx
27458 movq -3*8(%rsi), %r9
27459 movq -4*8(%rsi), %r8
27460 leaq -4*8(%rsi), %rsi
27461
27462 movq %r11, -1*8(%rdi)
27463- movq %r10, -2*8(%rdi)
27464+ movq %rcx, -2*8(%rdi)
27465 movq %r9, -3*8(%rdi)
27466 movq %r8, -4*8(%rdi)
27467 leaq -4*8(%rdi), %rdi
27468@@ -151,11 +151,11 @@ ENTRY(memmove)
27469 * Move data from 16 bytes to 31 bytes.
27470 */
27471 movq 0*8(%rsi), %r11
27472- movq 1*8(%rsi), %r10
27473+ movq 1*8(%rsi), %rcx
27474 movq -2*8(%rsi, %rdx), %r9
27475 movq -1*8(%rsi, %rdx), %r8
27476 movq %r11, 0*8(%rdi)
27477- movq %r10, 1*8(%rdi)
27478+ movq %rcx, 1*8(%rdi)
27479 movq %r9, -2*8(%rdi, %rdx)
27480 movq %r8, -1*8(%rdi, %rdx)
27481 jmp 13f
27482@@ -167,9 +167,9 @@ ENTRY(memmove)
27483 * Move data from 8 bytes to 15 bytes.
27484 */
27485 movq 0*8(%rsi), %r11
27486- movq -1*8(%rsi, %rdx), %r10
27487+ movq -1*8(%rsi, %rdx), %r9
27488 movq %r11, 0*8(%rdi)
27489- movq %r10, -1*8(%rdi, %rdx)
27490+ movq %r9, -1*8(%rdi, %rdx)
27491 jmp 13f
27492 10:
27493 cmpq $4, %rdx
27494@@ -178,9 +178,9 @@ ENTRY(memmove)
27495 * Move data from 4 bytes to 7 bytes.
27496 */
27497 movl (%rsi), %r11d
27498- movl -4(%rsi, %rdx), %r10d
27499+ movl -4(%rsi, %rdx), %r9d
27500 movl %r11d, (%rdi)
27501- movl %r10d, -4(%rdi, %rdx)
27502+ movl %r9d, -4(%rdi, %rdx)
27503 jmp 13f
27504 11:
27505 cmp $2, %rdx
27506@@ -189,9 +189,9 @@ ENTRY(memmove)
27507 * Move data from 2 bytes to 3 bytes.
27508 */
27509 movw (%rsi), %r11w
27510- movw -2(%rsi, %rdx), %r10w
27511+ movw -2(%rsi, %rdx), %r9w
27512 movw %r11w, (%rdi)
27513- movw %r10w, -2(%rdi, %rdx)
27514+ movw %r9w, -2(%rdi, %rdx)
27515 jmp 13f
27516 12:
27517 cmp $1, %rdx
27518@@ -202,14 +202,16 @@ ENTRY(memmove)
27519 movb (%rsi), %r11b
27520 movb %r11b, (%rdi)
27521 13:
27522+ pax_force_retaddr
27523 retq
27524 CFI_ENDPROC
27525
27526- .section .altinstr_replacement,"ax"
27527+ .section .altinstr_replacement,"a"
27528 .Lmemmove_begin_forward_efs:
27529 /* Forward moving data. */
27530 movq %rdx, %rcx
27531 rep movsb
27532+ pax_force_retaddr
27533 retq
27534 .Lmemmove_end_forward_efs:
27535 .previous
27536diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
27537index 2dcb380..50a78bc 100644
27538--- a/arch/x86/lib/memset_64.S
27539+++ b/arch/x86/lib/memset_64.S
27540@@ -16,7 +16,7 @@
27541 *
27542 * rax original destination
27543 */
27544- .section .altinstr_replacement, "ax", @progbits
27545+ .section .altinstr_replacement, "a", @progbits
27546 .Lmemset_c:
27547 movq %rdi,%r9
27548 movq %rdx,%rcx
27549@@ -30,6 +30,7 @@
27550 movl %edx,%ecx
27551 rep stosb
27552 movq %r9,%rax
27553+ pax_force_retaddr
27554 ret
27555 .Lmemset_e:
27556 .previous
27557@@ -45,13 +46,14 @@
27558 *
27559 * rax original destination
27560 */
27561- .section .altinstr_replacement, "ax", @progbits
27562+ .section .altinstr_replacement, "a", @progbits
27563 .Lmemset_c_e:
27564 movq %rdi,%r9
27565 movb %sil,%al
27566 movq %rdx,%rcx
27567 rep stosb
27568 movq %r9,%rax
27569+ pax_force_retaddr
27570 ret
27571 .Lmemset_e_e:
27572 .previous
27573@@ -59,7 +61,7 @@
27574 ENTRY(memset)
27575 ENTRY(__memset)
27576 CFI_STARTPROC
27577- movq %rdi,%r10
27578+ movq %rdi,%r11
27579
27580 /* expand byte value */
27581 movzbl %sil,%ecx
27582@@ -117,7 +119,8 @@ ENTRY(__memset)
27583 jnz .Lloop_1
27584
27585 .Lende:
27586- movq %r10,%rax
27587+ movq %r11,%rax
27588+ pax_force_retaddr
27589 ret
27590
27591 CFI_RESTORE_STATE
27592diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
27593index c9f2d9b..e7fd2c0 100644
27594--- a/arch/x86/lib/mmx_32.c
27595+++ b/arch/x86/lib/mmx_32.c
27596@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
27597 {
27598 void *p;
27599 int i;
27600+ unsigned long cr0;
27601
27602 if (unlikely(in_interrupt()))
27603 return __memcpy(to, from, len);
27604@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
27605 kernel_fpu_begin();
27606
27607 __asm__ __volatile__ (
27608- "1: prefetch (%0)\n" /* This set is 28 bytes */
27609- " prefetch 64(%0)\n"
27610- " prefetch 128(%0)\n"
27611- " prefetch 192(%0)\n"
27612- " prefetch 256(%0)\n"
27613+ "1: prefetch (%1)\n" /* This set is 28 bytes */
27614+ " prefetch 64(%1)\n"
27615+ " prefetch 128(%1)\n"
27616+ " prefetch 192(%1)\n"
27617+ " prefetch 256(%1)\n"
27618 "2: \n"
27619 ".section .fixup, \"ax\"\n"
27620- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
27621+ "3: \n"
27622+
27623+#ifdef CONFIG_PAX_KERNEXEC
27624+ " movl %%cr0, %0\n"
27625+ " movl %0, %%eax\n"
27626+ " andl $0xFFFEFFFF, %%eax\n"
27627+ " movl %%eax, %%cr0\n"
27628+#endif
27629+
27630+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
27631+
27632+#ifdef CONFIG_PAX_KERNEXEC
27633+ " movl %0, %%cr0\n"
27634+#endif
27635+
27636 " jmp 2b\n"
27637 ".previous\n"
27638 _ASM_EXTABLE(1b, 3b)
27639- : : "r" (from));
27640+ : "=&r" (cr0) : "r" (from) : "ax");
27641
27642 for ( ; i > 5; i--) {
27643 __asm__ __volatile__ (
27644- "1: prefetch 320(%0)\n"
27645- "2: movq (%0), %%mm0\n"
27646- " movq 8(%0), %%mm1\n"
27647- " movq 16(%0), %%mm2\n"
27648- " movq 24(%0), %%mm3\n"
27649- " movq %%mm0, (%1)\n"
27650- " movq %%mm1, 8(%1)\n"
27651- " movq %%mm2, 16(%1)\n"
27652- " movq %%mm3, 24(%1)\n"
27653- " movq 32(%0), %%mm0\n"
27654- " movq 40(%0), %%mm1\n"
27655- " movq 48(%0), %%mm2\n"
27656- " movq 56(%0), %%mm3\n"
27657- " movq %%mm0, 32(%1)\n"
27658- " movq %%mm1, 40(%1)\n"
27659- " movq %%mm2, 48(%1)\n"
27660- " movq %%mm3, 56(%1)\n"
27661+ "1: prefetch 320(%1)\n"
27662+ "2: movq (%1), %%mm0\n"
27663+ " movq 8(%1), %%mm1\n"
27664+ " movq 16(%1), %%mm2\n"
27665+ " movq 24(%1), %%mm3\n"
27666+ " movq %%mm0, (%2)\n"
27667+ " movq %%mm1, 8(%2)\n"
27668+ " movq %%mm2, 16(%2)\n"
27669+ " movq %%mm3, 24(%2)\n"
27670+ " movq 32(%1), %%mm0\n"
27671+ " movq 40(%1), %%mm1\n"
27672+ " movq 48(%1), %%mm2\n"
27673+ " movq 56(%1), %%mm3\n"
27674+ " movq %%mm0, 32(%2)\n"
27675+ " movq %%mm1, 40(%2)\n"
27676+ " movq %%mm2, 48(%2)\n"
27677+ " movq %%mm3, 56(%2)\n"
27678 ".section .fixup, \"ax\"\n"
27679- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
27680+ "3:\n"
27681+
27682+#ifdef CONFIG_PAX_KERNEXEC
27683+ " movl %%cr0, %0\n"
27684+ " movl %0, %%eax\n"
27685+ " andl $0xFFFEFFFF, %%eax\n"
27686+ " movl %%eax, %%cr0\n"
27687+#endif
27688+
27689+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
27690+
27691+#ifdef CONFIG_PAX_KERNEXEC
27692+ " movl %0, %%cr0\n"
27693+#endif
27694+
27695 " jmp 2b\n"
27696 ".previous\n"
27697 _ASM_EXTABLE(1b, 3b)
27698- : : "r" (from), "r" (to) : "memory");
27699+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
27700
27701 from += 64;
27702 to += 64;
27703@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
27704 static void fast_copy_page(void *to, void *from)
27705 {
27706 int i;
27707+ unsigned long cr0;
27708
27709 kernel_fpu_begin();
27710
27711@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
27712 * but that is for later. -AV
27713 */
27714 __asm__ __volatile__(
27715- "1: prefetch (%0)\n"
27716- " prefetch 64(%0)\n"
27717- " prefetch 128(%0)\n"
27718- " prefetch 192(%0)\n"
27719- " prefetch 256(%0)\n"
27720+ "1: prefetch (%1)\n"
27721+ " prefetch 64(%1)\n"
27722+ " prefetch 128(%1)\n"
27723+ " prefetch 192(%1)\n"
27724+ " prefetch 256(%1)\n"
27725 "2: \n"
27726 ".section .fixup, \"ax\"\n"
27727- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
27728+ "3: \n"
27729+
27730+#ifdef CONFIG_PAX_KERNEXEC
27731+ " movl %%cr0, %0\n"
27732+ " movl %0, %%eax\n"
27733+ " andl $0xFFFEFFFF, %%eax\n"
27734+ " movl %%eax, %%cr0\n"
27735+#endif
27736+
27737+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
27738+
27739+#ifdef CONFIG_PAX_KERNEXEC
27740+ " movl %0, %%cr0\n"
27741+#endif
27742+
27743 " jmp 2b\n"
27744 ".previous\n"
27745- _ASM_EXTABLE(1b, 3b) : : "r" (from));
27746+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
27747
27748 for (i = 0; i < (4096-320)/64; i++) {
27749 __asm__ __volatile__ (
27750- "1: prefetch 320(%0)\n"
27751- "2: movq (%0), %%mm0\n"
27752- " movntq %%mm0, (%1)\n"
27753- " movq 8(%0), %%mm1\n"
27754- " movntq %%mm1, 8(%1)\n"
27755- " movq 16(%0), %%mm2\n"
27756- " movntq %%mm2, 16(%1)\n"
27757- " movq 24(%0), %%mm3\n"
27758- " movntq %%mm3, 24(%1)\n"
27759- " movq 32(%0), %%mm4\n"
27760- " movntq %%mm4, 32(%1)\n"
27761- " movq 40(%0), %%mm5\n"
27762- " movntq %%mm5, 40(%1)\n"
27763- " movq 48(%0), %%mm6\n"
27764- " movntq %%mm6, 48(%1)\n"
27765- " movq 56(%0), %%mm7\n"
27766- " movntq %%mm7, 56(%1)\n"
27767+ "1: prefetch 320(%1)\n"
27768+ "2: movq (%1), %%mm0\n"
27769+ " movntq %%mm0, (%2)\n"
27770+ " movq 8(%1), %%mm1\n"
27771+ " movntq %%mm1, 8(%2)\n"
27772+ " movq 16(%1), %%mm2\n"
27773+ " movntq %%mm2, 16(%2)\n"
27774+ " movq 24(%1), %%mm3\n"
27775+ " movntq %%mm3, 24(%2)\n"
27776+ " movq 32(%1), %%mm4\n"
27777+ " movntq %%mm4, 32(%2)\n"
27778+ " movq 40(%1), %%mm5\n"
27779+ " movntq %%mm5, 40(%2)\n"
27780+ " movq 48(%1), %%mm6\n"
27781+ " movntq %%mm6, 48(%2)\n"
27782+ " movq 56(%1), %%mm7\n"
27783+ " movntq %%mm7, 56(%2)\n"
27784 ".section .fixup, \"ax\"\n"
27785- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
27786+ "3:\n"
27787+
27788+#ifdef CONFIG_PAX_KERNEXEC
27789+ " movl %%cr0, %0\n"
27790+ " movl %0, %%eax\n"
27791+ " andl $0xFFFEFFFF, %%eax\n"
27792+ " movl %%eax, %%cr0\n"
27793+#endif
27794+
27795+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
27796+
27797+#ifdef CONFIG_PAX_KERNEXEC
27798+ " movl %0, %%cr0\n"
27799+#endif
27800+
27801 " jmp 2b\n"
27802 ".previous\n"
27803- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
27804+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
27805
27806 from += 64;
27807 to += 64;
27808@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
27809 static void fast_copy_page(void *to, void *from)
27810 {
27811 int i;
27812+ unsigned long cr0;
27813
27814 kernel_fpu_begin();
27815
27816 __asm__ __volatile__ (
27817- "1: prefetch (%0)\n"
27818- " prefetch 64(%0)\n"
27819- " prefetch 128(%0)\n"
27820- " prefetch 192(%0)\n"
27821- " prefetch 256(%0)\n"
27822+ "1: prefetch (%1)\n"
27823+ " prefetch 64(%1)\n"
27824+ " prefetch 128(%1)\n"
27825+ " prefetch 192(%1)\n"
27826+ " prefetch 256(%1)\n"
27827 "2: \n"
27828 ".section .fixup, \"ax\"\n"
27829- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
27830+ "3: \n"
27831+
27832+#ifdef CONFIG_PAX_KERNEXEC
27833+ " movl %%cr0, %0\n"
27834+ " movl %0, %%eax\n"
27835+ " andl $0xFFFEFFFF, %%eax\n"
27836+ " movl %%eax, %%cr0\n"
27837+#endif
27838+
27839+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
27840+
27841+#ifdef CONFIG_PAX_KERNEXEC
27842+ " movl %0, %%cr0\n"
27843+#endif
27844+
27845 " jmp 2b\n"
27846 ".previous\n"
27847- _ASM_EXTABLE(1b, 3b) : : "r" (from));
27848+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
27849
27850 for (i = 0; i < 4096/64; i++) {
27851 __asm__ __volatile__ (
27852- "1: prefetch 320(%0)\n"
27853- "2: movq (%0), %%mm0\n"
27854- " movq 8(%0), %%mm1\n"
27855- " movq 16(%0), %%mm2\n"
27856- " movq 24(%0), %%mm3\n"
27857- " movq %%mm0, (%1)\n"
27858- " movq %%mm1, 8(%1)\n"
27859- " movq %%mm2, 16(%1)\n"
27860- " movq %%mm3, 24(%1)\n"
27861- " movq 32(%0), %%mm0\n"
27862- " movq 40(%0), %%mm1\n"
27863- " movq 48(%0), %%mm2\n"
27864- " movq 56(%0), %%mm3\n"
27865- " movq %%mm0, 32(%1)\n"
27866- " movq %%mm1, 40(%1)\n"
27867- " movq %%mm2, 48(%1)\n"
27868- " movq %%mm3, 56(%1)\n"
27869+ "1: prefetch 320(%1)\n"
27870+ "2: movq (%1), %%mm0\n"
27871+ " movq 8(%1), %%mm1\n"
27872+ " movq 16(%1), %%mm2\n"
27873+ " movq 24(%1), %%mm3\n"
27874+ " movq %%mm0, (%2)\n"
27875+ " movq %%mm1, 8(%2)\n"
27876+ " movq %%mm2, 16(%2)\n"
27877+ " movq %%mm3, 24(%2)\n"
27878+ " movq 32(%1), %%mm0\n"
27879+ " movq 40(%1), %%mm1\n"
27880+ " movq 48(%1), %%mm2\n"
27881+ " movq 56(%1), %%mm3\n"
27882+ " movq %%mm0, 32(%2)\n"
27883+ " movq %%mm1, 40(%2)\n"
27884+ " movq %%mm2, 48(%2)\n"
27885+ " movq %%mm3, 56(%2)\n"
27886 ".section .fixup, \"ax\"\n"
27887- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
27888+ "3:\n"
27889+
27890+#ifdef CONFIG_PAX_KERNEXEC
27891+ " movl %%cr0, %0\n"
27892+ " movl %0, %%eax\n"
27893+ " andl $0xFFFEFFFF, %%eax\n"
27894+ " movl %%eax, %%cr0\n"
27895+#endif
27896+
27897+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
27898+
27899+#ifdef CONFIG_PAX_KERNEXEC
27900+ " movl %0, %%cr0\n"
27901+#endif
27902+
27903 " jmp 2b\n"
27904 ".previous\n"
27905 _ASM_EXTABLE(1b, 3b)
27906- : : "r" (from), "r" (to) : "memory");
27907+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
27908
27909 from += 64;
27910 to += 64;
27911diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
27912index f6d13ee..aca5f0b 100644
27913--- a/arch/x86/lib/msr-reg.S
27914+++ b/arch/x86/lib/msr-reg.S
27915@@ -3,6 +3,7 @@
27916 #include <asm/dwarf2.h>
27917 #include <asm/asm.h>
27918 #include <asm/msr.h>
27919+#include <asm/alternative-asm.h>
27920
27921 #ifdef CONFIG_X86_64
27922 /*
27923@@ -16,7 +17,7 @@ ENTRY(\op\()_safe_regs)
27924 CFI_STARTPROC
27925 pushq_cfi %rbx
27926 pushq_cfi %rbp
27927- movq %rdi, %r10 /* Save pointer */
27928+ movq %rdi, %r9 /* Save pointer */
27929 xorl %r11d, %r11d /* Return value */
27930 movl (%rdi), %eax
27931 movl 4(%rdi), %ecx
27932@@ -27,16 +28,17 @@ ENTRY(\op\()_safe_regs)
27933 movl 28(%rdi), %edi
27934 CFI_REMEMBER_STATE
27935 1: \op
27936-2: movl %eax, (%r10)
27937+2: movl %eax, (%r9)
27938 movl %r11d, %eax /* Return value */
27939- movl %ecx, 4(%r10)
27940- movl %edx, 8(%r10)
27941- movl %ebx, 12(%r10)
27942- movl %ebp, 20(%r10)
27943- movl %esi, 24(%r10)
27944- movl %edi, 28(%r10)
27945+ movl %ecx, 4(%r9)
27946+ movl %edx, 8(%r9)
27947+ movl %ebx, 12(%r9)
27948+ movl %ebp, 20(%r9)
27949+ movl %esi, 24(%r9)
27950+ movl %edi, 28(%r9)
27951 popq_cfi %rbp
27952 popq_cfi %rbx
27953+ pax_force_retaddr
27954 ret
27955 3:
27956 CFI_RESTORE_STATE
27957diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
27958index fc6ba17..d4d989d 100644
27959--- a/arch/x86/lib/putuser.S
27960+++ b/arch/x86/lib/putuser.S
27961@@ -16,7 +16,9 @@
27962 #include <asm/errno.h>
27963 #include <asm/asm.h>
27964 #include <asm/smap.h>
27965-
27966+#include <asm/segment.h>
27967+#include <asm/pgtable.h>
27968+#include <asm/alternative-asm.h>
27969
27970 /*
27971 * __put_user_X
27972@@ -30,57 +32,125 @@
27973 * as they get called from within inline assembly.
27974 */
27975
27976-#define ENTER CFI_STARTPROC ; \
27977- GET_THREAD_INFO(%_ASM_BX)
27978-#define EXIT ASM_CLAC ; \
27979- ret ; \
27980+#define ENTER CFI_STARTPROC
27981+#define EXIT ASM_CLAC ; \
27982+ pax_force_retaddr ; \
27983+ ret ; \
27984 CFI_ENDPROC
27985
27986+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
27987+#define _DEST %_ASM_CX,%_ASM_BX
27988+#else
27989+#define _DEST %_ASM_CX
27990+#endif
27991+
27992+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
27993+#define __copyuser_seg gs;
27994+#else
27995+#define __copyuser_seg
27996+#endif
27997+
27998 .text
27999 ENTRY(__put_user_1)
28000 ENTER
28001+
28002+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28003+ GET_THREAD_INFO(%_ASM_BX)
28004 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
28005 jae bad_put_user
28006 ASM_STAC
28007-1: movb %al,(%_ASM_CX)
28008+
28009+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28010+ mov pax_user_shadow_base,%_ASM_BX
28011+ cmp %_ASM_BX,%_ASM_CX
28012+ jb 1234f
28013+ xor %ebx,%ebx
28014+1234:
28015+#endif
28016+
28017+#endif
28018+
28019+1: __copyuser_seg movb %al,(_DEST)
28020 xor %eax,%eax
28021 EXIT
28022 ENDPROC(__put_user_1)
28023
28024 ENTRY(__put_user_2)
28025 ENTER
28026+
28027+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28028+ GET_THREAD_INFO(%_ASM_BX)
28029 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
28030 sub $1,%_ASM_BX
28031 cmp %_ASM_BX,%_ASM_CX
28032 jae bad_put_user
28033 ASM_STAC
28034-2: movw %ax,(%_ASM_CX)
28035+
28036+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28037+ mov pax_user_shadow_base,%_ASM_BX
28038+ cmp %_ASM_BX,%_ASM_CX
28039+ jb 1234f
28040+ xor %ebx,%ebx
28041+1234:
28042+#endif
28043+
28044+#endif
28045+
28046+2: __copyuser_seg movw %ax,(_DEST)
28047 xor %eax,%eax
28048 EXIT
28049 ENDPROC(__put_user_2)
28050
28051 ENTRY(__put_user_4)
28052 ENTER
28053+
28054+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28055+ GET_THREAD_INFO(%_ASM_BX)
28056 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
28057 sub $3,%_ASM_BX
28058 cmp %_ASM_BX,%_ASM_CX
28059 jae bad_put_user
28060 ASM_STAC
28061-3: movl %eax,(%_ASM_CX)
28062+
28063+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28064+ mov pax_user_shadow_base,%_ASM_BX
28065+ cmp %_ASM_BX,%_ASM_CX
28066+ jb 1234f
28067+ xor %ebx,%ebx
28068+1234:
28069+#endif
28070+
28071+#endif
28072+
28073+3: __copyuser_seg movl %eax,(_DEST)
28074 xor %eax,%eax
28075 EXIT
28076 ENDPROC(__put_user_4)
28077
28078 ENTRY(__put_user_8)
28079 ENTER
28080+
28081+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
28082+ GET_THREAD_INFO(%_ASM_BX)
28083 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
28084 sub $7,%_ASM_BX
28085 cmp %_ASM_BX,%_ASM_CX
28086 jae bad_put_user
28087 ASM_STAC
28088-4: mov %_ASM_AX,(%_ASM_CX)
28089+
28090+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28091+ mov pax_user_shadow_base,%_ASM_BX
28092+ cmp %_ASM_BX,%_ASM_CX
28093+ jb 1234f
28094+ xor %ebx,%ebx
28095+1234:
28096+#endif
28097+
28098+#endif
28099+
28100+4: __copyuser_seg mov %_ASM_AX,(_DEST)
28101 #ifdef CONFIG_X86_32
28102-5: movl %edx,4(%_ASM_CX)
28103+5: __copyuser_seg movl %edx,4(_DEST)
28104 #endif
28105 xor %eax,%eax
28106 EXIT
28107diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
28108index 1cad221..de671ee 100644
28109--- a/arch/x86/lib/rwlock.S
28110+++ b/arch/x86/lib/rwlock.S
28111@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
28112 FRAME
28113 0: LOCK_PREFIX
28114 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
28115+
28116+#ifdef CONFIG_PAX_REFCOUNT
28117+ jno 1234f
28118+ LOCK_PREFIX
28119+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
28120+ int $4
28121+1234:
28122+ _ASM_EXTABLE(1234b, 1234b)
28123+#endif
28124+
28125 1: rep; nop
28126 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
28127 jne 1b
28128 LOCK_PREFIX
28129 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
28130+
28131+#ifdef CONFIG_PAX_REFCOUNT
28132+ jno 1234f
28133+ LOCK_PREFIX
28134+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
28135+ int $4
28136+1234:
28137+ _ASM_EXTABLE(1234b, 1234b)
28138+#endif
28139+
28140 jnz 0b
28141 ENDFRAME
28142+ pax_force_retaddr
28143 ret
28144 CFI_ENDPROC
28145 END(__write_lock_failed)
28146@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
28147 FRAME
28148 0: LOCK_PREFIX
28149 READ_LOCK_SIZE(inc) (%__lock_ptr)
28150+
28151+#ifdef CONFIG_PAX_REFCOUNT
28152+ jno 1234f
28153+ LOCK_PREFIX
28154+ READ_LOCK_SIZE(dec) (%__lock_ptr)
28155+ int $4
28156+1234:
28157+ _ASM_EXTABLE(1234b, 1234b)
28158+#endif
28159+
28160 1: rep; nop
28161 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
28162 js 1b
28163 LOCK_PREFIX
28164 READ_LOCK_SIZE(dec) (%__lock_ptr)
28165+
28166+#ifdef CONFIG_PAX_REFCOUNT
28167+ jno 1234f
28168+ LOCK_PREFIX
28169+ READ_LOCK_SIZE(inc) (%__lock_ptr)
28170+ int $4
28171+1234:
28172+ _ASM_EXTABLE(1234b, 1234b)
28173+#endif
28174+
28175 js 0b
28176 ENDFRAME
28177+ pax_force_retaddr
28178 ret
28179 CFI_ENDPROC
28180 END(__read_lock_failed)
28181diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
28182index 5dff5f0..cadebf4 100644
28183--- a/arch/x86/lib/rwsem.S
28184+++ b/arch/x86/lib/rwsem.S
28185@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
28186 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
28187 CFI_RESTORE __ASM_REG(dx)
28188 restore_common_regs
28189+ pax_force_retaddr
28190 ret
28191 CFI_ENDPROC
28192 ENDPROC(call_rwsem_down_read_failed)
28193@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
28194 movq %rax,%rdi
28195 call rwsem_down_write_failed
28196 restore_common_regs
28197+ pax_force_retaddr
28198 ret
28199 CFI_ENDPROC
28200 ENDPROC(call_rwsem_down_write_failed)
28201@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
28202 movq %rax,%rdi
28203 call rwsem_wake
28204 restore_common_regs
28205-1: ret
28206+1: pax_force_retaddr
28207+ ret
28208 CFI_ENDPROC
28209 ENDPROC(call_rwsem_wake)
28210
28211@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
28212 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
28213 CFI_RESTORE __ASM_REG(dx)
28214 restore_common_regs
28215+ pax_force_retaddr
28216 ret
28217 CFI_ENDPROC
28218 ENDPROC(call_rwsem_downgrade_wake)
28219diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
28220index a63efd6..ccecad8 100644
28221--- a/arch/x86/lib/thunk_64.S
28222+++ b/arch/x86/lib/thunk_64.S
28223@@ -8,6 +8,7 @@
28224 #include <linux/linkage.h>
28225 #include <asm/dwarf2.h>
28226 #include <asm/calling.h>
28227+#include <asm/alternative-asm.h>
28228
28229 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
28230 .macro THUNK name, func, put_ret_addr_in_rdi=0
28231@@ -41,5 +42,6 @@
28232 SAVE_ARGS
28233 restore:
28234 RESTORE_ARGS
28235+ pax_force_retaddr
28236 ret
28237 CFI_ENDPROC
28238diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
28239index 3eb18ac..6890bc3 100644
28240--- a/arch/x86/lib/usercopy_32.c
28241+++ b/arch/x86/lib/usercopy_32.c
28242@@ -42,11 +42,13 @@ do { \
28243 int __d0; \
28244 might_fault(); \
28245 __asm__ __volatile__( \
28246+ __COPYUSER_SET_ES \
28247 ASM_STAC "\n" \
28248 "0: rep; stosl\n" \
28249 " movl %2,%0\n" \
28250 "1: rep; stosb\n" \
28251 "2: " ASM_CLAC "\n" \
28252+ __COPYUSER_RESTORE_ES \
28253 ".section .fixup,\"ax\"\n" \
28254 "3: lea 0(%2,%0,4),%0\n" \
28255 " jmp 2b\n" \
28256@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
28257
28258 #ifdef CONFIG_X86_INTEL_USERCOPY
28259 static unsigned long
28260-__copy_user_intel(void __user *to, const void *from, unsigned long size)
28261+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
28262 {
28263 int d0, d1;
28264 __asm__ __volatile__(
28265@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
28266 " .align 2,0x90\n"
28267 "3: movl 0(%4), %%eax\n"
28268 "4: movl 4(%4), %%edx\n"
28269- "5: movl %%eax, 0(%3)\n"
28270- "6: movl %%edx, 4(%3)\n"
28271+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
28272+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
28273 "7: movl 8(%4), %%eax\n"
28274 "8: movl 12(%4),%%edx\n"
28275- "9: movl %%eax, 8(%3)\n"
28276- "10: movl %%edx, 12(%3)\n"
28277+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
28278+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
28279 "11: movl 16(%4), %%eax\n"
28280 "12: movl 20(%4), %%edx\n"
28281- "13: movl %%eax, 16(%3)\n"
28282- "14: movl %%edx, 20(%3)\n"
28283+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
28284+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
28285 "15: movl 24(%4), %%eax\n"
28286 "16: movl 28(%4), %%edx\n"
28287- "17: movl %%eax, 24(%3)\n"
28288- "18: movl %%edx, 28(%3)\n"
28289+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
28290+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
28291 "19: movl 32(%4), %%eax\n"
28292 "20: movl 36(%4), %%edx\n"
28293- "21: movl %%eax, 32(%3)\n"
28294- "22: movl %%edx, 36(%3)\n"
28295+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
28296+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
28297 "23: movl 40(%4), %%eax\n"
28298 "24: movl 44(%4), %%edx\n"
28299- "25: movl %%eax, 40(%3)\n"
28300- "26: movl %%edx, 44(%3)\n"
28301+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
28302+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
28303 "27: movl 48(%4), %%eax\n"
28304 "28: movl 52(%4), %%edx\n"
28305- "29: movl %%eax, 48(%3)\n"
28306- "30: movl %%edx, 52(%3)\n"
28307+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
28308+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
28309 "31: movl 56(%4), %%eax\n"
28310 "32: movl 60(%4), %%edx\n"
28311- "33: movl %%eax, 56(%3)\n"
28312- "34: movl %%edx, 60(%3)\n"
28313+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
28314+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
28315 " addl $-64, %0\n"
28316 " addl $64, %4\n"
28317 " addl $64, %3\n"
28318@@ -149,10 +151,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
28319 " shrl $2, %0\n"
28320 " andl $3, %%eax\n"
28321 " cld\n"
28322+ __COPYUSER_SET_ES
28323 "99: rep; movsl\n"
28324 "36: movl %%eax, %0\n"
28325 "37: rep; movsb\n"
28326 "100:\n"
28327+ __COPYUSER_RESTORE_ES
28328 ".section .fixup,\"ax\"\n"
28329 "101: lea 0(%%eax,%0,4),%0\n"
28330 " jmp 100b\n"
28331@@ -202,46 +206,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
28332 }
28333
28334 static unsigned long
28335+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
28336+{
28337+ int d0, d1;
28338+ __asm__ __volatile__(
28339+ " .align 2,0x90\n"
28340+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
28341+ " cmpl $67, %0\n"
28342+ " jbe 3f\n"
28343+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
28344+ " .align 2,0x90\n"
28345+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
28346+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
28347+ "5: movl %%eax, 0(%3)\n"
28348+ "6: movl %%edx, 4(%3)\n"
28349+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
28350+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
28351+ "9: movl %%eax, 8(%3)\n"
28352+ "10: movl %%edx, 12(%3)\n"
28353+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
28354+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
28355+ "13: movl %%eax, 16(%3)\n"
28356+ "14: movl %%edx, 20(%3)\n"
28357+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
28358+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
28359+ "17: movl %%eax, 24(%3)\n"
28360+ "18: movl %%edx, 28(%3)\n"
28361+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
28362+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
28363+ "21: movl %%eax, 32(%3)\n"
28364+ "22: movl %%edx, 36(%3)\n"
28365+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
28366+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
28367+ "25: movl %%eax, 40(%3)\n"
28368+ "26: movl %%edx, 44(%3)\n"
28369+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
28370+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
28371+ "29: movl %%eax, 48(%3)\n"
28372+ "30: movl %%edx, 52(%3)\n"
28373+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
28374+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
28375+ "33: movl %%eax, 56(%3)\n"
28376+ "34: movl %%edx, 60(%3)\n"
28377+ " addl $-64, %0\n"
28378+ " addl $64, %4\n"
28379+ " addl $64, %3\n"
28380+ " cmpl $63, %0\n"
28381+ " ja 1b\n"
28382+ "35: movl %0, %%eax\n"
28383+ " shrl $2, %0\n"
28384+ " andl $3, %%eax\n"
28385+ " cld\n"
28386+ "99: rep; "__copyuser_seg" movsl\n"
28387+ "36: movl %%eax, %0\n"
28388+ "37: rep; "__copyuser_seg" movsb\n"
28389+ "100:\n"
28390+ ".section .fixup,\"ax\"\n"
28391+ "101: lea 0(%%eax,%0,4),%0\n"
28392+ " jmp 100b\n"
28393+ ".previous\n"
28394+ _ASM_EXTABLE(1b,100b)
28395+ _ASM_EXTABLE(2b,100b)
28396+ _ASM_EXTABLE(3b,100b)
28397+ _ASM_EXTABLE(4b,100b)
28398+ _ASM_EXTABLE(5b,100b)
28399+ _ASM_EXTABLE(6b,100b)
28400+ _ASM_EXTABLE(7b,100b)
28401+ _ASM_EXTABLE(8b,100b)
28402+ _ASM_EXTABLE(9b,100b)
28403+ _ASM_EXTABLE(10b,100b)
28404+ _ASM_EXTABLE(11b,100b)
28405+ _ASM_EXTABLE(12b,100b)
28406+ _ASM_EXTABLE(13b,100b)
28407+ _ASM_EXTABLE(14b,100b)
28408+ _ASM_EXTABLE(15b,100b)
28409+ _ASM_EXTABLE(16b,100b)
28410+ _ASM_EXTABLE(17b,100b)
28411+ _ASM_EXTABLE(18b,100b)
28412+ _ASM_EXTABLE(19b,100b)
28413+ _ASM_EXTABLE(20b,100b)
28414+ _ASM_EXTABLE(21b,100b)
28415+ _ASM_EXTABLE(22b,100b)
28416+ _ASM_EXTABLE(23b,100b)
28417+ _ASM_EXTABLE(24b,100b)
28418+ _ASM_EXTABLE(25b,100b)
28419+ _ASM_EXTABLE(26b,100b)
28420+ _ASM_EXTABLE(27b,100b)
28421+ _ASM_EXTABLE(28b,100b)
28422+ _ASM_EXTABLE(29b,100b)
28423+ _ASM_EXTABLE(30b,100b)
28424+ _ASM_EXTABLE(31b,100b)
28425+ _ASM_EXTABLE(32b,100b)
28426+ _ASM_EXTABLE(33b,100b)
28427+ _ASM_EXTABLE(34b,100b)
28428+ _ASM_EXTABLE(35b,100b)
28429+ _ASM_EXTABLE(36b,100b)
28430+ _ASM_EXTABLE(37b,100b)
28431+ _ASM_EXTABLE(99b,101b)
28432+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
28433+ : "1"(to), "2"(from), "0"(size)
28434+ : "eax", "edx", "memory");
28435+ return size;
28436+}
28437+
28438+static unsigned long __size_overflow(3)
28439 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
28440 {
28441 int d0, d1;
28442 __asm__ __volatile__(
28443 " .align 2,0x90\n"
28444- "0: movl 32(%4), %%eax\n"
28445+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
28446 " cmpl $67, %0\n"
28447 " jbe 2f\n"
28448- "1: movl 64(%4), %%eax\n"
28449+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
28450 " .align 2,0x90\n"
28451- "2: movl 0(%4), %%eax\n"
28452- "21: movl 4(%4), %%edx\n"
28453+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
28454+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
28455 " movl %%eax, 0(%3)\n"
28456 " movl %%edx, 4(%3)\n"
28457- "3: movl 8(%4), %%eax\n"
28458- "31: movl 12(%4),%%edx\n"
28459+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
28460+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
28461 " movl %%eax, 8(%3)\n"
28462 " movl %%edx, 12(%3)\n"
28463- "4: movl 16(%4), %%eax\n"
28464- "41: movl 20(%4), %%edx\n"
28465+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
28466+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
28467 " movl %%eax, 16(%3)\n"
28468 " movl %%edx, 20(%3)\n"
28469- "10: movl 24(%4), %%eax\n"
28470- "51: movl 28(%4), %%edx\n"
28471+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
28472+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
28473 " movl %%eax, 24(%3)\n"
28474 " movl %%edx, 28(%3)\n"
28475- "11: movl 32(%4), %%eax\n"
28476- "61: movl 36(%4), %%edx\n"
28477+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
28478+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
28479 " movl %%eax, 32(%3)\n"
28480 " movl %%edx, 36(%3)\n"
28481- "12: movl 40(%4), %%eax\n"
28482- "71: movl 44(%4), %%edx\n"
28483+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
28484+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
28485 " movl %%eax, 40(%3)\n"
28486 " movl %%edx, 44(%3)\n"
28487- "13: movl 48(%4), %%eax\n"
28488- "81: movl 52(%4), %%edx\n"
28489+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
28490+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
28491 " movl %%eax, 48(%3)\n"
28492 " movl %%edx, 52(%3)\n"
28493- "14: movl 56(%4), %%eax\n"
28494- "91: movl 60(%4), %%edx\n"
28495+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
28496+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
28497 " movl %%eax, 56(%3)\n"
28498 " movl %%edx, 60(%3)\n"
28499 " addl $-64, %0\n"
28500@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
28501 " shrl $2, %0\n"
28502 " andl $3, %%eax\n"
28503 " cld\n"
28504- "6: rep; movsl\n"
28505+ "6: rep; "__copyuser_seg" movsl\n"
28506 " movl %%eax,%0\n"
28507- "7: rep; movsb\n"
28508+ "7: rep; "__copyuser_seg" movsb\n"
28509 "8:\n"
28510 ".section .fixup,\"ax\"\n"
28511 "9: lea 0(%%eax,%0,4),%0\n"
28512@@ -298,48 +406,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
28513 * hyoshiok@miraclelinux.com
28514 */
28515
28516-static unsigned long __copy_user_zeroing_intel_nocache(void *to,
28517+static unsigned long __size_overflow(3) __copy_user_zeroing_intel_nocache(void *to,
28518 const void __user *from, unsigned long size)
28519 {
28520 int d0, d1;
28521
28522 __asm__ __volatile__(
28523 " .align 2,0x90\n"
28524- "0: movl 32(%4), %%eax\n"
28525+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
28526 " cmpl $67, %0\n"
28527 " jbe 2f\n"
28528- "1: movl 64(%4), %%eax\n"
28529+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
28530 " .align 2,0x90\n"
28531- "2: movl 0(%4), %%eax\n"
28532- "21: movl 4(%4), %%edx\n"
28533+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
28534+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
28535 " movnti %%eax, 0(%3)\n"
28536 " movnti %%edx, 4(%3)\n"
28537- "3: movl 8(%4), %%eax\n"
28538- "31: movl 12(%4),%%edx\n"
28539+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
28540+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
28541 " movnti %%eax, 8(%3)\n"
28542 " movnti %%edx, 12(%3)\n"
28543- "4: movl 16(%4), %%eax\n"
28544- "41: movl 20(%4), %%edx\n"
28545+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
28546+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
28547 " movnti %%eax, 16(%3)\n"
28548 " movnti %%edx, 20(%3)\n"
28549- "10: movl 24(%4), %%eax\n"
28550- "51: movl 28(%4), %%edx\n"
28551+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
28552+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
28553 " movnti %%eax, 24(%3)\n"
28554 " movnti %%edx, 28(%3)\n"
28555- "11: movl 32(%4), %%eax\n"
28556- "61: movl 36(%4), %%edx\n"
28557+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
28558+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
28559 " movnti %%eax, 32(%3)\n"
28560 " movnti %%edx, 36(%3)\n"
28561- "12: movl 40(%4), %%eax\n"
28562- "71: movl 44(%4), %%edx\n"
28563+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
28564+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
28565 " movnti %%eax, 40(%3)\n"
28566 " movnti %%edx, 44(%3)\n"
28567- "13: movl 48(%4), %%eax\n"
28568- "81: movl 52(%4), %%edx\n"
28569+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
28570+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
28571 " movnti %%eax, 48(%3)\n"
28572 " movnti %%edx, 52(%3)\n"
28573- "14: movl 56(%4), %%eax\n"
28574- "91: movl 60(%4), %%edx\n"
28575+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
28576+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
28577 " movnti %%eax, 56(%3)\n"
28578 " movnti %%edx, 60(%3)\n"
28579 " addl $-64, %0\n"
28580@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
28581 " shrl $2, %0\n"
28582 " andl $3, %%eax\n"
28583 " cld\n"
28584- "6: rep; movsl\n"
28585+ "6: rep; "__copyuser_seg" movsl\n"
28586 " movl %%eax,%0\n"
28587- "7: rep; movsb\n"
28588+ "7: rep; "__copyuser_seg" movsb\n"
28589 "8:\n"
28590 ".section .fixup,\"ax\"\n"
28591 "9: lea 0(%%eax,%0,4),%0\n"
28592@@ -392,48 +500,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
28593 return size;
28594 }
28595
28596-static unsigned long __copy_user_intel_nocache(void *to,
28597+static unsigned long __size_overflow(3) __copy_user_intel_nocache(void *to,
28598 const void __user *from, unsigned long size)
28599 {
28600 int d0, d1;
28601
28602 __asm__ __volatile__(
28603 " .align 2,0x90\n"
28604- "0: movl 32(%4), %%eax\n"
28605+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
28606 " cmpl $67, %0\n"
28607 " jbe 2f\n"
28608- "1: movl 64(%4), %%eax\n"
28609+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
28610 " .align 2,0x90\n"
28611- "2: movl 0(%4), %%eax\n"
28612- "21: movl 4(%4), %%edx\n"
28613+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
28614+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
28615 " movnti %%eax, 0(%3)\n"
28616 " movnti %%edx, 4(%3)\n"
28617- "3: movl 8(%4), %%eax\n"
28618- "31: movl 12(%4),%%edx\n"
28619+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
28620+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
28621 " movnti %%eax, 8(%3)\n"
28622 " movnti %%edx, 12(%3)\n"
28623- "4: movl 16(%4), %%eax\n"
28624- "41: movl 20(%4), %%edx\n"
28625+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
28626+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
28627 " movnti %%eax, 16(%3)\n"
28628 " movnti %%edx, 20(%3)\n"
28629- "10: movl 24(%4), %%eax\n"
28630- "51: movl 28(%4), %%edx\n"
28631+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
28632+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
28633 " movnti %%eax, 24(%3)\n"
28634 " movnti %%edx, 28(%3)\n"
28635- "11: movl 32(%4), %%eax\n"
28636- "61: movl 36(%4), %%edx\n"
28637+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
28638+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
28639 " movnti %%eax, 32(%3)\n"
28640 " movnti %%edx, 36(%3)\n"
28641- "12: movl 40(%4), %%eax\n"
28642- "71: movl 44(%4), %%edx\n"
28643+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
28644+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
28645 " movnti %%eax, 40(%3)\n"
28646 " movnti %%edx, 44(%3)\n"
28647- "13: movl 48(%4), %%eax\n"
28648- "81: movl 52(%4), %%edx\n"
28649+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
28650+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
28651 " movnti %%eax, 48(%3)\n"
28652 " movnti %%edx, 52(%3)\n"
28653- "14: movl 56(%4), %%eax\n"
28654- "91: movl 60(%4), %%edx\n"
28655+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
28656+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
28657 " movnti %%eax, 56(%3)\n"
28658 " movnti %%edx, 60(%3)\n"
28659 " addl $-64, %0\n"
28660@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
28661 " shrl $2, %0\n"
28662 " andl $3, %%eax\n"
28663 " cld\n"
28664- "6: rep; movsl\n"
28665+ "6: rep; "__copyuser_seg" movsl\n"
28666 " movl %%eax,%0\n"
28667- "7: rep; movsb\n"
28668+ "7: rep; "__copyuser_seg" movsb\n"
28669 "8:\n"
28670 ".section .fixup,\"ax\"\n"
28671 "9: lea 0(%%eax,%0,4),%0\n"
28672@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
28673 */
28674 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
28675 unsigned long size);
28676-unsigned long __copy_user_intel(void __user *to, const void *from,
28677+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
28678+ unsigned long size);
28679+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
28680 unsigned long size);
28681 unsigned long __copy_user_zeroing_intel_nocache(void *to,
28682 const void __user *from, unsigned long size);
28683 #endif /* CONFIG_X86_INTEL_USERCOPY */
28684
28685 /* Generic arbitrary sized copy. */
28686-#define __copy_user(to, from, size) \
28687+#define __copy_user(to, from, size, prefix, set, restore) \
28688 do { \
28689 int __d0, __d1, __d2; \
28690 __asm__ __volatile__( \
28691+ set \
28692 " cmp $7,%0\n" \
28693 " jbe 1f\n" \
28694 " movl %1,%0\n" \
28695 " negl %0\n" \
28696 " andl $7,%0\n" \
28697 " subl %0,%3\n" \
28698- "4: rep; movsb\n" \
28699+ "4: rep; "prefix"movsb\n" \
28700 " movl %3,%0\n" \
28701 " shrl $2,%0\n" \
28702 " andl $3,%3\n" \
28703 " .align 2,0x90\n" \
28704- "0: rep; movsl\n" \
28705+ "0: rep; "prefix"movsl\n" \
28706 " movl %3,%0\n" \
28707- "1: rep; movsb\n" \
28708+ "1: rep; "prefix"movsb\n" \
28709 "2:\n" \
28710+ restore \
28711 ".section .fixup,\"ax\"\n" \
28712 "5: addl %3,%0\n" \
28713 " jmp 2b\n" \
28714@@ -538,14 +650,14 @@ do { \
28715 " negl %0\n" \
28716 " andl $7,%0\n" \
28717 " subl %0,%3\n" \
28718- "4: rep; movsb\n" \
28719+ "4: rep; "__copyuser_seg"movsb\n" \
28720 " movl %3,%0\n" \
28721 " shrl $2,%0\n" \
28722 " andl $3,%3\n" \
28723 " .align 2,0x90\n" \
28724- "0: rep; movsl\n" \
28725+ "0: rep; "__copyuser_seg"movsl\n" \
28726 " movl %3,%0\n" \
28727- "1: rep; movsb\n" \
28728+ "1: rep; "__copyuser_seg"movsb\n" \
28729 "2:\n" \
28730 ".section .fixup,\"ax\"\n" \
28731 "5: addl %3,%0\n" \
28732@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
28733 {
28734 stac();
28735 if (movsl_is_ok(to, from, n))
28736- __copy_user(to, from, n);
28737+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
28738 else
28739- n = __copy_user_intel(to, from, n);
28740+ n = __generic_copy_to_user_intel(to, from, n);
28741 clac();
28742 return n;
28743 }
28744@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
28745 {
28746 stac();
28747 if (movsl_is_ok(to, from, n))
28748- __copy_user(to, from, n);
28749+ __copy_user(to, from, n, __copyuser_seg, "", "");
28750 else
28751- n = __copy_user_intel((void __user *)to,
28752- (const void *)from, n);
28753+ n = __generic_copy_from_user_intel(to, from, n);
28754 clac();
28755 return n;
28756 }
28757@@ -632,60 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
28758 if (n > 64 && cpu_has_xmm2)
28759 n = __copy_user_intel_nocache(to, from, n);
28760 else
28761- __copy_user(to, from, n);
28762+ __copy_user(to, from, n, __copyuser_seg, "", "");
28763 #else
28764- __copy_user(to, from, n);
28765+ __copy_user(to, from, n, __copyuser_seg, "", "");
28766 #endif
28767 clac();
28768 return n;
28769 }
28770 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
28771
28772-/**
28773- * copy_to_user: - Copy a block of data into user space.
28774- * @to: Destination address, in user space.
28775- * @from: Source address, in kernel space.
28776- * @n: Number of bytes to copy.
28777- *
28778- * Context: User context only. This function may sleep.
28779- *
28780- * Copy data from kernel space to user space.
28781- *
28782- * Returns number of bytes that could not be copied.
28783- * On success, this will be zero.
28784- */
28785-unsigned long
28786-copy_to_user(void __user *to, const void *from, unsigned long n)
28787+#ifdef CONFIG_PAX_MEMORY_UDEREF
28788+void __set_fs(mm_segment_t x)
28789 {
28790- if (access_ok(VERIFY_WRITE, to, n))
28791- n = __copy_to_user(to, from, n);
28792- return n;
28793+ switch (x.seg) {
28794+ case 0:
28795+ loadsegment(gs, 0);
28796+ break;
28797+ case TASK_SIZE_MAX:
28798+ loadsegment(gs, __USER_DS);
28799+ break;
28800+ case -1UL:
28801+ loadsegment(gs, __KERNEL_DS);
28802+ break;
28803+ default:
28804+ BUG();
28805+ }
28806 }
28807-EXPORT_SYMBOL(copy_to_user);
28808+EXPORT_SYMBOL(__set_fs);
28809
28810-/**
28811- * copy_from_user: - Copy a block of data from user space.
28812- * @to: Destination address, in kernel space.
28813- * @from: Source address, in user space.
28814- * @n: Number of bytes to copy.
28815- *
28816- * Context: User context only. This function may sleep.
28817- *
28818- * Copy data from user space to kernel space.
28819- *
28820- * Returns number of bytes that could not be copied.
28821- * On success, this will be zero.
28822- *
28823- * If some data could not be copied, this function will pad the copied
28824- * data to the requested size using zero bytes.
28825- */
28826-unsigned long
28827-_copy_from_user(void *to, const void __user *from, unsigned long n)
28828+void set_fs(mm_segment_t x)
28829 {
28830- if (access_ok(VERIFY_READ, from, n))
28831- n = __copy_from_user(to, from, n);
28832- else
28833- memset(to, 0, n);
28834- return n;
28835+ current_thread_info()->addr_limit = x;
28836+ __set_fs(x);
28837 }
28838-EXPORT_SYMBOL(_copy_from_user);
28839+EXPORT_SYMBOL(set_fs);
28840+#endif
28841diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
28842index 906fea3..0194a18 100644
28843--- a/arch/x86/lib/usercopy_64.c
28844+++ b/arch/x86/lib/usercopy_64.c
28845@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
28846 might_fault();
28847 /* no memory constraint because it doesn't change any memory gcc knows
28848 about */
28849+ pax_open_userland();
28850 stac();
28851 asm volatile(
28852 " testq %[size8],%[size8]\n"
28853@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
28854 _ASM_EXTABLE(0b,3b)
28855 _ASM_EXTABLE(1b,2b)
28856 : [size8] "=&c"(size), [dst] "=&D" (__d0)
28857- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
28858+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
28859 [zero] "r" (0UL), [eight] "r" (8UL));
28860 clac();
28861+ pax_close_userland();
28862 return size;
28863 }
28864 EXPORT_SYMBOL(__clear_user);
28865@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
28866 }
28867 EXPORT_SYMBOL(clear_user);
28868
28869-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
28870+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
28871 {
28872- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
28873- return copy_user_generic((__force void *)to, (__force void *)from, len);
28874- }
28875- return len;
28876+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
28877+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
28878+ return len;
28879 }
28880 EXPORT_SYMBOL(copy_in_user);
28881
28882@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
28883 * it is not necessary to optimize tail handling.
28884 */
28885 unsigned long
28886-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
28887+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
28888 {
28889 char c;
28890 unsigned zero_len;
28891
28892+ clac();
28893+ pax_close_userland();
28894 for (; len; --len, to++) {
28895 if (__get_user_nocheck(c, from++, sizeof(char)))
28896 break;
28897@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
28898 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
28899 if (__put_user_nocheck(c, to++, sizeof(char)))
28900 break;
28901- clac();
28902 return len;
28903 }
28904diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
28905index 23d8e5f..9ccc13a 100644
28906--- a/arch/x86/mm/Makefile
28907+++ b/arch/x86/mm/Makefile
28908@@ -28,3 +28,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
28909 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
28910
28911 obj-$(CONFIG_MEMTEST) += memtest.o
28912+
28913+quote:="
28914+obj-$(CONFIG_X86_64) += uderef_64.o
28915+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
28916diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
28917index 903ec1e..c4166b2 100644
28918--- a/arch/x86/mm/extable.c
28919+++ b/arch/x86/mm/extable.c
28920@@ -6,12 +6,24 @@
28921 static inline unsigned long
28922 ex_insn_addr(const struct exception_table_entry *x)
28923 {
28924- return (unsigned long)&x->insn + x->insn;
28925+ unsigned long reloc = 0;
28926+
28927+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28928+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
28929+#endif
28930+
28931+ return (unsigned long)&x->insn + x->insn + reloc;
28932 }
28933 static inline unsigned long
28934 ex_fixup_addr(const struct exception_table_entry *x)
28935 {
28936- return (unsigned long)&x->fixup + x->fixup;
28937+ unsigned long reloc = 0;
28938+
28939+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28940+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
28941+#endif
28942+
28943+ return (unsigned long)&x->fixup + x->fixup + reloc;
28944 }
28945
28946 int fixup_exception(struct pt_regs *regs)
28947@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
28948 unsigned long new_ip;
28949
28950 #ifdef CONFIG_PNPBIOS
28951- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
28952+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
28953 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
28954 extern u32 pnp_bios_is_utter_crap;
28955 pnp_bios_is_utter_crap = 1;
28956@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
28957 i += 4;
28958 p->fixup -= i;
28959 i += 4;
28960+
28961+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28962+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
28963+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
28964+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
28965+#endif
28966+
28967 }
28968 }
28969
28970diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
28971index 654be4a..a4a3da1 100644
28972--- a/arch/x86/mm/fault.c
28973+++ b/arch/x86/mm/fault.c
28974@@ -14,11 +14,18 @@
28975 #include <linux/hugetlb.h> /* hstate_index_to_shift */
28976 #include <linux/prefetch.h> /* prefetchw */
28977 #include <linux/context_tracking.h> /* exception_enter(), ... */
28978+#include <linux/unistd.h>
28979+#include <linux/compiler.h>
28980
28981 #include <asm/traps.h> /* dotraplinkage, ... */
28982 #include <asm/pgalloc.h> /* pgd_*(), ... */
28983 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
28984 #include <asm/fixmap.h> /* VSYSCALL_START */
28985+#include <asm/tlbflush.h>
28986+
28987+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
28988+#include <asm/stacktrace.h>
28989+#endif
28990
28991 /*
28992 * Page fault error code bits:
28993@@ -56,7 +63,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
28994 int ret = 0;
28995
28996 /* kprobe_running() needs smp_processor_id() */
28997- if (kprobes_built_in() && !user_mode_vm(regs)) {
28998+ if (kprobes_built_in() && !user_mode(regs)) {
28999 preempt_disable();
29000 if (kprobe_running() && kprobe_fault_handler(regs, 14))
29001 ret = 1;
29002@@ -117,7 +124,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
29003 return !instr_lo || (instr_lo>>1) == 1;
29004 case 0x00:
29005 /* Prefetch instruction is 0x0F0D or 0x0F18 */
29006- if (probe_kernel_address(instr, opcode))
29007+ if (user_mode(regs)) {
29008+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
29009+ return 0;
29010+ } else if (probe_kernel_address(instr, opcode))
29011 return 0;
29012
29013 *prefetch = (instr_lo == 0xF) &&
29014@@ -151,7 +161,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
29015 while (instr < max_instr) {
29016 unsigned char opcode;
29017
29018- if (probe_kernel_address(instr, opcode))
29019+ if (user_mode(regs)) {
29020+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
29021+ break;
29022+ } else if (probe_kernel_address(instr, opcode))
29023 break;
29024
29025 instr++;
29026@@ -182,6 +195,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
29027 force_sig_info(si_signo, &info, tsk);
29028 }
29029
29030+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
29031+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
29032+#endif
29033+
29034+#ifdef CONFIG_PAX_EMUTRAMP
29035+static int pax_handle_fetch_fault(struct pt_regs *regs);
29036+#endif
29037+
29038+#ifdef CONFIG_PAX_PAGEEXEC
29039+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
29040+{
29041+ pgd_t *pgd;
29042+ pud_t *pud;
29043+ pmd_t *pmd;
29044+
29045+ pgd = pgd_offset(mm, address);
29046+ if (!pgd_present(*pgd))
29047+ return NULL;
29048+ pud = pud_offset(pgd, address);
29049+ if (!pud_present(*pud))
29050+ return NULL;
29051+ pmd = pmd_offset(pud, address);
29052+ if (!pmd_present(*pmd))
29053+ return NULL;
29054+ return pmd;
29055+}
29056+#endif
29057+
29058 DEFINE_SPINLOCK(pgd_lock);
29059 LIST_HEAD(pgd_list);
29060
29061@@ -232,10 +273,27 @@ void vmalloc_sync_all(void)
29062 for (address = VMALLOC_START & PMD_MASK;
29063 address >= TASK_SIZE && address < FIXADDR_TOP;
29064 address += PMD_SIZE) {
29065+
29066+#ifdef CONFIG_PAX_PER_CPU_PGD
29067+ unsigned long cpu;
29068+#else
29069 struct page *page;
29070+#endif
29071
29072 spin_lock(&pgd_lock);
29073+
29074+#ifdef CONFIG_PAX_PER_CPU_PGD
29075+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
29076+ pgd_t *pgd = get_cpu_pgd(cpu, user);
29077+ pmd_t *ret;
29078+
29079+ ret = vmalloc_sync_one(pgd, address);
29080+ if (!ret)
29081+ break;
29082+ pgd = get_cpu_pgd(cpu, kernel);
29083+#else
29084 list_for_each_entry(page, &pgd_list, lru) {
29085+ pgd_t *pgd;
29086 spinlock_t *pgt_lock;
29087 pmd_t *ret;
29088
29089@@ -243,8 +301,14 @@ void vmalloc_sync_all(void)
29090 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
29091
29092 spin_lock(pgt_lock);
29093- ret = vmalloc_sync_one(page_address(page), address);
29094+ pgd = page_address(page);
29095+#endif
29096+
29097+ ret = vmalloc_sync_one(pgd, address);
29098+
29099+#ifndef CONFIG_PAX_PER_CPU_PGD
29100 spin_unlock(pgt_lock);
29101+#endif
29102
29103 if (!ret)
29104 break;
29105@@ -278,6 +342,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
29106 * an interrupt in the middle of a task switch..
29107 */
29108 pgd_paddr = read_cr3();
29109+
29110+#ifdef CONFIG_PAX_PER_CPU_PGD
29111+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
29112+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
29113+#endif
29114+
29115 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
29116 if (!pmd_k)
29117 return -1;
29118@@ -373,11 +443,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
29119 * happen within a race in page table update. In the later
29120 * case just flush:
29121 */
29122- pgd = pgd_offset(current->active_mm, address);
29123+
29124 pgd_ref = pgd_offset_k(address);
29125 if (pgd_none(*pgd_ref))
29126 return -1;
29127
29128+#ifdef CONFIG_PAX_PER_CPU_PGD
29129+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
29130+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
29131+ if (pgd_none(*pgd)) {
29132+ set_pgd(pgd, *pgd_ref);
29133+ arch_flush_lazy_mmu_mode();
29134+ } else {
29135+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
29136+ }
29137+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
29138+#else
29139+ pgd = pgd_offset(current->active_mm, address);
29140+#endif
29141+
29142 if (pgd_none(*pgd)) {
29143 set_pgd(pgd, *pgd_ref);
29144 arch_flush_lazy_mmu_mode();
29145@@ -543,7 +627,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
29146 static int is_errata100(struct pt_regs *regs, unsigned long address)
29147 {
29148 #ifdef CONFIG_X86_64
29149- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
29150+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
29151 return 1;
29152 #endif
29153 return 0;
29154@@ -570,7 +654,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
29155 }
29156
29157 static const char nx_warning[] = KERN_CRIT
29158-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
29159+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
29160
29161 static void
29162 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
29163@@ -579,15 +663,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
29164 if (!oops_may_print())
29165 return;
29166
29167- if (error_code & PF_INSTR) {
29168+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
29169 unsigned int level;
29170
29171 pte_t *pte = lookup_address(address, &level);
29172
29173 if (pte && pte_present(*pte) && !pte_exec(*pte))
29174- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
29175+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
29176 }
29177
29178+#ifdef CONFIG_PAX_KERNEXEC
29179+ if (init_mm.start_code <= address && address < init_mm.end_code) {
29180+ if (current->signal->curr_ip)
29181+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
29182+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
29183+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
29184+ else
29185+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
29186+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
29187+ }
29188+#endif
29189+
29190 printk(KERN_ALERT "BUG: unable to handle kernel ");
29191 if (address < PAGE_SIZE)
29192 printk(KERN_CONT "NULL pointer dereference");
29193@@ -750,6 +846,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
29194 return;
29195 }
29196 #endif
29197+
29198+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
29199+ if (pax_is_fetch_fault(regs, error_code, address)) {
29200+
29201+#ifdef CONFIG_PAX_EMUTRAMP
29202+ switch (pax_handle_fetch_fault(regs)) {
29203+ case 2:
29204+ return;
29205+ }
29206+#endif
29207+
29208+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
29209+ do_group_exit(SIGKILL);
29210+ }
29211+#endif
29212+
29213 /* Kernel addresses are always protection faults: */
29214 if (address >= TASK_SIZE)
29215 error_code |= PF_PROT;
29216@@ -835,7 +947,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
29217 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
29218 printk(KERN_ERR
29219 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
29220- tsk->comm, tsk->pid, address);
29221+ tsk->comm, task_pid_nr(tsk), address);
29222 code = BUS_MCEERR_AR;
29223 }
29224 #endif
29225@@ -898,6 +1010,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
29226 return 1;
29227 }
29228
29229+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
29230+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
29231+{
29232+ pte_t *pte;
29233+ pmd_t *pmd;
29234+ spinlock_t *ptl;
29235+ unsigned char pte_mask;
29236+
29237+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
29238+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
29239+ return 0;
29240+
29241+ /* PaX: it's our fault, let's handle it if we can */
29242+
29243+ /* PaX: take a look at read faults before acquiring any locks */
29244+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
29245+ /* instruction fetch attempt from a protected page in user mode */
29246+ up_read(&mm->mmap_sem);
29247+
29248+#ifdef CONFIG_PAX_EMUTRAMP
29249+ switch (pax_handle_fetch_fault(regs)) {
29250+ case 2:
29251+ return 1;
29252+ }
29253+#endif
29254+
29255+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
29256+ do_group_exit(SIGKILL);
29257+ }
29258+
29259+ pmd = pax_get_pmd(mm, address);
29260+ if (unlikely(!pmd))
29261+ return 0;
29262+
29263+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
29264+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
29265+ pte_unmap_unlock(pte, ptl);
29266+ return 0;
29267+ }
29268+
29269+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
29270+ /* write attempt to a protected page in user mode */
29271+ pte_unmap_unlock(pte, ptl);
29272+ return 0;
29273+ }
29274+
29275+#ifdef CONFIG_SMP
29276+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
29277+#else
29278+ if (likely(address > get_limit(regs->cs)))
29279+#endif
29280+ {
29281+ set_pte(pte, pte_mkread(*pte));
29282+ __flush_tlb_one(address);
29283+ pte_unmap_unlock(pte, ptl);
29284+ up_read(&mm->mmap_sem);
29285+ return 1;
29286+ }
29287+
29288+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
29289+
29290+ /*
29291+ * PaX: fill DTLB with user rights and retry
29292+ */
29293+ __asm__ __volatile__ (
29294+ "orb %2,(%1)\n"
29295+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
29296+/*
29297+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
29298+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
29299+ * page fault when examined during a TLB load attempt. this is true not only
29300+ * for PTEs holding a non-present entry but also present entries that will
29301+ * raise a page fault (such as those set up by PaX, or the copy-on-write
29302+ * mechanism). in effect it means that we do *not* need to flush the TLBs
29303+ * for our target pages since their PTEs are simply not in the TLBs at all.
29304+
29305+ * the best thing in omitting it is that we gain around 15-20% speed in the
29306+ * fast path of the page fault handler and can get rid of tracing since we
29307+ * can no longer flush unintended entries.
29308+ */
29309+ "invlpg (%0)\n"
29310+#endif
29311+ __copyuser_seg"testb $0,(%0)\n"
29312+ "xorb %3,(%1)\n"
29313+ :
29314+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
29315+ : "memory", "cc");
29316+ pte_unmap_unlock(pte, ptl);
29317+ up_read(&mm->mmap_sem);
29318+ return 1;
29319+}
29320+#endif
29321+
29322 /*
29323 * Handle a spurious fault caused by a stale TLB entry.
29324 *
29325@@ -964,6 +1169,9 @@ int show_unhandled_signals = 1;
29326 static inline int
29327 access_error(unsigned long error_code, struct vm_area_struct *vma)
29328 {
29329+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
29330+ return 1;
29331+
29332 if (error_code & PF_WRITE) {
29333 /* write, present and write, not present: */
29334 if (unlikely(!(vma->vm_flags & VM_WRITE)))
29335@@ -992,7 +1200,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
29336 if (error_code & PF_USER)
29337 return false;
29338
29339- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
29340+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
29341 return false;
29342
29343 return true;
29344@@ -1008,18 +1216,33 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
29345 {
29346 struct vm_area_struct *vma;
29347 struct task_struct *tsk;
29348- unsigned long address;
29349 struct mm_struct *mm;
29350 int fault;
29351 int write = error_code & PF_WRITE;
29352 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
29353 (write ? FAULT_FLAG_WRITE : 0);
29354
29355- tsk = current;
29356- mm = tsk->mm;
29357-
29358 /* Get the faulting address: */
29359- address = read_cr2();
29360+ unsigned long address = read_cr2();
29361+
29362+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29363+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
29364+ if (!search_exception_tables(regs->ip)) {
29365+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
29366+ bad_area_nosemaphore(regs, error_code, address);
29367+ return;
29368+ }
29369+ if (address < pax_user_shadow_base) {
29370+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
29371+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
29372+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
29373+ } else
29374+ address -= pax_user_shadow_base;
29375+ }
29376+#endif
29377+
29378+ tsk = current;
29379+ mm = tsk->mm;
29380
29381 /*
29382 * Detect and handle instructions that would cause a page fault for
29383@@ -1080,7 +1303,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
29384 * User-mode registers count as a user access even for any
29385 * potential system fault or CPU buglet:
29386 */
29387- if (user_mode_vm(regs)) {
29388+ if (user_mode(regs)) {
29389 local_irq_enable();
29390 error_code |= PF_USER;
29391 } else {
29392@@ -1142,6 +1365,11 @@ retry:
29393 might_sleep();
29394 }
29395
29396+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
29397+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
29398+ return;
29399+#endif
29400+
29401 vma = find_vma(mm, address);
29402 if (unlikely(!vma)) {
29403 bad_area(regs, error_code, address);
29404@@ -1153,18 +1381,24 @@ retry:
29405 bad_area(regs, error_code, address);
29406 return;
29407 }
29408- if (error_code & PF_USER) {
29409- /*
29410- * Accessing the stack below %sp is always a bug.
29411- * The large cushion allows instructions like enter
29412- * and pusha to work. ("enter $65535, $31" pushes
29413- * 32 pointers and then decrements %sp by 65535.)
29414- */
29415- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
29416- bad_area(regs, error_code, address);
29417- return;
29418- }
29419+ /*
29420+ * Accessing the stack below %sp is always a bug.
29421+ * The large cushion allows instructions like enter
29422+ * and pusha to work. ("enter $65535, $31" pushes
29423+ * 32 pointers and then decrements %sp by 65535.)
29424+ */
29425+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
29426+ bad_area(regs, error_code, address);
29427+ return;
29428 }
29429+
29430+#ifdef CONFIG_PAX_SEGMEXEC
29431+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
29432+ bad_area(regs, error_code, address);
29433+ return;
29434+ }
29435+#endif
29436+
29437 if (unlikely(expand_stack(vma, address))) {
29438 bad_area(regs, error_code, address);
29439 return;
29440@@ -1230,3 +1464,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
29441 __do_page_fault(regs, error_code);
29442 exception_exit(prev_state);
29443 }
29444+
29445+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
29446+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
29447+{
29448+ struct mm_struct *mm = current->mm;
29449+ unsigned long ip = regs->ip;
29450+
29451+ if (v8086_mode(regs))
29452+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
29453+
29454+#ifdef CONFIG_PAX_PAGEEXEC
29455+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
29456+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
29457+ return true;
29458+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
29459+ return true;
29460+ return false;
29461+ }
29462+#endif
29463+
29464+#ifdef CONFIG_PAX_SEGMEXEC
29465+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
29466+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
29467+ return true;
29468+ return false;
29469+ }
29470+#endif
29471+
29472+ return false;
29473+}
29474+#endif
29475+
29476+#ifdef CONFIG_PAX_EMUTRAMP
29477+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
29478+{
29479+ int err;
29480+
29481+ do { /* PaX: libffi trampoline emulation */
29482+ unsigned char mov, jmp;
29483+ unsigned int addr1, addr2;
29484+
29485+#ifdef CONFIG_X86_64
29486+ if ((regs->ip + 9) >> 32)
29487+ break;
29488+#endif
29489+
29490+ err = get_user(mov, (unsigned char __user *)regs->ip);
29491+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
29492+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
29493+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
29494+
29495+ if (err)
29496+ break;
29497+
29498+ if (mov == 0xB8 && jmp == 0xE9) {
29499+ regs->ax = addr1;
29500+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
29501+ return 2;
29502+ }
29503+ } while (0);
29504+
29505+ do { /* PaX: gcc trampoline emulation #1 */
29506+ unsigned char mov1, mov2;
29507+ unsigned short jmp;
29508+ unsigned int addr1, addr2;
29509+
29510+#ifdef CONFIG_X86_64
29511+ if ((regs->ip + 11) >> 32)
29512+ break;
29513+#endif
29514+
29515+ err = get_user(mov1, (unsigned char __user *)regs->ip);
29516+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
29517+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
29518+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
29519+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
29520+
29521+ if (err)
29522+ break;
29523+
29524+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
29525+ regs->cx = addr1;
29526+ regs->ax = addr2;
29527+ regs->ip = addr2;
29528+ return 2;
29529+ }
29530+ } while (0);
29531+
29532+ do { /* PaX: gcc trampoline emulation #2 */
29533+ unsigned char mov, jmp;
29534+ unsigned int addr1, addr2;
29535+
29536+#ifdef CONFIG_X86_64
29537+ if ((regs->ip + 9) >> 32)
29538+ break;
29539+#endif
29540+
29541+ err = get_user(mov, (unsigned char __user *)regs->ip);
29542+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
29543+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
29544+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
29545+
29546+ if (err)
29547+ break;
29548+
29549+ if (mov == 0xB9 && jmp == 0xE9) {
29550+ regs->cx = addr1;
29551+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
29552+ return 2;
29553+ }
29554+ } while (0);
29555+
29556+ return 1; /* PaX in action */
29557+}
29558+
29559+#ifdef CONFIG_X86_64
29560+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
29561+{
29562+ int err;
29563+
29564+ do { /* PaX: libffi trampoline emulation */
29565+ unsigned short mov1, mov2, jmp1;
29566+ unsigned char stcclc, jmp2;
29567+ unsigned long addr1, addr2;
29568+
29569+ err = get_user(mov1, (unsigned short __user *)regs->ip);
29570+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
29571+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
29572+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
29573+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
29574+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
29575+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
29576+
29577+ if (err)
29578+ break;
29579+
29580+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
29581+ regs->r11 = addr1;
29582+ regs->r10 = addr2;
29583+ if (stcclc == 0xF8)
29584+ regs->flags &= ~X86_EFLAGS_CF;
29585+ else
29586+ regs->flags |= X86_EFLAGS_CF;
29587+ regs->ip = addr1;
29588+ return 2;
29589+ }
29590+ } while (0);
29591+
29592+ do { /* PaX: gcc trampoline emulation #1 */
29593+ unsigned short mov1, mov2, jmp1;
29594+ unsigned char jmp2;
29595+ unsigned int addr1;
29596+ unsigned long addr2;
29597+
29598+ err = get_user(mov1, (unsigned short __user *)regs->ip);
29599+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
29600+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
29601+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
29602+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
29603+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
29604+
29605+ if (err)
29606+ break;
29607+
29608+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
29609+ regs->r11 = addr1;
29610+ regs->r10 = addr2;
29611+ regs->ip = addr1;
29612+ return 2;
29613+ }
29614+ } while (0);
29615+
29616+ do { /* PaX: gcc trampoline emulation #2 */
29617+ unsigned short mov1, mov2, jmp1;
29618+ unsigned char jmp2;
29619+ unsigned long addr1, addr2;
29620+
29621+ err = get_user(mov1, (unsigned short __user *)regs->ip);
29622+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
29623+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
29624+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
29625+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
29626+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
29627+
29628+ if (err)
29629+ break;
29630+
29631+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
29632+ regs->r11 = addr1;
29633+ regs->r10 = addr2;
29634+ regs->ip = addr1;
29635+ return 2;
29636+ }
29637+ } while (0);
29638+
29639+ return 1; /* PaX in action */
29640+}
29641+#endif
29642+
29643+/*
29644+ * PaX: decide what to do with offenders (regs->ip = fault address)
29645+ *
29646+ * returns 1 when task should be killed
29647+ * 2 when gcc trampoline was detected
29648+ */
29649+static int pax_handle_fetch_fault(struct pt_regs *regs)
29650+{
29651+ if (v8086_mode(regs))
29652+ return 1;
29653+
29654+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
29655+ return 1;
29656+
29657+#ifdef CONFIG_X86_32
29658+ return pax_handle_fetch_fault_32(regs);
29659+#else
29660+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
29661+ return pax_handle_fetch_fault_32(regs);
29662+ else
29663+ return pax_handle_fetch_fault_64(regs);
29664+#endif
29665+}
29666+#endif
29667+
29668+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
29669+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
29670+{
29671+ long i;
29672+
29673+ printk(KERN_ERR "PAX: bytes at PC: ");
29674+ for (i = 0; i < 20; i++) {
29675+ unsigned char c;
29676+ if (get_user(c, (unsigned char __force_user *)pc+i))
29677+ printk(KERN_CONT "?? ");
29678+ else
29679+ printk(KERN_CONT "%02x ", c);
29680+ }
29681+ printk("\n");
29682+
29683+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
29684+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
29685+ unsigned long c;
29686+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
29687+#ifdef CONFIG_X86_32
29688+ printk(KERN_CONT "???????? ");
29689+#else
29690+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
29691+ printk(KERN_CONT "???????? ???????? ");
29692+ else
29693+ printk(KERN_CONT "???????????????? ");
29694+#endif
29695+ } else {
29696+#ifdef CONFIG_X86_64
29697+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
29698+ printk(KERN_CONT "%08x ", (unsigned int)c);
29699+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
29700+ } else
29701+#endif
29702+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
29703+ }
29704+ }
29705+ printk("\n");
29706+}
29707+#endif
29708+
29709+/**
29710+ * probe_kernel_write(): safely attempt to write to a location
29711+ * @dst: address to write to
29712+ * @src: pointer to the data that shall be written
29713+ * @size: size of the data chunk
29714+ *
29715+ * Safely write to address @dst from the buffer at @src. If a kernel fault
29716+ * happens, handle that and return -EFAULT.
29717+ */
29718+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
29719+{
29720+ long ret;
29721+ mm_segment_t old_fs = get_fs();
29722+
29723+ set_fs(KERNEL_DS);
29724+ pagefault_disable();
29725+ pax_open_kernel();
29726+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
29727+ pax_close_kernel();
29728+ pagefault_enable();
29729+ set_fs(old_fs);
29730+
29731+ return ret ? -EFAULT : 0;
29732+}
29733diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
29734index dd74e46..7d26398 100644
29735--- a/arch/x86/mm/gup.c
29736+++ b/arch/x86/mm/gup.c
29737@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
29738 addr = start;
29739 len = (unsigned long) nr_pages << PAGE_SHIFT;
29740 end = start + len;
29741- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
29742+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
29743 (void __user *)start, len)))
29744 return 0;
29745
29746diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
29747index 252b8f5..4dcfdc1 100644
29748--- a/arch/x86/mm/highmem_32.c
29749+++ b/arch/x86/mm/highmem_32.c
29750@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
29751 idx = type + KM_TYPE_NR*smp_processor_id();
29752 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
29753 BUG_ON(!pte_none(*(kmap_pte-idx)));
29754+
29755+ pax_open_kernel();
29756 set_pte(kmap_pte-idx, mk_pte(page, prot));
29757+ pax_close_kernel();
29758+
29759 arch_flush_lazy_mmu_mode();
29760
29761 return (void *)vaddr;
29762diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
29763index ae1aa71..d9bea75 100644
29764--- a/arch/x86/mm/hugetlbpage.c
29765+++ b/arch/x86/mm/hugetlbpage.c
29766@@ -271,23 +271,30 @@ follow_huge_pud(struct mm_struct *mm, unsigned long address,
29767 #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
29768 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
29769 unsigned long addr, unsigned long len,
29770- unsigned long pgoff, unsigned long flags)
29771+ unsigned long pgoff, unsigned long flags, unsigned long offset)
29772 {
29773 struct hstate *h = hstate_file(file);
29774 struct vm_unmapped_area_info info;
29775-
29776+
29777 info.flags = 0;
29778 info.length = len;
29779 info.low_limit = TASK_UNMAPPED_BASE;
29780+
29781+#ifdef CONFIG_PAX_RANDMMAP
29782+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
29783+ info.low_limit += current->mm->delta_mmap;
29784+#endif
29785+
29786 info.high_limit = TASK_SIZE;
29787 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
29788 info.align_offset = 0;
29789+ info.threadstack_offset = offset;
29790 return vm_unmapped_area(&info);
29791 }
29792
29793 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
29794 unsigned long addr0, unsigned long len,
29795- unsigned long pgoff, unsigned long flags)
29796+ unsigned long pgoff, unsigned long flags, unsigned long offset)
29797 {
29798 struct hstate *h = hstate_file(file);
29799 struct vm_unmapped_area_info info;
29800@@ -299,6 +306,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
29801 info.high_limit = current->mm->mmap_base;
29802 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
29803 info.align_offset = 0;
29804+ info.threadstack_offset = offset;
29805 addr = vm_unmapped_area(&info);
29806
29807 /*
29808@@ -311,6 +319,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
29809 VM_BUG_ON(addr != -ENOMEM);
29810 info.flags = 0;
29811 info.low_limit = TASK_UNMAPPED_BASE;
29812+
29813+#ifdef CONFIG_PAX_RANDMMAP
29814+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
29815+ info.low_limit += current->mm->delta_mmap;
29816+#endif
29817+
29818 info.high_limit = TASK_SIZE;
29819 addr = vm_unmapped_area(&info);
29820 }
29821@@ -325,10 +339,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
29822 struct hstate *h = hstate_file(file);
29823 struct mm_struct *mm = current->mm;
29824 struct vm_area_struct *vma;
29825+ unsigned long pax_task_size = TASK_SIZE;
29826+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
29827
29828 if (len & ~huge_page_mask(h))
29829 return -EINVAL;
29830- if (len > TASK_SIZE)
29831+
29832+#ifdef CONFIG_PAX_SEGMEXEC
29833+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
29834+ pax_task_size = SEGMEXEC_TASK_SIZE;
29835+#endif
29836+
29837+ pax_task_size -= PAGE_SIZE;
29838+
29839+ if (len > pax_task_size)
29840 return -ENOMEM;
29841
29842 if (flags & MAP_FIXED) {
29843@@ -337,19 +361,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
29844 return addr;
29845 }
29846
29847+#ifdef CONFIG_PAX_RANDMMAP
29848+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
29849+#endif
29850+
29851 if (addr) {
29852 addr = ALIGN(addr, huge_page_size(h));
29853 vma = find_vma(mm, addr);
29854- if (TASK_SIZE - len >= addr &&
29855- (!vma || addr + len <= vma->vm_start))
29856+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
29857 return addr;
29858 }
29859 if (mm->get_unmapped_area == arch_get_unmapped_area)
29860 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
29861- pgoff, flags);
29862+ pgoff, flags, offset);
29863 else
29864 return hugetlb_get_unmapped_area_topdown(file, addr, len,
29865- pgoff, flags);
29866+ pgoff, flags, offset);
29867 }
29868
29869 #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/
29870diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
29871index 1f34e92..c97b98f 100644
29872--- a/arch/x86/mm/init.c
29873+++ b/arch/x86/mm/init.c
29874@@ -4,6 +4,7 @@
29875 #include <linux/swap.h>
29876 #include <linux/memblock.h>
29877 #include <linux/bootmem.h> /* for max_low_pfn */
29878+#include <linux/tboot.h>
29879
29880 #include <asm/cacheflush.h>
29881 #include <asm/e820.h>
29882@@ -17,6 +18,8 @@
29883 #include <asm/proto.h>
29884 #include <asm/dma.h> /* for MAX_DMA_PFN */
29885 #include <asm/microcode.h>
29886+#include <asm/desc.h>
29887+#include <asm/bios_ebda.h>
29888
29889 #include "mm_internal.h"
29890
29891@@ -465,7 +468,18 @@ void __init init_mem_mapping(void)
29892 early_ioremap_page_table_range_init();
29893 #endif
29894
29895+#ifdef CONFIG_PAX_PER_CPU_PGD
29896+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
29897+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
29898+ KERNEL_PGD_PTRS);
29899+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
29900+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
29901+ KERNEL_PGD_PTRS);
29902+ load_cr3(get_cpu_pgd(0, kernel));
29903+#else
29904 load_cr3(swapper_pg_dir);
29905+#endif
29906+
29907 __flush_tlb_all();
29908
29909 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
29910@@ -481,10 +495,40 @@ void __init init_mem_mapping(void)
29911 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
29912 * mmio resources as well as potential bios/acpi data regions.
29913 */
29914+
29915+#ifdef CONFIG_GRKERNSEC_KMEM
29916+static unsigned int ebda_start __read_only;
29917+static unsigned int ebda_end __read_only;
29918+#endif
29919+
29920 int devmem_is_allowed(unsigned long pagenr)
29921 {
29922- if (pagenr < 256)
29923+#ifdef CONFIG_GRKERNSEC_KMEM
29924+ /* allow BDA */
29925+ if (!pagenr)
29926 return 1;
29927+ /* allow EBDA */
29928+ if (pagenr >= ebda_start && pagenr < ebda_end)
29929+ return 1;
29930+ /* if tboot is in use, allow access to its hardcoded serial log range */
29931+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
29932+ return 1;
29933+#else
29934+ if (!pagenr)
29935+ return 1;
29936+#ifdef CONFIG_VM86
29937+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
29938+ return 1;
29939+#endif
29940+#endif
29941+
29942+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
29943+ return 1;
29944+#ifdef CONFIG_GRKERNSEC_KMEM
29945+ /* throw out everything else below 1MB */
29946+ if (pagenr <= 256)
29947+ return 0;
29948+#endif
29949 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
29950 return 0;
29951 if (!page_is_ram(pagenr))
29952@@ -538,8 +582,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
29953 #endif
29954 }
29955
29956+#ifdef CONFIG_GRKERNSEC_KMEM
29957+static inline void gr_init_ebda(void)
29958+{
29959+ unsigned int ebda_addr;
29960+ unsigned int ebda_size = 0;
29961+
29962+ ebda_addr = get_bios_ebda();
29963+ if (ebda_addr) {
29964+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
29965+ ebda_size <<= 10;
29966+ }
29967+ if (ebda_addr && ebda_size) {
29968+ ebda_start = ebda_addr >> PAGE_SHIFT;
29969+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
29970+ } else {
29971+ ebda_start = 0x9f000 >> PAGE_SHIFT;
29972+ ebda_end = 0xa0000 >> PAGE_SHIFT;
29973+ }
29974+}
29975+#else
29976+static inline void gr_init_ebda(void) { }
29977+#endif
29978+
29979 void free_initmem(void)
29980 {
29981+#ifdef CONFIG_PAX_KERNEXEC
29982+#ifdef CONFIG_X86_32
29983+ /* PaX: limit KERNEL_CS to actual size */
29984+ unsigned long addr, limit;
29985+ struct desc_struct d;
29986+ int cpu;
29987+#else
29988+ pgd_t *pgd;
29989+ pud_t *pud;
29990+ pmd_t *pmd;
29991+ unsigned long addr, end;
29992+#endif
29993+#endif
29994+
29995+ gr_init_ebda();
29996+
29997+#ifdef CONFIG_PAX_KERNEXEC
29998+#ifdef CONFIG_X86_32
29999+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
30000+ limit = (limit - 1UL) >> PAGE_SHIFT;
30001+
30002+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
30003+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
30004+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
30005+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
30006+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
30007+ }
30008+
30009+ /* PaX: make KERNEL_CS read-only */
30010+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
30011+ if (!paravirt_enabled())
30012+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
30013+/*
30014+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
30015+ pgd = pgd_offset_k(addr);
30016+ pud = pud_offset(pgd, addr);
30017+ pmd = pmd_offset(pud, addr);
30018+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
30019+ }
30020+*/
30021+#ifdef CONFIG_X86_PAE
30022+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
30023+/*
30024+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
30025+ pgd = pgd_offset_k(addr);
30026+ pud = pud_offset(pgd, addr);
30027+ pmd = pmd_offset(pud, addr);
30028+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
30029+ }
30030+*/
30031+#endif
30032+
30033+#ifdef CONFIG_MODULES
30034+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
30035+#endif
30036+
30037+#else
30038+ /* PaX: make kernel code/rodata read-only, rest non-executable */
30039+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
30040+ pgd = pgd_offset_k(addr);
30041+ pud = pud_offset(pgd, addr);
30042+ pmd = pmd_offset(pud, addr);
30043+ if (!pmd_present(*pmd))
30044+ continue;
30045+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
30046+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
30047+ else
30048+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
30049+ }
30050+
30051+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
30052+ end = addr + KERNEL_IMAGE_SIZE;
30053+ for (; addr < end; addr += PMD_SIZE) {
30054+ pgd = pgd_offset_k(addr);
30055+ pud = pud_offset(pgd, addr);
30056+ pmd = pmd_offset(pud, addr);
30057+ if (!pmd_present(*pmd))
30058+ continue;
30059+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
30060+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
30061+ }
30062+#endif
30063+
30064+ flush_tlb_all();
30065+#endif
30066+
30067 free_init_pages("unused kernel memory",
30068 (unsigned long)(&__init_begin),
30069 (unsigned long)(&__init_end));
30070diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
30071index 3ac7e31..89611b7 100644
30072--- a/arch/x86/mm/init_32.c
30073+++ b/arch/x86/mm/init_32.c
30074@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
30075 bool __read_mostly __vmalloc_start_set = false;
30076
30077 /*
30078- * Creates a middle page table and puts a pointer to it in the
30079- * given global directory entry. This only returns the gd entry
30080- * in non-PAE compilation mode, since the middle layer is folded.
30081- */
30082-static pmd_t * __init one_md_table_init(pgd_t *pgd)
30083-{
30084- pud_t *pud;
30085- pmd_t *pmd_table;
30086-
30087-#ifdef CONFIG_X86_PAE
30088- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
30089- pmd_table = (pmd_t *)alloc_low_page();
30090- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
30091- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
30092- pud = pud_offset(pgd, 0);
30093- BUG_ON(pmd_table != pmd_offset(pud, 0));
30094-
30095- return pmd_table;
30096- }
30097-#endif
30098- pud = pud_offset(pgd, 0);
30099- pmd_table = pmd_offset(pud, 0);
30100-
30101- return pmd_table;
30102-}
30103-
30104-/*
30105 * Create a page table and place a pointer to it in a middle page
30106 * directory entry:
30107 */
30108@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
30109 pte_t *page_table = (pte_t *)alloc_low_page();
30110
30111 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
30112+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
30113+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
30114+#else
30115 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
30116+#endif
30117 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
30118 }
30119
30120 return pte_offset_kernel(pmd, 0);
30121 }
30122
30123+static pmd_t * __init one_md_table_init(pgd_t *pgd)
30124+{
30125+ pud_t *pud;
30126+ pmd_t *pmd_table;
30127+
30128+ pud = pud_offset(pgd, 0);
30129+ pmd_table = pmd_offset(pud, 0);
30130+
30131+ return pmd_table;
30132+}
30133+
30134 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
30135 {
30136 int pgd_idx = pgd_index(vaddr);
30137@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
30138 int pgd_idx, pmd_idx;
30139 unsigned long vaddr;
30140 pgd_t *pgd;
30141+ pud_t *pud;
30142 pmd_t *pmd;
30143 pte_t *pte = NULL;
30144 unsigned long count = page_table_range_init_count(start, end);
30145@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
30146 pgd = pgd_base + pgd_idx;
30147
30148 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
30149- pmd = one_md_table_init(pgd);
30150- pmd = pmd + pmd_index(vaddr);
30151+ pud = pud_offset(pgd, vaddr);
30152+ pmd = pmd_offset(pud, vaddr);
30153+
30154+#ifdef CONFIG_X86_PAE
30155+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
30156+#endif
30157+
30158 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
30159 pmd++, pmd_idx++) {
30160 pte = page_table_kmap_check(one_page_table_init(pmd),
30161@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
30162 }
30163 }
30164
30165-static inline int is_kernel_text(unsigned long addr)
30166+static inline int is_kernel_text(unsigned long start, unsigned long end)
30167 {
30168- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
30169- return 1;
30170- return 0;
30171+ if ((start > ktla_ktva((unsigned long)_etext) ||
30172+ end <= ktla_ktva((unsigned long)_stext)) &&
30173+ (start > ktla_ktva((unsigned long)_einittext) ||
30174+ end <= ktla_ktva((unsigned long)_sinittext)) &&
30175+
30176+#ifdef CONFIG_ACPI_SLEEP
30177+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
30178+#endif
30179+
30180+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
30181+ return 0;
30182+ return 1;
30183 }
30184
30185 /*
30186@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
30187 unsigned long last_map_addr = end;
30188 unsigned long start_pfn, end_pfn;
30189 pgd_t *pgd_base = swapper_pg_dir;
30190- int pgd_idx, pmd_idx, pte_ofs;
30191+ unsigned int pgd_idx, pmd_idx, pte_ofs;
30192 unsigned long pfn;
30193 pgd_t *pgd;
30194+ pud_t *pud;
30195 pmd_t *pmd;
30196 pte_t *pte;
30197 unsigned pages_2m, pages_4k;
30198@@ -291,8 +295,13 @@ repeat:
30199 pfn = start_pfn;
30200 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
30201 pgd = pgd_base + pgd_idx;
30202- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
30203- pmd = one_md_table_init(pgd);
30204+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
30205+ pud = pud_offset(pgd, 0);
30206+ pmd = pmd_offset(pud, 0);
30207+
30208+#ifdef CONFIG_X86_PAE
30209+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
30210+#endif
30211
30212 if (pfn >= end_pfn)
30213 continue;
30214@@ -304,14 +313,13 @@ repeat:
30215 #endif
30216 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
30217 pmd++, pmd_idx++) {
30218- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
30219+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
30220
30221 /*
30222 * Map with big pages if possible, otherwise
30223 * create normal page tables:
30224 */
30225 if (use_pse) {
30226- unsigned int addr2;
30227 pgprot_t prot = PAGE_KERNEL_LARGE;
30228 /*
30229 * first pass will use the same initial
30230@@ -322,11 +330,7 @@ repeat:
30231 _PAGE_PSE);
30232
30233 pfn &= PMD_MASK >> PAGE_SHIFT;
30234- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
30235- PAGE_OFFSET + PAGE_SIZE-1;
30236-
30237- if (is_kernel_text(addr) ||
30238- is_kernel_text(addr2))
30239+ if (is_kernel_text(address, address + PMD_SIZE))
30240 prot = PAGE_KERNEL_LARGE_EXEC;
30241
30242 pages_2m++;
30243@@ -343,7 +347,7 @@ repeat:
30244 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
30245 pte += pte_ofs;
30246 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
30247- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
30248+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
30249 pgprot_t prot = PAGE_KERNEL;
30250 /*
30251 * first pass will use the same initial
30252@@ -351,7 +355,7 @@ repeat:
30253 */
30254 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
30255
30256- if (is_kernel_text(addr))
30257+ if (is_kernel_text(address, address + PAGE_SIZE))
30258 prot = PAGE_KERNEL_EXEC;
30259
30260 pages_4k++;
30261@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
30262
30263 pud = pud_offset(pgd, va);
30264 pmd = pmd_offset(pud, va);
30265- if (!pmd_present(*pmd))
30266+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
30267 break;
30268
30269 /* should not be large page here */
30270@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
30271
30272 static void __init pagetable_init(void)
30273 {
30274- pgd_t *pgd_base = swapper_pg_dir;
30275-
30276- permanent_kmaps_init(pgd_base);
30277+ permanent_kmaps_init(swapper_pg_dir);
30278 }
30279
30280-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
30281+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
30282 EXPORT_SYMBOL_GPL(__supported_pte_mask);
30283
30284 /* user-defined highmem size */
30285@@ -772,7 +774,7 @@ void __init mem_init(void)
30286 after_bootmem = 1;
30287
30288 codesize = (unsigned long) &_etext - (unsigned long) &_text;
30289- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
30290+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
30291 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
30292
30293 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
30294@@ -813,10 +815,10 @@ void __init mem_init(void)
30295 ((unsigned long)&__init_end -
30296 (unsigned long)&__init_begin) >> 10,
30297
30298- (unsigned long)&_etext, (unsigned long)&_edata,
30299- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
30300+ (unsigned long)&_sdata, (unsigned long)&_edata,
30301+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
30302
30303- (unsigned long)&_text, (unsigned long)&_etext,
30304+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
30305 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
30306
30307 /*
30308@@ -906,6 +908,7 @@ void set_kernel_text_rw(void)
30309 if (!kernel_set_to_readonly)
30310 return;
30311
30312+ start = ktla_ktva(start);
30313 pr_debug("Set kernel text: %lx - %lx for read write\n",
30314 start, start+size);
30315
30316@@ -920,6 +923,7 @@ void set_kernel_text_ro(void)
30317 if (!kernel_set_to_readonly)
30318 return;
30319
30320+ start = ktla_ktva(start);
30321 pr_debug("Set kernel text: %lx - %lx for read only\n",
30322 start, start+size);
30323
30324@@ -948,6 +952,7 @@ void mark_rodata_ro(void)
30325 unsigned long start = PFN_ALIGN(_text);
30326 unsigned long size = PFN_ALIGN(_etext) - start;
30327
30328+ start = ktla_ktva(start);
30329 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
30330 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
30331 size >> 10);
30332diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
30333index bb00c46..bf91a67 100644
30334--- a/arch/x86/mm/init_64.c
30335+++ b/arch/x86/mm/init_64.c
30336@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
30337 * around without checking the pgd every time.
30338 */
30339
30340-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
30341+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
30342 EXPORT_SYMBOL_GPL(__supported_pte_mask);
30343
30344 int force_personality32;
30345@@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
30346
30347 for (address = start; address <= end; address += PGDIR_SIZE) {
30348 const pgd_t *pgd_ref = pgd_offset_k(address);
30349+
30350+#ifdef CONFIG_PAX_PER_CPU_PGD
30351+ unsigned long cpu;
30352+#else
30353 struct page *page;
30354+#endif
30355
30356 if (pgd_none(*pgd_ref))
30357 continue;
30358
30359 spin_lock(&pgd_lock);
30360+
30361+#ifdef CONFIG_PAX_PER_CPU_PGD
30362+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
30363+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
30364+
30365+ if (pgd_none(*pgd))
30366+ set_pgd(pgd, *pgd_ref);
30367+ else
30368+ BUG_ON(pgd_page_vaddr(*pgd)
30369+ != pgd_page_vaddr(*pgd_ref));
30370+ pgd = pgd_offset_cpu(cpu, kernel, address);
30371+#else
30372 list_for_each_entry(page, &pgd_list, lru) {
30373 pgd_t *pgd;
30374 spinlock_t *pgt_lock;
30375@@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
30376 /* the pgt_lock only for Xen */
30377 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
30378 spin_lock(pgt_lock);
30379+#endif
30380
30381 if (pgd_none(*pgd))
30382 set_pgd(pgd, *pgd_ref);
30383@@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
30384 BUG_ON(pgd_page_vaddr(*pgd)
30385 != pgd_page_vaddr(*pgd_ref));
30386
30387+#ifndef CONFIG_PAX_PER_CPU_PGD
30388 spin_unlock(pgt_lock);
30389+#endif
30390+
30391 }
30392 spin_unlock(&pgd_lock);
30393 }
30394@@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
30395 {
30396 if (pgd_none(*pgd)) {
30397 pud_t *pud = (pud_t *)spp_getpage();
30398- pgd_populate(&init_mm, pgd, pud);
30399+ pgd_populate_kernel(&init_mm, pgd, pud);
30400 if (pud != pud_offset(pgd, 0))
30401 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
30402 pud, pud_offset(pgd, 0));
30403@@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
30404 {
30405 if (pud_none(*pud)) {
30406 pmd_t *pmd = (pmd_t *) spp_getpage();
30407- pud_populate(&init_mm, pud, pmd);
30408+ pud_populate_kernel(&init_mm, pud, pmd);
30409 if (pmd != pmd_offset(pud, 0))
30410 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
30411 pmd, pmd_offset(pud, 0));
30412@@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
30413 pmd = fill_pmd(pud, vaddr);
30414 pte = fill_pte(pmd, vaddr);
30415
30416+ pax_open_kernel();
30417 set_pte(pte, new_pte);
30418+ pax_close_kernel();
30419
30420 /*
30421 * It's enough to flush this one mapping.
30422@@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
30423 pgd = pgd_offset_k((unsigned long)__va(phys));
30424 if (pgd_none(*pgd)) {
30425 pud = (pud_t *) spp_getpage();
30426- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
30427- _PAGE_USER));
30428+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
30429 }
30430 pud = pud_offset(pgd, (unsigned long)__va(phys));
30431 if (pud_none(*pud)) {
30432 pmd = (pmd_t *) spp_getpage();
30433- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
30434- _PAGE_USER));
30435+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
30436 }
30437 pmd = pmd_offset(pud, phys);
30438 BUG_ON(!pmd_none(*pmd));
30439@@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
30440 prot);
30441
30442 spin_lock(&init_mm.page_table_lock);
30443- pud_populate(&init_mm, pud, pmd);
30444+ pud_populate_kernel(&init_mm, pud, pmd);
30445 spin_unlock(&init_mm.page_table_lock);
30446 }
30447 __flush_tlb_all();
30448@@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
30449 page_size_mask);
30450
30451 spin_lock(&init_mm.page_table_lock);
30452- pgd_populate(&init_mm, pgd, pud);
30453+ pgd_populate_kernel(&init_mm, pgd, pud);
30454 spin_unlock(&init_mm.page_table_lock);
30455 pgd_changed = true;
30456 }
30457@@ -1221,8 +1242,8 @@ int kern_addr_valid(unsigned long addr)
30458 static struct vm_area_struct gate_vma = {
30459 .vm_start = VSYSCALL_START,
30460 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
30461- .vm_page_prot = PAGE_READONLY_EXEC,
30462- .vm_flags = VM_READ | VM_EXEC
30463+ .vm_page_prot = PAGE_READONLY,
30464+ .vm_flags = VM_READ
30465 };
30466
30467 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
30468@@ -1256,7 +1277,7 @@ int in_gate_area_no_mm(unsigned long addr)
30469
30470 const char *arch_vma_name(struct vm_area_struct *vma)
30471 {
30472- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
30473+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
30474 return "[vdso]";
30475 if (vma == &gate_vma)
30476 return "[vsyscall]";
30477diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
30478index 7b179b4..6bd17777 100644
30479--- a/arch/x86/mm/iomap_32.c
30480+++ b/arch/x86/mm/iomap_32.c
30481@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
30482 type = kmap_atomic_idx_push();
30483 idx = type + KM_TYPE_NR * smp_processor_id();
30484 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
30485+
30486+ pax_open_kernel();
30487 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
30488+ pax_close_kernel();
30489+
30490 arch_flush_lazy_mmu_mode();
30491
30492 return (void *)vaddr;
30493diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
30494index 9a1e658..da003f3 100644
30495--- a/arch/x86/mm/ioremap.c
30496+++ b/arch/x86/mm/ioremap.c
30497@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
30498 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
30499 int is_ram = page_is_ram(pfn);
30500
30501- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
30502+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
30503 return NULL;
30504 WARN_ON_ONCE(is_ram);
30505 }
30506@@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
30507 *
30508 * Caller must ensure there is only one unmapping for the same pointer.
30509 */
30510-void iounmap(volatile void __iomem *addr)
30511+void iounmap(const volatile void __iomem *addr)
30512 {
30513 struct vm_struct *p, *o;
30514
30515@@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
30516
30517 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
30518 if (page_is_ram(start >> PAGE_SHIFT))
30519+#ifdef CONFIG_HIGHMEM
30520+ if ((start >> PAGE_SHIFT) < max_low_pfn)
30521+#endif
30522 return __va(phys);
30523
30524 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
30525@@ -322,6 +325,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
30526 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
30527 {
30528 if (page_is_ram(phys >> PAGE_SHIFT))
30529+#ifdef CONFIG_HIGHMEM
30530+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
30531+#endif
30532 return;
30533
30534 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
30535@@ -339,7 +345,7 @@ static int __init early_ioremap_debug_setup(char *str)
30536 early_param("early_ioremap_debug", early_ioremap_debug_setup);
30537
30538 static __initdata int after_paging_init;
30539-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
30540+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
30541
30542 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
30543 {
30544@@ -376,8 +382,7 @@ void __init early_ioremap_init(void)
30545 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
30546
30547 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
30548- memset(bm_pte, 0, sizeof(bm_pte));
30549- pmd_populate_kernel(&init_mm, pmd, bm_pte);
30550+ pmd_populate_user(&init_mm, pmd, bm_pte);
30551
30552 /*
30553 * The boot-ioremap range spans multiple pmds, for which
30554diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
30555index d87dd6d..bf3fa66 100644
30556--- a/arch/x86/mm/kmemcheck/kmemcheck.c
30557+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
30558@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
30559 * memory (e.g. tracked pages)? For now, we need this to avoid
30560 * invoking kmemcheck for PnP BIOS calls.
30561 */
30562- if (regs->flags & X86_VM_MASK)
30563+ if (v8086_mode(regs))
30564 return false;
30565- if (regs->cs != __KERNEL_CS)
30566+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
30567 return false;
30568
30569 pte = kmemcheck_pte_lookup(address);
30570diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
30571index c1af323..4758dad 100644
30572--- a/arch/x86/mm/mmap.c
30573+++ b/arch/x86/mm/mmap.c
30574@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
30575 * Leave an at least ~128 MB hole with possible stack randomization.
30576 */
30577 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
30578-#define MAX_GAP (TASK_SIZE/6*5)
30579+#define MAX_GAP (pax_task_size/6*5)
30580
30581 static int mmap_is_legacy(void)
30582 {
30583@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
30584 return rnd << PAGE_SHIFT;
30585 }
30586
30587-static unsigned long mmap_base(void)
30588+static unsigned long mmap_base(struct mm_struct *mm)
30589 {
30590 unsigned long gap = rlimit(RLIMIT_STACK);
30591+ unsigned long pax_task_size = TASK_SIZE;
30592+
30593+#ifdef CONFIG_PAX_SEGMEXEC
30594+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
30595+ pax_task_size = SEGMEXEC_TASK_SIZE;
30596+#endif
30597
30598 if (gap < MIN_GAP)
30599 gap = MIN_GAP;
30600 else if (gap > MAX_GAP)
30601 gap = MAX_GAP;
30602
30603- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
30604+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
30605 }
30606
30607 /*
30608 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
30609 * does, but not when emulating X86_32
30610 */
30611-unsigned long mmap_legacy_base(void)
30612+unsigned long mmap_legacy_base(struct mm_struct *mm)
30613 {
30614- if (mmap_is_ia32())
30615+ if (mmap_is_ia32()) {
30616+
30617+#ifdef CONFIG_PAX_SEGMEXEC
30618+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
30619+ return SEGMEXEC_TASK_UNMAPPED_BASE;
30620+ else
30621+#endif
30622+
30623 return TASK_UNMAPPED_BASE;
30624- else
30625+ } else
30626 return TASK_UNMAPPED_BASE + mmap_rnd();
30627 }
30628
30629@@ -113,11 +126,23 @@ unsigned long mmap_legacy_base(void)
30630 void arch_pick_mmap_layout(struct mm_struct *mm)
30631 {
30632 if (mmap_is_legacy()) {
30633- mm->mmap_base = mmap_legacy_base();
30634+ mm->mmap_base = mmap_legacy_base(mm);
30635+
30636+#ifdef CONFIG_PAX_RANDMMAP
30637+ if (mm->pax_flags & MF_PAX_RANDMMAP)
30638+ mm->mmap_base += mm->delta_mmap;
30639+#endif
30640+
30641 mm->get_unmapped_area = arch_get_unmapped_area;
30642 mm->unmap_area = arch_unmap_area;
30643 } else {
30644- mm->mmap_base = mmap_base();
30645+ mm->mmap_base = mmap_base(mm);
30646+
30647+#ifdef CONFIG_PAX_RANDMMAP
30648+ if (mm->pax_flags & MF_PAX_RANDMMAP)
30649+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
30650+#endif
30651+
30652 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
30653 mm->unmap_area = arch_unmap_area_topdown;
30654 }
30655diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
30656index dc0b727..f612039 100644
30657--- a/arch/x86/mm/mmio-mod.c
30658+++ b/arch/x86/mm/mmio-mod.c
30659@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
30660 break;
30661 default:
30662 {
30663- unsigned char *ip = (unsigned char *)instptr;
30664+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
30665 my_trace->opcode = MMIO_UNKNOWN_OP;
30666 my_trace->width = 0;
30667 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
30668@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
30669 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
30670 void __iomem *addr)
30671 {
30672- static atomic_t next_id;
30673+ static atomic_unchecked_t next_id;
30674 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
30675 /* These are page-unaligned. */
30676 struct mmiotrace_map map = {
30677@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
30678 .private = trace
30679 },
30680 .phys = offset,
30681- .id = atomic_inc_return(&next_id)
30682+ .id = atomic_inc_return_unchecked(&next_id)
30683 };
30684 map.map_id = trace->id;
30685
30686@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
30687 ioremap_trace_core(offset, size, addr);
30688 }
30689
30690-static void iounmap_trace_core(volatile void __iomem *addr)
30691+static void iounmap_trace_core(const volatile void __iomem *addr)
30692 {
30693 struct mmiotrace_map map = {
30694 .phys = 0,
30695@@ -328,7 +328,7 @@ not_enabled:
30696 }
30697 }
30698
30699-void mmiotrace_iounmap(volatile void __iomem *addr)
30700+void mmiotrace_iounmap(const volatile void __iomem *addr)
30701 {
30702 might_sleep();
30703 if (is_enabled()) /* recheck and proper locking in *_core() */
30704diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
30705index a71c4e2..301ae44 100644
30706--- a/arch/x86/mm/numa.c
30707+++ b/arch/x86/mm/numa.c
30708@@ -474,7 +474,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
30709 return true;
30710 }
30711
30712-static int __init numa_register_memblks(struct numa_meminfo *mi)
30713+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
30714 {
30715 unsigned long uninitialized_var(pfn_align);
30716 int i, nid;
30717diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
30718index d0b1773..4c3327c 100644
30719--- a/arch/x86/mm/pageattr-test.c
30720+++ b/arch/x86/mm/pageattr-test.c
30721@@ -36,7 +36,7 @@ enum {
30722
30723 static int pte_testbit(pte_t pte)
30724 {
30725- return pte_flags(pte) & _PAGE_UNUSED1;
30726+ return pte_flags(pte) & _PAGE_CPA_TEST;
30727 }
30728
30729 struct split_state {
30730diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
30731index bb32480..75f2f5e 100644
30732--- a/arch/x86/mm/pageattr.c
30733+++ b/arch/x86/mm/pageattr.c
30734@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
30735 */
30736 #ifdef CONFIG_PCI_BIOS
30737 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
30738- pgprot_val(forbidden) |= _PAGE_NX;
30739+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
30740 #endif
30741
30742 /*
30743@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
30744 * Does not cover __inittext since that is gone later on. On
30745 * 64bit we do not enforce !NX on the low mapping
30746 */
30747- if (within(address, (unsigned long)_text, (unsigned long)_etext))
30748- pgprot_val(forbidden) |= _PAGE_NX;
30749+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
30750+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
30751
30752+#ifdef CONFIG_DEBUG_RODATA
30753 /*
30754 * The .rodata section needs to be read-only. Using the pfn
30755 * catches all aliases.
30756@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
30757 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
30758 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
30759 pgprot_val(forbidden) |= _PAGE_RW;
30760+#endif
30761
30762 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
30763 /*
30764@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
30765 }
30766 #endif
30767
30768+#ifdef CONFIG_PAX_KERNEXEC
30769+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
30770+ pgprot_val(forbidden) |= _PAGE_RW;
30771+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
30772+ }
30773+#endif
30774+
30775 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
30776
30777 return prot;
30778@@ -400,23 +409,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
30779 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
30780 {
30781 /* change init_mm */
30782+ pax_open_kernel();
30783 set_pte_atomic(kpte, pte);
30784+
30785 #ifdef CONFIG_X86_32
30786 if (!SHARED_KERNEL_PMD) {
30787+
30788+#ifdef CONFIG_PAX_PER_CPU_PGD
30789+ unsigned long cpu;
30790+#else
30791 struct page *page;
30792+#endif
30793
30794+#ifdef CONFIG_PAX_PER_CPU_PGD
30795+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
30796+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
30797+#else
30798 list_for_each_entry(page, &pgd_list, lru) {
30799- pgd_t *pgd;
30800+ pgd_t *pgd = (pgd_t *)page_address(page);
30801+#endif
30802+
30803 pud_t *pud;
30804 pmd_t *pmd;
30805
30806- pgd = (pgd_t *)page_address(page) + pgd_index(address);
30807+ pgd += pgd_index(address);
30808 pud = pud_offset(pgd, address);
30809 pmd = pmd_offset(pud, address);
30810 set_pte_atomic((pte_t *)pmd, pte);
30811 }
30812 }
30813 #endif
30814+ pax_close_kernel();
30815 }
30816
30817 static int
30818diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
30819index 6574388..87e9bef 100644
30820--- a/arch/x86/mm/pat.c
30821+++ b/arch/x86/mm/pat.c
30822@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
30823
30824 if (!entry) {
30825 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
30826- current->comm, current->pid, start, end - 1);
30827+ current->comm, task_pid_nr(current), start, end - 1);
30828 return -EINVAL;
30829 }
30830
30831@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
30832
30833 while (cursor < to) {
30834 if (!devmem_is_allowed(pfn)) {
30835- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
30836- current->comm, from, to - 1);
30837+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
30838+ current->comm, from, to - 1, cursor);
30839 return 0;
30840 }
30841 cursor += PAGE_SIZE;
30842@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
30843 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
30844 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
30845 "for [mem %#010Lx-%#010Lx]\n",
30846- current->comm, current->pid,
30847+ current->comm, task_pid_nr(current),
30848 cattr_name(flags),
30849 base, (unsigned long long)(base + size-1));
30850 return -EINVAL;
30851@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
30852 flags = lookup_memtype(paddr);
30853 if (want_flags != flags) {
30854 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
30855- current->comm, current->pid,
30856+ current->comm, task_pid_nr(current),
30857 cattr_name(want_flags),
30858 (unsigned long long)paddr,
30859 (unsigned long long)(paddr + size - 1),
30860@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
30861 free_memtype(paddr, paddr + size);
30862 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
30863 " for [mem %#010Lx-%#010Lx], got %s\n",
30864- current->comm, current->pid,
30865+ current->comm, task_pid_nr(current),
30866 cattr_name(want_flags),
30867 (unsigned long long)paddr,
30868 (unsigned long long)(paddr + size - 1),
30869diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
30870index 415f6c4..d319983 100644
30871--- a/arch/x86/mm/pat_rbtree.c
30872+++ b/arch/x86/mm/pat_rbtree.c
30873@@ -160,7 +160,7 @@ success:
30874
30875 failure:
30876 printk(KERN_INFO "%s:%d conflicting memory types "
30877- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
30878+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
30879 end, cattr_name(found_type), cattr_name(match->type));
30880 return -EBUSY;
30881 }
30882diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
30883index 9f0614d..92ae64a 100644
30884--- a/arch/x86/mm/pf_in.c
30885+++ b/arch/x86/mm/pf_in.c
30886@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
30887 int i;
30888 enum reason_type rv = OTHERS;
30889
30890- p = (unsigned char *)ins_addr;
30891+ p = (unsigned char *)ktla_ktva(ins_addr);
30892 p += skip_prefix(p, &prf);
30893 p += get_opcode(p, &opcode);
30894
30895@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
30896 struct prefix_bits prf;
30897 int i;
30898
30899- p = (unsigned char *)ins_addr;
30900+ p = (unsigned char *)ktla_ktva(ins_addr);
30901 p += skip_prefix(p, &prf);
30902 p += get_opcode(p, &opcode);
30903
30904@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
30905 struct prefix_bits prf;
30906 int i;
30907
30908- p = (unsigned char *)ins_addr;
30909+ p = (unsigned char *)ktla_ktva(ins_addr);
30910 p += skip_prefix(p, &prf);
30911 p += get_opcode(p, &opcode);
30912
30913@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
30914 struct prefix_bits prf;
30915 int i;
30916
30917- p = (unsigned char *)ins_addr;
30918+ p = (unsigned char *)ktla_ktva(ins_addr);
30919 p += skip_prefix(p, &prf);
30920 p += get_opcode(p, &opcode);
30921 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
30922@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
30923 struct prefix_bits prf;
30924 int i;
30925
30926- p = (unsigned char *)ins_addr;
30927+ p = (unsigned char *)ktla_ktva(ins_addr);
30928 p += skip_prefix(p, &prf);
30929 p += get_opcode(p, &opcode);
30930 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
30931diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
30932index 17fda6a..f7d54a0 100644
30933--- a/arch/x86/mm/pgtable.c
30934+++ b/arch/x86/mm/pgtable.c
30935@@ -91,10 +91,67 @@ static inline void pgd_list_del(pgd_t *pgd)
30936 list_del(&page->lru);
30937 }
30938
30939-#define UNSHARED_PTRS_PER_PGD \
30940- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
30941+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30942+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
30943
30944+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
30945+{
30946+ unsigned int count = USER_PGD_PTRS;
30947
30948+ if (!pax_user_shadow_base)
30949+ return;
30950+
30951+ while (count--)
30952+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
30953+}
30954+#endif
30955+
30956+#ifdef CONFIG_PAX_PER_CPU_PGD
30957+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
30958+{
30959+ unsigned int count = USER_PGD_PTRS;
30960+
30961+ while (count--) {
30962+ pgd_t pgd;
30963+
30964+#ifdef CONFIG_X86_64
30965+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
30966+#else
30967+ pgd = *src++;
30968+#endif
30969+
30970+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30971+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
30972+#endif
30973+
30974+ *dst++ = pgd;
30975+ }
30976+
30977+}
30978+#endif
30979+
30980+#ifdef CONFIG_X86_64
30981+#define pxd_t pud_t
30982+#define pyd_t pgd_t
30983+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
30984+#define pxd_free(mm, pud) pud_free((mm), (pud))
30985+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
30986+#define pyd_offset(mm, address) pgd_offset((mm), (address))
30987+#define PYD_SIZE PGDIR_SIZE
30988+#else
30989+#define pxd_t pmd_t
30990+#define pyd_t pud_t
30991+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
30992+#define pxd_free(mm, pud) pmd_free((mm), (pud))
30993+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
30994+#define pyd_offset(mm, address) pud_offset((mm), (address))
30995+#define PYD_SIZE PUD_SIZE
30996+#endif
30997+
30998+#ifdef CONFIG_PAX_PER_CPU_PGD
30999+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
31000+static inline void pgd_dtor(pgd_t *pgd) {}
31001+#else
31002 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
31003 {
31004 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
31005@@ -135,6 +192,7 @@ static void pgd_dtor(pgd_t *pgd)
31006 pgd_list_del(pgd);
31007 spin_unlock(&pgd_lock);
31008 }
31009+#endif
31010
31011 /*
31012 * List of all pgd's needed for non-PAE so it can invalidate entries
31013@@ -147,7 +205,7 @@ static void pgd_dtor(pgd_t *pgd)
31014 * -- nyc
31015 */
31016
31017-#ifdef CONFIG_X86_PAE
31018+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
31019 /*
31020 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
31021 * updating the top-level pagetable entries to guarantee the
31022@@ -159,7 +217,7 @@ static void pgd_dtor(pgd_t *pgd)
31023 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
31024 * and initialize the kernel pmds here.
31025 */
31026-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
31027+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
31028
31029 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
31030 {
31031@@ -177,36 +235,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
31032 */
31033 flush_tlb_mm(mm);
31034 }
31035+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
31036+#define PREALLOCATED_PXDS USER_PGD_PTRS
31037 #else /* !CONFIG_X86_PAE */
31038
31039 /* No need to prepopulate any pagetable entries in non-PAE modes. */
31040-#define PREALLOCATED_PMDS 0
31041+#define PREALLOCATED_PXDS 0
31042
31043 #endif /* CONFIG_X86_PAE */
31044
31045-static void free_pmds(pmd_t *pmds[])
31046+static void free_pxds(pxd_t *pxds[])
31047 {
31048 int i;
31049
31050- for(i = 0; i < PREALLOCATED_PMDS; i++)
31051- if (pmds[i])
31052- free_page((unsigned long)pmds[i]);
31053+ for(i = 0; i < PREALLOCATED_PXDS; i++)
31054+ if (pxds[i])
31055+ free_page((unsigned long)pxds[i]);
31056 }
31057
31058-static int preallocate_pmds(pmd_t *pmds[])
31059+static int preallocate_pxds(pxd_t *pxds[])
31060 {
31061 int i;
31062 bool failed = false;
31063
31064- for(i = 0; i < PREALLOCATED_PMDS; i++) {
31065- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
31066- if (pmd == NULL)
31067+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
31068+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
31069+ if (pxd == NULL)
31070 failed = true;
31071- pmds[i] = pmd;
31072+ pxds[i] = pxd;
31073 }
31074
31075 if (failed) {
31076- free_pmds(pmds);
31077+ free_pxds(pxds);
31078 return -ENOMEM;
31079 }
31080
31081@@ -219,51 +279,55 @@ static int preallocate_pmds(pmd_t *pmds[])
31082 * preallocate which never got a corresponding vma will need to be
31083 * freed manually.
31084 */
31085-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
31086+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
31087 {
31088 int i;
31089
31090- for(i = 0; i < PREALLOCATED_PMDS; i++) {
31091+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
31092 pgd_t pgd = pgdp[i];
31093
31094 if (pgd_val(pgd) != 0) {
31095- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
31096+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
31097
31098- pgdp[i] = native_make_pgd(0);
31099+ set_pgd(pgdp + i, native_make_pgd(0));
31100
31101- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
31102- pmd_free(mm, pmd);
31103+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
31104+ pxd_free(mm, pxd);
31105 }
31106 }
31107 }
31108
31109-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
31110+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
31111 {
31112- pud_t *pud;
31113+ pyd_t *pyd;
31114 unsigned long addr;
31115 int i;
31116
31117- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
31118+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
31119 return;
31120
31121- pud = pud_offset(pgd, 0);
31122+#ifdef CONFIG_X86_64
31123+ pyd = pyd_offset(mm, 0L);
31124+#else
31125+ pyd = pyd_offset(pgd, 0L);
31126+#endif
31127
31128- for (addr = i = 0; i < PREALLOCATED_PMDS;
31129- i++, pud++, addr += PUD_SIZE) {
31130- pmd_t *pmd = pmds[i];
31131+ for (addr = i = 0; i < PREALLOCATED_PXDS;
31132+ i++, pyd++, addr += PYD_SIZE) {
31133+ pxd_t *pxd = pxds[i];
31134
31135 if (i >= KERNEL_PGD_BOUNDARY)
31136- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
31137- sizeof(pmd_t) * PTRS_PER_PMD);
31138+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
31139+ sizeof(pxd_t) * PTRS_PER_PMD);
31140
31141- pud_populate(mm, pud, pmd);
31142+ pyd_populate(mm, pyd, pxd);
31143 }
31144 }
31145
31146 pgd_t *pgd_alloc(struct mm_struct *mm)
31147 {
31148 pgd_t *pgd;
31149- pmd_t *pmds[PREALLOCATED_PMDS];
31150+ pxd_t *pxds[PREALLOCATED_PXDS];
31151
31152 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
31153
31154@@ -272,11 +336,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
31155
31156 mm->pgd = pgd;
31157
31158- if (preallocate_pmds(pmds) != 0)
31159+ if (preallocate_pxds(pxds) != 0)
31160 goto out_free_pgd;
31161
31162 if (paravirt_pgd_alloc(mm) != 0)
31163- goto out_free_pmds;
31164+ goto out_free_pxds;
31165
31166 /*
31167 * Make sure that pre-populating the pmds is atomic with
31168@@ -286,14 +350,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
31169 spin_lock(&pgd_lock);
31170
31171 pgd_ctor(mm, pgd);
31172- pgd_prepopulate_pmd(mm, pgd, pmds);
31173+ pgd_prepopulate_pxd(mm, pgd, pxds);
31174
31175 spin_unlock(&pgd_lock);
31176
31177 return pgd;
31178
31179-out_free_pmds:
31180- free_pmds(pmds);
31181+out_free_pxds:
31182+ free_pxds(pxds);
31183 out_free_pgd:
31184 free_page((unsigned long)pgd);
31185 out:
31186@@ -302,7 +366,7 @@ out:
31187
31188 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
31189 {
31190- pgd_mop_up_pmds(mm, pgd);
31191+ pgd_mop_up_pxds(mm, pgd);
31192 pgd_dtor(pgd);
31193 paravirt_pgd_free(mm, pgd);
31194 free_page((unsigned long)pgd);
31195diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
31196index a69bcb8..19068ab 100644
31197--- a/arch/x86/mm/pgtable_32.c
31198+++ b/arch/x86/mm/pgtable_32.c
31199@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
31200 return;
31201 }
31202 pte = pte_offset_kernel(pmd, vaddr);
31203+
31204+ pax_open_kernel();
31205 if (pte_val(pteval))
31206 set_pte_at(&init_mm, vaddr, pte, pteval);
31207 else
31208 pte_clear(&init_mm, vaddr, pte);
31209+ pax_close_kernel();
31210
31211 /*
31212 * It's enough to flush this one mapping.
31213diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
31214index e666cbb..61788c45 100644
31215--- a/arch/x86/mm/physaddr.c
31216+++ b/arch/x86/mm/physaddr.c
31217@@ -10,7 +10,7 @@
31218 #ifdef CONFIG_X86_64
31219
31220 #ifdef CONFIG_DEBUG_VIRTUAL
31221-unsigned long __phys_addr(unsigned long x)
31222+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
31223 {
31224 unsigned long y = x - __START_KERNEL_map;
31225
31226@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
31227 #else
31228
31229 #ifdef CONFIG_DEBUG_VIRTUAL
31230-unsigned long __phys_addr(unsigned long x)
31231+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
31232 {
31233 unsigned long phys_addr = x - PAGE_OFFSET;
31234 /* VMALLOC_* aren't constants */
31235diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
31236index 410531d..0f16030 100644
31237--- a/arch/x86/mm/setup_nx.c
31238+++ b/arch/x86/mm/setup_nx.c
31239@@ -5,8 +5,10 @@
31240 #include <asm/pgtable.h>
31241 #include <asm/proto.h>
31242
31243+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
31244 static int disable_nx __cpuinitdata;
31245
31246+#ifndef CONFIG_PAX_PAGEEXEC
31247 /*
31248 * noexec = on|off
31249 *
31250@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
31251 return 0;
31252 }
31253 early_param("noexec", noexec_setup);
31254+#endif
31255+
31256+#endif
31257
31258 void __cpuinit x86_configure_nx(void)
31259 {
31260+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
31261 if (cpu_has_nx && !disable_nx)
31262 __supported_pte_mask |= _PAGE_NX;
31263 else
31264+#endif
31265 __supported_pte_mask &= ~_PAGE_NX;
31266 }
31267
31268diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
31269index 282375f..e03a98f 100644
31270--- a/arch/x86/mm/tlb.c
31271+++ b/arch/x86/mm/tlb.c
31272@@ -48,7 +48,11 @@ void leave_mm(int cpu)
31273 BUG();
31274 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
31275 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
31276+
31277+#ifndef CONFIG_PAX_PER_CPU_PGD
31278 load_cr3(swapper_pg_dir);
31279+#endif
31280+
31281 }
31282 }
31283 EXPORT_SYMBOL_GPL(leave_mm);
31284diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
31285new file mode 100644
31286index 0000000..dace51c
31287--- /dev/null
31288+++ b/arch/x86/mm/uderef_64.c
31289@@ -0,0 +1,37 @@
31290+#include <linux/mm.h>
31291+#include <asm/pgtable.h>
31292+#include <asm/uaccess.h>
31293+
31294+#ifdef CONFIG_PAX_MEMORY_UDEREF
31295+/* PaX: due to the special call convention these functions must
31296+ * - remain leaf functions under all configurations,
31297+ * - never be called directly, only dereferenced from the wrappers.
31298+ */
31299+void __pax_open_userland(void)
31300+{
31301+ unsigned int cpu;
31302+
31303+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
31304+ return;
31305+
31306+ cpu = raw_get_cpu();
31307+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
31308+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
31309+ raw_put_cpu_no_resched();
31310+}
31311+EXPORT_SYMBOL(__pax_open_userland);
31312+
31313+void __pax_close_userland(void)
31314+{
31315+ unsigned int cpu;
31316+
31317+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
31318+ return;
31319+
31320+ cpu = raw_get_cpu();
31321+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
31322+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
31323+ raw_put_cpu_no_resched();
31324+}
31325+EXPORT_SYMBOL(__pax_close_userland);
31326+#endif
31327diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
31328index 877b9a1..a8ecf42 100644
31329--- a/arch/x86/net/bpf_jit.S
31330+++ b/arch/x86/net/bpf_jit.S
31331@@ -9,6 +9,7 @@
31332 */
31333 #include <linux/linkage.h>
31334 #include <asm/dwarf2.h>
31335+#include <asm/alternative-asm.h>
31336
31337 /*
31338 * Calling convention :
31339@@ -35,6 +36,7 @@ sk_load_word_positive_offset:
31340 jle bpf_slow_path_word
31341 mov (SKBDATA,%rsi),%eax
31342 bswap %eax /* ntohl() */
31343+ pax_force_retaddr
31344 ret
31345
31346 sk_load_half:
31347@@ -52,6 +54,7 @@ sk_load_half_positive_offset:
31348 jle bpf_slow_path_half
31349 movzwl (SKBDATA,%rsi),%eax
31350 rol $8,%ax # ntohs()
31351+ pax_force_retaddr
31352 ret
31353
31354 sk_load_byte:
31355@@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
31356 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
31357 jle bpf_slow_path_byte
31358 movzbl (SKBDATA,%rsi),%eax
31359+ pax_force_retaddr
31360 ret
31361
31362 /**
31363@@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
31364 movzbl (SKBDATA,%rsi),%ebx
31365 and $15,%bl
31366 shl $2,%bl
31367+ pax_force_retaddr
31368 ret
31369
31370 /* rsi contains offset and can be scratched */
31371@@ -109,6 +114,7 @@ bpf_slow_path_word:
31372 js bpf_error
31373 mov -12(%rbp),%eax
31374 bswap %eax
31375+ pax_force_retaddr
31376 ret
31377
31378 bpf_slow_path_half:
31379@@ -117,12 +123,14 @@ bpf_slow_path_half:
31380 mov -12(%rbp),%ax
31381 rol $8,%ax
31382 movzwl %ax,%eax
31383+ pax_force_retaddr
31384 ret
31385
31386 bpf_slow_path_byte:
31387 bpf_slow_path_common(1)
31388 js bpf_error
31389 movzbl -12(%rbp),%eax
31390+ pax_force_retaddr
31391 ret
31392
31393 bpf_slow_path_byte_msh:
31394@@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
31395 and $15,%al
31396 shl $2,%al
31397 xchg %eax,%ebx
31398+ pax_force_retaddr
31399 ret
31400
31401 #define sk_negative_common(SIZE) \
31402@@ -157,6 +166,7 @@ sk_load_word_negative_offset:
31403 sk_negative_common(4)
31404 mov (%rax), %eax
31405 bswap %eax
31406+ pax_force_retaddr
31407 ret
31408
31409 bpf_slow_path_half_neg:
31410@@ -168,6 +178,7 @@ sk_load_half_negative_offset:
31411 mov (%rax),%ax
31412 rol $8,%ax
31413 movzwl %ax,%eax
31414+ pax_force_retaddr
31415 ret
31416
31417 bpf_slow_path_byte_neg:
31418@@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
31419 .globl sk_load_byte_negative_offset
31420 sk_negative_common(1)
31421 movzbl (%rax), %eax
31422+ pax_force_retaddr
31423 ret
31424
31425 bpf_slow_path_byte_msh_neg:
31426@@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
31427 and $15,%al
31428 shl $2,%al
31429 xchg %eax,%ebx
31430+ pax_force_retaddr
31431 ret
31432
31433 bpf_error:
31434@@ -197,4 +210,5 @@ bpf_error:
31435 xor %eax,%eax
31436 mov -8(%rbp),%rbx
31437 leaveq
31438+ pax_force_retaddr
31439 ret
31440diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
31441index f66b540..3e88dfb 100644
31442--- a/arch/x86/net/bpf_jit_comp.c
31443+++ b/arch/x86/net/bpf_jit_comp.c
31444@@ -12,6 +12,7 @@
31445 #include <linux/netdevice.h>
31446 #include <linux/filter.h>
31447 #include <linux/if_vlan.h>
31448+#include <linux/random.h>
31449
31450 /*
31451 * Conventions :
31452@@ -49,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
31453 return ptr + len;
31454 }
31455
31456+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31457+#define MAX_INSTR_CODE_SIZE 96
31458+#else
31459+#define MAX_INSTR_CODE_SIZE 64
31460+#endif
31461+
31462 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
31463
31464 #define EMIT1(b1) EMIT(b1, 1)
31465 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
31466 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
31467 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
31468+
31469+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31470+/* original constant will appear in ecx */
31471+#define DILUTE_CONST_SEQUENCE(_off, _key) \
31472+do { \
31473+ /* mov ecx, randkey */ \
31474+ EMIT1(0xb9); \
31475+ EMIT(_key, 4); \
31476+ /* xor ecx, randkey ^ off */ \
31477+ EMIT2(0x81, 0xf1); \
31478+ EMIT((_key) ^ (_off), 4); \
31479+} while (0)
31480+
31481+#define EMIT1_off32(b1, _off) \
31482+do { \
31483+ switch (b1) { \
31484+ case 0x05: /* add eax, imm32 */ \
31485+ case 0x2d: /* sub eax, imm32 */ \
31486+ case 0x25: /* and eax, imm32 */ \
31487+ case 0x0d: /* or eax, imm32 */ \
31488+ case 0xb8: /* mov eax, imm32 */ \
31489+ case 0x35: /* xor eax, imm32 */ \
31490+ case 0x3d: /* cmp eax, imm32 */ \
31491+ case 0xa9: /* test eax, imm32 */ \
31492+ DILUTE_CONST_SEQUENCE(_off, randkey); \
31493+ EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
31494+ break; \
31495+ case 0xbb: /* mov ebx, imm32 */ \
31496+ DILUTE_CONST_SEQUENCE(_off, randkey); \
31497+ /* mov ebx, ecx */ \
31498+ EMIT2(0x89, 0xcb); \
31499+ break; \
31500+ case 0xbe: /* mov esi, imm32 */ \
31501+ DILUTE_CONST_SEQUENCE(_off, randkey); \
31502+ /* mov esi, ecx */ \
31503+ EMIT2(0x89, 0xce); \
31504+ break; \
31505+ case 0xe8: /* call rel imm32, always to known funcs */ \
31506+ EMIT1(b1); \
31507+ EMIT(_off, 4); \
31508+ break; \
31509+ case 0xe9: /* jmp rel imm32 */ \
31510+ EMIT1(b1); \
31511+ EMIT(_off, 4); \
31512+ /* prevent fall-through, we're not called if off = 0 */ \
31513+ EMIT(0xcccccccc, 4); \
31514+ EMIT(0xcccccccc, 4); \
31515+ break; \
31516+ default: \
31517+ BUILD_BUG(); \
31518+ } \
31519+} while (0)
31520+
31521+#define EMIT2_off32(b1, b2, _off) \
31522+do { \
31523+ if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
31524+ EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
31525+ EMIT(randkey, 4); \
31526+ EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
31527+ EMIT((_off) - randkey, 4); \
31528+ } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
31529+ DILUTE_CONST_SEQUENCE(_off, randkey); \
31530+ /* imul eax, ecx */ \
31531+ EMIT3(0x0f, 0xaf, 0xc1); \
31532+ } else { \
31533+ BUILD_BUG(); \
31534+ } \
31535+} while (0)
31536+#else
31537 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
31538+#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
31539+#endif
31540
31541 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
31542 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
31543@@ -90,6 +168,24 @@ do { \
31544 #define X86_JBE 0x76
31545 #define X86_JA 0x77
31546
31547+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31548+#define APPEND_FLOW_VERIFY() \
31549+do { \
31550+ /* mov ecx, randkey */ \
31551+ EMIT1(0xb9); \
31552+ EMIT(randkey, 4); \
31553+ /* cmp ecx, randkey */ \
31554+ EMIT2(0x81, 0xf9); \
31555+ EMIT(randkey, 4); \
31556+ /* jz after 8 int 3s */ \
31557+ EMIT2(0x74, 0x08); \
31558+ EMIT(0xcccccccc, 4); \
31559+ EMIT(0xcccccccc, 4); \
31560+} while (0)
31561+#else
31562+#define APPEND_FLOW_VERIFY() do { } while (0)
31563+#endif
31564+
31565 #define EMIT_COND_JMP(op, offset) \
31566 do { \
31567 if (is_near(offset)) \
31568@@ -97,6 +193,7 @@ do { \
31569 else { \
31570 EMIT2(0x0f, op + 0x10); \
31571 EMIT(offset, 4); /* jxx .+off32 */ \
31572+ APPEND_FLOW_VERIFY(); \
31573 } \
31574 } while (0)
31575
31576@@ -121,6 +218,11 @@ static inline void bpf_flush_icache(void *start, void *end)
31577 set_fs(old_fs);
31578 }
31579
31580+struct bpf_jit_work {
31581+ struct work_struct work;
31582+ void *image;
31583+};
31584+
31585 #define CHOOSE_LOAD_FUNC(K, func) \
31586 ((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset)
31587
31588@@ -146,7 +248,7 @@ static int pkt_type_offset(void)
31589
31590 void bpf_jit_compile(struct sk_filter *fp)
31591 {
31592- u8 temp[64];
31593+ u8 temp[MAX_INSTR_CODE_SIZE];
31594 u8 *prog;
31595 unsigned int proglen, oldproglen = 0;
31596 int ilen, i;
31597@@ -159,6 +261,9 @@ void bpf_jit_compile(struct sk_filter *fp)
31598 unsigned int *addrs;
31599 const struct sock_filter *filter = fp->insns;
31600 int flen = fp->len;
31601+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31602+ unsigned int randkey;
31603+#endif
31604
31605 if (!bpf_jit_enable)
31606 return;
31607@@ -167,11 +272,19 @@ void bpf_jit_compile(struct sk_filter *fp)
31608 if (addrs == NULL)
31609 return;
31610
31611+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
31612+ if (!fp->work)
31613+ goto out;
31614+
31615+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31616+ randkey = get_random_int();
31617+#endif
31618+
31619 /* Before first pass, make a rough estimation of addrs[]
31620- * each bpf instruction is translated to less than 64 bytes
31621+ * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
31622 */
31623 for (proglen = 0, i = 0; i < flen; i++) {
31624- proglen += 64;
31625+ proglen += MAX_INSTR_CODE_SIZE;
31626 addrs[i] = proglen;
31627 }
31628 cleanup_addr = proglen; /* epilogue address */
31629@@ -282,10 +395,8 @@ void bpf_jit_compile(struct sk_filter *fp)
31630 case BPF_S_ALU_MUL_K: /* A *= K */
31631 if (is_imm8(K))
31632 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
31633- else {
31634- EMIT2(0x69, 0xc0); /* imul imm32,%eax */
31635- EMIT(K, 4);
31636- }
31637+ else
31638+ EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
31639 break;
31640 case BPF_S_ALU_DIV_X: /* A /= X; */
31641 seen |= SEEN_XREG;
31642@@ -325,13 +436,23 @@ void bpf_jit_compile(struct sk_filter *fp)
31643 break;
31644 case BPF_S_ALU_MOD_K: /* A %= K; */
31645 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
31646+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31647+ DILUTE_CONST_SEQUENCE(K, randkey);
31648+#else
31649 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
31650+#endif
31651 EMIT2(0xf7, 0xf1); /* div %ecx */
31652 EMIT2(0x89, 0xd0); /* mov %edx,%eax */
31653 break;
31654 case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
31655+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
31656+ DILUTE_CONST_SEQUENCE(K, randkey);
31657+ // imul rax, rcx
31658+ EMIT4(0x48, 0x0f, 0xaf, 0xc1);
31659+#else
31660 EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
31661 EMIT(K, 4);
31662+#endif
31663 EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
31664 break;
31665 case BPF_S_ALU_AND_X:
31666@@ -602,8 +723,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
31667 if (is_imm8(K)) {
31668 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
31669 } else {
31670- EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
31671- EMIT(K, 4);
31672+ EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
31673 }
31674 } else {
31675 EMIT2(0x89,0xde); /* mov %ebx,%esi */
31676@@ -686,17 +806,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
31677 break;
31678 default:
31679 /* hmm, too complex filter, give up with jit compiler */
31680- goto out;
31681+ goto error;
31682 }
31683 ilen = prog - temp;
31684 if (image) {
31685 if (unlikely(proglen + ilen > oldproglen)) {
31686 pr_err("bpb_jit_compile fatal error\n");
31687- kfree(addrs);
31688- module_free(NULL, image);
31689- return;
31690+ module_free_exec(NULL, image);
31691+ goto error;
31692 }
31693+ pax_open_kernel();
31694 memcpy(image + proglen, temp, ilen);
31695+ pax_close_kernel();
31696 }
31697 proglen += ilen;
31698 addrs[i] = proglen;
31699@@ -717,11 +838,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
31700 break;
31701 }
31702 if (proglen == oldproglen) {
31703- image = module_alloc(max_t(unsigned int,
31704- proglen,
31705- sizeof(struct work_struct)));
31706+ image = module_alloc_exec(proglen);
31707 if (!image)
31708- goto out;
31709+ goto error;
31710 }
31711 oldproglen = proglen;
31712 }
31713@@ -732,7 +851,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
31714 if (image) {
31715 bpf_flush_icache(image, image + proglen);
31716 fp->bpf_func = (void *)image;
31717- }
31718+ } else
31719+error:
31720+ kfree(fp->work);
31721+
31722 out:
31723 kfree(addrs);
31724 return;
31725@@ -740,18 +862,20 @@ out:
31726
31727 static void jit_free_defer(struct work_struct *arg)
31728 {
31729- module_free(NULL, arg);
31730+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
31731+ kfree(arg);
31732 }
31733
31734 /* run from softirq, we must use a work_struct to call
31735- * module_free() from process context
31736+ * module_free_exec() from process context
31737 */
31738 void bpf_jit_free(struct sk_filter *fp)
31739 {
31740 if (fp->bpf_func != sk_run_filter) {
31741- struct work_struct *work = (struct work_struct *)fp->bpf_func;
31742+ struct work_struct *work = &fp->work->work;
31743
31744 INIT_WORK(work, jit_free_defer);
31745+ fp->work->image = fp->bpf_func;
31746 schedule_work(work);
31747 }
31748 }
31749diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
31750index d6aa6e8..266395a 100644
31751--- a/arch/x86/oprofile/backtrace.c
31752+++ b/arch/x86/oprofile/backtrace.c
31753@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
31754 struct stack_frame_ia32 *fp;
31755 unsigned long bytes;
31756
31757- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
31758+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
31759 if (bytes != sizeof(bufhead))
31760 return NULL;
31761
31762- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
31763+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
31764
31765 oprofile_add_trace(bufhead[0].return_address);
31766
31767@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
31768 struct stack_frame bufhead[2];
31769 unsigned long bytes;
31770
31771- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
31772+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
31773 if (bytes != sizeof(bufhead))
31774 return NULL;
31775
31776@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
31777 {
31778 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
31779
31780- if (!user_mode_vm(regs)) {
31781+ if (!user_mode(regs)) {
31782 unsigned long stack = kernel_stack_pointer(regs);
31783 if (depth)
31784 dump_trace(NULL, regs, (unsigned long *)stack, 0,
31785diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
31786index 48768df..ba9143c 100644
31787--- a/arch/x86/oprofile/nmi_int.c
31788+++ b/arch/x86/oprofile/nmi_int.c
31789@@ -23,6 +23,7 @@
31790 #include <asm/nmi.h>
31791 #include <asm/msr.h>
31792 #include <asm/apic.h>
31793+#include <asm/pgtable.h>
31794
31795 #include "op_counter.h"
31796 #include "op_x86_model.h"
31797@@ -774,8 +775,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
31798 if (ret)
31799 return ret;
31800
31801- if (!model->num_virt_counters)
31802- model->num_virt_counters = model->num_counters;
31803+ if (!model->num_virt_counters) {
31804+ pax_open_kernel();
31805+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
31806+ pax_close_kernel();
31807+ }
31808
31809 mux_init(ops);
31810
31811diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
31812index b2b9443..be58856 100644
31813--- a/arch/x86/oprofile/op_model_amd.c
31814+++ b/arch/x86/oprofile/op_model_amd.c
31815@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
31816 num_counters = AMD64_NUM_COUNTERS;
31817 }
31818
31819- op_amd_spec.num_counters = num_counters;
31820- op_amd_spec.num_controls = num_counters;
31821- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
31822+ pax_open_kernel();
31823+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
31824+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
31825+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
31826+ pax_close_kernel();
31827
31828 return 0;
31829 }
31830diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
31831index d90528e..0127e2b 100644
31832--- a/arch/x86/oprofile/op_model_ppro.c
31833+++ b/arch/x86/oprofile/op_model_ppro.c
31834@@ -19,6 +19,7 @@
31835 #include <asm/msr.h>
31836 #include <asm/apic.h>
31837 #include <asm/nmi.h>
31838+#include <asm/pgtable.h>
31839
31840 #include "op_x86_model.h"
31841 #include "op_counter.h"
31842@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
31843
31844 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
31845
31846- op_arch_perfmon_spec.num_counters = num_counters;
31847- op_arch_perfmon_spec.num_controls = num_counters;
31848+ pax_open_kernel();
31849+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
31850+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
31851+ pax_close_kernel();
31852 }
31853
31854 static int arch_perfmon_init(struct oprofile_operations *ignore)
31855diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
31856index 71e8a67..6a313bb 100644
31857--- a/arch/x86/oprofile/op_x86_model.h
31858+++ b/arch/x86/oprofile/op_x86_model.h
31859@@ -52,7 +52,7 @@ struct op_x86_model_spec {
31860 void (*switch_ctrl)(struct op_x86_model_spec const *model,
31861 struct op_msrs const * const msrs);
31862 #endif
31863-};
31864+} __do_const;
31865
31866 struct op_counter_config;
31867
31868diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
31869index e9e6ed5..e47ae67 100644
31870--- a/arch/x86/pci/amd_bus.c
31871+++ b/arch/x86/pci/amd_bus.c
31872@@ -337,7 +337,7 @@ static int __cpuinit amd_cpu_notify(struct notifier_block *self,
31873 return NOTIFY_OK;
31874 }
31875
31876-static struct notifier_block __cpuinitdata amd_cpu_notifier = {
31877+static struct notifier_block amd_cpu_notifier = {
31878 .notifier_call = amd_cpu_notify,
31879 };
31880
31881diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
31882index 372e9b8..e775a6c 100644
31883--- a/arch/x86/pci/irq.c
31884+++ b/arch/x86/pci/irq.c
31885@@ -50,7 +50,7 @@ struct irq_router {
31886 struct irq_router_handler {
31887 u16 vendor;
31888 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
31889-};
31890+} __do_const;
31891
31892 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
31893 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
31894@@ -794,7 +794,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
31895 return 0;
31896 }
31897
31898-static __initdata struct irq_router_handler pirq_routers[] = {
31899+static __initconst const struct irq_router_handler pirq_routers[] = {
31900 { PCI_VENDOR_ID_INTEL, intel_router_probe },
31901 { PCI_VENDOR_ID_AL, ali_router_probe },
31902 { PCI_VENDOR_ID_ITE, ite_router_probe },
31903@@ -821,7 +821,7 @@ static struct pci_dev *pirq_router_dev;
31904 static void __init pirq_find_router(struct irq_router *r)
31905 {
31906 struct irq_routing_table *rt = pirq_table;
31907- struct irq_router_handler *h;
31908+ const struct irq_router_handler *h;
31909
31910 #ifdef CONFIG_PCI_BIOS
31911 if (!rt->signature) {
31912@@ -1094,7 +1094,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
31913 return 0;
31914 }
31915
31916-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
31917+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
31918 {
31919 .callback = fix_broken_hp_bios_irq9,
31920 .ident = "HP Pavilion N5400 Series Laptop",
31921diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
31922index 6eb18c4..20d83de 100644
31923--- a/arch/x86/pci/mrst.c
31924+++ b/arch/x86/pci/mrst.c
31925@@ -238,7 +238,9 @@ int __init pci_mrst_init(void)
31926 printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n");
31927 pci_mmcfg_late_init();
31928 pcibios_enable_irq = mrst_pci_irq_enable;
31929- pci_root_ops = pci_mrst_ops;
31930+ pax_open_kernel();
31931+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
31932+ pax_close_kernel();
31933 pci_soc_mode = 1;
31934 /* Continue with standard init */
31935 return 1;
31936diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
31937index c77b24a..c979855 100644
31938--- a/arch/x86/pci/pcbios.c
31939+++ b/arch/x86/pci/pcbios.c
31940@@ -79,7 +79,7 @@ union bios32 {
31941 static struct {
31942 unsigned long address;
31943 unsigned short segment;
31944-} bios32_indirect = { 0, __KERNEL_CS };
31945+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
31946
31947 /*
31948 * Returns the entry point for the given service, NULL on error
31949@@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
31950 unsigned long length; /* %ecx */
31951 unsigned long entry; /* %edx */
31952 unsigned long flags;
31953+ struct desc_struct d, *gdt;
31954
31955 local_irq_save(flags);
31956- __asm__("lcall *(%%edi); cld"
31957+
31958+ gdt = get_cpu_gdt_table(smp_processor_id());
31959+
31960+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
31961+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
31962+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
31963+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
31964+
31965+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
31966 : "=a" (return_code),
31967 "=b" (address),
31968 "=c" (length),
31969 "=d" (entry)
31970 : "0" (service),
31971 "1" (0),
31972- "D" (&bios32_indirect));
31973+ "D" (&bios32_indirect),
31974+ "r"(__PCIBIOS_DS)
31975+ : "memory");
31976+
31977+ pax_open_kernel();
31978+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
31979+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
31980+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
31981+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
31982+ pax_close_kernel();
31983+
31984 local_irq_restore(flags);
31985
31986 switch (return_code) {
31987- case 0:
31988- return address + entry;
31989- case 0x80: /* Not present */
31990- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
31991- return 0;
31992- default: /* Shouldn't happen */
31993- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
31994- service, return_code);
31995+ case 0: {
31996+ int cpu;
31997+ unsigned char flags;
31998+
31999+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
32000+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
32001+ printk(KERN_WARNING "bios32_service: not valid\n");
32002 return 0;
32003+ }
32004+ address = address + PAGE_OFFSET;
32005+ length += 16UL; /* some BIOSs underreport this... */
32006+ flags = 4;
32007+ if (length >= 64*1024*1024) {
32008+ length >>= PAGE_SHIFT;
32009+ flags |= 8;
32010+ }
32011+
32012+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32013+ gdt = get_cpu_gdt_table(cpu);
32014+ pack_descriptor(&d, address, length, 0x9b, flags);
32015+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
32016+ pack_descriptor(&d, address, length, 0x93, flags);
32017+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
32018+ }
32019+ return entry;
32020+ }
32021+ case 0x80: /* Not present */
32022+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
32023+ return 0;
32024+ default: /* Shouldn't happen */
32025+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
32026+ service, return_code);
32027+ return 0;
32028 }
32029 }
32030
32031 static struct {
32032 unsigned long address;
32033 unsigned short segment;
32034-} pci_indirect = { 0, __KERNEL_CS };
32035+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
32036
32037-static int pci_bios_present;
32038+static int pci_bios_present __read_only;
32039
32040 static int check_pcibios(void)
32041 {
32042@@ -131,11 +174,13 @@ static int check_pcibios(void)
32043 unsigned long flags, pcibios_entry;
32044
32045 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
32046- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
32047+ pci_indirect.address = pcibios_entry;
32048
32049 local_irq_save(flags);
32050- __asm__(
32051- "lcall *(%%edi); cld\n\t"
32052+ __asm__("movw %w6, %%ds\n\t"
32053+ "lcall *%%ss:(%%edi); cld\n\t"
32054+ "push %%ss\n\t"
32055+ "pop %%ds\n\t"
32056 "jc 1f\n\t"
32057 "xor %%ah, %%ah\n"
32058 "1:"
32059@@ -144,7 +189,8 @@ static int check_pcibios(void)
32060 "=b" (ebx),
32061 "=c" (ecx)
32062 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
32063- "D" (&pci_indirect)
32064+ "D" (&pci_indirect),
32065+ "r" (__PCIBIOS_DS)
32066 : "memory");
32067 local_irq_restore(flags);
32068
32069@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
32070
32071 switch (len) {
32072 case 1:
32073- __asm__("lcall *(%%esi); cld\n\t"
32074+ __asm__("movw %w6, %%ds\n\t"
32075+ "lcall *%%ss:(%%esi); cld\n\t"
32076+ "push %%ss\n\t"
32077+ "pop %%ds\n\t"
32078 "jc 1f\n\t"
32079 "xor %%ah, %%ah\n"
32080 "1:"
32081@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
32082 : "1" (PCIBIOS_READ_CONFIG_BYTE),
32083 "b" (bx),
32084 "D" ((long)reg),
32085- "S" (&pci_indirect));
32086+ "S" (&pci_indirect),
32087+ "r" (__PCIBIOS_DS));
32088 /*
32089 * Zero-extend the result beyond 8 bits, do not trust the
32090 * BIOS having done it:
32091@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
32092 *value &= 0xff;
32093 break;
32094 case 2:
32095- __asm__("lcall *(%%esi); cld\n\t"
32096+ __asm__("movw %w6, %%ds\n\t"
32097+ "lcall *%%ss:(%%esi); cld\n\t"
32098+ "push %%ss\n\t"
32099+ "pop %%ds\n\t"
32100 "jc 1f\n\t"
32101 "xor %%ah, %%ah\n"
32102 "1:"
32103@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
32104 : "1" (PCIBIOS_READ_CONFIG_WORD),
32105 "b" (bx),
32106 "D" ((long)reg),
32107- "S" (&pci_indirect));
32108+ "S" (&pci_indirect),
32109+ "r" (__PCIBIOS_DS));
32110 /*
32111 * Zero-extend the result beyond 16 bits, do not trust the
32112 * BIOS having done it:
32113@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
32114 *value &= 0xffff;
32115 break;
32116 case 4:
32117- __asm__("lcall *(%%esi); cld\n\t"
32118+ __asm__("movw %w6, %%ds\n\t"
32119+ "lcall *%%ss:(%%esi); cld\n\t"
32120+ "push %%ss\n\t"
32121+ "pop %%ds\n\t"
32122 "jc 1f\n\t"
32123 "xor %%ah, %%ah\n"
32124 "1:"
32125@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
32126 : "1" (PCIBIOS_READ_CONFIG_DWORD),
32127 "b" (bx),
32128 "D" ((long)reg),
32129- "S" (&pci_indirect));
32130+ "S" (&pci_indirect),
32131+ "r" (__PCIBIOS_DS));
32132 break;
32133 }
32134
32135@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
32136
32137 switch (len) {
32138 case 1:
32139- __asm__("lcall *(%%esi); cld\n\t"
32140+ __asm__("movw %w6, %%ds\n\t"
32141+ "lcall *%%ss:(%%esi); cld\n\t"
32142+ "push %%ss\n\t"
32143+ "pop %%ds\n\t"
32144 "jc 1f\n\t"
32145 "xor %%ah, %%ah\n"
32146 "1:"
32147@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
32148 "c" (value),
32149 "b" (bx),
32150 "D" ((long)reg),
32151- "S" (&pci_indirect));
32152+ "S" (&pci_indirect),
32153+ "r" (__PCIBIOS_DS));
32154 break;
32155 case 2:
32156- __asm__("lcall *(%%esi); cld\n\t"
32157+ __asm__("movw %w6, %%ds\n\t"
32158+ "lcall *%%ss:(%%esi); cld\n\t"
32159+ "push %%ss\n\t"
32160+ "pop %%ds\n\t"
32161 "jc 1f\n\t"
32162 "xor %%ah, %%ah\n"
32163 "1:"
32164@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
32165 "c" (value),
32166 "b" (bx),
32167 "D" ((long)reg),
32168- "S" (&pci_indirect));
32169+ "S" (&pci_indirect),
32170+ "r" (__PCIBIOS_DS));
32171 break;
32172 case 4:
32173- __asm__("lcall *(%%esi); cld\n\t"
32174+ __asm__("movw %w6, %%ds\n\t"
32175+ "lcall *%%ss:(%%esi); cld\n\t"
32176+ "push %%ss\n\t"
32177+ "pop %%ds\n\t"
32178 "jc 1f\n\t"
32179 "xor %%ah, %%ah\n"
32180 "1:"
32181@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
32182 "c" (value),
32183 "b" (bx),
32184 "D" ((long)reg),
32185- "S" (&pci_indirect));
32186+ "S" (&pci_indirect),
32187+ "r" (__PCIBIOS_DS));
32188 break;
32189 }
32190
32191@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
32192
32193 DBG("PCI: Fetching IRQ routing table... ");
32194 __asm__("push %%es\n\t"
32195+ "movw %w8, %%ds\n\t"
32196 "push %%ds\n\t"
32197 "pop %%es\n\t"
32198- "lcall *(%%esi); cld\n\t"
32199+ "lcall *%%ss:(%%esi); cld\n\t"
32200 "pop %%es\n\t"
32201+ "push %%ss\n\t"
32202+ "pop %%ds\n"
32203 "jc 1f\n\t"
32204 "xor %%ah, %%ah\n"
32205 "1:"
32206@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
32207 "1" (0),
32208 "D" ((long) &opt),
32209 "S" (&pci_indirect),
32210- "m" (opt)
32211+ "m" (opt),
32212+ "r" (__PCIBIOS_DS)
32213 : "memory");
32214 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
32215 if (ret & 0xff00)
32216@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
32217 {
32218 int ret;
32219
32220- __asm__("lcall *(%%esi); cld\n\t"
32221+ __asm__("movw %w5, %%ds\n\t"
32222+ "lcall *%%ss:(%%esi); cld\n\t"
32223+ "push %%ss\n\t"
32224+ "pop %%ds\n"
32225 "jc 1f\n\t"
32226 "xor %%ah, %%ah\n"
32227 "1:"
32228@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
32229 : "0" (PCIBIOS_SET_PCI_HW_INT),
32230 "b" ((dev->bus->number << 8) | dev->devfn),
32231 "c" ((irq << 8) | (pin + 10)),
32232- "S" (&pci_indirect));
32233+ "S" (&pci_indirect),
32234+ "r" (__PCIBIOS_DS));
32235 return !(ret & 0xff00);
32236 }
32237 EXPORT_SYMBOL(pcibios_set_irq_routing);
32238diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
32239index 40e4469..d915bf9 100644
32240--- a/arch/x86/platform/efi/efi_32.c
32241+++ b/arch/x86/platform/efi/efi_32.c
32242@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
32243 {
32244 struct desc_ptr gdt_descr;
32245
32246+#ifdef CONFIG_PAX_KERNEXEC
32247+ struct desc_struct d;
32248+#endif
32249+
32250 local_irq_save(efi_rt_eflags);
32251
32252 load_cr3(initial_page_table);
32253 __flush_tlb_all();
32254
32255+#ifdef CONFIG_PAX_KERNEXEC
32256+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
32257+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
32258+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
32259+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
32260+#endif
32261+
32262 gdt_descr.address = __pa(get_cpu_gdt_table(0));
32263 gdt_descr.size = GDT_SIZE - 1;
32264 load_gdt(&gdt_descr);
32265@@ -58,11 +69,24 @@ void efi_call_phys_epilog(void)
32266 {
32267 struct desc_ptr gdt_descr;
32268
32269+#ifdef CONFIG_PAX_KERNEXEC
32270+ struct desc_struct d;
32271+
32272+ memset(&d, 0, sizeof d);
32273+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
32274+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
32275+#endif
32276+
32277 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
32278 gdt_descr.size = GDT_SIZE - 1;
32279 load_gdt(&gdt_descr);
32280
32281+#ifdef CONFIG_PAX_PER_CPU_PGD
32282+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
32283+#else
32284 load_cr3(swapper_pg_dir);
32285+#endif
32286+
32287 __flush_tlb_all();
32288
32289 local_irq_restore(efi_rt_eflags);
32290diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
32291index 39a0e7f1..872396e 100644
32292--- a/arch/x86/platform/efi/efi_64.c
32293+++ b/arch/x86/platform/efi/efi_64.c
32294@@ -76,6 +76,11 @@ void __init efi_call_phys_prelog(void)
32295 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
32296 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
32297 }
32298+
32299+#ifdef CONFIG_PAX_PER_CPU_PGD
32300+ load_cr3(swapper_pg_dir);
32301+#endif
32302+
32303 __flush_tlb_all();
32304 }
32305
32306@@ -89,6 +94,11 @@ void __init efi_call_phys_epilog(void)
32307 for (pgd = 0; pgd < n_pgds; pgd++)
32308 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
32309 kfree(save_pgd);
32310+
32311+#ifdef CONFIG_PAX_PER_CPU_PGD
32312+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
32313+#endif
32314+
32315 __flush_tlb_all();
32316 local_irq_restore(efi_flags);
32317 early_code_mapping_set_exec(0);
32318diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
32319index fbe66e6..eae5e38 100644
32320--- a/arch/x86/platform/efi/efi_stub_32.S
32321+++ b/arch/x86/platform/efi/efi_stub_32.S
32322@@ -6,7 +6,9 @@
32323 */
32324
32325 #include <linux/linkage.h>
32326+#include <linux/init.h>
32327 #include <asm/page_types.h>
32328+#include <asm/segment.h>
32329
32330 /*
32331 * efi_call_phys(void *, ...) is a function with variable parameters.
32332@@ -20,7 +22,7 @@
32333 * service functions will comply with gcc calling convention, too.
32334 */
32335
32336-.text
32337+__INIT
32338 ENTRY(efi_call_phys)
32339 /*
32340 * 0. The function can only be called in Linux kernel. So CS has been
32341@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
32342 * The mapping of lower virtual memory has been created in prelog and
32343 * epilog.
32344 */
32345- movl $1f, %edx
32346- subl $__PAGE_OFFSET, %edx
32347- jmp *%edx
32348+#ifdef CONFIG_PAX_KERNEXEC
32349+ movl $(__KERNEXEC_EFI_DS), %edx
32350+ mov %edx, %ds
32351+ mov %edx, %es
32352+ mov %edx, %ss
32353+ addl $2f,(1f)
32354+ ljmp *(1f)
32355+
32356+__INITDATA
32357+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
32358+.previous
32359+
32360+2:
32361+ subl $2b,(1b)
32362+#else
32363+ jmp 1f-__PAGE_OFFSET
32364 1:
32365+#endif
32366
32367 /*
32368 * 2. Now on the top of stack is the return
32369@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
32370 * parameter 2, ..., param n. To make things easy, we save the return
32371 * address of efi_call_phys in a global variable.
32372 */
32373- popl %edx
32374- movl %edx, saved_return_addr
32375- /* get the function pointer into ECX*/
32376- popl %ecx
32377- movl %ecx, efi_rt_function_ptr
32378- movl $2f, %edx
32379- subl $__PAGE_OFFSET, %edx
32380- pushl %edx
32381+ popl (saved_return_addr)
32382+ popl (efi_rt_function_ptr)
32383
32384 /*
32385 * 3. Clear PG bit in %CR0.
32386@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
32387 /*
32388 * 5. Call the physical function.
32389 */
32390- jmp *%ecx
32391+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
32392
32393-2:
32394 /*
32395 * 6. After EFI runtime service returns, control will return to
32396 * following instruction. We'd better readjust stack pointer first.
32397@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
32398 movl %cr0, %edx
32399 orl $0x80000000, %edx
32400 movl %edx, %cr0
32401- jmp 1f
32402-1:
32403+
32404 /*
32405 * 8. Now restore the virtual mode from flat mode by
32406 * adding EIP with PAGE_OFFSET.
32407 */
32408- movl $1f, %edx
32409- jmp *%edx
32410+#ifdef CONFIG_PAX_KERNEXEC
32411+ movl $(__KERNEL_DS), %edx
32412+ mov %edx, %ds
32413+ mov %edx, %es
32414+ mov %edx, %ss
32415+ ljmp $(__KERNEL_CS),$1f
32416+#else
32417+ jmp 1f+__PAGE_OFFSET
32418+#endif
32419 1:
32420
32421 /*
32422 * 9. Balance the stack. And because EAX contain the return value,
32423 * we'd better not clobber it.
32424 */
32425- leal efi_rt_function_ptr, %edx
32426- movl (%edx), %ecx
32427- pushl %ecx
32428+ pushl (efi_rt_function_ptr)
32429
32430 /*
32431- * 10. Push the saved return address onto the stack and return.
32432+ * 10. Return to the saved return address.
32433 */
32434- leal saved_return_addr, %edx
32435- movl (%edx), %ecx
32436- pushl %ecx
32437- ret
32438+ jmpl *(saved_return_addr)
32439 ENDPROC(efi_call_phys)
32440 .previous
32441
32442-.data
32443+__INITDATA
32444 saved_return_addr:
32445 .long 0
32446 efi_rt_function_ptr:
32447diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
32448index 4c07cca..2c8427d 100644
32449--- a/arch/x86/platform/efi/efi_stub_64.S
32450+++ b/arch/x86/platform/efi/efi_stub_64.S
32451@@ -7,6 +7,7 @@
32452 */
32453
32454 #include <linux/linkage.h>
32455+#include <asm/alternative-asm.h>
32456
32457 #define SAVE_XMM \
32458 mov %rsp, %rax; \
32459@@ -40,6 +41,7 @@ ENTRY(efi_call0)
32460 call *%rdi
32461 addq $32, %rsp
32462 RESTORE_XMM
32463+ pax_force_retaddr 0, 1
32464 ret
32465 ENDPROC(efi_call0)
32466
32467@@ -50,6 +52,7 @@ ENTRY(efi_call1)
32468 call *%rdi
32469 addq $32, %rsp
32470 RESTORE_XMM
32471+ pax_force_retaddr 0, 1
32472 ret
32473 ENDPROC(efi_call1)
32474
32475@@ -60,6 +63,7 @@ ENTRY(efi_call2)
32476 call *%rdi
32477 addq $32, %rsp
32478 RESTORE_XMM
32479+ pax_force_retaddr 0, 1
32480 ret
32481 ENDPROC(efi_call2)
32482
32483@@ -71,6 +75,7 @@ ENTRY(efi_call3)
32484 call *%rdi
32485 addq $32, %rsp
32486 RESTORE_XMM
32487+ pax_force_retaddr 0, 1
32488 ret
32489 ENDPROC(efi_call3)
32490
32491@@ -83,6 +88,7 @@ ENTRY(efi_call4)
32492 call *%rdi
32493 addq $32, %rsp
32494 RESTORE_XMM
32495+ pax_force_retaddr 0, 1
32496 ret
32497 ENDPROC(efi_call4)
32498
32499@@ -96,6 +102,7 @@ ENTRY(efi_call5)
32500 call *%rdi
32501 addq $48, %rsp
32502 RESTORE_XMM
32503+ pax_force_retaddr 0, 1
32504 ret
32505 ENDPROC(efi_call5)
32506
32507@@ -112,5 +119,6 @@ ENTRY(efi_call6)
32508 call *%rdi
32509 addq $48, %rsp
32510 RESTORE_XMM
32511+ pax_force_retaddr 0, 1
32512 ret
32513 ENDPROC(efi_call6)
32514diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
32515index a0a0a43..a48e233 100644
32516--- a/arch/x86/platform/mrst/mrst.c
32517+++ b/arch/x86/platform/mrst/mrst.c
32518@@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
32519 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
32520 int sfi_mrtc_num;
32521
32522-static void mrst_power_off(void)
32523+static __noreturn void mrst_power_off(void)
32524 {
32525+ BUG();
32526 }
32527
32528-static void mrst_reboot(void)
32529+static __noreturn void mrst_reboot(void)
32530 {
32531 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
32532+ BUG();
32533 }
32534
32535 /* parse all the mtimer info to a static mtimer array */
32536diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
32537index d6ee929..3637cb5 100644
32538--- a/arch/x86/platform/olpc/olpc_dt.c
32539+++ b/arch/x86/platform/olpc/olpc_dt.c
32540@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
32541 return res;
32542 }
32543
32544-static struct of_pdt_ops prom_olpc_ops __initdata = {
32545+static struct of_pdt_ops prom_olpc_ops __initconst = {
32546 .nextprop = olpc_dt_nextprop,
32547 .getproplen = olpc_dt_getproplen,
32548 .getproperty = olpc_dt_getproperty,
32549diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
32550index 1cf5b30..fd45732 100644
32551--- a/arch/x86/power/cpu.c
32552+++ b/arch/x86/power/cpu.c
32553@@ -137,11 +137,8 @@ static void do_fpu_end(void)
32554 static void fix_processor_context(void)
32555 {
32556 int cpu = smp_processor_id();
32557- struct tss_struct *t = &per_cpu(init_tss, cpu);
32558-#ifdef CONFIG_X86_64
32559- struct desc_struct *desc = get_cpu_gdt_table(cpu);
32560- tss_desc tss;
32561-#endif
32562+ struct tss_struct *t = init_tss + cpu;
32563+
32564 set_tss_desc(cpu, t); /*
32565 * This just modifies memory; should not be
32566 * necessary. But... This is necessary, because
32567@@ -150,10 +147,6 @@ static void fix_processor_context(void)
32568 */
32569
32570 #ifdef CONFIG_X86_64
32571- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
32572- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
32573- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
32574-
32575 syscall_init(); /* This sets MSR_*STAR and related */
32576 #endif
32577 load_TR_desc(); /* This does ltr */
32578diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
32579index a44f457..9140171 100644
32580--- a/arch/x86/realmode/init.c
32581+++ b/arch/x86/realmode/init.c
32582@@ -70,7 +70,13 @@ void __init setup_real_mode(void)
32583 __va(real_mode_header->trampoline_header);
32584
32585 #ifdef CONFIG_X86_32
32586- trampoline_header->start = __pa_symbol(startup_32_smp);
32587+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
32588+
32589+#ifdef CONFIG_PAX_KERNEXEC
32590+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
32591+#endif
32592+
32593+ trampoline_header->boot_cs = __BOOT_CS;
32594 trampoline_header->gdt_limit = __BOOT_DS + 7;
32595 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
32596 #else
32597@@ -86,7 +92,7 @@ void __init setup_real_mode(void)
32598 *trampoline_cr4_features = read_cr4();
32599
32600 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
32601- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
32602+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
32603 trampoline_pgd[511] = init_level4_pgt[511].pgd;
32604 #endif
32605 }
32606diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
32607index 8869287..d577672 100644
32608--- a/arch/x86/realmode/rm/Makefile
32609+++ b/arch/x86/realmode/rm/Makefile
32610@@ -78,5 +78,8 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
32611 $(call cc-option, -fno-unit-at-a-time)) \
32612 $(call cc-option, -fno-stack-protector) \
32613 $(call cc-option, -mpreferred-stack-boundary=2)
32614+ifdef CONSTIFY_PLUGIN
32615+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
32616+endif
32617 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
32618 GCOV_PROFILE := n
32619diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
32620index a28221d..93c40f1 100644
32621--- a/arch/x86/realmode/rm/header.S
32622+++ b/arch/x86/realmode/rm/header.S
32623@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
32624 #endif
32625 /* APM/BIOS reboot */
32626 .long pa_machine_real_restart_asm
32627-#ifdef CONFIG_X86_64
32628+#ifdef CONFIG_X86_32
32629+ .long __KERNEL_CS
32630+#else
32631 .long __KERNEL32_CS
32632 #endif
32633 END(real_mode_header)
32634diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
32635index c1b2791..f9e31c7 100644
32636--- a/arch/x86/realmode/rm/trampoline_32.S
32637+++ b/arch/x86/realmode/rm/trampoline_32.S
32638@@ -25,6 +25,12 @@
32639 #include <asm/page_types.h>
32640 #include "realmode.h"
32641
32642+#ifdef CONFIG_PAX_KERNEXEC
32643+#define ta(X) (X)
32644+#else
32645+#define ta(X) (pa_ ## X)
32646+#endif
32647+
32648 .text
32649 .code16
32650
32651@@ -39,8 +45,6 @@ ENTRY(trampoline_start)
32652
32653 cli # We should be safe anyway
32654
32655- movl tr_start, %eax # where we need to go
32656-
32657 movl $0xA5A5A5A5, trampoline_status
32658 # write marker for master knows we're running
32659
32660@@ -56,7 +60,7 @@ ENTRY(trampoline_start)
32661 movw $1, %dx # protected mode (PE) bit
32662 lmsw %dx # into protected mode
32663
32664- ljmpl $__BOOT_CS, $pa_startup_32
32665+ ljmpl *(trampoline_header)
32666
32667 .section ".text32","ax"
32668 .code32
32669@@ -67,7 +71,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
32670 .balign 8
32671 GLOBAL(trampoline_header)
32672 tr_start: .space 4
32673- tr_gdt_pad: .space 2
32674+ tr_boot_cs: .space 2
32675 tr_gdt: .space 6
32676 END(trampoline_header)
32677
32678diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
32679index bb360dc..d0fd8f8 100644
32680--- a/arch/x86/realmode/rm/trampoline_64.S
32681+++ b/arch/x86/realmode/rm/trampoline_64.S
32682@@ -94,6 +94,7 @@ ENTRY(startup_32)
32683 movl %edx, %gs
32684
32685 movl pa_tr_cr4, %eax
32686+ andl $~X86_CR4_PCIDE, %eax
32687 movl %eax, %cr4 # Enable PAE mode
32688
32689 # Setup trampoline 4 level pagetables
32690@@ -107,7 +108,7 @@ ENTRY(startup_32)
32691 wrmsr
32692
32693 # Enable paging and in turn activate Long Mode
32694- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
32695+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
32696 movl %eax, %cr0
32697
32698 /*
32699diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
32700index e812034..c747134 100644
32701--- a/arch/x86/tools/Makefile
32702+++ b/arch/x86/tools/Makefile
32703@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
32704
32705 $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
32706
32707-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
32708+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
32709 hostprogs-y += relocs
32710 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
32711 relocs: $(obj)/relocs
32712diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
32713index f7bab68..b6d9886 100644
32714--- a/arch/x86/tools/relocs.c
32715+++ b/arch/x86/tools/relocs.c
32716@@ -1,5 +1,7 @@
32717 /* This is included from relocs_32/64.c */
32718
32719+#include "../../../include/generated/autoconf.h"
32720+
32721 #define ElfW(type) _ElfW(ELF_BITS, type)
32722 #define _ElfW(bits, type) __ElfW(bits, type)
32723 #define __ElfW(bits, type) Elf##bits##_##type
32724@@ -11,6 +13,7 @@
32725 #define Elf_Sym ElfW(Sym)
32726
32727 static Elf_Ehdr ehdr;
32728+static Elf_Phdr *phdr;
32729
32730 struct relocs {
32731 uint32_t *offset;
32732@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
32733 }
32734 }
32735
32736+static void read_phdrs(FILE *fp)
32737+{
32738+ unsigned int i;
32739+
32740+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
32741+ if (!phdr) {
32742+ die("Unable to allocate %d program headers\n",
32743+ ehdr.e_phnum);
32744+ }
32745+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
32746+ die("Seek to %d failed: %s\n",
32747+ ehdr.e_phoff, strerror(errno));
32748+ }
32749+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
32750+ die("Cannot read ELF program headers: %s\n",
32751+ strerror(errno));
32752+ }
32753+ for(i = 0; i < ehdr.e_phnum; i++) {
32754+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
32755+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
32756+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
32757+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
32758+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
32759+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
32760+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
32761+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
32762+ }
32763+
32764+}
32765+
32766 static void read_shdrs(FILE *fp)
32767 {
32768- int i;
32769+ unsigned int i;
32770 Elf_Shdr shdr;
32771
32772 secs = calloc(ehdr.e_shnum, sizeof(struct section));
32773@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
32774
32775 static void read_strtabs(FILE *fp)
32776 {
32777- int i;
32778+ unsigned int i;
32779 for (i = 0; i < ehdr.e_shnum; i++) {
32780 struct section *sec = &secs[i];
32781 if (sec->shdr.sh_type != SHT_STRTAB) {
32782@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
32783
32784 static void read_symtabs(FILE *fp)
32785 {
32786- int i,j;
32787+ unsigned int i,j;
32788 for (i = 0; i < ehdr.e_shnum; i++) {
32789 struct section *sec = &secs[i];
32790 if (sec->shdr.sh_type != SHT_SYMTAB) {
32791@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
32792 }
32793
32794
32795-static void read_relocs(FILE *fp)
32796+static void read_relocs(FILE *fp, int use_real_mode)
32797 {
32798- int i,j;
32799+ unsigned int i,j;
32800+ uint32_t base;
32801+
32802 for (i = 0; i < ehdr.e_shnum; i++) {
32803 struct section *sec = &secs[i];
32804 if (sec->shdr.sh_type != SHT_REL_TYPE) {
32805@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
32806 die("Cannot read symbol table: %s\n",
32807 strerror(errno));
32808 }
32809+ base = 0;
32810+
32811+#ifdef CONFIG_X86_32
32812+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
32813+ if (phdr[j].p_type != PT_LOAD )
32814+ continue;
32815+ 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)
32816+ continue;
32817+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
32818+ break;
32819+ }
32820+#endif
32821+
32822 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
32823 Elf_Rel *rel = &sec->reltab[j];
32824- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
32825+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
32826 rel->r_info = elf_xword_to_cpu(rel->r_info);
32827 #if (SHT_REL_TYPE == SHT_RELA)
32828 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
32829@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
32830
32831 static void print_absolute_symbols(void)
32832 {
32833- int i;
32834+ unsigned int i;
32835 const char *format;
32836
32837 if (ELF_BITS == 64)
32838@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
32839 for (i = 0; i < ehdr.e_shnum; i++) {
32840 struct section *sec = &secs[i];
32841 char *sym_strtab;
32842- int j;
32843+ unsigned int j;
32844
32845 if (sec->shdr.sh_type != SHT_SYMTAB) {
32846 continue;
32847@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
32848
32849 static void print_absolute_relocs(void)
32850 {
32851- int i, printed = 0;
32852+ unsigned int i, printed = 0;
32853 const char *format;
32854
32855 if (ELF_BITS == 64)
32856@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
32857 struct section *sec_applies, *sec_symtab;
32858 char *sym_strtab;
32859 Elf_Sym *sh_symtab;
32860- int j;
32861+ unsigned int j;
32862 if (sec->shdr.sh_type != SHT_REL_TYPE) {
32863 continue;
32864 }
32865@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
32866 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
32867 Elf_Sym *sym, const char *symname))
32868 {
32869- int i;
32870+ unsigned int i;
32871 /* Walk through the relocations */
32872 for (i = 0; i < ehdr.e_shnum; i++) {
32873 char *sym_strtab;
32874 Elf_Sym *sh_symtab;
32875 struct section *sec_applies, *sec_symtab;
32876- int j;
32877+ unsigned int j;
32878 struct section *sec = &secs[i];
32879
32880 if (sec->shdr.sh_type != SHT_REL_TYPE) {
32881@@ -812,6 +860,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
32882 {
32883 unsigned r_type = ELF32_R_TYPE(rel->r_info);
32884 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
32885+ char *sym_strtab = sec->link->link->strtab;
32886+
32887+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
32888+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
32889+ return 0;
32890+
32891+#ifdef CONFIG_PAX_KERNEXEC
32892+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
32893+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
32894+ return 0;
32895+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
32896+ return 0;
32897+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
32898+ return 0;
32899+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
32900+ return 0;
32901+#endif
32902
32903 switch (r_type) {
32904 case R_386_NONE:
32905@@ -950,7 +1015,7 @@ static int write32_as_text(uint32_t v, FILE *f)
32906
32907 static void emit_relocs(int as_text, int use_real_mode)
32908 {
32909- int i;
32910+ unsigned int i;
32911 int (*write_reloc)(uint32_t, FILE *) = write32;
32912 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
32913 const char *symname);
32914@@ -1026,10 +1091,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
32915 {
32916 regex_init(use_real_mode);
32917 read_ehdr(fp);
32918+ read_phdrs(fp);
32919 read_shdrs(fp);
32920 read_strtabs(fp);
32921 read_symtabs(fp);
32922- read_relocs(fp);
32923+ read_relocs(fp, use_real_mode);
32924 if (ELF_BITS == 64)
32925 percpu_init();
32926 if (show_absolute_syms) {
32927diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
32928index 80ffa5b..a33bd15 100644
32929--- a/arch/x86/um/tls_32.c
32930+++ b/arch/x86/um/tls_32.c
32931@@ -260,7 +260,7 @@ out:
32932 if (unlikely(task == current &&
32933 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
32934 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
32935- "without flushed TLS.", current->pid);
32936+ "without flushed TLS.", task_pid_nr(current));
32937 }
32938
32939 return 0;
32940diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
32941index fd14be1..e3c79c0 100644
32942--- a/arch/x86/vdso/Makefile
32943+++ b/arch/x86/vdso/Makefile
32944@@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
32945 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
32946 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
32947
32948-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
32949+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
32950 GCOV_PROFILE := n
32951
32952 #
32953diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
32954index 0faad64..39ef157 100644
32955--- a/arch/x86/vdso/vdso32-setup.c
32956+++ b/arch/x86/vdso/vdso32-setup.c
32957@@ -25,6 +25,7 @@
32958 #include <asm/tlbflush.h>
32959 #include <asm/vdso.h>
32960 #include <asm/proto.h>
32961+#include <asm/mman.h>
32962
32963 enum {
32964 VDSO_DISABLED = 0,
32965@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
32966 void enable_sep_cpu(void)
32967 {
32968 int cpu = get_cpu();
32969- struct tss_struct *tss = &per_cpu(init_tss, cpu);
32970+ struct tss_struct *tss = init_tss + cpu;
32971
32972 if (!boot_cpu_has(X86_FEATURE_SEP)) {
32973 put_cpu();
32974@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
32975 gate_vma.vm_start = FIXADDR_USER_START;
32976 gate_vma.vm_end = FIXADDR_USER_END;
32977 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
32978- gate_vma.vm_page_prot = __P101;
32979+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
32980
32981 return 0;
32982 }
32983@@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
32984 if (compat)
32985 addr = VDSO_HIGH_BASE;
32986 else {
32987- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
32988+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
32989 if (IS_ERR_VALUE(addr)) {
32990 ret = addr;
32991 goto up_fail;
32992 }
32993 }
32994
32995- current->mm->context.vdso = (void *)addr;
32996+ current->mm->context.vdso = addr;
32997
32998 if (compat_uses_vma || !compat) {
32999 /*
33000@@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
33001 }
33002
33003 current_thread_info()->sysenter_return =
33004- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
33005+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
33006
33007 up_fail:
33008 if (ret)
33009- current->mm->context.vdso = NULL;
33010+ current->mm->context.vdso = 0;
33011
33012 up_write(&mm->mmap_sem);
33013
33014@@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
33015
33016 const char *arch_vma_name(struct vm_area_struct *vma)
33017 {
33018- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
33019+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
33020 return "[vdso]";
33021+
33022+#ifdef CONFIG_PAX_SEGMEXEC
33023+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
33024+ return "[vdso]";
33025+#endif
33026+
33027 return NULL;
33028 }
33029
33030@@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
33031 * Check to see if the corresponding task was created in compat vdso
33032 * mode.
33033 */
33034- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
33035+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
33036 return &gate_vma;
33037 return NULL;
33038 }
33039diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
33040index 431e875..cbb23f3 100644
33041--- a/arch/x86/vdso/vma.c
33042+++ b/arch/x86/vdso/vma.c
33043@@ -16,8 +16,6 @@
33044 #include <asm/vdso.h>
33045 #include <asm/page.h>
33046
33047-unsigned int __read_mostly vdso_enabled = 1;
33048-
33049 extern char vdso_start[], vdso_end[];
33050 extern unsigned short vdso_sync_cpuid;
33051
33052@@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
33053 * unaligned here as a result of stack start randomization.
33054 */
33055 addr = PAGE_ALIGN(addr);
33056- addr = align_vdso_addr(addr);
33057
33058 return addr;
33059 }
33060@@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
33061 unsigned size)
33062 {
33063 struct mm_struct *mm = current->mm;
33064- unsigned long addr;
33065+ unsigned long addr = 0;
33066 int ret;
33067
33068- if (!vdso_enabled)
33069- return 0;
33070-
33071 down_write(&mm->mmap_sem);
33072+
33073+#ifdef CONFIG_PAX_RANDMMAP
33074+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
33075+#endif
33076+
33077 addr = vdso_addr(mm->start_stack, size);
33078+ addr = align_vdso_addr(addr);
33079 addr = get_unmapped_area(NULL, addr, size, 0, 0);
33080 if (IS_ERR_VALUE(addr)) {
33081 ret = addr;
33082 goto up_fail;
33083 }
33084
33085- current->mm->context.vdso = (void *)addr;
33086+ mm->context.vdso = addr;
33087
33088 ret = install_special_mapping(mm, addr, size,
33089 VM_READ|VM_EXEC|
33090 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
33091 pages);
33092- if (ret) {
33093- current->mm->context.vdso = NULL;
33094- goto up_fail;
33095- }
33096+ if (ret)
33097+ mm->context.vdso = 0;
33098
33099 up_fail:
33100 up_write(&mm->mmap_sem);
33101@@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
33102 vdsox32_size);
33103 }
33104 #endif
33105-
33106-static __init int vdso_setup(char *s)
33107-{
33108- vdso_enabled = simple_strtoul(s, NULL, 0);
33109- return 0;
33110-}
33111-__setup("vdso=", vdso_setup);
33112diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
33113index a492be2..08678da 100644
33114--- a/arch/x86/xen/enlighten.c
33115+++ b/arch/x86/xen/enlighten.c
33116@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
33117
33118 struct shared_info xen_dummy_shared_info;
33119
33120-void *xen_initial_gdt;
33121-
33122 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
33123 __read_mostly int xen_have_vector_callback;
33124 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
33125@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
33126 {
33127 unsigned long va = dtr->address;
33128 unsigned int size = dtr->size + 1;
33129- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
33130- unsigned long frames[pages];
33131+ unsigned long frames[65536 / PAGE_SIZE];
33132 int f;
33133
33134 /*
33135@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
33136 {
33137 unsigned long va = dtr->address;
33138 unsigned int size = dtr->size + 1;
33139- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
33140- unsigned long frames[pages];
33141+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
33142 int f;
33143
33144 /*
33145@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
33146 * 8-byte entries, or 16 4k pages..
33147 */
33148
33149- BUG_ON(size > 65536);
33150+ BUG_ON(size > GDT_SIZE);
33151 BUG_ON(va & ~PAGE_MASK);
33152
33153 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
33154@@ -985,7 +981,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
33155 return 0;
33156 }
33157
33158-static void set_xen_basic_apic_ops(void)
33159+static void __init set_xen_basic_apic_ops(void)
33160 {
33161 apic->read = xen_apic_read;
33162 apic->write = xen_apic_write;
33163@@ -1290,30 +1286,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
33164 #endif
33165 };
33166
33167-static void xen_reboot(int reason)
33168+static __noreturn void xen_reboot(int reason)
33169 {
33170 struct sched_shutdown r = { .reason = reason };
33171
33172- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
33173- BUG();
33174+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
33175+ BUG();
33176 }
33177
33178-static void xen_restart(char *msg)
33179+static __noreturn void xen_restart(char *msg)
33180 {
33181 xen_reboot(SHUTDOWN_reboot);
33182 }
33183
33184-static void xen_emergency_restart(void)
33185+static __noreturn void xen_emergency_restart(void)
33186 {
33187 xen_reboot(SHUTDOWN_reboot);
33188 }
33189
33190-static void xen_machine_halt(void)
33191+static __noreturn void xen_machine_halt(void)
33192 {
33193 xen_reboot(SHUTDOWN_poweroff);
33194 }
33195
33196-static void xen_machine_power_off(void)
33197+static __noreturn void xen_machine_power_off(void)
33198 {
33199 if (pm_power_off)
33200 pm_power_off();
33201@@ -1464,7 +1460,17 @@ asmlinkage void __init xen_start_kernel(void)
33202 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
33203
33204 /* Work out if we support NX */
33205- x86_configure_nx();
33206+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33207+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
33208+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
33209+ unsigned l, h;
33210+
33211+ __supported_pte_mask |= _PAGE_NX;
33212+ rdmsr(MSR_EFER, l, h);
33213+ l |= EFER_NX;
33214+ wrmsr(MSR_EFER, l, h);
33215+ }
33216+#endif
33217
33218 xen_setup_features();
33219
33220@@ -1495,13 +1501,6 @@ asmlinkage void __init xen_start_kernel(void)
33221
33222 machine_ops = xen_machine_ops;
33223
33224- /*
33225- * The only reliable way to retain the initial address of the
33226- * percpu gdt_page is to remember it here, so we can go and
33227- * mark it RW later, when the initial percpu area is freed.
33228- */
33229- xen_initial_gdt = &per_cpu(gdt_page, 0);
33230-
33231 xen_smp_init();
33232
33233 #ifdef CONFIG_ACPI_NUMA
33234@@ -1700,7 +1699,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
33235 return NOTIFY_OK;
33236 }
33237
33238-static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = {
33239+static struct notifier_block xen_hvm_cpu_notifier = {
33240 .notifier_call = xen_hvm_cpu_notify,
33241 };
33242
33243diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
33244index fdc3ba2..3daee39 100644
33245--- a/arch/x86/xen/mmu.c
33246+++ b/arch/x86/xen/mmu.c
33247@@ -1894,6 +1894,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
33248 /* L3_k[510] -> level2_kernel_pgt
33249 * L3_i[511] -> level2_fixmap_pgt */
33250 convert_pfn_mfn(level3_kernel_pgt);
33251+ convert_pfn_mfn(level3_vmalloc_start_pgt);
33252+ convert_pfn_mfn(level3_vmalloc_end_pgt);
33253+ convert_pfn_mfn(level3_vmemmap_pgt);
33254
33255 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
33256 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
33257@@ -1923,8 +1926,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
33258 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
33259 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
33260 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
33261+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
33262+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
33263+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
33264 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
33265 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
33266+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
33267 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
33268 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
33269
33270@@ -2108,6 +2115,7 @@ static void __init xen_post_allocator_init(void)
33271 pv_mmu_ops.set_pud = xen_set_pud;
33272 #if PAGETABLE_LEVELS == 4
33273 pv_mmu_ops.set_pgd = xen_set_pgd;
33274+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
33275 #endif
33276
33277 /* This will work as long as patching hasn't happened yet
33278@@ -2186,6 +2194,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
33279 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
33280 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
33281 .set_pgd = xen_set_pgd_hyper,
33282+ .set_pgd_batched = xen_set_pgd_hyper,
33283
33284 .alloc_pud = xen_alloc_pmd_init,
33285 .release_pud = xen_release_pmd_init,
33286diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
33287index d99cae8..18401e1 100644
33288--- a/arch/x86/xen/smp.c
33289+++ b/arch/x86/xen/smp.c
33290@@ -240,11 +240,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
33291 {
33292 BUG_ON(smp_processor_id() != 0);
33293 native_smp_prepare_boot_cpu();
33294-
33295- /* We've switched to the "real" per-cpu gdt, so make sure the
33296- old memory can be recycled */
33297- make_lowmem_page_readwrite(xen_initial_gdt);
33298-
33299 xen_filter_cpu_maps();
33300 xen_setup_vcpu_info_placement();
33301 }
33302@@ -314,7 +309,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
33303 ctxt->user_regs.ss = __KERNEL_DS;
33304 #ifdef CONFIG_X86_32
33305 ctxt->user_regs.fs = __KERNEL_PERCPU;
33306- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
33307+ savesegment(gs, ctxt->user_regs.gs);
33308 #else
33309 ctxt->gs_base_kernel = per_cpu_offset(cpu);
33310 #endif
33311@@ -324,8 +319,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
33312
33313 {
33314 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
33315- ctxt->user_regs.ds = __USER_DS;
33316- ctxt->user_regs.es = __USER_DS;
33317+ ctxt->user_regs.ds = __KERNEL_DS;
33318+ ctxt->user_regs.es = __KERNEL_DS;
33319
33320 xen_copy_trap_info(ctxt->trap_ctxt);
33321
33322@@ -370,13 +365,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu, struct task_struct *idle)
33323 int rc;
33324
33325 per_cpu(current_task, cpu) = idle;
33326+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
33327 #ifdef CONFIG_X86_32
33328 irq_ctx_init(cpu);
33329 #else
33330 clear_tsk_thread_flag(idle, TIF_FORK);
33331- per_cpu(kernel_stack, cpu) =
33332- (unsigned long)task_stack_page(idle) -
33333- KERNEL_STACK_OFFSET + THREAD_SIZE;
33334+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
33335 #endif
33336 xen_setup_runstate_info(cpu);
33337 xen_setup_timer(cpu);
33338@@ -651,7 +645,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
33339
33340 void __init xen_smp_init(void)
33341 {
33342- smp_ops = xen_smp_ops;
33343+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
33344 xen_fill_possible_map();
33345 xen_init_spinlocks();
33346 }
33347diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
33348index 33ca6e4..0ded929 100644
33349--- a/arch/x86/xen/xen-asm_32.S
33350+++ b/arch/x86/xen/xen-asm_32.S
33351@@ -84,14 +84,14 @@ ENTRY(xen_iret)
33352 ESP_OFFSET=4 # bytes pushed onto stack
33353
33354 /*
33355- * Store vcpu_info pointer for easy access. Do it this way to
33356- * avoid having to reload %fs
33357+ * Store vcpu_info pointer for easy access.
33358 */
33359 #ifdef CONFIG_SMP
33360- GET_THREAD_INFO(%eax)
33361- movl %ss:TI_cpu(%eax), %eax
33362- movl %ss:__per_cpu_offset(,%eax,4), %eax
33363- mov %ss:xen_vcpu(%eax), %eax
33364+ push %fs
33365+ mov $(__KERNEL_PERCPU), %eax
33366+ mov %eax, %fs
33367+ mov PER_CPU_VAR(xen_vcpu), %eax
33368+ pop %fs
33369 #else
33370 movl %ss:xen_vcpu, %eax
33371 #endif
33372diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
33373index 7faed58..ba4427c 100644
33374--- a/arch/x86/xen/xen-head.S
33375+++ b/arch/x86/xen/xen-head.S
33376@@ -19,6 +19,17 @@ ENTRY(startup_xen)
33377 #ifdef CONFIG_X86_32
33378 mov %esi,xen_start_info
33379 mov $init_thread_union+THREAD_SIZE,%esp
33380+#ifdef CONFIG_SMP
33381+ movl $cpu_gdt_table,%edi
33382+ movl $__per_cpu_load,%eax
33383+ movw %ax,__KERNEL_PERCPU + 2(%edi)
33384+ rorl $16,%eax
33385+ movb %al,__KERNEL_PERCPU + 4(%edi)
33386+ movb %ah,__KERNEL_PERCPU + 7(%edi)
33387+ movl $__per_cpu_end - 1,%eax
33388+ subl $__per_cpu_start,%eax
33389+ movw %ax,__KERNEL_PERCPU + 0(%edi)
33390+#endif
33391 #else
33392 mov %rsi,xen_start_info
33393 mov $init_thread_union+THREAD_SIZE,%rsp
33394diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
33395index a95b417..b6dbd0b 100644
33396--- a/arch/x86/xen/xen-ops.h
33397+++ b/arch/x86/xen/xen-ops.h
33398@@ -10,8 +10,6 @@
33399 extern const char xen_hypervisor_callback[];
33400 extern const char xen_failsafe_callback[];
33401
33402-extern void *xen_initial_gdt;
33403-
33404 struct trap_info;
33405 void xen_copy_trap_info(struct trap_info *traps);
33406
33407diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
33408index 525bd3d..ef888b1 100644
33409--- a/arch/xtensa/variants/dc232b/include/variant/core.h
33410+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
33411@@ -119,9 +119,9 @@
33412 ----------------------------------------------------------------------*/
33413
33414 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
33415-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
33416 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
33417 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
33418+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
33419
33420 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
33421 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
33422diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
33423index 2f33760..835e50a 100644
33424--- a/arch/xtensa/variants/fsf/include/variant/core.h
33425+++ b/arch/xtensa/variants/fsf/include/variant/core.h
33426@@ -11,6 +11,7 @@
33427 #ifndef _XTENSA_CORE_H
33428 #define _XTENSA_CORE_H
33429
33430+#include <linux/const.h>
33431
33432 /****************************************************************************
33433 Parameters Useful for Any Code, USER or PRIVILEGED
33434@@ -112,9 +113,9 @@
33435 ----------------------------------------------------------------------*/
33436
33437 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
33438-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
33439 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
33440 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
33441+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
33442
33443 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
33444 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
33445diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
33446index af00795..2bb8105 100644
33447--- a/arch/xtensa/variants/s6000/include/variant/core.h
33448+++ b/arch/xtensa/variants/s6000/include/variant/core.h
33449@@ -11,6 +11,7 @@
33450 #ifndef _XTENSA_CORE_CONFIGURATION_H
33451 #define _XTENSA_CORE_CONFIGURATION_H
33452
33453+#include <linux/const.h>
33454
33455 /****************************************************************************
33456 Parameters Useful for Any Code, USER or PRIVILEGED
33457@@ -118,9 +119,9 @@
33458 ----------------------------------------------------------------------*/
33459
33460 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
33461-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
33462 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
33463 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
33464+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
33465
33466 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
33467 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
33468diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
33469index 58916af..eb9dbcf6 100644
33470--- a/block/blk-iopoll.c
33471+++ b/block/blk-iopoll.c
33472@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
33473 }
33474 EXPORT_SYMBOL(blk_iopoll_complete);
33475
33476-static void blk_iopoll_softirq(struct softirq_action *h)
33477+static void blk_iopoll_softirq(void)
33478 {
33479 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
33480 int rearm = 0, budget = blk_iopoll_budget;
33481@@ -209,7 +209,7 @@ static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self,
33482 return NOTIFY_OK;
33483 }
33484
33485-static struct notifier_block __cpuinitdata blk_iopoll_cpu_notifier = {
33486+static struct notifier_block blk_iopoll_cpu_notifier = {
33487 .notifier_call = blk_iopoll_cpu_notify,
33488 };
33489
33490diff --git a/block/blk-map.c b/block/blk-map.c
33491index 623e1cd..ca1e109 100644
33492--- a/block/blk-map.c
33493+++ b/block/blk-map.c
33494@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
33495 if (!len || !kbuf)
33496 return -EINVAL;
33497
33498- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
33499+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
33500 if (do_copy)
33501 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
33502 else
33503diff --git a/block/blk-softirq.c b/block/blk-softirq.c
33504index 467c8de..f3628c5 100644
33505--- a/block/blk-softirq.c
33506+++ b/block/blk-softirq.c
33507@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
33508 * Softirq action handler - move entries to local list and loop over them
33509 * while passing them to the queue registered handler.
33510 */
33511-static void blk_done_softirq(struct softirq_action *h)
33512+static void blk_done_softirq(void)
33513 {
33514 struct list_head *cpu_list, local_list;
33515
33516@@ -98,7 +98,7 @@ static int __cpuinit blk_cpu_notify(struct notifier_block *self,
33517 return NOTIFY_OK;
33518 }
33519
33520-static struct notifier_block __cpuinitdata blk_cpu_notifier = {
33521+static struct notifier_block blk_cpu_notifier = {
33522 .notifier_call = blk_cpu_notify,
33523 };
33524
33525diff --git a/block/bsg.c b/block/bsg.c
33526index 420a5a9..23834aa 100644
33527--- a/block/bsg.c
33528+++ b/block/bsg.c
33529@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
33530 struct sg_io_v4 *hdr, struct bsg_device *bd,
33531 fmode_t has_write_perm)
33532 {
33533+ unsigned char tmpcmd[sizeof(rq->__cmd)];
33534+ unsigned char *cmdptr;
33535+
33536 if (hdr->request_len > BLK_MAX_CDB) {
33537 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
33538 if (!rq->cmd)
33539 return -ENOMEM;
33540- }
33541+ cmdptr = rq->cmd;
33542+ } else
33543+ cmdptr = tmpcmd;
33544
33545- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
33546+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
33547 hdr->request_len))
33548 return -EFAULT;
33549
33550+ if (cmdptr != rq->cmd)
33551+ memcpy(rq->cmd, cmdptr, hdr->request_len);
33552+
33553 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
33554 if (blk_verify_command(rq->cmd, has_write_perm))
33555 return -EPERM;
33556diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
33557index 7c668c8..db3521c 100644
33558--- a/block/compat_ioctl.c
33559+++ b/block/compat_ioctl.c
33560@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
33561 err |= __get_user(f->spec1, &uf->spec1);
33562 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
33563 err |= __get_user(name, &uf->name);
33564- f->name = compat_ptr(name);
33565+ f->name = (void __force_kernel *)compat_ptr(name);
33566 if (err) {
33567 err = -EFAULT;
33568 goto out;
33569diff --git a/block/genhd.c b/block/genhd.c
33570index cdeb527..10aa34db 100644
33571--- a/block/genhd.c
33572+++ b/block/genhd.c
33573@@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
33574
33575 /*
33576 * Register device numbers dev..(dev+range-1)
33577- * range must be nonzero
33578+ * Noop if @range is zero.
33579 * The hash chain is sorted on range, so that subranges can override.
33580 */
33581 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
33582 struct kobject *(*probe)(dev_t, int *, void *),
33583 int (*lock)(dev_t, void *), void *data)
33584 {
33585- kobj_map(bdev_map, devt, range, module, probe, lock, data);
33586+ if (range)
33587+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
33588 }
33589
33590 EXPORT_SYMBOL(blk_register_region);
33591
33592+/* undo blk_register_region(), noop if @range is zero */
33593 void blk_unregister_region(dev_t devt, unsigned long range)
33594 {
33595- kobj_unmap(bdev_map, devt, range);
33596+ if (range)
33597+ kobj_unmap(bdev_map, devt, range);
33598 }
33599
33600 EXPORT_SYMBOL(blk_unregister_region);
33601diff --git a/block/partitions/efi.c b/block/partitions/efi.c
33602index c85fc89..51e690b 100644
33603--- a/block/partitions/efi.c
33604+++ b/block/partitions/efi.c
33605@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
33606 if (!gpt)
33607 return NULL;
33608
33609+ if (!le32_to_cpu(gpt->num_partition_entries))
33610+ return NULL;
33611+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
33612+ if (!pte)
33613+ return NULL;
33614+
33615 count = le32_to_cpu(gpt->num_partition_entries) *
33616 le32_to_cpu(gpt->sizeof_partition_entry);
33617- if (!count)
33618- return NULL;
33619- pte = kmalloc(count, GFP_KERNEL);
33620- if (!pte)
33621- return NULL;
33622-
33623 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
33624 (u8 *) pte,
33625 count) < count) {
33626diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
33627index a5ffcc9..3cedc9c 100644
33628--- a/block/scsi_ioctl.c
33629+++ b/block/scsi_ioctl.c
33630@@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
33631 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
33632 struct sg_io_hdr *hdr, fmode_t mode)
33633 {
33634- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
33635+ unsigned char tmpcmd[sizeof(rq->__cmd)];
33636+ unsigned char *cmdptr;
33637+
33638+ if (rq->cmd != rq->__cmd)
33639+ cmdptr = rq->cmd;
33640+ else
33641+ cmdptr = tmpcmd;
33642+
33643+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
33644 return -EFAULT;
33645+
33646+ if (cmdptr != rq->cmd)
33647+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
33648+
33649 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
33650 return -EPERM;
33651
33652@@ -434,6 +446,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
33653 int err;
33654 unsigned int in_len, out_len, bytes, opcode, cmdlen;
33655 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
33656+ unsigned char tmpcmd[sizeof(rq->__cmd)];
33657+ unsigned char *cmdptr;
33658
33659 if (!sic)
33660 return -EINVAL;
33661@@ -467,9 +481,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
33662 */
33663 err = -EFAULT;
33664 rq->cmd_len = cmdlen;
33665- if (copy_from_user(rq->cmd, sic->data, cmdlen))
33666+
33667+ if (rq->cmd != rq->__cmd)
33668+ cmdptr = rq->cmd;
33669+ else
33670+ cmdptr = tmpcmd;
33671+
33672+ if (copy_from_user(cmdptr, sic->data, cmdlen))
33673 goto error;
33674
33675+ if (rq->cmd != cmdptr)
33676+ memcpy(rq->cmd, cmdptr, cmdlen);
33677+
33678 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
33679 goto error;
33680
33681diff --git a/crypto/cryptd.c b/crypto/cryptd.c
33682index 7bdd61b..afec999 100644
33683--- a/crypto/cryptd.c
33684+++ b/crypto/cryptd.c
33685@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
33686
33687 struct cryptd_blkcipher_request_ctx {
33688 crypto_completion_t complete;
33689-};
33690+} __no_const;
33691
33692 struct cryptd_hash_ctx {
33693 struct crypto_shash *child;
33694@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
33695
33696 struct cryptd_aead_request_ctx {
33697 crypto_completion_t complete;
33698-};
33699+} __no_const;
33700
33701 static void cryptd_queue_worker(struct work_struct *work);
33702
33703diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
33704index b2c99dc..476c9fb 100644
33705--- a/crypto/pcrypt.c
33706+++ b/crypto/pcrypt.c
33707@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
33708 int ret;
33709
33710 pinst->kobj.kset = pcrypt_kset;
33711- ret = kobject_add(&pinst->kobj, NULL, name);
33712+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
33713 if (!ret)
33714 kobject_uevent(&pinst->kobj, KOBJ_ADD);
33715
33716@@ -455,8 +455,8 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
33717
33718 get_online_cpus();
33719
33720- pcrypt->wq = alloc_workqueue(name,
33721- WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1);
33722+ pcrypt->wq = alloc_workqueue("%s",
33723+ WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1, name);
33724 if (!pcrypt->wq)
33725 goto err;
33726
33727diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
33728index f220d64..d359ad6 100644
33729--- a/drivers/acpi/apei/apei-internal.h
33730+++ b/drivers/acpi/apei/apei-internal.h
33731@@ -20,7 +20,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
33732 struct apei_exec_ins_type {
33733 u32 flags;
33734 apei_exec_ins_func_t run;
33735-};
33736+} __do_const;
33737
33738 struct apei_exec_context {
33739 u32 ip;
33740diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
33741index 33dc6a0..4b24b47 100644
33742--- a/drivers/acpi/apei/cper.c
33743+++ b/drivers/acpi/apei/cper.c
33744@@ -39,12 +39,12 @@
33745 */
33746 u64 cper_next_record_id(void)
33747 {
33748- static atomic64_t seq;
33749+ static atomic64_unchecked_t seq;
33750
33751- if (!atomic64_read(&seq))
33752- atomic64_set(&seq, ((u64)get_seconds()) << 32);
33753+ if (!atomic64_read_unchecked(&seq))
33754+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
33755
33756- return atomic64_inc_return(&seq);
33757+ return atomic64_inc_return_unchecked(&seq);
33758 }
33759 EXPORT_SYMBOL_GPL(cper_next_record_id);
33760
33761diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
33762index be60399..778b33e8 100644
33763--- a/drivers/acpi/bgrt.c
33764+++ b/drivers/acpi/bgrt.c
33765@@ -87,8 +87,10 @@ static int __init bgrt_init(void)
33766 return -ENODEV;
33767
33768 sysfs_bin_attr_init(&image_attr);
33769- image_attr.private = bgrt_image;
33770- image_attr.size = bgrt_image_size;
33771+ pax_open_kernel();
33772+ *(void **)&image_attr.private = bgrt_image;
33773+ *(size_t *)&image_attr.size = bgrt_image_size;
33774+ pax_close_kernel();
33775
33776 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
33777 if (!bgrt_kobj)
33778diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
33779index cb96296..b81293b 100644
33780--- a/drivers/acpi/blacklist.c
33781+++ b/drivers/acpi/blacklist.c
33782@@ -52,7 +52,7 @@ struct acpi_blacklist_item {
33783 u32 is_critical_error;
33784 };
33785
33786-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
33787+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
33788
33789 /*
33790 * POLICY: If *anything* doesn't work, put it on the blacklist.
33791@@ -193,7 +193,7 @@ static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
33792 return 0;
33793 }
33794
33795-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
33796+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
33797 {
33798 .callback = dmi_disable_osi_vista,
33799 .ident = "Fujitsu Siemens",
33800diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
33801index 7586544..636a2f0 100644
33802--- a/drivers/acpi/ec_sys.c
33803+++ b/drivers/acpi/ec_sys.c
33804@@ -12,6 +12,7 @@
33805 #include <linux/acpi.h>
33806 #include <linux/debugfs.h>
33807 #include <linux/module.h>
33808+#include <linux/uaccess.h>
33809 #include "internal.h"
33810
33811 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
33812@@ -34,7 +35,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
33813 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
33814 */
33815 unsigned int size = EC_SPACE_SIZE;
33816- u8 *data = (u8 *) buf;
33817+ u8 data;
33818 loff_t init_off = *off;
33819 int err = 0;
33820
33821@@ -47,9 +48,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
33822 size = count;
33823
33824 while (size) {
33825- err = ec_read(*off, &data[*off - init_off]);
33826+ err = ec_read(*off, &data);
33827 if (err)
33828 return err;
33829+ if (put_user(data, &buf[*off - init_off]))
33830+ return -EFAULT;
33831 *off += 1;
33832 size--;
33833 }
33834@@ -65,7 +68,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
33835
33836 unsigned int size = count;
33837 loff_t init_off = *off;
33838- u8 *data = (u8 *) buf;
33839 int err = 0;
33840
33841 if (*off >= EC_SPACE_SIZE)
33842@@ -76,7 +78,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
33843 }
33844
33845 while (size) {
33846- u8 byte_write = data[*off - init_off];
33847+ u8 byte_write;
33848+ if (get_user(byte_write, &buf[*off - init_off]))
33849+ return -EFAULT;
33850 err = ec_write(*off, byte_write);
33851 if (err)
33852 return err;
33853diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
33854index eb133c7..f571552 100644
33855--- a/drivers/acpi/processor_idle.c
33856+++ b/drivers/acpi/processor_idle.c
33857@@ -994,7 +994,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
33858 {
33859 int i, count = CPUIDLE_DRIVER_STATE_START;
33860 struct acpi_processor_cx *cx;
33861- struct cpuidle_state *state;
33862+ cpuidle_state_no_const *state;
33863 struct cpuidle_driver *drv = &acpi_idle_driver;
33864
33865 if (!pr->flags.power_setup_done)
33866diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
33867index fcae5fa..e9f71ea 100644
33868--- a/drivers/acpi/sysfs.c
33869+++ b/drivers/acpi/sysfs.c
33870@@ -423,11 +423,11 @@ static u32 num_counters;
33871 static struct attribute **all_attrs;
33872 static u32 acpi_gpe_count;
33873
33874-static struct attribute_group interrupt_stats_attr_group = {
33875+static attribute_group_no_const interrupt_stats_attr_group = {
33876 .name = "interrupts",
33877 };
33878
33879-static struct kobj_attribute *counter_attrs;
33880+static kobj_attribute_no_const *counter_attrs;
33881
33882 static void delete_gpe_attr_array(void)
33883 {
33884diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
33885index 7b9bdd8..37638ca 100644
33886--- a/drivers/ata/libahci.c
33887+++ b/drivers/ata/libahci.c
33888@@ -1230,7 +1230,7 @@ int ahci_kick_engine(struct ata_port *ap)
33889 }
33890 EXPORT_SYMBOL_GPL(ahci_kick_engine);
33891
33892-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
33893+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
33894 struct ata_taskfile *tf, int is_cmd, u16 flags,
33895 unsigned long timeout_msec)
33896 {
33897diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
33898index adf002a..39bb8f9 100644
33899--- a/drivers/ata/libata-core.c
33900+++ b/drivers/ata/libata-core.c
33901@@ -4792,7 +4792,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
33902 struct ata_port *ap;
33903 unsigned int tag;
33904
33905- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
33906+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
33907 ap = qc->ap;
33908
33909 qc->flags = 0;
33910@@ -4808,7 +4808,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
33911 struct ata_port *ap;
33912 struct ata_link *link;
33913
33914- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
33915+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
33916 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
33917 ap = qc->ap;
33918 link = qc->dev->link;
33919@@ -5926,6 +5926,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
33920 return;
33921
33922 spin_lock(&lock);
33923+ pax_open_kernel();
33924
33925 for (cur = ops->inherits; cur; cur = cur->inherits) {
33926 void **inherit = (void **)cur;
33927@@ -5939,8 +5940,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
33928 if (IS_ERR(*pp))
33929 *pp = NULL;
33930
33931- ops->inherits = NULL;
33932+ *(struct ata_port_operations **)&ops->inherits = NULL;
33933
33934+ pax_close_kernel();
33935 spin_unlock(&lock);
33936 }
33937
33938diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
33939index 7638121..357a965 100644
33940--- a/drivers/ata/pata_arasan_cf.c
33941+++ b/drivers/ata/pata_arasan_cf.c
33942@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
33943 /* Handle platform specific quirks */
33944 if (quirk) {
33945 if (quirk & CF_BROKEN_PIO) {
33946- ap->ops->set_piomode = NULL;
33947+ pax_open_kernel();
33948+ *(void **)&ap->ops->set_piomode = NULL;
33949+ pax_close_kernel();
33950 ap->pio_mask = 0;
33951 }
33952 if (quirk & CF_BROKEN_MWDMA)
33953diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
33954index f9b983a..887b9d8 100644
33955--- a/drivers/atm/adummy.c
33956+++ b/drivers/atm/adummy.c
33957@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
33958 vcc->pop(vcc, skb);
33959 else
33960 dev_kfree_skb_any(skb);
33961- atomic_inc(&vcc->stats->tx);
33962+ atomic_inc_unchecked(&vcc->stats->tx);
33963
33964 return 0;
33965 }
33966diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
33967index 77a7480d..05cde58 100644
33968--- a/drivers/atm/ambassador.c
33969+++ b/drivers/atm/ambassador.c
33970@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
33971 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
33972
33973 // VC layer stats
33974- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
33975+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
33976
33977 // free the descriptor
33978 kfree (tx_descr);
33979@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
33980 dump_skb ("<<<", vc, skb);
33981
33982 // VC layer stats
33983- atomic_inc(&atm_vcc->stats->rx);
33984+ atomic_inc_unchecked(&atm_vcc->stats->rx);
33985 __net_timestamp(skb);
33986 // end of our responsibility
33987 atm_vcc->push (atm_vcc, skb);
33988@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
33989 } else {
33990 PRINTK (KERN_INFO, "dropped over-size frame");
33991 // should we count this?
33992- atomic_inc(&atm_vcc->stats->rx_drop);
33993+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
33994 }
33995
33996 } else {
33997@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
33998 }
33999
34000 if (check_area (skb->data, skb->len)) {
34001- atomic_inc(&atm_vcc->stats->tx_err);
34002+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
34003 return -ENOMEM; // ?
34004 }
34005
34006diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
34007index 0e3f8f9..765a7a5 100644
34008--- a/drivers/atm/atmtcp.c
34009+++ b/drivers/atm/atmtcp.c
34010@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
34011 if (vcc->pop) vcc->pop(vcc,skb);
34012 else dev_kfree_skb(skb);
34013 if (dev_data) return 0;
34014- atomic_inc(&vcc->stats->tx_err);
34015+ atomic_inc_unchecked(&vcc->stats->tx_err);
34016 return -ENOLINK;
34017 }
34018 size = skb->len+sizeof(struct atmtcp_hdr);
34019@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
34020 if (!new_skb) {
34021 if (vcc->pop) vcc->pop(vcc,skb);
34022 else dev_kfree_skb(skb);
34023- atomic_inc(&vcc->stats->tx_err);
34024+ atomic_inc_unchecked(&vcc->stats->tx_err);
34025 return -ENOBUFS;
34026 }
34027 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
34028@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
34029 if (vcc->pop) vcc->pop(vcc,skb);
34030 else dev_kfree_skb(skb);
34031 out_vcc->push(out_vcc,new_skb);
34032- atomic_inc(&vcc->stats->tx);
34033- atomic_inc(&out_vcc->stats->rx);
34034+ atomic_inc_unchecked(&vcc->stats->tx);
34035+ atomic_inc_unchecked(&out_vcc->stats->rx);
34036 return 0;
34037 }
34038
34039@@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
34040 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
34041 read_unlock(&vcc_sklist_lock);
34042 if (!out_vcc) {
34043- atomic_inc(&vcc->stats->tx_err);
34044+ atomic_inc_unchecked(&vcc->stats->tx_err);
34045 goto done;
34046 }
34047 skb_pull(skb,sizeof(struct atmtcp_hdr));
34048@@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
34049 __net_timestamp(new_skb);
34050 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
34051 out_vcc->push(out_vcc,new_skb);
34052- atomic_inc(&vcc->stats->tx);
34053- atomic_inc(&out_vcc->stats->rx);
34054+ atomic_inc_unchecked(&vcc->stats->tx);
34055+ atomic_inc_unchecked(&out_vcc->stats->rx);
34056 done:
34057 if (vcc->pop) vcc->pop(vcc,skb);
34058 else dev_kfree_skb(skb);
34059diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
34060index b1955ba..b179940 100644
34061--- a/drivers/atm/eni.c
34062+++ b/drivers/atm/eni.c
34063@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
34064 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
34065 vcc->dev->number);
34066 length = 0;
34067- atomic_inc(&vcc->stats->rx_err);
34068+ atomic_inc_unchecked(&vcc->stats->rx_err);
34069 }
34070 else {
34071 length = ATM_CELL_SIZE-1; /* no HEC */
34072@@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
34073 size);
34074 }
34075 eff = length = 0;
34076- atomic_inc(&vcc->stats->rx_err);
34077+ atomic_inc_unchecked(&vcc->stats->rx_err);
34078 }
34079 else {
34080 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
34081@@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
34082 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
34083 vcc->dev->number,vcc->vci,length,size << 2,descr);
34084 length = eff = 0;
34085- atomic_inc(&vcc->stats->rx_err);
34086+ atomic_inc_unchecked(&vcc->stats->rx_err);
34087 }
34088 }
34089 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
34090@@ -767,7 +767,7 @@ rx_dequeued++;
34091 vcc->push(vcc,skb);
34092 pushed++;
34093 }
34094- atomic_inc(&vcc->stats->rx);
34095+ atomic_inc_unchecked(&vcc->stats->rx);
34096 }
34097 wake_up(&eni_dev->rx_wait);
34098 }
34099@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
34100 PCI_DMA_TODEVICE);
34101 if (vcc->pop) vcc->pop(vcc,skb);
34102 else dev_kfree_skb_irq(skb);
34103- atomic_inc(&vcc->stats->tx);
34104+ atomic_inc_unchecked(&vcc->stats->tx);
34105 wake_up(&eni_dev->tx_wait);
34106 dma_complete++;
34107 }
34108diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
34109index b41c948..a002b17 100644
34110--- a/drivers/atm/firestream.c
34111+++ b/drivers/atm/firestream.c
34112@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
34113 }
34114 }
34115
34116- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
34117+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
34118
34119 fs_dprintk (FS_DEBUG_TXMEM, "i");
34120 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
34121@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
34122 #endif
34123 skb_put (skb, qe->p1 & 0xffff);
34124 ATM_SKB(skb)->vcc = atm_vcc;
34125- atomic_inc(&atm_vcc->stats->rx);
34126+ atomic_inc_unchecked(&atm_vcc->stats->rx);
34127 __net_timestamp(skb);
34128 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
34129 atm_vcc->push (atm_vcc, skb);
34130@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
34131 kfree (pe);
34132 }
34133 if (atm_vcc)
34134- atomic_inc(&atm_vcc->stats->rx_drop);
34135+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
34136 break;
34137 case 0x1f: /* Reassembly abort: no buffers. */
34138 /* Silently increment error counter. */
34139 if (atm_vcc)
34140- atomic_inc(&atm_vcc->stats->rx_drop);
34141+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
34142 break;
34143 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
34144 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
34145diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
34146index 204814e..cede831 100644
34147--- a/drivers/atm/fore200e.c
34148+++ b/drivers/atm/fore200e.c
34149@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
34150 #endif
34151 /* check error condition */
34152 if (*entry->status & STATUS_ERROR)
34153- atomic_inc(&vcc->stats->tx_err);
34154+ atomic_inc_unchecked(&vcc->stats->tx_err);
34155 else
34156- atomic_inc(&vcc->stats->tx);
34157+ atomic_inc_unchecked(&vcc->stats->tx);
34158 }
34159 }
34160
34161@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
34162 if (skb == NULL) {
34163 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
34164
34165- atomic_inc(&vcc->stats->rx_drop);
34166+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34167 return -ENOMEM;
34168 }
34169
34170@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
34171
34172 dev_kfree_skb_any(skb);
34173
34174- atomic_inc(&vcc->stats->rx_drop);
34175+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34176 return -ENOMEM;
34177 }
34178
34179 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
34180
34181 vcc->push(vcc, skb);
34182- atomic_inc(&vcc->stats->rx);
34183+ atomic_inc_unchecked(&vcc->stats->rx);
34184
34185 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
34186
34187@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
34188 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
34189 fore200e->atm_dev->number,
34190 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
34191- atomic_inc(&vcc->stats->rx_err);
34192+ atomic_inc_unchecked(&vcc->stats->rx_err);
34193 }
34194 }
34195
34196@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
34197 goto retry_here;
34198 }
34199
34200- atomic_inc(&vcc->stats->tx_err);
34201+ atomic_inc_unchecked(&vcc->stats->tx_err);
34202
34203 fore200e->tx_sat++;
34204 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
34205diff --git a/drivers/atm/he.c b/drivers/atm/he.c
34206index 507362a..a845e57 100644
34207--- a/drivers/atm/he.c
34208+++ b/drivers/atm/he.c
34209@@ -1698,7 +1698,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
34210
34211 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
34212 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
34213- atomic_inc(&vcc->stats->rx_drop);
34214+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34215 goto return_host_buffers;
34216 }
34217
34218@@ -1725,7 +1725,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
34219 RBRQ_LEN_ERR(he_dev->rbrq_head)
34220 ? "LEN_ERR" : "",
34221 vcc->vpi, vcc->vci);
34222- atomic_inc(&vcc->stats->rx_err);
34223+ atomic_inc_unchecked(&vcc->stats->rx_err);
34224 goto return_host_buffers;
34225 }
34226
34227@@ -1777,7 +1777,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
34228 vcc->push(vcc, skb);
34229 spin_lock(&he_dev->global_lock);
34230
34231- atomic_inc(&vcc->stats->rx);
34232+ atomic_inc_unchecked(&vcc->stats->rx);
34233
34234 return_host_buffers:
34235 ++pdus_assembled;
34236@@ -2103,7 +2103,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
34237 tpd->vcc->pop(tpd->vcc, tpd->skb);
34238 else
34239 dev_kfree_skb_any(tpd->skb);
34240- atomic_inc(&tpd->vcc->stats->tx_err);
34241+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
34242 }
34243 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
34244 return;
34245@@ -2515,7 +2515,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
34246 vcc->pop(vcc, skb);
34247 else
34248 dev_kfree_skb_any(skb);
34249- atomic_inc(&vcc->stats->tx_err);
34250+ atomic_inc_unchecked(&vcc->stats->tx_err);
34251 return -EINVAL;
34252 }
34253
34254@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
34255 vcc->pop(vcc, skb);
34256 else
34257 dev_kfree_skb_any(skb);
34258- atomic_inc(&vcc->stats->tx_err);
34259+ atomic_inc_unchecked(&vcc->stats->tx_err);
34260 return -EINVAL;
34261 }
34262 #endif
34263@@ -2538,7 +2538,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
34264 vcc->pop(vcc, skb);
34265 else
34266 dev_kfree_skb_any(skb);
34267- atomic_inc(&vcc->stats->tx_err);
34268+ atomic_inc_unchecked(&vcc->stats->tx_err);
34269 spin_unlock_irqrestore(&he_dev->global_lock, flags);
34270 return -ENOMEM;
34271 }
34272@@ -2580,7 +2580,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
34273 vcc->pop(vcc, skb);
34274 else
34275 dev_kfree_skb_any(skb);
34276- atomic_inc(&vcc->stats->tx_err);
34277+ atomic_inc_unchecked(&vcc->stats->tx_err);
34278 spin_unlock_irqrestore(&he_dev->global_lock, flags);
34279 return -ENOMEM;
34280 }
34281@@ -2611,7 +2611,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
34282 __enqueue_tpd(he_dev, tpd, cid);
34283 spin_unlock_irqrestore(&he_dev->global_lock, flags);
34284
34285- atomic_inc(&vcc->stats->tx);
34286+ atomic_inc_unchecked(&vcc->stats->tx);
34287
34288 return 0;
34289 }
34290diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
34291index 1dc0519..1aadaf7 100644
34292--- a/drivers/atm/horizon.c
34293+++ b/drivers/atm/horizon.c
34294@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
34295 {
34296 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
34297 // VC layer stats
34298- atomic_inc(&vcc->stats->rx);
34299+ atomic_inc_unchecked(&vcc->stats->rx);
34300 __net_timestamp(skb);
34301 // end of our responsibility
34302 vcc->push (vcc, skb);
34303@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
34304 dev->tx_iovec = NULL;
34305
34306 // VC layer stats
34307- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
34308+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
34309
34310 // free the skb
34311 hrz_kfree_skb (skb);
34312diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
34313index 272f009..a18ba55 100644
34314--- a/drivers/atm/idt77252.c
34315+++ b/drivers/atm/idt77252.c
34316@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
34317 else
34318 dev_kfree_skb(skb);
34319
34320- atomic_inc(&vcc->stats->tx);
34321+ atomic_inc_unchecked(&vcc->stats->tx);
34322 }
34323
34324 atomic_dec(&scq->used);
34325@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
34326 if ((sb = dev_alloc_skb(64)) == NULL) {
34327 printk("%s: Can't allocate buffers for aal0.\n",
34328 card->name);
34329- atomic_add(i, &vcc->stats->rx_drop);
34330+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
34331 break;
34332 }
34333 if (!atm_charge(vcc, sb->truesize)) {
34334 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
34335 card->name);
34336- atomic_add(i - 1, &vcc->stats->rx_drop);
34337+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
34338 dev_kfree_skb(sb);
34339 break;
34340 }
34341@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
34342 ATM_SKB(sb)->vcc = vcc;
34343 __net_timestamp(sb);
34344 vcc->push(vcc, sb);
34345- atomic_inc(&vcc->stats->rx);
34346+ atomic_inc_unchecked(&vcc->stats->rx);
34347
34348 cell += ATM_CELL_PAYLOAD;
34349 }
34350@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
34351 "(CDC: %08x)\n",
34352 card->name, len, rpp->len, readl(SAR_REG_CDC));
34353 recycle_rx_pool_skb(card, rpp);
34354- atomic_inc(&vcc->stats->rx_err);
34355+ atomic_inc_unchecked(&vcc->stats->rx_err);
34356 return;
34357 }
34358 if (stat & SAR_RSQE_CRC) {
34359 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
34360 recycle_rx_pool_skb(card, rpp);
34361- atomic_inc(&vcc->stats->rx_err);
34362+ atomic_inc_unchecked(&vcc->stats->rx_err);
34363 return;
34364 }
34365 if (skb_queue_len(&rpp->queue) > 1) {
34366@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
34367 RXPRINTK("%s: Can't alloc RX skb.\n",
34368 card->name);
34369 recycle_rx_pool_skb(card, rpp);
34370- atomic_inc(&vcc->stats->rx_err);
34371+ atomic_inc_unchecked(&vcc->stats->rx_err);
34372 return;
34373 }
34374 if (!atm_charge(vcc, skb->truesize)) {
34375@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
34376 __net_timestamp(skb);
34377
34378 vcc->push(vcc, skb);
34379- atomic_inc(&vcc->stats->rx);
34380+ atomic_inc_unchecked(&vcc->stats->rx);
34381
34382 return;
34383 }
34384@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
34385 __net_timestamp(skb);
34386
34387 vcc->push(vcc, skb);
34388- atomic_inc(&vcc->stats->rx);
34389+ atomic_inc_unchecked(&vcc->stats->rx);
34390
34391 if (skb->truesize > SAR_FB_SIZE_3)
34392 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
34393@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
34394 if (vcc->qos.aal != ATM_AAL0) {
34395 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
34396 card->name, vpi, vci);
34397- atomic_inc(&vcc->stats->rx_drop);
34398+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34399 goto drop;
34400 }
34401
34402 if ((sb = dev_alloc_skb(64)) == NULL) {
34403 printk("%s: Can't allocate buffers for AAL0.\n",
34404 card->name);
34405- atomic_inc(&vcc->stats->rx_err);
34406+ atomic_inc_unchecked(&vcc->stats->rx_err);
34407 goto drop;
34408 }
34409
34410@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
34411 ATM_SKB(sb)->vcc = vcc;
34412 __net_timestamp(sb);
34413 vcc->push(vcc, sb);
34414- atomic_inc(&vcc->stats->rx);
34415+ atomic_inc_unchecked(&vcc->stats->rx);
34416
34417 drop:
34418 skb_pull(queue, 64);
34419@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
34420
34421 if (vc == NULL) {
34422 printk("%s: NULL connection in send().\n", card->name);
34423- atomic_inc(&vcc->stats->tx_err);
34424+ atomic_inc_unchecked(&vcc->stats->tx_err);
34425 dev_kfree_skb(skb);
34426 return -EINVAL;
34427 }
34428 if (!test_bit(VCF_TX, &vc->flags)) {
34429 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
34430- atomic_inc(&vcc->stats->tx_err);
34431+ atomic_inc_unchecked(&vcc->stats->tx_err);
34432 dev_kfree_skb(skb);
34433 return -EINVAL;
34434 }
34435@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
34436 break;
34437 default:
34438 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
34439- atomic_inc(&vcc->stats->tx_err);
34440+ atomic_inc_unchecked(&vcc->stats->tx_err);
34441 dev_kfree_skb(skb);
34442 return -EINVAL;
34443 }
34444
34445 if (skb_shinfo(skb)->nr_frags != 0) {
34446 printk("%s: No scatter-gather yet.\n", card->name);
34447- atomic_inc(&vcc->stats->tx_err);
34448+ atomic_inc_unchecked(&vcc->stats->tx_err);
34449 dev_kfree_skb(skb);
34450 return -EINVAL;
34451 }
34452@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
34453
34454 err = queue_skb(card, vc, skb, oam);
34455 if (err) {
34456- atomic_inc(&vcc->stats->tx_err);
34457+ atomic_inc_unchecked(&vcc->stats->tx_err);
34458 dev_kfree_skb(skb);
34459 return err;
34460 }
34461@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
34462 skb = dev_alloc_skb(64);
34463 if (!skb) {
34464 printk("%s: Out of memory in send_oam().\n", card->name);
34465- atomic_inc(&vcc->stats->tx_err);
34466+ atomic_inc_unchecked(&vcc->stats->tx_err);
34467 return -ENOMEM;
34468 }
34469 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
34470diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
34471index 4217f29..88f547a 100644
34472--- a/drivers/atm/iphase.c
34473+++ b/drivers/atm/iphase.c
34474@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
34475 status = (u_short) (buf_desc_ptr->desc_mode);
34476 if (status & (RX_CER | RX_PTE | RX_OFL))
34477 {
34478- atomic_inc(&vcc->stats->rx_err);
34479+ atomic_inc_unchecked(&vcc->stats->rx_err);
34480 IF_ERR(printk("IA: bad packet, dropping it");)
34481 if (status & RX_CER) {
34482 IF_ERR(printk(" cause: packet CRC error\n");)
34483@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
34484 len = dma_addr - buf_addr;
34485 if (len > iadev->rx_buf_sz) {
34486 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
34487- atomic_inc(&vcc->stats->rx_err);
34488+ atomic_inc_unchecked(&vcc->stats->rx_err);
34489 goto out_free_desc;
34490 }
34491
34492@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
34493 ia_vcc = INPH_IA_VCC(vcc);
34494 if (ia_vcc == NULL)
34495 {
34496- atomic_inc(&vcc->stats->rx_err);
34497+ atomic_inc_unchecked(&vcc->stats->rx_err);
34498 atm_return(vcc, skb->truesize);
34499 dev_kfree_skb_any(skb);
34500 goto INCR_DLE;
34501@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
34502 if ((length > iadev->rx_buf_sz) || (length >
34503 (skb->len - sizeof(struct cpcs_trailer))))
34504 {
34505- atomic_inc(&vcc->stats->rx_err);
34506+ atomic_inc_unchecked(&vcc->stats->rx_err);
34507 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
34508 length, skb->len);)
34509 atm_return(vcc, skb->truesize);
34510@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
34511
34512 IF_RX(printk("rx_dle_intr: skb push");)
34513 vcc->push(vcc,skb);
34514- atomic_inc(&vcc->stats->rx);
34515+ atomic_inc_unchecked(&vcc->stats->rx);
34516 iadev->rx_pkt_cnt++;
34517 }
34518 INCR_DLE:
34519@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
34520 {
34521 struct k_sonet_stats *stats;
34522 stats = &PRIV(_ia_dev[board])->sonet_stats;
34523- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
34524- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
34525- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
34526- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
34527- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
34528- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
34529- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
34530- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
34531- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
34532+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
34533+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
34534+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
34535+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
34536+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
34537+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
34538+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
34539+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
34540+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
34541 }
34542 ia_cmds.status = 0;
34543 break;
34544@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
34545 if ((desc == 0) || (desc > iadev->num_tx_desc))
34546 {
34547 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
34548- atomic_inc(&vcc->stats->tx);
34549+ atomic_inc_unchecked(&vcc->stats->tx);
34550 if (vcc->pop)
34551 vcc->pop(vcc, skb);
34552 else
34553@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
34554 ATM_DESC(skb) = vcc->vci;
34555 skb_queue_tail(&iadev->tx_dma_q, skb);
34556
34557- atomic_inc(&vcc->stats->tx);
34558+ atomic_inc_unchecked(&vcc->stats->tx);
34559 iadev->tx_pkt_cnt++;
34560 /* Increment transaction counter */
34561 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
34562
34563 #if 0
34564 /* add flow control logic */
34565- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
34566+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
34567 if (iavcc->vc_desc_cnt > 10) {
34568 vcc->tx_quota = vcc->tx_quota * 3 / 4;
34569 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
34570diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
34571index fa7d701..1e404c7 100644
34572--- a/drivers/atm/lanai.c
34573+++ b/drivers/atm/lanai.c
34574@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
34575 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
34576 lanai_endtx(lanai, lvcc);
34577 lanai_free_skb(lvcc->tx.atmvcc, skb);
34578- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
34579+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
34580 }
34581
34582 /* Try to fill the buffer - don't call unless there is backlog */
34583@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
34584 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
34585 __net_timestamp(skb);
34586 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
34587- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
34588+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
34589 out:
34590 lvcc->rx.buf.ptr = end;
34591 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
34592@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
34593 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
34594 "vcc %d\n", lanai->number, (unsigned int) s, vci);
34595 lanai->stats.service_rxnotaal5++;
34596- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
34597+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
34598 return 0;
34599 }
34600 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
34601@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
34602 int bytes;
34603 read_unlock(&vcc_sklist_lock);
34604 DPRINTK("got trashed rx pdu on vci %d\n", vci);
34605- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
34606+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
34607 lvcc->stats.x.aal5.service_trash++;
34608 bytes = (SERVICE_GET_END(s) * 16) -
34609 (((unsigned long) lvcc->rx.buf.ptr) -
34610@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
34611 }
34612 if (s & SERVICE_STREAM) {
34613 read_unlock(&vcc_sklist_lock);
34614- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
34615+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
34616 lvcc->stats.x.aal5.service_stream++;
34617 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
34618 "PDU on VCI %d!\n", lanai->number, vci);
34619@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
34620 return 0;
34621 }
34622 DPRINTK("got rx crc error on vci %d\n", vci);
34623- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
34624+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
34625 lvcc->stats.x.aal5.service_rxcrc++;
34626 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
34627 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
34628diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
34629index 6587dc2..149833d 100644
34630--- a/drivers/atm/nicstar.c
34631+++ b/drivers/atm/nicstar.c
34632@@ -1641,7 +1641,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
34633 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
34634 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
34635 card->index);
34636- atomic_inc(&vcc->stats->tx_err);
34637+ atomic_inc_unchecked(&vcc->stats->tx_err);
34638 dev_kfree_skb_any(skb);
34639 return -EINVAL;
34640 }
34641@@ -1649,7 +1649,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
34642 if (!vc->tx) {
34643 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
34644 card->index);
34645- atomic_inc(&vcc->stats->tx_err);
34646+ atomic_inc_unchecked(&vcc->stats->tx_err);
34647 dev_kfree_skb_any(skb);
34648 return -EINVAL;
34649 }
34650@@ -1657,14 +1657,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
34651 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
34652 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
34653 card->index);
34654- atomic_inc(&vcc->stats->tx_err);
34655+ atomic_inc_unchecked(&vcc->stats->tx_err);
34656 dev_kfree_skb_any(skb);
34657 return -EINVAL;
34658 }
34659
34660 if (skb_shinfo(skb)->nr_frags != 0) {
34661 printk("nicstar%d: No scatter-gather yet.\n", card->index);
34662- atomic_inc(&vcc->stats->tx_err);
34663+ atomic_inc_unchecked(&vcc->stats->tx_err);
34664 dev_kfree_skb_any(skb);
34665 return -EINVAL;
34666 }
34667@@ -1712,11 +1712,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
34668 }
34669
34670 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
34671- atomic_inc(&vcc->stats->tx_err);
34672+ atomic_inc_unchecked(&vcc->stats->tx_err);
34673 dev_kfree_skb_any(skb);
34674 return -EIO;
34675 }
34676- atomic_inc(&vcc->stats->tx);
34677+ atomic_inc_unchecked(&vcc->stats->tx);
34678
34679 return 0;
34680 }
34681@@ -2033,14 +2033,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34682 printk
34683 ("nicstar%d: Can't allocate buffers for aal0.\n",
34684 card->index);
34685- atomic_add(i, &vcc->stats->rx_drop);
34686+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
34687 break;
34688 }
34689 if (!atm_charge(vcc, sb->truesize)) {
34690 RXPRINTK
34691 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
34692 card->index);
34693- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
34694+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
34695 dev_kfree_skb_any(sb);
34696 break;
34697 }
34698@@ -2055,7 +2055,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34699 ATM_SKB(sb)->vcc = vcc;
34700 __net_timestamp(sb);
34701 vcc->push(vcc, sb);
34702- atomic_inc(&vcc->stats->rx);
34703+ atomic_inc_unchecked(&vcc->stats->rx);
34704 cell += ATM_CELL_PAYLOAD;
34705 }
34706
34707@@ -2072,7 +2072,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34708 if (iovb == NULL) {
34709 printk("nicstar%d: Out of iovec buffers.\n",
34710 card->index);
34711- atomic_inc(&vcc->stats->rx_drop);
34712+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34713 recycle_rx_buf(card, skb);
34714 return;
34715 }
34716@@ -2096,7 +2096,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34717 small or large buffer itself. */
34718 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
34719 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
34720- atomic_inc(&vcc->stats->rx_err);
34721+ atomic_inc_unchecked(&vcc->stats->rx_err);
34722 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
34723 NS_MAX_IOVECS);
34724 NS_PRV_IOVCNT(iovb) = 0;
34725@@ -2116,7 +2116,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34726 ("nicstar%d: Expected a small buffer, and this is not one.\n",
34727 card->index);
34728 which_list(card, skb);
34729- atomic_inc(&vcc->stats->rx_err);
34730+ atomic_inc_unchecked(&vcc->stats->rx_err);
34731 recycle_rx_buf(card, skb);
34732 vc->rx_iov = NULL;
34733 recycle_iov_buf(card, iovb);
34734@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34735 ("nicstar%d: Expected a large buffer, and this is not one.\n",
34736 card->index);
34737 which_list(card, skb);
34738- atomic_inc(&vcc->stats->rx_err);
34739+ atomic_inc_unchecked(&vcc->stats->rx_err);
34740 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
34741 NS_PRV_IOVCNT(iovb));
34742 vc->rx_iov = NULL;
34743@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34744 printk(" - PDU size mismatch.\n");
34745 else
34746 printk(".\n");
34747- atomic_inc(&vcc->stats->rx_err);
34748+ atomic_inc_unchecked(&vcc->stats->rx_err);
34749 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
34750 NS_PRV_IOVCNT(iovb));
34751 vc->rx_iov = NULL;
34752@@ -2166,7 +2166,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34753 /* skb points to a small buffer */
34754 if (!atm_charge(vcc, skb->truesize)) {
34755 push_rxbufs(card, skb);
34756- atomic_inc(&vcc->stats->rx_drop);
34757+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34758 } else {
34759 skb_put(skb, len);
34760 dequeue_sm_buf(card, skb);
34761@@ -2176,7 +2176,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34762 ATM_SKB(skb)->vcc = vcc;
34763 __net_timestamp(skb);
34764 vcc->push(vcc, skb);
34765- atomic_inc(&vcc->stats->rx);
34766+ atomic_inc_unchecked(&vcc->stats->rx);
34767 }
34768 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
34769 struct sk_buff *sb;
34770@@ -2187,7 +2187,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34771 if (len <= NS_SMBUFSIZE) {
34772 if (!atm_charge(vcc, sb->truesize)) {
34773 push_rxbufs(card, sb);
34774- atomic_inc(&vcc->stats->rx_drop);
34775+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34776 } else {
34777 skb_put(sb, len);
34778 dequeue_sm_buf(card, sb);
34779@@ -2197,7 +2197,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34780 ATM_SKB(sb)->vcc = vcc;
34781 __net_timestamp(sb);
34782 vcc->push(vcc, sb);
34783- atomic_inc(&vcc->stats->rx);
34784+ atomic_inc_unchecked(&vcc->stats->rx);
34785 }
34786
34787 push_rxbufs(card, skb);
34788@@ -2206,7 +2206,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34789
34790 if (!atm_charge(vcc, skb->truesize)) {
34791 push_rxbufs(card, skb);
34792- atomic_inc(&vcc->stats->rx_drop);
34793+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34794 } else {
34795 dequeue_lg_buf(card, skb);
34796 #ifdef NS_USE_DESTRUCTORS
34797@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34798 ATM_SKB(skb)->vcc = vcc;
34799 __net_timestamp(skb);
34800 vcc->push(vcc, skb);
34801- atomic_inc(&vcc->stats->rx);
34802+ atomic_inc_unchecked(&vcc->stats->rx);
34803 }
34804
34805 push_rxbufs(card, sb);
34806@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34807 printk
34808 ("nicstar%d: Out of huge buffers.\n",
34809 card->index);
34810- atomic_inc(&vcc->stats->rx_drop);
34811+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34812 recycle_iovec_rx_bufs(card,
34813 (struct iovec *)
34814 iovb->data,
34815@@ -2291,7 +2291,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34816 card->hbpool.count++;
34817 } else
34818 dev_kfree_skb_any(hb);
34819- atomic_inc(&vcc->stats->rx_drop);
34820+ atomic_inc_unchecked(&vcc->stats->rx_drop);
34821 } else {
34822 /* Copy the small buffer to the huge buffer */
34823 sb = (struct sk_buff *)iov->iov_base;
34824@@ -2328,7 +2328,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
34825 #endif /* NS_USE_DESTRUCTORS */
34826 __net_timestamp(hb);
34827 vcc->push(vcc, hb);
34828- atomic_inc(&vcc->stats->rx);
34829+ atomic_inc_unchecked(&vcc->stats->rx);
34830 }
34831 }
34832
34833diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
34834index 32784d1..4a8434a 100644
34835--- a/drivers/atm/solos-pci.c
34836+++ b/drivers/atm/solos-pci.c
34837@@ -838,7 +838,7 @@ void solos_bh(unsigned long card_arg)
34838 }
34839 atm_charge(vcc, skb->truesize);
34840 vcc->push(vcc, skb);
34841- atomic_inc(&vcc->stats->rx);
34842+ atomic_inc_unchecked(&vcc->stats->rx);
34843 break;
34844
34845 case PKT_STATUS:
34846@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
34847 vcc = SKB_CB(oldskb)->vcc;
34848
34849 if (vcc) {
34850- atomic_inc(&vcc->stats->tx);
34851+ atomic_inc_unchecked(&vcc->stats->tx);
34852 solos_pop(vcc, oldskb);
34853 } else {
34854 dev_kfree_skb_irq(oldskb);
34855diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
34856index 0215934..ce9f5b1 100644
34857--- a/drivers/atm/suni.c
34858+++ b/drivers/atm/suni.c
34859@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
34860
34861
34862 #define ADD_LIMITED(s,v) \
34863- atomic_add((v),&stats->s); \
34864- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
34865+ atomic_add_unchecked((v),&stats->s); \
34866+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
34867
34868
34869 static void suni_hz(unsigned long from_timer)
34870diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
34871index 5120a96..e2572bd 100644
34872--- a/drivers/atm/uPD98402.c
34873+++ b/drivers/atm/uPD98402.c
34874@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
34875 struct sonet_stats tmp;
34876 int error = 0;
34877
34878- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
34879+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
34880 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
34881 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
34882 if (zero && !error) {
34883@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
34884
34885
34886 #define ADD_LIMITED(s,v) \
34887- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
34888- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
34889- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
34890+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
34891+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
34892+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
34893
34894
34895 static void stat_event(struct atm_dev *dev)
34896@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
34897 if (reason & uPD98402_INT_PFM) stat_event(dev);
34898 if (reason & uPD98402_INT_PCO) {
34899 (void) GET(PCOCR); /* clear interrupt cause */
34900- atomic_add(GET(HECCT),
34901+ atomic_add_unchecked(GET(HECCT),
34902 &PRIV(dev)->sonet_stats.uncorr_hcs);
34903 }
34904 if ((reason & uPD98402_INT_RFO) &&
34905@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
34906 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
34907 uPD98402_INT_LOS),PIMR); /* enable them */
34908 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
34909- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
34910- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
34911- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
34912+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
34913+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
34914+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
34915 return 0;
34916 }
34917
34918diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
34919index 969c3c2..9b72956 100644
34920--- a/drivers/atm/zatm.c
34921+++ b/drivers/atm/zatm.c
34922@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
34923 }
34924 if (!size) {
34925 dev_kfree_skb_irq(skb);
34926- if (vcc) atomic_inc(&vcc->stats->rx_err);
34927+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
34928 continue;
34929 }
34930 if (!atm_charge(vcc,skb->truesize)) {
34931@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
34932 skb->len = size;
34933 ATM_SKB(skb)->vcc = vcc;
34934 vcc->push(vcc,skb);
34935- atomic_inc(&vcc->stats->rx);
34936+ atomic_inc_unchecked(&vcc->stats->rx);
34937 }
34938 zout(pos & 0xffff,MTA(mbx));
34939 #if 0 /* probably a stupid idea */
34940@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
34941 skb_queue_head(&zatm_vcc->backlog,skb);
34942 break;
34943 }
34944- atomic_inc(&vcc->stats->tx);
34945+ atomic_inc_unchecked(&vcc->stats->tx);
34946 wake_up(&zatm_vcc->tx_wait);
34947 }
34948
34949diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
34950index d78b204..ecc1929 100644
34951--- a/drivers/base/attribute_container.c
34952+++ b/drivers/base/attribute_container.c
34953@@ -167,7 +167,7 @@ attribute_container_add_device(struct device *dev,
34954 ic->classdev.parent = get_device(dev);
34955 ic->classdev.class = cont->class;
34956 cont->class->dev_release = attribute_container_release;
34957- dev_set_name(&ic->classdev, dev_name(dev));
34958+ dev_set_name(&ic->classdev, "%s", dev_name(dev));
34959 if (fn)
34960 fn(cont, dev, &ic->classdev);
34961 else
34962diff --git a/drivers/base/bus.c b/drivers/base/bus.c
34963index d414331..b4dd4ba 100644
34964--- a/drivers/base/bus.c
34965+++ b/drivers/base/bus.c
34966@@ -1163,7 +1163,7 @@ int subsys_interface_register(struct subsys_interface *sif)
34967 return -EINVAL;
34968
34969 mutex_lock(&subsys->p->mutex);
34970- list_add_tail(&sif->node, &subsys->p->interfaces);
34971+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
34972 if (sif->add_dev) {
34973 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
34974 while ((dev = subsys_dev_iter_next(&iter)))
34975@@ -1188,7 +1188,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
34976 subsys = sif->subsys;
34977
34978 mutex_lock(&subsys->p->mutex);
34979- list_del_init(&sif->node);
34980+ pax_list_del_init((struct list_head *)&sif->node);
34981 if (sif->remove_dev) {
34982 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
34983 while ((dev = subsys_dev_iter_next(&iter)))
34984diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
34985index 7413d06..79155fa 100644
34986--- a/drivers/base/devtmpfs.c
34987+++ b/drivers/base/devtmpfs.c
34988@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
34989 if (!thread)
34990 return 0;
34991
34992- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
34993+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
34994 if (err)
34995 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
34996 else
34997@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
34998 *err = sys_unshare(CLONE_NEWNS);
34999 if (*err)
35000 goto out;
35001- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
35002+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
35003 if (*err)
35004 goto out;
35005- sys_chdir("/.."); /* will traverse into overmounted root */
35006- sys_chroot(".");
35007+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
35008+ sys_chroot((char __force_user *)".");
35009 complete(&setup_done);
35010 while (1) {
35011 spin_lock(&req_lock);
35012diff --git a/drivers/base/node.c b/drivers/base/node.c
35013index 7616a77c..8f57f51 100644
35014--- a/drivers/base/node.c
35015+++ b/drivers/base/node.c
35016@@ -626,7 +626,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
35017 struct node_attr {
35018 struct device_attribute attr;
35019 enum node_states state;
35020-};
35021+} __do_const;
35022
35023 static ssize_t show_node_state(struct device *dev,
35024 struct device_attribute *attr, char *buf)
35025diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
35026index 7072404..76dcebd 100644
35027--- a/drivers/base/power/domain.c
35028+++ b/drivers/base/power/domain.c
35029@@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
35030 {
35031 struct cpuidle_driver *cpuidle_drv;
35032 struct gpd_cpu_data *cpu_data;
35033- struct cpuidle_state *idle_state;
35034+ cpuidle_state_no_const *idle_state;
35035 int ret = 0;
35036
35037 if (IS_ERR_OR_NULL(genpd) || state < 0)
35038@@ -1918,7 +1918,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
35039 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
35040 {
35041 struct gpd_cpu_data *cpu_data;
35042- struct cpuidle_state *idle_state;
35043+ cpuidle_state_no_const *idle_state;
35044 int ret = 0;
35045
35046 if (IS_ERR_OR_NULL(genpd))
35047diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
35048index a53ebd2..8f73eeb 100644
35049--- a/drivers/base/power/sysfs.c
35050+++ b/drivers/base/power/sysfs.c
35051@@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
35052 return -EIO;
35053 }
35054 }
35055- return sprintf(buf, p);
35056+ return sprintf(buf, "%s", p);
35057 }
35058
35059 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
35060diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
35061index 79715e7..df06b3b 100644
35062--- a/drivers/base/power/wakeup.c
35063+++ b/drivers/base/power/wakeup.c
35064@@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
35065 * They need to be modified together atomically, so it's better to use one
35066 * atomic variable to hold them both.
35067 */
35068-static atomic_t combined_event_count = ATOMIC_INIT(0);
35069+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
35070
35071 #define IN_PROGRESS_BITS (sizeof(int) * 4)
35072 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
35073
35074 static void split_counters(unsigned int *cnt, unsigned int *inpr)
35075 {
35076- unsigned int comb = atomic_read(&combined_event_count);
35077+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
35078
35079 *cnt = (comb >> IN_PROGRESS_BITS);
35080 *inpr = comb & MAX_IN_PROGRESS;
35081@@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
35082 ws->start_prevent_time = ws->last_time;
35083
35084 /* Increment the counter of events in progress. */
35085- cec = atomic_inc_return(&combined_event_count);
35086+ cec = atomic_inc_return_unchecked(&combined_event_count);
35087
35088 trace_wakeup_source_activate(ws->name, cec);
35089 }
35090@@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
35091 * Increment the counter of registered wakeup events and decrement the
35092 * couter of wakeup events in progress simultaneously.
35093 */
35094- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
35095+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
35096 trace_wakeup_source_deactivate(ws->name, cec);
35097
35098 split_counters(&cnt, &inpr);
35099diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
35100index e8d11b6..7b1b36f 100644
35101--- a/drivers/base/syscore.c
35102+++ b/drivers/base/syscore.c
35103@@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
35104 void register_syscore_ops(struct syscore_ops *ops)
35105 {
35106 mutex_lock(&syscore_ops_lock);
35107- list_add_tail(&ops->node, &syscore_ops_list);
35108+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
35109 mutex_unlock(&syscore_ops_lock);
35110 }
35111 EXPORT_SYMBOL_GPL(register_syscore_ops);
35112@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
35113 void unregister_syscore_ops(struct syscore_ops *ops)
35114 {
35115 mutex_lock(&syscore_ops_lock);
35116- list_del(&ops->node);
35117+ pax_list_del((struct list_head *)&ops->node);
35118 mutex_unlock(&syscore_ops_lock);
35119 }
35120 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
35121diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
35122index 62b6c2c..4a11354 100644
35123--- a/drivers/block/cciss.c
35124+++ b/drivers/block/cciss.c
35125@@ -1189,6 +1189,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
35126 int err;
35127 u32 cp;
35128
35129+ memset(&arg64, 0, sizeof(arg64));
35130+
35131 err = 0;
35132 err |=
35133 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
35134@@ -3010,7 +3012,7 @@ static void start_io(ctlr_info_t *h)
35135 while (!list_empty(&h->reqQ)) {
35136 c = list_entry(h->reqQ.next, CommandList_struct, list);
35137 /* can't do anything if fifo is full */
35138- if ((h->access.fifo_full(h))) {
35139+ if ((h->access->fifo_full(h))) {
35140 dev_warn(&h->pdev->dev, "fifo full\n");
35141 break;
35142 }
35143@@ -3020,7 +3022,7 @@ static void start_io(ctlr_info_t *h)
35144 h->Qdepth--;
35145
35146 /* Tell the controller execute command */
35147- h->access.submit_command(h, c);
35148+ h->access->submit_command(h, c);
35149
35150 /* Put job onto the completed Q */
35151 addQ(&h->cmpQ, c);
35152@@ -3446,17 +3448,17 @@ startio:
35153
35154 static inline unsigned long get_next_completion(ctlr_info_t *h)
35155 {
35156- return h->access.command_completed(h);
35157+ return h->access->command_completed(h);
35158 }
35159
35160 static inline int interrupt_pending(ctlr_info_t *h)
35161 {
35162- return h->access.intr_pending(h);
35163+ return h->access->intr_pending(h);
35164 }
35165
35166 static inline long interrupt_not_for_us(ctlr_info_t *h)
35167 {
35168- return ((h->access.intr_pending(h) == 0) ||
35169+ return ((h->access->intr_pending(h) == 0) ||
35170 (h->interrupts_enabled == 0));
35171 }
35172
35173@@ -3489,7 +3491,7 @@ static inline u32 next_command(ctlr_info_t *h)
35174 u32 a;
35175
35176 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
35177- return h->access.command_completed(h);
35178+ return h->access->command_completed(h);
35179
35180 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
35181 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
35182@@ -4046,7 +4048,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
35183 trans_support & CFGTBL_Trans_use_short_tags);
35184
35185 /* Change the access methods to the performant access methods */
35186- h->access = SA5_performant_access;
35187+ h->access = &SA5_performant_access;
35188 h->transMethod = CFGTBL_Trans_Performant;
35189
35190 return;
35191@@ -4319,7 +4321,7 @@ static int cciss_pci_init(ctlr_info_t *h)
35192 if (prod_index < 0)
35193 return -ENODEV;
35194 h->product_name = products[prod_index].product_name;
35195- h->access = *(products[prod_index].access);
35196+ h->access = products[prod_index].access;
35197
35198 if (cciss_board_disabled(h)) {
35199 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
35200@@ -5051,7 +5053,7 @@ reinit_after_soft_reset:
35201 }
35202
35203 /* make sure the board interrupts are off */
35204- h->access.set_intr_mask(h, CCISS_INTR_OFF);
35205+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
35206 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
35207 if (rc)
35208 goto clean2;
35209@@ -5101,7 +5103,7 @@ reinit_after_soft_reset:
35210 * fake ones to scoop up any residual completions.
35211 */
35212 spin_lock_irqsave(&h->lock, flags);
35213- h->access.set_intr_mask(h, CCISS_INTR_OFF);
35214+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
35215 spin_unlock_irqrestore(&h->lock, flags);
35216 free_irq(h->intr[h->intr_mode], h);
35217 rc = cciss_request_irq(h, cciss_msix_discard_completions,
35218@@ -5121,9 +5123,9 @@ reinit_after_soft_reset:
35219 dev_info(&h->pdev->dev, "Board READY.\n");
35220 dev_info(&h->pdev->dev,
35221 "Waiting for stale completions to drain.\n");
35222- h->access.set_intr_mask(h, CCISS_INTR_ON);
35223+ h->access->set_intr_mask(h, CCISS_INTR_ON);
35224 msleep(10000);
35225- h->access.set_intr_mask(h, CCISS_INTR_OFF);
35226+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
35227
35228 rc = controller_reset_failed(h->cfgtable);
35229 if (rc)
35230@@ -5146,7 +5148,7 @@ reinit_after_soft_reset:
35231 cciss_scsi_setup(h);
35232
35233 /* Turn the interrupts on so we can service requests */
35234- h->access.set_intr_mask(h, CCISS_INTR_ON);
35235+ h->access->set_intr_mask(h, CCISS_INTR_ON);
35236
35237 /* Get the firmware version */
35238 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
35239@@ -5218,7 +5220,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
35240 kfree(flush_buf);
35241 if (return_code != IO_OK)
35242 dev_warn(&h->pdev->dev, "Error flushing cache\n");
35243- h->access.set_intr_mask(h, CCISS_INTR_OFF);
35244+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
35245 free_irq(h->intr[h->intr_mode], h);
35246 }
35247
35248diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
35249index 7fda30e..eb5dfe0 100644
35250--- a/drivers/block/cciss.h
35251+++ b/drivers/block/cciss.h
35252@@ -101,7 +101,7 @@ struct ctlr_info
35253 /* information about each logical volume */
35254 drive_info_struct *drv[CISS_MAX_LUN];
35255
35256- struct access_method access;
35257+ struct access_method *access;
35258
35259 /* queue and queue Info */
35260 struct list_head reqQ;
35261diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
35262index 639d26b..fd6ad1f 100644
35263--- a/drivers/block/cpqarray.c
35264+++ b/drivers/block/cpqarray.c
35265@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
35266 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
35267 goto Enomem4;
35268 }
35269- hba[i]->access.set_intr_mask(hba[i], 0);
35270+ hba[i]->access->set_intr_mask(hba[i], 0);
35271 if (request_irq(hba[i]->intr, do_ida_intr,
35272 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
35273 {
35274@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
35275 add_timer(&hba[i]->timer);
35276
35277 /* Enable IRQ now that spinlock and rate limit timer are set up */
35278- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
35279+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
35280
35281 for(j=0; j<NWD; j++) {
35282 struct gendisk *disk = ida_gendisk[i][j];
35283@@ -694,7 +694,7 @@ DBGINFO(
35284 for(i=0; i<NR_PRODUCTS; i++) {
35285 if (board_id == products[i].board_id) {
35286 c->product_name = products[i].product_name;
35287- c->access = *(products[i].access);
35288+ c->access = products[i].access;
35289 break;
35290 }
35291 }
35292@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
35293 hba[ctlr]->intr = intr;
35294 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
35295 hba[ctlr]->product_name = products[j].product_name;
35296- hba[ctlr]->access = *(products[j].access);
35297+ hba[ctlr]->access = products[j].access;
35298 hba[ctlr]->ctlr = ctlr;
35299 hba[ctlr]->board_id = board_id;
35300 hba[ctlr]->pci_dev = NULL; /* not PCI */
35301@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
35302
35303 while((c = h->reqQ) != NULL) {
35304 /* Can't do anything if we're busy */
35305- if (h->access.fifo_full(h) == 0)
35306+ if (h->access->fifo_full(h) == 0)
35307 return;
35308
35309 /* Get the first entry from the request Q */
35310@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
35311 h->Qdepth--;
35312
35313 /* Tell the controller to do our bidding */
35314- h->access.submit_command(h, c);
35315+ h->access->submit_command(h, c);
35316
35317 /* Get onto the completion Q */
35318 addQ(&h->cmpQ, c);
35319@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
35320 unsigned long flags;
35321 __u32 a,a1;
35322
35323- istat = h->access.intr_pending(h);
35324+ istat = h->access->intr_pending(h);
35325 /* Is this interrupt for us? */
35326 if (istat == 0)
35327 return IRQ_NONE;
35328@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
35329 */
35330 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
35331 if (istat & FIFO_NOT_EMPTY) {
35332- while((a = h->access.command_completed(h))) {
35333+ while((a = h->access->command_completed(h))) {
35334 a1 = a; a &= ~3;
35335 if ((c = h->cmpQ) == NULL)
35336 {
35337@@ -1193,6 +1193,7 @@ out_passthru:
35338 ida_pci_info_struct pciinfo;
35339
35340 if (!arg) return -EINVAL;
35341+ memset(&pciinfo, 0, sizeof(pciinfo));
35342 pciinfo.bus = host->pci_dev->bus->number;
35343 pciinfo.dev_fn = host->pci_dev->devfn;
35344 pciinfo.board_id = host->board_id;
35345@@ -1447,11 +1448,11 @@ static int sendcmd(
35346 /*
35347 * Disable interrupt
35348 */
35349- info_p->access.set_intr_mask(info_p, 0);
35350+ info_p->access->set_intr_mask(info_p, 0);
35351 /* Make sure there is room in the command FIFO */
35352 /* Actually it should be completely empty at this time. */
35353 for (i = 200000; i > 0; i--) {
35354- temp = info_p->access.fifo_full(info_p);
35355+ temp = info_p->access->fifo_full(info_p);
35356 if (temp != 0) {
35357 break;
35358 }
35359@@ -1464,7 +1465,7 @@ DBG(
35360 /*
35361 * Send the cmd
35362 */
35363- info_p->access.submit_command(info_p, c);
35364+ info_p->access->submit_command(info_p, c);
35365 complete = pollcomplete(ctlr);
35366
35367 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
35368@@ -1547,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
35369 * we check the new geometry. Then turn interrupts back on when
35370 * we're done.
35371 */
35372- host->access.set_intr_mask(host, 0);
35373+ host->access->set_intr_mask(host, 0);
35374 getgeometry(ctlr);
35375- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
35376+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
35377
35378 for(i=0; i<NWD; i++) {
35379 struct gendisk *disk = ida_gendisk[ctlr][i];
35380@@ -1589,7 +1590,7 @@ static int pollcomplete(int ctlr)
35381 /* Wait (up to 2 seconds) for a command to complete */
35382
35383 for (i = 200000; i > 0; i--) {
35384- done = hba[ctlr]->access.command_completed(hba[ctlr]);
35385+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
35386 if (done == 0) {
35387 udelay(10); /* a short fixed delay */
35388 } else
35389diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
35390index be73e9d..7fbf140 100644
35391--- a/drivers/block/cpqarray.h
35392+++ b/drivers/block/cpqarray.h
35393@@ -99,7 +99,7 @@ struct ctlr_info {
35394 drv_info_t drv[NWD];
35395 struct proc_dir_entry *proc;
35396
35397- struct access_method access;
35398+ struct access_method *access;
35399
35400 cmdlist_t *reqQ;
35401 cmdlist_t *cmpQ;
35402diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
35403index f943aac..99bfd19 100644
35404--- a/drivers/block/drbd/drbd_int.h
35405+++ b/drivers/block/drbd/drbd_int.h
35406@@ -582,7 +582,7 @@ struct drbd_epoch {
35407 struct drbd_tconn *tconn;
35408 struct list_head list;
35409 unsigned int barrier_nr;
35410- atomic_t epoch_size; /* increased on every request added. */
35411+ atomic_unchecked_t epoch_size; /* increased on every request added. */
35412 atomic_t active; /* increased on every req. added, and dec on every finished. */
35413 unsigned long flags;
35414 };
35415@@ -1021,7 +1021,7 @@ struct drbd_conf {
35416 unsigned int al_tr_number;
35417 int al_tr_cycle;
35418 wait_queue_head_t seq_wait;
35419- atomic_t packet_seq;
35420+ atomic_unchecked_t packet_seq;
35421 unsigned int peer_seq;
35422 spinlock_t peer_seq_lock;
35423 unsigned int minor;
35424@@ -1562,7 +1562,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
35425 char __user *uoptval;
35426 int err;
35427
35428- uoptval = (char __user __force *)optval;
35429+ uoptval = (char __force_user *)optval;
35430
35431 set_fs(KERNEL_DS);
35432 if (level == SOL_SOCKET)
35433diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
35434index a5dca6a..bb27967 100644
35435--- a/drivers/block/drbd/drbd_main.c
35436+++ b/drivers/block/drbd/drbd_main.c
35437@@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
35438 p->sector = sector;
35439 p->block_id = block_id;
35440 p->blksize = blksize;
35441- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
35442+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
35443 return drbd_send_command(mdev, sock, cmd, sizeof(*p), NULL, 0);
35444 }
35445
35446@@ -1619,7 +1619,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
35447 return -EIO;
35448 p->sector = cpu_to_be64(req->i.sector);
35449 p->block_id = (unsigned long)req;
35450- p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq));
35451+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&mdev->packet_seq));
35452 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
35453 if (mdev->state.conn >= C_SYNC_SOURCE &&
35454 mdev->state.conn <= C_PAUSED_SYNC_T)
35455@@ -2574,8 +2574,8 @@ void conn_destroy(struct kref *kref)
35456 {
35457 struct drbd_tconn *tconn = container_of(kref, struct drbd_tconn, kref);
35458
35459- if (atomic_read(&tconn->current_epoch->epoch_size) != 0)
35460- conn_err(tconn, "epoch_size:%d\n", atomic_read(&tconn->current_epoch->epoch_size));
35461+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size) != 0)
35462+ conn_err(tconn, "epoch_size:%d\n", atomic_read_unchecked(&tconn->current_epoch->epoch_size));
35463 kfree(tconn->current_epoch);
35464
35465 idr_destroy(&tconn->volumes);
35466diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
35467index 4222aff..1f79506 100644
35468--- a/drivers/block/drbd/drbd_receiver.c
35469+++ b/drivers/block/drbd/drbd_receiver.c
35470@@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
35471 {
35472 int err;
35473
35474- atomic_set(&mdev->packet_seq, 0);
35475+ atomic_set_unchecked(&mdev->packet_seq, 0);
35476 mdev->peer_seq = 0;
35477
35478 mdev->state_mutex = mdev->tconn->agreed_pro_version < 100 ?
35479@@ -1193,7 +1193,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
35480 do {
35481 next_epoch = NULL;
35482
35483- epoch_size = atomic_read(&epoch->epoch_size);
35484+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
35485
35486 switch (ev & ~EV_CLEANUP) {
35487 case EV_PUT:
35488@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_tconn *tconn,
35489 rv = FE_DESTROYED;
35490 } else {
35491 epoch->flags = 0;
35492- atomic_set(&epoch->epoch_size, 0);
35493+ atomic_set_unchecked(&epoch->epoch_size, 0);
35494 /* atomic_set(&epoch->active, 0); is already zero */
35495 if (rv == FE_STILL_LIVE)
35496 rv = FE_RECYCLED;
35497@@ -1451,7 +1451,7 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
35498 conn_wait_active_ee_empty(tconn);
35499 drbd_flush(tconn);
35500
35501- if (atomic_read(&tconn->current_epoch->epoch_size)) {
35502+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
35503 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
35504 if (epoch)
35505 break;
35506@@ -1464,11 +1464,11 @@ static int receive_Barrier(struct drbd_tconn *tconn, struct packet_info *pi)
35507 }
35508
35509 epoch->flags = 0;
35510- atomic_set(&epoch->epoch_size, 0);
35511+ atomic_set_unchecked(&epoch->epoch_size, 0);
35512 atomic_set(&epoch->active, 0);
35513
35514 spin_lock(&tconn->epoch_lock);
35515- if (atomic_read(&tconn->current_epoch->epoch_size)) {
35516+ if (atomic_read_unchecked(&tconn->current_epoch->epoch_size)) {
35517 list_add(&epoch->list, &tconn->current_epoch->list);
35518 tconn->current_epoch = epoch;
35519 tconn->epochs++;
35520@@ -2172,7 +2172,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
35521
35522 err = wait_for_and_update_peer_seq(mdev, peer_seq);
35523 drbd_send_ack_dp(mdev, P_NEG_ACK, p, pi->size);
35524- atomic_inc(&tconn->current_epoch->epoch_size);
35525+ atomic_inc_unchecked(&tconn->current_epoch->epoch_size);
35526 err2 = drbd_drain_block(mdev, pi->size);
35527 if (!err)
35528 err = err2;
35529@@ -2206,7 +2206,7 @@ static int receive_Data(struct drbd_tconn *tconn, struct packet_info *pi)
35530
35531 spin_lock(&tconn->epoch_lock);
35532 peer_req->epoch = tconn->current_epoch;
35533- atomic_inc(&peer_req->epoch->epoch_size);
35534+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
35535 atomic_inc(&peer_req->epoch->active);
35536 spin_unlock(&tconn->epoch_lock);
35537
35538@@ -4347,7 +4347,7 @@ struct data_cmd {
35539 int expect_payload;
35540 size_t pkt_size;
35541 int (*fn)(struct drbd_tconn *, struct packet_info *);
35542-};
35543+} __do_const;
35544
35545 static struct data_cmd drbd_cmd_handler[] = {
35546 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
35547@@ -4467,7 +4467,7 @@ static void conn_disconnect(struct drbd_tconn *tconn)
35548 if (!list_empty(&tconn->current_epoch->list))
35549 conn_err(tconn, "ASSERTION FAILED: tconn->current_epoch->list not empty\n");
35550 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
35551- atomic_set(&tconn->current_epoch->epoch_size, 0);
35552+ atomic_set_unchecked(&tconn->current_epoch->epoch_size, 0);
35553 tconn->send.seen_any_write_yet = false;
35554
35555 conn_info(tconn, "Connection closed\n");
35556@@ -5223,7 +5223,7 @@ static int tconn_finish_peer_reqs(struct drbd_tconn *tconn)
35557 struct asender_cmd {
35558 size_t pkt_size;
35559 int (*fn)(struct drbd_tconn *tconn, struct packet_info *);
35560-};
35561+} __do_const;
35562
35563 static struct asender_cmd asender_tbl[] = {
35564 [P_PING] = { 0, got_Ping },
35565diff --git a/drivers/block/loop.c b/drivers/block/loop.c
35566index d92d50f..a7e9d97 100644
35567--- a/drivers/block/loop.c
35568+++ b/drivers/block/loop.c
35569@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
35570
35571 file_start_write(file);
35572 set_fs(get_ds());
35573- bw = file->f_op->write(file, buf, len, &pos);
35574+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
35575 set_fs(old_fs);
35576 file_end_write(file);
35577 if (likely(bw == len))
35578diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
35579index f5d0ea1..c62380a 100644
35580--- a/drivers/block/pktcdvd.c
35581+++ b/drivers/block/pktcdvd.c
35582@@ -84,7 +84,7 @@
35583 #define MAX_SPEED 0xffff
35584
35585 #define ZONE(sector, pd) (((sector) + (pd)->offset) & \
35586- ~(sector_t)((pd)->settings.size - 1))
35587+ ~(sector_t)((pd)->settings.size - 1UL))
35588
35589 static DEFINE_MUTEX(pktcdvd_mutex);
35590 static struct pktcdvd_device *pkt_devs[MAX_WRITERS];
35591diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
35592index 8a3aff7..d7538c2 100644
35593--- a/drivers/cdrom/cdrom.c
35594+++ b/drivers/cdrom/cdrom.c
35595@@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
35596 ENSURE(reset, CDC_RESET);
35597 ENSURE(generic_packet, CDC_GENERIC_PACKET);
35598 cdi->mc_flags = 0;
35599- cdo->n_minors = 0;
35600 cdi->options = CDO_USE_FFLAGS;
35601
35602 if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
35603@@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
35604 else
35605 cdi->cdda_method = CDDA_OLD;
35606
35607- if (!cdo->generic_packet)
35608- cdo->generic_packet = cdrom_dummy_generic_packet;
35609+ if (!cdo->generic_packet) {
35610+ pax_open_kernel();
35611+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
35612+ pax_close_kernel();
35613+ }
35614
35615 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
35616 mutex_lock(&cdrom_mutex);
35617@@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
35618 if (cdi->exit)
35619 cdi->exit(cdi);
35620
35621- cdi->ops->n_minors--;
35622 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
35623 }
35624
35625@@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
35626 */
35627 nr = nframes;
35628 do {
35629- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
35630+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
35631 if (cgc.buffer)
35632 break;
35633
35634@@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
35635 struct cdrom_device_info *cdi;
35636 int ret;
35637
35638- ret = scnprintf(info + *pos, max_size - *pos, header);
35639+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
35640 if (!ret)
35641 return 1;
35642
35643diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
35644index 4afcb65..a68a32d 100644
35645--- a/drivers/cdrom/gdrom.c
35646+++ b/drivers/cdrom/gdrom.c
35647@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
35648 .audio_ioctl = gdrom_audio_ioctl,
35649 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
35650 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
35651- .n_minors = 1,
35652 };
35653
35654 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
35655diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
35656index 3bb6fa3..34013fb 100644
35657--- a/drivers/char/Kconfig
35658+++ b/drivers/char/Kconfig
35659@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
35660
35661 config DEVKMEM
35662 bool "/dev/kmem virtual device support"
35663- default y
35664+ default n
35665+ depends on !GRKERNSEC_KMEM
35666 help
35667 Say Y here if you want to support the /dev/kmem device. The
35668 /dev/kmem device is rarely used, but can be used for certain
35669@@ -582,6 +583,7 @@ config DEVPORT
35670 bool
35671 depends on !M68K
35672 depends on ISA || PCI
35673+ depends on !GRKERNSEC_KMEM
35674 default y
35675
35676 source "drivers/s390/char/Kconfig"
35677diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
35678index a48e05b..6bac831 100644
35679--- a/drivers/char/agp/compat_ioctl.c
35680+++ b/drivers/char/agp/compat_ioctl.c
35681@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
35682 return -ENOMEM;
35683 }
35684
35685- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
35686+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
35687 sizeof(*usegment) * ureserve.seg_count)) {
35688 kfree(usegment);
35689 kfree(ksegment);
35690diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
35691index 2e04433..771f2cc 100644
35692--- a/drivers/char/agp/frontend.c
35693+++ b/drivers/char/agp/frontend.c
35694@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
35695 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
35696 return -EFAULT;
35697
35698- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
35699+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
35700 return -EFAULT;
35701
35702 client = agp_find_client_by_pid(reserve.pid);
35703@@ -847,7 +847,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
35704 if (segment == NULL)
35705 return -ENOMEM;
35706
35707- if (copy_from_user(segment, (void __user *) reserve.seg_list,
35708+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
35709 sizeof(struct agp_segment) * reserve.seg_count)) {
35710 kfree(segment);
35711 return -EFAULT;
35712diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
35713index 4f94375..413694e 100644
35714--- a/drivers/char/genrtc.c
35715+++ b/drivers/char/genrtc.c
35716@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
35717 switch (cmd) {
35718
35719 case RTC_PLL_GET:
35720+ memset(&pll, 0, sizeof(pll));
35721 if (get_rtc_pll(&pll))
35722 return -EINVAL;
35723 else
35724diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
35725index d784650..e8bfd69 100644
35726--- a/drivers/char/hpet.c
35727+++ b/drivers/char/hpet.c
35728@@ -559,7 +559,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
35729 }
35730
35731 static int
35732-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
35733+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
35734 struct hpet_info *info)
35735 {
35736 struct hpet_timer __iomem *timer;
35737diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
35738index 86fe45c..c0ea948 100644
35739--- a/drivers/char/hw_random/intel-rng.c
35740+++ b/drivers/char/hw_random/intel-rng.c
35741@@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
35742
35743 if (no_fwh_detect)
35744 return -ENODEV;
35745- printk(warning);
35746+ printk("%s", warning);
35747 return -EBUSY;
35748 }
35749
35750diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
35751index 4445fa1..7c6de37 100644
35752--- a/drivers/char/ipmi/ipmi_msghandler.c
35753+++ b/drivers/char/ipmi/ipmi_msghandler.c
35754@@ -420,7 +420,7 @@ struct ipmi_smi {
35755 struct proc_dir_entry *proc_dir;
35756 char proc_dir_name[10];
35757
35758- atomic_t stats[IPMI_NUM_STATS];
35759+ atomic_unchecked_t stats[IPMI_NUM_STATS];
35760
35761 /*
35762 * run_to_completion duplicate of smb_info, smi_info
35763@@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
35764
35765
35766 #define ipmi_inc_stat(intf, stat) \
35767- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
35768+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
35769 #define ipmi_get_stat(intf, stat) \
35770- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
35771+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
35772
35773 static int is_lan_addr(struct ipmi_addr *addr)
35774 {
35775@@ -2883,7 +2883,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
35776 INIT_LIST_HEAD(&intf->cmd_rcvrs);
35777 init_waitqueue_head(&intf->waitq);
35778 for (i = 0; i < IPMI_NUM_STATS; i++)
35779- atomic_set(&intf->stats[i], 0);
35780+ atomic_set_unchecked(&intf->stats[i], 0);
35781
35782 intf->proc_dir = NULL;
35783
35784diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
35785index af4b23f..79806fc 100644
35786--- a/drivers/char/ipmi/ipmi_si_intf.c
35787+++ b/drivers/char/ipmi/ipmi_si_intf.c
35788@@ -275,7 +275,7 @@ struct smi_info {
35789 unsigned char slave_addr;
35790
35791 /* Counters and things for the proc filesystem. */
35792- atomic_t stats[SI_NUM_STATS];
35793+ atomic_unchecked_t stats[SI_NUM_STATS];
35794
35795 struct task_struct *thread;
35796
35797@@ -284,9 +284,9 @@ struct smi_info {
35798 };
35799
35800 #define smi_inc_stat(smi, stat) \
35801- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
35802+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
35803 #define smi_get_stat(smi, stat) \
35804- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
35805+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
35806
35807 #define SI_MAX_PARMS 4
35808
35809@@ -3258,7 +3258,7 @@ static int try_smi_init(struct smi_info *new_smi)
35810 atomic_set(&new_smi->req_events, 0);
35811 new_smi->run_to_completion = 0;
35812 for (i = 0; i < SI_NUM_STATS; i++)
35813- atomic_set(&new_smi->stats[i], 0);
35814+ atomic_set_unchecked(&new_smi->stats[i], 0);
35815
35816 new_smi->interrupt_disabled = 1;
35817 atomic_set(&new_smi->stop_operation, 0);
35818diff --git a/drivers/char/mem.c b/drivers/char/mem.c
35819index 1ccbe94..6ad651a 100644
35820--- a/drivers/char/mem.c
35821+++ b/drivers/char/mem.c
35822@@ -18,6 +18,7 @@
35823 #include <linux/raw.h>
35824 #include <linux/tty.h>
35825 #include <linux/capability.h>
35826+#include <linux/security.h>
35827 #include <linux/ptrace.h>
35828 #include <linux/device.h>
35829 #include <linux/highmem.h>
35830@@ -38,6 +39,10 @@
35831
35832 #define DEVPORT_MINOR 4
35833
35834+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
35835+extern const struct file_operations grsec_fops;
35836+#endif
35837+
35838 static inline unsigned long size_inside_page(unsigned long start,
35839 unsigned long size)
35840 {
35841@@ -69,9 +74,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
35842
35843 while (cursor < to) {
35844 if (!devmem_is_allowed(pfn)) {
35845+#ifdef CONFIG_GRKERNSEC_KMEM
35846+ gr_handle_mem_readwrite(from, to);
35847+#else
35848 printk(KERN_INFO
35849 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
35850 current->comm, from, to);
35851+#endif
35852 return 0;
35853 }
35854 cursor += PAGE_SIZE;
35855@@ -79,6 +88,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
35856 }
35857 return 1;
35858 }
35859+#elif defined(CONFIG_GRKERNSEC_KMEM)
35860+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
35861+{
35862+ return 0;
35863+}
35864 #else
35865 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
35866 {
35867@@ -121,6 +135,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
35868
35869 while (count > 0) {
35870 unsigned long remaining;
35871+ char *temp;
35872
35873 sz = size_inside_page(p, count);
35874
35875@@ -136,7 +151,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
35876 if (!ptr)
35877 return -EFAULT;
35878
35879- remaining = copy_to_user(buf, ptr, sz);
35880+#ifdef CONFIG_PAX_USERCOPY
35881+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
35882+ if (!temp) {
35883+ unxlate_dev_mem_ptr(p, ptr);
35884+ return -ENOMEM;
35885+ }
35886+ memcpy(temp, ptr, sz);
35887+#else
35888+ temp = ptr;
35889+#endif
35890+
35891+ remaining = copy_to_user(buf, temp, sz);
35892+
35893+#ifdef CONFIG_PAX_USERCOPY
35894+ kfree(temp);
35895+#endif
35896+
35897 unxlate_dev_mem_ptr(p, ptr);
35898 if (remaining)
35899 return -EFAULT;
35900@@ -379,7 +410,7 @@ static ssize_t read_oldmem(struct file *file, char __user *buf,
35901 else
35902 csize = count;
35903
35904- rc = copy_oldmem_page(pfn, buf, csize, offset, 1);
35905+ rc = copy_oldmem_page(pfn, (char __force_kernel *)buf, csize, offset, 1);
35906 if (rc < 0)
35907 return rc;
35908 buf += csize;
35909@@ -399,9 +430,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
35910 size_t count, loff_t *ppos)
35911 {
35912 unsigned long p = *ppos;
35913- ssize_t low_count, read, sz;
35914+ ssize_t low_count, read, sz, err = 0;
35915 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
35916- int err = 0;
35917
35918 read = 0;
35919 if (p < (unsigned long) high_memory) {
35920@@ -423,6 +453,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
35921 }
35922 #endif
35923 while (low_count > 0) {
35924+ char *temp;
35925+
35926 sz = size_inside_page(p, low_count);
35927
35928 /*
35929@@ -432,7 +464,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
35930 */
35931 kbuf = xlate_dev_kmem_ptr((char *)p);
35932
35933- if (copy_to_user(buf, kbuf, sz))
35934+#ifdef CONFIG_PAX_USERCOPY
35935+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
35936+ if (!temp)
35937+ return -ENOMEM;
35938+ memcpy(temp, kbuf, sz);
35939+#else
35940+ temp = kbuf;
35941+#endif
35942+
35943+ err = copy_to_user(buf, temp, sz);
35944+
35945+#ifdef CONFIG_PAX_USERCOPY
35946+ kfree(temp);
35947+#endif
35948+
35949+ if (err)
35950 return -EFAULT;
35951 buf += sz;
35952 p += sz;
35953@@ -869,6 +916,9 @@ static const struct memdev {
35954 #ifdef CONFIG_CRASH_DUMP
35955 [12] = { "oldmem", 0, &oldmem_fops, NULL },
35956 #endif
35957+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
35958+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
35959+#endif
35960 };
35961
35962 static int memory_open(struct inode *inode, struct file *filp)
35963@@ -940,7 +990,7 @@ static int __init chr_dev_init(void)
35964 continue;
35965
35966 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
35967- NULL, devlist[minor].name);
35968+ NULL, "%s", devlist[minor].name);
35969 }
35970
35971 return tty_init();
35972diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
35973index c689697..04e6d6a2 100644
35974--- a/drivers/char/mwave/tp3780i.c
35975+++ b/drivers/char/mwave/tp3780i.c
35976@@ -479,6 +479,7 @@ int tp3780I_QueryAbilities(THINKPAD_BD_DATA * pBDData, MW_ABILITIES * pAbilities
35977 PRINTK_2(TRACE_TP3780I,
35978 "tp3780i::tp3780I_QueryAbilities entry pBDData %p\n", pBDData);
35979
35980+ memset(pAbilities, 0, sizeof(*pAbilities));
35981 /* fill out standard constant fields */
35982 pAbilities->instr_per_sec = pBDData->rDspSettings.uIps;
35983 pAbilities->data_size = pBDData->rDspSettings.uDStoreSize;
35984diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
35985index 9df78e2..01ba9ae 100644
35986--- a/drivers/char/nvram.c
35987+++ b/drivers/char/nvram.c
35988@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
35989
35990 spin_unlock_irq(&rtc_lock);
35991
35992- if (copy_to_user(buf, contents, tmp - contents))
35993+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
35994 return -EFAULT;
35995
35996 *ppos = i;
35997diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
35998index 5c5cc00..ac9edb7 100644
35999--- a/drivers/char/pcmcia/synclink_cs.c
36000+++ b/drivers/char/pcmcia/synclink_cs.c
36001@@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
36002
36003 if (debug_level >= DEBUG_LEVEL_INFO)
36004 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
36005- __FILE__, __LINE__, info->device_name, port->count);
36006+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
36007
36008- WARN_ON(!port->count);
36009+ WARN_ON(!atomic_read(&port->count));
36010
36011 if (tty_port_close_start(port, tty, filp) == 0)
36012 goto cleanup;
36013@@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
36014 cleanup:
36015 if (debug_level >= DEBUG_LEVEL_INFO)
36016 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
36017- tty->driver->name, port->count);
36018+ tty->driver->name, atomic_read(&port->count));
36019 }
36020
36021 /* Wait until the transmitter is empty.
36022@@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
36023
36024 if (debug_level >= DEBUG_LEVEL_INFO)
36025 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
36026- __FILE__, __LINE__, tty->driver->name, port->count);
36027+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
36028
36029 /* If port is closing, signal caller to try again */
36030 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
36031@@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
36032 goto cleanup;
36033 }
36034 spin_lock(&port->lock);
36035- port->count++;
36036+ atomic_inc(&port->count);
36037 spin_unlock(&port->lock);
36038 spin_unlock_irqrestore(&info->netlock, flags);
36039
36040- if (port->count == 1) {
36041+ if (atomic_read(&port->count) == 1) {
36042 /* 1st open on this device, init hardware */
36043 retval = startup(info, tty);
36044 if (retval < 0)
36045@@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
36046 unsigned short new_crctype;
36047
36048 /* return error if TTY interface open */
36049- if (info->port.count)
36050+ if (atomic_read(&info->port.count))
36051 return -EBUSY;
36052
36053 switch (encoding)
36054@@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
36055
36056 /* arbitrate between network and tty opens */
36057 spin_lock_irqsave(&info->netlock, flags);
36058- if (info->port.count != 0 || info->netcount != 0) {
36059+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
36060 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
36061 spin_unlock_irqrestore(&info->netlock, flags);
36062 return -EBUSY;
36063@@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
36064 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
36065
36066 /* return error if TTY interface open */
36067- if (info->port.count)
36068+ if (atomic_read(&info->port.count))
36069 return -EBUSY;
36070
36071 if (cmd != SIOCWANDEV)
36072diff --git a/drivers/char/random.c b/drivers/char/random.c
36073index 35487e8..dac8bd1 100644
36074--- a/drivers/char/random.c
36075+++ b/drivers/char/random.c
36076@@ -272,8 +272,13 @@
36077 /*
36078 * Configuration information
36079 */
36080+#ifdef CONFIG_GRKERNSEC_RANDNET
36081+#define INPUT_POOL_WORDS 512
36082+#define OUTPUT_POOL_WORDS 128
36083+#else
36084 #define INPUT_POOL_WORDS 128
36085 #define OUTPUT_POOL_WORDS 32
36086+#endif
36087 #define SEC_XFER_SIZE 512
36088 #define EXTRACT_SIZE 10
36089
36090@@ -313,10 +318,17 @@ static struct poolinfo {
36091 int poolwords;
36092 int tap1, tap2, tap3, tap4, tap5;
36093 } poolinfo_table[] = {
36094+#ifdef CONFIG_GRKERNSEC_RANDNET
36095+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
36096+ { 512, 411, 308, 208, 104, 1 },
36097+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
36098+ { 128, 103, 76, 51, 25, 1 },
36099+#else
36100 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
36101 { 128, 103, 76, 51, 25, 1 },
36102 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
36103 { 32, 26, 20, 14, 7, 1 },
36104+#endif
36105 #if 0
36106 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
36107 { 2048, 1638, 1231, 819, 411, 1 },
36108@@ -524,8 +536,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
36109 input_rotate += i ? 7 : 14;
36110 }
36111
36112- ACCESS_ONCE(r->input_rotate) = input_rotate;
36113- ACCESS_ONCE(r->add_ptr) = i;
36114+ ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
36115+ ACCESS_ONCE_RW(r->add_ptr) = i;
36116 smp_wmb();
36117
36118 if (out)
36119@@ -1032,7 +1044,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
36120
36121 extract_buf(r, tmp);
36122 i = min_t(int, nbytes, EXTRACT_SIZE);
36123- if (copy_to_user(buf, tmp, i)) {
36124+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
36125 ret = -EFAULT;
36126 break;
36127 }
36128@@ -1368,7 +1380,7 @@ EXPORT_SYMBOL(generate_random_uuid);
36129 #include <linux/sysctl.h>
36130
36131 static int min_read_thresh = 8, min_write_thresh;
36132-static int max_read_thresh = INPUT_POOL_WORDS * 32;
36133+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
36134 static int max_write_thresh = INPUT_POOL_WORDS * 32;
36135 static char sysctl_bootid[16];
36136
36137@@ -1384,7 +1396,7 @@ static char sysctl_bootid[16];
36138 static int proc_do_uuid(ctl_table *table, int write,
36139 void __user *buffer, size_t *lenp, loff_t *ppos)
36140 {
36141- ctl_table fake_table;
36142+ ctl_table_no_const fake_table;
36143 unsigned char buf[64], tmp_uuid[16], *uuid;
36144
36145 uuid = table->data;
36146diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
36147index bf2349db..5456d53 100644
36148--- a/drivers/char/sonypi.c
36149+++ b/drivers/char/sonypi.c
36150@@ -54,6 +54,7 @@
36151
36152 #include <asm/uaccess.h>
36153 #include <asm/io.h>
36154+#include <asm/local.h>
36155
36156 #include <linux/sonypi.h>
36157
36158@@ -490,7 +491,7 @@ static struct sonypi_device {
36159 spinlock_t fifo_lock;
36160 wait_queue_head_t fifo_proc_list;
36161 struct fasync_struct *fifo_async;
36162- int open_count;
36163+ local_t open_count;
36164 int model;
36165 struct input_dev *input_jog_dev;
36166 struct input_dev *input_key_dev;
36167@@ -897,7 +898,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
36168 static int sonypi_misc_release(struct inode *inode, struct file *file)
36169 {
36170 mutex_lock(&sonypi_device.lock);
36171- sonypi_device.open_count--;
36172+ local_dec(&sonypi_device.open_count);
36173 mutex_unlock(&sonypi_device.lock);
36174 return 0;
36175 }
36176@@ -906,9 +907,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
36177 {
36178 mutex_lock(&sonypi_device.lock);
36179 /* Flush input queue on first open */
36180- if (!sonypi_device.open_count)
36181+ if (!local_read(&sonypi_device.open_count))
36182 kfifo_reset(&sonypi_device.fifo);
36183- sonypi_device.open_count++;
36184+ local_inc(&sonypi_device.open_count);
36185 mutex_unlock(&sonypi_device.lock);
36186
36187 return 0;
36188diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
36189index 64420b3..5c40b56 100644
36190--- a/drivers/char/tpm/tpm_acpi.c
36191+++ b/drivers/char/tpm/tpm_acpi.c
36192@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
36193 virt = acpi_os_map_memory(start, len);
36194 if (!virt) {
36195 kfree(log->bios_event_log);
36196+ log->bios_event_log = NULL;
36197 printk("%s: ERROR - Unable to map memory\n", __func__);
36198 return -EIO;
36199 }
36200
36201- memcpy_fromio(log->bios_event_log, virt, len);
36202+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
36203
36204 acpi_os_unmap_memory(virt, len);
36205 return 0;
36206diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
36207index 84ddc55..1d32f1e 100644
36208--- a/drivers/char/tpm/tpm_eventlog.c
36209+++ b/drivers/char/tpm/tpm_eventlog.c
36210@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
36211 event = addr;
36212
36213 if ((event->event_type == 0 && event->event_size == 0) ||
36214- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
36215+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
36216 return NULL;
36217
36218 return addr;
36219@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
36220 return NULL;
36221
36222 if ((event->event_type == 0 && event->event_size == 0) ||
36223- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
36224+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
36225 return NULL;
36226
36227 (*pos)++;
36228@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
36229 int i;
36230
36231 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
36232- seq_putc(m, data[i]);
36233+ if (!seq_putc(m, data[i]))
36234+ return -EFAULT;
36235
36236 return 0;
36237 }
36238diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
36239index fc45567..fa2a590 100644
36240--- a/drivers/char/virtio_console.c
36241+++ b/drivers/char/virtio_console.c
36242@@ -682,7 +682,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
36243 if (to_user) {
36244 ssize_t ret;
36245
36246- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
36247+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
36248 if (ret)
36249 return -EFAULT;
36250 } else {
36251@@ -785,7 +785,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
36252 if (!port_has_data(port) && !port->host_connected)
36253 return 0;
36254
36255- return fill_readbuf(port, ubuf, count, true);
36256+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
36257 }
36258
36259 static int wait_port_writable(struct port *port, bool nonblock)
36260diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
36261index a33f46f..a720eed 100644
36262--- a/drivers/clk/clk-composite.c
36263+++ b/drivers/clk/clk-composite.c
36264@@ -122,7 +122,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
36265 struct clk *clk;
36266 struct clk_init_data init;
36267 struct clk_composite *composite;
36268- struct clk_ops *clk_composite_ops;
36269+ clk_ops_no_const *clk_composite_ops;
36270
36271 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
36272 if (!composite) {
36273diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
36274index bd11315..7f87098 100644
36275--- a/drivers/clk/socfpga/clk.c
36276+++ b/drivers/clk/socfpga/clk.c
36277@@ -22,6 +22,7 @@
36278 #include <linux/clk-provider.h>
36279 #include <linux/io.h>
36280 #include <linux/of.h>
36281+#include <asm/pgtable.h>
36282
36283 /* Clock Manager offsets */
36284 #define CLKMGR_CTRL 0x0
36285@@ -135,8 +136,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
36286 if (strcmp(clk_name, "main_pll") || strcmp(clk_name, "periph_pll") ||
36287 strcmp(clk_name, "sdram_pll")) {
36288 socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
36289- clk_pll_ops.enable = clk_gate_ops.enable;
36290- clk_pll_ops.disable = clk_gate_ops.disable;
36291+ pax_open_kernel();
36292+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
36293+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
36294+ pax_close_kernel();
36295 }
36296
36297 clk = clk_register(NULL, &socfpga_clk->hw.hw);
36298diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
36299index a2b2541..bc1e7ff 100644
36300--- a/drivers/clocksource/arm_arch_timer.c
36301+++ b/drivers/clocksource/arm_arch_timer.c
36302@@ -264,7 +264,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
36303 return NOTIFY_OK;
36304 }
36305
36306-static struct notifier_block arch_timer_cpu_nb __cpuinitdata = {
36307+static struct notifier_block arch_timer_cpu_nb = {
36308 .notifier_call = arch_timer_cpu_notify,
36309 };
36310
36311diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
36312index 350f493..489479e 100644
36313--- a/drivers/clocksource/bcm_kona_timer.c
36314+++ b/drivers/clocksource/bcm_kona_timer.c
36315@@ -199,7 +199,7 @@ static struct irqaction kona_timer_irq = {
36316 .handler = kona_timer_interrupt,
36317 };
36318
36319-static void __init kona_timer_init(void)
36320+static void __init kona_timer_init(struct device_node *np)
36321 {
36322 kona_timers_init();
36323 kona_timer_clockevents_init();
36324diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
36325index ade7513..069445f 100644
36326--- a/drivers/clocksource/metag_generic.c
36327+++ b/drivers/clocksource/metag_generic.c
36328@@ -169,7 +169,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
36329 return NOTIFY_OK;
36330 }
36331
36332-static struct notifier_block __cpuinitdata arch_timer_cpu_nb = {
36333+static struct notifier_block arch_timer_cpu_nb = {
36334 .notifier_call = arch_timer_cpu_notify,
36335 };
36336
36337diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
36338index edc089e..bc7c0bc 100644
36339--- a/drivers/cpufreq/acpi-cpufreq.c
36340+++ b/drivers/cpufreq/acpi-cpufreq.c
36341@@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj,
36342 return sprintf(buf, "%u\n", boost_enabled);
36343 }
36344
36345-static struct global_attr global_boost = __ATTR(boost, 0644,
36346+static global_attr_no_const global_boost = __ATTR(boost, 0644,
36347 show_global_boost,
36348 store_global_boost);
36349
36350@@ -705,8 +705,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
36351 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
36352 per_cpu(acfreq_data, cpu) = data;
36353
36354- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
36355- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
36356+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
36357+ pax_open_kernel();
36358+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
36359+ pax_close_kernel();
36360+ }
36361
36362 result = acpi_processor_register_performance(data->acpi_data, cpu);
36363 if (result)
36364@@ -832,7 +835,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
36365 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
36366 break;
36367 case ACPI_ADR_SPACE_FIXED_HARDWARE:
36368- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
36369+ pax_open_kernel();
36370+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
36371+ pax_close_kernel();
36372 policy->cur = get_cur_freq_on_cpu(cpu);
36373 break;
36374 default:
36375@@ -843,8 +848,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
36376 acpi_processor_notify_smm(THIS_MODULE);
36377
36378 /* Check for APERF/MPERF support in hardware */
36379- if (boot_cpu_has(X86_FEATURE_APERFMPERF))
36380- acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
36381+ if (boot_cpu_has(X86_FEATURE_APERFMPERF)) {
36382+ pax_open_kernel();
36383+ *(void **)&acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
36384+ pax_close_kernel();
36385+ }
36386
36387 pr_debug("CPU%u - ACPI performance management activated.\n", cpu);
36388 for (i = 0; i < perf->state_count; i++)
36389diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
36390index 6485547..477033e 100644
36391--- a/drivers/cpufreq/cpufreq.c
36392+++ b/drivers/cpufreq/cpufreq.c
36393@@ -1854,7 +1854,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
36394 return NOTIFY_OK;
36395 }
36396
36397-static struct notifier_block __refdata cpufreq_cpu_notifier = {
36398+static struct notifier_block cpufreq_cpu_notifier = {
36399 .notifier_call = cpufreq_cpu_callback,
36400 };
36401
36402@@ -1886,8 +1886,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
36403
36404 pr_debug("trying to register driver %s\n", driver_data->name);
36405
36406- if (driver_data->setpolicy)
36407- driver_data->flags |= CPUFREQ_CONST_LOOPS;
36408+ if (driver_data->setpolicy) {
36409+ pax_open_kernel();
36410+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
36411+ pax_close_kernel();
36412+ }
36413
36414 write_lock_irqsave(&cpufreq_driver_lock, flags);
36415 if (cpufreq_driver) {
36416diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
36417index a86ff72..aad2b03 100644
36418--- a/drivers/cpufreq/cpufreq_governor.c
36419+++ b/drivers/cpufreq/cpufreq_governor.c
36420@@ -235,7 +235,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
36421 struct dbs_data *dbs_data;
36422 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
36423 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
36424- struct od_ops *od_ops = NULL;
36425+ const struct od_ops *od_ops = NULL;
36426 struct od_dbs_tuners *od_tuners = NULL;
36427 struct cs_dbs_tuners *cs_tuners = NULL;
36428 struct cpu_dbs_common_info *cpu_cdbs;
36429@@ -298,7 +298,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
36430
36431 if ((cdata->governor == GOV_CONSERVATIVE) &&
36432 (!policy->governor->initialized)) {
36433- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
36434+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
36435
36436 cpufreq_register_notifier(cs_ops->notifier_block,
36437 CPUFREQ_TRANSITION_NOTIFIER);
36438@@ -315,7 +315,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
36439
36440 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
36441 (policy->governor->initialized == 1)) {
36442- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
36443+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
36444
36445 cpufreq_unregister_notifier(cs_ops->notifier_block,
36446 CPUFREQ_TRANSITION_NOTIFIER);
36447diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
36448index 0d9e6be..461fd3b 100644
36449--- a/drivers/cpufreq/cpufreq_governor.h
36450+++ b/drivers/cpufreq/cpufreq_governor.h
36451@@ -204,7 +204,7 @@ struct common_dbs_data {
36452 void (*exit)(struct dbs_data *dbs_data);
36453
36454 /* Governor specific ops, see below */
36455- void *gov_ops;
36456+ const void *gov_ops;
36457 };
36458
36459 /* Governer Per policy data */
36460diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
36461index c087347..dad6268 100644
36462--- a/drivers/cpufreq/cpufreq_ondemand.c
36463+++ b/drivers/cpufreq/cpufreq_ondemand.c
36464@@ -615,14 +615,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
36465 (struct cpufreq_policy *, unsigned int, unsigned int),
36466 unsigned int powersave_bias)
36467 {
36468- od_ops.powersave_bias_target = f;
36469+ pax_open_kernel();
36470+ *(void **)&od_ops.powersave_bias_target = f;
36471+ pax_close_kernel();
36472 od_set_powersave_bias(powersave_bias);
36473 }
36474 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
36475
36476 void od_unregister_powersave_bias_handler(void)
36477 {
36478- od_ops.powersave_bias_target = generic_powersave_bias_target;
36479+ pax_open_kernel();
36480+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
36481+ pax_close_kernel();
36482 od_set_powersave_bias(0);
36483 }
36484 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
36485diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
36486index bfd6273..e39dd63 100644
36487--- a/drivers/cpufreq/cpufreq_stats.c
36488+++ b/drivers/cpufreq/cpufreq_stats.c
36489@@ -365,7 +365,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
36490 }
36491
36492 /* priority=1 so this will get called before cpufreq_remove_dev */
36493-static struct notifier_block cpufreq_stat_cpu_notifier __refdata = {
36494+static struct notifier_block cpufreq_stat_cpu_notifier = {
36495 .notifier_call = cpufreq_stat_cpu_callback,
36496 .priority = 1,
36497 };
36498diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
36499index 421ef37..e708530c 100644
36500--- a/drivers/cpufreq/p4-clockmod.c
36501+++ b/drivers/cpufreq/p4-clockmod.c
36502@@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
36503 case 0x0F: /* Core Duo */
36504 case 0x16: /* Celeron Core */
36505 case 0x1C: /* Atom */
36506- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
36507+ pax_open_kernel();
36508+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
36509+ pax_close_kernel();
36510 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
36511 case 0x0D: /* Pentium M (Dothan) */
36512- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
36513+ pax_open_kernel();
36514+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
36515+ pax_close_kernel();
36516 /* fall through */
36517 case 0x09: /* Pentium M (Banias) */
36518 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
36519@@ -175,7 +179,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
36520
36521 /* on P-4s, the TSC runs with constant frequency independent whether
36522 * throttling is active or not. */
36523- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
36524+ pax_open_kernel();
36525+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
36526+ pax_close_kernel();
36527
36528 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
36529 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
36530diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
36531index c71ee14..7c2e183 100644
36532--- a/drivers/cpufreq/sparc-us3-cpufreq.c
36533+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
36534@@ -18,14 +18,12 @@
36535 #include <asm/head.h>
36536 #include <asm/timer.h>
36537
36538-static struct cpufreq_driver *cpufreq_us3_driver;
36539-
36540 struct us3_freq_percpu_info {
36541 struct cpufreq_frequency_table table[4];
36542 };
36543
36544 /* Indexed by cpu number. */
36545-static struct us3_freq_percpu_info *us3_freq_table;
36546+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
36547
36548 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
36549 * in the Safari config register.
36550@@ -186,12 +184,25 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
36551
36552 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
36553 {
36554- if (cpufreq_us3_driver)
36555- us3_set_cpu_divider_index(policy, 0);
36556+ us3_set_cpu_divider_index(policy->cpu, 0);
36557
36558 return 0;
36559 }
36560
36561+static int __init us3_freq_init(void);
36562+static void __exit us3_freq_exit(void);
36563+
36564+static struct cpufreq_driver cpufreq_us3_driver = {
36565+ .init = us3_freq_cpu_init,
36566+ .verify = us3_freq_verify,
36567+ .target = us3_freq_target,
36568+ .get = us3_freq_get,
36569+ .exit = us3_freq_cpu_exit,
36570+ .owner = THIS_MODULE,
36571+ .name = "UltraSPARC-III",
36572+
36573+};
36574+
36575 static int __init us3_freq_init(void)
36576 {
36577 unsigned long manuf, impl, ver;
36578@@ -208,57 +219,15 @@ static int __init us3_freq_init(void)
36579 (impl == CHEETAH_IMPL ||
36580 impl == CHEETAH_PLUS_IMPL ||
36581 impl == JAGUAR_IMPL ||
36582- impl == PANTHER_IMPL)) {
36583- struct cpufreq_driver *driver;
36584-
36585- ret = -ENOMEM;
36586- driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
36587- if (!driver)
36588- goto err_out;
36589-
36590- us3_freq_table = kzalloc(
36591- (NR_CPUS * sizeof(struct us3_freq_percpu_info)),
36592- GFP_KERNEL);
36593- if (!us3_freq_table)
36594- goto err_out;
36595-
36596- driver->init = us3_freq_cpu_init;
36597- driver->verify = us3_freq_verify;
36598- driver->target = us3_freq_target;
36599- driver->get = us3_freq_get;
36600- driver->exit = us3_freq_cpu_exit;
36601- driver->owner = THIS_MODULE,
36602- strcpy(driver->name, "UltraSPARC-III");
36603-
36604- cpufreq_us3_driver = driver;
36605- ret = cpufreq_register_driver(driver);
36606- if (ret)
36607- goto err_out;
36608-
36609- return 0;
36610-
36611-err_out:
36612- if (driver) {
36613- kfree(driver);
36614- cpufreq_us3_driver = NULL;
36615- }
36616- kfree(us3_freq_table);
36617- us3_freq_table = NULL;
36618- return ret;
36619- }
36620+ impl == PANTHER_IMPL))
36621+ return cpufreq_register_driver(&cpufreq_us3_driver);
36622
36623 return -ENODEV;
36624 }
36625
36626 static void __exit us3_freq_exit(void)
36627 {
36628- if (cpufreq_us3_driver) {
36629- cpufreq_unregister_driver(cpufreq_us3_driver);
36630- kfree(cpufreq_us3_driver);
36631- cpufreq_us3_driver = NULL;
36632- kfree(us3_freq_table);
36633- us3_freq_table = NULL;
36634- }
36635+ cpufreq_unregister_driver(&cpufreq_us3_driver);
36636 }
36637
36638 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
36639diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
36640index 618e6f4..e89d915 100644
36641--- a/drivers/cpufreq/speedstep-centrino.c
36642+++ b/drivers/cpufreq/speedstep-centrino.c
36643@@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
36644 !cpu_has(cpu, X86_FEATURE_EST))
36645 return -ENODEV;
36646
36647- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
36648- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
36649+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
36650+ pax_open_kernel();
36651+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
36652+ pax_close_kernel();
36653+ }
36654
36655 if (policy->cpu != 0)
36656 return -ENODEV;
36657diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
36658index c3a93fe..e808f24 100644
36659--- a/drivers/cpuidle/cpuidle.c
36660+++ b/drivers/cpuidle/cpuidle.c
36661@@ -254,7 +254,7 @@ static int poll_idle(struct cpuidle_device *dev,
36662
36663 static void poll_idle_init(struct cpuidle_driver *drv)
36664 {
36665- struct cpuidle_state *state = &drv->states[0];
36666+ cpuidle_state_no_const *state = &drv->states[0];
36667
36668 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
36669 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
36670diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
36671index ea2f8e7..70ac501 100644
36672--- a/drivers/cpuidle/governor.c
36673+++ b/drivers/cpuidle/governor.c
36674@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
36675 mutex_lock(&cpuidle_lock);
36676 if (__cpuidle_find_governor(gov->name) == NULL) {
36677 ret = 0;
36678- list_add_tail(&gov->governor_list, &cpuidle_governors);
36679+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
36680 if (!cpuidle_curr_governor ||
36681 cpuidle_curr_governor->rating < gov->rating)
36682 cpuidle_switch_governor(gov);
36683@@ -135,7 +135,7 @@ void cpuidle_unregister_governor(struct cpuidle_governor *gov)
36684 new_gov = cpuidle_replace_governor(gov->rating);
36685 cpuidle_switch_governor(new_gov);
36686 }
36687- list_del(&gov->governor_list);
36688+ pax_list_del((struct list_head *)&gov->governor_list);
36689 mutex_unlock(&cpuidle_lock);
36690 }
36691
36692diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
36693index 428754a..8bdf9cc 100644
36694--- a/drivers/cpuidle/sysfs.c
36695+++ b/drivers/cpuidle/sysfs.c
36696@@ -131,7 +131,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
36697 NULL
36698 };
36699
36700-static struct attribute_group cpuidle_attr_group = {
36701+static attribute_group_no_const cpuidle_attr_group = {
36702 .attrs = cpuidle_default_attrs,
36703 .name = "cpuidle",
36704 };
36705diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
36706index 3b36797..db0b0c0 100644
36707--- a/drivers/devfreq/devfreq.c
36708+++ b/drivers/devfreq/devfreq.c
36709@@ -477,7 +477,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
36710 GFP_KERNEL);
36711 devfreq->last_stat_updated = jiffies;
36712
36713- dev_set_name(&devfreq->dev, dev_name(dev));
36714+ dev_set_name(&devfreq->dev, "%s", dev_name(dev));
36715 err = device_register(&devfreq->dev);
36716 if (err) {
36717 put_device(&devfreq->dev);
36718@@ -588,7 +588,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
36719 goto err_out;
36720 }
36721
36722- list_add(&governor->node, &devfreq_governor_list);
36723+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
36724
36725 list_for_each_entry(devfreq, &devfreq_list, node) {
36726 int ret = 0;
36727@@ -676,7 +676,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
36728 }
36729 }
36730
36731- list_del(&governor->node);
36732+ pax_list_del((struct list_head *)&governor->node);
36733 err_out:
36734 mutex_unlock(&devfreq_list_lock);
36735
36736diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
36737index b70709b..1d8d02a 100644
36738--- a/drivers/dma/sh/shdma.c
36739+++ b/drivers/dma/sh/shdma.c
36740@@ -476,7 +476,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
36741 return ret;
36742 }
36743
36744-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
36745+static struct notifier_block sh_dmae_nmi_notifier = {
36746 .notifier_call = sh_dmae_nmi_handler,
36747
36748 /* Run before NMI debug handler and KGDB */
36749diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
36750index c4d700a..0b57abd 100644
36751--- a/drivers/edac/edac_mc_sysfs.c
36752+++ b/drivers/edac/edac_mc_sysfs.c
36753@@ -148,7 +148,7 @@ static const char * const edac_caps[] = {
36754 struct dev_ch_attribute {
36755 struct device_attribute attr;
36756 int channel;
36757-};
36758+} __do_const;
36759
36760 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
36761 struct dev_ch_attribute dev_attr_legacy_##_name = \
36762@@ -1005,14 +1005,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
36763 }
36764
36765 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
36766+ pax_open_kernel();
36767 if (mci->get_sdram_scrub_rate) {
36768- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
36769- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
36770+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
36771+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
36772 }
36773 if (mci->set_sdram_scrub_rate) {
36774- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
36775- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
36776+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
36777+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
36778 }
36779+ pax_close_kernel();
36780 err = device_create_file(&mci->dev,
36781 &dev_attr_sdram_scrub_rate);
36782 if (err) {
36783diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
36784index e8658e4..22746d6 100644
36785--- a/drivers/edac/edac_pci_sysfs.c
36786+++ b/drivers/edac/edac_pci_sysfs.c
36787@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
36788 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
36789 static int edac_pci_poll_msec = 1000; /* one second workq period */
36790
36791-static atomic_t pci_parity_count = ATOMIC_INIT(0);
36792-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
36793+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
36794+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
36795
36796 static struct kobject *edac_pci_top_main_kobj;
36797 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
36798@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
36799 void *value;
36800 ssize_t(*show) (void *, char *);
36801 ssize_t(*store) (void *, const char *, size_t);
36802-};
36803+} __do_const;
36804
36805 /* Set of show/store abstract level functions for PCI Parity object */
36806 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
36807@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
36808 edac_printk(KERN_CRIT, EDAC_PCI,
36809 "Signaled System Error on %s\n",
36810 pci_name(dev));
36811- atomic_inc(&pci_nonparity_count);
36812+ atomic_inc_unchecked(&pci_nonparity_count);
36813 }
36814
36815 if (status & (PCI_STATUS_PARITY)) {
36816@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
36817 "Master Data Parity Error on %s\n",
36818 pci_name(dev));
36819
36820- atomic_inc(&pci_parity_count);
36821+ atomic_inc_unchecked(&pci_parity_count);
36822 }
36823
36824 if (status & (PCI_STATUS_DETECTED_PARITY)) {
36825@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
36826 "Detected Parity Error on %s\n",
36827 pci_name(dev));
36828
36829- atomic_inc(&pci_parity_count);
36830+ atomic_inc_unchecked(&pci_parity_count);
36831 }
36832 }
36833
36834@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
36835 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
36836 "Signaled System Error on %s\n",
36837 pci_name(dev));
36838- atomic_inc(&pci_nonparity_count);
36839+ atomic_inc_unchecked(&pci_nonparity_count);
36840 }
36841
36842 if (status & (PCI_STATUS_PARITY)) {
36843@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
36844 "Master Data Parity Error on "
36845 "%s\n", pci_name(dev));
36846
36847- atomic_inc(&pci_parity_count);
36848+ atomic_inc_unchecked(&pci_parity_count);
36849 }
36850
36851 if (status & (PCI_STATUS_DETECTED_PARITY)) {
36852@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
36853 "Detected Parity Error on %s\n",
36854 pci_name(dev));
36855
36856- atomic_inc(&pci_parity_count);
36857+ atomic_inc_unchecked(&pci_parity_count);
36858 }
36859 }
36860 }
36861@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
36862 if (!check_pci_errors)
36863 return;
36864
36865- before_count = atomic_read(&pci_parity_count);
36866+ before_count = atomic_read_unchecked(&pci_parity_count);
36867
36868 /* scan all PCI devices looking for a Parity Error on devices and
36869 * bridges.
36870@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
36871 /* Only if operator has selected panic on PCI Error */
36872 if (edac_pci_get_panic_on_pe()) {
36873 /* If the count is different 'after' from 'before' */
36874- if (before_count != atomic_read(&pci_parity_count))
36875+ if (before_count != atomic_read_unchecked(&pci_parity_count))
36876 panic("EDAC: PCI Parity Error");
36877 }
36878 }
36879diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
36880index 51b7e3a..aa8a3e8 100644
36881--- a/drivers/edac/mce_amd.h
36882+++ b/drivers/edac/mce_amd.h
36883@@ -77,7 +77,7 @@ struct amd_decoder_ops {
36884 bool (*mc0_mce)(u16, u8);
36885 bool (*mc1_mce)(u16, u8);
36886 bool (*mc2_mce)(u16, u8);
36887-};
36888+} __no_const;
36889
36890 void amd_report_gart_errors(bool);
36891 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
36892diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
36893index 57ea7f4..789e3c3 100644
36894--- a/drivers/firewire/core-card.c
36895+++ b/drivers/firewire/core-card.c
36896@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
36897
36898 void fw_core_remove_card(struct fw_card *card)
36899 {
36900- struct fw_card_driver dummy_driver = dummy_driver_template;
36901+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
36902
36903 card->driver->update_phy_reg(card, 4,
36904 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
36905diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
36906index 664a6ff..af13580 100644
36907--- a/drivers/firewire/core-device.c
36908+++ b/drivers/firewire/core-device.c
36909@@ -232,7 +232,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
36910 struct config_rom_attribute {
36911 struct device_attribute attr;
36912 u32 key;
36913-};
36914+} __do_const;
36915
36916 static ssize_t show_immediate(struct device *dev,
36917 struct device_attribute *dattr, char *buf)
36918diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
36919index 28a94c7..58da63a 100644
36920--- a/drivers/firewire/core-transaction.c
36921+++ b/drivers/firewire/core-transaction.c
36922@@ -38,6 +38,7 @@
36923 #include <linux/timer.h>
36924 #include <linux/types.h>
36925 #include <linux/workqueue.h>
36926+#include <linux/sched.h>
36927
36928 #include <asm/byteorder.h>
36929
36930diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
36931index 515a42c..5ecf3ba 100644
36932--- a/drivers/firewire/core.h
36933+++ b/drivers/firewire/core.h
36934@@ -111,6 +111,7 @@ struct fw_card_driver {
36935
36936 int (*stop_iso)(struct fw_iso_context *ctx);
36937 };
36938+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
36939
36940 void fw_card_initialize(struct fw_card *card,
36941 const struct fw_card_driver *driver, struct device *device);
36942diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
36943index 94a58a0..f5eba42 100644
36944--- a/drivers/firmware/dmi-id.c
36945+++ b/drivers/firmware/dmi-id.c
36946@@ -16,7 +16,7 @@
36947 struct dmi_device_attribute{
36948 struct device_attribute dev_attr;
36949 int field;
36950-};
36951+} __do_const;
36952 #define to_dmi_dev_attr(_dev_attr) \
36953 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
36954
36955diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
36956index b95159b..841ae55 100644
36957--- a/drivers/firmware/dmi_scan.c
36958+++ b/drivers/firmware/dmi_scan.c
36959@@ -497,11 +497,6 @@ void __init dmi_scan_machine(void)
36960 }
36961 }
36962 else {
36963- /*
36964- * no iounmap() for that ioremap(); it would be a no-op, but
36965- * it's so early in setup that sucker gets confused into doing
36966- * what it shouldn't if we actually call it.
36967- */
36968 p = dmi_ioremap(0xF0000, 0x10000);
36969 if (p == NULL)
36970 goto error;
36971@@ -786,7 +781,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
36972 if (buf == NULL)
36973 return -1;
36974
36975- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
36976+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
36977
36978 iounmap(buf);
36979 return 0;
36980diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
36981index 5145fa3..0d3babd 100644
36982--- a/drivers/firmware/efi/efi.c
36983+++ b/drivers/firmware/efi/efi.c
36984@@ -65,14 +65,16 @@ static struct attribute_group efi_subsys_attr_group = {
36985 };
36986
36987 static struct efivars generic_efivars;
36988-static struct efivar_operations generic_ops;
36989+static efivar_operations_no_const generic_ops __read_only;
36990
36991 static int generic_ops_register(void)
36992 {
36993- generic_ops.get_variable = efi.get_variable;
36994- generic_ops.set_variable = efi.set_variable;
36995- generic_ops.get_next_variable = efi.get_next_variable;
36996- generic_ops.query_variable_store = efi_query_variable_store;
36997+ pax_open_kernel();
36998+ *(void **)&generic_ops.get_variable = efi.get_variable;
36999+ *(void **)&generic_ops.set_variable = efi.set_variable;
37000+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
37001+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
37002+ pax_close_kernel();
37003
37004 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
37005 }
37006diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
37007index 8bd1bb6..c48b0c6 100644
37008--- a/drivers/firmware/efi/efivars.c
37009+++ b/drivers/firmware/efi/efivars.c
37010@@ -452,7 +452,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
37011 static int
37012 create_efivars_bin_attributes(void)
37013 {
37014- struct bin_attribute *attr;
37015+ bin_attribute_no_const *attr;
37016 int error;
37017
37018 /* new_var */
37019diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
37020index 2a90ba6..07f3733 100644
37021--- a/drivers/firmware/google/memconsole.c
37022+++ b/drivers/firmware/google/memconsole.c
37023@@ -147,7 +147,9 @@ static int __init memconsole_init(void)
37024 if (!found_memconsole())
37025 return -ENODEV;
37026
37027- memconsole_bin_attr.size = memconsole_length;
37028+ pax_open_kernel();
37029+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
37030+ pax_close_kernel();
37031
37032 ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
37033
37034diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
37035index e16d932..f0206ef 100644
37036--- a/drivers/gpio/gpio-ich.c
37037+++ b/drivers/gpio/gpio-ich.c
37038@@ -69,7 +69,7 @@ struct ichx_desc {
37039 /* Some chipsets have quirks, let these use their own request/get */
37040 int (*request)(struct gpio_chip *chip, unsigned offset);
37041 int (*get)(struct gpio_chip *chip, unsigned offset);
37042-};
37043+} __do_const;
37044
37045 static struct {
37046 spinlock_t lock;
37047diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
37048index 9902732..64b62dd 100644
37049--- a/drivers/gpio/gpio-vr41xx.c
37050+++ b/drivers/gpio/gpio-vr41xx.c
37051@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
37052 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
37053 maskl, pendl, maskh, pendh);
37054
37055- atomic_inc(&irq_err_count);
37056+ atomic_inc_unchecked(&irq_err_count);
37057
37058 return -EINVAL;
37059 }
37060diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
37061index ed1334e..ee0dd42 100644
37062--- a/drivers/gpu/drm/drm_crtc_helper.c
37063+++ b/drivers/gpu/drm/drm_crtc_helper.c
37064@@ -321,7 +321,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
37065 struct drm_crtc *tmp;
37066 int crtc_mask = 1;
37067
37068- WARN(!crtc, "checking null crtc?\n");
37069+ BUG_ON(!crtc);
37070
37071 dev = crtc->dev;
37072
37073diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
37074index 9cc247f..36aa285 100644
37075--- a/drivers/gpu/drm/drm_drv.c
37076+++ b/drivers/gpu/drm/drm_drv.c
37077@@ -306,7 +306,7 @@ module_exit(drm_core_exit);
37078 /**
37079 * Copy and IOCTL return string to user space
37080 */
37081-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
37082+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
37083 {
37084 int len;
37085
37086@@ -376,7 +376,7 @@ long drm_ioctl(struct file *filp,
37087 struct drm_file *file_priv = filp->private_data;
37088 struct drm_device *dev;
37089 const struct drm_ioctl_desc *ioctl = NULL;
37090- drm_ioctl_t *func;
37091+ drm_ioctl_no_const_t func;
37092 unsigned int nr = DRM_IOCTL_NR(cmd);
37093 int retcode = -EINVAL;
37094 char stack_kdata[128];
37095@@ -389,7 +389,7 @@ long drm_ioctl(struct file *filp,
37096 return -ENODEV;
37097
37098 atomic_inc(&dev->ioctl_count);
37099- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
37100+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
37101 ++file_priv->ioctl_count;
37102
37103 if ((nr >= DRM_CORE_IOCTL_COUNT) &&
37104diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
37105index 429e07d..e681a2c 100644
37106--- a/drivers/gpu/drm/drm_fops.c
37107+++ b/drivers/gpu/drm/drm_fops.c
37108@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
37109 }
37110
37111 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
37112- atomic_set(&dev->counts[i], 0);
37113+ atomic_set_unchecked(&dev->counts[i], 0);
37114
37115 dev->sigdata.lock = NULL;
37116
37117@@ -135,7 +135,7 @@ int drm_open(struct inode *inode, struct file *filp)
37118 if (drm_device_is_unplugged(dev))
37119 return -ENODEV;
37120
37121- if (!dev->open_count++)
37122+ if (local_inc_return(&dev->open_count) == 1)
37123 need_setup = 1;
37124 mutex_lock(&dev->struct_mutex);
37125 old_imapping = inode->i_mapping;
37126@@ -151,7 +151,7 @@ int drm_open(struct inode *inode, struct file *filp)
37127 retcode = drm_open_helper(inode, filp, dev);
37128 if (retcode)
37129 goto err_undo;
37130- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
37131+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
37132 if (need_setup) {
37133 retcode = drm_setup(dev);
37134 if (retcode)
37135@@ -166,7 +166,7 @@ err_undo:
37136 iput(container_of(dev->dev_mapping, struct inode, i_data));
37137 dev->dev_mapping = old_mapping;
37138 mutex_unlock(&dev->struct_mutex);
37139- dev->open_count--;
37140+ local_dec(&dev->open_count);
37141 return retcode;
37142 }
37143 EXPORT_SYMBOL(drm_open);
37144@@ -441,7 +441,7 @@ int drm_release(struct inode *inode, struct file *filp)
37145
37146 mutex_lock(&drm_global_mutex);
37147
37148- DRM_DEBUG("open_count = %d\n", dev->open_count);
37149+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
37150
37151 if (dev->driver->preclose)
37152 dev->driver->preclose(dev, file_priv);
37153@@ -450,10 +450,10 @@ int drm_release(struct inode *inode, struct file *filp)
37154 * Begin inline drm_release
37155 */
37156
37157- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
37158+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
37159 task_pid_nr(current),
37160 (long)old_encode_dev(file_priv->minor->device),
37161- dev->open_count);
37162+ local_read(&dev->open_count));
37163
37164 /* Release any auth tokens that might point to this file_priv,
37165 (do that under the drm_global_mutex) */
37166@@ -550,8 +550,8 @@ int drm_release(struct inode *inode, struct file *filp)
37167 * End inline drm_release
37168 */
37169
37170- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
37171- if (!--dev->open_count) {
37172+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
37173+ if (local_dec_and_test(&dev->open_count)) {
37174 if (atomic_read(&dev->ioctl_count)) {
37175 DRM_ERROR("Device busy: %d\n",
37176 atomic_read(&dev->ioctl_count));
37177diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
37178index f731116..629842c 100644
37179--- a/drivers/gpu/drm/drm_global.c
37180+++ b/drivers/gpu/drm/drm_global.c
37181@@ -36,7 +36,7 @@
37182 struct drm_global_item {
37183 struct mutex mutex;
37184 void *object;
37185- int refcount;
37186+ atomic_t refcount;
37187 };
37188
37189 static struct drm_global_item glob[DRM_GLOBAL_NUM];
37190@@ -49,7 +49,7 @@ void drm_global_init(void)
37191 struct drm_global_item *item = &glob[i];
37192 mutex_init(&item->mutex);
37193 item->object = NULL;
37194- item->refcount = 0;
37195+ atomic_set(&item->refcount, 0);
37196 }
37197 }
37198
37199@@ -59,7 +59,7 @@ void drm_global_release(void)
37200 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
37201 struct drm_global_item *item = &glob[i];
37202 BUG_ON(item->object != NULL);
37203- BUG_ON(item->refcount != 0);
37204+ BUG_ON(atomic_read(&item->refcount) != 0);
37205 }
37206 }
37207
37208@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
37209 void *object;
37210
37211 mutex_lock(&item->mutex);
37212- if (item->refcount == 0) {
37213+ if (atomic_read(&item->refcount) == 0) {
37214 item->object = kzalloc(ref->size, GFP_KERNEL);
37215 if (unlikely(item->object == NULL)) {
37216 ret = -ENOMEM;
37217@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
37218 goto out_err;
37219
37220 }
37221- ++item->refcount;
37222+ atomic_inc(&item->refcount);
37223 ref->object = item->object;
37224 object = item->object;
37225 mutex_unlock(&item->mutex);
37226@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
37227 struct drm_global_item *item = &glob[ref->global_type];
37228
37229 mutex_lock(&item->mutex);
37230- BUG_ON(item->refcount == 0);
37231+ BUG_ON(atomic_read(&item->refcount) == 0);
37232 BUG_ON(ref->object != item->object);
37233- if (--item->refcount == 0) {
37234+ if (atomic_dec_and_test(&item->refcount)) {
37235 ref->release(ref);
37236 item->object = NULL;
37237 }
37238diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
37239index d4b20ce..77a8d41 100644
37240--- a/drivers/gpu/drm/drm_info.c
37241+++ b/drivers/gpu/drm/drm_info.c
37242@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
37243 struct drm_local_map *map;
37244 struct drm_map_list *r_list;
37245
37246- /* Hardcoded from _DRM_FRAME_BUFFER,
37247- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
37248- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
37249- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
37250+ static const char * const types[] = {
37251+ [_DRM_FRAME_BUFFER] = "FB",
37252+ [_DRM_REGISTERS] = "REG",
37253+ [_DRM_SHM] = "SHM",
37254+ [_DRM_AGP] = "AGP",
37255+ [_DRM_SCATTER_GATHER] = "SG",
37256+ [_DRM_CONSISTENT] = "PCI",
37257+ [_DRM_GEM] = "GEM" };
37258 const char *type;
37259 int i;
37260
37261@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
37262 map = r_list->map;
37263 if (!map)
37264 continue;
37265- if (map->type < 0 || map->type > 5)
37266+ if (map->type >= ARRAY_SIZE(types))
37267 type = "??";
37268 else
37269 type = types[map->type];
37270@@ -253,7 +257,11 @@ int drm_vma_info(struct seq_file *m, void *data)
37271 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
37272 vma->vm_flags & VM_LOCKED ? 'l' : '-',
37273 vma->vm_flags & VM_IO ? 'i' : '-',
37274+#ifdef CONFIG_GRKERNSEC_HIDESYM
37275+ 0);
37276+#else
37277 vma->vm_pgoff);
37278+#endif
37279
37280 #if defined(__i386__)
37281 pgprot = pgprot_val(vma->vm_page_prot);
37282diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
37283index 2f4c434..dd12cd2 100644
37284--- a/drivers/gpu/drm/drm_ioc32.c
37285+++ b/drivers/gpu/drm/drm_ioc32.c
37286@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
37287 request = compat_alloc_user_space(nbytes);
37288 if (!access_ok(VERIFY_WRITE, request, nbytes))
37289 return -EFAULT;
37290- list = (struct drm_buf_desc *) (request + 1);
37291+ list = (struct drm_buf_desc __user *) (request + 1);
37292
37293 if (__put_user(count, &request->count)
37294 || __put_user(list, &request->list))
37295@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
37296 request = compat_alloc_user_space(nbytes);
37297 if (!access_ok(VERIFY_WRITE, request, nbytes))
37298 return -EFAULT;
37299- list = (struct drm_buf_pub *) (request + 1);
37300+ list = (struct drm_buf_pub __user *) (request + 1);
37301
37302 if (__put_user(count, &request->count)
37303 || __put_user(list, &request->list))
37304@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
37305 return 0;
37306 }
37307
37308-drm_ioctl_compat_t *drm_compat_ioctls[] = {
37309+drm_ioctl_compat_t drm_compat_ioctls[] = {
37310 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
37311 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
37312 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
37313@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
37314 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
37315 {
37316 unsigned int nr = DRM_IOCTL_NR(cmd);
37317- drm_ioctl_compat_t *fn;
37318 int ret;
37319
37320 /* Assume that ioctls without an explicit compat routine will just
37321@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
37322 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
37323 return drm_ioctl(filp, cmd, arg);
37324
37325- fn = drm_compat_ioctls[nr];
37326-
37327- if (fn != NULL)
37328- ret = (*fn) (filp, cmd, arg);
37329+ if (drm_compat_ioctls[nr] != NULL)
37330+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
37331 else
37332 ret = drm_ioctl(filp, cmd, arg);
37333
37334diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
37335index e77bd8b..1571b85 100644
37336--- a/drivers/gpu/drm/drm_ioctl.c
37337+++ b/drivers/gpu/drm/drm_ioctl.c
37338@@ -252,7 +252,7 @@ int drm_getstats(struct drm_device *dev, void *data,
37339 stats->data[i].value =
37340 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
37341 else
37342- stats->data[i].value = atomic_read(&dev->counts[i]);
37343+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
37344 stats->data[i].type = dev->types[i];
37345 }
37346
37347diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
37348index d752c96..fe08455 100644
37349--- a/drivers/gpu/drm/drm_lock.c
37350+++ b/drivers/gpu/drm/drm_lock.c
37351@@ -86,7 +86,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
37352 if (drm_lock_take(&master->lock, lock->context)) {
37353 master->lock.file_priv = file_priv;
37354 master->lock.lock_time = jiffies;
37355- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
37356+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
37357 break; /* Got lock */
37358 }
37359
37360@@ -157,7 +157,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
37361 return -EINVAL;
37362 }
37363
37364- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
37365+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
37366
37367 if (drm_lock_free(&master->lock, lock->context)) {
37368 /* FIXME: Should really bail out here. */
37369diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
37370index 16f3ec5..b28f9ca 100644
37371--- a/drivers/gpu/drm/drm_stub.c
37372+++ b/drivers/gpu/drm/drm_stub.c
37373@@ -501,7 +501,7 @@ void drm_unplug_dev(struct drm_device *dev)
37374
37375 drm_device_set_unplugged(dev);
37376
37377- if (dev->open_count == 0) {
37378+ if (local_read(&dev->open_count) == 0) {
37379 drm_put_dev(dev);
37380 }
37381 mutex_unlock(&drm_global_mutex);
37382diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
37383index 0229665..f61329c 100644
37384--- a/drivers/gpu/drm/drm_sysfs.c
37385+++ b/drivers/gpu/drm/drm_sysfs.c
37386@@ -499,7 +499,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
37387 int drm_sysfs_device_add(struct drm_minor *minor)
37388 {
37389 int err;
37390- char *minor_str;
37391+ const char *minor_str;
37392
37393 minor->kdev.parent = minor->dev->dev;
37394
37395diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
37396index 004ecdf..db1f6e0 100644
37397--- a/drivers/gpu/drm/i810/i810_dma.c
37398+++ b/drivers/gpu/drm/i810/i810_dma.c
37399@@ -945,8 +945,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
37400 dma->buflist[vertex->idx],
37401 vertex->discard, vertex->used);
37402
37403- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
37404- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
37405+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
37406+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
37407 sarea_priv->last_enqueue = dev_priv->counter - 1;
37408 sarea_priv->last_dispatch = (int)hw_status[5];
37409
37410@@ -1106,8 +1106,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
37411 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
37412 mc->last_render);
37413
37414- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
37415- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
37416+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
37417+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
37418 sarea_priv->last_enqueue = dev_priv->counter - 1;
37419 sarea_priv->last_dispatch = (int)hw_status[5];
37420
37421diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
37422index 6e0acad..93c8289 100644
37423--- a/drivers/gpu/drm/i810/i810_drv.h
37424+++ b/drivers/gpu/drm/i810/i810_drv.h
37425@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
37426 int page_flipping;
37427
37428 wait_queue_head_t irq_queue;
37429- atomic_t irq_received;
37430- atomic_t irq_emitted;
37431+ atomic_unchecked_t irq_received;
37432+ atomic_unchecked_t irq_emitted;
37433
37434 int front_offset;
37435 } drm_i810_private_t;
37436diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
37437index e913d32..4d9b351 100644
37438--- a/drivers/gpu/drm/i915/i915_debugfs.c
37439+++ b/drivers/gpu/drm/i915/i915_debugfs.c
37440@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
37441 I915_READ(GTIMR));
37442 }
37443 seq_printf(m, "Interrupts received: %d\n",
37444- atomic_read(&dev_priv->irq_received));
37445+ atomic_read_unchecked(&dev_priv->irq_received));
37446 for_each_ring(ring, dev_priv, i) {
37447 if (IS_GEN6(dev) || IS_GEN7(dev)) {
37448 seq_printf(m,
37449diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
37450index 17d9b0b..860e6d9 100644
37451--- a/drivers/gpu/drm/i915/i915_dma.c
37452+++ b/drivers/gpu/drm/i915/i915_dma.c
37453@@ -1259,7 +1259,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
37454 bool can_switch;
37455
37456 spin_lock(&dev->count_lock);
37457- can_switch = (dev->open_count == 0);
37458+ can_switch = (local_read(&dev->open_count) == 0);
37459 spin_unlock(&dev->count_lock);
37460 return can_switch;
37461 }
37462diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
37463index 47d8b68..52f5d8d 100644
37464--- a/drivers/gpu/drm/i915/i915_drv.h
37465+++ b/drivers/gpu/drm/i915/i915_drv.h
37466@@ -916,7 +916,7 @@ typedef struct drm_i915_private {
37467 drm_dma_handle_t *status_page_dmah;
37468 struct resource mch_res;
37469
37470- atomic_t irq_received;
37471+ atomic_unchecked_t irq_received;
37472
37473 /* protects the irq masks */
37474 spinlock_t irq_lock;
37475@@ -1813,7 +1813,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter(
37476 struct drm_i915_private *dev_priv, unsigned port);
37477 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
37478 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
37479-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
37480+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
37481 {
37482 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
37483 }
37484diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
37485index 117ce38..eefd237 100644
37486--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
37487+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
37488@@ -727,9 +727,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
37489
37490 static int
37491 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
37492- int count)
37493+ unsigned int count)
37494 {
37495- int i;
37496+ unsigned int i;
37497 int relocs_total = 0;
37498 int relocs_max = INT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
37499
37500diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
37501index 3c59584..500f2e9 100644
37502--- a/drivers/gpu/drm/i915/i915_ioc32.c
37503+++ b/drivers/gpu/drm/i915/i915_ioc32.c
37504@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
37505 (unsigned long)request);
37506 }
37507
37508-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
37509+static drm_ioctl_compat_t i915_compat_ioctls[] = {
37510 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
37511 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
37512 [DRM_I915_GETPARAM] = compat_i915_getparam,
37513@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
37514 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
37515 {
37516 unsigned int nr = DRM_IOCTL_NR(cmd);
37517- drm_ioctl_compat_t *fn = NULL;
37518 int ret;
37519
37520 if (nr < DRM_COMMAND_BASE)
37521 return drm_compat_ioctl(filp, cmd, arg);
37522
37523- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
37524- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
37525-
37526- if (fn != NULL)
37527+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
37528+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
37529 ret = (*fn) (filp, cmd, arg);
37530- else
37531+ } else
37532 ret = drm_ioctl(filp, cmd, arg);
37533
37534 return ret;
37535diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
37536index e5e32869..1678f36 100644
37537--- a/drivers/gpu/drm/i915/i915_irq.c
37538+++ b/drivers/gpu/drm/i915/i915_irq.c
37539@@ -670,7 +670,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
37540 int pipe;
37541 u32 pipe_stats[I915_MAX_PIPES];
37542
37543- atomic_inc(&dev_priv->irq_received);
37544+ atomic_inc_unchecked(&dev_priv->irq_received);
37545
37546 while (true) {
37547 iir = I915_READ(VLV_IIR);
37548@@ -835,7 +835,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg)
37549 irqreturn_t ret = IRQ_NONE;
37550 int i;
37551
37552- atomic_inc(&dev_priv->irq_received);
37553+ atomic_inc_unchecked(&dev_priv->irq_received);
37554
37555 /* disable master interrupt before clearing iir */
37556 de_ier = I915_READ(DEIER);
37557@@ -925,7 +925,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
37558 int ret = IRQ_NONE;
37559 u32 de_iir, gt_iir, de_ier, pm_iir, sde_ier;
37560
37561- atomic_inc(&dev_priv->irq_received);
37562+ atomic_inc_unchecked(&dev_priv->irq_received);
37563
37564 /* disable master interrupt before clearing iir */
37565 de_ier = I915_READ(DEIER);
37566@@ -2089,7 +2089,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
37567 {
37568 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
37569
37570- atomic_set(&dev_priv->irq_received, 0);
37571+ atomic_set_unchecked(&dev_priv->irq_received, 0);
37572
37573 I915_WRITE(HWSTAM, 0xeffe);
37574
37575@@ -2124,7 +2124,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
37576 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
37577 int pipe;
37578
37579- atomic_set(&dev_priv->irq_received, 0);
37580+ atomic_set_unchecked(&dev_priv->irq_received, 0);
37581
37582 /* VLV magic */
37583 I915_WRITE(VLV_IMR, 0);
37584@@ -2411,7 +2411,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
37585 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
37586 int pipe;
37587
37588- atomic_set(&dev_priv->irq_received, 0);
37589+ atomic_set_unchecked(&dev_priv->irq_received, 0);
37590
37591 for_each_pipe(pipe)
37592 I915_WRITE(PIPESTAT(pipe), 0);
37593@@ -2490,7 +2490,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
37594 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
37595 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
37596
37597- atomic_inc(&dev_priv->irq_received);
37598+ atomic_inc_unchecked(&dev_priv->irq_received);
37599
37600 iir = I915_READ16(IIR);
37601 if (iir == 0)
37602@@ -2565,7 +2565,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
37603 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
37604 int pipe;
37605
37606- atomic_set(&dev_priv->irq_received, 0);
37607+ atomic_set_unchecked(&dev_priv->irq_received, 0);
37608
37609 if (I915_HAS_HOTPLUG(dev)) {
37610 I915_WRITE(PORT_HOTPLUG_EN, 0);
37611@@ -2664,7 +2664,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
37612 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
37613 int pipe, ret = IRQ_NONE;
37614
37615- atomic_inc(&dev_priv->irq_received);
37616+ atomic_inc_unchecked(&dev_priv->irq_received);
37617
37618 iir = I915_READ(IIR);
37619 do {
37620@@ -2791,7 +2791,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
37621 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
37622 int pipe;
37623
37624- atomic_set(&dev_priv->irq_received, 0);
37625+ atomic_set_unchecked(&dev_priv->irq_received, 0);
37626
37627 I915_WRITE(PORT_HOTPLUG_EN, 0);
37628 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
37629@@ -2898,7 +2898,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
37630 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
37631 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
37632
37633- atomic_inc(&dev_priv->irq_received);
37634+ atomic_inc_unchecked(&dev_priv->irq_received);
37635
37636 iir = I915_READ(IIR);
37637
37638diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
37639index eea5982..eeef407 100644
37640--- a/drivers/gpu/drm/i915/intel_display.c
37641+++ b/drivers/gpu/drm/i915/intel_display.c
37642@@ -8935,13 +8935,13 @@ struct intel_quirk {
37643 int subsystem_vendor;
37644 int subsystem_device;
37645 void (*hook)(struct drm_device *dev);
37646-};
37647+} __do_const;
37648
37649 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
37650 struct intel_dmi_quirk {
37651 void (*hook)(struct drm_device *dev);
37652 const struct dmi_system_id (*dmi_id_list)[];
37653-};
37654+} __do_const;
37655
37656 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
37657 {
37658@@ -8949,18 +8949,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
37659 return 1;
37660 }
37661
37662-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
37663+static const struct dmi_system_id intel_dmi_quirks_table[] = {
37664 {
37665- .dmi_id_list = &(const struct dmi_system_id[]) {
37666- {
37667- .callback = intel_dmi_reverse_brightness,
37668- .ident = "NCR Corporation",
37669- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
37670- DMI_MATCH(DMI_PRODUCT_NAME, ""),
37671- },
37672- },
37673- { } /* terminating entry */
37674+ .callback = intel_dmi_reverse_brightness,
37675+ .ident = "NCR Corporation",
37676+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
37677+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
37678 },
37679+ },
37680+ { } /* terminating entry */
37681+};
37682+
37683+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
37684+ {
37685+ .dmi_id_list = &intel_dmi_quirks_table,
37686 .hook = quirk_invert_brightness,
37687 },
37688 };
37689diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
37690index 54558a0..2d97005 100644
37691--- a/drivers/gpu/drm/mga/mga_drv.h
37692+++ b/drivers/gpu/drm/mga/mga_drv.h
37693@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
37694 u32 clear_cmd;
37695 u32 maccess;
37696
37697- atomic_t vbl_received; /**< Number of vblanks received. */
37698+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
37699 wait_queue_head_t fence_queue;
37700- atomic_t last_fence_retired;
37701+ atomic_unchecked_t last_fence_retired;
37702 u32 next_fence_to_post;
37703
37704 unsigned int fb_cpp;
37705diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
37706index 709e90d..89a1c0d 100644
37707--- a/drivers/gpu/drm/mga/mga_ioc32.c
37708+++ b/drivers/gpu/drm/mga/mga_ioc32.c
37709@@ -189,7 +189,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
37710 return 0;
37711 }
37712
37713-drm_ioctl_compat_t *mga_compat_ioctls[] = {
37714+drm_ioctl_compat_t mga_compat_ioctls[] = {
37715 [DRM_MGA_INIT] = compat_mga_init,
37716 [DRM_MGA_GETPARAM] = compat_mga_getparam,
37717 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
37718@@ -207,18 +207,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
37719 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
37720 {
37721 unsigned int nr = DRM_IOCTL_NR(cmd);
37722- drm_ioctl_compat_t *fn = NULL;
37723 int ret;
37724
37725 if (nr < DRM_COMMAND_BASE)
37726 return drm_compat_ioctl(filp, cmd, arg);
37727
37728- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
37729- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
37730-
37731- if (fn != NULL)
37732+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
37733+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
37734 ret = (*fn) (filp, cmd, arg);
37735- else
37736+ } else
37737 ret = drm_ioctl(filp, cmd, arg);
37738
37739 return ret;
37740diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
37741index 598c281..60d590e 100644
37742--- a/drivers/gpu/drm/mga/mga_irq.c
37743+++ b/drivers/gpu/drm/mga/mga_irq.c
37744@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
37745 if (crtc != 0)
37746 return 0;
37747
37748- return atomic_read(&dev_priv->vbl_received);
37749+ return atomic_read_unchecked(&dev_priv->vbl_received);
37750 }
37751
37752
37753@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
37754 /* VBLANK interrupt */
37755 if (status & MGA_VLINEPEN) {
37756 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
37757- atomic_inc(&dev_priv->vbl_received);
37758+ atomic_inc_unchecked(&dev_priv->vbl_received);
37759 drm_handle_vblank(dev, 0);
37760 handled = 1;
37761 }
37762@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
37763 if ((prim_start & ~0x03) != (prim_end & ~0x03))
37764 MGA_WRITE(MGA_PRIMEND, prim_end);
37765
37766- atomic_inc(&dev_priv->last_fence_retired);
37767+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
37768 DRM_WAKEUP(&dev_priv->fence_queue);
37769 handled = 1;
37770 }
37771@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
37772 * using fences.
37773 */
37774 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
37775- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
37776+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
37777 - *sequence) <= (1 << 23)));
37778
37779 *sequence = cur_fence;
37780diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
37781index 6aa2137..fe8dc55 100644
37782--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
37783+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
37784@@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
37785 struct bit_table {
37786 const char id;
37787 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
37788-};
37789+} __no_const;
37790
37791 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
37792
37793diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
37794index f2b30f8..d0f9a95 100644
37795--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
37796+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
37797@@ -92,7 +92,7 @@ struct nouveau_drm {
37798 struct drm_global_reference mem_global_ref;
37799 struct ttm_bo_global_ref bo_global_ref;
37800 struct ttm_bo_device bdev;
37801- atomic_t validate_sequence;
37802+ atomic_unchecked_t validate_sequence;
37803 int (*move)(struct nouveau_channel *,
37804 struct ttm_buffer_object *,
37805 struct ttm_mem_reg *, struct ttm_mem_reg *);
37806diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
37807index b4b4d0c..b7edc15 100644
37808--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
37809+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
37810@@ -322,7 +322,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
37811 int ret, i;
37812 struct nouveau_bo *res_bo = NULL;
37813
37814- sequence = atomic_add_return(1, &drm->ttm.validate_sequence);
37815+ sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence);
37816 retry:
37817 if (++trycnt > 100000) {
37818 NV_ERROR(cli, "%s failed and gave up.\n", __func__);
37819@@ -359,7 +359,7 @@ retry:
37820 if (ret) {
37821 validate_fini(op, NULL);
37822 if (unlikely(ret == -EAGAIN)) {
37823- sequence = atomic_add_return(1, &drm->ttm.validate_sequence);
37824+ sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence);
37825 ret = ttm_bo_reserve_slowpath(&nvbo->bo, true,
37826 sequence);
37827 if (!ret)
37828diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
37829index 08214bc..9208577 100644
37830--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
37831+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
37832@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
37833 unsigned long arg)
37834 {
37835 unsigned int nr = DRM_IOCTL_NR(cmd);
37836- drm_ioctl_compat_t *fn = NULL;
37837+ drm_ioctl_compat_t fn = NULL;
37838 int ret;
37839
37840 if (nr < DRM_COMMAND_BASE)
37841diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
37842index 25d3495..d81aaf6 100644
37843--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
37844+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
37845@@ -62,7 +62,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
37846 bool can_switch;
37847
37848 spin_lock(&dev->count_lock);
37849- can_switch = (dev->open_count == 0);
37850+ can_switch = (local_read(&dev->open_count) == 0);
37851 spin_unlock(&dev->count_lock);
37852 return can_switch;
37853 }
37854diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
37855index 489cb8c..0b8d0d3 100644
37856--- a/drivers/gpu/drm/qxl/qxl_ttm.c
37857+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
37858@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
37859 }
37860 }
37861
37862-static struct vm_operations_struct qxl_ttm_vm_ops;
37863+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
37864 static const struct vm_operations_struct *ttm_vm_ops;
37865
37866 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
37867@@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
37868 return r;
37869 if (unlikely(ttm_vm_ops == NULL)) {
37870 ttm_vm_ops = vma->vm_ops;
37871+ pax_open_kernel();
37872 qxl_ttm_vm_ops = *ttm_vm_ops;
37873 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
37874+ pax_close_kernel();
37875 }
37876 vma->vm_ops = &qxl_ttm_vm_ops;
37877 return 0;
37878@@ -556,25 +558,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
37879 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
37880 {
37881 #if defined(CONFIG_DEBUG_FS)
37882- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
37883- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
37884- unsigned i;
37885+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
37886+ {
37887+ .name = "qxl_mem_mm",
37888+ .show = &qxl_mm_dump_table,
37889+ },
37890+ {
37891+ .name = "qxl_surf_mm",
37892+ .show = &qxl_mm_dump_table,
37893+ }
37894+ };
37895
37896- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
37897- if (i == 0)
37898- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
37899- else
37900- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
37901- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
37902- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
37903- qxl_mem_types_list[i].driver_features = 0;
37904- if (i == 0)
37905- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
37906- else
37907- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
37908+ pax_open_kernel();
37909+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
37910+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
37911+ pax_close_kernel();
37912
37913- }
37914- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
37915+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
37916 #else
37917 return 0;
37918 #endif
37919diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
37920index d4660cf..70dbe65 100644
37921--- a/drivers/gpu/drm/r128/r128_cce.c
37922+++ b/drivers/gpu/drm/r128/r128_cce.c
37923@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
37924
37925 /* GH: Simple idle check.
37926 */
37927- atomic_set(&dev_priv->idle_count, 0);
37928+ atomic_set_unchecked(&dev_priv->idle_count, 0);
37929
37930 /* We don't support anything other than bus-mastering ring mode,
37931 * but the ring can be in either AGP or PCI space for the ring
37932diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
37933index 930c71b..499aded 100644
37934--- a/drivers/gpu/drm/r128/r128_drv.h
37935+++ b/drivers/gpu/drm/r128/r128_drv.h
37936@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
37937 int is_pci;
37938 unsigned long cce_buffers_offset;
37939
37940- atomic_t idle_count;
37941+ atomic_unchecked_t idle_count;
37942
37943 int page_flipping;
37944 int current_page;
37945 u32 crtc_offset;
37946 u32 crtc_offset_cntl;
37947
37948- atomic_t vbl_received;
37949+ atomic_unchecked_t vbl_received;
37950
37951 u32 color_fmt;
37952 unsigned int front_offset;
37953diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
37954index a954c54..9cc595c 100644
37955--- a/drivers/gpu/drm/r128/r128_ioc32.c
37956+++ b/drivers/gpu/drm/r128/r128_ioc32.c
37957@@ -177,7 +177,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
37958 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
37959 }
37960
37961-drm_ioctl_compat_t *r128_compat_ioctls[] = {
37962+drm_ioctl_compat_t r128_compat_ioctls[] = {
37963 [DRM_R128_INIT] = compat_r128_init,
37964 [DRM_R128_DEPTH] = compat_r128_depth,
37965 [DRM_R128_STIPPLE] = compat_r128_stipple,
37966@@ -196,18 +196,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
37967 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
37968 {
37969 unsigned int nr = DRM_IOCTL_NR(cmd);
37970- drm_ioctl_compat_t *fn = NULL;
37971 int ret;
37972
37973 if (nr < DRM_COMMAND_BASE)
37974 return drm_compat_ioctl(filp, cmd, arg);
37975
37976- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
37977- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
37978-
37979- if (fn != NULL)
37980+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
37981+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
37982 ret = (*fn) (filp, cmd, arg);
37983- else
37984+ } else
37985 ret = drm_ioctl(filp, cmd, arg);
37986
37987 return ret;
37988diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
37989index 2ea4f09..d391371 100644
37990--- a/drivers/gpu/drm/r128/r128_irq.c
37991+++ b/drivers/gpu/drm/r128/r128_irq.c
37992@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
37993 if (crtc != 0)
37994 return 0;
37995
37996- return atomic_read(&dev_priv->vbl_received);
37997+ return atomic_read_unchecked(&dev_priv->vbl_received);
37998 }
37999
38000 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
38001@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
38002 /* VBLANK interrupt */
38003 if (status & R128_CRTC_VBLANK_INT) {
38004 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
38005- atomic_inc(&dev_priv->vbl_received);
38006+ atomic_inc_unchecked(&dev_priv->vbl_received);
38007 drm_handle_vblank(dev, 0);
38008 return IRQ_HANDLED;
38009 }
38010diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
38011index 19bb7e6..de7e2a2 100644
38012--- a/drivers/gpu/drm/r128/r128_state.c
38013+++ b/drivers/gpu/drm/r128/r128_state.c
38014@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
38015
38016 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
38017 {
38018- if (atomic_read(&dev_priv->idle_count) == 0)
38019+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
38020 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
38021 else
38022- atomic_set(&dev_priv->idle_count, 0);
38023+ atomic_set_unchecked(&dev_priv->idle_count, 0);
38024 }
38025
38026 #endif
38027diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
38028index 5a82b6b..9e69c73 100644
38029--- a/drivers/gpu/drm/radeon/mkregtable.c
38030+++ b/drivers/gpu/drm/radeon/mkregtable.c
38031@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
38032 regex_t mask_rex;
38033 regmatch_t match[4];
38034 char buf[1024];
38035- size_t end;
38036+ long end;
38037 int len;
38038 int done = 0;
38039 int r;
38040 unsigned o;
38041 struct offset *offset;
38042 char last_reg_s[10];
38043- int last_reg;
38044+ unsigned long last_reg;
38045
38046 if (regcomp
38047 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
38048diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
38049index b0dc0b6..a9bfe9c 100644
38050--- a/drivers/gpu/drm/radeon/radeon_device.c
38051+++ b/drivers/gpu/drm/radeon/radeon_device.c
38052@@ -1014,7 +1014,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
38053 bool can_switch;
38054
38055 spin_lock(&dev->count_lock);
38056- can_switch = (dev->open_count == 0);
38057+ can_switch = (local_read(&dev->open_count) == 0);
38058 spin_unlock(&dev->count_lock);
38059 return can_switch;
38060 }
38061diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
38062index b369d42..8dd04eb 100644
38063--- a/drivers/gpu/drm/radeon/radeon_drv.h
38064+++ b/drivers/gpu/drm/radeon/radeon_drv.h
38065@@ -258,7 +258,7 @@ typedef struct drm_radeon_private {
38066
38067 /* SW interrupt */
38068 wait_queue_head_t swi_queue;
38069- atomic_t swi_emitted;
38070+ atomic_unchecked_t swi_emitted;
38071 int vblank_crtc;
38072 uint32_t irq_enable_reg;
38073 uint32_t r500_disp_irq_reg;
38074diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
38075index c180df8..5fd8186 100644
38076--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
38077+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
38078@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
38079 request = compat_alloc_user_space(sizeof(*request));
38080 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
38081 || __put_user(req32.param, &request->param)
38082- || __put_user((void __user *)(unsigned long)req32.value,
38083+ || __put_user((unsigned long)req32.value,
38084 &request->value))
38085 return -EFAULT;
38086
38087@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
38088 #define compat_radeon_cp_setparam NULL
38089 #endif /* X86_64 || IA64 */
38090
38091-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
38092+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
38093 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
38094 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
38095 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
38096@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
38097 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
38098 {
38099 unsigned int nr = DRM_IOCTL_NR(cmd);
38100- drm_ioctl_compat_t *fn = NULL;
38101 int ret;
38102
38103 if (nr < DRM_COMMAND_BASE)
38104 return drm_compat_ioctl(filp, cmd, arg);
38105
38106- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
38107- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
38108-
38109- if (fn != NULL)
38110+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
38111+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
38112 ret = (*fn) (filp, cmd, arg);
38113- else
38114+ } else
38115 ret = drm_ioctl(filp, cmd, arg);
38116
38117 return ret;
38118diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
38119index 8d68e97..9dcfed8 100644
38120--- a/drivers/gpu/drm/radeon/radeon_irq.c
38121+++ b/drivers/gpu/drm/radeon/radeon_irq.c
38122@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
38123 unsigned int ret;
38124 RING_LOCALS;
38125
38126- atomic_inc(&dev_priv->swi_emitted);
38127- ret = atomic_read(&dev_priv->swi_emitted);
38128+ atomic_inc_unchecked(&dev_priv->swi_emitted);
38129+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
38130
38131 BEGIN_RING(4);
38132 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
38133@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
38134 drm_radeon_private_t *dev_priv =
38135 (drm_radeon_private_t *) dev->dev_private;
38136
38137- atomic_set(&dev_priv->swi_emitted, 0);
38138+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
38139 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
38140
38141 dev->max_vblank_count = 0x001fffff;
38142diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
38143index 4d20910..6726b6d 100644
38144--- a/drivers/gpu/drm/radeon/radeon_state.c
38145+++ b/drivers/gpu/drm/radeon/radeon_state.c
38146@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
38147 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
38148 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
38149
38150- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
38151+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
38152 sarea_priv->nbox * sizeof(depth_boxes[0])))
38153 return -EFAULT;
38154
38155@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
38156 {
38157 drm_radeon_private_t *dev_priv = dev->dev_private;
38158 drm_radeon_getparam_t *param = data;
38159- int value;
38160+ int value = 0;
38161
38162 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
38163
38164diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
38165index 6c0ce89..57a2529 100644
38166--- a/drivers/gpu/drm/radeon/radeon_ttm.c
38167+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
38168@@ -782,7 +782,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
38169 man->size = size >> PAGE_SHIFT;
38170 }
38171
38172-static struct vm_operations_struct radeon_ttm_vm_ops;
38173+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
38174 static const struct vm_operations_struct *ttm_vm_ops = NULL;
38175
38176 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38177@@ -823,8 +823,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
38178 }
38179 if (unlikely(ttm_vm_ops == NULL)) {
38180 ttm_vm_ops = vma->vm_ops;
38181+ pax_open_kernel();
38182 radeon_ttm_vm_ops = *ttm_vm_ops;
38183 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
38184+ pax_close_kernel();
38185 }
38186 vma->vm_ops = &radeon_ttm_vm_ops;
38187 return 0;
38188@@ -853,38 +855,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
38189 static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
38190 {
38191 #if defined(CONFIG_DEBUG_FS)
38192- static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];
38193- static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];
38194+ static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2] = {
38195+ {
38196+ .name = "radeon_vram_mm",
38197+ .show = &radeon_mm_dump_table,
38198+ },
38199+ {
38200+ .name = "radeon_gtt_mm",
38201+ .show = &radeon_mm_dump_table,
38202+ },
38203+ {
38204+ .name = "ttm_page_pool",
38205+ .show = &ttm_page_alloc_debugfs,
38206+ },
38207+ {
38208+ .name = "ttm_dma_page_pool",
38209+ .show = &ttm_dma_page_alloc_debugfs,
38210+ },
38211+ };
38212 unsigned i;
38213
38214- for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
38215- if (i == 0)
38216- sprintf(radeon_mem_types_names[i], "radeon_vram_mm");
38217- else
38218- sprintf(radeon_mem_types_names[i], "radeon_gtt_mm");
38219- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
38220- radeon_mem_types_list[i].show = &radeon_mm_dump_table;
38221- radeon_mem_types_list[i].driver_features = 0;
38222- if (i == 0)
38223- radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
38224- else
38225- radeon_mem_types_list[i].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
38226-
38227- }
38228- /* Add ttm page pool to debugfs */
38229- sprintf(radeon_mem_types_names[i], "ttm_page_pool");
38230- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
38231- radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;
38232- radeon_mem_types_list[i].driver_features = 0;
38233- radeon_mem_types_list[i++].data = NULL;
38234+ pax_open_kernel();
38235+ *(void **)&radeon_mem_types_list[0].data = rdev->mman.bdev.man[TTM_PL_VRAM].priv;
38236+ *(void **)&radeon_mem_types_list[1].data = rdev->mman.bdev.man[TTM_PL_TT].priv;
38237+ pax_close_kernel();
38238 #ifdef CONFIG_SWIOTLB
38239- if (swiotlb_nr_tbl()) {
38240- sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
38241- radeon_mem_types_list[i].name = radeon_mem_types_names[i];
38242- radeon_mem_types_list[i].show = &ttm_dma_page_alloc_debugfs;
38243- radeon_mem_types_list[i].driver_features = 0;
38244- radeon_mem_types_list[i++].data = NULL;
38245- }
38246+ if (swiotlb_nr_tbl())
38247+ i++;
38248 #endif
38249 return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);
38250
38251diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
38252index 55880d5..9e95342 100644
38253--- a/drivers/gpu/drm/radeon/rs690.c
38254+++ b/drivers/gpu/drm/radeon/rs690.c
38255@@ -327,9 +327,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
38256 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
38257 rdev->pm.sideport_bandwidth.full)
38258 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
38259- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
38260+ read_delay_latency.full = dfixed_const(800 * 1000);
38261 read_delay_latency.full = dfixed_div(read_delay_latency,
38262 rdev->pm.igp_sideport_mclk);
38263+ a.full = dfixed_const(370);
38264+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
38265 } else {
38266 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
38267 rdev->pm.k8_bandwidth.full)
38268diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
38269index dbc2def..0a9f710 100644
38270--- a/drivers/gpu/drm/ttm/ttm_memory.c
38271+++ b/drivers/gpu/drm/ttm/ttm_memory.c
38272@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
38273 zone->glob = glob;
38274 glob->zone_kernel = zone;
38275 ret = kobject_init_and_add(
38276- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
38277+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
38278 if (unlikely(ret != 0)) {
38279 kobject_put(&zone->kobj);
38280 return ret;
38281@@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
38282 zone->glob = glob;
38283 glob->zone_dma32 = zone;
38284 ret = kobject_init_and_add(
38285- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
38286+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
38287 if (unlikely(ret != 0)) {
38288 kobject_put(&zone->kobj);
38289 return ret;
38290diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
38291index bd2a3b4..122d9ad 100644
38292--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
38293+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
38294@@ -394,9 +394,9 @@ static int ttm_pool_get_num_unused_pages(void)
38295 static int ttm_pool_mm_shrink(struct shrinker *shrink,
38296 struct shrink_control *sc)
38297 {
38298- static atomic_t start_pool = ATOMIC_INIT(0);
38299+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
38300 unsigned i;
38301- unsigned pool_offset = atomic_add_return(1, &start_pool);
38302+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
38303 struct ttm_page_pool *pool;
38304 int shrink_pages = sc->nr_to_scan;
38305
38306diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
38307index dc0c065..58a0782 100644
38308--- a/drivers/gpu/drm/udl/udl_fb.c
38309+++ b/drivers/gpu/drm/udl/udl_fb.c
38310@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
38311 fb_deferred_io_cleanup(info);
38312 kfree(info->fbdefio);
38313 info->fbdefio = NULL;
38314- info->fbops->fb_mmap = udl_fb_mmap;
38315 }
38316
38317 pr_warn("released /dev/fb%d user=%d count=%d\n",
38318diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
38319index 893a650..6190d3b 100644
38320--- a/drivers/gpu/drm/via/via_drv.h
38321+++ b/drivers/gpu/drm/via/via_drv.h
38322@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
38323 typedef uint32_t maskarray_t[5];
38324
38325 typedef struct drm_via_irq {
38326- atomic_t irq_received;
38327+ atomic_unchecked_t irq_received;
38328 uint32_t pending_mask;
38329 uint32_t enable_mask;
38330 wait_queue_head_t irq_queue;
38331@@ -75,7 +75,7 @@ typedef struct drm_via_private {
38332 struct timeval last_vblank;
38333 int last_vblank_valid;
38334 unsigned usec_per_vblank;
38335- atomic_t vbl_received;
38336+ atomic_unchecked_t vbl_received;
38337 drm_via_state_t hc_state;
38338 char pci_buf[VIA_PCI_BUF_SIZE];
38339 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
38340diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
38341index ac98964..5dbf512 100644
38342--- a/drivers/gpu/drm/via/via_irq.c
38343+++ b/drivers/gpu/drm/via/via_irq.c
38344@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
38345 if (crtc != 0)
38346 return 0;
38347
38348- return atomic_read(&dev_priv->vbl_received);
38349+ return atomic_read_unchecked(&dev_priv->vbl_received);
38350 }
38351
38352 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
38353@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
38354
38355 status = VIA_READ(VIA_REG_INTERRUPT);
38356 if (status & VIA_IRQ_VBLANK_PENDING) {
38357- atomic_inc(&dev_priv->vbl_received);
38358- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
38359+ atomic_inc_unchecked(&dev_priv->vbl_received);
38360+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
38361 do_gettimeofday(&cur_vblank);
38362 if (dev_priv->last_vblank_valid) {
38363 dev_priv->usec_per_vblank =
38364@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
38365 dev_priv->last_vblank = cur_vblank;
38366 dev_priv->last_vblank_valid = 1;
38367 }
38368- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
38369+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
38370 DRM_DEBUG("US per vblank is: %u\n",
38371 dev_priv->usec_per_vblank);
38372 }
38373@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
38374
38375 for (i = 0; i < dev_priv->num_irqs; ++i) {
38376 if (status & cur_irq->pending_mask) {
38377- atomic_inc(&cur_irq->irq_received);
38378+ atomic_inc_unchecked(&cur_irq->irq_received);
38379 DRM_WAKEUP(&cur_irq->irq_queue);
38380 handled = 1;
38381 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
38382@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
38383 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
38384 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
38385 masks[irq][4]));
38386- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
38387+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
38388 } else {
38389 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
38390 (((cur_irq_sequence =
38391- atomic_read(&cur_irq->irq_received)) -
38392+ atomic_read_unchecked(&cur_irq->irq_received)) -
38393 *sequence) <= (1 << 23)));
38394 }
38395 *sequence = cur_irq_sequence;
38396@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
38397 }
38398
38399 for (i = 0; i < dev_priv->num_irqs; ++i) {
38400- atomic_set(&cur_irq->irq_received, 0);
38401+ atomic_set_unchecked(&cur_irq->irq_received, 0);
38402 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
38403 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
38404 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
38405@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
38406 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
38407 case VIA_IRQ_RELATIVE:
38408 irqwait->request.sequence +=
38409- atomic_read(&cur_irq->irq_received);
38410+ atomic_read_unchecked(&cur_irq->irq_received);
38411 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
38412 case VIA_IRQ_ABSOLUTE:
38413 break;
38414diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
38415index 13aeda7..4a952d1 100644
38416--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
38417+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
38418@@ -290,7 +290,7 @@ struct vmw_private {
38419 * Fencing and IRQs.
38420 */
38421
38422- atomic_t marker_seq;
38423+ atomic_unchecked_t marker_seq;
38424 wait_queue_head_t fence_queue;
38425 wait_queue_head_t fifo_queue;
38426 int fence_queue_waiters; /* Protected by hw_mutex */
38427diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
38428index 3eb1486..0a47ee9 100644
38429--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
38430+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
38431@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
38432 (unsigned int) min,
38433 (unsigned int) fifo->capabilities);
38434
38435- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
38436+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
38437 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
38438 vmw_marker_queue_init(&fifo->marker_queue);
38439 return vmw_fifo_send_fence(dev_priv, &dummy);
38440@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
38441 if (reserveable)
38442 iowrite32(bytes, fifo_mem +
38443 SVGA_FIFO_RESERVED);
38444- return fifo_mem + (next_cmd >> 2);
38445+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
38446 } else {
38447 need_bounce = true;
38448 }
38449@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
38450
38451 fm = vmw_fifo_reserve(dev_priv, bytes);
38452 if (unlikely(fm == NULL)) {
38453- *seqno = atomic_read(&dev_priv->marker_seq);
38454+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
38455 ret = -ENOMEM;
38456 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
38457 false, 3*HZ);
38458@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
38459 }
38460
38461 do {
38462- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
38463+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
38464 } while (*seqno == 0);
38465
38466 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
38467diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
38468index c509d40..3b640c3 100644
38469--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
38470+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
38471@@ -138,7 +138,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
38472 int ret;
38473
38474 num_clips = arg->num_clips;
38475- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
38476+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
38477
38478 if (unlikely(num_clips == 0))
38479 return 0;
38480@@ -222,7 +222,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
38481 int ret;
38482
38483 num_clips = arg->num_clips;
38484- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
38485+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
38486
38487 if (unlikely(num_clips == 0))
38488 return 0;
38489diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
38490index 4640adb..e1384ed 100644
38491--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
38492+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
38493@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
38494 * emitted. Then the fence is stale and signaled.
38495 */
38496
38497- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
38498+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
38499 > VMW_FENCE_WRAP);
38500
38501 return ret;
38502@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
38503
38504 if (fifo_idle)
38505 down_read(&fifo_state->rwsem);
38506- signal_seq = atomic_read(&dev_priv->marker_seq);
38507+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
38508 ret = 0;
38509
38510 for (;;) {
38511diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
38512index 8a8725c2..afed796 100644
38513--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
38514+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
38515@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
38516 while (!vmw_lag_lt(queue, us)) {
38517 spin_lock(&queue->lock);
38518 if (list_empty(&queue->head))
38519- seqno = atomic_read(&dev_priv->marker_seq);
38520+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
38521 else {
38522 marker = list_first_entry(&queue->head,
38523 struct vmw_marker, head);
38524diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
38525index 8c04943..4370ed9 100644
38526--- a/drivers/gpu/host1x/drm/dc.c
38527+++ b/drivers/gpu/host1x/drm/dc.c
38528@@ -999,7 +999,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
38529 }
38530
38531 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
38532- dc->debugfs_files[i].data = dc;
38533+ *(void **)&dc->debugfs_files[i].data = dc;
38534
38535 err = drm_debugfs_create_files(dc->debugfs_files,
38536 ARRAY_SIZE(debugfs_files),
38537diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
38538index 402f486..f862d7e 100644
38539--- a/drivers/hid/hid-core.c
38540+++ b/drivers/hid/hid-core.c
38541@@ -2275,7 +2275,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
38542
38543 int hid_add_device(struct hid_device *hdev)
38544 {
38545- static atomic_t id = ATOMIC_INIT(0);
38546+ static atomic_unchecked_t id = ATOMIC_INIT(0);
38547 int ret;
38548
38549 if (WARN_ON(hdev->status & HID_STAT_ADDED))
38550@@ -2309,7 +2309,7 @@ int hid_add_device(struct hid_device *hdev)
38551 /* XXX hack, any other cleaner solution after the driver core
38552 * is converted to allow more than 20 bytes as the device name? */
38553 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
38554- hdev->vendor, hdev->product, atomic_inc_return(&id));
38555+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
38556
38557 hid_debug_register(hdev, dev_name(&hdev->dev));
38558 ret = device_add(&hdev->dev);
38559diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
38560index 90124ff..3761764 100644
38561--- a/drivers/hid/hid-wiimote-debug.c
38562+++ b/drivers/hid/hid-wiimote-debug.c
38563@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
38564 else if (size == 0)
38565 return -EIO;
38566
38567- if (copy_to_user(u, buf, size))
38568+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
38569 return -EFAULT;
38570
38571 *off += size;
38572diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
38573index 0b122f8..b1d8160 100644
38574--- a/drivers/hv/channel.c
38575+++ b/drivers/hv/channel.c
38576@@ -394,8 +394,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
38577 int ret = 0;
38578 int t;
38579
38580- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
38581- atomic_inc(&vmbus_connection.next_gpadl_handle);
38582+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
38583+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
38584
38585 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
38586 if (ret)
38587diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
38588index ae49237..380d4c9 100644
38589--- a/drivers/hv/hv.c
38590+++ b/drivers/hv/hv.c
38591@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
38592 u64 output_address = (output) ? virt_to_phys(output) : 0;
38593 u32 output_address_hi = output_address >> 32;
38594 u32 output_address_lo = output_address & 0xFFFFFFFF;
38595- void *hypercall_page = hv_context.hypercall_page;
38596+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
38597
38598 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
38599 "=a"(hv_status_lo) : "d" (control_hi),
38600diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
38601index 12f2f9e..679603c 100644
38602--- a/drivers/hv/hyperv_vmbus.h
38603+++ b/drivers/hv/hyperv_vmbus.h
38604@@ -591,7 +591,7 @@ enum vmbus_connect_state {
38605 struct vmbus_connection {
38606 enum vmbus_connect_state conn_state;
38607
38608- atomic_t next_gpadl_handle;
38609+ atomic_unchecked_t next_gpadl_handle;
38610
38611 /*
38612 * Represents channel interrupts. Each bit position represents a
38613diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
38614index 4004e54..c2de226 100644
38615--- a/drivers/hv/vmbus_drv.c
38616+++ b/drivers/hv/vmbus_drv.c
38617@@ -668,10 +668,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
38618 {
38619 int ret = 0;
38620
38621- static atomic_t device_num = ATOMIC_INIT(0);
38622+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
38623
38624 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
38625- atomic_inc_return(&device_num));
38626+ atomic_inc_return_unchecked(&device_num));
38627
38628 child_device_obj->device.bus = &hv_bus;
38629 child_device_obj->device.parent = &hv_acpi_dev->dev;
38630diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
38631index 6351aba..dc4aaf4 100644
38632--- a/drivers/hwmon/acpi_power_meter.c
38633+++ b/drivers/hwmon/acpi_power_meter.c
38634@@ -117,7 +117,7 @@ struct sensor_template {
38635 struct device_attribute *devattr,
38636 const char *buf, size_t count);
38637 int index;
38638-};
38639+} __do_const;
38640
38641 /* Averaging interval */
38642 static int update_avg_interval(struct acpi_power_meter_resource *resource)
38643@@ -629,7 +629,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
38644 struct sensor_template *attrs)
38645 {
38646 struct device *dev = &resource->acpi_dev->dev;
38647- struct sensor_device_attribute *sensors =
38648+ sensor_device_attribute_no_const *sensors =
38649 &resource->sensors[resource->num_sensors];
38650 int res = 0;
38651
38652diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
38653index 62c2e32..8f2859a 100644
38654--- a/drivers/hwmon/applesmc.c
38655+++ b/drivers/hwmon/applesmc.c
38656@@ -1084,7 +1084,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
38657 {
38658 struct applesmc_node_group *grp;
38659 struct applesmc_dev_attr *node;
38660- struct attribute *attr;
38661+ attribute_no_const *attr;
38662 int ret, i;
38663
38664 for (grp = groups; grp->format; grp++) {
38665diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
38666index b25c643..a13460d 100644
38667--- a/drivers/hwmon/asus_atk0110.c
38668+++ b/drivers/hwmon/asus_atk0110.c
38669@@ -152,10 +152,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
38670 struct atk_sensor_data {
38671 struct list_head list;
38672 struct atk_data *data;
38673- struct device_attribute label_attr;
38674- struct device_attribute input_attr;
38675- struct device_attribute limit1_attr;
38676- struct device_attribute limit2_attr;
38677+ device_attribute_no_const label_attr;
38678+ device_attribute_no_const input_attr;
38679+ device_attribute_no_const limit1_attr;
38680+ device_attribute_no_const limit2_attr;
38681 char label_attr_name[ATTR_NAME_SIZE];
38682 char input_attr_name[ATTR_NAME_SIZE];
38683 char limit1_attr_name[ATTR_NAME_SIZE];
38684@@ -275,7 +275,7 @@ static ssize_t atk_name_show(struct device *dev,
38685 static struct device_attribute atk_name_attr =
38686 __ATTR(name, 0444, atk_name_show, NULL);
38687
38688-static void atk_init_attribute(struct device_attribute *attr, char *name,
38689+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
38690 sysfs_show_func show)
38691 {
38692 sysfs_attr_init(&attr->attr);
38693diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
38694index 658ce3a..0d0c2f3 100644
38695--- a/drivers/hwmon/coretemp.c
38696+++ b/drivers/hwmon/coretemp.c
38697@@ -790,7 +790,7 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
38698 return NOTIFY_OK;
38699 }
38700
38701-static struct notifier_block coretemp_cpu_notifier __refdata = {
38702+static struct notifier_block coretemp_cpu_notifier = {
38703 .notifier_call = coretemp_cpu_callback,
38704 };
38705
38706diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
38707index 1429f6e..ee03d59 100644
38708--- a/drivers/hwmon/ibmaem.c
38709+++ b/drivers/hwmon/ibmaem.c
38710@@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
38711 struct aem_rw_sensor_template *rw)
38712 {
38713 struct device *dev = &data->pdev->dev;
38714- struct sensor_device_attribute *sensors = data->sensors;
38715+ sensor_device_attribute_no_const *sensors = data->sensors;
38716 int err;
38717
38718 /* Set up read-only sensors */
38719diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
38720index 52b77af..aed1ddf 100644
38721--- a/drivers/hwmon/iio_hwmon.c
38722+++ b/drivers/hwmon/iio_hwmon.c
38723@@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
38724 {
38725 struct device *dev = &pdev->dev;
38726 struct iio_hwmon_state *st;
38727- struct sensor_device_attribute *a;
38728+ sensor_device_attribute_no_const *a;
38729 int ret, i;
38730 int in_i = 1, temp_i = 1, curr_i = 1;
38731 enum iio_chan_type type;
38732diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
38733index 9add6092..ee7ba3f 100644
38734--- a/drivers/hwmon/pmbus/pmbus_core.c
38735+++ b/drivers/hwmon/pmbus/pmbus_core.c
38736@@ -781,7 +781,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
38737 return 0;
38738 }
38739
38740-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
38741+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
38742 const char *name,
38743 umode_t mode,
38744 ssize_t (*show)(struct device *dev,
38745@@ -798,7 +798,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
38746 dev_attr->store = store;
38747 }
38748
38749-static void pmbus_attr_init(struct sensor_device_attribute *a,
38750+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
38751 const char *name,
38752 umode_t mode,
38753 ssize_t (*show)(struct device *dev,
38754@@ -820,7 +820,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
38755 u16 reg, u8 mask)
38756 {
38757 struct pmbus_boolean *boolean;
38758- struct sensor_device_attribute *a;
38759+ sensor_device_attribute_no_const *a;
38760
38761 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
38762 if (!boolean)
38763@@ -845,7 +845,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
38764 bool update, bool readonly)
38765 {
38766 struct pmbus_sensor *sensor;
38767- struct device_attribute *a;
38768+ device_attribute_no_const *a;
38769
38770 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
38771 if (!sensor)
38772@@ -876,7 +876,7 @@ static int pmbus_add_label(struct pmbus_data *data,
38773 const char *lstring, int index)
38774 {
38775 struct pmbus_label *label;
38776- struct device_attribute *a;
38777+ device_attribute_no_const *a;
38778
38779 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
38780 if (!label)
38781diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
38782index 2507f90..1645765 100644
38783--- a/drivers/hwmon/sht15.c
38784+++ b/drivers/hwmon/sht15.c
38785@@ -169,7 +169,7 @@ struct sht15_data {
38786 int supply_uv;
38787 bool supply_uv_valid;
38788 struct work_struct update_supply_work;
38789- atomic_t interrupt_handled;
38790+ atomic_unchecked_t interrupt_handled;
38791 };
38792
38793 /**
38794@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
38795 ret = gpio_direction_input(data->pdata->gpio_data);
38796 if (ret)
38797 return ret;
38798- atomic_set(&data->interrupt_handled, 0);
38799+ atomic_set_unchecked(&data->interrupt_handled, 0);
38800
38801 enable_irq(gpio_to_irq(data->pdata->gpio_data));
38802 if (gpio_get_value(data->pdata->gpio_data) == 0) {
38803 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
38804 /* Only relevant if the interrupt hasn't occurred. */
38805- if (!atomic_read(&data->interrupt_handled))
38806+ if (!atomic_read_unchecked(&data->interrupt_handled))
38807 schedule_work(&data->read_work);
38808 }
38809 ret = wait_event_timeout(data->wait_queue,
38810@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
38811
38812 /* First disable the interrupt */
38813 disable_irq_nosync(irq);
38814- atomic_inc(&data->interrupt_handled);
38815+ atomic_inc_unchecked(&data->interrupt_handled);
38816 /* Then schedule a reading work struct */
38817 if (data->state != SHT15_READING_NOTHING)
38818 schedule_work(&data->read_work);
38819@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
38820 * If not, then start the interrupt again - care here as could
38821 * have gone low in meantime so verify it hasn't!
38822 */
38823- atomic_set(&data->interrupt_handled, 0);
38824+ atomic_set_unchecked(&data->interrupt_handled, 0);
38825 enable_irq(gpio_to_irq(data->pdata->gpio_data));
38826 /* If still not occurred or another handler was scheduled */
38827 if (gpio_get_value(data->pdata->gpio_data)
38828- || atomic_read(&data->interrupt_handled))
38829+ || atomic_read_unchecked(&data->interrupt_handled))
38830 return;
38831 }
38832
38833diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
38834index 76f157b..9c0db1b 100644
38835--- a/drivers/hwmon/via-cputemp.c
38836+++ b/drivers/hwmon/via-cputemp.c
38837@@ -296,7 +296,7 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
38838 return NOTIFY_OK;
38839 }
38840
38841-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
38842+static struct notifier_block via_cputemp_cpu_notifier = {
38843 .notifier_call = via_cputemp_cpu_callback,
38844 };
38845
38846diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
38847index 07f01ac..d79ad3d 100644
38848--- a/drivers/i2c/busses/i2c-amd756-s4882.c
38849+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
38850@@ -43,7 +43,7 @@
38851 extern struct i2c_adapter amd756_smbus;
38852
38853 static struct i2c_adapter *s4882_adapter;
38854-static struct i2c_algorithm *s4882_algo;
38855+static i2c_algorithm_no_const *s4882_algo;
38856
38857 /* Wrapper access functions for multiplexed SMBus */
38858 static DEFINE_MUTEX(amd756_lock);
38859diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
38860index 2ca268d..c6acbdf 100644
38861--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
38862+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
38863@@ -41,7 +41,7 @@
38864 extern struct i2c_adapter *nforce2_smbus;
38865
38866 static struct i2c_adapter *s4985_adapter;
38867-static struct i2c_algorithm *s4985_algo;
38868+static i2c_algorithm_no_const *s4985_algo;
38869
38870 /* Wrapper access functions for multiplexed SMBus */
38871 static DEFINE_MUTEX(nforce2_lock);
38872diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
38873index c3ccdea..5b3dc1a 100644
38874--- a/drivers/i2c/i2c-dev.c
38875+++ b/drivers/i2c/i2c-dev.c
38876@@ -271,7 +271,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
38877 break;
38878 }
38879
38880- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
38881+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
38882 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
38883 if (IS_ERR(rdwr_pa[i].buf)) {
38884 res = PTR_ERR(rdwr_pa[i].buf);
38885diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
38886index 2ff6204..218c16e 100644
38887--- a/drivers/ide/ide-cd.c
38888+++ b/drivers/ide/ide-cd.c
38889@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
38890 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
38891 if ((unsigned long)buf & alignment
38892 || blk_rq_bytes(rq) & q->dma_pad_mask
38893- || object_is_on_stack(buf))
38894+ || object_starts_on_stack(buf))
38895 drive->dma = 0;
38896 }
38897 }
38898diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
38899index e145931..08bfc59 100644
38900--- a/drivers/iio/industrialio-core.c
38901+++ b/drivers/iio/industrialio-core.c
38902@@ -506,7 +506,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
38903 }
38904
38905 static
38906-int __iio_device_attr_init(struct device_attribute *dev_attr,
38907+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
38908 const char *postfix,
38909 struct iio_chan_spec const *chan,
38910 ssize_t (*readfunc)(struct device *dev,
38911diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
38912index 784b97c..c9ceadf 100644
38913--- a/drivers/infiniband/core/cm.c
38914+++ b/drivers/infiniband/core/cm.c
38915@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
38916
38917 struct cm_counter_group {
38918 struct kobject obj;
38919- atomic_long_t counter[CM_ATTR_COUNT];
38920+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
38921 };
38922
38923 struct cm_counter_attribute {
38924@@ -1395,7 +1395,7 @@ static void cm_dup_req_handler(struct cm_work *work,
38925 struct ib_mad_send_buf *msg = NULL;
38926 int ret;
38927
38928- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38929+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38930 counter[CM_REQ_COUNTER]);
38931
38932 /* Quick state check to discard duplicate REQs. */
38933@@ -1779,7 +1779,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
38934 if (!cm_id_priv)
38935 return;
38936
38937- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38938+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38939 counter[CM_REP_COUNTER]);
38940 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
38941 if (ret)
38942@@ -1946,7 +1946,7 @@ static int cm_rtu_handler(struct cm_work *work)
38943 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
38944 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
38945 spin_unlock_irq(&cm_id_priv->lock);
38946- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38947+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38948 counter[CM_RTU_COUNTER]);
38949 goto out;
38950 }
38951@@ -2129,7 +2129,7 @@ static int cm_dreq_handler(struct cm_work *work)
38952 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
38953 dreq_msg->local_comm_id);
38954 if (!cm_id_priv) {
38955- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38956+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38957 counter[CM_DREQ_COUNTER]);
38958 cm_issue_drep(work->port, work->mad_recv_wc);
38959 return -EINVAL;
38960@@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_work *work)
38961 case IB_CM_MRA_REP_RCVD:
38962 break;
38963 case IB_CM_TIMEWAIT:
38964- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38965+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38966 counter[CM_DREQ_COUNTER]);
38967 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
38968 goto unlock;
38969@@ -2168,7 +2168,7 @@ static int cm_dreq_handler(struct cm_work *work)
38970 cm_free_msg(msg);
38971 goto deref;
38972 case IB_CM_DREQ_RCVD:
38973- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38974+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38975 counter[CM_DREQ_COUNTER]);
38976 goto unlock;
38977 default:
38978@@ -2535,7 +2535,7 @@ static int cm_mra_handler(struct cm_work *work)
38979 ib_modify_mad(cm_id_priv->av.port->mad_agent,
38980 cm_id_priv->msg, timeout)) {
38981 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
38982- atomic_long_inc(&work->port->
38983+ atomic_long_inc_unchecked(&work->port->
38984 counter_group[CM_RECV_DUPLICATES].
38985 counter[CM_MRA_COUNTER]);
38986 goto out;
38987@@ -2544,7 +2544,7 @@ static int cm_mra_handler(struct cm_work *work)
38988 break;
38989 case IB_CM_MRA_REQ_RCVD:
38990 case IB_CM_MRA_REP_RCVD:
38991- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
38992+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
38993 counter[CM_MRA_COUNTER]);
38994 /* fall through */
38995 default:
38996@@ -2706,7 +2706,7 @@ static int cm_lap_handler(struct cm_work *work)
38997 case IB_CM_LAP_IDLE:
38998 break;
38999 case IB_CM_MRA_LAP_SENT:
39000- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
39001+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
39002 counter[CM_LAP_COUNTER]);
39003 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
39004 goto unlock;
39005@@ -2722,7 +2722,7 @@ static int cm_lap_handler(struct cm_work *work)
39006 cm_free_msg(msg);
39007 goto deref;
39008 case IB_CM_LAP_RCVD:
39009- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
39010+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
39011 counter[CM_LAP_COUNTER]);
39012 goto unlock;
39013 default:
39014@@ -3006,7 +3006,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
39015 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
39016 if (cur_cm_id_priv) {
39017 spin_unlock_irq(&cm.lock);
39018- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
39019+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
39020 counter[CM_SIDR_REQ_COUNTER]);
39021 goto out; /* Duplicate message. */
39022 }
39023@@ -3218,10 +3218,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
39024 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
39025 msg->retries = 1;
39026
39027- atomic_long_add(1 + msg->retries,
39028+ atomic_long_add_unchecked(1 + msg->retries,
39029 &port->counter_group[CM_XMIT].counter[attr_index]);
39030 if (msg->retries)
39031- atomic_long_add(msg->retries,
39032+ atomic_long_add_unchecked(msg->retries,
39033 &port->counter_group[CM_XMIT_RETRIES].
39034 counter[attr_index]);
39035
39036@@ -3431,7 +3431,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
39037 }
39038
39039 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
39040- atomic_long_inc(&port->counter_group[CM_RECV].
39041+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
39042 counter[attr_id - CM_ATTR_ID_OFFSET]);
39043
39044 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
39045@@ -3636,7 +3636,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
39046 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
39047
39048 return sprintf(buf, "%ld\n",
39049- atomic_long_read(&group->counter[cm_attr->index]));
39050+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
39051 }
39052
39053 static const struct sysfs_ops cm_counter_ops = {
39054diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
39055index 9f5ad7c..588cd84 100644
39056--- a/drivers/infiniband/core/fmr_pool.c
39057+++ b/drivers/infiniband/core/fmr_pool.c
39058@@ -98,8 +98,8 @@ struct ib_fmr_pool {
39059
39060 struct task_struct *thread;
39061
39062- atomic_t req_ser;
39063- atomic_t flush_ser;
39064+ atomic_unchecked_t req_ser;
39065+ atomic_unchecked_t flush_ser;
39066
39067 wait_queue_head_t force_wait;
39068 };
39069@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
39070 struct ib_fmr_pool *pool = pool_ptr;
39071
39072 do {
39073- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
39074+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
39075 ib_fmr_batch_release(pool);
39076
39077- atomic_inc(&pool->flush_ser);
39078+ atomic_inc_unchecked(&pool->flush_ser);
39079 wake_up_interruptible(&pool->force_wait);
39080
39081 if (pool->flush_function)
39082@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
39083 }
39084
39085 set_current_state(TASK_INTERRUPTIBLE);
39086- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
39087+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
39088 !kthread_should_stop())
39089 schedule();
39090 __set_current_state(TASK_RUNNING);
39091@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
39092 pool->dirty_watermark = params->dirty_watermark;
39093 pool->dirty_len = 0;
39094 spin_lock_init(&pool->pool_lock);
39095- atomic_set(&pool->req_ser, 0);
39096- atomic_set(&pool->flush_ser, 0);
39097+ atomic_set_unchecked(&pool->req_ser, 0);
39098+ atomic_set_unchecked(&pool->flush_ser, 0);
39099 init_waitqueue_head(&pool->force_wait);
39100
39101 pool->thread = kthread_run(ib_fmr_cleanup_thread,
39102@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
39103 }
39104 spin_unlock_irq(&pool->pool_lock);
39105
39106- serial = atomic_inc_return(&pool->req_ser);
39107+ serial = atomic_inc_return_unchecked(&pool->req_ser);
39108 wake_up_process(pool->thread);
39109
39110 if (wait_event_interruptible(pool->force_wait,
39111- atomic_read(&pool->flush_ser) - serial >= 0))
39112+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
39113 return -EINTR;
39114
39115 return 0;
39116@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
39117 } else {
39118 list_add_tail(&fmr->list, &pool->dirty_list);
39119 if (++pool->dirty_len >= pool->dirty_watermark) {
39120- atomic_inc(&pool->req_ser);
39121+ atomic_inc_unchecked(&pool->req_ser);
39122 wake_up_process(pool->thread);
39123 }
39124 }
39125diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
39126index 4cb8eb2..146bf60 100644
39127--- a/drivers/infiniband/hw/cxgb4/mem.c
39128+++ b/drivers/infiniband/hw/cxgb4/mem.c
39129@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
39130 int err;
39131 struct fw_ri_tpte tpt;
39132 u32 stag_idx;
39133- static atomic_t key;
39134+ static atomic_unchecked_t key;
39135
39136 if (c4iw_fatal_error(rdev))
39137 return -EIO;
39138@@ -266,7 +266,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
39139 if (rdev->stats.stag.cur > rdev->stats.stag.max)
39140 rdev->stats.stag.max = rdev->stats.stag.cur;
39141 mutex_unlock(&rdev->stats.lock);
39142- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
39143+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
39144 }
39145 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
39146 __func__, stag_state, type, pdid, stag_idx);
39147diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
39148index 79b3dbc..96e5fcc 100644
39149--- a/drivers/infiniband/hw/ipath/ipath_rc.c
39150+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
39151@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
39152 struct ib_atomic_eth *ateth;
39153 struct ipath_ack_entry *e;
39154 u64 vaddr;
39155- atomic64_t *maddr;
39156+ atomic64_unchecked_t *maddr;
39157 u64 sdata;
39158 u32 rkey;
39159 u8 next;
39160@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
39161 IB_ACCESS_REMOTE_ATOMIC)))
39162 goto nack_acc_unlck;
39163 /* Perform atomic OP and save result. */
39164- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
39165+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
39166 sdata = be64_to_cpu(ateth->swap_data);
39167 e = &qp->s_ack_queue[qp->r_head_ack_queue];
39168 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
39169- (u64) atomic64_add_return(sdata, maddr) - sdata :
39170+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
39171 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
39172 be64_to_cpu(ateth->compare_data),
39173 sdata);
39174diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
39175index 1f95bba..9530f87 100644
39176--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
39177+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
39178@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
39179 unsigned long flags;
39180 struct ib_wc wc;
39181 u64 sdata;
39182- atomic64_t *maddr;
39183+ atomic64_unchecked_t *maddr;
39184 enum ib_wc_status send_status;
39185
39186 /*
39187@@ -382,11 +382,11 @@ again:
39188 IB_ACCESS_REMOTE_ATOMIC)))
39189 goto acc_err;
39190 /* Perform atomic OP and save result. */
39191- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
39192+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
39193 sdata = wqe->wr.wr.atomic.compare_add;
39194 *(u64 *) sqp->s_sge.sge.vaddr =
39195 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
39196- (u64) atomic64_add_return(sdata, maddr) - sdata :
39197+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
39198 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
39199 sdata, wqe->wr.wr.atomic.swap);
39200 goto send_comp;
39201diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
39202index 9d3e5c1..d9afe4a 100644
39203--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
39204+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
39205@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
39206 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
39207 }
39208
39209-int mthca_QUERY_FW(struct mthca_dev *dev)
39210+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
39211 {
39212 struct mthca_mailbox *mailbox;
39213 u32 *outbox;
39214diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
39215index ed9a989..e0c5871 100644
39216--- a/drivers/infiniband/hw/mthca/mthca_mr.c
39217+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
39218@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
39219 return key;
39220 }
39221
39222-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
39223+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
39224 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
39225 {
39226 struct mthca_mailbox *mailbox;
39227diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
39228index 4291410..d2ab1fb 100644
39229--- a/drivers/infiniband/hw/nes/nes.c
39230+++ b/drivers/infiniband/hw/nes/nes.c
39231@@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
39232 LIST_HEAD(nes_adapter_list);
39233 static LIST_HEAD(nes_dev_list);
39234
39235-atomic_t qps_destroyed;
39236+atomic_unchecked_t qps_destroyed;
39237
39238 static unsigned int ee_flsh_adapter;
39239 static unsigned int sysfs_nonidx_addr;
39240@@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
39241 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
39242 struct nes_adapter *nesadapter = nesdev->nesadapter;
39243
39244- atomic_inc(&qps_destroyed);
39245+ atomic_inc_unchecked(&qps_destroyed);
39246
39247 /* Free the control structures */
39248
39249diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
39250index 33cc589..3bd6538 100644
39251--- a/drivers/infiniband/hw/nes/nes.h
39252+++ b/drivers/infiniband/hw/nes/nes.h
39253@@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
39254 extern unsigned int wqm_quanta;
39255 extern struct list_head nes_adapter_list;
39256
39257-extern atomic_t cm_connects;
39258-extern atomic_t cm_accepts;
39259-extern atomic_t cm_disconnects;
39260-extern atomic_t cm_closes;
39261-extern atomic_t cm_connecteds;
39262-extern atomic_t cm_connect_reqs;
39263-extern atomic_t cm_rejects;
39264-extern atomic_t mod_qp_timouts;
39265-extern atomic_t qps_created;
39266-extern atomic_t qps_destroyed;
39267-extern atomic_t sw_qps_destroyed;
39268+extern atomic_unchecked_t cm_connects;
39269+extern atomic_unchecked_t cm_accepts;
39270+extern atomic_unchecked_t cm_disconnects;
39271+extern atomic_unchecked_t cm_closes;
39272+extern atomic_unchecked_t cm_connecteds;
39273+extern atomic_unchecked_t cm_connect_reqs;
39274+extern atomic_unchecked_t cm_rejects;
39275+extern atomic_unchecked_t mod_qp_timouts;
39276+extern atomic_unchecked_t qps_created;
39277+extern atomic_unchecked_t qps_destroyed;
39278+extern atomic_unchecked_t sw_qps_destroyed;
39279 extern u32 mh_detected;
39280 extern u32 mh_pauses_sent;
39281 extern u32 cm_packets_sent;
39282@@ -196,16 +196,16 @@ extern u32 cm_packets_created;
39283 extern u32 cm_packets_received;
39284 extern u32 cm_packets_dropped;
39285 extern u32 cm_packets_retrans;
39286-extern atomic_t cm_listens_created;
39287-extern atomic_t cm_listens_destroyed;
39288+extern atomic_unchecked_t cm_listens_created;
39289+extern atomic_unchecked_t cm_listens_destroyed;
39290 extern u32 cm_backlog_drops;
39291-extern atomic_t cm_loopbacks;
39292-extern atomic_t cm_nodes_created;
39293-extern atomic_t cm_nodes_destroyed;
39294-extern atomic_t cm_accel_dropped_pkts;
39295-extern atomic_t cm_resets_recvd;
39296-extern atomic_t pau_qps_created;
39297-extern atomic_t pau_qps_destroyed;
39298+extern atomic_unchecked_t cm_loopbacks;
39299+extern atomic_unchecked_t cm_nodes_created;
39300+extern atomic_unchecked_t cm_nodes_destroyed;
39301+extern atomic_unchecked_t cm_accel_dropped_pkts;
39302+extern atomic_unchecked_t cm_resets_recvd;
39303+extern atomic_unchecked_t pau_qps_created;
39304+extern atomic_unchecked_t pau_qps_destroyed;
39305
39306 extern u32 int_mod_timer_init;
39307 extern u32 int_mod_cq_depth_256;
39308diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
39309index 24b9f1a..00fd004 100644
39310--- a/drivers/infiniband/hw/nes/nes_cm.c
39311+++ b/drivers/infiniband/hw/nes/nes_cm.c
39312@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
39313 u32 cm_packets_retrans;
39314 u32 cm_packets_created;
39315 u32 cm_packets_received;
39316-atomic_t cm_listens_created;
39317-atomic_t cm_listens_destroyed;
39318+atomic_unchecked_t cm_listens_created;
39319+atomic_unchecked_t cm_listens_destroyed;
39320 u32 cm_backlog_drops;
39321-atomic_t cm_loopbacks;
39322-atomic_t cm_nodes_created;
39323-atomic_t cm_nodes_destroyed;
39324-atomic_t cm_accel_dropped_pkts;
39325-atomic_t cm_resets_recvd;
39326+atomic_unchecked_t cm_loopbacks;
39327+atomic_unchecked_t cm_nodes_created;
39328+atomic_unchecked_t cm_nodes_destroyed;
39329+atomic_unchecked_t cm_accel_dropped_pkts;
39330+atomic_unchecked_t cm_resets_recvd;
39331
39332 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
39333 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
39334@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
39335
39336 static struct nes_cm_core *g_cm_core;
39337
39338-atomic_t cm_connects;
39339-atomic_t cm_accepts;
39340-atomic_t cm_disconnects;
39341-atomic_t cm_closes;
39342-atomic_t cm_connecteds;
39343-atomic_t cm_connect_reqs;
39344-atomic_t cm_rejects;
39345+atomic_unchecked_t cm_connects;
39346+atomic_unchecked_t cm_accepts;
39347+atomic_unchecked_t cm_disconnects;
39348+atomic_unchecked_t cm_closes;
39349+atomic_unchecked_t cm_connecteds;
39350+atomic_unchecked_t cm_connect_reqs;
39351+atomic_unchecked_t cm_rejects;
39352
39353 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
39354 {
39355@@ -1272,7 +1272,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
39356 kfree(listener);
39357 listener = NULL;
39358 ret = 0;
39359- atomic_inc(&cm_listens_destroyed);
39360+ atomic_inc_unchecked(&cm_listens_destroyed);
39361 } else {
39362 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
39363 }
39364@@ -1466,7 +1466,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
39365 cm_node->rem_mac);
39366
39367 add_hte_node(cm_core, cm_node);
39368- atomic_inc(&cm_nodes_created);
39369+ atomic_inc_unchecked(&cm_nodes_created);
39370
39371 return cm_node;
39372 }
39373@@ -1524,7 +1524,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
39374 }
39375
39376 atomic_dec(&cm_core->node_cnt);
39377- atomic_inc(&cm_nodes_destroyed);
39378+ atomic_inc_unchecked(&cm_nodes_destroyed);
39379 nesqp = cm_node->nesqp;
39380 if (nesqp) {
39381 nesqp->cm_node = NULL;
39382@@ -1588,7 +1588,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
39383
39384 static void drop_packet(struct sk_buff *skb)
39385 {
39386- atomic_inc(&cm_accel_dropped_pkts);
39387+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
39388 dev_kfree_skb_any(skb);
39389 }
39390
39391@@ -1651,7 +1651,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
39392 {
39393
39394 int reset = 0; /* whether to send reset in case of err.. */
39395- atomic_inc(&cm_resets_recvd);
39396+ atomic_inc_unchecked(&cm_resets_recvd);
39397 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
39398 " refcnt=%d\n", cm_node, cm_node->state,
39399 atomic_read(&cm_node->ref_count));
39400@@ -2292,7 +2292,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
39401 rem_ref_cm_node(cm_node->cm_core, cm_node);
39402 return NULL;
39403 }
39404- atomic_inc(&cm_loopbacks);
39405+ atomic_inc_unchecked(&cm_loopbacks);
39406 loopbackremotenode->loopbackpartner = cm_node;
39407 loopbackremotenode->tcp_cntxt.rcv_wscale =
39408 NES_CM_DEFAULT_RCV_WND_SCALE;
39409@@ -2567,7 +2567,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
39410 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
39411 else {
39412 rem_ref_cm_node(cm_core, cm_node);
39413- atomic_inc(&cm_accel_dropped_pkts);
39414+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
39415 dev_kfree_skb_any(skb);
39416 }
39417 break;
39418@@ -2875,7 +2875,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
39419
39420 if ((cm_id) && (cm_id->event_handler)) {
39421 if (issue_disconn) {
39422- atomic_inc(&cm_disconnects);
39423+ atomic_inc_unchecked(&cm_disconnects);
39424 cm_event.event = IW_CM_EVENT_DISCONNECT;
39425 cm_event.status = disconn_status;
39426 cm_event.local_addr = cm_id->local_addr;
39427@@ -2897,7 +2897,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
39428 }
39429
39430 if (issue_close) {
39431- atomic_inc(&cm_closes);
39432+ atomic_inc_unchecked(&cm_closes);
39433 nes_disconnect(nesqp, 1);
39434
39435 cm_id->provider_data = nesqp;
39436@@ -3033,7 +3033,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
39437
39438 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
39439 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
39440- atomic_inc(&cm_accepts);
39441+ atomic_inc_unchecked(&cm_accepts);
39442
39443 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
39444 netdev_refcnt_read(nesvnic->netdev));
39445@@ -3228,7 +3228,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
39446 struct nes_cm_core *cm_core;
39447 u8 *start_buff;
39448
39449- atomic_inc(&cm_rejects);
39450+ atomic_inc_unchecked(&cm_rejects);
39451 cm_node = (struct nes_cm_node *)cm_id->provider_data;
39452 loopback = cm_node->loopbackpartner;
39453 cm_core = cm_node->cm_core;
39454@@ -3288,7 +3288,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
39455 ntohl(cm_id->local_addr.sin_addr.s_addr),
39456 ntohs(cm_id->local_addr.sin_port));
39457
39458- atomic_inc(&cm_connects);
39459+ atomic_inc_unchecked(&cm_connects);
39460 nesqp->active_conn = 1;
39461
39462 /* cache the cm_id in the qp */
39463@@ -3398,7 +3398,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
39464 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
39465 return err;
39466 }
39467- atomic_inc(&cm_listens_created);
39468+ atomic_inc_unchecked(&cm_listens_created);
39469 }
39470
39471 cm_id->add_ref(cm_id);
39472@@ -3499,7 +3499,7 @@ static void cm_event_connected(struct nes_cm_event *event)
39473
39474 if (nesqp->destroyed)
39475 return;
39476- atomic_inc(&cm_connecteds);
39477+ atomic_inc_unchecked(&cm_connecteds);
39478 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
39479 " local port 0x%04X. jiffies = %lu.\n",
39480 nesqp->hwqp.qp_id,
39481@@ -3679,7 +3679,7 @@ static void cm_event_reset(struct nes_cm_event *event)
39482
39483 cm_id->add_ref(cm_id);
39484 ret = cm_id->event_handler(cm_id, &cm_event);
39485- atomic_inc(&cm_closes);
39486+ atomic_inc_unchecked(&cm_closes);
39487 cm_event.event = IW_CM_EVENT_CLOSE;
39488 cm_event.status = 0;
39489 cm_event.provider_data = cm_id->provider_data;
39490@@ -3715,7 +3715,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
39491 return;
39492 cm_id = cm_node->cm_id;
39493
39494- atomic_inc(&cm_connect_reqs);
39495+ atomic_inc_unchecked(&cm_connect_reqs);
39496 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
39497 cm_node, cm_id, jiffies);
39498
39499@@ -3755,7 +3755,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
39500 return;
39501 cm_id = cm_node->cm_id;
39502
39503- atomic_inc(&cm_connect_reqs);
39504+ atomic_inc_unchecked(&cm_connect_reqs);
39505 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
39506 cm_node, cm_id, jiffies);
39507
39508diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
39509index 4166452..fc952c3 100644
39510--- a/drivers/infiniband/hw/nes/nes_mgt.c
39511+++ b/drivers/infiniband/hw/nes/nes_mgt.c
39512@@ -40,8 +40,8 @@
39513 #include "nes.h"
39514 #include "nes_mgt.h"
39515
39516-atomic_t pau_qps_created;
39517-atomic_t pau_qps_destroyed;
39518+atomic_unchecked_t pau_qps_created;
39519+atomic_unchecked_t pau_qps_destroyed;
39520
39521 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
39522 {
39523@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
39524 {
39525 struct sk_buff *skb;
39526 unsigned long flags;
39527- atomic_inc(&pau_qps_destroyed);
39528+ atomic_inc_unchecked(&pau_qps_destroyed);
39529
39530 /* Free packets that have not yet been forwarded */
39531 /* Lock is acquired by skb_dequeue when removing the skb */
39532@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
39533 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
39534 skb_queue_head_init(&nesqp->pau_list);
39535 spin_lock_init(&nesqp->pau_lock);
39536- atomic_inc(&pau_qps_created);
39537+ atomic_inc_unchecked(&pau_qps_created);
39538 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
39539 }
39540
39541diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
39542index 49eb511..a774366 100644
39543--- a/drivers/infiniband/hw/nes/nes_nic.c
39544+++ b/drivers/infiniband/hw/nes/nes_nic.c
39545@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
39546 target_stat_values[++index] = mh_detected;
39547 target_stat_values[++index] = mh_pauses_sent;
39548 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
39549- target_stat_values[++index] = atomic_read(&cm_connects);
39550- target_stat_values[++index] = atomic_read(&cm_accepts);
39551- target_stat_values[++index] = atomic_read(&cm_disconnects);
39552- target_stat_values[++index] = atomic_read(&cm_connecteds);
39553- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
39554- target_stat_values[++index] = atomic_read(&cm_rejects);
39555- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
39556- target_stat_values[++index] = atomic_read(&qps_created);
39557- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
39558- target_stat_values[++index] = atomic_read(&qps_destroyed);
39559- target_stat_values[++index] = atomic_read(&cm_closes);
39560+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
39561+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
39562+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
39563+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
39564+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
39565+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
39566+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
39567+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
39568+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
39569+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
39570+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
39571 target_stat_values[++index] = cm_packets_sent;
39572 target_stat_values[++index] = cm_packets_bounced;
39573 target_stat_values[++index] = cm_packets_created;
39574 target_stat_values[++index] = cm_packets_received;
39575 target_stat_values[++index] = cm_packets_dropped;
39576 target_stat_values[++index] = cm_packets_retrans;
39577- target_stat_values[++index] = atomic_read(&cm_listens_created);
39578- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
39579+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
39580+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
39581 target_stat_values[++index] = cm_backlog_drops;
39582- target_stat_values[++index] = atomic_read(&cm_loopbacks);
39583- target_stat_values[++index] = atomic_read(&cm_nodes_created);
39584- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
39585- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
39586- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
39587+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
39588+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
39589+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
39590+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
39591+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
39592 target_stat_values[++index] = nesadapter->free_4kpbl;
39593 target_stat_values[++index] = nesadapter->free_256pbl;
39594 target_stat_values[++index] = int_mod_timer_init;
39595 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
39596 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
39597 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
39598- target_stat_values[++index] = atomic_read(&pau_qps_created);
39599- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
39600+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
39601+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
39602 }
39603
39604 /**
39605diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
39606index 8f67fe2..8960859 100644
39607--- a/drivers/infiniband/hw/nes/nes_verbs.c
39608+++ b/drivers/infiniband/hw/nes/nes_verbs.c
39609@@ -46,9 +46,9 @@
39610
39611 #include <rdma/ib_umem.h>
39612
39613-atomic_t mod_qp_timouts;
39614-atomic_t qps_created;
39615-atomic_t sw_qps_destroyed;
39616+atomic_unchecked_t mod_qp_timouts;
39617+atomic_unchecked_t qps_created;
39618+atomic_unchecked_t sw_qps_destroyed;
39619
39620 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
39621
39622@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
39623 if (init_attr->create_flags)
39624 return ERR_PTR(-EINVAL);
39625
39626- atomic_inc(&qps_created);
39627+ atomic_inc_unchecked(&qps_created);
39628 switch (init_attr->qp_type) {
39629 case IB_QPT_RC:
39630 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
39631@@ -1465,7 +1465,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
39632 struct iw_cm_event cm_event;
39633 int ret = 0;
39634
39635- atomic_inc(&sw_qps_destroyed);
39636+ atomic_inc_unchecked(&sw_qps_destroyed);
39637 nesqp->destroyed = 1;
39638
39639 /* Blow away the connection if it exists. */
39640diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
39641index 4d11575..3e890e5 100644
39642--- a/drivers/infiniband/hw/qib/qib.h
39643+++ b/drivers/infiniband/hw/qib/qib.h
39644@@ -51,6 +51,7 @@
39645 #include <linux/completion.h>
39646 #include <linux/kref.h>
39647 #include <linux/sched.h>
39648+#include <linux/slab.h>
39649
39650 #include "qib_common.h"
39651 #include "qib_verbs.h"
39652diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
39653index da739d9..da1c7f4 100644
39654--- a/drivers/input/gameport/gameport.c
39655+++ b/drivers/input/gameport/gameport.c
39656@@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
39657 */
39658 static void gameport_init_port(struct gameport *gameport)
39659 {
39660- static atomic_t gameport_no = ATOMIC_INIT(0);
39661+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
39662
39663 __module_get(THIS_MODULE);
39664
39665 mutex_init(&gameport->drv_mutex);
39666 device_initialize(&gameport->dev);
39667 dev_set_name(&gameport->dev, "gameport%lu",
39668- (unsigned long)atomic_inc_return(&gameport_no) - 1);
39669+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
39670 gameport->dev.bus = &gameport_bus;
39671 gameport->dev.release = gameport_release_port;
39672 if (gameport->parent)
39673diff --git a/drivers/input/input.c b/drivers/input/input.c
39674index c044699..174d71a 100644
39675--- a/drivers/input/input.c
39676+++ b/drivers/input/input.c
39677@@ -2019,7 +2019,7 @@ static void devm_input_device_unregister(struct device *dev, void *res)
39678 */
39679 int input_register_device(struct input_dev *dev)
39680 {
39681- static atomic_t input_no = ATOMIC_INIT(0);
39682+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
39683 struct input_devres *devres = NULL;
39684 struct input_handler *handler;
39685 unsigned int packet_size;
39686@@ -2074,7 +2074,7 @@ int input_register_device(struct input_dev *dev)
39687 dev->setkeycode = input_default_setkeycode;
39688
39689 dev_set_name(&dev->dev, "input%ld",
39690- (unsigned long) atomic_inc_return(&input_no) - 1);
39691+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
39692
39693 error = device_add(&dev->dev);
39694 if (error)
39695diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
39696index 04c69af..5f92d00 100644
39697--- a/drivers/input/joystick/sidewinder.c
39698+++ b/drivers/input/joystick/sidewinder.c
39699@@ -30,6 +30,7 @@
39700 #include <linux/kernel.h>
39701 #include <linux/module.h>
39702 #include <linux/slab.h>
39703+#include <linux/sched.h>
39704 #include <linux/init.h>
39705 #include <linux/input.h>
39706 #include <linux/gameport.h>
39707diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
39708index fa061d4..4a6957c 100644
39709--- a/drivers/input/joystick/xpad.c
39710+++ b/drivers/input/joystick/xpad.c
39711@@ -735,7 +735,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
39712
39713 static int xpad_led_probe(struct usb_xpad *xpad)
39714 {
39715- static atomic_t led_seq = ATOMIC_INIT(0);
39716+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
39717 long led_no;
39718 struct xpad_led *led;
39719 struct led_classdev *led_cdev;
39720@@ -748,7 +748,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
39721 if (!led)
39722 return -ENOMEM;
39723
39724- led_no = (long)atomic_inc_return(&led_seq) - 1;
39725+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
39726
39727 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
39728 led->xpad = xpad;
39729diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
39730index 2f0b39d..7370f13 100644
39731--- a/drivers/input/mouse/psmouse.h
39732+++ b/drivers/input/mouse/psmouse.h
39733@@ -116,7 +116,7 @@ struct psmouse_attribute {
39734 ssize_t (*set)(struct psmouse *psmouse, void *data,
39735 const char *buf, size_t count);
39736 bool protect;
39737-};
39738+} __do_const;
39739 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
39740
39741 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
39742diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
39743index 4c842c3..590b0bf 100644
39744--- a/drivers/input/mousedev.c
39745+++ b/drivers/input/mousedev.c
39746@@ -738,7 +738,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
39747
39748 spin_unlock_irq(&client->packet_lock);
39749
39750- if (copy_to_user(buffer, data, count))
39751+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
39752 return -EFAULT;
39753
39754 return count;
39755diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
39756index 25fc597..558bf3b3 100644
39757--- a/drivers/input/serio/serio.c
39758+++ b/drivers/input/serio/serio.c
39759@@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
39760 */
39761 static void serio_init_port(struct serio *serio)
39762 {
39763- static atomic_t serio_no = ATOMIC_INIT(0);
39764+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
39765
39766 __module_get(THIS_MODULE);
39767
39768@@ -507,7 +507,7 @@ static void serio_init_port(struct serio *serio)
39769 mutex_init(&serio->drv_mutex);
39770 device_initialize(&serio->dev);
39771 dev_set_name(&serio->dev, "serio%ld",
39772- (long)atomic_inc_return(&serio_no) - 1);
39773+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
39774 serio->dev.bus = &serio_bus;
39775 serio->dev.release = serio_release_port;
39776 serio->dev.groups = serio_device_attr_groups;
39777diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
39778index d8f98b1..f62a640 100644
39779--- a/drivers/iommu/iommu.c
39780+++ b/drivers/iommu/iommu.c
39781@@ -583,7 +583,7 @@ static struct notifier_block iommu_bus_nb = {
39782 static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
39783 {
39784 bus_register_notifier(bus, &iommu_bus_nb);
39785- bus_for_each_dev(bus, NULL, ops, add_iommu_group);
39786+ bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
39787 }
39788
39789 /**
39790diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
39791index dcfea4e..f4226b2 100644
39792--- a/drivers/iommu/irq_remapping.c
39793+++ b/drivers/iommu/irq_remapping.c
39794@@ -354,7 +354,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
39795 void panic_if_irq_remap(const char *msg)
39796 {
39797 if (irq_remapping_enabled)
39798- panic(msg);
39799+ panic("%s", msg);
39800 }
39801
39802 static void ir_ack_apic_edge(struct irq_data *data)
39803@@ -375,10 +375,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
39804
39805 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
39806 {
39807- chip->irq_print_chip = ir_print_prefix;
39808- chip->irq_ack = ir_ack_apic_edge;
39809- chip->irq_eoi = ir_ack_apic_level;
39810- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
39811+ pax_open_kernel();
39812+ *(void **)&chip->irq_print_chip = ir_print_prefix;
39813+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
39814+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
39815+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
39816+ pax_close_kernel();
39817 }
39818
39819 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
39820diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
39821index 19ceaa6..3625818 100644
39822--- a/drivers/irqchip/irq-gic.c
39823+++ b/drivers/irqchip/irq-gic.c
39824@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
39825 * Supported arch specific GIC irq extension.
39826 * Default make them NULL.
39827 */
39828-struct irq_chip gic_arch_extn = {
39829+irq_chip_no_const gic_arch_extn = {
39830 .irq_eoi = NULL,
39831 .irq_mask = NULL,
39832 .irq_unmask = NULL,
39833@@ -333,7 +333,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
39834 chained_irq_exit(chip, desc);
39835 }
39836
39837-static struct irq_chip gic_chip = {
39838+static irq_chip_no_const gic_chip __read_only = {
39839 .name = "GIC",
39840 .irq_mask = gic_mask_irq,
39841 .irq_unmask = gic_unmask_irq,
39842diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
39843index ac6f72b..81150f2 100644
39844--- a/drivers/isdn/capi/capi.c
39845+++ b/drivers/isdn/capi/capi.c
39846@@ -81,8 +81,8 @@ struct capiminor {
39847
39848 struct capi20_appl *ap;
39849 u32 ncci;
39850- atomic_t datahandle;
39851- atomic_t msgid;
39852+ atomic_unchecked_t datahandle;
39853+ atomic_unchecked_t msgid;
39854
39855 struct tty_port port;
39856 int ttyinstop;
39857@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
39858 capimsg_setu16(s, 2, mp->ap->applid);
39859 capimsg_setu8 (s, 4, CAPI_DATA_B3);
39860 capimsg_setu8 (s, 5, CAPI_RESP);
39861- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
39862+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
39863 capimsg_setu32(s, 8, mp->ncci);
39864 capimsg_setu16(s, 12, datahandle);
39865 }
39866@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
39867 mp->outbytes -= len;
39868 spin_unlock_bh(&mp->outlock);
39869
39870- datahandle = atomic_inc_return(&mp->datahandle);
39871+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
39872 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
39873 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
39874 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
39875 capimsg_setu16(skb->data, 2, mp->ap->applid);
39876 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
39877 capimsg_setu8 (skb->data, 5, CAPI_REQ);
39878- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
39879+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
39880 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
39881 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
39882 capimsg_setu16(skb->data, 16, len); /* Data length */
39883diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
39884index 600c79b..3752bab 100644
39885--- a/drivers/isdn/gigaset/interface.c
39886+++ b/drivers/isdn/gigaset/interface.c
39887@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
39888 }
39889 tty->driver_data = cs;
39890
39891- ++cs->port.count;
39892+ atomic_inc(&cs->port.count);
39893
39894- if (cs->port.count == 1) {
39895+ if (atomic_read(&cs->port.count) == 1) {
39896 tty_port_tty_set(&cs->port, tty);
39897 cs->port.low_latency = 1;
39898 }
39899@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
39900
39901 if (!cs->connected)
39902 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
39903- else if (!cs->port.count)
39904+ else if (!atomic_read(&cs->port.count))
39905 dev_warn(cs->dev, "%s: device not opened\n", __func__);
39906- else if (!--cs->port.count)
39907+ else if (!atomic_dec_return(&cs->port.count))
39908 tty_port_tty_set(&cs->port, NULL);
39909
39910 mutex_unlock(&cs->mutex);
39911diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
39912index 4d9b195..455075c 100644
39913--- a/drivers/isdn/hardware/avm/b1.c
39914+++ b/drivers/isdn/hardware/avm/b1.c
39915@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
39916 }
39917 if (left) {
39918 if (t4file->user) {
39919- if (copy_from_user(buf, dp, left))
39920+ if (left > sizeof buf || copy_from_user(buf, dp, left))
39921 return -EFAULT;
39922 } else {
39923 memcpy(buf, dp, left);
39924@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
39925 }
39926 if (left) {
39927 if (config->user) {
39928- if (copy_from_user(buf, dp, left))
39929+ if (left > sizeof buf || copy_from_user(buf, dp, left))
39930 return -EFAULT;
39931 } else {
39932 memcpy(buf, dp, left);
39933diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
39934index 3c5f249..5fac4d0 100644
39935--- a/drivers/isdn/i4l/isdn_tty.c
39936+++ b/drivers/isdn/i4l/isdn_tty.c
39937@@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
39938
39939 #ifdef ISDN_DEBUG_MODEM_OPEN
39940 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
39941- port->count);
39942+ atomic_read(&port->count));
39943 #endif
39944- port->count++;
39945+ atomic_inc(&port->count);
39946 port->tty = tty;
39947 /*
39948 * Start up serial port
39949@@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
39950 #endif
39951 return;
39952 }
39953- if ((tty->count == 1) && (port->count != 1)) {
39954+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
39955 /*
39956 * Uh, oh. tty->count is 1, which means that the tty
39957 * structure will be freed. Info->count should always
39958@@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
39959 * serial port won't be shutdown.
39960 */
39961 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
39962- "info->count is %d\n", port->count);
39963- port->count = 1;
39964+ "info->count is %d\n", atomic_read(&port->count));
39965+ atomic_set(&port->count, 1);
39966 }
39967- if (--port->count < 0) {
39968+ if (atomic_dec_return(&port->count) < 0) {
39969 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
39970- info->line, port->count);
39971- port->count = 0;
39972+ info->line, atomic_read(&port->count));
39973+ atomic_set(&port->count, 0);
39974 }
39975- if (port->count) {
39976+ if (atomic_read(&port->count)) {
39977 #ifdef ISDN_DEBUG_MODEM_OPEN
39978 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
39979 #endif
39980@@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
39981 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
39982 return;
39983 isdn_tty_shutdown(info);
39984- port->count = 0;
39985+ atomic_set(&port->count, 0);
39986 port->flags &= ~ASYNC_NORMAL_ACTIVE;
39987 port->tty = NULL;
39988 wake_up_interruptible(&port->open_wait);
39989@@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
39990 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
39991 modem_info *info = &dev->mdm.info[i];
39992
39993- if (info->port.count == 0)
39994+ if (atomic_read(&info->port.count) == 0)
39995 continue;
39996 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
39997 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
39998diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
39999index e74df7c..03a03ba 100644
40000--- a/drivers/isdn/icn/icn.c
40001+++ b/drivers/isdn/icn/icn.c
40002@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
40003 if (count > len)
40004 count = len;
40005 if (user) {
40006- if (copy_from_user(msg, buf, count))
40007+ if (count > sizeof msg || copy_from_user(msg, buf, count))
40008 return -EFAULT;
40009 } else
40010 memcpy(msg, buf, count);
40011diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
40012index 6a8405d..0bd1c7e 100644
40013--- a/drivers/leds/leds-clevo-mail.c
40014+++ b/drivers/leds/leds-clevo-mail.c
40015@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
40016 * detected as working, but in reality it is not) as low as
40017 * possible.
40018 */
40019-static struct dmi_system_id __initdata clevo_mail_led_dmi_table[] = {
40020+static const struct dmi_system_id __initconst clevo_mail_led_dmi_table[] = {
40021 {
40022 .callback = clevo_mail_led_dmi_callback,
40023 .ident = "Clevo D410J",
40024diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
40025index 64e204e..c6bf189 100644
40026--- a/drivers/leds/leds-ss4200.c
40027+++ b/drivers/leds/leds-ss4200.c
40028@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
40029 * detected as working, but in reality it is not) as low as
40030 * possible.
40031 */
40032-static struct dmi_system_id __initdata nas_led_whitelist[] = {
40033+static const struct dmi_system_id __initconst nas_led_whitelist[] = {
40034 {
40035 .callback = ss4200_led_dmi_callback,
40036 .ident = "Intel SS4200-E",
40037diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
40038index 0bf1e4e..b4bf44e 100644
40039--- a/drivers/lguest/core.c
40040+++ b/drivers/lguest/core.c
40041@@ -97,9 +97,17 @@ static __init int map_switcher(void)
40042 * The end address needs +1 because __get_vm_area allocates an
40043 * extra guard page, so we need space for that.
40044 */
40045+
40046+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
40047+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
40048+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
40049+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
40050+#else
40051 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
40052 VM_ALLOC, switcher_addr, switcher_addr
40053 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
40054+#endif
40055+
40056 if (!switcher_vma) {
40057 err = -ENOMEM;
40058 printk("lguest: could not map switcher pages high\n");
40059@@ -124,7 +132,7 @@ static __init int map_switcher(void)
40060 * Now the Switcher is mapped at the right address, we can't fail!
40061 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
40062 */
40063- memcpy(switcher_vma->addr, start_switcher_text,
40064+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
40065 end_switcher_text - start_switcher_text);
40066
40067 printk(KERN_INFO "lguest: mapped switcher at %p\n",
40068diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
40069index 5b9ac32..2ef4f26 100644
40070--- a/drivers/lguest/page_tables.c
40071+++ b/drivers/lguest/page_tables.c
40072@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
40073 /*:*/
40074
40075 #ifdef CONFIG_X86_PAE
40076-static void release_pmd(pmd_t *spmd)
40077+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
40078 {
40079 /* If the entry's not present, there's nothing to release. */
40080 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
40081diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
40082index f0a3347..f6608b2 100644
40083--- a/drivers/lguest/x86/core.c
40084+++ b/drivers/lguest/x86/core.c
40085@@ -59,7 +59,7 @@ static struct {
40086 /* Offset from where switcher.S was compiled to where we've copied it */
40087 static unsigned long switcher_offset(void)
40088 {
40089- return switcher_addr - (unsigned long)start_switcher_text;
40090+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
40091 }
40092
40093 /* This cpu's struct lguest_pages (after the Switcher text page) */
40094@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
40095 * These copies are pretty cheap, so we do them unconditionally: */
40096 /* Save the current Host top-level page directory.
40097 */
40098+
40099+#ifdef CONFIG_PAX_PER_CPU_PGD
40100+ pages->state.host_cr3 = read_cr3();
40101+#else
40102 pages->state.host_cr3 = __pa(current->mm->pgd);
40103+#endif
40104+
40105 /*
40106 * Set up the Guest's page tables to see this CPU's pages (and no
40107 * other CPU's pages).
40108@@ -475,7 +481,7 @@ void __init lguest_arch_host_init(void)
40109 * compiled-in switcher code and the high-mapped copy we just made.
40110 */
40111 for (i = 0; i < IDT_ENTRIES; i++)
40112- default_idt_entries[i] += switcher_offset();
40113+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
40114
40115 /*
40116 * Set up the Switcher's per-cpu areas.
40117@@ -558,7 +564,7 @@ void __init lguest_arch_host_init(void)
40118 * it will be undisturbed when we switch. To change %cs and jump we
40119 * need this structure to feed to Intel's "lcall" instruction.
40120 */
40121- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
40122+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
40123 lguest_entry.segment = LGUEST_CS;
40124
40125 /*
40126diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
40127index 40634b0..4f5855e 100644
40128--- a/drivers/lguest/x86/switcher_32.S
40129+++ b/drivers/lguest/x86/switcher_32.S
40130@@ -87,6 +87,7 @@
40131 #include <asm/page.h>
40132 #include <asm/segment.h>
40133 #include <asm/lguest.h>
40134+#include <asm/processor-flags.h>
40135
40136 // We mark the start of the code to copy
40137 // It's placed in .text tho it's never run here
40138@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
40139 // Changes type when we load it: damn Intel!
40140 // For after we switch over our page tables
40141 // That entry will be read-only: we'd crash.
40142+
40143+#ifdef CONFIG_PAX_KERNEXEC
40144+ mov %cr0, %edx
40145+ xor $X86_CR0_WP, %edx
40146+ mov %edx, %cr0
40147+#endif
40148+
40149 movl $(GDT_ENTRY_TSS*8), %edx
40150 ltr %dx
40151
40152@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
40153 // Let's clear it again for our return.
40154 // The GDT descriptor of the Host
40155 // Points to the table after two "size" bytes
40156- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
40157+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
40158 // Clear "used" from type field (byte 5, bit 2)
40159- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
40160+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
40161+
40162+#ifdef CONFIG_PAX_KERNEXEC
40163+ mov %cr0, %eax
40164+ xor $X86_CR0_WP, %eax
40165+ mov %eax, %cr0
40166+#endif
40167
40168 // Once our page table's switched, the Guest is live!
40169 // The Host fades as we run this final step.
40170@@ -295,13 +309,12 @@ deliver_to_host:
40171 // I consulted gcc, and it gave
40172 // These instructions, which I gladly credit:
40173 leal (%edx,%ebx,8), %eax
40174- movzwl (%eax),%edx
40175- movl 4(%eax), %eax
40176- xorw %ax, %ax
40177- orl %eax, %edx
40178+ movl 4(%eax), %edx
40179+ movw (%eax), %dx
40180 // Now the address of the handler's in %edx
40181 // We call it now: its "iret" drops us home.
40182- jmp *%edx
40183+ ljmp $__KERNEL_CS, $1f
40184+1: jmp *%edx
40185
40186 // Every interrupt can come to us here
40187 // But we must truly tell each apart.
40188diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
40189index 0003992..854bbce 100644
40190--- a/drivers/md/bcache/closure.h
40191+++ b/drivers/md/bcache/closure.h
40192@@ -622,7 +622,7 @@ static inline void closure_wake_up(struct closure_waitlist *list)
40193 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
40194 struct workqueue_struct *wq)
40195 {
40196- BUG_ON(object_is_on_stack(cl));
40197+ BUG_ON(object_starts_on_stack(cl));
40198 closure_set_ip(cl);
40199 cl->fn = fn;
40200 cl->wq = wq;
40201diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
40202index 5a2c754..0fa55db 100644
40203--- a/drivers/md/bitmap.c
40204+++ b/drivers/md/bitmap.c
40205@@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
40206 chunk_kb ? "KB" : "B");
40207 if (bitmap->storage.file) {
40208 seq_printf(seq, ", file: ");
40209- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
40210+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
40211 }
40212
40213 seq_printf(seq, "\n");
40214diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
40215index 81a79b7..87a0f73 100644
40216--- a/drivers/md/dm-ioctl.c
40217+++ b/drivers/md/dm-ioctl.c
40218@@ -1697,7 +1697,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
40219 cmd == DM_LIST_VERSIONS_CMD)
40220 return 0;
40221
40222- if ((cmd == DM_DEV_CREATE_CMD)) {
40223+ if (cmd == DM_DEV_CREATE_CMD) {
40224 if (!*param->name) {
40225 DMWARN("name not supplied when creating device");
40226 return -EINVAL;
40227diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
40228index 699b5be..eac0a15 100644
40229--- a/drivers/md/dm-raid1.c
40230+++ b/drivers/md/dm-raid1.c
40231@@ -40,7 +40,7 @@ enum dm_raid1_error {
40232
40233 struct mirror {
40234 struct mirror_set *ms;
40235- atomic_t error_count;
40236+ atomic_unchecked_t error_count;
40237 unsigned long error_type;
40238 struct dm_dev *dev;
40239 sector_t offset;
40240@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
40241 struct mirror *m;
40242
40243 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
40244- if (!atomic_read(&m->error_count))
40245+ if (!atomic_read_unchecked(&m->error_count))
40246 return m;
40247
40248 return NULL;
40249@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
40250 * simple way to tell if a device has encountered
40251 * errors.
40252 */
40253- atomic_inc(&m->error_count);
40254+ atomic_inc_unchecked(&m->error_count);
40255
40256 if (test_and_set_bit(error_type, &m->error_type))
40257 return;
40258@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
40259 struct mirror *m = get_default_mirror(ms);
40260
40261 do {
40262- if (likely(!atomic_read(&m->error_count)))
40263+ if (likely(!atomic_read_unchecked(&m->error_count)))
40264 return m;
40265
40266 if (m-- == ms->mirror)
40267@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
40268 {
40269 struct mirror *default_mirror = get_default_mirror(m->ms);
40270
40271- return !atomic_read(&default_mirror->error_count);
40272+ return !atomic_read_unchecked(&default_mirror->error_count);
40273 }
40274
40275 static int mirror_available(struct mirror_set *ms, struct bio *bio)
40276@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
40277 */
40278 if (likely(region_in_sync(ms, region, 1)))
40279 m = choose_mirror(ms, bio->bi_sector);
40280- else if (m && atomic_read(&m->error_count))
40281+ else if (m && atomic_read_unchecked(&m->error_count))
40282 m = NULL;
40283
40284 if (likely(m))
40285@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
40286 }
40287
40288 ms->mirror[mirror].ms = ms;
40289- atomic_set(&(ms->mirror[mirror].error_count), 0);
40290+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
40291 ms->mirror[mirror].error_type = 0;
40292 ms->mirror[mirror].offset = offset;
40293
40294@@ -1340,7 +1340,7 @@ static void mirror_resume(struct dm_target *ti)
40295 */
40296 static char device_status_char(struct mirror *m)
40297 {
40298- if (!atomic_read(&(m->error_count)))
40299+ if (!atomic_read_unchecked(&(m->error_count)))
40300 return 'A';
40301
40302 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
40303diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
40304index d907ca6..cfb8384 100644
40305--- a/drivers/md/dm-stripe.c
40306+++ b/drivers/md/dm-stripe.c
40307@@ -20,7 +20,7 @@ struct stripe {
40308 struct dm_dev *dev;
40309 sector_t physical_start;
40310
40311- atomic_t error_count;
40312+ atomic_unchecked_t error_count;
40313 };
40314
40315 struct stripe_c {
40316@@ -185,7 +185,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
40317 kfree(sc);
40318 return r;
40319 }
40320- atomic_set(&(sc->stripe[i].error_count), 0);
40321+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
40322 }
40323
40324 ti->private = sc;
40325@@ -326,7 +326,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
40326 DMEMIT("%d ", sc->stripes);
40327 for (i = 0; i < sc->stripes; i++) {
40328 DMEMIT("%s ", sc->stripe[i].dev->name);
40329- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
40330+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
40331 'D' : 'A';
40332 }
40333 buffer[i] = '\0';
40334@@ -371,8 +371,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
40335 */
40336 for (i = 0; i < sc->stripes; i++)
40337 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
40338- atomic_inc(&(sc->stripe[i].error_count));
40339- if (atomic_read(&(sc->stripe[i].error_count)) <
40340+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
40341+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
40342 DM_IO_ERROR_THRESHOLD)
40343 schedule_work(&sc->trigger_event);
40344 }
40345diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
40346index 1ff252a..ee384c1 100644
40347--- a/drivers/md/dm-table.c
40348+++ b/drivers/md/dm-table.c
40349@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
40350 if (!dev_size)
40351 return 0;
40352
40353- if ((start >= dev_size) || (start + len > dev_size)) {
40354+ if ((start >= dev_size) || (len > dev_size - start)) {
40355 DMWARN("%s: %s too small for target: "
40356 "start=%llu, len=%llu, dev_size=%llu",
40357 dm_device_name(ti->table->md), bdevname(bdev, b),
40358diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
40359index 60bce43..9b997d0 100644
40360--- a/drivers/md/dm-thin-metadata.c
40361+++ b/drivers/md/dm-thin-metadata.c
40362@@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
40363 {
40364 pmd->info.tm = pmd->tm;
40365 pmd->info.levels = 2;
40366- pmd->info.value_type.context = pmd->data_sm;
40367+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
40368 pmd->info.value_type.size = sizeof(__le64);
40369 pmd->info.value_type.inc = data_block_inc;
40370 pmd->info.value_type.dec = data_block_dec;
40371@@ -416,7 +416,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
40372
40373 pmd->bl_info.tm = pmd->tm;
40374 pmd->bl_info.levels = 1;
40375- pmd->bl_info.value_type.context = pmd->data_sm;
40376+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
40377 pmd->bl_info.value_type.size = sizeof(__le64);
40378 pmd->bl_info.value_type.inc = data_block_inc;
40379 pmd->bl_info.value_type.dec = data_block_dec;
40380diff --git a/drivers/md/dm.c b/drivers/md/dm.c
40381index 33f2010..23fb84c 100644
40382--- a/drivers/md/dm.c
40383+++ b/drivers/md/dm.c
40384@@ -169,9 +169,9 @@ struct mapped_device {
40385 /*
40386 * Event handling.
40387 */
40388- atomic_t event_nr;
40389+ atomic_unchecked_t event_nr;
40390 wait_queue_head_t eventq;
40391- atomic_t uevent_seq;
40392+ atomic_unchecked_t uevent_seq;
40393 struct list_head uevent_list;
40394 spinlock_t uevent_lock; /* Protect access to uevent_list */
40395
40396@@ -1884,8 +1884,8 @@ static struct mapped_device *alloc_dev(int minor)
40397 rwlock_init(&md->map_lock);
40398 atomic_set(&md->holders, 1);
40399 atomic_set(&md->open_count, 0);
40400- atomic_set(&md->event_nr, 0);
40401- atomic_set(&md->uevent_seq, 0);
40402+ atomic_set_unchecked(&md->event_nr, 0);
40403+ atomic_set_unchecked(&md->uevent_seq, 0);
40404 INIT_LIST_HEAD(&md->uevent_list);
40405 spin_lock_init(&md->uevent_lock);
40406
40407@@ -2033,7 +2033,7 @@ static void event_callback(void *context)
40408
40409 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
40410
40411- atomic_inc(&md->event_nr);
40412+ atomic_inc_unchecked(&md->event_nr);
40413 wake_up(&md->eventq);
40414 }
40415
40416@@ -2690,18 +2690,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
40417
40418 uint32_t dm_next_uevent_seq(struct mapped_device *md)
40419 {
40420- return atomic_add_return(1, &md->uevent_seq);
40421+ return atomic_add_return_unchecked(1, &md->uevent_seq);
40422 }
40423
40424 uint32_t dm_get_event_nr(struct mapped_device *md)
40425 {
40426- return atomic_read(&md->event_nr);
40427+ return atomic_read_unchecked(&md->event_nr);
40428 }
40429
40430 int dm_wait_event(struct mapped_device *md, int event_nr)
40431 {
40432 return wait_event_interruptible(md->eventq,
40433- (event_nr != atomic_read(&md->event_nr)));
40434+ (event_nr != atomic_read_unchecked(&md->event_nr)));
40435 }
40436
40437 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
40438diff --git a/drivers/md/md.c b/drivers/md/md.c
40439index 51f0345..c77810e 100644
40440--- a/drivers/md/md.c
40441+++ b/drivers/md/md.c
40442@@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
40443 * start build, activate spare
40444 */
40445 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
40446-static atomic_t md_event_count;
40447+static atomic_unchecked_t md_event_count;
40448 void md_new_event(struct mddev *mddev)
40449 {
40450- atomic_inc(&md_event_count);
40451+ atomic_inc_unchecked(&md_event_count);
40452 wake_up(&md_event_waiters);
40453 }
40454 EXPORT_SYMBOL_GPL(md_new_event);
40455@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
40456 */
40457 static void md_new_event_inintr(struct mddev *mddev)
40458 {
40459- atomic_inc(&md_event_count);
40460+ atomic_inc_unchecked(&md_event_count);
40461 wake_up(&md_event_waiters);
40462 }
40463
40464@@ -1501,7 +1501,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
40465 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
40466 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
40467 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
40468- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
40469+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
40470
40471 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
40472 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
40473@@ -1745,7 +1745,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
40474 else
40475 sb->resync_offset = cpu_to_le64(0);
40476
40477- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
40478+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
40479
40480 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
40481 sb->size = cpu_to_le64(mddev->dev_sectors);
40482@@ -2750,7 +2750,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
40483 static ssize_t
40484 errors_show(struct md_rdev *rdev, char *page)
40485 {
40486- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
40487+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
40488 }
40489
40490 static ssize_t
40491@@ -2759,7 +2759,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
40492 char *e;
40493 unsigned long n = simple_strtoul(buf, &e, 10);
40494 if (*buf && (*e == 0 || *e == '\n')) {
40495- atomic_set(&rdev->corrected_errors, n);
40496+ atomic_set_unchecked(&rdev->corrected_errors, n);
40497 return len;
40498 }
40499 return -EINVAL;
40500@@ -3207,8 +3207,8 @@ int md_rdev_init(struct md_rdev *rdev)
40501 rdev->sb_loaded = 0;
40502 rdev->bb_page = NULL;
40503 atomic_set(&rdev->nr_pending, 0);
40504- atomic_set(&rdev->read_errors, 0);
40505- atomic_set(&rdev->corrected_errors, 0);
40506+ atomic_set_unchecked(&rdev->read_errors, 0);
40507+ atomic_set_unchecked(&rdev->corrected_errors, 0);
40508
40509 INIT_LIST_HEAD(&rdev->same_set);
40510 init_waitqueue_head(&rdev->blocked_wait);
40511@@ -7009,7 +7009,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
40512
40513 spin_unlock(&pers_lock);
40514 seq_printf(seq, "\n");
40515- seq->poll_event = atomic_read(&md_event_count);
40516+ seq->poll_event = atomic_read_unchecked(&md_event_count);
40517 return 0;
40518 }
40519 if (v == (void*)2) {
40520@@ -7112,7 +7112,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
40521 return error;
40522
40523 seq = file->private_data;
40524- seq->poll_event = atomic_read(&md_event_count);
40525+ seq->poll_event = atomic_read_unchecked(&md_event_count);
40526 return error;
40527 }
40528
40529@@ -7126,7 +7126,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
40530 /* always allow read */
40531 mask = POLLIN | POLLRDNORM;
40532
40533- if (seq->poll_event != atomic_read(&md_event_count))
40534+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
40535 mask |= POLLERR | POLLPRI;
40536 return mask;
40537 }
40538@@ -7170,7 +7170,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
40539 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
40540 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
40541 (int)part_stat_read(&disk->part0, sectors[1]) -
40542- atomic_read(&disk->sync_io);
40543+ atomic_read_unchecked(&disk->sync_io);
40544 /* sync IO will cause sync_io to increase before the disk_stats
40545 * as sync_io is counted when a request starts, and
40546 * disk_stats is counted when it completes.
40547diff --git a/drivers/md/md.h b/drivers/md/md.h
40548index 653f992b6..6af6c40 100644
40549--- a/drivers/md/md.h
40550+++ b/drivers/md/md.h
40551@@ -94,13 +94,13 @@ struct md_rdev {
40552 * only maintained for arrays that
40553 * support hot removal
40554 */
40555- atomic_t read_errors; /* number of consecutive read errors that
40556+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
40557 * we have tried to ignore.
40558 */
40559 struct timespec last_read_error; /* monotonic time since our
40560 * last read error
40561 */
40562- atomic_t corrected_errors; /* number of corrected read errors,
40563+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
40564 * for reporting to userspace and storing
40565 * in superblock.
40566 */
40567@@ -434,7 +434,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
40568
40569 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
40570 {
40571- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
40572+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
40573 }
40574
40575 struct md_personality
40576diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
40577index 3e6d115..ffecdeb 100644
40578--- a/drivers/md/persistent-data/dm-space-map.h
40579+++ b/drivers/md/persistent-data/dm-space-map.h
40580@@ -71,6 +71,7 @@ struct dm_space_map {
40581 dm_sm_threshold_fn fn,
40582 void *context);
40583 };
40584+typedef struct dm_space_map __no_const dm_space_map_no_const;
40585
40586 /*----------------------------------------------------------------*/
40587
40588diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
40589index 6f48244..7d29145 100644
40590--- a/drivers/md/raid1.c
40591+++ b/drivers/md/raid1.c
40592@@ -1822,7 +1822,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
40593 if (r1_sync_page_io(rdev, sect, s,
40594 bio->bi_io_vec[idx].bv_page,
40595 READ) != 0)
40596- atomic_add(s, &rdev->corrected_errors);
40597+ atomic_add_unchecked(s, &rdev->corrected_errors);
40598 }
40599 sectors -= s;
40600 sect += s;
40601@@ -2049,7 +2049,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
40602 test_bit(In_sync, &rdev->flags)) {
40603 if (r1_sync_page_io(rdev, sect, s,
40604 conf->tmppage, READ)) {
40605- atomic_add(s, &rdev->corrected_errors);
40606+ atomic_add_unchecked(s, &rdev->corrected_errors);
40607 printk(KERN_INFO
40608 "md/raid1:%s: read error corrected "
40609 "(%d sectors at %llu on %s)\n",
40610diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
40611index 081bb33..3c4b287 100644
40612--- a/drivers/md/raid10.c
40613+++ b/drivers/md/raid10.c
40614@@ -1940,7 +1940,7 @@ static void end_sync_read(struct bio *bio, int error)
40615 /* The write handler will notice the lack of
40616 * R10BIO_Uptodate and record any errors etc
40617 */
40618- atomic_add(r10_bio->sectors,
40619+ atomic_add_unchecked(r10_bio->sectors,
40620 &conf->mirrors[d].rdev->corrected_errors);
40621
40622 /* for reconstruct, we always reschedule after a read.
40623@@ -2298,7 +2298,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
40624 {
40625 struct timespec cur_time_mon;
40626 unsigned long hours_since_last;
40627- unsigned int read_errors = atomic_read(&rdev->read_errors);
40628+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
40629
40630 ktime_get_ts(&cur_time_mon);
40631
40632@@ -2320,9 +2320,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
40633 * overflowing the shift of read_errors by hours_since_last.
40634 */
40635 if (hours_since_last >= 8 * sizeof(read_errors))
40636- atomic_set(&rdev->read_errors, 0);
40637+ atomic_set_unchecked(&rdev->read_errors, 0);
40638 else
40639- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
40640+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
40641 }
40642
40643 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
40644@@ -2376,8 +2376,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
40645 return;
40646
40647 check_decay_read_errors(mddev, rdev);
40648- atomic_inc(&rdev->read_errors);
40649- if (atomic_read(&rdev->read_errors) > max_read_errors) {
40650+ atomic_inc_unchecked(&rdev->read_errors);
40651+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
40652 char b[BDEVNAME_SIZE];
40653 bdevname(rdev->bdev, b);
40654
40655@@ -2385,7 +2385,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
40656 "md/raid10:%s: %s: Raid device exceeded "
40657 "read_error threshold [cur %d:max %d]\n",
40658 mdname(mddev), b,
40659- atomic_read(&rdev->read_errors), max_read_errors);
40660+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
40661 printk(KERN_NOTICE
40662 "md/raid10:%s: %s: Failing raid device\n",
40663 mdname(mddev), b);
40664@@ -2540,7 +2540,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
40665 sect +
40666 choose_data_offset(r10_bio, rdev)),
40667 bdevname(rdev->bdev, b));
40668- atomic_add(s, &rdev->corrected_errors);
40669+ atomic_add_unchecked(s, &rdev->corrected_errors);
40670 }
40671
40672 rdev_dec_pending(rdev, mddev);
40673diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
40674index a35b846..e295c6d 100644
40675--- a/drivers/md/raid5.c
40676+++ b/drivers/md/raid5.c
40677@@ -1764,21 +1764,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
40678 mdname(conf->mddev), STRIPE_SECTORS,
40679 (unsigned long long)s,
40680 bdevname(rdev->bdev, b));
40681- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
40682+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
40683 clear_bit(R5_ReadError, &sh->dev[i].flags);
40684 clear_bit(R5_ReWrite, &sh->dev[i].flags);
40685 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
40686 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
40687
40688- if (atomic_read(&rdev->read_errors))
40689- atomic_set(&rdev->read_errors, 0);
40690+ if (atomic_read_unchecked(&rdev->read_errors))
40691+ atomic_set_unchecked(&rdev->read_errors, 0);
40692 } else {
40693 const char *bdn = bdevname(rdev->bdev, b);
40694 int retry = 0;
40695 int set_bad = 0;
40696
40697 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
40698- atomic_inc(&rdev->read_errors);
40699+ atomic_inc_unchecked(&rdev->read_errors);
40700 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
40701 printk_ratelimited(
40702 KERN_WARNING
40703@@ -1806,7 +1806,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
40704 mdname(conf->mddev),
40705 (unsigned long long)s,
40706 bdn);
40707- } else if (atomic_read(&rdev->read_errors)
40708+ } else if (atomic_read_unchecked(&rdev->read_errors)
40709 > conf->max_nr_stripes)
40710 printk(KERN_WARNING
40711 "md/raid:%s: Too many read errors, failing device %s.\n",
40712diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
40713index 401ef64..836e563 100644
40714--- a/drivers/media/dvb-core/dvbdev.c
40715+++ b/drivers/media/dvb-core/dvbdev.c
40716@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
40717 const struct dvb_device *template, void *priv, int type)
40718 {
40719 struct dvb_device *dvbdev;
40720- struct file_operations *dvbdevfops;
40721+ file_operations_no_const *dvbdevfops;
40722 struct device *clsdev;
40723 int minor;
40724 int id;
40725diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
40726index 9b6c3bb..baeb5c7 100644
40727--- a/drivers/media/dvb-frontends/dib3000.h
40728+++ b/drivers/media/dvb-frontends/dib3000.h
40729@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
40730 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
40731 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
40732 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
40733-};
40734+} __no_const;
40735
40736 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
40737 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
40738diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
40739index c7a9be1..683f6f8 100644
40740--- a/drivers/media/pci/cx88/cx88-video.c
40741+++ b/drivers/media/pci/cx88/cx88-video.c
40742@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
40743
40744 /* ------------------------------------------------------------------ */
40745
40746-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
40747-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
40748-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
40749+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
40750+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
40751+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
40752
40753 module_param_array(video_nr, int, NULL, 0444);
40754 module_param_array(vbi_nr, int, NULL, 0444);
40755diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
40756index d338b19..aae4f9e 100644
40757--- a/drivers/media/platform/omap/omap_vout.c
40758+++ b/drivers/media/platform/omap/omap_vout.c
40759@@ -63,7 +63,6 @@ enum omap_vout_channels {
40760 OMAP_VIDEO2,
40761 };
40762
40763-static struct videobuf_queue_ops video_vbq_ops;
40764 /* Variables configurable through module params*/
40765 static u32 video1_numbuffers = 3;
40766 static u32 video2_numbuffers = 3;
40767@@ -1015,6 +1014,12 @@ static int omap_vout_open(struct file *file)
40768 {
40769 struct videobuf_queue *q;
40770 struct omap_vout_device *vout = NULL;
40771+ static struct videobuf_queue_ops video_vbq_ops = {
40772+ .buf_setup = omap_vout_buffer_setup,
40773+ .buf_prepare = omap_vout_buffer_prepare,
40774+ .buf_release = omap_vout_buffer_release,
40775+ .buf_queue = omap_vout_buffer_queue,
40776+ };
40777
40778 vout = video_drvdata(file);
40779 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
40780@@ -1032,10 +1037,6 @@ static int omap_vout_open(struct file *file)
40781 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
40782
40783 q = &vout->vbq;
40784- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
40785- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
40786- video_vbq_ops.buf_release = omap_vout_buffer_release;
40787- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
40788 spin_lock_init(&vout->vbq_lock);
40789
40790 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
40791diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
40792index 04e6490..2df65bf 100644
40793--- a/drivers/media/platform/s5p-tv/mixer.h
40794+++ b/drivers/media/platform/s5p-tv/mixer.h
40795@@ -156,7 +156,7 @@ struct mxr_layer {
40796 /** layer index (unique identifier) */
40797 int idx;
40798 /** callbacks for layer methods */
40799- struct mxr_layer_ops ops;
40800+ struct mxr_layer_ops *ops;
40801 /** format array */
40802 const struct mxr_format **fmt_array;
40803 /** size of format array */
40804diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
40805index b93a21f..2535195 100644
40806--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
40807+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
40808@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
40809 {
40810 struct mxr_layer *layer;
40811 int ret;
40812- struct mxr_layer_ops ops = {
40813+ static struct mxr_layer_ops ops = {
40814 .release = mxr_graph_layer_release,
40815 .buffer_set = mxr_graph_buffer_set,
40816 .stream_set = mxr_graph_stream_set,
40817diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
40818index b713403..53cb5ad 100644
40819--- a/drivers/media/platform/s5p-tv/mixer_reg.c
40820+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
40821@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
40822 layer->update_buf = next;
40823 }
40824
40825- layer->ops.buffer_set(layer, layer->update_buf);
40826+ layer->ops->buffer_set(layer, layer->update_buf);
40827
40828 if (done && done != layer->shadow_buf)
40829 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
40830diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
40831index ef0efdf..8c78eb6 100644
40832--- a/drivers/media/platform/s5p-tv/mixer_video.c
40833+++ b/drivers/media/platform/s5p-tv/mixer_video.c
40834@@ -209,7 +209,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
40835 layer->geo.src.height = layer->geo.src.full_height;
40836
40837 mxr_geometry_dump(mdev, &layer->geo);
40838- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
40839+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
40840 mxr_geometry_dump(mdev, &layer->geo);
40841 }
40842
40843@@ -227,7 +227,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
40844 layer->geo.dst.full_width = mbus_fmt.width;
40845 layer->geo.dst.full_height = mbus_fmt.height;
40846 layer->geo.dst.field = mbus_fmt.field;
40847- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
40848+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
40849
40850 mxr_geometry_dump(mdev, &layer->geo);
40851 }
40852@@ -333,7 +333,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
40853 /* set source size to highest accepted value */
40854 geo->src.full_width = max(geo->dst.full_width, pix->width);
40855 geo->src.full_height = max(geo->dst.full_height, pix->height);
40856- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
40857+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
40858 mxr_geometry_dump(mdev, &layer->geo);
40859 /* set cropping to total visible screen */
40860 geo->src.width = pix->width;
40861@@ -341,12 +341,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
40862 geo->src.x_offset = 0;
40863 geo->src.y_offset = 0;
40864 /* assure consistency of geometry */
40865- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
40866+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
40867 mxr_geometry_dump(mdev, &layer->geo);
40868 /* set full size to lowest possible value */
40869 geo->src.full_width = 0;
40870 geo->src.full_height = 0;
40871- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
40872+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
40873 mxr_geometry_dump(mdev, &layer->geo);
40874
40875 /* returning results */
40876@@ -473,7 +473,7 @@ static int mxr_s_selection(struct file *file, void *fh,
40877 target->width = s->r.width;
40878 target->height = s->r.height;
40879
40880- layer->ops.fix_geometry(layer, stage, s->flags);
40881+ layer->ops->fix_geometry(layer, stage, s->flags);
40882
40883 /* retrieve update selection rectangle */
40884 res.left = target->x_offset;
40885@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
40886 mxr_output_get(mdev);
40887
40888 mxr_layer_update_output(layer);
40889- layer->ops.format_set(layer);
40890+ layer->ops->format_set(layer);
40891 /* enabling layer in hardware */
40892 spin_lock_irqsave(&layer->enq_slock, flags);
40893 layer->state = MXR_LAYER_STREAMING;
40894 spin_unlock_irqrestore(&layer->enq_slock, flags);
40895
40896- layer->ops.stream_set(layer, MXR_ENABLE);
40897+ layer->ops->stream_set(layer, MXR_ENABLE);
40898 mxr_streamer_get(mdev);
40899
40900 return 0;
40901@@ -1030,7 +1030,7 @@ static int stop_streaming(struct vb2_queue *vq)
40902 spin_unlock_irqrestore(&layer->enq_slock, flags);
40903
40904 /* disabling layer in hardware */
40905- layer->ops.stream_set(layer, MXR_DISABLE);
40906+ layer->ops->stream_set(layer, MXR_DISABLE);
40907 /* remove one streamer */
40908 mxr_streamer_put(mdev);
40909 /* allow changes in output configuration */
40910@@ -1069,8 +1069,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
40911
40912 void mxr_layer_release(struct mxr_layer *layer)
40913 {
40914- if (layer->ops.release)
40915- layer->ops.release(layer);
40916+ if (layer->ops->release)
40917+ layer->ops->release(layer);
40918 }
40919
40920 void mxr_base_layer_release(struct mxr_layer *layer)
40921@@ -1096,7 +1096,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
40922
40923 layer->mdev = mdev;
40924 layer->idx = idx;
40925- layer->ops = *ops;
40926+ layer->ops = ops;
40927
40928 spin_lock_init(&layer->enq_slock);
40929 INIT_LIST_HEAD(&layer->enq_list);
40930diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
40931index 3d13a63..da31bf1 100644
40932--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
40933+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
40934@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
40935 {
40936 struct mxr_layer *layer;
40937 int ret;
40938- struct mxr_layer_ops ops = {
40939+ static struct mxr_layer_ops ops = {
40940 .release = mxr_vp_layer_release,
40941 .buffer_set = mxr_vp_buffer_set,
40942 .stream_set = mxr_vp_stream_set,
40943diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
40944index 545c04c..a14bded 100644
40945--- a/drivers/media/radio/radio-cadet.c
40946+++ b/drivers/media/radio/radio-cadet.c
40947@@ -324,6 +324,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
40948 unsigned char readbuf[RDS_BUFFER];
40949 int i = 0;
40950
40951+ if (count > RDS_BUFFER)
40952+ return -EFAULT;
40953 mutex_lock(&dev->lock);
40954 if (dev->rdsstat == 0)
40955 cadet_start_rds(dev);
40956@@ -339,7 +341,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
40957 while (i < count && dev->rdsin != dev->rdsout)
40958 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
40959
40960- if (i && copy_to_user(data, readbuf, i))
40961+ if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
40962 i = -EFAULT;
40963 unlock:
40964 mutex_unlock(&dev->lock);
40965diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
40966index 3940bb0..fb3952a 100644
40967--- a/drivers/media/usb/dvb-usb/cxusb.c
40968+++ b/drivers/media/usb/dvb-usb/cxusb.c
40969@@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
40970
40971 struct dib0700_adapter_state {
40972 int (*set_param_save) (struct dvb_frontend *);
40973-};
40974+} __no_const;
40975
40976 static int dib7070_set_param_override(struct dvb_frontend *fe)
40977 {
40978diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
40979index 6e237b6..dc25556 100644
40980--- a/drivers/media/usb/dvb-usb/dw2102.c
40981+++ b/drivers/media/usb/dvb-usb/dw2102.c
40982@@ -118,7 +118,7 @@ struct su3000_state {
40983
40984 struct s6x0_state {
40985 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
40986-};
40987+} __no_const;
40988
40989 /* debug */
40990 static int dvb_usb_dw2102_debug;
40991diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
40992index f129551..ecf6514 100644
40993--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
40994+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
40995@@ -326,7 +326,7 @@ struct v4l2_buffer32 {
40996 __u32 reserved;
40997 };
40998
40999-static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
41000+static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
41001 enum v4l2_memory memory)
41002 {
41003 void __user *up_pln;
41004@@ -355,7 +355,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
41005 return 0;
41006 }
41007
41008-static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
41009+static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
41010 enum v4l2_memory memory)
41011 {
41012 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
41013@@ -772,7 +772,7 @@ static int put_v4l2_subdev_edid32(struct v4l2_subdev_edid *kp, struct v4l2_subde
41014 put_user(kp->start_block, &up->start_block) ||
41015 put_user(kp->blocks, &up->blocks) ||
41016 put_user(tmp, &up->edid) ||
41017- copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
41018+ copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
41019 return -EFAULT;
41020 return 0;
41021 }
41022diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
41023index 7658586..1079260 100644
41024--- a/drivers/media/v4l2-core/v4l2-ioctl.c
41025+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
41026@@ -1995,7 +1995,8 @@ struct v4l2_ioctl_info {
41027 struct file *file, void *fh, void *p);
41028 } u;
41029 void (*debug)(const void *arg, bool write_only);
41030-};
41031+} __do_const;
41032+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
41033
41034 /* This control needs a priority check */
41035 #define INFO_FL_PRIO (1 << 0)
41036@@ -2177,7 +2178,7 @@ static long __video_do_ioctl(struct file *file,
41037 struct video_device *vfd = video_devdata(file);
41038 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
41039 bool write_only = false;
41040- struct v4l2_ioctl_info default_info;
41041+ v4l2_ioctl_info_no_const default_info;
41042 const struct v4l2_ioctl_info *info;
41043 void *fh = file->private_data;
41044 struct v4l2_fh *vfh = NULL;
41045@@ -2251,7 +2252,7 @@ done:
41046 }
41047
41048 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
41049- void * __user *user_ptr, void ***kernel_ptr)
41050+ void __user **user_ptr, void ***kernel_ptr)
41051 {
41052 int ret = 0;
41053
41054@@ -2267,7 +2268,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
41055 ret = -EINVAL;
41056 break;
41057 }
41058- *user_ptr = (void __user *)buf->m.planes;
41059+ *user_ptr = (void __force_user *)buf->m.planes;
41060 *kernel_ptr = (void *)&buf->m.planes;
41061 *array_size = sizeof(struct v4l2_plane) * buf->length;
41062 ret = 1;
41063@@ -2302,7 +2303,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
41064 ret = -EINVAL;
41065 break;
41066 }
41067- *user_ptr = (void __user *)ctrls->controls;
41068+ *user_ptr = (void __force_user *)ctrls->controls;
41069 *kernel_ptr = (void *)&ctrls->controls;
41070 *array_size = sizeof(struct v4l2_ext_control)
41071 * ctrls->count;
41072diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
41073index 767ff4d..c69d259 100644
41074--- a/drivers/message/fusion/mptbase.c
41075+++ b/drivers/message/fusion/mptbase.c
41076@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
41077 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
41078 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
41079
41080+#ifdef CONFIG_GRKERNSEC_HIDESYM
41081+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
41082+#else
41083 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
41084 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
41085+#endif
41086+
41087 /*
41088 * Rounding UP to nearest 4-kB boundary here...
41089 */
41090@@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
41091 ioc->facts.GlobalCredits);
41092
41093 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
41094+#ifdef CONFIG_GRKERNSEC_HIDESYM
41095+ NULL, NULL);
41096+#else
41097 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
41098+#endif
41099 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
41100 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
41101 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
41102diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
41103index dd239bd..689c4f7 100644
41104--- a/drivers/message/fusion/mptsas.c
41105+++ b/drivers/message/fusion/mptsas.c
41106@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
41107 return 0;
41108 }
41109
41110+static inline void
41111+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
41112+{
41113+ if (phy_info->port_details) {
41114+ phy_info->port_details->rphy = rphy;
41115+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
41116+ ioc->name, rphy));
41117+ }
41118+
41119+ if (rphy) {
41120+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
41121+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
41122+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
41123+ ioc->name, rphy, rphy->dev.release));
41124+ }
41125+}
41126+
41127 /* no mutex */
41128 static void
41129 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
41130@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
41131 return NULL;
41132 }
41133
41134-static inline void
41135-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
41136-{
41137- if (phy_info->port_details) {
41138- phy_info->port_details->rphy = rphy;
41139- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
41140- ioc->name, rphy));
41141- }
41142-
41143- if (rphy) {
41144- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
41145- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
41146- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
41147- ioc->name, rphy, rphy->dev.release));
41148- }
41149-}
41150-
41151 static inline struct sas_port *
41152 mptsas_get_port(struct mptsas_phyinfo *phy_info)
41153 {
41154diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
41155index 727819c..ad74694 100644
41156--- a/drivers/message/fusion/mptscsih.c
41157+++ b/drivers/message/fusion/mptscsih.c
41158@@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
41159
41160 h = shost_priv(SChost);
41161
41162- if (h) {
41163- if (h->info_kbuf == NULL)
41164- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
41165- return h->info_kbuf;
41166- h->info_kbuf[0] = '\0';
41167+ if (!h)
41168+ return NULL;
41169
41170- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
41171- h->info_kbuf[size-1] = '\0';
41172- }
41173+ if (h->info_kbuf == NULL)
41174+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
41175+ return h->info_kbuf;
41176+ h->info_kbuf[0] = '\0';
41177+
41178+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
41179+ h->info_kbuf[size-1] = '\0';
41180
41181 return h->info_kbuf;
41182 }
41183diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
41184index b7d87cd..9890039 100644
41185--- a/drivers/message/i2o/i2o_proc.c
41186+++ b/drivers/message/i2o/i2o_proc.c
41187@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
41188 "Array Controller Device"
41189 };
41190
41191-static char *chtostr(char *tmp, u8 *chars, int n)
41192-{
41193- tmp[0] = 0;
41194- return strncat(tmp, (char *)chars, n);
41195-}
41196-
41197 static int i2o_report_query_status(struct seq_file *seq, int block_status,
41198 char *group)
41199 {
41200@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
41201 } *result;
41202
41203 i2o_exec_execute_ddm_table ddm_table;
41204- char tmp[28 + 1];
41205
41206 result = kmalloc(sizeof(*result), GFP_KERNEL);
41207 if (!result)
41208@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
41209
41210 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
41211 seq_printf(seq, "%-#8x", ddm_table.module_id);
41212- seq_printf(seq, "%-29s",
41213- chtostr(tmp, ddm_table.module_name_version, 28));
41214+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
41215 seq_printf(seq, "%9d ", ddm_table.data_size);
41216 seq_printf(seq, "%8d", ddm_table.code_size);
41217
41218@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
41219
41220 i2o_driver_result_table *result;
41221 i2o_driver_store_table *dst;
41222- char tmp[28 + 1];
41223
41224 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
41225 if (result == NULL)
41226@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
41227
41228 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
41229 seq_printf(seq, "%-#8x", dst->module_id);
41230- seq_printf(seq, "%-29s",
41231- chtostr(tmp, dst->module_name_version, 28));
41232- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
41233+ seq_printf(seq, "%-.28s", dst->module_name_version);
41234+ seq_printf(seq, "%-.8s", dst->date);
41235 seq_printf(seq, "%8d ", dst->module_size);
41236 seq_printf(seq, "%8d ", dst->mpb_size);
41237 seq_printf(seq, "0x%04x", dst->module_flags);
41238@@ -1250,7 +1240,6 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
41239 // == (allow) 512d bytes (max)
41240 static u16 *work16 = (u16 *) work32;
41241 int token;
41242- char tmp[16 + 1];
41243
41244 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
41245
41246@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
41247 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
41248 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
41249 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
41250- seq_printf(seq, "Vendor info : %s\n",
41251- chtostr(tmp, (u8 *) (work32 + 2), 16));
41252- seq_printf(seq, "Product info : %s\n",
41253- chtostr(tmp, (u8 *) (work32 + 6), 16));
41254- seq_printf(seq, "Description : %s\n",
41255- chtostr(tmp, (u8 *) (work32 + 10), 16));
41256- seq_printf(seq, "Product rev. : %s\n",
41257- chtostr(tmp, (u8 *) (work32 + 14), 8));
41258+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
41259+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
41260+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
41261+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
41262
41263 seq_printf(seq, "Serial number : ");
41264 print_serial_number(seq, (u8 *) (work32 + 16),
41265@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
41266 u8 pad[256]; // allow up to 256 byte (max) serial number
41267 } result;
41268
41269- char tmp[24 + 1];
41270-
41271 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
41272
41273 if (token < 0) {
41274@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
41275 }
41276
41277 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
41278- seq_printf(seq, "Module name : %s\n",
41279- chtostr(tmp, result.module_name, 24));
41280- seq_printf(seq, "Module revision : %s\n",
41281- chtostr(tmp, result.module_rev, 8));
41282+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
41283+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
41284
41285 seq_printf(seq, "Serial number : ");
41286 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
41287@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
41288 u8 instance_number[4];
41289 } result;
41290
41291- char tmp[64 + 1];
41292-
41293 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
41294
41295 if (token < 0) {
41296@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
41297 return 0;
41298 }
41299
41300- seq_printf(seq, "Device name : %s\n",
41301- chtostr(tmp, result.device_name, 64));
41302- seq_printf(seq, "Service name : %s\n",
41303- chtostr(tmp, result.service_name, 64));
41304- seq_printf(seq, "Physical name : %s\n",
41305- chtostr(tmp, result.physical_location, 64));
41306- seq_printf(seq, "Instance number : %s\n",
41307- chtostr(tmp, result.instance_number, 4));
41308+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
41309+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
41310+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
41311+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
41312
41313 return 0;
41314 }
41315diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
41316index a8c08f3..155fe3d 100644
41317--- a/drivers/message/i2o/iop.c
41318+++ b/drivers/message/i2o/iop.c
41319@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
41320
41321 spin_lock_irqsave(&c->context_list_lock, flags);
41322
41323- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
41324- atomic_inc(&c->context_list_counter);
41325+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
41326+ atomic_inc_unchecked(&c->context_list_counter);
41327
41328- entry->context = atomic_read(&c->context_list_counter);
41329+ entry->context = atomic_read_unchecked(&c->context_list_counter);
41330
41331 list_add(&entry->list, &c->context_list);
41332
41333@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
41334
41335 #if BITS_PER_LONG == 64
41336 spin_lock_init(&c->context_list_lock);
41337- atomic_set(&c->context_list_counter, 0);
41338+ atomic_set_unchecked(&c->context_list_counter, 0);
41339 INIT_LIST_HEAD(&c->context_list);
41340 #endif
41341
41342diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
41343index 45ece11..8efa218 100644
41344--- a/drivers/mfd/janz-cmodio.c
41345+++ b/drivers/mfd/janz-cmodio.c
41346@@ -13,6 +13,7 @@
41347
41348 #include <linux/kernel.h>
41349 #include <linux/module.h>
41350+#include <linux/slab.h>
41351 #include <linux/init.h>
41352 #include <linux/pci.h>
41353 #include <linux/interrupt.h>
41354diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
41355index a5f9888..1c0ed56 100644
41356--- a/drivers/mfd/twl4030-irq.c
41357+++ b/drivers/mfd/twl4030-irq.c
41358@@ -35,6 +35,7 @@
41359 #include <linux/of.h>
41360 #include <linux/irqdomain.h>
41361 #include <linux/i2c/twl.h>
41362+#include <asm/pgtable.h>
41363
41364 #include "twl-core.h"
41365
41366@@ -728,10 +729,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
41367 * Install an irq handler for each of the SIH modules;
41368 * clone dummy irq_chip since PIH can't *do* anything
41369 */
41370- twl4030_irq_chip = dummy_irq_chip;
41371- twl4030_irq_chip.name = "twl4030";
41372+ pax_open_kernel();
41373+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
41374+ *(const char **)&twl4030_irq_chip.name = "twl4030";
41375
41376- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
41377+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
41378+ pax_close_kernel();
41379
41380 for (i = irq_base; i < irq_end; i++) {
41381 irq_set_chip_and_handler(i, &twl4030_irq_chip,
41382diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
41383index 277a8db..0e0b754 100644
41384--- a/drivers/mfd/twl6030-irq.c
41385+++ b/drivers/mfd/twl6030-irq.c
41386@@ -387,10 +387,12 @@ int twl6030_init_irq(struct device *dev, int irq_num)
41387 * install an irq handler for each of the modules;
41388 * clone dummy irq_chip since PIH can't *do* anything
41389 */
41390- twl6030_irq_chip = dummy_irq_chip;
41391- twl6030_irq_chip.name = "twl6030";
41392- twl6030_irq_chip.irq_set_type = NULL;
41393- twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
41394+ pax_open_kernel();
41395+ memcpy((void *)&twl6030_irq_chip, &dummy_irq_chip, sizeof twl6030_irq_chip);
41396+ *(const char **)&twl6030_irq_chip.name = "twl6030";
41397+ *(void **)&twl6030_irq_chip.irq_set_type = NULL;
41398+ *(void **)&twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
41399+ pax_close_kernel();
41400
41401 for (i = irq_base; i < irq_end; i++) {
41402 irq_set_chip_and_handler(i, &twl6030_irq_chip,
41403diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
41404index f32550a..e3e52a2 100644
41405--- a/drivers/misc/c2port/core.c
41406+++ b/drivers/misc/c2port/core.c
41407@@ -920,7 +920,9 @@ struct c2port_device *c2port_device_register(char *name,
41408 mutex_init(&c2dev->mutex);
41409
41410 /* Create binary file */
41411- c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
41412+ pax_open_kernel();
41413+ *(size_t *)&c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
41414+ pax_close_kernel();
41415 ret = device_create_bin_file(c2dev->dev, &c2port_bin_attrs);
41416 if (unlikely(ret))
41417 goto error_device_create_bin_file;
41418diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
41419index 36f5d52..32311c3 100644
41420--- a/drivers/misc/kgdbts.c
41421+++ b/drivers/misc/kgdbts.c
41422@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
41423 char before[BREAK_INSTR_SIZE];
41424 char after[BREAK_INSTR_SIZE];
41425
41426- probe_kernel_read(before, (char *)kgdbts_break_test,
41427+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
41428 BREAK_INSTR_SIZE);
41429 init_simple_test();
41430 ts.tst = plant_and_detach_test;
41431@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
41432 /* Activate test with initial breakpoint */
41433 if (!is_early)
41434 kgdb_breakpoint();
41435- probe_kernel_read(after, (char *)kgdbts_break_test,
41436+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
41437 BREAK_INSTR_SIZE);
41438 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
41439 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
41440diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
41441index 4cd4a3d..b48cbc7 100644
41442--- a/drivers/misc/lis3lv02d/lis3lv02d.c
41443+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
41444@@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
41445 * the lid is closed. This leads to interrupts as soon as a little move
41446 * is done.
41447 */
41448- atomic_inc(&lis3->count);
41449+ atomic_inc_unchecked(&lis3->count);
41450
41451 wake_up_interruptible(&lis3->misc_wait);
41452 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
41453@@ -584,7 +584,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
41454 if (lis3->pm_dev)
41455 pm_runtime_get_sync(lis3->pm_dev);
41456
41457- atomic_set(&lis3->count, 0);
41458+ atomic_set_unchecked(&lis3->count, 0);
41459 return 0;
41460 }
41461
41462@@ -616,7 +616,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
41463 add_wait_queue(&lis3->misc_wait, &wait);
41464 while (true) {
41465 set_current_state(TASK_INTERRUPTIBLE);
41466- data = atomic_xchg(&lis3->count, 0);
41467+ data = atomic_xchg_unchecked(&lis3->count, 0);
41468 if (data)
41469 break;
41470
41471@@ -657,7 +657,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
41472 struct lis3lv02d, miscdev);
41473
41474 poll_wait(file, &lis3->misc_wait, wait);
41475- if (atomic_read(&lis3->count))
41476+ if (atomic_read_unchecked(&lis3->count))
41477 return POLLIN | POLLRDNORM;
41478 return 0;
41479 }
41480diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
41481index c439c82..1f20f57 100644
41482--- a/drivers/misc/lis3lv02d/lis3lv02d.h
41483+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
41484@@ -297,7 +297,7 @@ struct lis3lv02d {
41485 struct input_polled_dev *idev; /* input device */
41486 struct platform_device *pdev; /* platform device */
41487 struct regulator_bulk_data regulators[2];
41488- atomic_t count; /* interrupt count after last read */
41489+ atomic_unchecked_t count; /* interrupt count after last read */
41490 union axis_conversion ac; /* hw -> logical axis */
41491 int mapped_btns[3];
41492
41493diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
41494index 2f30bad..c4c13d0 100644
41495--- a/drivers/misc/sgi-gru/gruhandles.c
41496+++ b/drivers/misc/sgi-gru/gruhandles.c
41497@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
41498 unsigned long nsec;
41499
41500 nsec = CLKS2NSEC(clks);
41501- atomic_long_inc(&mcs_op_statistics[op].count);
41502- atomic_long_add(nsec, &mcs_op_statistics[op].total);
41503+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
41504+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
41505 if (mcs_op_statistics[op].max < nsec)
41506 mcs_op_statistics[op].max = nsec;
41507 }
41508diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
41509index 797d796..ae8f01e 100644
41510--- a/drivers/misc/sgi-gru/gruprocfs.c
41511+++ b/drivers/misc/sgi-gru/gruprocfs.c
41512@@ -32,9 +32,9 @@
41513
41514 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
41515
41516-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
41517+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
41518 {
41519- unsigned long val = atomic_long_read(v);
41520+ unsigned long val = atomic_long_read_unchecked(v);
41521
41522 seq_printf(s, "%16lu %s\n", val, id);
41523 }
41524@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
41525
41526 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
41527 for (op = 0; op < mcsop_last; op++) {
41528- count = atomic_long_read(&mcs_op_statistics[op].count);
41529- total = atomic_long_read(&mcs_op_statistics[op].total);
41530+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
41531+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
41532 max = mcs_op_statistics[op].max;
41533 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
41534 count ? total / count : 0, max);
41535diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
41536index 5c3ce24..4915ccb 100644
41537--- a/drivers/misc/sgi-gru/grutables.h
41538+++ b/drivers/misc/sgi-gru/grutables.h
41539@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
41540 * GRU statistics.
41541 */
41542 struct gru_stats_s {
41543- atomic_long_t vdata_alloc;
41544- atomic_long_t vdata_free;
41545- atomic_long_t gts_alloc;
41546- atomic_long_t gts_free;
41547- atomic_long_t gms_alloc;
41548- atomic_long_t gms_free;
41549- atomic_long_t gts_double_allocate;
41550- atomic_long_t assign_context;
41551- atomic_long_t assign_context_failed;
41552- atomic_long_t free_context;
41553- atomic_long_t load_user_context;
41554- atomic_long_t load_kernel_context;
41555- atomic_long_t lock_kernel_context;
41556- atomic_long_t unlock_kernel_context;
41557- atomic_long_t steal_user_context;
41558- atomic_long_t steal_kernel_context;
41559- atomic_long_t steal_context_failed;
41560- atomic_long_t nopfn;
41561- atomic_long_t asid_new;
41562- atomic_long_t asid_next;
41563- atomic_long_t asid_wrap;
41564- atomic_long_t asid_reuse;
41565- atomic_long_t intr;
41566- atomic_long_t intr_cbr;
41567- atomic_long_t intr_tfh;
41568- atomic_long_t intr_spurious;
41569- atomic_long_t intr_mm_lock_failed;
41570- atomic_long_t call_os;
41571- atomic_long_t call_os_wait_queue;
41572- atomic_long_t user_flush_tlb;
41573- atomic_long_t user_unload_context;
41574- atomic_long_t user_exception;
41575- atomic_long_t set_context_option;
41576- atomic_long_t check_context_retarget_intr;
41577- atomic_long_t check_context_unload;
41578- atomic_long_t tlb_dropin;
41579- atomic_long_t tlb_preload_page;
41580- atomic_long_t tlb_dropin_fail_no_asid;
41581- atomic_long_t tlb_dropin_fail_upm;
41582- atomic_long_t tlb_dropin_fail_invalid;
41583- atomic_long_t tlb_dropin_fail_range_active;
41584- atomic_long_t tlb_dropin_fail_idle;
41585- atomic_long_t tlb_dropin_fail_fmm;
41586- atomic_long_t tlb_dropin_fail_no_exception;
41587- atomic_long_t tfh_stale_on_fault;
41588- atomic_long_t mmu_invalidate_range;
41589- atomic_long_t mmu_invalidate_page;
41590- atomic_long_t flush_tlb;
41591- atomic_long_t flush_tlb_gru;
41592- atomic_long_t flush_tlb_gru_tgh;
41593- atomic_long_t flush_tlb_gru_zero_asid;
41594+ atomic_long_unchecked_t vdata_alloc;
41595+ atomic_long_unchecked_t vdata_free;
41596+ atomic_long_unchecked_t gts_alloc;
41597+ atomic_long_unchecked_t gts_free;
41598+ atomic_long_unchecked_t gms_alloc;
41599+ atomic_long_unchecked_t gms_free;
41600+ atomic_long_unchecked_t gts_double_allocate;
41601+ atomic_long_unchecked_t assign_context;
41602+ atomic_long_unchecked_t assign_context_failed;
41603+ atomic_long_unchecked_t free_context;
41604+ atomic_long_unchecked_t load_user_context;
41605+ atomic_long_unchecked_t load_kernel_context;
41606+ atomic_long_unchecked_t lock_kernel_context;
41607+ atomic_long_unchecked_t unlock_kernel_context;
41608+ atomic_long_unchecked_t steal_user_context;
41609+ atomic_long_unchecked_t steal_kernel_context;
41610+ atomic_long_unchecked_t steal_context_failed;
41611+ atomic_long_unchecked_t nopfn;
41612+ atomic_long_unchecked_t asid_new;
41613+ atomic_long_unchecked_t asid_next;
41614+ atomic_long_unchecked_t asid_wrap;
41615+ atomic_long_unchecked_t asid_reuse;
41616+ atomic_long_unchecked_t intr;
41617+ atomic_long_unchecked_t intr_cbr;
41618+ atomic_long_unchecked_t intr_tfh;
41619+ atomic_long_unchecked_t intr_spurious;
41620+ atomic_long_unchecked_t intr_mm_lock_failed;
41621+ atomic_long_unchecked_t call_os;
41622+ atomic_long_unchecked_t call_os_wait_queue;
41623+ atomic_long_unchecked_t user_flush_tlb;
41624+ atomic_long_unchecked_t user_unload_context;
41625+ atomic_long_unchecked_t user_exception;
41626+ atomic_long_unchecked_t set_context_option;
41627+ atomic_long_unchecked_t check_context_retarget_intr;
41628+ atomic_long_unchecked_t check_context_unload;
41629+ atomic_long_unchecked_t tlb_dropin;
41630+ atomic_long_unchecked_t tlb_preload_page;
41631+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
41632+ atomic_long_unchecked_t tlb_dropin_fail_upm;
41633+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
41634+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
41635+ atomic_long_unchecked_t tlb_dropin_fail_idle;
41636+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
41637+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
41638+ atomic_long_unchecked_t tfh_stale_on_fault;
41639+ atomic_long_unchecked_t mmu_invalidate_range;
41640+ atomic_long_unchecked_t mmu_invalidate_page;
41641+ atomic_long_unchecked_t flush_tlb;
41642+ atomic_long_unchecked_t flush_tlb_gru;
41643+ atomic_long_unchecked_t flush_tlb_gru_tgh;
41644+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
41645
41646- atomic_long_t copy_gpa;
41647- atomic_long_t read_gpa;
41648+ atomic_long_unchecked_t copy_gpa;
41649+ atomic_long_unchecked_t read_gpa;
41650
41651- atomic_long_t mesq_receive;
41652- atomic_long_t mesq_receive_none;
41653- atomic_long_t mesq_send;
41654- atomic_long_t mesq_send_failed;
41655- atomic_long_t mesq_noop;
41656- atomic_long_t mesq_send_unexpected_error;
41657- atomic_long_t mesq_send_lb_overflow;
41658- atomic_long_t mesq_send_qlimit_reached;
41659- atomic_long_t mesq_send_amo_nacked;
41660- atomic_long_t mesq_send_put_nacked;
41661- atomic_long_t mesq_page_overflow;
41662- atomic_long_t mesq_qf_locked;
41663- atomic_long_t mesq_qf_noop_not_full;
41664- atomic_long_t mesq_qf_switch_head_failed;
41665- atomic_long_t mesq_qf_unexpected_error;
41666- atomic_long_t mesq_noop_unexpected_error;
41667- atomic_long_t mesq_noop_lb_overflow;
41668- atomic_long_t mesq_noop_qlimit_reached;
41669- atomic_long_t mesq_noop_amo_nacked;
41670- atomic_long_t mesq_noop_put_nacked;
41671- atomic_long_t mesq_noop_page_overflow;
41672+ atomic_long_unchecked_t mesq_receive;
41673+ atomic_long_unchecked_t mesq_receive_none;
41674+ atomic_long_unchecked_t mesq_send;
41675+ atomic_long_unchecked_t mesq_send_failed;
41676+ atomic_long_unchecked_t mesq_noop;
41677+ atomic_long_unchecked_t mesq_send_unexpected_error;
41678+ atomic_long_unchecked_t mesq_send_lb_overflow;
41679+ atomic_long_unchecked_t mesq_send_qlimit_reached;
41680+ atomic_long_unchecked_t mesq_send_amo_nacked;
41681+ atomic_long_unchecked_t mesq_send_put_nacked;
41682+ atomic_long_unchecked_t mesq_page_overflow;
41683+ atomic_long_unchecked_t mesq_qf_locked;
41684+ atomic_long_unchecked_t mesq_qf_noop_not_full;
41685+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
41686+ atomic_long_unchecked_t mesq_qf_unexpected_error;
41687+ atomic_long_unchecked_t mesq_noop_unexpected_error;
41688+ atomic_long_unchecked_t mesq_noop_lb_overflow;
41689+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
41690+ atomic_long_unchecked_t mesq_noop_amo_nacked;
41691+ atomic_long_unchecked_t mesq_noop_put_nacked;
41692+ atomic_long_unchecked_t mesq_noop_page_overflow;
41693
41694 };
41695
41696@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
41697 tghop_invalidate, mcsop_last};
41698
41699 struct mcs_op_statistic {
41700- atomic_long_t count;
41701- atomic_long_t total;
41702+ atomic_long_unchecked_t count;
41703+ atomic_long_unchecked_t total;
41704 unsigned long max;
41705 };
41706
41707@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
41708
41709 #define STAT(id) do { \
41710 if (gru_options & OPT_STATS) \
41711- atomic_long_inc(&gru_stats.id); \
41712+ atomic_long_inc_unchecked(&gru_stats.id); \
41713 } while (0)
41714
41715 #ifdef CONFIG_SGI_GRU_DEBUG
41716diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
41717index c862cd4..0d176fe 100644
41718--- a/drivers/misc/sgi-xp/xp.h
41719+++ b/drivers/misc/sgi-xp/xp.h
41720@@ -288,7 +288,7 @@ struct xpc_interface {
41721 xpc_notify_func, void *);
41722 void (*received) (short, int, void *);
41723 enum xp_retval (*partid_to_nasids) (short, void *);
41724-};
41725+} __no_const;
41726
41727 extern struct xpc_interface xpc_interface;
41728
41729diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
41730index b94d5f7..7f494c5 100644
41731--- a/drivers/misc/sgi-xp/xpc.h
41732+++ b/drivers/misc/sgi-xp/xpc.h
41733@@ -835,6 +835,7 @@ struct xpc_arch_operations {
41734 void (*received_payload) (struct xpc_channel *, void *);
41735 void (*notify_senders_of_disconnect) (struct xpc_channel *);
41736 };
41737+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
41738
41739 /* struct xpc_partition act_state values (for XPC HB) */
41740
41741@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
41742 /* found in xpc_main.c */
41743 extern struct device *xpc_part;
41744 extern struct device *xpc_chan;
41745-extern struct xpc_arch_operations xpc_arch_ops;
41746+extern xpc_arch_operations_no_const xpc_arch_ops;
41747 extern int xpc_disengage_timelimit;
41748 extern int xpc_disengage_timedout;
41749 extern int xpc_activate_IRQ_rcvd;
41750diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
41751index d971817..33bdca5 100644
41752--- a/drivers/misc/sgi-xp/xpc_main.c
41753+++ b/drivers/misc/sgi-xp/xpc_main.c
41754@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
41755 .notifier_call = xpc_system_die,
41756 };
41757
41758-struct xpc_arch_operations xpc_arch_ops;
41759+xpc_arch_operations_no_const xpc_arch_ops;
41760
41761 /*
41762 * Timer function to enforce the timelimit on the partition disengage.
41763@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
41764
41765 if (((die_args->trapnr == X86_TRAP_MF) ||
41766 (die_args->trapnr == X86_TRAP_XF)) &&
41767- !user_mode_vm(die_args->regs))
41768+ !user_mode(die_args->regs))
41769 xpc_die_deactivate();
41770
41771 break;
41772diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
41773index 49f04bc..65660c2 100644
41774--- a/drivers/mmc/core/mmc_ops.c
41775+++ b/drivers/mmc/core/mmc_ops.c
41776@@ -247,7 +247,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
41777 void *data_buf;
41778 int is_on_stack;
41779
41780- is_on_stack = object_is_on_stack(buf);
41781+ is_on_stack = object_starts_on_stack(buf);
41782 if (is_on_stack) {
41783 /*
41784 * dma onto stack is unsafe/nonportable, but callers to this
41785diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
41786index 0b74189..818358f 100644
41787--- a/drivers/mmc/host/dw_mmc.h
41788+++ b/drivers/mmc/host/dw_mmc.h
41789@@ -202,5 +202,5 @@ struct dw_mci_drv_data {
41790 void (*prepare_command)(struct dw_mci *host, u32 *cmdr);
41791 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
41792 int (*parse_dt)(struct dw_mci *host);
41793-};
41794+} __do_const;
41795 #endif /* _DW_MMC_H_ */
41796diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
41797index c6f6246..60760a8 100644
41798--- a/drivers/mmc/host/sdhci-s3c.c
41799+++ b/drivers/mmc/host/sdhci-s3c.c
41800@@ -664,9 +664,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
41801 * we can use overriding functions instead of default.
41802 */
41803 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
41804- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
41805- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
41806- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
41807+ pax_open_kernel();
41808+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
41809+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
41810+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
41811+ pax_close_kernel();
41812 }
41813
41814 /* It supports additional host capabilities if needed */
41815diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
41816index 0c8bb6b..6f35deb 100644
41817--- a/drivers/mtd/nand/denali.c
41818+++ b/drivers/mtd/nand/denali.c
41819@@ -24,6 +24,7 @@
41820 #include <linux/slab.h>
41821 #include <linux/mtd/mtd.h>
41822 #include <linux/module.h>
41823+#include <linux/slab.h>
41824
41825 #include "denali.h"
41826
41827diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
41828index 51b9d6a..52af9a7 100644
41829--- a/drivers/mtd/nftlmount.c
41830+++ b/drivers/mtd/nftlmount.c
41831@@ -24,6 +24,7 @@
41832 #include <asm/errno.h>
41833 #include <linux/delay.h>
41834 #include <linux/slab.h>
41835+#include <linux/sched.h>
41836 #include <linux/mtd/mtd.h>
41837 #include <linux/mtd/nand.h>
41838 #include <linux/mtd/nftl.h>
41839diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
41840index f9d5615..99dd95f 100644
41841--- a/drivers/mtd/sm_ftl.c
41842+++ b/drivers/mtd/sm_ftl.c
41843@@ -56,7 +56,7 @@ ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
41844 #define SM_CIS_VENDOR_OFFSET 0x59
41845 struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
41846 {
41847- struct attribute_group *attr_group;
41848+ attribute_group_no_const *attr_group;
41849 struct attribute **attributes;
41850 struct sm_sysfs_attribute *vendor_attribute;
41851
41852diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
41853index f975696..4597e21 100644
41854--- a/drivers/net/bonding/bond_main.c
41855+++ b/drivers/net/bonding/bond_main.c
41856@@ -4870,7 +4870,7 @@ static unsigned int bond_get_num_tx_queues(void)
41857 return tx_queues;
41858 }
41859
41860-static struct rtnl_link_ops bond_link_ops __read_mostly = {
41861+static struct rtnl_link_ops bond_link_ops = {
41862 .kind = "bond",
41863 .priv_size = sizeof(struct bonding),
41864 .setup = bond_setup,
41865@@ -4995,8 +4995,8 @@ static void __exit bonding_exit(void)
41866
41867 bond_destroy_debugfs();
41868
41869- rtnl_link_unregister(&bond_link_ops);
41870 unregister_pernet_subsys(&bond_net_ops);
41871+ rtnl_link_unregister(&bond_link_ops);
41872
41873 #ifdef CONFIG_NET_POLL_CONTROLLER
41874 /*
41875diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
41876index e1d2643..7f4133b 100644
41877--- a/drivers/net/ethernet/8390/ax88796.c
41878+++ b/drivers/net/ethernet/8390/ax88796.c
41879@@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev)
41880 if (ax->plat->reg_offsets)
41881 ei_local->reg_offset = ax->plat->reg_offsets;
41882 else {
41883+ resource_size_t _mem_size = mem_size;
41884+ do_div(_mem_size, 0x18);
41885 ei_local->reg_offset = ax->reg_offsets;
41886 for (ret = 0; ret < 0x18; ret++)
41887- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
41888+ ax->reg_offsets[ret] = _mem_size * ret;
41889 }
41890
41891 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
41892diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
41893index 151675d..0139a9d 100644
41894--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
41895+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
41896@@ -1112,7 +1112,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
41897 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
41898 {
41899 /* RX_MODE controlling object */
41900- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
41901+ bnx2x_init_rx_mode_obj(bp);
41902
41903 /* multicast configuration controlling object */
41904 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
41905diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
41906index ce1a916..10b52b0 100644
41907--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
41908+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
41909@@ -960,6 +960,9 @@ static int bnx2x_set_dump(struct net_device *dev, struct ethtool_dump *val)
41910 struct bnx2x *bp = netdev_priv(dev);
41911
41912 /* Use the ethtool_dump "flag" field as the dump preset index */
41913+ if (val->flag < 1 || val->flag > DUMP_MAX_PRESETS)
41914+ return -EINVAL;
41915+
41916 bp->dump_preset_idx = val->flag;
41917 return 0;
41918 }
41919@@ -986,8 +989,6 @@ static int bnx2x_get_dump_data(struct net_device *dev,
41920 struct bnx2x *bp = netdev_priv(dev);
41921 struct dump_header dump_hdr = {0};
41922
41923- memset(p, 0, dump->len);
41924-
41925 /* Disable parity attentions as long as following dump may
41926 * cause false alarms by reading never written registers. We
41927 * will re-enable parity attentions right after the dump.
41928diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
41929index b4c9dea..2a9927f 100644
41930--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
41931+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
41932@@ -11497,6 +11497,8 @@ static int bnx2x_init_bp(struct bnx2x *bp)
41933 bp->min_msix_vec_cnt = 2;
41934 BNX2X_DEV_INFO("bp->min_msix_vec_cnt %d", bp->min_msix_vec_cnt);
41935
41936+ bp->dump_preset_idx = 1;
41937+
41938 return rc;
41939 }
41940
41941diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
41942index 32a9609..0b1c53a 100644
41943--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
41944+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
41945@@ -2387,15 +2387,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
41946 return rc;
41947 }
41948
41949-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
41950- struct bnx2x_rx_mode_obj *o)
41951+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
41952 {
41953 if (CHIP_IS_E1x(bp)) {
41954- o->wait_comp = bnx2x_empty_rx_mode_wait;
41955- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
41956+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
41957+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
41958 } else {
41959- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
41960- o->config_rx_mode = bnx2x_set_rx_mode_e2;
41961+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
41962+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
41963 }
41964 }
41965
41966diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
41967index 43c00bc..dd1d03d 100644
41968--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
41969+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
41970@@ -1321,8 +1321,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
41971
41972 /********************* RX MODE ****************/
41973
41974-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
41975- struct bnx2x_rx_mode_obj *o);
41976+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
41977
41978 /**
41979 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
41980diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
41981index ff6e30e..87e8452 100644
41982--- a/drivers/net/ethernet/broadcom/tg3.h
41983+++ b/drivers/net/ethernet/broadcom/tg3.h
41984@@ -147,6 +147,7 @@
41985 #define CHIPREV_ID_5750_A0 0x4000
41986 #define CHIPREV_ID_5750_A1 0x4001
41987 #define CHIPREV_ID_5750_A3 0x4003
41988+#define CHIPREV_ID_5750_C1 0x4201
41989 #define CHIPREV_ID_5750_C2 0x4202
41990 #define CHIPREV_ID_5752_A0_HW 0x5000
41991 #define CHIPREV_ID_5752_A0 0x6000
41992diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
41993index 71497e8..b650951 100644
41994--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
41995+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
41996@@ -3037,7 +3037,9 @@ static void t3_io_resume(struct pci_dev *pdev)
41997 CH_ALERT(adapter, "adapter recovering, PEX ERR 0x%x\n",
41998 t3_read_reg(adapter, A_PCIE_PEX_ERR));
41999
42000+ rtnl_lock();
42001 t3_resume_ports(adapter);
42002+ rtnl_unlock();
42003 }
42004
42005 static const struct pci_error_handlers t3_err_handler = {
42006diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
42007index 8cffcdf..aadf043 100644
42008--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
42009+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
42010@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
42011 */
42012 struct l2t_skb_cb {
42013 arp_failure_handler_func arp_failure_handler;
42014-};
42015+} __no_const;
42016
42017 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
42018
42019diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
42020index 4c83003..2a2a5b9 100644
42021--- a/drivers/net/ethernet/dec/tulip/de4x5.c
42022+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
42023@@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
42024 for (i=0; i<ETH_ALEN; i++) {
42025 tmp.addr[i] = dev->dev_addr[i];
42026 }
42027- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
42028+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
42029 break;
42030
42031 case DE4X5_SET_HWADDR: /* Set the hardware address */
42032@@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
42033 spin_lock_irqsave(&lp->lock, flags);
42034 memcpy(&statbuf, &lp->pktStats, ioc->len);
42035 spin_unlock_irqrestore(&lp->lock, flags);
42036- if (copy_to_user(ioc->data, &statbuf, ioc->len))
42037+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
42038 return -EFAULT;
42039 break;
42040 }
42041diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
42042index 6e43426..1bd8365 100644
42043--- a/drivers/net/ethernet/emulex/benet/be_main.c
42044+++ b/drivers/net/ethernet/emulex/benet/be_main.c
42045@@ -469,7 +469,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
42046
42047 if (wrapped)
42048 newacc += 65536;
42049- ACCESS_ONCE(*acc) = newacc;
42050+ ACCESS_ONCE_RW(*acc) = newacc;
42051 }
42052
42053 void populate_erx_stats(struct be_adapter *adapter,
42054diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
42055index 21b85fb..b49e5fc 100644
42056--- a/drivers/net/ethernet/faraday/ftgmac100.c
42057+++ b/drivers/net/ethernet/faraday/ftgmac100.c
42058@@ -31,6 +31,8 @@
42059 #include <linux/netdevice.h>
42060 #include <linux/phy.h>
42061 #include <linux/platform_device.h>
42062+#include <linux/interrupt.h>
42063+#include <linux/irqreturn.h>
42064 #include <net/ip.h>
42065
42066 #include "ftgmac100.h"
42067diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
42068index a6eda8d..935d273 100644
42069--- a/drivers/net/ethernet/faraday/ftmac100.c
42070+++ b/drivers/net/ethernet/faraday/ftmac100.c
42071@@ -31,6 +31,8 @@
42072 #include <linux/module.h>
42073 #include <linux/netdevice.h>
42074 #include <linux/platform_device.h>
42075+#include <linux/interrupt.h>
42076+#include <linux/irqreturn.h>
42077
42078 #include "ftmac100.h"
42079
42080diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
42081index 331987d..3be1135 100644
42082--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
42083+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
42084@@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
42085 }
42086
42087 /* update the base incval used to calculate frequency adjustment */
42088- ACCESS_ONCE(adapter->base_incval) = incval;
42089+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
42090 smp_mb();
42091
42092 /* need lock to prevent incorrect read while modifying cyclecounter */
42093diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
42094index fbe5363..266b4e3 100644
42095--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
42096+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
42097@@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
42098 struct __vxge_hw_fifo *fifo;
42099 struct vxge_hw_fifo_config *config;
42100 u32 txdl_size, txdl_per_memblock;
42101- struct vxge_hw_mempool_cbs fifo_mp_callback;
42102+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
42103+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
42104+ };
42105+
42106 struct __vxge_hw_virtualpath *vpath;
42107
42108 if ((vp == NULL) || (attr == NULL)) {
42109@@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
42110 goto exit;
42111 }
42112
42113- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
42114-
42115 fifo->mempool =
42116 __vxge_hw_mempool_create(vpath->hldev,
42117 fifo->config->memblock_size,
42118diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
42119index 5e7fb1d..f8d1810 100644
42120--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
42121+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
42122@@ -1948,7 +1948,9 @@ int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *adapter)
42123 op_mode = QLC_83XX_DEFAULT_OPMODE;
42124
42125 if (op_mode == QLC_83XX_DEFAULT_OPMODE) {
42126- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
42127+ pax_open_kernel();
42128+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
42129+ pax_close_kernel();
42130 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
42131 } else {
42132 return -EIO;
42133diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
42134index b0c3de9..fc5857e 100644
42135--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
42136+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
42137@@ -200,15 +200,21 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
42138 if (priv_level == QLCNIC_NON_PRIV_FUNC) {
42139 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
42140 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
42141- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
42142+ pax_open_kernel();
42143+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
42144+ pax_close_kernel();
42145 } else if (priv_level == QLCNIC_PRIV_FUNC) {
42146 ahw->op_mode = QLCNIC_PRIV_FUNC;
42147 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
42148- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
42149+ pax_open_kernel();
42150+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
42151+ pax_close_kernel();
42152 } else if (priv_level == QLCNIC_MGMT_FUNC) {
42153 ahw->op_mode = QLCNIC_MGMT_FUNC;
42154 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
42155- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
42156+ pax_open_kernel();
42157+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
42158+ pax_close_kernel();
42159 } else {
42160 return -EIO;
42161 }
42162diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
42163index 6acf82b..14b097e 100644
42164--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
42165+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
42166@@ -206,10 +206,10 @@ int qlcnic_fw_cmd_set_drv_version(struct qlcnic_adapter *adapter)
42167 if (err) {
42168 dev_info(&adapter->pdev->dev,
42169 "Failed to set driver version in firmware\n");
42170- return -EIO;
42171+ err = -EIO;
42172 }
42173-
42174- return 0;
42175+ qlcnic_free_mbx_args(&cmd);
42176+ return err;
42177 }
42178
42179 int
42180diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
42181index d3f8797..82a03d3 100644
42182--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
42183+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
42184@@ -262,7 +262,7 @@ void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr,
42185
42186 mac_req = (struct qlcnic_mac_req *)&(req->words[0]);
42187 mac_req->op = vlan_id ? QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_ADD;
42188- memcpy(mac_req->mac_addr, &uaddr, ETH_ALEN);
42189+ memcpy(mac_req->mac_addr, uaddr, ETH_ALEN);
42190
42191 vlan_req = (struct qlcnic_vlan_req *)&req->words[1];
42192 vlan_req->vlan_id = cpu_to_le16(vlan_id);
42193diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
42194index 887aebe..9095ff9 100644
42195--- a/drivers/net/ethernet/realtek/8139cp.c
42196+++ b/drivers/net/ethernet/realtek/8139cp.c
42197@@ -524,6 +524,7 @@ rx_status_loop:
42198 PCI_DMA_FROMDEVICE);
42199 if (dma_mapping_error(&cp->pdev->dev, new_mapping)) {
42200 dev->stats.rx_dropped++;
42201+ kfree_skb(new_skb);
42202 goto rx_next;
42203 }
42204
42205diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
42206index 393f961..d343034 100644
42207--- a/drivers/net/ethernet/realtek/r8169.c
42208+++ b/drivers/net/ethernet/realtek/r8169.c
42209@@ -753,22 +753,22 @@ struct rtl8169_private {
42210 struct mdio_ops {
42211 void (*write)(struct rtl8169_private *, int, int);
42212 int (*read)(struct rtl8169_private *, int);
42213- } mdio_ops;
42214+ } __no_const mdio_ops;
42215
42216 struct pll_power_ops {
42217 void (*down)(struct rtl8169_private *);
42218 void (*up)(struct rtl8169_private *);
42219- } pll_power_ops;
42220+ } __no_const pll_power_ops;
42221
42222 struct jumbo_ops {
42223 void (*enable)(struct rtl8169_private *);
42224 void (*disable)(struct rtl8169_private *);
42225- } jumbo_ops;
42226+ } __no_const jumbo_ops;
42227
42228 struct csi_ops {
42229 void (*write)(struct rtl8169_private *, int, int);
42230 u32 (*read)(struct rtl8169_private *, int);
42231- } csi_ops;
42232+ } __no_const csi_ops;
42233
42234 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
42235 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
42236diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
42237index 9a95abf..36df7f9 100644
42238--- a/drivers/net/ethernet/sfc/ptp.c
42239+++ b/drivers/net/ethernet/sfc/ptp.c
42240@@ -535,7 +535,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
42241 (u32)((u64)ptp->start.dma_addr >> 32));
42242
42243 /* Clear flag that signals MC ready */
42244- ACCESS_ONCE(*start) = 0;
42245+ ACCESS_ONCE_RW(*start) = 0;
42246 efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
42247 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
42248
42249diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
42250index 50617c5..b13724c 100644
42251--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
42252+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
42253@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
42254
42255 writel(value, ioaddr + MMC_CNTRL);
42256
42257- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
42258- MMC_CNTRL, value);
42259+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
42260+// MMC_CNTRL, value);
42261 }
42262
42263 /* To mask all all interrupts.*/
42264diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
42265index e6fe0d8..2b7d752 100644
42266--- a/drivers/net/hyperv/hyperv_net.h
42267+++ b/drivers/net/hyperv/hyperv_net.h
42268@@ -101,7 +101,7 @@ struct rndis_device {
42269
42270 enum rndis_device_state state;
42271 bool link_state;
42272- atomic_t new_req_id;
42273+ atomic_unchecked_t new_req_id;
42274
42275 spinlock_t request_lock;
42276 struct list_head req_list;
42277diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
42278index 0775f0a..d4fb316 100644
42279--- a/drivers/net/hyperv/rndis_filter.c
42280+++ b/drivers/net/hyperv/rndis_filter.c
42281@@ -104,7 +104,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
42282 * template
42283 */
42284 set = &rndis_msg->msg.set_req;
42285- set->req_id = atomic_inc_return(&dev->new_req_id);
42286+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
42287
42288 /* Add to the request list */
42289 spin_lock_irqsave(&dev->request_lock, flags);
42290@@ -752,7 +752,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
42291
42292 /* Setup the rndis set */
42293 halt = &request->request_msg.msg.halt_req;
42294- halt->req_id = atomic_inc_return(&dev->new_req_id);
42295+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
42296
42297 /* Ignore return since this msg is optional. */
42298 rndis_filter_send_request(dev, request);
42299diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
42300index bf0d55e..82bcfbd1 100644
42301--- a/drivers/net/ieee802154/fakehard.c
42302+++ b/drivers/net/ieee802154/fakehard.c
42303@@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
42304 phy->transmit_power = 0xbf;
42305
42306 dev->netdev_ops = &fake_ops;
42307- dev->ml_priv = &fake_mlme;
42308+ dev->ml_priv = (void *)&fake_mlme;
42309
42310 priv = netdev_priv(dev);
42311 priv->phy = phy;
42312diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
42313index 6e91931..2b0ebe7 100644
42314--- a/drivers/net/macvlan.c
42315+++ b/drivers/net/macvlan.c
42316@@ -905,13 +905,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
42317 int macvlan_link_register(struct rtnl_link_ops *ops)
42318 {
42319 /* common fields */
42320- ops->priv_size = sizeof(struct macvlan_dev);
42321- ops->validate = macvlan_validate;
42322- ops->maxtype = IFLA_MACVLAN_MAX;
42323- ops->policy = macvlan_policy;
42324- ops->changelink = macvlan_changelink;
42325- ops->get_size = macvlan_get_size;
42326- ops->fill_info = macvlan_fill_info;
42327+ pax_open_kernel();
42328+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
42329+ *(void **)&ops->validate = macvlan_validate;
42330+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
42331+ *(const void **)&ops->policy = macvlan_policy;
42332+ *(void **)&ops->changelink = macvlan_changelink;
42333+ *(void **)&ops->get_size = macvlan_get_size;
42334+ *(void **)&ops->fill_info = macvlan_fill_info;
42335+ pax_close_kernel();
42336
42337 return rtnl_link_register(ops);
42338 };
42339@@ -967,7 +969,7 @@ static int macvlan_device_event(struct notifier_block *unused,
42340 return NOTIFY_DONE;
42341 }
42342
42343-static struct notifier_block macvlan_notifier_block __read_mostly = {
42344+static struct notifier_block macvlan_notifier_block = {
42345 .notifier_call = macvlan_device_event,
42346 };
42347
42348diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
42349index 523d6b2..5e16aa1 100644
42350--- a/drivers/net/macvtap.c
42351+++ b/drivers/net/macvtap.c
42352@@ -1110,7 +1110,7 @@ static int macvtap_device_event(struct notifier_block *unused,
42353 return NOTIFY_DONE;
42354 }
42355
42356-static struct notifier_block macvtap_notifier_block __read_mostly = {
42357+static struct notifier_block macvtap_notifier_block = {
42358 .notifier_call = macvtap_device_event,
42359 };
42360
42361diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
42362index daec9b0..6428fcb 100644
42363--- a/drivers/net/phy/mdio-bitbang.c
42364+++ b/drivers/net/phy/mdio-bitbang.c
42365@@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
42366 struct mdiobb_ctrl *ctrl = bus->priv;
42367
42368 module_put(ctrl->ops->owner);
42369+ mdiobus_unregister(bus);
42370 mdiobus_free(bus);
42371 }
42372 EXPORT_SYMBOL(free_mdio_bitbang);
42373diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
42374index 72ff14b..11d442d 100644
42375--- a/drivers/net/ppp/ppp_generic.c
42376+++ b/drivers/net/ppp/ppp_generic.c
42377@@ -999,7 +999,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
42378 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
42379 struct ppp_stats stats;
42380 struct ppp_comp_stats cstats;
42381- char *vers;
42382
42383 switch (cmd) {
42384 case SIOCGPPPSTATS:
42385@@ -1021,8 +1020,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
42386 break;
42387
42388 case SIOCGPPPVER:
42389- vers = PPP_VERSION;
42390- if (copy_to_user(addr, vers, strlen(vers) + 1))
42391+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
42392 break;
42393 err = 0;
42394 break;
42395diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
42396index 1252d9c..80e660b 100644
42397--- a/drivers/net/slip/slhc.c
42398+++ b/drivers/net/slip/slhc.c
42399@@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
42400 register struct tcphdr *thp;
42401 register struct iphdr *ip;
42402 register struct cstate *cs;
42403- int len, hdrlen;
42404+ long len, hdrlen;
42405 unsigned char *cp = icp;
42406
42407 /* We've got a compressed packet; read the change byte */
42408diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
42409index b305105..8ead6df 100644
42410--- a/drivers/net/team/team.c
42411+++ b/drivers/net/team/team.c
42412@@ -2682,7 +2682,7 @@ static int team_device_event(struct notifier_block *unused,
42413 return NOTIFY_DONE;
42414 }
42415
42416-static struct notifier_block team_notifier_block __read_mostly = {
42417+static struct notifier_block team_notifier_block = {
42418 .notifier_call = team_device_event,
42419 };
42420
42421diff --git a/drivers/net/tun.c b/drivers/net/tun.c
42422index 2491eb2..1a453eb 100644
42423--- a/drivers/net/tun.c
42424+++ b/drivers/net/tun.c
42425@@ -1076,8 +1076,9 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
42426 u32 rxhash;
42427
42428 if (!(tun->flags & TUN_NO_PI)) {
42429- if ((len -= sizeof(pi)) > total_len)
42430+ if (len < sizeof(pi))
42431 return -EINVAL;
42432+ len -= sizeof(pi);
42433
42434 if (memcpy_fromiovecend((void *)&pi, iv, 0, sizeof(pi)))
42435 return -EFAULT;
42436@@ -1085,8 +1086,9 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
42437 }
42438
42439 if (tun->flags & TUN_VNET_HDR) {
42440- if ((len -= tun->vnet_hdr_sz) > total_len)
42441+ if (len < tun->vnet_hdr_sz)
42442 return -EINVAL;
42443+ len -= tun->vnet_hdr_sz;
42444
42445 if (memcpy_fromiovecend((void *)&gso, iv, offset, sizeof(gso)))
42446 return -EFAULT;
42447@@ -1869,7 +1871,7 @@ unlock:
42448 }
42449
42450 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
42451- unsigned long arg, int ifreq_len)
42452+ unsigned long arg, size_t ifreq_len)
42453 {
42454 struct tun_file *tfile = file->private_data;
42455 struct tun_struct *tun;
42456@@ -1881,6 +1883,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
42457 int vnet_hdr_sz;
42458 int ret;
42459
42460+ if (ifreq_len > sizeof ifr)
42461+ return -EFAULT;
42462+
42463 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
42464 if (copy_from_user(&ifr, argp, ifreq_len))
42465 return -EFAULT;
42466diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
42467index cba1d46..f703766 100644
42468--- a/drivers/net/usb/hso.c
42469+++ b/drivers/net/usb/hso.c
42470@@ -71,7 +71,7 @@
42471 #include <asm/byteorder.h>
42472 #include <linux/serial_core.h>
42473 #include <linux/serial.h>
42474-
42475+#include <asm/local.h>
42476
42477 #define MOD_AUTHOR "Option Wireless"
42478 #define MOD_DESCRIPTION "USB High Speed Option driver"
42479@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
42480 struct urb *urb;
42481
42482 urb = serial->rx_urb[0];
42483- if (serial->port.count > 0) {
42484+ if (atomic_read(&serial->port.count) > 0) {
42485 count = put_rxbuf_data(urb, serial);
42486 if (count == -1)
42487 return;
42488@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
42489 DUMP1(urb->transfer_buffer, urb->actual_length);
42490
42491 /* Anyone listening? */
42492- if (serial->port.count == 0)
42493+ if (atomic_read(&serial->port.count) == 0)
42494 return;
42495
42496 if (status == 0) {
42497@@ -1298,8 +1298,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
42498 tty_port_tty_set(&serial->port, tty);
42499
42500 /* check for port already opened, if not set the termios */
42501- serial->port.count++;
42502- if (serial->port.count == 1) {
42503+ if (atomic_inc_return(&serial->port.count) == 1) {
42504 serial->rx_state = RX_IDLE;
42505 /* Force default termio settings */
42506 _hso_serial_set_termios(tty, NULL);
42507@@ -1311,7 +1310,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
42508 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
42509 if (result) {
42510 hso_stop_serial_device(serial->parent);
42511- serial->port.count--;
42512+ atomic_dec(&serial->port.count);
42513 kref_put(&serial->parent->ref, hso_serial_ref_free);
42514 }
42515 } else {
42516@@ -1348,10 +1347,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
42517
42518 /* reset the rts and dtr */
42519 /* do the actual close */
42520- serial->port.count--;
42521+ atomic_dec(&serial->port.count);
42522
42523- if (serial->port.count <= 0) {
42524- serial->port.count = 0;
42525+ if (atomic_read(&serial->port.count) <= 0) {
42526+ atomic_set(&serial->port.count, 0);
42527 tty_port_tty_set(&serial->port, NULL);
42528 if (!usb_gone)
42529 hso_stop_serial_device(serial->parent);
42530@@ -1427,7 +1426,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
42531
42532 /* the actual setup */
42533 spin_lock_irqsave(&serial->serial_lock, flags);
42534- if (serial->port.count)
42535+ if (atomic_read(&serial->port.count))
42536 _hso_serial_set_termios(tty, old);
42537 else
42538 tty->termios = *old;
42539@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
42540 D1("Pending read interrupt on port %d\n", i);
42541 spin_lock(&serial->serial_lock);
42542 if (serial->rx_state == RX_IDLE &&
42543- serial->port.count > 0) {
42544+ atomic_read(&serial->port.count) > 0) {
42545 /* Setup and send a ctrl req read on
42546 * port i */
42547 if (!serial->rx_urb_filled[0]) {
42548@@ -3057,7 +3056,7 @@ static int hso_resume(struct usb_interface *iface)
42549 /* Start all serial ports */
42550 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
42551 if (serial_table[i] && (serial_table[i]->interface == iface)) {
42552- if (dev2ser(serial_table[i])->port.count) {
42553+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
42554 result =
42555 hso_start_serial_device(serial_table[i], GFP_NOIO);
42556 hso_kick_transmit(dev2ser(serial_table[i]));
42557diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
42558index 57325f3..36b181f 100644
42559--- a/drivers/net/vxlan.c
42560+++ b/drivers/net/vxlan.c
42561@@ -1579,7 +1579,7 @@ nla_put_failure:
42562 return -EMSGSIZE;
42563 }
42564
42565-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
42566+static struct rtnl_link_ops vxlan_link_ops = {
42567 .kind = "vxlan",
42568 .maxtype = IFLA_VXLAN_MAX,
42569 .policy = vxlan_policy,
42570diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
42571index 34c8a33..3261fdc 100644
42572--- a/drivers/net/wireless/at76c50x-usb.c
42573+++ b/drivers/net/wireless/at76c50x-usb.c
42574@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
42575 }
42576
42577 /* Convert timeout from the DFU status to jiffies */
42578-static inline unsigned long at76_get_timeout(struct dfu_status *s)
42579+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
42580 {
42581 return msecs_to_jiffies((s->poll_timeout[2] << 16)
42582 | (s->poll_timeout[1] << 8)
42583diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
42584index 8d78253..bebbb68 100644
42585--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
42586+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
42587@@ -184,8 +184,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42588 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
42589 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
42590
42591- ACCESS_ONCE(ads->ds_link) = i->link;
42592- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
42593+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
42594+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
42595
42596 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
42597 ctl6 = SM(i->keytype, AR_EncrType);
42598@@ -199,26 +199,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42599
42600 if ((i->is_first || i->is_last) &&
42601 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
42602- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
42603+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
42604 | set11nTries(i->rates, 1)
42605 | set11nTries(i->rates, 2)
42606 | set11nTries(i->rates, 3)
42607 | (i->dur_update ? AR_DurUpdateEna : 0)
42608 | SM(0, AR_BurstDur);
42609
42610- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
42611+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
42612 | set11nRate(i->rates, 1)
42613 | set11nRate(i->rates, 2)
42614 | set11nRate(i->rates, 3);
42615 } else {
42616- ACCESS_ONCE(ads->ds_ctl2) = 0;
42617- ACCESS_ONCE(ads->ds_ctl3) = 0;
42618+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
42619+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
42620 }
42621
42622 if (!i->is_first) {
42623- ACCESS_ONCE(ads->ds_ctl0) = 0;
42624- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
42625- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
42626+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
42627+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
42628+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
42629 return;
42630 }
42631
42632@@ -243,7 +243,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42633 break;
42634 }
42635
42636- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
42637+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
42638 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
42639 | SM(i->txpower, AR_XmitPower)
42640 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
42641@@ -253,19 +253,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42642 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
42643 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
42644
42645- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
42646- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
42647+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
42648+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
42649
42650 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
42651 return;
42652
42653- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
42654+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
42655 | set11nPktDurRTSCTS(i->rates, 1);
42656
42657- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
42658+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
42659 | set11nPktDurRTSCTS(i->rates, 3);
42660
42661- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
42662+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
42663 | set11nRateFlags(i->rates, 1)
42664 | set11nRateFlags(i->rates, 2)
42665 | set11nRateFlags(i->rates, 3)
42666diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
42667index 301bf72..3f5654f 100644
42668--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
42669+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
42670@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42671 (i->qcu << AR_TxQcuNum_S) | desc_len;
42672
42673 checksum += val;
42674- ACCESS_ONCE(ads->info) = val;
42675+ ACCESS_ONCE_RW(ads->info) = val;
42676
42677 checksum += i->link;
42678- ACCESS_ONCE(ads->link) = i->link;
42679+ ACCESS_ONCE_RW(ads->link) = i->link;
42680
42681 checksum += i->buf_addr[0];
42682- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
42683+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
42684 checksum += i->buf_addr[1];
42685- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
42686+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
42687 checksum += i->buf_addr[2];
42688- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
42689+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
42690 checksum += i->buf_addr[3];
42691- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
42692+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
42693
42694 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
42695- ACCESS_ONCE(ads->ctl3) = val;
42696+ ACCESS_ONCE_RW(ads->ctl3) = val;
42697 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
42698- ACCESS_ONCE(ads->ctl5) = val;
42699+ ACCESS_ONCE_RW(ads->ctl5) = val;
42700 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
42701- ACCESS_ONCE(ads->ctl7) = val;
42702+ ACCESS_ONCE_RW(ads->ctl7) = val;
42703 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
42704- ACCESS_ONCE(ads->ctl9) = val;
42705+ ACCESS_ONCE_RW(ads->ctl9) = val;
42706
42707 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
42708- ACCESS_ONCE(ads->ctl10) = checksum;
42709+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
42710
42711 if (i->is_first || i->is_last) {
42712- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
42713+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
42714 | set11nTries(i->rates, 1)
42715 | set11nTries(i->rates, 2)
42716 | set11nTries(i->rates, 3)
42717 | (i->dur_update ? AR_DurUpdateEna : 0)
42718 | SM(0, AR_BurstDur);
42719
42720- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
42721+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
42722 | set11nRate(i->rates, 1)
42723 | set11nRate(i->rates, 2)
42724 | set11nRate(i->rates, 3);
42725 } else {
42726- ACCESS_ONCE(ads->ctl13) = 0;
42727- ACCESS_ONCE(ads->ctl14) = 0;
42728+ ACCESS_ONCE_RW(ads->ctl13) = 0;
42729+ ACCESS_ONCE_RW(ads->ctl14) = 0;
42730 }
42731
42732 ads->ctl20 = 0;
42733@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42734
42735 ctl17 = SM(i->keytype, AR_EncrType);
42736 if (!i->is_first) {
42737- ACCESS_ONCE(ads->ctl11) = 0;
42738- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
42739- ACCESS_ONCE(ads->ctl15) = 0;
42740- ACCESS_ONCE(ads->ctl16) = 0;
42741- ACCESS_ONCE(ads->ctl17) = ctl17;
42742- ACCESS_ONCE(ads->ctl18) = 0;
42743- ACCESS_ONCE(ads->ctl19) = 0;
42744+ ACCESS_ONCE_RW(ads->ctl11) = 0;
42745+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
42746+ ACCESS_ONCE_RW(ads->ctl15) = 0;
42747+ ACCESS_ONCE_RW(ads->ctl16) = 0;
42748+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
42749+ ACCESS_ONCE_RW(ads->ctl18) = 0;
42750+ ACCESS_ONCE_RW(ads->ctl19) = 0;
42751 return;
42752 }
42753
42754- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
42755+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
42756 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
42757 | SM(i->txpower, AR_XmitPower)
42758 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
42759@@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
42760 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
42761 ctl12 |= SM(val, AR_PAPRDChainMask);
42762
42763- ACCESS_ONCE(ads->ctl12) = ctl12;
42764- ACCESS_ONCE(ads->ctl17) = ctl17;
42765+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
42766+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
42767
42768- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
42769+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
42770 | set11nPktDurRTSCTS(i->rates, 1);
42771
42772- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
42773+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
42774 | set11nPktDurRTSCTS(i->rates, 3);
42775
42776- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
42777+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
42778 | set11nRateFlags(i->rates, 1)
42779 | set11nRateFlags(i->rates, 2)
42780 | set11nRateFlags(i->rates, 3)
42781 | SM(i->rtscts_rate, AR_RTSCTSRate);
42782
42783- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
42784+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
42785 }
42786
42787 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
42788diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
42789index ae30343..a117806 100644
42790--- a/drivers/net/wireless/ath/ath9k/hw.h
42791+++ b/drivers/net/wireless/ath/ath9k/hw.h
42792@@ -652,7 +652,7 @@ struct ath_hw_private_ops {
42793
42794 /* ANI */
42795 void (*ani_cache_ini_regs)(struct ath_hw *ah);
42796-};
42797+} __no_const;
42798
42799 /**
42800 * struct ath_spec_scan - parameters for Atheros spectral scan
42801@@ -721,7 +721,7 @@ struct ath_hw_ops {
42802 struct ath_spec_scan *param);
42803 void (*spectral_scan_trigger)(struct ath_hw *ah);
42804 void (*spectral_scan_wait)(struct ath_hw *ah);
42805-};
42806+} __no_const;
42807
42808 struct ath_nf_limits {
42809 s16 max;
42810diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
42811index b37a582..680835d 100644
42812--- a/drivers/net/wireless/iwlegacy/3945-mac.c
42813+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
42814@@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
42815 */
42816 if (il3945_mod_params.disable_hw_scan) {
42817 D_INFO("Disabling hw_scan\n");
42818- il3945_mac_ops.hw_scan = NULL;
42819+ pax_open_kernel();
42820+ *(void **)&il3945_mac_ops.hw_scan = NULL;
42821+ pax_close_kernel();
42822 }
42823
42824 D_INFO("*** LOAD DRIVER ***\n");
42825diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
42826index d532948..e0d8bb1 100644
42827--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
42828+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
42829@@ -203,7 +203,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
42830 {
42831 struct iwl_priv *priv = file->private_data;
42832 char buf[64];
42833- int buf_size;
42834+ size_t buf_size;
42835 u32 offset, len;
42836
42837 memset(buf, 0, sizeof(buf));
42838@@ -473,7 +473,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
42839 struct iwl_priv *priv = file->private_data;
42840
42841 char buf[8];
42842- int buf_size;
42843+ size_t buf_size;
42844 u32 reset_flag;
42845
42846 memset(buf, 0, sizeof(buf));
42847@@ -554,7 +554,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
42848 {
42849 struct iwl_priv *priv = file->private_data;
42850 char buf[8];
42851- int buf_size;
42852+ size_t buf_size;
42853 int ht40;
42854
42855 memset(buf, 0, sizeof(buf));
42856@@ -606,7 +606,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
42857 {
42858 struct iwl_priv *priv = file->private_data;
42859 char buf[8];
42860- int buf_size;
42861+ size_t buf_size;
42862 int value;
42863
42864 memset(buf, 0, sizeof(buf));
42865@@ -698,10 +698,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
42866 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
42867 DEBUGFS_READ_FILE_OPS(current_sleep_command);
42868
42869-static const char *fmt_value = " %-30s %10u\n";
42870-static const char *fmt_hex = " %-30s 0x%02X\n";
42871-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
42872-static const char *fmt_header =
42873+static const char fmt_value[] = " %-30s %10u\n";
42874+static const char fmt_hex[] = " %-30s 0x%02X\n";
42875+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
42876+static const char fmt_header[] =
42877 "%-32s current cumulative delta max\n";
42878
42879 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
42880@@ -1871,7 +1871,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
42881 {
42882 struct iwl_priv *priv = file->private_data;
42883 char buf[8];
42884- int buf_size;
42885+ size_t buf_size;
42886 int clear;
42887
42888 memset(buf, 0, sizeof(buf));
42889@@ -1916,7 +1916,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
42890 {
42891 struct iwl_priv *priv = file->private_data;
42892 char buf[8];
42893- int buf_size;
42894+ size_t buf_size;
42895 int trace;
42896
42897 memset(buf, 0, sizeof(buf));
42898@@ -1987,7 +1987,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
42899 {
42900 struct iwl_priv *priv = file->private_data;
42901 char buf[8];
42902- int buf_size;
42903+ size_t buf_size;
42904 int missed;
42905
42906 memset(buf, 0, sizeof(buf));
42907@@ -2028,7 +2028,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
42908
42909 struct iwl_priv *priv = file->private_data;
42910 char buf[8];
42911- int buf_size;
42912+ size_t buf_size;
42913 int plcp;
42914
42915 memset(buf, 0, sizeof(buf));
42916@@ -2088,7 +2088,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
42917
42918 struct iwl_priv *priv = file->private_data;
42919 char buf[8];
42920- int buf_size;
42921+ size_t buf_size;
42922 int flush;
42923
42924 memset(buf, 0, sizeof(buf));
42925@@ -2178,7 +2178,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
42926
42927 struct iwl_priv *priv = file->private_data;
42928 char buf[8];
42929- int buf_size;
42930+ size_t buf_size;
42931 int rts;
42932
42933 if (!priv->cfg->ht_params)
42934@@ -2220,7 +2220,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
42935 {
42936 struct iwl_priv *priv = file->private_data;
42937 char buf[8];
42938- int buf_size;
42939+ size_t buf_size;
42940
42941 memset(buf, 0, sizeof(buf));
42942 buf_size = min(count, sizeof(buf) - 1);
42943@@ -2254,7 +2254,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
42944 struct iwl_priv *priv = file->private_data;
42945 u32 event_log_flag;
42946 char buf[8];
42947- int buf_size;
42948+ size_t buf_size;
42949
42950 /* check that the interface is up */
42951 if (!iwl_is_ready(priv))
42952@@ -2308,7 +2308,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
42953 struct iwl_priv *priv = file->private_data;
42954 char buf[8];
42955 u32 calib_disabled;
42956- int buf_size;
42957+ size_t buf_size;
42958
42959 memset(buf, 0, sizeof(buf));
42960 buf_size = min(count, sizeof(buf) - 1);
42961diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
42962index 50ba0a4..29424e7 100644
42963--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
42964+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
42965@@ -1329,7 +1329,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
42966 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
42967
42968 char buf[8];
42969- int buf_size;
42970+ size_t buf_size;
42971 u32 reset_flag;
42972
42973 memset(buf, 0, sizeof(buf));
42974@@ -1350,7 +1350,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
42975 {
42976 struct iwl_trans *trans = file->private_data;
42977 char buf[8];
42978- int buf_size;
42979+ size_t buf_size;
42980 int csr;
42981
42982 memset(buf, 0, sizeof(buf));
42983diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
42984index cb34c78..9fec0dc 100644
42985--- a/drivers/net/wireless/mac80211_hwsim.c
42986+++ b/drivers/net/wireless/mac80211_hwsim.c
42987@@ -2195,25 +2195,19 @@ static int __init init_mac80211_hwsim(void)
42988
42989 if (channels > 1) {
42990 hwsim_if_comb.num_different_channels = channels;
42991- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
42992- mac80211_hwsim_ops.cancel_hw_scan =
42993- mac80211_hwsim_cancel_hw_scan;
42994- mac80211_hwsim_ops.sw_scan_start = NULL;
42995- mac80211_hwsim_ops.sw_scan_complete = NULL;
42996- mac80211_hwsim_ops.remain_on_channel =
42997- mac80211_hwsim_roc;
42998- mac80211_hwsim_ops.cancel_remain_on_channel =
42999- mac80211_hwsim_croc;
43000- mac80211_hwsim_ops.add_chanctx =
43001- mac80211_hwsim_add_chanctx;
43002- mac80211_hwsim_ops.remove_chanctx =
43003- mac80211_hwsim_remove_chanctx;
43004- mac80211_hwsim_ops.change_chanctx =
43005- mac80211_hwsim_change_chanctx;
43006- mac80211_hwsim_ops.assign_vif_chanctx =
43007- mac80211_hwsim_assign_vif_chanctx;
43008- mac80211_hwsim_ops.unassign_vif_chanctx =
43009- mac80211_hwsim_unassign_vif_chanctx;
43010+ pax_open_kernel();
43011+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
43012+ *(void **)&mac80211_hwsim_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
43013+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
43014+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
43015+ *(void **)&mac80211_hwsim_ops.remain_on_channel = mac80211_hwsim_roc;
43016+ *(void **)&mac80211_hwsim_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
43017+ *(void **)&mac80211_hwsim_ops.add_chanctx = mac80211_hwsim_add_chanctx;
43018+ *(void **)&mac80211_hwsim_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
43019+ *(void **)&mac80211_hwsim_ops.change_chanctx = mac80211_hwsim_change_chanctx;
43020+ *(void **)&mac80211_hwsim_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
43021+ *(void **)&mac80211_hwsim_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
43022+ pax_close_kernel();
43023 }
43024
43025 spin_lock_init(&hwsim_radio_lock);
43026diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
43027index 8169a85..7fa3b47 100644
43028--- a/drivers/net/wireless/rndis_wlan.c
43029+++ b/drivers/net/wireless/rndis_wlan.c
43030@@ -1238,7 +1238,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
43031
43032 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
43033
43034- if (rts_threshold < 0 || rts_threshold > 2347)
43035+ if (rts_threshold > 2347)
43036 rts_threshold = 2347;
43037
43038 tmp = cpu_to_le32(rts_threshold);
43039diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
43040index 7510723..5ba37f5 100644
43041--- a/drivers/net/wireless/rt2x00/rt2x00.h
43042+++ b/drivers/net/wireless/rt2x00/rt2x00.h
43043@@ -386,7 +386,7 @@ struct rt2x00_intf {
43044 * for hardware which doesn't support hardware
43045 * sequence counting.
43046 */
43047- atomic_t seqno;
43048+ atomic_unchecked_t seqno;
43049 };
43050
43051 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
43052diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
43053index d955741..8730748 100644
43054--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
43055+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
43056@@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
43057 * sequence counter given by mac80211.
43058 */
43059 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
43060- seqno = atomic_add_return(0x10, &intf->seqno);
43061+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
43062 else
43063- seqno = atomic_read(&intf->seqno);
43064+ seqno = atomic_read_unchecked(&intf->seqno);
43065
43066 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
43067 hdr->seq_ctrl |= cpu_to_le16(seqno);
43068diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
43069index e2b3d9c..67a5184 100644
43070--- a/drivers/net/wireless/ti/wl1251/sdio.c
43071+++ b/drivers/net/wireless/ti/wl1251/sdio.c
43072@@ -271,13 +271,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
43073
43074 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
43075
43076- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
43077- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
43078+ pax_open_kernel();
43079+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
43080+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
43081+ pax_close_kernel();
43082
43083 wl1251_info("using dedicated interrupt line");
43084 } else {
43085- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
43086- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
43087+ pax_open_kernel();
43088+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
43089+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
43090+ pax_close_kernel();
43091
43092 wl1251_info("using SDIO interrupt");
43093 }
43094diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
43095index 1c627da..69f7d17 100644
43096--- a/drivers/net/wireless/ti/wl12xx/main.c
43097+++ b/drivers/net/wireless/ti/wl12xx/main.c
43098@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
43099 sizeof(wl->conf.mem));
43100
43101 /* read data preparation is only needed by wl127x */
43102- wl->ops->prepare_read = wl127x_prepare_read;
43103+ pax_open_kernel();
43104+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
43105+ pax_close_kernel();
43106
43107 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
43108 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
43109@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
43110 sizeof(wl->conf.mem));
43111
43112 /* read data preparation is only needed by wl127x */
43113- wl->ops->prepare_read = wl127x_prepare_read;
43114+ pax_open_kernel();
43115+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
43116+ pax_close_kernel();
43117
43118 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
43119 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
43120diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
43121index 9fa692d..b31fee0 100644
43122--- a/drivers/net/wireless/ti/wl18xx/main.c
43123+++ b/drivers/net/wireless/ti/wl18xx/main.c
43124@@ -1687,8 +1687,10 @@ static int wl18xx_setup(struct wl1271 *wl)
43125 }
43126
43127 if (!checksum_param) {
43128- wl18xx_ops.set_rx_csum = NULL;
43129- wl18xx_ops.init_vif = NULL;
43130+ pax_open_kernel();
43131+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
43132+ *(void **)&wl18xx_ops.init_vif = NULL;
43133+ pax_close_kernel();
43134 }
43135
43136 /* Enable 11a Band only if we have 5G antennas */
43137diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
43138index 7ef0b4a..ff65c28 100644
43139--- a/drivers/net/wireless/zd1211rw/zd_usb.c
43140+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
43141@@ -386,7 +386,7 @@ static inline void handle_regs_int(struct urb *urb)
43142 {
43143 struct zd_usb *usb = urb->context;
43144 struct zd_usb_interrupt *intr = &usb->intr;
43145- int len;
43146+ unsigned int len;
43147 u16 int_num;
43148
43149 ZD_ASSERT(in_interrupt());
43150diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
43151index d93b2b6..ae50401 100644
43152--- a/drivers/oprofile/buffer_sync.c
43153+++ b/drivers/oprofile/buffer_sync.c
43154@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
43155 if (cookie == NO_COOKIE)
43156 offset = pc;
43157 if (cookie == INVALID_COOKIE) {
43158- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
43159+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
43160 offset = pc;
43161 }
43162 if (cookie != last_cookie) {
43163@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
43164 /* add userspace sample */
43165
43166 if (!mm) {
43167- atomic_inc(&oprofile_stats.sample_lost_no_mm);
43168+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
43169 return 0;
43170 }
43171
43172 cookie = lookup_dcookie(mm, s->eip, &offset);
43173
43174 if (cookie == INVALID_COOKIE) {
43175- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
43176+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
43177 return 0;
43178 }
43179
43180@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
43181 /* ignore backtraces if failed to add a sample */
43182 if (state == sb_bt_start) {
43183 state = sb_bt_ignore;
43184- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
43185+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
43186 }
43187 }
43188 release_mm(mm);
43189diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
43190index c0cc4e7..44d4e54 100644
43191--- a/drivers/oprofile/event_buffer.c
43192+++ b/drivers/oprofile/event_buffer.c
43193@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
43194 }
43195
43196 if (buffer_pos == buffer_size) {
43197- atomic_inc(&oprofile_stats.event_lost_overflow);
43198+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
43199 return;
43200 }
43201
43202diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
43203index ed2c3ec..deda85a 100644
43204--- a/drivers/oprofile/oprof.c
43205+++ b/drivers/oprofile/oprof.c
43206@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
43207 if (oprofile_ops.switch_events())
43208 return;
43209
43210- atomic_inc(&oprofile_stats.multiplex_counter);
43211+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
43212 start_switch_worker();
43213 }
43214
43215diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
43216index 84a208d..d61b0a1 100644
43217--- a/drivers/oprofile/oprofile_files.c
43218+++ b/drivers/oprofile/oprofile_files.c
43219@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
43220
43221 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
43222
43223-static ssize_t timeout_read(struct file *file, char __user *buf,
43224+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
43225 size_t count, loff_t *offset)
43226 {
43227 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
43228diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
43229index 917d28e..d62d981 100644
43230--- a/drivers/oprofile/oprofile_stats.c
43231+++ b/drivers/oprofile/oprofile_stats.c
43232@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
43233 cpu_buf->sample_invalid_eip = 0;
43234 }
43235
43236- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
43237- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
43238- atomic_set(&oprofile_stats.event_lost_overflow, 0);
43239- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
43240- atomic_set(&oprofile_stats.multiplex_counter, 0);
43241+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
43242+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
43243+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
43244+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
43245+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
43246 }
43247
43248
43249diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
43250index 38b6fc0..b5cbfce 100644
43251--- a/drivers/oprofile/oprofile_stats.h
43252+++ b/drivers/oprofile/oprofile_stats.h
43253@@ -13,11 +13,11 @@
43254 #include <linux/atomic.h>
43255
43256 struct oprofile_stat_struct {
43257- atomic_t sample_lost_no_mm;
43258- atomic_t sample_lost_no_mapping;
43259- atomic_t bt_lost_no_mapping;
43260- atomic_t event_lost_overflow;
43261- atomic_t multiplex_counter;
43262+ atomic_unchecked_t sample_lost_no_mm;
43263+ atomic_unchecked_t sample_lost_no_mapping;
43264+ atomic_unchecked_t bt_lost_no_mapping;
43265+ atomic_unchecked_t event_lost_overflow;
43266+ atomic_unchecked_t multiplex_counter;
43267 };
43268
43269 extern struct oprofile_stat_struct oprofile_stats;
43270diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
43271index 7c12d9c..558bf3bb 100644
43272--- a/drivers/oprofile/oprofilefs.c
43273+++ b/drivers/oprofile/oprofilefs.c
43274@@ -190,7 +190,7 @@ static const struct file_operations atomic_ro_fops = {
43275
43276
43277 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
43278- char const *name, atomic_t *val)
43279+ char const *name, atomic_unchecked_t *val)
43280 {
43281 return __oprofilefs_create_file(sb, root, name,
43282 &atomic_ro_fops, 0444, val);
43283diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
43284index 93404f7..4a313d8 100644
43285--- a/drivers/oprofile/timer_int.c
43286+++ b/drivers/oprofile/timer_int.c
43287@@ -93,7 +93,7 @@ static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,
43288 return NOTIFY_OK;
43289 }
43290
43291-static struct notifier_block __refdata oprofile_cpu_notifier = {
43292+static struct notifier_block oprofile_cpu_notifier = {
43293 .notifier_call = oprofile_cpu_notify,
43294 };
43295
43296diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
43297index 92ed045..62d39bd7 100644
43298--- a/drivers/parport/procfs.c
43299+++ b/drivers/parport/procfs.c
43300@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
43301
43302 *ppos += len;
43303
43304- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
43305+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
43306 }
43307
43308 #ifdef CONFIG_PARPORT_1284
43309@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
43310
43311 *ppos += len;
43312
43313- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
43314+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
43315 }
43316 #endif /* IEEE1284.3 support. */
43317
43318diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
43319index c35e8ad..fc33beb 100644
43320--- a/drivers/pci/hotplug/acpiphp_ibm.c
43321+++ b/drivers/pci/hotplug/acpiphp_ibm.c
43322@@ -464,7 +464,9 @@ static int __init ibm_acpiphp_init(void)
43323 goto init_cleanup;
43324 }
43325
43326- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
43327+ pax_open_kernel();
43328+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
43329+ pax_close_kernel();
43330 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
43331
43332 return retval;
43333diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
43334index a6a71c4..c91097b 100644
43335--- a/drivers/pci/hotplug/cpcihp_generic.c
43336+++ b/drivers/pci/hotplug/cpcihp_generic.c
43337@@ -73,7 +73,6 @@ static u16 port;
43338 static unsigned int enum_bit;
43339 static u8 enum_mask;
43340
43341-static struct cpci_hp_controller_ops generic_hpc_ops;
43342 static struct cpci_hp_controller generic_hpc;
43343
43344 static int __init validate_parameters(void)
43345@@ -139,6 +138,10 @@ static int query_enum(void)
43346 return ((value & enum_mask) == enum_mask);
43347 }
43348
43349+static struct cpci_hp_controller_ops generic_hpc_ops = {
43350+ .query_enum = query_enum,
43351+};
43352+
43353 static int __init cpcihp_generic_init(void)
43354 {
43355 int status;
43356@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
43357 pci_dev_put(dev);
43358
43359 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
43360- generic_hpc_ops.query_enum = query_enum;
43361 generic_hpc.ops = &generic_hpc_ops;
43362
43363 status = cpci_hp_register_controller(&generic_hpc);
43364diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
43365index 449b4bb..257e2e8 100644
43366--- a/drivers/pci/hotplug/cpcihp_zt5550.c
43367+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
43368@@ -59,7 +59,6 @@
43369 /* local variables */
43370 static bool debug;
43371 static bool poll;
43372-static struct cpci_hp_controller_ops zt5550_hpc_ops;
43373 static struct cpci_hp_controller zt5550_hpc;
43374
43375 /* Primary cPCI bus bridge device */
43376@@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
43377 return 0;
43378 }
43379
43380+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
43381+ .query_enum = zt5550_hc_query_enum,
43382+};
43383+
43384 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
43385 {
43386 int status;
43387@@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
43388 dbg("returned from zt5550_hc_config");
43389
43390 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
43391- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
43392 zt5550_hpc.ops = &zt5550_hpc_ops;
43393 if(!poll) {
43394 zt5550_hpc.irq = hc_dev->irq;
43395 zt5550_hpc.irq_flags = IRQF_SHARED;
43396 zt5550_hpc.dev_id = hc_dev;
43397
43398- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
43399- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
43400- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
43401+ pax_open_kernel();
43402+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
43403+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
43404+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
43405+ pax_open_kernel();
43406 } else {
43407 info("using ENUM# polling mode");
43408 }
43409diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
43410index 76ba8a1..20ca857 100644
43411--- a/drivers/pci/hotplug/cpqphp_nvram.c
43412+++ b/drivers/pci/hotplug/cpqphp_nvram.c
43413@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
43414
43415 void compaq_nvram_init (void __iomem *rom_start)
43416 {
43417+
43418+#ifndef CONFIG_PAX_KERNEXEC
43419 if (rom_start) {
43420 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
43421 }
43422+#endif
43423+
43424 dbg("int15 entry = %p\n", compaq_int15_entry_point);
43425
43426 /* initialize our int15 lock */
43427diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
43428index ec20f74..c1d961e 100644
43429--- a/drivers/pci/hotplug/pci_hotplug_core.c
43430+++ b/drivers/pci/hotplug/pci_hotplug_core.c
43431@@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
43432 return -EINVAL;
43433 }
43434
43435- slot->ops->owner = owner;
43436- slot->ops->mod_name = mod_name;
43437+ pax_open_kernel();
43438+ *(struct module **)&slot->ops->owner = owner;
43439+ *(const char **)&slot->ops->mod_name = mod_name;
43440+ pax_close_kernel();
43441
43442 mutex_lock(&pci_hp_mutex);
43443 /*
43444diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
43445index 7d72c5e..edce02c 100644
43446--- a/drivers/pci/hotplug/pciehp_core.c
43447+++ b/drivers/pci/hotplug/pciehp_core.c
43448@@ -91,7 +91,7 @@ static int init_slot(struct controller *ctrl)
43449 struct slot *slot = ctrl->slot;
43450 struct hotplug_slot *hotplug = NULL;
43451 struct hotplug_slot_info *info = NULL;
43452- struct hotplug_slot_ops *ops = NULL;
43453+ hotplug_slot_ops_no_const *ops = NULL;
43454 char name[SLOT_NAME_SIZE];
43455 int retval = -ENOMEM;
43456
43457diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
43458index 5b4a9d9..cd5ac1f 100644
43459--- a/drivers/pci/pci-sysfs.c
43460+++ b/drivers/pci/pci-sysfs.c
43461@@ -1071,7 +1071,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
43462 {
43463 /* allocate attribute structure, piggyback attribute name */
43464 int name_len = write_combine ? 13 : 10;
43465- struct bin_attribute *res_attr;
43466+ bin_attribute_no_const *res_attr;
43467 int retval;
43468
43469 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
43470@@ -1256,7 +1256,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
43471 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
43472 {
43473 int retval;
43474- struct bin_attribute *attr;
43475+ bin_attribute_no_const *attr;
43476
43477 /* If the device has VPD, try to expose it in sysfs. */
43478 if (dev->vpd) {
43479@@ -1303,7 +1303,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
43480 {
43481 int retval;
43482 int rom_size = 0;
43483- struct bin_attribute *attr;
43484+ bin_attribute_no_const *attr;
43485
43486 if (!sysfs_initialized)
43487 return -EACCES;
43488diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
43489index d1182c4..2a138ec 100644
43490--- a/drivers/pci/pci.h
43491+++ b/drivers/pci/pci.h
43492@@ -92,7 +92,7 @@ struct pci_vpd_ops {
43493 struct pci_vpd {
43494 unsigned int len;
43495 const struct pci_vpd_ops *ops;
43496- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
43497+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
43498 };
43499
43500 int pci_vpd_pci22_init(struct pci_dev *dev);
43501diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
43502index d320df6..ca9a8f6 100644
43503--- a/drivers/pci/pcie/aspm.c
43504+++ b/drivers/pci/pcie/aspm.c
43505@@ -27,9 +27,9 @@
43506 #define MODULE_PARAM_PREFIX "pcie_aspm."
43507
43508 /* Note: those are not register definitions */
43509-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
43510-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
43511-#define ASPM_STATE_L1 (4) /* L1 state */
43512+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
43513+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
43514+#define ASPM_STATE_L1 (4U) /* L1 state */
43515 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
43516 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
43517
43518diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
43519index ea37072..10e58e56 100644
43520--- a/drivers/pci/probe.c
43521+++ b/drivers/pci/probe.c
43522@@ -173,7 +173,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
43523 struct pci_bus_region region;
43524 bool bar_too_big = false, bar_disabled = false;
43525
43526- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
43527+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
43528
43529 /* No printks while decoding is disabled! */
43530 if (!dev->mmio_always_on) {
43531diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
43532index 0812608..b04018c4 100644
43533--- a/drivers/pci/proc.c
43534+++ b/drivers/pci/proc.c
43535@@ -453,7 +453,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
43536 static int __init pci_proc_init(void)
43537 {
43538 struct pci_dev *dev = NULL;
43539+
43540+#ifdef CONFIG_GRKERNSEC_PROC_ADD
43541+#ifdef CONFIG_GRKERNSEC_PROC_USER
43542+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
43543+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
43544+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
43545+#endif
43546+#else
43547 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
43548+#endif
43549 proc_create("devices", 0, proc_bus_pci_dir,
43550 &proc_bus_pci_dev_operations);
43551 proc_initialized = 1;
43552diff --git a/drivers/platform/x86/chromeos_laptop.c b/drivers/platform/x86/chromeos_laptop.c
43553index 3e5b4497..dcdfb70 100644
43554--- a/drivers/platform/x86/chromeos_laptop.c
43555+++ b/drivers/platform/x86/chromeos_laptop.c
43556@@ -301,7 +301,7 @@ static int __init setup_tsl2563_als(const struct dmi_system_id *id)
43557 return 0;
43558 }
43559
43560-static struct dmi_system_id __initdata chromeos_laptop_dmi_table[] = {
43561+static struct dmi_system_id __initconst chromeos_laptop_dmi_table[] = {
43562 {
43563 .ident = "Samsung Series 5 550 - Touchpad",
43564 .matches = {
43565diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
43566index 6b22938..bc9700e 100644
43567--- a/drivers/platform/x86/msi-laptop.c
43568+++ b/drivers/platform/x86/msi-laptop.c
43569@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
43570
43571 if (!quirks->ec_read_only) {
43572 /* allow userland write sysfs file */
43573- dev_attr_bluetooth.store = store_bluetooth;
43574- dev_attr_wlan.store = store_wlan;
43575- dev_attr_threeg.store = store_threeg;
43576- dev_attr_bluetooth.attr.mode |= S_IWUSR;
43577- dev_attr_wlan.attr.mode |= S_IWUSR;
43578- dev_attr_threeg.attr.mode |= S_IWUSR;
43579+ pax_open_kernel();
43580+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
43581+ *(void **)&dev_attr_wlan.store = store_wlan;
43582+ *(void **)&dev_attr_threeg.store = store_threeg;
43583+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
43584+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
43585+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
43586+ pax_close_kernel();
43587 }
43588
43589 /* disable hardware control by fn key */
43590diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
43591index 2ac045f..39c443d 100644
43592--- a/drivers/platform/x86/sony-laptop.c
43593+++ b/drivers/platform/x86/sony-laptop.c
43594@@ -2483,7 +2483,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
43595 }
43596
43597 /* High speed charging function */
43598-static struct device_attribute *hsc_handle;
43599+static device_attribute_no_const *hsc_handle;
43600
43601 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
43602 struct device_attribute *attr,
43603diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
43604index 54d31c0..3f896d3 100644
43605--- a/drivers/platform/x86/thinkpad_acpi.c
43606+++ b/drivers/platform/x86/thinkpad_acpi.c
43607@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
43608 return 0;
43609 }
43610
43611-void static hotkey_mask_warn_incomplete_mask(void)
43612+static void hotkey_mask_warn_incomplete_mask(void)
43613 {
43614 /* log only what the user can fix... */
43615 const u32 wantedmask = hotkey_driver_mask &
43616@@ -2324,11 +2324,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
43617 }
43618 }
43619
43620-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43621- struct tp_nvram_state *newn,
43622- const u32 event_mask)
43623-{
43624-
43625 #define TPACPI_COMPARE_KEY(__scancode, __member) \
43626 do { \
43627 if ((event_mask & (1 << __scancode)) && \
43628@@ -2342,36 +2337,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43629 tpacpi_hotkey_send_key(__scancode); \
43630 } while (0)
43631
43632- void issue_volchange(const unsigned int oldvol,
43633- const unsigned int newvol)
43634- {
43635- unsigned int i = oldvol;
43636+static void issue_volchange(const unsigned int oldvol,
43637+ const unsigned int newvol,
43638+ const u32 event_mask)
43639+{
43640+ unsigned int i = oldvol;
43641
43642- while (i > newvol) {
43643- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
43644- i--;
43645- }
43646- while (i < newvol) {
43647- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
43648- i++;
43649- }
43650+ while (i > newvol) {
43651+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
43652+ i--;
43653 }
43654+ while (i < newvol) {
43655+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
43656+ i++;
43657+ }
43658+}
43659
43660- void issue_brightnesschange(const unsigned int oldbrt,
43661- const unsigned int newbrt)
43662- {
43663- unsigned int i = oldbrt;
43664+static void issue_brightnesschange(const unsigned int oldbrt,
43665+ const unsigned int newbrt,
43666+ const u32 event_mask)
43667+{
43668+ unsigned int i = oldbrt;
43669
43670- while (i > newbrt) {
43671- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
43672- i--;
43673- }
43674- while (i < newbrt) {
43675- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
43676- i++;
43677- }
43678+ while (i > newbrt) {
43679+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
43680+ i--;
43681+ }
43682+ while (i < newbrt) {
43683+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
43684+ i++;
43685 }
43686+}
43687
43688+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43689+ struct tp_nvram_state *newn,
43690+ const u32 event_mask)
43691+{
43692 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
43693 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
43694 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
43695@@ -2405,7 +2406,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43696 oldn->volume_level != newn->volume_level) {
43697 /* recently muted, or repeated mute keypress, or
43698 * multiple presses ending in mute */
43699- issue_volchange(oldn->volume_level, newn->volume_level);
43700+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
43701 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
43702 }
43703 } else {
43704@@ -2415,7 +2416,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43705 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
43706 }
43707 if (oldn->volume_level != newn->volume_level) {
43708- issue_volchange(oldn->volume_level, newn->volume_level);
43709+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
43710 } else if (oldn->volume_toggle != newn->volume_toggle) {
43711 /* repeated vol up/down keypress at end of scale ? */
43712 if (newn->volume_level == 0)
43713@@ -2428,7 +2429,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43714 /* handle brightness */
43715 if (oldn->brightness_level != newn->brightness_level) {
43716 issue_brightnesschange(oldn->brightness_level,
43717- newn->brightness_level);
43718+ newn->brightness_level,
43719+ event_mask);
43720 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
43721 /* repeated key presses that didn't change state */
43722 if (newn->brightness_level == 0)
43723@@ -2437,10 +2439,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
43724 && !tp_features.bright_unkfw)
43725 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
43726 }
43727+}
43728
43729 #undef TPACPI_COMPARE_KEY
43730 #undef TPACPI_MAY_SEND_KEY
43731-}
43732
43733 /*
43734 * Polling driver
43735diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
43736index 769d265..a3a05ca 100644
43737--- a/drivers/pnp/pnpbios/bioscalls.c
43738+++ b/drivers/pnp/pnpbios/bioscalls.c
43739@@ -58,7 +58,7 @@ do { \
43740 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
43741 } while(0)
43742
43743-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
43744+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
43745 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
43746
43747 /*
43748@@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
43749
43750 cpu = get_cpu();
43751 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
43752+
43753+ pax_open_kernel();
43754 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
43755+ pax_close_kernel();
43756
43757 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
43758 spin_lock_irqsave(&pnp_bios_lock, flags);
43759@@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
43760 :"memory");
43761 spin_unlock_irqrestore(&pnp_bios_lock, flags);
43762
43763+ pax_open_kernel();
43764 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
43765+ pax_close_kernel();
43766+
43767 put_cpu();
43768
43769 /* If we get here and this is set then the PnP BIOS faulted on us. */
43770@@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
43771 return status;
43772 }
43773
43774-void pnpbios_calls_init(union pnp_bios_install_struct *header)
43775+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
43776 {
43777 int i;
43778
43779@@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
43780 pnp_bios_callpoint.offset = header->fields.pm16offset;
43781 pnp_bios_callpoint.segment = PNP_CS16;
43782
43783+ pax_open_kernel();
43784+
43785 for_each_possible_cpu(i) {
43786 struct desc_struct *gdt = get_cpu_gdt_table(i);
43787 if (!gdt)
43788@@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
43789 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
43790 (unsigned long)__va(header->fields.pm16dseg));
43791 }
43792+
43793+ pax_close_kernel();
43794 }
43795diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
43796index 3e6db1c..1fbbdae 100644
43797--- a/drivers/pnp/resource.c
43798+++ b/drivers/pnp/resource.c
43799@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
43800 return 1;
43801
43802 /* check if the resource is valid */
43803- if (*irq < 0 || *irq > 15)
43804+ if (*irq > 15)
43805 return 0;
43806
43807 /* check if the resource is reserved */
43808@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
43809 return 1;
43810
43811 /* check if the resource is valid */
43812- if (*dma < 0 || *dma == 4 || *dma > 7)
43813+ if (*dma == 4 || *dma > 7)
43814 return 0;
43815
43816 /* check if the resource is reserved */
43817diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
43818index 0c52e2a..3421ab7 100644
43819--- a/drivers/power/pda_power.c
43820+++ b/drivers/power/pda_power.c
43821@@ -37,7 +37,11 @@ static int polling;
43822
43823 #if IS_ENABLED(CONFIG_USB_PHY)
43824 static struct usb_phy *transceiver;
43825-static struct notifier_block otg_nb;
43826+static int otg_handle_notification(struct notifier_block *nb,
43827+ unsigned long event, void *unused);
43828+static struct notifier_block otg_nb = {
43829+ .notifier_call = otg_handle_notification
43830+};
43831 #endif
43832
43833 static struct regulator *ac_draw;
43834@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
43835
43836 #if IS_ENABLED(CONFIG_USB_PHY)
43837 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
43838- otg_nb.notifier_call = otg_handle_notification;
43839 ret = usb_register_notifier(transceiver, &otg_nb);
43840 if (ret) {
43841 dev_err(dev, "failure to register otg notifier\n");
43842diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
43843index cc439fd..8fa30df 100644
43844--- a/drivers/power/power_supply.h
43845+++ b/drivers/power/power_supply.h
43846@@ -16,12 +16,12 @@ struct power_supply;
43847
43848 #ifdef CONFIG_SYSFS
43849
43850-extern void power_supply_init_attrs(struct device_type *dev_type);
43851+extern void power_supply_init_attrs(void);
43852 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
43853
43854 #else
43855
43856-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
43857+static inline void power_supply_init_attrs(void) {}
43858 #define power_supply_uevent NULL
43859
43860 #endif /* CONFIG_SYSFS */
43861diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
43862index 1c517c3..ffa2f17 100644
43863--- a/drivers/power/power_supply_core.c
43864+++ b/drivers/power/power_supply_core.c
43865@@ -24,7 +24,10 @@
43866 struct class *power_supply_class;
43867 EXPORT_SYMBOL_GPL(power_supply_class);
43868
43869-static struct device_type power_supply_dev_type;
43870+extern const struct attribute_group *power_supply_attr_groups[];
43871+static struct device_type power_supply_dev_type = {
43872+ .groups = power_supply_attr_groups,
43873+};
43874
43875 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
43876 struct power_supply *supply)
43877@@ -554,7 +557,7 @@ static int __init power_supply_class_init(void)
43878 return PTR_ERR(power_supply_class);
43879
43880 power_supply_class->dev_uevent = power_supply_uevent;
43881- power_supply_init_attrs(&power_supply_dev_type);
43882+ power_supply_init_attrs();
43883
43884 return 0;
43885 }
43886diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
43887index 29178f7..c65f324 100644
43888--- a/drivers/power/power_supply_sysfs.c
43889+++ b/drivers/power/power_supply_sysfs.c
43890@@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
43891 .is_visible = power_supply_attr_is_visible,
43892 };
43893
43894-static const struct attribute_group *power_supply_attr_groups[] = {
43895+const struct attribute_group *power_supply_attr_groups[] = {
43896 &power_supply_attr_group,
43897 NULL,
43898 };
43899
43900-void power_supply_init_attrs(struct device_type *dev_type)
43901+void power_supply_init_attrs(void)
43902 {
43903 int i;
43904
43905- dev_type->groups = power_supply_attr_groups;
43906-
43907 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
43908 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
43909 }
43910diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
43911index d428ef9..fdc0357 100644
43912--- a/drivers/regulator/max8660.c
43913+++ b/drivers/regulator/max8660.c
43914@@ -333,8 +333,10 @@ static int max8660_probe(struct i2c_client *client,
43915 max8660->shadow_regs[MAX8660_OVER1] = 5;
43916 } else {
43917 /* Otherwise devices can be toggled via software */
43918- max8660_dcdc_ops.enable = max8660_dcdc_enable;
43919- max8660_dcdc_ops.disable = max8660_dcdc_disable;
43920+ pax_open_kernel();
43921+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
43922+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
43923+ pax_close_kernel();
43924 }
43925
43926 /*
43927diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
43928index adb1414..c13e0ce 100644
43929--- a/drivers/regulator/max8973-regulator.c
43930+++ b/drivers/regulator/max8973-regulator.c
43931@@ -401,9 +401,11 @@ static int max8973_probe(struct i2c_client *client,
43932 if (!pdata->enable_ext_control) {
43933 max->desc.enable_reg = MAX8973_VOUT;
43934 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
43935- max8973_dcdc_ops.enable = regulator_enable_regmap;
43936- max8973_dcdc_ops.disable = regulator_disable_regmap;
43937- max8973_dcdc_ops.is_enabled = regulator_is_enabled_regmap;
43938+ pax_open_kernel();
43939+ *(void **)&max8973_dcdc_ops.enable = regulator_enable_regmap;
43940+ *(void **)&max8973_dcdc_ops.disable = regulator_disable_regmap;
43941+ *(void **)&max8973_dcdc_ops.is_enabled = regulator_is_enabled_regmap;
43942+ pax_close_kernel();
43943 }
43944
43945 max->enable_external_control = pdata->enable_ext_control;
43946diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
43947index b716283..3cc4349 100644
43948--- a/drivers/regulator/mc13892-regulator.c
43949+++ b/drivers/regulator/mc13892-regulator.c
43950@@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
43951 }
43952 mc13xxx_unlock(mc13892);
43953
43954- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
43955+ pax_open_kernel();
43956+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
43957 = mc13892_vcam_set_mode;
43958- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
43959+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
43960 = mc13892_vcam_get_mode;
43961+ pax_close_kernel();
43962
43963 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
43964 ARRAY_SIZE(mc13892_regulators));
43965diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
43966index f1cb706..4c7832a 100644
43967--- a/drivers/rtc/rtc-cmos.c
43968+++ b/drivers/rtc/rtc-cmos.c
43969@@ -724,7 +724,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
43970 hpet_rtc_timer_init();
43971
43972 /* export at least the first block of NVRAM */
43973- nvram.size = address_space - NVRAM_OFFSET;
43974+ pax_open_kernel();
43975+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
43976+ pax_close_kernel();
43977 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
43978 if (retval < 0) {
43979 dev_dbg(dev, "can't create nvram file? %d\n", retval);
43980diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
43981index d049393..bb20be0 100644
43982--- a/drivers/rtc/rtc-dev.c
43983+++ b/drivers/rtc/rtc-dev.c
43984@@ -16,6 +16,7 @@
43985 #include <linux/module.h>
43986 #include <linux/rtc.h>
43987 #include <linux/sched.h>
43988+#include <linux/grsecurity.h>
43989 #include "rtc-core.h"
43990
43991 static dev_t rtc_devt;
43992@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
43993 if (copy_from_user(&tm, uarg, sizeof(tm)))
43994 return -EFAULT;
43995
43996+ gr_log_timechange();
43997+
43998 return rtc_set_time(rtc, &tm);
43999
44000 case RTC_PIE_ON:
44001diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
44002index b53992a..776df84 100644
44003--- a/drivers/rtc/rtc-ds1307.c
44004+++ b/drivers/rtc/rtc-ds1307.c
44005@@ -107,7 +107,7 @@ struct ds1307 {
44006 u8 offset; /* register's offset */
44007 u8 regs[11];
44008 u16 nvram_offset;
44009- struct bin_attribute *nvram;
44010+ bin_attribute_no_const *nvram;
44011 enum ds_type type;
44012 unsigned long flags;
44013 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
44014diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
44015index 130f29a..6179d03 100644
44016--- a/drivers/rtc/rtc-m48t59.c
44017+++ b/drivers/rtc/rtc-m48t59.c
44018@@ -482,7 +482,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
44019 goto out;
44020 }
44021
44022- m48t59_nvram_attr.size = pdata->offset;
44023+ pax_open_kernel();
44024+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
44025+ pax_close_kernel();
44026
44027 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
44028 if (ret) {
44029diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
44030index e693af6..2e525b6 100644
44031--- a/drivers/scsi/bfa/bfa_fcpim.h
44032+++ b/drivers/scsi/bfa/bfa_fcpim.h
44033@@ -36,7 +36,7 @@ struct bfa_iotag_s {
44034
44035 struct bfa_itn_s {
44036 bfa_isr_func_t isr;
44037-};
44038+} __no_const;
44039
44040 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
44041 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
44042diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
44043index 23a90e7..9cf04ee 100644
44044--- a/drivers/scsi/bfa/bfa_ioc.h
44045+++ b/drivers/scsi/bfa/bfa_ioc.h
44046@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
44047 bfa_ioc_disable_cbfn_t disable_cbfn;
44048 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
44049 bfa_ioc_reset_cbfn_t reset_cbfn;
44050-};
44051+} __no_const;
44052
44053 /*
44054 * IOC event notification mechanism.
44055@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
44056 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
44057 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
44058 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
44059-};
44060+} __no_const;
44061
44062 /*
44063 * Queue element to wait for room in request queue. FIFO order is
44064diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
44065index df0c3c7..b00e1d0 100644
44066--- a/drivers/scsi/hosts.c
44067+++ b/drivers/scsi/hosts.c
44068@@ -42,7 +42,7 @@
44069 #include "scsi_logging.h"
44070
44071
44072-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
44073+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
44074
44075
44076 static void scsi_host_cls_release(struct device *dev)
44077@@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
44078 * subtract one because we increment first then return, but we need to
44079 * know what the next host number was before increment
44080 */
44081- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
44082+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
44083 shost->dma_channel = 0xff;
44084
44085 /* These three are default values which can be overridden */
44086diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
44087index 7f4f790..b75b92a 100644
44088--- a/drivers/scsi/hpsa.c
44089+++ b/drivers/scsi/hpsa.c
44090@@ -554,7 +554,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
44091 unsigned long flags;
44092
44093 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
44094- return h->access.command_completed(h, q);
44095+ return h->access->command_completed(h, q);
44096
44097 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
44098 a = rq->head[rq->current_entry];
44099@@ -3422,7 +3422,7 @@ static void start_io(struct ctlr_info *h)
44100 while (!list_empty(&h->reqQ)) {
44101 c = list_entry(h->reqQ.next, struct CommandList, list);
44102 /* can't do anything if fifo is full */
44103- if ((h->access.fifo_full(h))) {
44104+ if ((h->access->fifo_full(h))) {
44105 dev_warn(&h->pdev->dev, "fifo full\n");
44106 break;
44107 }
44108@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h)
44109
44110 /* Tell the controller execute command */
44111 spin_unlock_irqrestore(&h->lock, flags);
44112- h->access.submit_command(h, c);
44113+ h->access->submit_command(h, c);
44114 spin_lock_irqsave(&h->lock, flags);
44115 }
44116 spin_unlock_irqrestore(&h->lock, flags);
44117@@ -3452,17 +3452,17 @@ static void start_io(struct ctlr_info *h)
44118
44119 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
44120 {
44121- return h->access.command_completed(h, q);
44122+ return h->access->command_completed(h, q);
44123 }
44124
44125 static inline bool interrupt_pending(struct ctlr_info *h)
44126 {
44127- return h->access.intr_pending(h);
44128+ return h->access->intr_pending(h);
44129 }
44130
44131 static inline long interrupt_not_for_us(struct ctlr_info *h)
44132 {
44133- return (h->access.intr_pending(h) == 0) ||
44134+ return (h->access->intr_pending(h) == 0) ||
44135 (h->interrupts_enabled == 0);
44136 }
44137
44138@@ -4364,7 +4364,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
44139 if (prod_index < 0)
44140 return -ENODEV;
44141 h->product_name = products[prod_index].product_name;
44142- h->access = *(products[prod_index].access);
44143+ h->access = products[prod_index].access;
44144
44145 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
44146 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
44147@@ -4646,7 +4646,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
44148
44149 assert_spin_locked(&lockup_detector_lock);
44150 remove_ctlr_from_lockup_detector_list(h);
44151- h->access.set_intr_mask(h, HPSA_INTR_OFF);
44152+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
44153 spin_lock_irqsave(&h->lock, flags);
44154 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
44155 spin_unlock_irqrestore(&h->lock, flags);
44156@@ -4823,7 +4823,7 @@ reinit_after_soft_reset:
44157 }
44158
44159 /* make sure the board interrupts are off */
44160- h->access.set_intr_mask(h, HPSA_INTR_OFF);
44161+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
44162
44163 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
44164 goto clean2;
44165@@ -4857,7 +4857,7 @@ reinit_after_soft_reset:
44166 * fake ones to scoop up any residual completions.
44167 */
44168 spin_lock_irqsave(&h->lock, flags);
44169- h->access.set_intr_mask(h, HPSA_INTR_OFF);
44170+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
44171 spin_unlock_irqrestore(&h->lock, flags);
44172 free_irqs(h);
44173 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
44174@@ -4876,9 +4876,9 @@ reinit_after_soft_reset:
44175 dev_info(&h->pdev->dev, "Board READY.\n");
44176 dev_info(&h->pdev->dev,
44177 "Waiting for stale completions to drain.\n");
44178- h->access.set_intr_mask(h, HPSA_INTR_ON);
44179+ h->access->set_intr_mask(h, HPSA_INTR_ON);
44180 msleep(10000);
44181- h->access.set_intr_mask(h, HPSA_INTR_OFF);
44182+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
44183
44184 rc = controller_reset_failed(h->cfgtable);
44185 if (rc)
44186@@ -4899,7 +4899,7 @@ reinit_after_soft_reset:
44187 }
44188
44189 /* Turn the interrupts on so we can service requests */
44190- h->access.set_intr_mask(h, HPSA_INTR_ON);
44191+ h->access->set_intr_mask(h, HPSA_INTR_ON);
44192
44193 hpsa_hba_inquiry(h);
44194 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
44195@@ -4954,7 +4954,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
44196 * To write all data in the battery backed cache to disks
44197 */
44198 hpsa_flush_cache(h);
44199- h->access.set_intr_mask(h, HPSA_INTR_OFF);
44200+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
44201 hpsa_free_irqs_and_disable_msix(h);
44202 }
44203
44204@@ -5122,7 +5122,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
44205 return;
44206 }
44207 /* Change the access methods to the performant access methods */
44208- h->access = SA5_performant_access;
44209+ h->access = &SA5_performant_access;
44210 h->transMethod = CFGTBL_Trans_Performant;
44211 }
44212
44213diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
44214index 9816479..c5d4e97 100644
44215--- a/drivers/scsi/hpsa.h
44216+++ b/drivers/scsi/hpsa.h
44217@@ -79,7 +79,7 @@ struct ctlr_info {
44218 unsigned int msix_vector;
44219 unsigned int msi_vector;
44220 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
44221- struct access_method access;
44222+ struct access_method *access;
44223
44224 /* queue and queue Info */
44225 struct list_head reqQ;
44226diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
44227index 8b928c6..9c76300 100644
44228--- a/drivers/scsi/libfc/fc_exch.c
44229+++ b/drivers/scsi/libfc/fc_exch.c
44230@@ -100,12 +100,12 @@ struct fc_exch_mgr {
44231 u16 pool_max_index;
44232
44233 struct {
44234- atomic_t no_free_exch;
44235- atomic_t no_free_exch_xid;
44236- atomic_t xid_not_found;
44237- atomic_t xid_busy;
44238- atomic_t seq_not_found;
44239- atomic_t non_bls_resp;
44240+ atomic_unchecked_t no_free_exch;
44241+ atomic_unchecked_t no_free_exch_xid;
44242+ atomic_unchecked_t xid_not_found;
44243+ atomic_unchecked_t xid_busy;
44244+ atomic_unchecked_t seq_not_found;
44245+ atomic_unchecked_t non_bls_resp;
44246 } stats;
44247 };
44248
44249@@ -736,7 +736,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
44250 /* allocate memory for exchange */
44251 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
44252 if (!ep) {
44253- atomic_inc(&mp->stats.no_free_exch);
44254+ atomic_inc_unchecked(&mp->stats.no_free_exch);
44255 goto out;
44256 }
44257 memset(ep, 0, sizeof(*ep));
44258@@ -797,7 +797,7 @@ out:
44259 return ep;
44260 err:
44261 spin_unlock_bh(&pool->lock);
44262- atomic_inc(&mp->stats.no_free_exch_xid);
44263+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
44264 mempool_free(ep, mp->ep_pool);
44265 return NULL;
44266 }
44267@@ -940,7 +940,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
44268 xid = ntohs(fh->fh_ox_id); /* we originated exch */
44269 ep = fc_exch_find(mp, xid);
44270 if (!ep) {
44271- atomic_inc(&mp->stats.xid_not_found);
44272+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44273 reject = FC_RJT_OX_ID;
44274 goto out;
44275 }
44276@@ -970,7 +970,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
44277 ep = fc_exch_find(mp, xid);
44278 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
44279 if (ep) {
44280- atomic_inc(&mp->stats.xid_busy);
44281+ atomic_inc_unchecked(&mp->stats.xid_busy);
44282 reject = FC_RJT_RX_ID;
44283 goto rel;
44284 }
44285@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
44286 }
44287 xid = ep->xid; /* get our XID */
44288 } else if (!ep) {
44289- atomic_inc(&mp->stats.xid_not_found);
44290+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44291 reject = FC_RJT_RX_ID; /* XID not found */
44292 goto out;
44293 }
44294@@ -998,7 +998,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
44295 } else {
44296 sp = &ep->seq;
44297 if (sp->id != fh->fh_seq_id) {
44298- atomic_inc(&mp->stats.seq_not_found);
44299+ atomic_inc_unchecked(&mp->stats.seq_not_found);
44300 if (f_ctl & FC_FC_END_SEQ) {
44301 /*
44302 * Update sequence_id based on incoming last
44303@@ -1448,22 +1448,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
44304
44305 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
44306 if (!ep) {
44307- atomic_inc(&mp->stats.xid_not_found);
44308+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44309 goto out;
44310 }
44311 if (ep->esb_stat & ESB_ST_COMPLETE) {
44312- atomic_inc(&mp->stats.xid_not_found);
44313+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44314 goto rel;
44315 }
44316 if (ep->rxid == FC_XID_UNKNOWN)
44317 ep->rxid = ntohs(fh->fh_rx_id);
44318 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
44319- atomic_inc(&mp->stats.xid_not_found);
44320+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44321 goto rel;
44322 }
44323 if (ep->did != ntoh24(fh->fh_s_id) &&
44324 ep->did != FC_FID_FLOGI) {
44325- atomic_inc(&mp->stats.xid_not_found);
44326+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44327 goto rel;
44328 }
44329 sof = fr_sof(fp);
44330@@ -1472,7 +1472,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
44331 sp->ssb_stat |= SSB_ST_RESP;
44332 sp->id = fh->fh_seq_id;
44333 } else if (sp->id != fh->fh_seq_id) {
44334- atomic_inc(&mp->stats.seq_not_found);
44335+ atomic_inc_unchecked(&mp->stats.seq_not_found);
44336 goto rel;
44337 }
44338
44339@@ -1536,9 +1536,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
44340 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
44341
44342 if (!sp)
44343- atomic_inc(&mp->stats.xid_not_found);
44344+ atomic_inc_unchecked(&mp->stats.xid_not_found);
44345 else
44346- atomic_inc(&mp->stats.non_bls_resp);
44347+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
44348
44349 fc_frame_free(fp);
44350 }
44351@@ -2185,13 +2185,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
44352
44353 list_for_each_entry(ema, &lport->ema_list, ema_list) {
44354 mp = ema->mp;
44355- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
44356+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
44357 st->fc_no_free_exch_xid +=
44358- atomic_read(&mp->stats.no_free_exch_xid);
44359- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
44360- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
44361- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
44362- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
44363+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
44364+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
44365+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
44366+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
44367+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
44368 }
44369 }
44370 EXPORT_SYMBOL(fc_exch_update_stats);
44371diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
44372index 161c98e..6d563b3 100644
44373--- a/drivers/scsi/libsas/sas_ata.c
44374+++ b/drivers/scsi/libsas/sas_ata.c
44375@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
44376 .postreset = ata_std_postreset,
44377 .error_handler = ata_std_error_handler,
44378 .post_internal_cmd = sas_ata_post_internal,
44379- .qc_defer = ata_std_qc_defer,
44380+ .qc_defer = ata_std_qc_defer,
44381 .qc_prep = ata_noop_qc_prep,
44382 .qc_issue = sas_ata_qc_issue,
44383 .qc_fill_rtf = sas_ata_qc_fill_rtf,
44384diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
44385index bcc56ca..6f4174a 100644
44386--- a/drivers/scsi/lpfc/lpfc.h
44387+++ b/drivers/scsi/lpfc/lpfc.h
44388@@ -431,7 +431,7 @@ struct lpfc_vport {
44389 struct dentry *debug_nodelist;
44390 struct dentry *vport_debugfs_root;
44391 struct lpfc_debugfs_trc *disc_trc;
44392- atomic_t disc_trc_cnt;
44393+ atomic_unchecked_t disc_trc_cnt;
44394 #endif
44395 uint8_t stat_data_enabled;
44396 uint8_t stat_data_blocked;
44397@@ -865,8 +865,8 @@ struct lpfc_hba {
44398 struct timer_list fabric_block_timer;
44399 unsigned long bit_flags;
44400 #define FABRIC_COMANDS_BLOCKED 0
44401- atomic_t num_rsrc_err;
44402- atomic_t num_cmd_success;
44403+ atomic_unchecked_t num_rsrc_err;
44404+ atomic_unchecked_t num_cmd_success;
44405 unsigned long last_rsrc_error_time;
44406 unsigned long last_ramp_down_time;
44407 unsigned long last_ramp_up_time;
44408@@ -902,7 +902,7 @@ struct lpfc_hba {
44409
44410 struct dentry *debug_slow_ring_trc;
44411 struct lpfc_debugfs_trc *slow_ring_trc;
44412- atomic_t slow_ring_trc_cnt;
44413+ atomic_unchecked_t slow_ring_trc_cnt;
44414 /* iDiag debugfs sub-directory */
44415 struct dentry *idiag_root;
44416 struct dentry *idiag_pci_cfg;
44417diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
44418index f525ecb..32549a4 100644
44419--- a/drivers/scsi/lpfc/lpfc_debugfs.c
44420+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
44421@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
44422
44423 #include <linux/debugfs.h>
44424
44425-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
44426+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
44427 static unsigned long lpfc_debugfs_start_time = 0L;
44428
44429 /* iDiag */
44430@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
44431 lpfc_debugfs_enable = 0;
44432
44433 len = 0;
44434- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
44435+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
44436 (lpfc_debugfs_max_disc_trc - 1);
44437 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
44438 dtp = vport->disc_trc + i;
44439@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
44440 lpfc_debugfs_enable = 0;
44441
44442 len = 0;
44443- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
44444+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
44445 (lpfc_debugfs_max_slow_ring_trc - 1);
44446 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
44447 dtp = phba->slow_ring_trc + i;
44448@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
44449 !vport || !vport->disc_trc)
44450 return;
44451
44452- index = atomic_inc_return(&vport->disc_trc_cnt) &
44453+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
44454 (lpfc_debugfs_max_disc_trc - 1);
44455 dtp = vport->disc_trc + index;
44456 dtp->fmt = fmt;
44457 dtp->data1 = data1;
44458 dtp->data2 = data2;
44459 dtp->data3 = data3;
44460- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
44461+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
44462 dtp->jif = jiffies;
44463 #endif
44464 return;
44465@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
44466 !phba || !phba->slow_ring_trc)
44467 return;
44468
44469- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
44470+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
44471 (lpfc_debugfs_max_slow_ring_trc - 1);
44472 dtp = phba->slow_ring_trc + index;
44473 dtp->fmt = fmt;
44474 dtp->data1 = data1;
44475 dtp->data2 = data2;
44476 dtp->data3 = data3;
44477- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
44478+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
44479 dtp->jif = jiffies;
44480 #endif
44481 return;
44482@@ -4182,7 +4182,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
44483 "slow_ring buffer\n");
44484 goto debug_failed;
44485 }
44486- atomic_set(&phba->slow_ring_trc_cnt, 0);
44487+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
44488 memset(phba->slow_ring_trc, 0,
44489 (sizeof(struct lpfc_debugfs_trc) *
44490 lpfc_debugfs_max_slow_ring_trc));
44491@@ -4228,7 +4228,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
44492 "buffer\n");
44493 goto debug_failed;
44494 }
44495- atomic_set(&vport->disc_trc_cnt, 0);
44496+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
44497
44498 snprintf(name, sizeof(name), "discovery_trace");
44499 vport->debug_disc_trc =
44500diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
44501index cb465b2..2e7b25f 100644
44502--- a/drivers/scsi/lpfc/lpfc_init.c
44503+++ b/drivers/scsi/lpfc/lpfc_init.c
44504@@ -10950,8 +10950,10 @@ lpfc_init(void)
44505 "misc_register returned with status %d", error);
44506
44507 if (lpfc_enable_npiv) {
44508- lpfc_transport_functions.vport_create = lpfc_vport_create;
44509- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
44510+ pax_open_kernel();
44511+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
44512+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
44513+ pax_close_kernel();
44514 }
44515 lpfc_transport_template =
44516 fc_attach_transport(&lpfc_transport_functions);
44517diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
44518index 8523b278e..ce1d812 100644
44519--- a/drivers/scsi/lpfc/lpfc_scsi.c
44520+++ b/drivers/scsi/lpfc/lpfc_scsi.c
44521@@ -331,7 +331,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
44522 uint32_t evt_posted;
44523
44524 spin_lock_irqsave(&phba->hbalock, flags);
44525- atomic_inc(&phba->num_rsrc_err);
44526+ atomic_inc_unchecked(&phba->num_rsrc_err);
44527 phba->last_rsrc_error_time = jiffies;
44528
44529 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
44530@@ -372,7 +372,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
44531 unsigned long flags;
44532 struct lpfc_hba *phba = vport->phba;
44533 uint32_t evt_posted;
44534- atomic_inc(&phba->num_cmd_success);
44535+ atomic_inc_unchecked(&phba->num_cmd_success);
44536
44537 if (vport->cfg_lun_queue_depth <= queue_depth)
44538 return;
44539@@ -416,8 +416,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
44540 unsigned long num_rsrc_err, num_cmd_success;
44541 int i;
44542
44543- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
44544- num_cmd_success = atomic_read(&phba->num_cmd_success);
44545+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
44546+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
44547
44548 /*
44549 * The error and success command counters are global per
44550@@ -445,8 +445,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
44551 }
44552 }
44553 lpfc_destroy_vport_work_array(phba, vports);
44554- atomic_set(&phba->num_rsrc_err, 0);
44555- atomic_set(&phba->num_cmd_success, 0);
44556+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
44557+ atomic_set_unchecked(&phba->num_cmd_success, 0);
44558 }
44559
44560 /**
44561@@ -480,8 +480,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
44562 }
44563 }
44564 lpfc_destroy_vport_work_array(phba, vports);
44565- atomic_set(&phba->num_rsrc_err, 0);
44566- atomic_set(&phba->num_cmd_success, 0);
44567+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
44568+ atomic_set_unchecked(&phba->num_cmd_success, 0);
44569 }
44570
44571 /**
44572diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
44573index 8e1b737..50ff510 100644
44574--- a/drivers/scsi/pmcraid.c
44575+++ b/drivers/scsi/pmcraid.c
44576@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
44577 res->scsi_dev = scsi_dev;
44578 scsi_dev->hostdata = res;
44579 res->change_detected = 0;
44580- atomic_set(&res->read_failures, 0);
44581- atomic_set(&res->write_failures, 0);
44582+ atomic_set_unchecked(&res->read_failures, 0);
44583+ atomic_set_unchecked(&res->write_failures, 0);
44584 rc = 0;
44585 }
44586 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
44587@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
44588
44589 /* If this was a SCSI read/write command keep count of errors */
44590 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
44591- atomic_inc(&res->read_failures);
44592+ atomic_inc_unchecked(&res->read_failures);
44593 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
44594- atomic_inc(&res->write_failures);
44595+ atomic_inc_unchecked(&res->write_failures);
44596
44597 if (!RES_IS_GSCSI(res->cfg_entry) &&
44598 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
44599@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
44600 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
44601 * hrrq_id assigned here in queuecommand
44602 */
44603- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
44604+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
44605 pinstance->num_hrrq;
44606 cmd->cmd_done = pmcraid_io_done;
44607
44608@@ -3846,7 +3846,7 @@ static long pmcraid_ioctl_passthrough(
44609 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
44610 * hrrq_id assigned here in queuecommand
44611 */
44612- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
44613+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
44614 pinstance->num_hrrq;
44615
44616 if (request_size) {
44617@@ -4483,7 +4483,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
44618
44619 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
44620 /* add resources only after host is added into system */
44621- if (!atomic_read(&pinstance->expose_resources))
44622+ if (!atomic_read_unchecked(&pinstance->expose_resources))
44623 return;
44624
44625 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
44626@@ -5310,8 +5310,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
44627 init_waitqueue_head(&pinstance->reset_wait_q);
44628
44629 atomic_set(&pinstance->outstanding_cmds, 0);
44630- atomic_set(&pinstance->last_message_id, 0);
44631- atomic_set(&pinstance->expose_resources, 0);
44632+ atomic_set_unchecked(&pinstance->last_message_id, 0);
44633+ atomic_set_unchecked(&pinstance->expose_resources, 0);
44634
44635 INIT_LIST_HEAD(&pinstance->free_res_q);
44636 INIT_LIST_HEAD(&pinstance->used_res_q);
44637@@ -6024,7 +6024,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
44638 /* Schedule worker thread to handle CCN and take care of adding and
44639 * removing devices to OS
44640 */
44641- atomic_set(&pinstance->expose_resources, 1);
44642+ atomic_set_unchecked(&pinstance->expose_resources, 1);
44643 schedule_work(&pinstance->worker_q);
44644 return rc;
44645
44646diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
44647index e1d150f..6c6df44 100644
44648--- a/drivers/scsi/pmcraid.h
44649+++ b/drivers/scsi/pmcraid.h
44650@@ -748,7 +748,7 @@ struct pmcraid_instance {
44651 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
44652
44653 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
44654- atomic_t last_message_id;
44655+ atomic_unchecked_t last_message_id;
44656
44657 /* configuration table */
44658 struct pmcraid_config_table *cfg_table;
44659@@ -777,7 +777,7 @@ struct pmcraid_instance {
44660 atomic_t outstanding_cmds;
44661
44662 /* should add/delete resources to mid-layer now ?*/
44663- atomic_t expose_resources;
44664+ atomic_unchecked_t expose_resources;
44665
44666
44667
44668@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
44669 struct pmcraid_config_table_entry_ext cfg_entry_ext;
44670 };
44671 struct scsi_device *scsi_dev; /* Link scsi_device structure */
44672- atomic_t read_failures; /* count of failed READ commands */
44673- atomic_t write_failures; /* count of failed WRITE commands */
44674+ atomic_unchecked_t read_failures; /* count of failed READ commands */
44675+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
44676
44677 /* To indicate add/delete/modify during CCN */
44678 u8 change_detected;
44679diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
44680index bf60c63..74d4dce 100644
44681--- a/drivers/scsi/qla2xxx/qla_attr.c
44682+++ b/drivers/scsi/qla2xxx/qla_attr.c
44683@@ -2001,7 +2001,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
44684 return 0;
44685 }
44686
44687-struct fc_function_template qla2xxx_transport_functions = {
44688+fc_function_template_no_const qla2xxx_transport_functions = {
44689
44690 .show_host_node_name = 1,
44691 .show_host_port_name = 1,
44692@@ -2048,7 +2048,7 @@ struct fc_function_template qla2xxx_transport_functions = {
44693 .bsg_timeout = qla24xx_bsg_timeout,
44694 };
44695
44696-struct fc_function_template qla2xxx_transport_vport_functions = {
44697+fc_function_template_no_const qla2xxx_transport_vport_functions = {
44698
44699 .show_host_node_name = 1,
44700 .show_host_port_name = 1,
44701diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
44702index 026bfde..90c4018 100644
44703--- a/drivers/scsi/qla2xxx/qla_gbl.h
44704+++ b/drivers/scsi/qla2xxx/qla_gbl.h
44705@@ -528,8 +528,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
44706 struct device_attribute;
44707 extern struct device_attribute *qla2x00_host_attrs[];
44708 struct fc_function_template;
44709-extern struct fc_function_template qla2xxx_transport_functions;
44710-extern struct fc_function_template qla2xxx_transport_vport_functions;
44711+extern fc_function_template_no_const qla2xxx_transport_functions;
44712+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
44713 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
44714 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
44715 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
44716diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
44717index ad72c1d..afc9a98 100644
44718--- a/drivers/scsi/qla2xxx/qla_os.c
44719+++ b/drivers/scsi/qla2xxx/qla_os.c
44720@@ -1571,8 +1571,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
44721 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
44722 /* Ok, a 64bit DMA mask is applicable. */
44723 ha->flags.enable_64bit_addressing = 1;
44724- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
44725- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
44726+ pax_open_kernel();
44727+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
44728+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
44729+ pax_close_kernel();
44730 return;
44731 }
44732 }
44733diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
44734index ddf16a8..80f4dd0 100644
44735--- a/drivers/scsi/qla4xxx/ql4_def.h
44736+++ b/drivers/scsi/qla4xxx/ql4_def.h
44737@@ -291,7 +291,7 @@ struct ddb_entry {
44738 * (4000 only) */
44739 atomic_t relogin_timer; /* Max Time to wait for
44740 * relogin to complete */
44741- atomic_t relogin_retry_count; /* Num of times relogin has been
44742+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
44743 * retried */
44744 uint32_t default_time2wait; /* Default Min time between
44745 * relogins (+aens) */
44746diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
44747index 4d231c1..2892c37 100644
44748--- a/drivers/scsi/qla4xxx/ql4_os.c
44749+++ b/drivers/scsi/qla4xxx/ql4_os.c
44750@@ -2971,12 +2971,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
44751 */
44752 if (!iscsi_is_session_online(cls_sess)) {
44753 /* Reset retry relogin timer */
44754- atomic_inc(&ddb_entry->relogin_retry_count);
44755+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
44756 DEBUG2(ql4_printk(KERN_INFO, ha,
44757 "%s: index[%d] relogin timed out-retrying"
44758 " relogin (%d), retry (%d)\n", __func__,
44759 ddb_entry->fw_ddb_index,
44760- atomic_read(&ddb_entry->relogin_retry_count),
44761+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
44762 ddb_entry->default_time2wait + 4));
44763 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
44764 atomic_set(&ddb_entry->retry_relogin_timer,
44765@@ -5081,7 +5081,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
44766
44767 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
44768 atomic_set(&ddb_entry->relogin_timer, 0);
44769- atomic_set(&ddb_entry->relogin_retry_count, 0);
44770+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
44771 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
44772 ddb_entry->default_relogin_timeout =
44773 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
44774diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
44775index eaa808e..95f8841 100644
44776--- a/drivers/scsi/scsi.c
44777+++ b/drivers/scsi/scsi.c
44778@@ -661,7 +661,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
44779 unsigned long timeout;
44780 int rtn = 0;
44781
44782- atomic_inc(&cmd->device->iorequest_cnt);
44783+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
44784
44785 /* check if the device is still usable */
44786 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
44787diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
44788index 86d5220..f22c51a 100644
44789--- a/drivers/scsi/scsi_lib.c
44790+++ b/drivers/scsi/scsi_lib.c
44791@@ -1458,7 +1458,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
44792 shost = sdev->host;
44793 scsi_init_cmd_errh(cmd);
44794 cmd->result = DID_NO_CONNECT << 16;
44795- atomic_inc(&cmd->device->iorequest_cnt);
44796+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
44797
44798 /*
44799 * SCSI request completion path will do scsi_device_unbusy(),
44800@@ -1484,9 +1484,9 @@ static void scsi_softirq_done(struct request *rq)
44801
44802 INIT_LIST_HEAD(&cmd->eh_entry);
44803
44804- atomic_inc(&cmd->device->iodone_cnt);
44805+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
44806 if (cmd->result)
44807- atomic_inc(&cmd->device->ioerr_cnt);
44808+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
44809
44810 disposition = scsi_decide_disposition(cmd);
44811 if (disposition != SUCCESS &&
44812diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
44813index 931a7d9..0c2a754 100644
44814--- a/drivers/scsi/scsi_sysfs.c
44815+++ b/drivers/scsi/scsi_sysfs.c
44816@@ -658,7 +658,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
44817 char *buf) \
44818 { \
44819 struct scsi_device *sdev = to_scsi_device(dev); \
44820- unsigned long long count = atomic_read(&sdev->field); \
44821+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
44822 return snprintf(buf, 20, "0x%llx\n", count); \
44823 } \
44824 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
44825diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
44826index 84a1fdf..693b0d6 100644
44827--- a/drivers/scsi/scsi_tgt_lib.c
44828+++ b/drivers/scsi/scsi_tgt_lib.c
44829@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
44830 int err;
44831
44832 dprintk("%lx %u\n", uaddr, len);
44833- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
44834+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
44835 if (err) {
44836 /*
44837 * TODO: need to fixup sg_tablesize, max_segment_size,
44838diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
44839index e106c27..11a380e 100644
44840--- a/drivers/scsi/scsi_transport_fc.c
44841+++ b/drivers/scsi/scsi_transport_fc.c
44842@@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
44843 * Netlink Infrastructure
44844 */
44845
44846-static atomic_t fc_event_seq;
44847+static atomic_unchecked_t fc_event_seq;
44848
44849 /**
44850 * fc_get_event_number - Obtain the next sequential FC event number
44851@@ -510,7 +510,7 @@ static atomic_t fc_event_seq;
44852 u32
44853 fc_get_event_number(void)
44854 {
44855- return atomic_add_return(1, &fc_event_seq);
44856+ return atomic_add_return_unchecked(1, &fc_event_seq);
44857 }
44858 EXPORT_SYMBOL(fc_get_event_number);
44859
44860@@ -654,7 +654,7 @@ static __init int fc_transport_init(void)
44861 {
44862 int error;
44863
44864- atomic_set(&fc_event_seq, 0);
44865+ atomic_set_unchecked(&fc_event_seq, 0);
44866
44867 error = transport_class_register(&fc_host_class);
44868 if (error)
44869@@ -844,7 +844,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
44870 char *cp;
44871
44872 *val = simple_strtoul(buf, &cp, 0);
44873- if ((*cp && (*cp != '\n')) || (*val < 0))
44874+ if (*cp && (*cp != '\n'))
44875 return -EINVAL;
44876 /*
44877 * Check for overflow; dev_loss_tmo is u32
44878diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
44879index 133926b..903000d 100644
44880--- a/drivers/scsi/scsi_transport_iscsi.c
44881+++ b/drivers/scsi/scsi_transport_iscsi.c
44882@@ -80,7 +80,7 @@ struct iscsi_internal {
44883 struct transport_container session_cont;
44884 };
44885
44886-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
44887+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
44888 static struct workqueue_struct *iscsi_eh_timer_workq;
44889
44890 static DEFINE_IDA(iscsi_sess_ida);
44891@@ -1738,7 +1738,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
44892 int err;
44893
44894 ihost = shost->shost_data;
44895- session->sid = atomic_add_return(1, &iscsi_session_nr);
44896+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
44897
44898 if (target_id == ISCSI_MAX_TARGET) {
44899 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
44900@@ -3944,7 +3944,7 @@ static __init int iscsi_transport_init(void)
44901 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
44902 ISCSI_TRANSPORT_VERSION);
44903
44904- atomic_set(&iscsi_session_nr, 0);
44905+ atomic_set_unchecked(&iscsi_session_nr, 0);
44906
44907 err = class_register(&iscsi_transport_class);
44908 if (err)
44909diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
44910index f379c7f..e8fc69c 100644
44911--- a/drivers/scsi/scsi_transport_srp.c
44912+++ b/drivers/scsi/scsi_transport_srp.c
44913@@ -33,7 +33,7 @@
44914 #include "scsi_transport_srp_internal.h"
44915
44916 struct srp_host_attrs {
44917- atomic_t next_port_id;
44918+ atomic_unchecked_t next_port_id;
44919 };
44920 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
44921
44922@@ -61,7 +61,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
44923 struct Scsi_Host *shost = dev_to_shost(dev);
44924 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
44925
44926- atomic_set(&srp_host->next_port_id, 0);
44927+ atomic_set_unchecked(&srp_host->next_port_id, 0);
44928 return 0;
44929 }
44930
44931@@ -210,7 +210,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
44932 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
44933 rport->roles = ids->roles;
44934
44935- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
44936+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
44937 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
44938
44939 transport_setup_device(&rport->dev);
44940diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
44941index 610417e..1544fa9 100644
44942--- a/drivers/scsi/sd.c
44943+++ b/drivers/scsi/sd.c
44944@@ -2928,7 +2928,7 @@ static int sd_probe(struct device *dev)
44945 sdkp->disk = gd;
44946 sdkp->index = index;
44947 atomic_set(&sdkp->openers, 0);
44948- atomic_set(&sdkp->device->ioerr_cnt, 0);
44949+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
44950
44951 if (!sdp->request_queue->rq_timeout) {
44952 if (sdp->type != TYPE_MOD)
44953diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
44954index df5e961..df6b97f 100644
44955--- a/drivers/scsi/sg.c
44956+++ b/drivers/scsi/sg.c
44957@@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
44958 sdp->disk->disk_name,
44959 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
44960 NULL,
44961- (char *)arg);
44962+ (char __user *)arg);
44963 case BLKTRACESTART:
44964 return blk_trace_startstop(sdp->device->request_queue, 1);
44965 case BLKTRACESTOP:
44966diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
44967index 32b7bb1..2f1c4bd 100644
44968--- a/drivers/spi/spi.c
44969+++ b/drivers/spi/spi.c
44970@@ -1631,7 +1631,7 @@ int spi_bus_unlock(struct spi_master *master)
44971 EXPORT_SYMBOL_GPL(spi_bus_unlock);
44972
44973 /* portable code must never pass more than 32 bytes */
44974-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
44975+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
44976
44977 static u8 *buf;
44978
44979diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
44980index 3675020..e80d92c 100644
44981--- a/drivers/staging/media/solo6x10/solo6x10-core.c
44982+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
44983@@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
44984
44985 static int solo_sysfs_init(struct solo_dev *solo_dev)
44986 {
44987- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
44988+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
44989 struct device *dev = &solo_dev->dev;
44990 const char *driver;
44991 int i;
44992diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
44993index 34afc16..ffe44dd 100644
44994--- a/drivers/staging/octeon/ethernet-rx.c
44995+++ b/drivers/staging/octeon/ethernet-rx.c
44996@@ -421,11 +421,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
44997 /* Increment RX stats for virtual ports */
44998 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
44999 #ifdef CONFIG_64BIT
45000- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
45001- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
45002+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
45003+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
45004 #else
45005- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
45006- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
45007+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
45008+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
45009 #endif
45010 }
45011 netif_receive_skb(skb);
45012@@ -437,9 +437,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
45013 dev->name);
45014 */
45015 #ifdef CONFIG_64BIT
45016- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
45017+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
45018 #else
45019- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
45020+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
45021 #endif
45022 dev_kfree_skb_irq(skb);
45023 }
45024diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
45025index c3a90e7..023619a 100644
45026--- a/drivers/staging/octeon/ethernet.c
45027+++ b/drivers/staging/octeon/ethernet.c
45028@@ -252,11 +252,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
45029 * since the RX tasklet also increments it.
45030 */
45031 #ifdef CONFIG_64BIT
45032- atomic64_add(rx_status.dropped_packets,
45033- (atomic64_t *)&priv->stats.rx_dropped);
45034+ atomic64_add_unchecked(rx_status.dropped_packets,
45035+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
45036 #else
45037- atomic_add(rx_status.dropped_packets,
45038- (atomic_t *)&priv->stats.rx_dropped);
45039+ atomic_add_unchecked(rx_status.dropped_packets,
45040+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
45041 #endif
45042 }
45043
45044diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
45045index dc23395..cf7e9b1 100644
45046--- a/drivers/staging/rtl8712/rtl871x_io.h
45047+++ b/drivers/staging/rtl8712/rtl871x_io.h
45048@@ -108,7 +108,7 @@ struct _io_ops {
45049 u8 *pmem);
45050 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
45051 u8 *pmem);
45052-};
45053+} __no_const;
45054
45055 struct io_req {
45056 struct list_head list;
45057diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
45058index 1f5088b..0e59820 100644
45059--- a/drivers/staging/sbe-2t3e3/netdev.c
45060+++ b/drivers/staging/sbe-2t3e3/netdev.c
45061@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
45062 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
45063
45064 if (rlen)
45065- if (copy_to_user(data, &resp, rlen))
45066+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
45067 return -EFAULT;
45068
45069 return 0;
45070diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
45071index a863a98..d272795 100644
45072--- a/drivers/staging/usbip/vhci.h
45073+++ b/drivers/staging/usbip/vhci.h
45074@@ -83,7 +83,7 @@ struct vhci_hcd {
45075 unsigned resuming:1;
45076 unsigned long re_timeout;
45077
45078- atomic_t seqnum;
45079+ atomic_unchecked_t seqnum;
45080
45081 /*
45082 * NOTE:
45083diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
45084index d7974cb..d78076b 100644
45085--- a/drivers/staging/usbip/vhci_hcd.c
45086+++ b/drivers/staging/usbip/vhci_hcd.c
45087@@ -441,7 +441,7 @@ static void vhci_tx_urb(struct urb *urb)
45088
45089 spin_lock(&vdev->priv_lock);
45090
45091- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
45092+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
45093 if (priv->seqnum == 0xffff)
45094 dev_info(&urb->dev->dev, "seqnum max\n");
45095
45096@@ -687,7 +687,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
45097 return -ENOMEM;
45098 }
45099
45100- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
45101+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
45102 if (unlink->seqnum == 0xffff)
45103 pr_info("seqnum max\n");
45104
45105@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
45106 vdev->rhport = rhport;
45107 }
45108
45109- atomic_set(&vhci->seqnum, 0);
45110+ atomic_set_unchecked(&vhci->seqnum, 0);
45111 spin_lock_init(&vhci->lock);
45112
45113 hcd->power_budget = 0; /* no limit */
45114diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
45115index d07fcb5..358e1e1 100644
45116--- a/drivers/staging/usbip/vhci_rx.c
45117+++ b/drivers/staging/usbip/vhci_rx.c
45118@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
45119 if (!urb) {
45120 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
45121 pr_info("max seqnum %d\n",
45122- atomic_read(&the_controller->seqnum));
45123+ atomic_read_unchecked(&the_controller->seqnum));
45124 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
45125 return;
45126 }
45127diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
45128index 8417c2f..ef5ebd6 100644
45129--- a/drivers/staging/vt6655/hostap.c
45130+++ b/drivers/staging/vt6655/hostap.c
45131@@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
45132 *
45133 */
45134
45135+static net_device_ops_no_const apdev_netdev_ops;
45136+
45137 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
45138 {
45139 PSDevice apdev_priv;
45140 struct net_device *dev = pDevice->dev;
45141 int ret;
45142- const struct net_device_ops apdev_netdev_ops = {
45143- .ndo_start_xmit = pDevice->tx_80211,
45144- };
45145
45146 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
45147
45148@@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
45149 *apdev_priv = *pDevice;
45150 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
45151
45152+ /* only half broken now */
45153+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
45154 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
45155
45156 pDevice->apdev->type = ARPHRD_IEEE80211;
45157diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
45158index c699a30..b90a5fd 100644
45159--- a/drivers/staging/vt6656/hostap.c
45160+++ b/drivers/staging/vt6656/hostap.c
45161@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
45162 *
45163 */
45164
45165+static net_device_ops_no_const apdev_netdev_ops;
45166+
45167 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
45168 {
45169 struct vnt_private *apdev_priv;
45170 struct net_device *dev = pDevice->dev;
45171 int ret;
45172- const struct net_device_ops apdev_netdev_ops = {
45173- .ndo_start_xmit = pDevice->tx_80211,
45174- };
45175
45176 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
45177
45178@@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
45179 *apdev_priv = *pDevice;
45180 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
45181
45182+ /* only half broken now */
45183+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
45184 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
45185
45186 pDevice->apdev->type = ARPHRD_IEEE80211;
45187diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
45188index d128ce2..fc1f9a1 100644
45189--- a/drivers/staging/zcache/tmem.h
45190+++ b/drivers/staging/zcache/tmem.h
45191@@ -225,7 +225,7 @@ struct tmem_pamops {
45192 bool (*is_remote)(void *);
45193 int (*replace_in_obj)(void *, struct tmem_obj *);
45194 #endif
45195-};
45196+} __no_const;
45197 extern void tmem_register_pamops(struct tmem_pamops *m);
45198
45199 /* memory allocation methods provided by the host implementation */
45200@@ -234,7 +234,7 @@ struct tmem_hostops {
45201 void (*obj_free)(struct tmem_obj *, struct tmem_pool *);
45202 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
45203 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
45204-};
45205+} __no_const;
45206 extern void tmem_register_hostops(struct tmem_hostops *m);
45207
45208 /* core tmem accessor functions */
45209diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
45210index 4630481..c26782a 100644
45211--- a/drivers/target/target_core_device.c
45212+++ b/drivers/target/target_core_device.c
45213@@ -1400,7 +1400,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
45214 spin_lock_init(&dev->se_port_lock);
45215 spin_lock_init(&dev->se_tmr_lock);
45216 spin_lock_init(&dev->qf_cmd_lock);
45217- atomic_set(&dev->dev_ordered_id, 0);
45218+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
45219 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
45220 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
45221 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
45222diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
45223index 21e3158..43c6004 100644
45224--- a/drivers/target/target_core_transport.c
45225+++ b/drivers/target/target_core_transport.c
45226@@ -1080,7 +1080,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
45227 * Used to determine when ORDERED commands should go from
45228 * Dormant to Active status.
45229 */
45230- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
45231+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
45232 smp_mb__after_atomic_inc();
45233 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
45234 cmd->se_ordered_id, cmd->sam_task_attr,
45235diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
45236index 33f83fe..d80f8e1 100644
45237--- a/drivers/tty/cyclades.c
45238+++ b/drivers/tty/cyclades.c
45239@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
45240 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
45241 info->port.count);
45242 #endif
45243- info->port.count++;
45244+ atomic_inc(&info->port.count);
45245 #ifdef CY_DEBUG_COUNT
45246 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
45247- current->pid, info->port.count);
45248+ current->pid, atomic_read(&info->port.count));
45249 #endif
45250
45251 /*
45252@@ -3972,7 +3972,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
45253 for (j = 0; j < cy_card[i].nports; j++) {
45254 info = &cy_card[i].ports[j];
45255
45256- if (info->port.count) {
45257+ if (atomic_read(&info->port.count)) {
45258 /* XXX is the ldisc num worth this? */
45259 struct tty_struct *tty;
45260 struct tty_ldisc *ld;
45261diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
45262index eb255e8..f637a57 100644
45263--- a/drivers/tty/hvc/hvc_console.c
45264+++ b/drivers/tty/hvc/hvc_console.c
45265@@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
45266
45267 spin_lock_irqsave(&hp->port.lock, flags);
45268 /* Check and then increment for fast path open. */
45269- if (hp->port.count++ > 0) {
45270+ if (atomic_inc_return(&hp->port.count) > 1) {
45271 spin_unlock_irqrestore(&hp->port.lock, flags);
45272 hvc_kick();
45273 return 0;
45274@@ -388,7 +388,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
45275
45276 spin_lock_irqsave(&hp->port.lock, flags);
45277
45278- if (--hp->port.count == 0) {
45279+ if (atomic_dec_return(&hp->port.count) == 0) {
45280 spin_unlock_irqrestore(&hp->port.lock, flags);
45281 /* We are done with the tty pointer now. */
45282 tty_port_tty_set(&hp->port, NULL);
45283@@ -406,9 +406,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
45284 */
45285 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
45286 } else {
45287- if (hp->port.count < 0)
45288+ if (atomic_read(&hp->port.count) < 0)
45289 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
45290- hp->vtermno, hp->port.count);
45291+ hp->vtermno, atomic_read(&hp->port.count));
45292 spin_unlock_irqrestore(&hp->port.lock, flags);
45293 }
45294 }
45295@@ -438,12 +438,12 @@ static void hvc_hangup(struct tty_struct *tty)
45296 * open->hangup case this can be called after the final close so prevent
45297 * that from happening for now.
45298 */
45299- if (hp->port.count <= 0) {
45300+ if (atomic_read(&hp->port.count) <= 0) {
45301 spin_unlock_irqrestore(&hp->port.lock, flags);
45302 return;
45303 }
45304
45305- hp->port.count = 0;
45306+ atomic_set(&hp->port.count, 0);
45307 spin_unlock_irqrestore(&hp->port.lock, flags);
45308 tty_port_tty_set(&hp->port, NULL);
45309
45310@@ -491,7 +491,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
45311 return -EPIPE;
45312
45313 /* FIXME what's this (unprotected) check for? */
45314- if (hp->port.count <= 0)
45315+ if (atomic_read(&hp->port.count) <= 0)
45316 return -EIO;
45317
45318 spin_lock_irqsave(&hp->lock, flags);
45319diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
45320index 81e939e..95ead10 100644
45321--- a/drivers/tty/hvc/hvcs.c
45322+++ b/drivers/tty/hvc/hvcs.c
45323@@ -83,6 +83,7 @@
45324 #include <asm/hvcserver.h>
45325 #include <asm/uaccess.h>
45326 #include <asm/vio.h>
45327+#include <asm/local.h>
45328
45329 /*
45330 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
45331@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
45332
45333 spin_lock_irqsave(&hvcsd->lock, flags);
45334
45335- if (hvcsd->port.count > 0) {
45336+ if (atomic_read(&hvcsd->port.count) > 0) {
45337 spin_unlock_irqrestore(&hvcsd->lock, flags);
45338 printk(KERN_INFO "HVCS: vterm state unchanged. "
45339 "The hvcs device node is still in use.\n");
45340@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
45341 }
45342 }
45343
45344- hvcsd->port.count = 0;
45345+ atomic_set(&hvcsd->port.count, 0);
45346 hvcsd->port.tty = tty;
45347 tty->driver_data = hvcsd;
45348
45349@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
45350 unsigned long flags;
45351
45352 spin_lock_irqsave(&hvcsd->lock, flags);
45353- hvcsd->port.count++;
45354+ atomic_inc(&hvcsd->port.count);
45355 hvcsd->todo_mask |= HVCS_SCHED_READ;
45356 spin_unlock_irqrestore(&hvcsd->lock, flags);
45357
45358@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
45359 hvcsd = tty->driver_data;
45360
45361 spin_lock_irqsave(&hvcsd->lock, flags);
45362- if (--hvcsd->port.count == 0) {
45363+ if (atomic_dec_and_test(&hvcsd->port.count)) {
45364
45365 vio_disable_interrupts(hvcsd->vdev);
45366
45367@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
45368
45369 free_irq(irq, hvcsd);
45370 return;
45371- } else if (hvcsd->port.count < 0) {
45372+ } else if (atomic_read(&hvcsd->port.count) < 0) {
45373 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
45374 " is missmanaged.\n",
45375- hvcsd->vdev->unit_address, hvcsd->port.count);
45376+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
45377 }
45378
45379 spin_unlock_irqrestore(&hvcsd->lock, flags);
45380@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
45381
45382 spin_lock_irqsave(&hvcsd->lock, flags);
45383 /* Preserve this so that we know how many kref refs to put */
45384- temp_open_count = hvcsd->port.count;
45385+ temp_open_count = atomic_read(&hvcsd->port.count);
45386
45387 /*
45388 * Don't kref put inside the spinlock because the destruction
45389@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
45390 tty->driver_data = NULL;
45391 hvcsd->port.tty = NULL;
45392
45393- hvcsd->port.count = 0;
45394+ atomic_set(&hvcsd->port.count, 0);
45395
45396 /* This will drop any buffered data on the floor which is OK in a hangup
45397 * scenario. */
45398@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
45399 * the middle of a write operation? This is a crummy place to do this
45400 * but we want to keep it all in the spinlock.
45401 */
45402- if (hvcsd->port.count <= 0) {
45403+ if (atomic_read(&hvcsd->port.count) <= 0) {
45404 spin_unlock_irqrestore(&hvcsd->lock, flags);
45405 return -ENODEV;
45406 }
45407@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
45408 {
45409 struct hvcs_struct *hvcsd = tty->driver_data;
45410
45411- if (!hvcsd || hvcsd->port.count <= 0)
45412+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
45413 return 0;
45414
45415 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
45416diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
45417index 8fd72ff..34a0bed 100644
45418--- a/drivers/tty/ipwireless/tty.c
45419+++ b/drivers/tty/ipwireless/tty.c
45420@@ -29,6 +29,7 @@
45421 #include <linux/tty_driver.h>
45422 #include <linux/tty_flip.h>
45423 #include <linux/uaccess.h>
45424+#include <asm/local.h>
45425
45426 #include "tty.h"
45427 #include "network.h"
45428@@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
45429 mutex_unlock(&tty->ipw_tty_mutex);
45430 return -ENODEV;
45431 }
45432- if (tty->port.count == 0)
45433+ if (atomic_read(&tty->port.count) == 0)
45434 tty->tx_bytes_queued = 0;
45435
45436- tty->port.count++;
45437+ atomic_inc(&tty->port.count);
45438
45439 tty->port.tty = linux_tty;
45440 linux_tty->driver_data = tty;
45441@@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
45442
45443 static void do_ipw_close(struct ipw_tty *tty)
45444 {
45445- tty->port.count--;
45446-
45447- if (tty->port.count == 0) {
45448+ if (atomic_dec_return(&tty->port.count) == 0) {
45449 struct tty_struct *linux_tty = tty->port.tty;
45450
45451 if (linux_tty != NULL) {
45452@@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
45453 return;
45454
45455 mutex_lock(&tty->ipw_tty_mutex);
45456- if (tty->port.count == 0) {
45457+ if (atomic_read(&tty->port.count) == 0) {
45458 mutex_unlock(&tty->ipw_tty_mutex);
45459 return;
45460 }
45461@@ -164,7 +163,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
45462
45463 mutex_lock(&tty->ipw_tty_mutex);
45464
45465- if (!tty->port.count) {
45466+ if (!atomic_read(&tty->port.count)) {
45467 mutex_unlock(&tty->ipw_tty_mutex);
45468 return;
45469 }
45470@@ -206,7 +205,7 @@ static int ipw_write(struct tty_struct *linux_tty,
45471 return -ENODEV;
45472
45473 mutex_lock(&tty->ipw_tty_mutex);
45474- if (!tty->port.count) {
45475+ if (!atomic_read(&tty->port.count)) {
45476 mutex_unlock(&tty->ipw_tty_mutex);
45477 return -EINVAL;
45478 }
45479@@ -246,7 +245,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
45480 if (!tty)
45481 return -ENODEV;
45482
45483- if (!tty->port.count)
45484+ if (!atomic_read(&tty->port.count))
45485 return -EINVAL;
45486
45487 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
45488@@ -288,7 +287,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
45489 if (!tty)
45490 return 0;
45491
45492- if (!tty->port.count)
45493+ if (!atomic_read(&tty->port.count))
45494 return 0;
45495
45496 return tty->tx_bytes_queued;
45497@@ -369,7 +368,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
45498 if (!tty)
45499 return -ENODEV;
45500
45501- if (!tty->port.count)
45502+ if (!atomic_read(&tty->port.count))
45503 return -EINVAL;
45504
45505 return get_control_lines(tty);
45506@@ -385,7 +384,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
45507 if (!tty)
45508 return -ENODEV;
45509
45510- if (!tty->port.count)
45511+ if (!atomic_read(&tty->port.count))
45512 return -EINVAL;
45513
45514 return set_control_lines(tty, set, clear);
45515@@ -399,7 +398,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
45516 if (!tty)
45517 return -ENODEV;
45518
45519- if (!tty->port.count)
45520+ if (!atomic_read(&tty->port.count))
45521 return -EINVAL;
45522
45523 /* FIXME: Exactly how is the tty object locked here .. */
45524@@ -555,7 +554,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
45525 * are gone */
45526 mutex_lock(&ttyj->ipw_tty_mutex);
45527 }
45528- while (ttyj->port.count)
45529+ while (atomic_read(&ttyj->port.count))
45530 do_ipw_close(ttyj);
45531 ipwireless_disassociate_network_ttys(network,
45532 ttyj->channel_idx);
45533diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
45534index 1deaca4..c8582d4 100644
45535--- a/drivers/tty/moxa.c
45536+++ b/drivers/tty/moxa.c
45537@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
45538 }
45539
45540 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
45541- ch->port.count++;
45542+ atomic_inc(&ch->port.count);
45543 tty->driver_data = ch;
45544 tty_port_tty_set(&ch->port, tty);
45545 mutex_lock(&ch->port.mutex);
45546diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
45547index 6422390..49003ac8 100644
45548--- a/drivers/tty/n_gsm.c
45549+++ b/drivers/tty/n_gsm.c
45550@@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
45551 spin_lock_init(&dlci->lock);
45552 mutex_init(&dlci->mutex);
45553 dlci->fifo = &dlci->_fifo;
45554- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
45555+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
45556 kfree(dlci);
45557 return NULL;
45558 }
45559@@ -2932,7 +2932,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
45560 struct gsm_dlci *dlci = tty->driver_data;
45561 struct tty_port *port = &dlci->port;
45562
45563- port->count++;
45564+ atomic_inc(&port->count);
45565 dlci_get(dlci);
45566 dlci_get(dlci->gsm->dlci[0]);
45567 mux_get(dlci->gsm);
45568diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
45569index 6c7fe90..9241dab 100644
45570--- a/drivers/tty/n_tty.c
45571+++ b/drivers/tty/n_tty.c
45572@@ -2203,6 +2203,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
45573 {
45574 *ops = tty_ldisc_N_TTY;
45575 ops->owner = NULL;
45576- ops->refcount = ops->flags = 0;
45577+ atomic_set(&ops->refcount, 0);
45578+ ops->flags = 0;
45579 }
45580 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
45581diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
45582index abfd990..5ab5da9 100644
45583--- a/drivers/tty/pty.c
45584+++ b/drivers/tty/pty.c
45585@@ -796,8 +796,10 @@ static void __init unix98_pty_init(void)
45586 panic("Couldn't register Unix98 pts driver");
45587
45588 /* Now create the /dev/ptmx special device */
45589+ pax_open_kernel();
45590 tty_default_fops(&ptmx_fops);
45591- ptmx_fops.open = ptmx_open;
45592+ *(void **)&ptmx_fops.open = ptmx_open;
45593+ pax_close_kernel();
45594
45595 cdev_init(&ptmx_cdev, &ptmx_fops);
45596 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
45597diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
45598index 354564e..fe50d9a 100644
45599--- a/drivers/tty/rocket.c
45600+++ b/drivers/tty/rocket.c
45601@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
45602 tty->driver_data = info;
45603 tty_port_tty_set(port, tty);
45604
45605- if (port->count++ == 0) {
45606+ if (atomic_inc_return(&port->count) == 1) {
45607 atomic_inc(&rp_num_ports_open);
45608
45609 #ifdef ROCKET_DEBUG_OPEN
45610@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
45611 #endif
45612 }
45613 #ifdef ROCKET_DEBUG_OPEN
45614- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
45615+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
45616 #endif
45617
45618 /*
45619@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
45620 spin_unlock_irqrestore(&info->port.lock, flags);
45621 return;
45622 }
45623- if (info->port.count)
45624+ if (atomic_read(&info->port.count))
45625 atomic_dec(&rp_num_ports_open);
45626 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
45627 spin_unlock_irqrestore(&info->port.lock, flags);
45628diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
45629index 1002054..dd644a8 100644
45630--- a/drivers/tty/serial/kgdboc.c
45631+++ b/drivers/tty/serial/kgdboc.c
45632@@ -24,8 +24,9 @@
45633 #define MAX_CONFIG_LEN 40
45634
45635 static struct kgdb_io kgdboc_io_ops;
45636+static struct kgdb_io kgdboc_io_ops_console;
45637
45638-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
45639+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
45640 static int configured = -1;
45641
45642 static char config[MAX_CONFIG_LEN];
45643@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
45644 kgdboc_unregister_kbd();
45645 if (configured == 1)
45646 kgdb_unregister_io_module(&kgdboc_io_ops);
45647+ else if (configured == 2)
45648+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
45649 }
45650
45651 static int configure_kgdboc(void)
45652@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
45653 int err;
45654 char *cptr = config;
45655 struct console *cons;
45656+ int is_console = 0;
45657
45658 err = kgdboc_option_setup(config);
45659 if (err || !strlen(config) || isspace(config[0]))
45660 goto noconfig;
45661
45662 err = -ENODEV;
45663- kgdboc_io_ops.is_console = 0;
45664 kgdb_tty_driver = NULL;
45665
45666 kgdboc_use_kms = 0;
45667@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
45668 int idx;
45669 if (cons->device && cons->device(cons, &idx) == p &&
45670 idx == tty_line) {
45671- kgdboc_io_ops.is_console = 1;
45672+ is_console = 1;
45673 break;
45674 }
45675 cons = cons->next;
45676@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
45677 kgdb_tty_line = tty_line;
45678
45679 do_register:
45680- err = kgdb_register_io_module(&kgdboc_io_ops);
45681+ if (is_console) {
45682+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
45683+ configured = 2;
45684+ } else {
45685+ err = kgdb_register_io_module(&kgdboc_io_ops);
45686+ configured = 1;
45687+ }
45688 if (err)
45689 goto noconfig;
45690
45691@@ -205,8 +214,6 @@ do_register:
45692 if (err)
45693 goto nmi_con_failed;
45694
45695- configured = 1;
45696-
45697 return 0;
45698
45699 nmi_con_failed:
45700@@ -223,7 +230,7 @@ noconfig:
45701 static int __init init_kgdboc(void)
45702 {
45703 /* Already configured? */
45704- if (configured == 1)
45705+ if (configured >= 1)
45706 return 0;
45707
45708 return configure_kgdboc();
45709@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
45710 if (config[len - 1] == '\n')
45711 config[len - 1] = '\0';
45712
45713- if (configured == 1)
45714+ if (configured >= 1)
45715 cleanup_kgdboc();
45716
45717 /* Go and configure with the new params. */
45718@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
45719 .post_exception = kgdboc_post_exp_handler,
45720 };
45721
45722+static struct kgdb_io kgdboc_io_ops_console = {
45723+ .name = "kgdboc",
45724+ .read_char = kgdboc_get_char,
45725+ .write_char = kgdboc_put_char,
45726+ .pre_exception = kgdboc_pre_exp_handler,
45727+ .post_exception = kgdboc_post_exp_handler,
45728+ .is_console = 1
45729+};
45730+
45731 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
45732 /* This is only available if kgdboc is a built in for early debugging */
45733 static int __init kgdboc_early_init(char *opt)
45734diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
45735index 0c8a9fa..234a95f 100644
45736--- a/drivers/tty/serial/samsung.c
45737+++ b/drivers/tty/serial/samsung.c
45738@@ -453,11 +453,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
45739 }
45740 }
45741
45742+static int s3c64xx_serial_startup(struct uart_port *port);
45743 static int s3c24xx_serial_startup(struct uart_port *port)
45744 {
45745 struct s3c24xx_uart_port *ourport = to_ourport(port);
45746 int ret;
45747
45748+ /* Startup sequence is different for s3c64xx and higher SoC's */
45749+ if (s3c24xx_serial_has_interrupt_mask(port))
45750+ return s3c64xx_serial_startup(port);
45751+
45752 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
45753 port->mapbase, port->membase);
45754
45755@@ -1124,10 +1129,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
45756 /* setup info for port */
45757 port->dev = &platdev->dev;
45758
45759- /* Startup sequence is different for s3c64xx and higher SoC's */
45760- if (s3c24xx_serial_has_interrupt_mask(port))
45761- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
45762-
45763 port->uartclk = 1;
45764
45765 if (cfg->uart_flags & UPF_CONS_FLOW) {
45766diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
45767index f87dbfd..42ad4b1 100644
45768--- a/drivers/tty/serial/serial_core.c
45769+++ b/drivers/tty/serial/serial_core.c
45770@@ -1454,7 +1454,7 @@ static void uart_hangup(struct tty_struct *tty)
45771 uart_flush_buffer(tty);
45772 uart_shutdown(tty, state);
45773 spin_lock_irqsave(&port->lock, flags);
45774- port->count = 0;
45775+ atomic_set(&port->count, 0);
45776 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
45777 spin_unlock_irqrestore(&port->lock, flags);
45778 tty_port_tty_set(port, NULL);
45779@@ -1550,7 +1550,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
45780 goto end;
45781 }
45782
45783- port->count++;
45784+ atomic_inc(&port->count);
45785 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
45786 retval = -ENXIO;
45787 goto err_dec_count;
45788@@ -1578,7 +1578,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
45789 /*
45790 * Make sure the device is in D0 state.
45791 */
45792- if (port->count == 1)
45793+ if (atomic_read(&port->count) == 1)
45794 uart_change_pm(state, UART_PM_STATE_ON);
45795
45796 /*
45797@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
45798 end:
45799 return retval;
45800 err_dec_count:
45801- port->count--;
45802+ atomic_inc(&port->count);
45803 mutex_unlock(&port->mutex);
45804 goto end;
45805 }
45806diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
45807index 8eaf1ab..85c030d 100644
45808--- a/drivers/tty/synclink.c
45809+++ b/drivers/tty/synclink.c
45810@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
45811
45812 if (debug_level >= DEBUG_LEVEL_INFO)
45813 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
45814- __FILE__,__LINE__, info->device_name, info->port.count);
45815+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
45816
45817 if (tty_port_close_start(&info->port, tty, filp) == 0)
45818 goto cleanup;
45819@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
45820 cleanup:
45821 if (debug_level >= DEBUG_LEVEL_INFO)
45822 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
45823- tty->driver->name, info->port.count);
45824+ tty->driver->name, atomic_read(&info->port.count));
45825
45826 } /* end of mgsl_close() */
45827
45828@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
45829
45830 mgsl_flush_buffer(tty);
45831 shutdown(info);
45832-
45833- info->port.count = 0;
45834+
45835+ atomic_set(&info->port.count, 0);
45836 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
45837 info->port.tty = NULL;
45838
45839@@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
45840
45841 if (debug_level >= DEBUG_LEVEL_INFO)
45842 printk("%s(%d):block_til_ready before block on %s count=%d\n",
45843- __FILE__,__LINE__, tty->driver->name, port->count );
45844+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
45845
45846 spin_lock_irqsave(&info->irq_spinlock, flags);
45847 if (!tty_hung_up_p(filp)) {
45848 extra_count = true;
45849- port->count--;
45850+ atomic_dec(&port->count);
45851 }
45852 spin_unlock_irqrestore(&info->irq_spinlock, flags);
45853 port->blocked_open++;
45854@@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
45855
45856 if (debug_level >= DEBUG_LEVEL_INFO)
45857 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
45858- __FILE__,__LINE__, tty->driver->name, port->count );
45859+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
45860
45861 tty_unlock(tty);
45862 schedule();
45863@@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
45864
45865 /* FIXME: Racy on hangup during close wait */
45866 if (extra_count)
45867- port->count++;
45868+ atomic_inc(&port->count);
45869 port->blocked_open--;
45870
45871 if (debug_level >= DEBUG_LEVEL_INFO)
45872 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
45873- __FILE__,__LINE__, tty->driver->name, port->count );
45874+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
45875
45876 if (!retval)
45877 port->flags |= ASYNC_NORMAL_ACTIVE;
45878@@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
45879
45880 if (debug_level >= DEBUG_LEVEL_INFO)
45881 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
45882- __FILE__,__LINE__,tty->driver->name, info->port.count);
45883+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
45884
45885 /* If port is closing, signal caller to try again */
45886 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
45887@@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
45888 spin_unlock_irqrestore(&info->netlock, flags);
45889 goto cleanup;
45890 }
45891- info->port.count++;
45892+ atomic_inc(&info->port.count);
45893 spin_unlock_irqrestore(&info->netlock, flags);
45894
45895- if (info->port.count == 1) {
45896+ if (atomic_read(&info->port.count) == 1) {
45897 /* 1st open on this device, init hardware */
45898 retval = startup(info);
45899 if (retval < 0)
45900@@ -3446,8 +3446,8 @@ cleanup:
45901 if (retval) {
45902 if (tty->count == 1)
45903 info->port.tty = NULL; /* tty layer will release tty struct */
45904- if(info->port.count)
45905- info->port.count--;
45906+ if (atomic_read(&info->port.count))
45907+ atomic_dec(&info->port.count);
45908 }
45909
45910 return retval;
45911@@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
45912 unsigned short new_crctype;
45913
45914 /* return error if TTY interface open */
45915- if (info->port.count)
45916+ if (atomic_read(&info->port.count))
45917 return -EBUSY;
45918
45919 switch (encoding)
45920@@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
45921
45922 /* arbitrate between network and tty opens */
45923 spin_lock_irqsave(&info->netlock, flags);
45924- if (info->port.count != 0 || info->netcount != 0) {
45925+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
45926 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
45927 spin_unlock_irqrestore(&info->netlock, flags);
45928 return -EBUSY;
45929@@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
45930 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
45931
45932 /* return error if TTY interface open */
45933- if (info->port.count)
45934+ if (atomic_read(&info->port.count))
45935 return -EBUSY;
45936
45937 if (cmd != SIOCWANDEV)
45938diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
45939index 1abf946..1ee34fc 100644
45940--- a/drivers/tty/synclink_gt.c
45941+++ b/drivers/tty/synclink_gt.c
45942@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
45943 tty->driver_data = info;
45944 info->port.tty = tty;
45945
45946- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
45947+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
45948
45949 /* If port is closing, signal caller to try again */
45950 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
45951@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
45952 mutex_unlock(&info->port.mutex);
45953 goto cleanup;
45954 }
45955- info->port.count++;
45956+ atomic_inc(&info->port.count);
45957 spin_unlock_irqrestore(&info->netlock, flags);
45958
45959- if (info->port.count == 1) {
45960+ if (atomic_read(&info->port.count) == 1) {
45961 /* 1st open on this device, init hardware */
45962 retval = startup(info);
45963 if (retval < 0) {
45964@@ -715,8 +715,8 @@ cleanup:
45965 if (retval) {
45966 if (tty->count == 1)
45967 info->port.tty = NULL; /* tty layer will release tty struct */
45968- if(info->port.count)
45969- info->port.count--;
45970+ if(atomic_read(&info->port.count))
45971+ atomic_dec(&info->port.count);
45972 }
45973
45974 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
45975@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
45976
45977 if (sanity_check(info, tty->name, "close"))
45978 return;
45979- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
45980+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
45981
45982 if (tty_port_close_start(&info->port, tty, filp) == 0)
45983 goto cleanup;
45984@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
45985 tty_port_close_end(&info->port, tty);
45986 info->port.tty = NULL;
45987 cleanup:
45988- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
45989+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
45990 }
45991
45992 static void hangup(struct tty_struct *tty)
45993@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
45994 shutdown(info);
45995
45996 spin_lock_irqsave(&info->port.lock, flags);
45997- info->port.count = 0;
45998+ atomic_set(&info->port.count, 0);
45999 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
46000 info->port.tty = NULL;
46001 spin_unlock_irqrestore(&info->port.lock, flags);
46002@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
46003 unsigned short new_crctype;
46004
46005 /* return error if TTY interface open */
46006- if (info->port.count)
46007+ if (atomic_read(&info->port.count))
46008 return -EBUSY;
46009
46010 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
46011@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
46012
46013 /* arbitrate between network and tty opens */
46014 spin_lock_irqsave(&info->netlock, flags);
46015- if (info->port.count != 0 || info->netcount != 0) {
46016+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
46017 DBGINFO(("%s hdlc_open busy\n", dev->name));
46018 spin_unlock_irqrestore(&info->netlock, flags);
46019 return -EBUSY;
46020@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46021 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
46022
46023 /* return error if TTY interface open */
46024- if (info->port.count)
46025+ if (atomic_read(&info->port.count))
46026 return -EBUSY;
46027
46028 if (cmd != SIOCWANDEV)
46029@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
46030 if (port == NULL)
46031 continue;
46032 spin_lock(&port->lock);
46033- if ((port->port.count || port->netcount) &&
46034+ if ((atomic_read(&port->port.count) || port->netcount) &&
46035 port->pending_bh && !port->bh_running &&
46036 !port->bh_requested) {
46037 DBGISR(("%s bh queued\n", port->device_name));
46038@@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
46039 spin_lock_irqsave(&info->lock, flags);
46040 if (!tty_hung_up_p(filp)) {
46041 extra_count = true;
46042- port->count--;
46043+ atomic_dec(&port->count);
46044 }
46045 spin_unlock_irqrestore(&info->lock, flags);
46046 port->blocked_open++;
46047@@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
46048 remove_wait_queue(&port->open_wait, &wait);
46049
46050 if (extra_count)
46051- port->count++;
46052+ atomic_inc(&port->count);
46053 port->blocked_open--;
46054
46055 if (!retval)
46056diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
46057index ff17138..e38b41e 100644
46058--- a/drivers/tty/synclinkmp.c
46059+++ b/drivers/tty/synclinkmp.c
46060@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
46061
46062 if (debug_level >= DEBUG_LEVEL_INFO)
46063 printk("%s(%d):%s open(), old ref count = %d\n",
46064- __FILE__,__LINE__,tty->driver->name, info->port.count);
46065+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
46066
46067 /* If port is closing, signal caller to try again */
46068 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
46069@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
46070 spin_unlock_irqrestore(&info->netlock, flags);
46071 goto cleanup;
46072 }
46073- info->port.count++;
46074+ atomic_inc(&info->port.count);
46075 spin_unlock_irqrestore(&info->netlock, flags);
46076
46077- if (info->port.count == 1) {
46078+ if (atomic_read(&info->port.count) == 1) {
46079 /* 1st open on this device, init hardware */
46080 retval = startup(info);
46081 if (retval < 0)
46082@@ -796,8 +796,8 @@ cleanup:
46083 if (retval) {
46084 if (tty->count == 1)
46085 info->port.tty = NULL; /* tty layer will release tty struct */
46086- if(info->port.count)
46087- info->port.count--;
46088+ if(atomic_read(&info->port.count))
46089+ atomic_dec(&info->port.count);
46090 }
46091
46092 return retval;
46093@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
46094
46095 if (debug_level >= DEBUG_LEVEL_INFO)
46096 printk("%s(%d):%s close() entry, count=%d\n",
46097- __FILE__,__LINE__, info->device_name, info->port.count);
46098+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
46099
46100 if (tty_port_close_start(&info->port, tty, filp) == 0)
46101 goto cleanup;
46102@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
46103 cleanup:
46104 if (debug_level >= DEBUG_LEVEL_INFO)
46105 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
46106- tty->driver->name, info->port.count);
46107+ tty->driver->name, atomic_read(&info->port.count));
46108 }
46109
46110 /* Called by tty_hangup() when a hangup is signaled.
46111@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
46112 shutdown(info);
46113
46114 spin_lock_irqsave(&info->port.lock, flags);
46115- info->port.count = 0;
46116+ atomic_set(&info->port.count, 0);
46117 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
46118 info->port.tty = NULL;
46119 spin_unlock_irqrestore(&info->port.lock, flags);
46120@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
46121 unsigned short new_crctype;
46122
46123 /* return error if TTY interface open */
46124- if (info->port.count)
46125+ if (atomic_read(&info->port.count))
46126 return -EBUSY;
46127
46128 switch (encoding)
46129@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
46130
46131 /* arbitrate between network and tty opens */
46132 spin_lock_irqsave(&info->netlock, flags);
46133- if (info->port.count != 0 || info->netcount != 0) {
46134+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
46135 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
46136 spin_unlock_irqrestore(&info->netlock, flags);
46137 return -EBUSY;
46138@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46139 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
46140
46141 /* return error if TTY interface open */
46142- if (info->port.count)
46143+ if (atomic_read(&info->port.count))
46144 return -EBUSY;
46145
46146 if (cmd != SIOCWANDEV)
46147@@ -2620,7 +2620,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
46148 * do not request bottom half processing if the
46149 * device is not open in a normal mode.
46150 */
46151- if ( port && (port->port.count || port->netcount) &&
46152+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
46153 port->pending_bh && !port->bh_running &&
46154 !port->bh_requested ) {
46155 if ( debug_level >= DEBUG_LEVEL_ISR )
46156@@ -3318,12 +3318,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
46157
46158 if (debug_level >= DEBUG_LEVEL_INFO)
46159 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
46160- __FILE__,__LINE__, tty->driver->name, port->count );
46161+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
46162
46163 spin_lock_irqsave(&info->lock, flags);
46164 if (!tty_hung_up_p(filp)) {
46165 extra_count = true;
46166- port->count--;
46167+ atomic_dec(&port->count);
46168 }
46169 spin_unlock_irqrestore(&info->lock, flags);
46170 port->blocked_open++;
46171@@ -3352,7 +3352,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
46172
46173 if (debug_level >= DEBUG_LEVEL_INFO)
46174 printk("%s(%d):%s block_til_ready() count=%d\n",
46175- __FILE__,__LINE__, tty->driver->name, port->count );
46176+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
46177
46178 tty_unlock(tty);
46179 schedule();
46180@@ -3363,12 +3363,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
46181 remove_wait_queue(&port->open_wait, &wait);
46182
46183 if (extra_count)
46184- port->count++;
46185+ atomic_inc(&port->count);
46186 port->blocked_open--;
46187
46188 if (debug_level >= DEBUG_LEVEL_INFO)
46189 printk("%s(%d):%s block_til_ready() after, count=%d\n",
46190- __FILE__,__LINE__, tty->driver->name, port->count );
46191+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
46192
46193 if (!retval)
46194 port->flags |= ASYNC_NORMAL_ACTIVE;
46195diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
46196index b51c154..17d55d1 100644
46197--- a/drivers/tty/sysrq.c
46198+++ b/drivers/tty/sysrq.c
46199@@ -1022,7 +1022,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
46200 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
46201 size_t count, loff_t *ppos)
46202 {
46203- if (count) {
46204+ if (count && capable(CAP_SYS_ADMIN)) {
46205 char c;
46206
46207 if (get_user(c, buf))
46208diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
46209index 4476682..d77e748 100644
46210--- a/drivers/tty/tty_io.c
46211+++ b/drivers/tty/tty_io.c
46212@@ -3466,7 +3466,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
46213
46214 void tty_default_fops(struct file_operations *fops)
46215 {
46216- *fops = tty_fops;
46217+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
46218 }
46219
46220 /*
46221diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
46222index 1afe192..73d2c20 100644
46223--- a/drivers/tty/tty_ldisc.c
46224+++ b/drivers/tty/tty_ldisc.c
46225@@ -66,7 +66,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
46226 raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
46227 tty_ldiscs[disc] = new_ldisc;
46228 new_ldisc->num = disc;
46229- new_ldisc->refcount = 0;
46230+ atomic_set(&new_ldisc->refcount, 0);
46231 raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
46232
46233 return ret;
46234@@ -94,7 +94,7 @@ int tty_unregister_ldisc(int disc)
46235 return -EINVAL;
46236
46237 raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
46238- if (tty_ldiscs[disc]->refcount)
46239+ if (atomic_read(&tty_ldiscs[disc]->refcount))
46240 ret = -EBUSY;
46241 else
46242 tty_ldiscs[disc] = NULL;
46243@@ -115,7 +115,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
46244 if (ldops) {
46245 ret = ERR_PTR(-EAGAIN);
46246 if (try_module_get(ldops->owner)) {
46247- ldops->refcount++;
46248+ atomic_inc(&ldops->refcount);
46249 ret = ldops;
46250 }
46251 }
46252@@ -128,7 +128,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
46253 unsigned long flags;
46254
46255 raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
46256- ldops->refcount--;
46257+ atomic_dec(&ldops->refcount);
46258 module_put(ldops->owner);
46259 raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
46260 }
46261@@ -196,7 +196,7 @@ static inline void tty_ldisc_put(struct tty_ldisc *ld)
46262 /* unreleased reader reference(s) will cause this WARN */
46263 WARN_ON(!atomic_dec_and_test(&ld->users));
46264
46265- ld->ops->refcount--;
46266+ atomic_dec(&ld->ops->refcount);
46267 module_put(ld->ops->owner);
46268 kfree(ld);
46269 raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
46270diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
46271index f597e88..b7f68ed 100644
46272--- a/drivers/tty/tty_port.c
46273+++ b/drivers/tty/tty_port.c
46274@@ -232,7 +232,7 @@ void tty_port_hangup(struct tty_port *port)
46275 unsigned long flags;
46276
46277 spin_lock_irqsave(&port->lock, flags);
46278- port->count = 0;
46279+ atomic_set(&port->count, 0);
46280 port->flags &= ~ASYNC_NORMAL_ACTIVE;
46281 tty = port->tty;
46282 if (tty)
46283@@ -390,7 +390,7 @@ int tty_port_block_til_ready(struct tty_port *port,
46284 /* The port lock protects the port counts */
46285 spin_lock_irqsave(&port->lock, flags);
46286 if (!tty_hung_up_p(filp))
46287- port->count--;
46288+ atomic_dec(&port->count);
46289 port->blocked_open++;
46290 spin_unlock_irqrestore(&port->lock, flags);
46291
46292@@ -432,7 +432,7 @@ int tty_port_block_til_ready(struct tty_port *port,
46293 we must not mess that up further */
46294 spin_lock_irqsave(&port->lock, flags);
46295 if (!tty_hung_up_p(filp))
46296- port->count++;
46297+ atomic_inc(&port->count);
46298 port->blocked_open--;
46299 if (retval == 0)
46300 port->flags |= ASYNC_NORMAL_ACTIVE;
46301@@ -466,19 +466,19 @@ int tty_port_close_start(struct tty_port *port,
46302 return 0;
46303 }
46304
46305- if (tty->count == 1 && port->count != 1) {
46306+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
46307 printk(KERN_WARNING
46308 "tty_port_close_start: tty->count = 1 port count = %d.\n",
46309- port->count);
46310- port->count = 1;
46311+ atomic_read(&port->count));
46312+ atomic_set(&port->count, 1);
46313 }
46314- if (--port->count < 0) {
46315+ if (atomic_dec_return(&port->count) < 0) {
46316 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
46317- port->count);
46318- port->count = 0;
46319+ atomic_read(&port->count));
46320+ atomic_set(&port->count, 0);
46321 }
46322
46323- if (port->count) {
46324+ if (atomic_read(&port->count)) {
46325 spin_unlock_irqrestore(&port->lock, flags);
46326 if (port->ops->drop)
46327 port->ops->drop(port);
46328@@ -564,7 +564,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
46329 {
46330 spin_lock_irq(&port->lock);
46331 if (!tty_hung_up_p(filp))
46332- ++port->count;
46333+ atomic_inc(&port->count);
46334 spin_unlock_irq(&port->lock);
46335 tty_port_tty_set(port, tty);
46336
46337diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
46338index a9af1b9a..1e08e7f 100644
46339--- a/drivers/tty/vt/keyboard.c
46340+++ b/drivers/tty/vt/keyboard.c
46341@@ -647,6 +647,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
46342 kbd->kbdmode == VC_OFF) &&
46343 value != KVAL(K_SAK))
46344 return; /* SAK is allowed even in raw mode */
46345+
46346+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
46347+ {
46348+ void *func = fn_handler[value];
46349+ if (func == fn_show_state || func == fn_show_ptregs ||
46350+ func == fn_show_mem)
46351+ return;
46352+ }
46353+#endif
46354+
46355 fn_handler[value](vc);
46356 }
46357
46358@@ -1795,9 +1805,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
46359 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
46360 return -EFAULT;
46361
46362- if (!capable(CAP_SYS_TTY_CONFIG))
46363- perm = 0;
46364-
46365 switch (cmd) {
46366 case KDGKBENT:
46367 /* Ensure another thread doesn't free it under us */
46368@@ -1812,6 +1819,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
46369 spin_unlock_irqrestore(&kbd_event_lock, flags);
46370 return put_user(val, &user_kbe->kb_value);
46371 case KDSKBENT:
46372+ if (!capable(CAP_SYS_TTY_CONFIG))
46373+ perm = 0;
46374+
46375 if (!perm)
46376 return -EPERM;
46377 if (!i && v == K_NOSUCHMAP) {
46378@@ -1902,9 +1912,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
46379 int i, j, k;
46380 int ret;
46381
46382- if (!capable(CAP_SYS_TTY_CONFIG))
46383- perm = 0;
46384-
46385 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
46386 if (!kbs) {
46387 ret = -ENOMEM;
46388@@ -1938,6 +1945,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
46389 kfree(kbs);
46390 return ((p && *p) ? -EOVERFLOW : 0);
46391 case KDSKBSENT:
46392+ if (!capable(CAP_SYS_TTY_CONFIG))
46393+ perm = 0;
46394+
46395 if (!perm) {
46396 ret = -EPERM;
46397 goto reterr;
46398diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
46399index b645c47..a55c182 100644
46400--- a/drivers/uio/uio.c
46401+++ b/drivers/uio/uio.c
46402@@ -25,6 +25,7 @@
46403 #include <linux/kobject.h>
46404 #include <linux/cdev.h>
46405 #include <linux/uio_driver.h>
46406+#include <asm/local.h>
46407
46408 #define UIO_MAX_DEVICES (1U << MINORBITS)
46409
46410@@ -32,10 +33,10 @@ struct uio_device {
46411 struct module *owner;
46412 struct device *dev;
46413 int minor;
46414- atomic_t event;
46415+ atomic_unchecked_t event;
46416 struct fasync_struct *async_queue;
46417 wait_queue_head_t wait;
46418- int vma_count;
46419+ local_t vma_count;
46420 struct uio_info *info;
46421 struct kobject *map_dir;
46422 struct kobject *portio_dir;
46423@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
46424 struct device_attribute *attr, char *buf)
46425 {
46426 struct uio_device *idev = dev_get_drvdata(dev);
46427- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
46428+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
46429 }
46430
46431 static struct device_attribute uio_class_attributes[] = {
46432@@ -398,7 +399,7 @@ void uio_event_notify(struct uio_info *info)
46433 {
46434 struct uio_device *idev = info->uio_dev;
46435
46436- atomic_inc(&idev->event);
46437+ atomic_inc_unchecked(&idev->event);
46438 wake_up_interruptible(&idev->wait);
46439 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
46440 }
46441@@ -451,7 +452,7 @@ static int uio_open(struct inode *inode, struct file *filep)
46442 }
46443
46444 listener->dev = idev;
46445- listener->event_count = atomic_read(&idev->event);
46446+ listener->event_count = atomic_read_unchecked(&idev->event);
46447 filep->private_data = listener;
46448
46449 if (idev->info->open) {
46450@@ -502,7 +503,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
46451 return -EIO;
46452
46453 poll_wait(filep, &idev->wait, wait);
46454- if (listener->event_count != atomic_read(&idev->event))
46455+ if (listener->event_count != atomic_read_unchecked(&idev->event))
46456 return POLLIN | POLLRDNORM;
46457 return 0;
46458 }
46459@@ -527,7 +528,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
46460 do {
46461 set_current_state(TASK_INTERRUPTIBLE);
46462
46463- event_count = atomic_read(&idev->event);
46464+ event_count = atomic_read_unchecked(&idev->event);
46465 if (event_count != listener->event_count) {
46466 if (copy_to_user(buf, &event_count, count))
46467 retval = -EFAULT;
46468@@ -596,13 +597,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
46469 static void uio_vma_open(struct vm_area_struct *vma)
46470 {
46471 struct uio_device *idev = vma->vm_private_data;
46472- idev->vma_count++;
46473+ local_inc(&idev->vma_count);
46474 }
46475
46476 static void uio_vma_close(struct vm_area_struct *vma)
46477 {
46478 struct uio_device *idev = vma->vm_private_data;
46479- idev->vma_count--;
46480+ local_dec(&idev->vma_count);
46481 }
46482
46483 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
46484@@ -809,7 +810,7 @@ int __uio_register_device(struct module *owner,
46485 idev->owner = owner;
46486 idev->info = info;
46487 init_waitqueue_head(&idev->wait);
46488- atomic_set(&idev->event, 0);
46489+ atomic_set_unchecked(&idev->event, 0);
46490
46491 ret = uio_get_minor(idev);
46492 if (ret)
46493diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
46494index 8a7eb77..c00402f 100644
46495--- a/drivers/usb/atm/cxacru.c
46496+++ b/drivers/usb/atm/cxacru.c
46497@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
46498 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
46499 if (ret < 2)
46500 return -EINVAL;
46501- if (index < 0 || index > 0x7f)
46502+ if (index > 0x7f)
46503 return -EINVAL;
46504 pos += tmp;
46505
46506diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
46507index d3527dd..26effa2 100644
46508--- a/drivers/usb/atm/usbatm.c
46509+++ b/drivers/usb/atm/usbatm.c
46510@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
46511 if (printk_ratelimit())
46512 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
46513 __func__, vpi, vci);
46514- atomic_inc(&vcc->stats->rx_err);
46515+ atomic_inc_unchecked(&vcc->stats->rx_err);
46516 return;
46517 }
46518
46519@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
46520 if (length > ATM_MAX_AAL5_PDU) {
46521 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
46522 __func__, length, vcc);
46523- atomic_inc(&vcc->stats->rx_err);
46524+ atomic_inc_unchecked(&vcc->stats->rx_err);
46525 goto out;
46526 }
46527
46528@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
46529 if (sarb->len < pdu_length) {
46530 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
46531 __func__, pdu_length, sarb->len, vcc);
46532- atomic_inc(&vcc->stats->rx_err);
46533+ atomic_inc_unchecked(&vcc->stats->rx_err);
46534 goto out;
46535 }
46536
46537 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
46538 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
46539 __func__, vcc);
46540- atomic_inc(&vcc->stats->rx_err);
46541+ atomic_inc_unchecked(&vcc->stats->rx_err);
46542 goto out;
46543 }
46544
46545@@ -389,7 +389,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
46546 if (printk_ratelimit())
46547 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
46548 __func__, length);
46549- atomic_inc(&vcc->stats->rx_drop);
46550+ atomic_inc_unchecked(&vcc->stats->rx_drop);
46551 goto out;
46552 }
46553
46554@@ -417,7 +417,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
46555
46556 vcc->push(vcc, skb);
46557
46558- atomic_inc(&vcc->stats->rx);
46559+ atomic_inc_unchecked(&vcc->stats->rx);
46560 out:
46561 skb_trim(sarb, 0);
46562 }
46563@@ -623,7 +623,7 @@ static void usbatm_tx_process(unsigned long data)
46564 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
46565
46566 usbatm_pop(vcc, skb);
46567- atomic_inc(&vcc->stats->tx);
46568+ atomic_inc_unchecked(&vcc->stats->tx);
46569
46570 skb = skb_dequeue(&instance->sndqueue);
46571 }
46572@@ -779,11 +779,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
46573 if (!left--)
46574 return sprintf(page,
46575 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
46576- atomic_read(&atm_dev->stats.aal5.tx),
46577- atomic_read(&atm_dev->stats.aal5.tx_err),
46578- atomic_read(&atm_dev->stats.aal5.rx),
46579- atomic_read(&atm_dev->stats.aal5.rx_err),
46580- atomic_read(&atm_dev->stats.aal5.rx_drop));
46581+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
46582+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
46583+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
46584+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
46585+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
46586
46587 if (!left--) {
46588 if (instance->disconnected)
46589diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
46590index 2a3bbdf..91d72cf 100644
46591--- a/drivers/usb/core/devices.c
46592+++ b/drivers/usb/core/devices.c
46593@@ -126,7 +126,7 @@ static const char format_endpt[] =
46594 * time it gets called.
46595 */
46596 static struct device_connect_event {
46597- atomic_t count;
46598+ atomic_unchecked_t count;
46599 wait_queue_head_t wait;
46600 } device_event = {
46601 .count = ATOMIC_INIT(1),
46602@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
46603
46604 void usbfs_conn_disc_event(void)
46605 {
46606- atomic_add(2, &device_event.count);
46607+ atomic_add_unchecked(2, &device_event.count);
46608 wake_up(&device_event.wait);
46609 }
46610
46611@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
46612
46613 poll_wait(file, &device_event.wait, wait);
46614
46615- event_count = atomic_read(&device_event.count);
46616+ event_count = atomic_read_unchecked(&device_event.count);
46617 if (file->f_version != event_count) {
46618 file->f_version = event_count;
46619 return POLLIN | POLLRDNORM;
46620diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
46621index d53547d..6a22d02 100644
46622--- a/drivers/usb/core/hcd.c
46623+++ b/drivers/usb/core/hcd.c
46624@@ -1526,7 +1526,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
46625 */
46626 usb_get_urb(urb);
46627 atomic_inc(&urb->use_count);
46628- atomic_inc(&urb->dev->urbnum);
46629+ atomic_inc_unchecked(&urb->dev->urbnum);
46630 usbmon_urb_submit(&hcd->self, urb);
46631
46632 /* NOTE requirements on root-hub callers (usbfs and the hub
46633@@ -1553,7 +1553,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
46634 urb->hcpriv = NULL;
46635 INIT_LIST_HEAD(&urb->urb_list);
46636 atomic_dec(&urb->use_count);
46637- atomic_dec(&urb->dev->urbnum);
46638+ atomic_dec_unchecked(&urb->dev->urbnum);
46639 if (atomic_read(&urb->reject))
46640 wake_up(&usb_kill_urb_queue);
46641 usb_put_urb(urb);
46642diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
46643index 444d30e..f15c850 100644
46644--- a/drivers/usb/core/message.c
46645+++ b/drivers/usb/core/message.c
46646@@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
46647 * method can wait for it to complete. Since you don't have a handle on the
46648 * URB used, you can't cancel the request.
46649 */
46650-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
46651+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
46652 __u8 requesttype, __u16 value, __u16 index, void *data,
46653 __u16 size, int timeout)
46654 {
46655diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
46656index aa38db4..0a08682 100644
46657--- a/drivers/usb/core/sysfs.c
46658+++ b/drivers/usb/core/sysfs.c
46659@@ -239,7 +239,7 @@ show_urbnum(struct device *dev, struct device_attribute *attr, char *buf)
46660 struct usb_device *udev;
46661
46662 udev = to_usb_device(dev);
46663- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
46664+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
46665 }
46666 static DEVICE_ATTR(urbnum, S_IRUGO, show_urbnum, NULL);
46667
46668diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
46669index b10da72..43aa0b2 100644
46670--- a/drivers/usb/core/usb.c
46671+++ b/drivers/usb/core/usb.c
46672@@ -389,7 +389,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
46673 set_dev_node(&dev->dev, dev_to_node(bus->controller));
46674 dev->state = USB_STATE_ATTACHED;
46675 dev->lpm_disable_count = 1;
46676- atomic_set(&dev->urbnum, 0);
46677+ atomic_set_unchecked(&dev->urbnum, 0);
46678
46679 INIT_LIST_HEAD(&dev->ep0.urb_list);
46680 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
46681diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
46682index 5e29dde..eca992f 100644
46683--- a/drivers/usb/early/ehci-dbgp.c
46684+++ b/drivers/usb/early/ehci-dbgp.c
46685@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
46686
46687 #ifdef CONFIG_KGDB
46688 static struct kgdb_io kgdbdbgp_io_ops;
46689-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
46690+static struct kgdb_io kgdbdbgp_io_ops_console;
46691+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
46692 #else
46693 #define dbgp_kgdb_mode (0)
46694 #endif
46695@@ -1047,6 +1048,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
46696 .write_char = kgdbdbgp_write_char,
46697 };
46698
46699+static struct kgdb_io kgdbdbgp_io_ops_console = {
46700+ .name = "kgdbdbgp",
46701+ .read_char = kgdbdbgp_read_char,
46702+ .write_char = kgdbdbgp_write_char,
46703+ .is_console = 1
46704+};
46705+
46706 static int kgdbdbgp_wait_time;
46707
46708 static int __init kgdbdbgp_parse_config(char *str)
46709@@ -1062,8 +1070,10 @@ static int __init kgdbdbgp_parse_config(char *str)
46710 ptr++;
46711 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
46712 }
46713- kgdb_register_io_module(&kgdbdbgp_io_ops);
46714- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
46715+ if (early_dbgp_console.index != -1)
46716+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
46717+ else
46718+ kgdb_register_io_module(&kgdbdbgp_io_ops);
46719
46720 return 0;
46721 }
46722diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
46723index b369292..9f3ba40 100644
46724--- a/drivers/usb/gadget/u_serial.c
46725+++ b/drivers/usb/gadget/u_serial.c
46726@@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
46727 spin_lock_irq(&port->port_lock);
46728
46729 /* already open? Great. */
46730- if (port->port.count) {
46731+ if (atomic_read(&port->port.count)) {
46732 status = 0;
46733- port->port.count++;
46734+ atomic_inc(&port->port.count);
46735
46736 /* currently opening/closing? wait ... */
46737 } else if (port->openclose) {
46738@@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
46739 tty->driver_data = port;
46740 port->port.tty = tty;
46741
46742- port->port.count = 1;
46743+ atomic_set(&port->port.count, 1);
46744 port->openclose = false;
46745
46746 /* if connected, start the I/O stream */
46747@@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
46748
46749 spin_lock_irq(&port->port_lock);
46750
46751- if (port->port.count != 1) {
46752- if (port->port.count == 0)
46753+ if (atomic_read(&port->port.count) != 1) {
46754+ if (atomic_read(&port->port.count) == 0)
46755 WARN_ON(1);
46756 else
46757- --port->port.count;
46758+ atomic_dec(&port->port.count);
46759 goto exit;
46760 }
46761
46762@@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
46763 * and sleep if necessary
46764 */
46765 port->openclose = true;
46766- port->port.count = 0;
46767+ atomic_set(&port->port.count, 0);
46768
46769 gser = port->port_usb;
46770 if (gser && gser->disconnect)
46771@@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
46772 int cond;
46773
46774 spin_lock_irq(&port->port_lock);
46775- cond = (port->port.count == 0) && !port->openclose;
46776+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
46777 spin_unlock_irq(&port->port_lock);
46778 return cond;
46779 }
46780@@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
46781 /* if it's already open, start I/O ... and notify the serial
46782 * protocol about open/close status (connect/disconnect).
46783 */
46784- if (port->port.count) {
46785+ if (atomic_read(&port->port.count)) {
46786 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
46787 gs_start_io(port);
46788 if (gser->connect)
46789@@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
46790
46791 port->port_usb = NULL;
46792 gser->ioport = NULL;
46793- if (port->port.count > 0 || port->openclose) {
46794+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
46795 wake_up_interruptible(&port->drain_wait);
46796 if (port->port.tty)
46797 tty_hangup(port->port.tty);
46798@@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
46799
46800 /* finally, free any unused/unusable I/O buffers */
46801 spin_lock_irqsave(&port->port_lock, flags);
46802- if (port->port.count == 0 && !port->openclose)
46803+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
46804 gs_buf_free(&port->port_write_buf);
46805 gs_free_requests(gser->out, &port->read_pool, NULL);
46806 gs_free_requests(gser->out, &port->read_queue, NULL);
46807diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
46808index 5f3bcd3..bfca43f 100644
46809--- a/drivers/usb/serial/console.c
46810+++ b/drivers/usb/serial/console.c
46811@@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
46812
46813 info->port = port;
46814
46815- ++port->port.count;
46816+ atomic_inc(&port->port.count);
46817 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
46818 if (serial->type->set_termios) {
46819 /*
46820@@ -174,7 +174,7 @@ static int usb_console_setup(struct console *co, char *options)
46821 }
46822 /* Now that any required fake tty operations are completed restore
46823 * the tty port count */
46824- --port->port.count;
46825+ atomic_dec(&port->port.count);
46826 /* The console is special in terms of closing the device so
46827 * indicate this port is now acting as a system console. */
46828 port->port.console = 1;
46829@@ -187,7 +187,7 @@ static int usb_console_setup(struct console *co, char *options)
46830 free_tty:
46831 kfree(tty);
46832 reset_open_count:
46833- port->port.count = 0;
46834+ atomic_set(&port->port.count, 0);
46835 usb_autopm_put_interface(serial->interface);
46836 error_get_interface:
46837 usb_serial_put(serial);
46838diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
46839index 75f70f0..d467e1a 100644
46840--- a/drivers/usb/storage/usb.h
46841+++ b/drivers/usb/storage/usb.h
46842@@ -63,7 +63,7 @@ struct us_unusual_dev {
46843 __u8 useProtocol;
46844 __u8 useTransport;
46845 int (*initFunction)(struct us_data *);
46846-};
46847+} __do_const;
46848
46849
46850 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
46851diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
46852index d6bea3e..60b250e 100644
46853--- a/drivers/usb/wusbcore/wa-hc.h
46854+++ b/drivers/usb/wusbcore/wa-hc.h
46855@@ -192,7 +192,7 @@ struct wahc {
46856 struct list_head xfer_delayed_list;
46857 spinlock_t xfer_list_lock;
46858 struct work_struct xfer_work;
46859- atomic_t xfer_id_count;
46860+ atomic_unchecked_t xfer_id_count;
46861 };
46862
46863
46864@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
46865 INIT_LIST_HEAD(&wa->xfer_delayed_list);
46866 spin_lock_init(&wa->xfer_list_lock);
46867 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
46868- atomic_set(&wa->xfer_id_count, 1);
46869+ atomic_set_unchecked(&wa->xfer_id_count, 1);
46870 }
46871
46872 /**
46873diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
46874index 028fc83..65bb105 100644
46875--- a/drivers/usb/wusbcore/wa-xfer.c
46876+++ b/drivers/usb/wusbcore/wa-xfer.c
46877@@ -296,7 +296,7 @@ out:
46878 */
46879 static void wa_xfer_id_init(struct wa_xfer *xfer)
46880 {
46881- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
46882+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
46883 }
46884
46885 /*
46886diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
46887index 5174eba..86e764a 100644
46888--- a/drivers/vhost/vringh.c
46889+++ b/drivers/vhost/vringh.c
46890@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
46891
46892 static inline int putu16_kern(u16 *p, u16 val)
46893 {
46894- ACCESS_ONCE(*p) = val;
46895+ ACCESS_ONCE_RW(*p) = val;
46896 return 0;
46897 }
46898
46899diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
46900index 8c55011..eed4ae1a 100644
46901--- a/drivers/video/aty/aty128fb.c
46902+++ b/drivers/video/aty/aty128fb.c
46903@@ -149,7 +149,7 @@ enum {
46904 };
46905
46906 /* Must match above enum */
46907-static char * const r128_family[] = {
46908+static const char * const r128_family[] = {
46909 "AGP",
46910 "PCI",
46911 "PRO AGP",
46912diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
46913index 4f27fdc..d3537e6 100644
46914--- a/drivers/video/aty/atyfb_base.c
46915+++ b/drivers/video/aty/atyfb_base.c
46916@@ -1325,10 +1325,14 @@ static int atyfb_set_par(struct fb_info *info)
46917 par->accel_flags = var->accel_flags; /* hack */
46918
46919 if (var->accel_flags) {
46920- info->fbops->fb_sync = atyfb_sync;
46921+ pax_open_kernel();
46922+ *(void **)&info->fbops->fb_sync = atyfb_sync;
46923+ pax_close_kernel();
46924 info->flags &= ~FBINFO_HWACCEL_DISABLED;
46925 } else {
46926- info->fbops->fb_sync = NULL;
46927+ pax_open_kernel();
46928+ *(void **)&info->fbops->fb_sync = NULL;
46929+ pax_close_kernel();
46930 info->flags |= FBINFO_HWACCEL_DISABLED;
46931 }
46932
46933diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c
46934index 95ec042..e6affdd 100644
46935--- a/drivers/video/aty/mach64_cursor.c
46936+++ b/drivers/video/aty/mach64_cursor.c
46937@@ -7,6 +7,7 @@
46938 #include <linux/string.h>
46939
46940 #include <asm/io.h>
46941+#include <asm/pgtable.h>
46942
46943 #ifdef __sparc__
46944 #include <asm/fbio.h>
46945@@ -208,7 +209,9 @@ int aty_init_cursor(struct fb_info *info)
46946 info->sprite.buf_align = 16; /* and 64 lines tall. */
46947 info->sprite.flags = FB_PIXMAP_IO;
46948
46949- info->fbops->fb_cursor = atyfb_cursor;
46950+ pax_open_kernel();
46951+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
46952+ pax_close_kernel();
46953
46954 return 0;
46955 }
46956diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
46957index c74e7aa..e3c2790 100644
46958--- a/drivers/video/backlight/backlight.c
46959+++ b/drivers/video/backlight/backlight.c
46960@@ -304,7 +304,7 @@ struct backlight_device *backlight_device_register(const char *name,
46961 new_bd->dev.class = backlight_class;
46962 new_bd->dev.parent = parent;
46963 new_bd->dev.release = bl_device_release;
46964- dev_set_name(&new_bd->dev, name);
46965+ dev_set_name(&new_bd->dev, "%s", name);
46966 dev_set_drvdata(&new_bd->dev, devdata);
46967
46968 /* Set default properties */
46969diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
46970index bca6ccc..252107e 100644
46971--- a/drivers/video/backlight/kb3886_bl.c
46972+++ b/drivers/video/backlight/kb3886_bl.c
46973@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
46974 static unsigned long kb3886bl_flags;
46975 #define KB3886BL_SUSPENDED 0x01
46976
46977-static struct dmi_system_id __initdata kb3886bl_device_table[] = {
46978+static const struct dmi_system_id __initconst kb3886bl_device_table[] = {
46979 {
46980 .ident = "Sahara Touch-iT",
46981 .matches = {
46982diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
46983index 34fb6bd..3649fd9 100644
46984--- a/drivers/video/backlight/lcd.c
46985+++ b/drivers/video/backlight/lcd.c
46986@@ -219,7 +219,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent,
46987 new_ld->dev.class = lcd_class;
46988 new_ld->dev.parent = parent;
46989 new_ld->dev.release = lcd_device_release;
46990- dev_set_name(&new_ld->dev, name);
46991+ dev_set_name(&new_ld->dev, "%s", name);
46992 dev_set_drvdata(&new_ld->dev, devdata);
46993
46994 rc = device_register(&new_ld->dev);
46995diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
46996index 900aa4e..6d49418 100644
46997--- a/drivers/video/fb_defio.c
46998+++ b/drivers/video/fb_defio.c
46999@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
47000
47001 BUG_ON(!fbdefio);
47002 mutex_init(&fbdefio->lock);
47003- info->fbops->fb_mmap = fb_deferred_io_mmap;
47004+ pax_open_kernel();
47005+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
47006+ pax_close_kernel();
47007 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
47008 INIT_LIST_HEAD(&fbdefio->pagelist);
47009 if (fbdefio->delay == 0) /* set a default of 1 s */
47010@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
47011 page->mapping = NULL;
47012 }
47013
47014- info->fbops->fb_mmap = NULL;
47015+ *(void **)&info->fbops->fb_mmap = NULL;
47016 mutex_destroy(&fbdefio->lock);
47017 }
47018 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
47019diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
47020index 5c3960d..15cf8fc 100644
47021--- a/drivers/video/fbcmap.c
47022+++ b/drivers/video/fbcmap.c
47023@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
47024 rc = -ENODEV;
47025 goto out;
47026 }
47027- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
47028- !info->fbops->fb_setcmap)) {
47029+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
47030 rc = -EINVAL;
47031 goto out1;
47032 }
47033diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
47034index 098bfc6..796841d 100644
47035--- a/drivers/video/fbmem.c
47036+++ b/drivers/video/fbmem.c
47037@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
47038 image->dx += image->width + 8;
47039 }
47040 } else if (rotate == FB_ROTATE_UD) {
47041- for (x = 0; x < num && image->dx >= 0; x++) {
47042+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
47043 info->fbops->fb_imageblit(info, image);
47044 image->dx -= image->width + 8;
47045 }
47046@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
47047 image->dy += image->height + 8;
47048 }
47049 } else if (rotate == FB_ROTATE_CCW) {
47050- for (x = 0; x < num && image->dy >= 0; x++) {
47051+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
47052 info->fbops->fb_imageblit(info, image);
47053 image->dy -= image->height + 8;
47054 }
47055@@ -1166,7 +1166,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
47056 return -EFAULT;
47057 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
47058 return -EINVAL;
47059- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
47060+ if (con2fb.framebuffer >= FB_MAX)
47061 return -EINVAL;
47062 if (!registered_fb[con2fb.framebuffer])
47063 request_module("fb%d", con2fb.framebuffer);
47064diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
47065index 7672d2e..b56437f 100644
47066--- a/drivers/video/i810/i810_accel.c
47067+++ b/drivers/video/i810/i810_accel.c
47068@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
47069 }
47070 }
47071 printk("ringbuffer lockup!!!\n");
47072+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
47073 i810_report_error(mmio);
47074 par->dev_flags |= LOCKUP;
47075 info->pixmap.scan_align = 1;
47076diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
47077index 3c14e43..eafa544 100644
47078--- a/drivers/video/logo/logo_linux_clut224.ppm
47079+++ b/drivers/video/logo/logo_linux_clut224.ppm
47080@@ -1,1604 +1,1123 @@
47081 P3
47082-# Standard 224-color Linux logo
47083 80 80
47084 255
47085- 0 0 0 0 0 0 0 0 0 0 0 0
47086- 0 0 0 0 0 0 0 0 0 0 0 0
47087- 0 0 0 0 0 0 0 0 0 0 0 0
47088- 0 0 0 0 0 0 0 0 0 0 0 0
47089- 0 0 0 0 0 0 0 0 0 0 0 0
47090- 0 0 0 0 0 0 0 0 0 0 0 0
47091- 0 0 0 0 0 0 0 0 0 0 0 0
47092- 0 0 0 0 0 0 0 0 0 0 0 0
47093- 0 0 0 0 0 0 0 0 0 0 0 0
47094- 6 6 6 6 6 6 10 10 10 10 10 10
47095- 10 10 10 6 6 6 6 6 6 6 6 6
47096- 0 0 0 0 0 0 0 0 0 0 0 0
47097- 0 0 0 0 0 0 0 0 0 0 0 0
47098- 0 0 0 0 0 0 0 0 0 0 0 0
47099- 0 0 0 0 0 0 0 0 0 0 0 0
47100- 0 0 0 0 0 0 0 0 0 0 0 0
47101- 0 0 0 0 0 0 0 0 0 0 0 0
47102- 0 0 0 0 0 0 0 0 0 0 0 0
47103- 0 0 0 0 0 0 0 0 0 0 0 0
47104- 0 0 0 0 0 0 0 0 0 0 0 0
47105- 0 0 0 0 0 0 0 0 0 0 0 0
47106- 0 0 0 0 0 0 0 0 0 0 0 0
47107- 0 0 0 0 0 0 0 0 0 0 0 0
47108- 0 0 0 0 0 0 0 0 0 0 0 0
47109- 0 0 0 0 0 0 0 0 0 0 0 0
47110- 0 0 0 0 0 0 0 0 0 0 0 0
47111- 0 0 0 0 0 0 0 0 0 0 0 0
47112- 0 0 0 0 0 0 0 0 0 0 0 0
47113- 0 0 0 6 6 6 10 10 10 14 14 14
47114- 22 22 22 26 26 26 30 30 30 34 34 34
47115- 30 30 30 30 30 30 26 26 26 18 18 18
47116- 14 14 14 10 10 10 6 6 6 0 0 0
47117- 0 0 0 0 0 0 0 0 0 0 0 0
47118- 0 0 0 0 0 0 0 0 0 0 0 0
47119- 0 0 0 0 0 0 0 0 0 0 0 0
47120- 0 0 0 0 0 0 0 0 0 0 0 0
47121- 0 0 0 0 0 0 0 0 0 0 0 0
47122- 0 0 0 0 0 0 0 0 0 0 0 0
47123- 0 0 0 0 0 0 0 0 0 0 0 0
47124- 0 0 0 0 0 0 0 0 0 0 0 0
47125- 0 0 0 0 0 0 0 0 0 0 0 0
47126- 0 0 0 0 0 1 0 0 1 0 0 0
47127- 0 0 0 0 0 0 0 0 0 0 0 0
47128- 0 0 0 0 0 0 0 0 0 0 0 0
47129- 0 0 0 0 0 0 0 0 0 0 0 0
47130- 0 0 0 0 0 0 0 0 0 0 0 0
47131- 0 0 0 0 0 0 0 0 0 0 0 0
47132- 0 0 0 0 0 0 0 0 0 0 0 0
47133- 6 6 6 14 14 14 26 26 26 42 42 42
47134- 54 54 54 66 66 66 78 78 78 78 78 78
47135- 78 78 78 74 74 74 66 66 66 54 54 54
47136- 42 42 42 26 26 26 18 18 18 10 10 10
47137- 6 6 6 0 0 0 0 0 0 0 0 0
47138- 0 0 0 0 0 0 0 0 0 0 0 0
47139- 0 0 0 0 0 0 0 0 0 0 0 0
47140- 0 0 0 0 0 0 0 0 0 0 0 0
47141- 0 0 0 0 0 0 0 0 0 0 0 0
47142- 0 0 0 0 0 0 0 0 0 0 0 0
47143- 0 0 0 0 0 0 0 0 0 0 0 0
47144- 0 0 0 0 0 0 0 0 0 0 0 0
47145- 0 0 0 0 0 0 0 0 0 0 0 0
47146- 0 0 1 0 0 0 0 0 0 0 0 0
47147- 0 0 0 0 0 0 0 0 0 0 0 0
47148- 0 0 0 0 0 0 0 0 0 0 0 0
47149- 0 0 0 0 0 0 0 0 0 0 0 0
47150- 0 0 0 0 0 0 0 0 0 0 0 0
47151- 0 0 0 0 0 0 0 0 0 0 0 0
47152- 0 0 0 0 0 0 0 0 0 10 10 10
47153- 22 22 22 42 42 42 66 66 66 86 86 86
47154- 66 66 66 38 38 38 38 38 38 22 22 22
47155- 26 26 26 34 34 34 54 54 54 66 66 66
47156- 86 86 86 70 70 70 46 46 46 26 26 26
47157- 14 14 14 6 6 6 0 0 0 0 0 0
47158- 0 0 0 0 0 0 0 0 0 0 0 0
47159- 0 0 0 0 0 0 0 0 0 0 0 0
47160- 0 0 0 0 0 0 0 0 0 0 0 0
47161- 0 0 0 0 0 0 0 0 0 0 0 0
47162- 0 0 0 0 0 0 0 0 0 0 0 0
47163- 0 0 0 0 0 0 0 0 0 0 0 0
47164- 0 0 0 0 0 0 0 0 0 0 0 0
47165- 0 0 0 0 0 0 0 0 0 0 0 0
47166- 0 0 1 0 0 1 0 0 1 0 0 0
47167- 0 0 0 0 0 0 0 0 0 0 0 0
47168- 0 0 0 0 0 0 0 0 0 0 0 0
47169- 0 0 0 0 0 0 0 0 0 0 0 0
47170- 0 0 0 0 0 0 0 0 0 0 0 0
47171- 0 0 0 0 0 0 0 0 0 0 0 0
47172- 0 0 0 0 0 0 10 10 10 26 26 26
47173- 50 50 50 82 82 82 58 58 58 6 6 6
47174- 2 2 6 2 2 6 2 2 6 2 2 6
47175- 2 2 6 2 2 6 2 2 6 2 2 6
47176- 6 6 6 54 54 54 86 86 86 66 66 66
47177- 38 38 38 18 18 18 6 6 6 0 0 0
47178- 0 0 0 0 0 0 0 0 0 0 0 0
47179- 0 0 0 0 0 0 0 0 0 0 0 0
47180- 0 0 0 0 0 0 0 0 0 0 0 0
47181- 0 0 0 0 0 0 0 0 0 0 0 0
47182- 0 0 0 0 0 0 0 0 0 0 0 0
47183- 0 0 0 0 0 0 0 0 0 0 0 0
47184- 0 0 0 0 0 0 0 0 0 0 0 0
47185- 0 0 0 0 0 0 0 0 0 0 0 0
47186- 0 0 0 0 0 0 0 0 0 0 0 0
47187- 0 0 0 0 0 0 0 0 0 0 0 0
47188- 0 0 0 0 0 0 0 0 0 0 0 0
47189- 0 0 0 0 0 0 0 0 0 0 0 0
47190- 0 0 0 0 0 0 0 0 0 0 0 0
47191- 0 0 0 0 0 0 0 0 0 0 0 0
47192- 0 0 0 6 6 6 22 22 22 50 50 50
47193- 78 78 78 34 34 34 2 2 6 2 2 6
47194- 2 2 6 2 2 6 2 2 6 2 2 6
47195- 2 2 6 2 2 6 2 2 6 2 2 6
47196- 2 2 6 2 2 6 6 6 6 70 70 70
47197- 78 78 78 46 46 46 22 22 22 6 6 6
47198- 0 0 0 0 0 0 0 0 0 0 0 0
47199- 0 0 0 0 0 0 0 0 0 0 0 0
47200- 0 0 0 0 0 0 0 0 0 0 0 0
47201- 0 0 0 0 0 0 0 0 0 0 0 0
47202- 0 0 0 0 0 0 0 0 0 0 0 0
47203- 0 0 0 0 0 0 0 0 0 0 0 0
47204- 0 0 0 0 0 0 0 0 0 0 0 0
47205- 0 0 0 0 0 0 0 0 0 0 0 0
47206- 0 0 1 0 0 1 0 0 1 0 0 0
47207- 0 0 0 0 0 0 0 0 0 0 0 0
47208- 0 0 0 0 0 0 0 0 0 0 0 0
47209- 0 0 0 0 0 0 0 0 0 0 0 0
47210- 0 0 0 0 0 0 0 0 0 0 0 0
47211- 0 0 0 0 0 0 0 0 0 0 0 0
47212- 6 6 6 18 18 18 42 42 42 82 82 82
47213- 26 26 26 2 2 6 2 2 6 2 2 6
47214- 2 2 6 2 2 6 2 2 6 2 2 6
47215- 2 2 6 2 2 6 2 2 6 14 14 14
47216- 46 46 46 34 34 34 6 6 6 2 2 6
47217- 42 42 42 78 78 78 42 42 42 18 18 18
47218- 6 6 6 0 0 0 0 0 0 0 0 0
47219- 0 0 0 0 0 0 0 0 0 0 0 0
47220- 0 0 0 0 0 0 0 0 0 0 0 0
47221- 0 0 0 0 0 0 0 0 0 0 0 0
47222- 0 0 0 0 0 0 0 0 0 0 0 0
47223- 0 0 0 0 0 0 0 0 0 0 0 0
47224- 0 0 0 0 0 0 0 0 0 0 0 0
47225- 0 0 0 0 0 0 0 0 0 0 0 0
47226- 0 0 1 0 0 0 0 0 1 0 0 0
47227- 0 0 0 0 0 0 0 0 0 0 0 0
47228- 0 0 0 0 0 0 0 0 0 0 0 0
47229- 0 0 0 0 0 0 0 0 0 0 0 0
47230- 0 0 0 0 0 0 0 0 0 0 0 0
47231- 0 0 0 0 0 0 0 0 0 0 0 0
47232- 10 10 10 30 30 30 66 66 66 58 58 58
47233- 2 2 6 2 2 6 2 2 6 2 2 6
47234- 2 2 6 2 2 6 2 2 6 2 2 6
47235- 2 2 6 2 2 6 2 2 6 26 26 26
47236- 86 86 86 101 101 101 46 46 46 10 10 10
47237- 2 2 6 58 58 58 70 70 70 34 34 34
47238- 10 10 10 0 0 0 0 0 0 0 0 0
47239- 0 0 0 0 0 0 0 0 0 0 0 0
47240- 0 0 0 0 0 0 0 0 0 0 0 0
47241- 0 0 0 0 0 0 0 0 0 0 0 0
47242- 0 0 0 0 0 0 0 0 0 0 0 0
47243- 0 0 0 0 0 0 0 0 0 0 0 0
47244- 0 0 0 0 0 0 0 0 0 0 0 0
47245- 0 0 0 0 0 0 0 0 0 0 0 0
47246- 0 0 1 0 0 1 0 0 1 0 0 0
47247- 0 0 0 0 0 0 0 0 0 0 0 0
47248- 0 0 0 0 0 0 0 0 0 0 0 0
47249- 0 0 0 0 0 0 0 0 0 0 0 0
47250- 0 0 0 0 0 0 0 0 0 0 0 0
47251- 0 0 0 0 0 0 0 0 0 0 0 0
47252- 14 14 14 42 42 42 86 86 86 10 10 10
47253- 2 2 6 2 2 6 2 2 6 2 2 6
47254- 2 2 6 2 2 6 2 2 6 2 2 6
47255- 2 2 6 2 2 6 2 2 6 30 30 30
47256- 94 94 94 94 94 94 58 58 58 26 26 26
47257- 2 2 6 6 6 6 78 78 78 54 54 54
47258- 22 22 22 6 6 6 0 0 0 0 0 0
47259- 0 0 0 0 0 0 0 0 0 0 0 0
47260- 0 0 0 0 0 0 0 0 0 0 0 0
47261- 0 0 0 0 0 0 0 0 0 0 0 0
47262- 0 0 0 0 0 0 0 0 0 0 0 0
47263- 0 0 0 0 0 0 0 0 0 0 0 0
47264- 0 0 0 0 0 0 0 0 0 0 0 0
47265- 0 0 0 0 0 0 0 0 0 0 0 0
47266- 0 0 0 0 0 0 0 0 0 0 0 0
47267- 0 0 0 0 0 0 0 0 0 0 0 0
47268- 0 0 0 0 0 0 0 0 0 0 0 0
47269- 0 0 0 0 0 0 0 0 0 0 0 0
47270- 0 0 0 0 0 0 0 0 0 0 0 0
47271- 0 0 0 0 0 0 0 0 0 6 6 6
47272- 22 22 22 62 62 62 62 62 62 2 2 6
47273- 2 2 6 2 2 6 2 2 6 2 2 6
47274- 2 2 6 2 2 6 2 2 6 2 2 6
47275- 2 2 6 2 2 6 2 2 6 26 26 26
47276- 54 54 54 38 38 38 18 18 18 10 10 10
47277- 2 2 6 2 2 6 34 34 34 82 82 82
47278- 38 38 38 14 14 14 0 0 0 0 0 0
47279- 0 0 0 0 0 0 0 0 0 0 0 0
47280- 0 0 0 0 0 0 0 0 0 0 0 0
47281- 0 0 0 0 0 0 0 0 0 0 0 0
47282- 0 0 0 0 0 0 0 0 0 0 0 0
47283- 0 0 0 0 0 0 0 0 0 0 0 0
47284- 0 0 0 0 0 0 0 0 0 0 0 0
47285- 0 0 0 0 0 0 0 0 0 0 0 0
47286- 0 0 0 0 0 1 0 0 1 0 0 0
47287- 0 0 0 0 0 0 0 0 0 0 0 0
47288- 0 0 0 0 0 0 0 0 0 0 0 0
47289- 0 0 0 0 0 0 0 0 0 0 0 0
47290- 0 0 0 0 0 0 0 0 0 0 0 0
47291- 0 0 0 0 0 0 0 0 0 6 6 6
47292- 30 30 30 78 78 78 30 30 30 2 2 6
47293- 2 2 6 2 2 6 2 2 6 2 2 6
47294- 2 2 6 2 2 6 2 2 6 2 2 6
47295- 2 2 6 2 2 6 2 2 6 10 10 10
47296- 10 10 10 2 2 6 2 2 6 2 2 6
47297- 2 2 6 2 2 6 2 2 6 78 78 78
47298- 50 50 50 18 18 18 6 6 6 0 0 0
47299- 0 0 0 0 0 0 0 0 0 0 0 0
47300- 0 0 0 0 0 0 0 0 0 0 0 0
47301- 0 0 0 0 0 0 0 0 0 0 0 0
47302- 0 0 0 0 0 0 0 0 0 0 0 0
47303- 0 0 0 0 0 0 0 0 0 0 0 0
47304- 0 0 0 0 0 0 0 0 0 0 0 0
47305- 0 0 0 0 0 0 0 0 0 0 0 0
47306- 0 0 1 0 0 0 0 0 0 0 0 0
47307- 0 0 0 0 0 0 0 0 0 0 0 0
47308- 0 0 0 0 0 0 0 0 0 0 0 0
47309- 0 0 0 0 0 0 0 0 0 0 0 0
47310- 0 0 0 0 0 0 0 0 0 0 0 0
47311- 0 0 0 0 0 0 0 0 0 10 10 10
47312- 38 38 38 86 86 86 14 14 14 2 2 6
47313- 2 2 6 2 2 6 2 2 6 2 2 6
47314- 2 2 6 2 2 6 2 2 6 2 2 6
47315- 2 2 6 2 2 6 2 2 6 2 2 6
47316- 2 2 6 2 2 6 2 2 6 2 2 6
47317- 2 2 6 2 2 6 2 2 6 54 54 54
47318- 66 66 66 26 26 26 6 6 6 0 0 0
47319- 0 0 0 0 0 0 0 0 0 0 0 0
47320- 0 0 0 0 0 0 0 0 0 0 0 0
47321- 0 0 0 0 0 0 0 0 0 0 0 0
47322- 0 0 0 0 0 0 0 0 0 0 0 0
47323- 0 0 0 0 0 0 0 0 0 0 0 0
47324- 0 0 0 0 0 0 0 0 0 0 0 0
47325- 0 0 0 0 0 0 0 0 0 0 0 0
47326- 0 0 0 0 0 1 0 0 1 0 0 0
47327- 0 0 0 0 0 0 0 0 0 0 0 0
47328- 0 0 0 0 0 0 0 0 0 0 0 0
47329- 0 0 0 0 0 0 0 0 0 0 0 0
47330- 0 0 0 0 0 0 0 0 0 0 0 0
47331- 0 0 0 0 0 0 0 0 0 14 14 14
47332- 42 42 42 82 82 82 2 2 6 2 2 6
47333- 2 2 6 6 6 6 10 10 10 2 2 6
47334- 2 2 6 2 2 6 2 2 6 2 2 6
47335- 2 2 6 2 2 6 2 2 6 6 6 6
47336- 14 14 14 10 10 10 2 2 6 2 2 6
47337- 2 2 6 2 2 6 2 2 6 18 18 18
47338- 82 82 82 34 34 34 10 10 10 0 0 0
47339- 0 0 0 0 0 0 0 0 0 0 0 0
47340- 0 0 0 0 0 0 0 0 0 0 0 0
47341- 0 0 0 0 0 0 0 0 0 0 0 0
47342- 0 0 0 0 0 0 0 0 0 0 0 0
47343- 0 0 0 0 0 0 0 0 0 0 0 0
47344- 0 0 0 0 0 0 0 0 0 0 0 0
47345- 0 0 0 0 0 0 0 0 0 0 0 0
47346- 0 0 1 0 0 0 0 0 0 0 0 0
47347- 0 0 0 0 0 0 0 0 0 0 0 0
47348- 0 0 0 0 0 0 0 0 0 0 0 0
47349- 0 0 0 0 0 0 0 0 0 0 0 0
47350- 0 0 0 0 0 0 0 0 0 0 0 0
47351- 0 0 0 0 0 0 0 0 0 14 14 14
47352- 46 46 46 86 86 86 2 2 6 2 2 6
47353- 6 6 6 6 6 6 22 22 22 34 34 34
47354- 6 6 6 2 2 6 2 2 6 2 2 6
47355- 2 2 6 2 2 6 18 18 18 34 34 34
47356- 10 10 10 50 50 50 22 22 22 2 2 6
47357- 2 2 6 2 2 6 2 2 6 10 10 10
47358- 86 86 86 42 42 42 14 14 14 0 0 0
47359- 0 0 0 0 0 0 0 0 0 0 0 0
47360- 0 0 0 0 0 0 0 0 0 0 0 0
47361- 0 0 0 0 0 0 0 0 0 0 0 0
47362- 0 0 0 0 0 0 0 0 0 0 0 0
47363- 0 0 0 0 0 0 0 0 0 0 0 0
47364- 0 0 0 0 0 0 0 0 0 0 0 0
47365- 0 0 0 0 0 0 0 0 0 0 0 0
47366- 0 0 1 0 0 1 0 0 1 0 0 0
47367- 0 0 0 0 0 0 0 0 0 0 0 0
47368- 0 0 0 0 0 0 0 0 0 0 0 0
47369- 0 0 0 0 0 0 0 0 0 0 0 0
47370- 0 0 0 0 0 0 0 0 0 0 0 0
47371- 0 0 0 0 0 0 0 0 0 14 14 14
47372- 46 46 46 86 86 86 2 2 6 2 2 6
47373- 38 38 38 116 116 116 94 94 94 22 22 22
47374- 22 22 22 2 2 6 2 2 6 2 2 6
47375- 14 14 14 86 86 86 138 138 138 162 162 162
47376-154 154 154 38 38 38 26 26 26 6 6 6
47377- 2 2 6 2 2 6 2 2 6 2 2 6
47378- 86 86 86 46 46 46 14 14 14 0 0 0
47379- 0 0 0 0 0 0 0 0 0 0 0 0
47380- 0 0 0 0 0 0 0 0 0 0 0 0
47381- 0 0 0 0 0 0 0 0 0 0 0 0
47382- 0 0 0 0 0 0 0 0 0 0 0 0
47383- 0 0 0 0 0 0 0 0 0 0 0 0
47384- 0 0 0 0 0 0 0 0 0 0 0 0
47385- 0 0 0 0 0 0 0 0 0 0 0 0
47386- 0 0 0 0 0 0 0 0 0 0 0 0
47387- 0 0 0 0 0 0 0 0 0 0 0 0
47388- 0 0 0 0 0 0 0 0 0 0 0 0
47389- 0 0 0 0 0 0 0 0 0 0 0 0
47390- 0 0 0 0 0 0 0 0 0 0 0 0
47391- 0 0 0 0 0 0 0 0 0 14 14 14
47392- 46 46 46 86 86 86 2 2 6 14 14 14
47393-134 134 134 198 198 198 195 195 195 116 116 116
47394- 10 10 10 2 2 6 2 2 6 6 6 6
47395-101 98 89 187 187 187 210 210 210 218 218 218
47396-214 214 214 134 134 134 14 14 14 6 6 6
47397- 2 2 6 2 2 6 2 2 6 2 2 6
47398- 86 86 86 50 50 50 18 18 18 6 6 6
47399- 0 0 0 0 0 0 0 0 0 0 0 0
47400- 0 0 0 0 0 0 0 0 0 0 0 0
47401- 0 0 0 0 0 0 0 0 0 0 0 0
47402- 0 0 0 0 0 0 0 0 0 0 0 0
47403- 0 0 0 0 0 0 0 0 0 0 0 0
47404- 0 0 0 0 0 0 0 0 0 0 0 0
47405- 0 0 0 0 0 0 0 0 1 0 0 0
47406- 0 0 1 0 0 1 0 0 1 0 0 0
47407- 0 0 0 0 0 0 0 0 0 0 0 0
47408- 0 0 0 0 0 0 0 0 0 0 0 0
47409- 0 0 0 0 0 0 0 0 0 0 0 0
47410- 0 0 0 0 0 0 0 0 0 0 0 0
47411- 0 0 0 0 0 0 0 0 0 14 14 14
47412- 46 46 46 86 86 86 2 2 6 54 54 54
47413-218 218 218 195 195 195 226 226 226 246 246 246
47414- 58 58 58 2 2 6 2 2 6 30 30 30
47415-210 210 210 253 253 253 174 174 174 123 123 123
47416-221 221 221 234 234 234 74 74 74 2 2 6
47417- 2 2 6 2 2 6 2 2 6 2 2 6
47418- 70 70 70 58 58 58 22 22 22 6 6 6
47419- 0 0 0 0 0 0 0 0 0 0 0 0
47420- 0 0 0 0 0 0 0 0 0 0 0 0
47421- 0 0 0 0 0 0 0 0 0 0 0 0
47422- 0 0 0 0 0 0 0 0 0 0 0 0
47423- 0 0 0 0 0 0 0 0 0 0 0 0
47424- 0 0 0 0 0 0 0 0 0 0 0 0
47425- 0 0 0 0 0 0 0 0 0 0 0 0
47426- 0 0 0 0 0 0 0 0 0 0 0 0
47427- 0 0 0 0 0 0 0 0 0 0 0 0
47428- 0 0 0 0 0 0 0 0 0 0 0 0
47429- 0 0 0 0 0 0 0 0 0 0 0 0
47430- 0 0 0 0 0 0 0 0 0 0 0 0
47431- 0 0 0 0 0 0 0 0 0 14 14 14
47432- 46 46 46 82 82 82 2 2 6 106 106 106
47433-170 170 170 26 26 26 86 86 86 226 226 226
47434-123 123 123 10 10 10 14 14 14 46 46 46
47435-231 231 231 190 190 190 6 6 6 70 70 70
47436- 90 90 90 238 238 238 158 158 158 2 2 6
47437- 2 2 6 2 2 6 2 2 6 2 2 6
47438- 70 70 70 58 58 58 22 22 22 6 6 6
47439- 0 0 0 0 0 0 0 0 0 0 0 0
47440- 0 0 0 0 0 0 0 0 0 0 0 0
47441- 0 0 0 0 0 0 0 0 0 0 0 0
47442- 0 0 0 0 0 0 0 0 0 0 0 0
47443- 0 0 0 0 0 0 0 0 0 0 0 0
47444- 0 0 0 0 0 0 0 0 0 0 0 0
47445- 0 0 0 0 0 0 0 0 1 0 0 0
47446- 0 0 1 0 0 1 0 0 1 0 0 0
47447- 0 0 0 0 0 0 0 0 0 0 0 0
47448- 0 0 0 0 0 0 0 0 0 0 0 0
47449- 0 0 0 0 0 0 0 0 0 0 0 0
47450- 0 0 0 0 0 0 0 0 0 0 0 0
47451- 0 0 0 0 0 0 0 0 0 14 14 14
47452- 42 42 42 86 86 86 6 6 6 116 116 116
47453-106 106 106 6 6 6 70 70 70 149 149 149
47454-128 128 128 18 18 18 38 38 38 54 54 54
47455-221 221 221 106 106 106 2 2 6 14 14 14
47456- 46 46 46 190 190 190 198 198 198 2 2 6
47457- 2 2 6 2 2 6 2 2 6 2 2 6
47458- 74 74 74 62 62 62 22 22 22 6 6 6
47459- 0 0 0 0 0 0 0 0 0 0 0 0
47460- 0 0 0 0 0 0 0 0 0 0 0 0
47461- 0 0 0 0 0 0 0 0 0 0 0 0
47462- 0 0 0 0 0 0 0 0 0 0 0 0
47463- 0 0 0 0 0 0 0 0 0 0 0 0
47464- 0 0 0 0 0 0 0 0 0 0 0 0
47465- 0 0 0 0 0 0 0 0 1 0 0 0
47466- 0 0 1 0 0 0 0 0 1 0 0 0
47467- 0 0 0 0 0 0 0 0 0 0 0 0
47468- 0 0 0 0 0 0 0 0 0 0 0 0
47469- 0 0 0 0 0 0 0 0 0 0 0 0
47470- 0 0 0 0 0 0 0 0 0 0 0 0
47471- 0 0 0 0 0 0 0 0 0 14 14 14
47472- 42 42 42 94 94 94 14 14 14 101 101 101
47473-128 128 128 2 2 6 18 18 18 116 116 116
47474-118 98 46 121 92 8 121 92 8 98 78 10
47475-162 162 162 106 106 106 2 2 6 2 2 6
47476- 2 2 6 195 195 195 195 195 195 6 6 6
47477- 2 2 6 2 2 6 2 2 6 2 2 6
47478- 74 74 74 62 62 62 22 22 22 6 6 6
47479- 0 0 0 0 0 0 0 0 0 0 0 0
47480- 0 0 0 0 0 0 0 0 0 0 0 0
47481- 0 0 0 0 0 0 0 0 0 0 0 0
47482- 0 0 0 0 0 0 0 0 0 0 0 0
47483- 0 0 0 0 0 0 0 0 0 0 0 0
47484- 0 0 0 0 0 0 0 0 0 0 0 0
47485- 0 0 0 0 0 0 0 0 1 0 0 1
47486- 0 0 1 0 0 0 0 0 1 0 0 0
47487- 0 0 0 0 0 0 0 0 0 0 0 0
47488- 0 0 0 0 0 0 0 0 0 0 0 0
47489- 0 0 0 0 0 0 0 0 0 0 0 0
47490- 0 0 0 0 0 0 0 0 0 0 0 0
47491- 0 0 0 0 0 0 0 0 0 10 10 10
47492- 38 38 38 90 90 90 14 14 14 58 58 58
47493-210 210 210 26 26 26 54 38 6 154 114 10
47494-226 170 11 236 186 11 225 175 15 184 144 12
47495-215 174 15 175 146 61 37 26 9 2 2 6
47496- 70 70 70 246 246 246 138 138 138 2 2 6
47497- 2 2 6 2 2 6 2 2 6 2 2 6
47498- 70 70 70 66 66 66 26 26 26 6 6 6
47499- 0 0 0 0 0 0 0 0 0 0 0 0
47500- 0 0 0 0 0 0 0 0 0 0 0 0
47501- 0 0 0 0 0 0 0 0 0 0 0 0
47502- 0 0 0 0 0 0 0 0 0 0 0 0
47503- 0 0 0 0 0 0 0 0 0 0 0 0
47504- 0 0 0 0 0 0 0 0 0 0 0 0
47505- 0 0 0 0 0 0 0 0 0 0 0 0
47506- 0 0 0 0 0 0 0 0 0 0 0 0
47507- 0 0 0 0 0 0 0 0 0 0 0 0
47508- 0 0 0 0 0 0 0 0 0 0 0 0
47509- 0 0 0 0 0 0 0 0 0 0 0 0
47510- 0 0 0 0 0 0 0 0 0 0 0 0
47511- 0 0 0 0 0 0 0 0 0 10 10 10
47512- 38 38 38 86 86 86 14 14 14 10 10 10
47513-195 195 195 188 164 115 192 133 9 225 175 15
47514-239 182 13 234 190 10 232 195 16 232 200 30
47515-245 207 45 241 208 19 232 195 16 184 144 12
47516-218 194 134 211 206 186 42 42 42 2 2 6
47517- 2 2 6 2 2 6 2 2 6 2 2 6
47518- 50 50 50 74 74 74 30 30 30 6 6 6
47519- 0 0 0 0 0 0 0 0 0 0 0 0
47520- 0 0 0 0 0 0 0 0 0 0 0 0
47521- 0 0 0 0 0 0 0 0 0 0 0 0
47522- 0 0 0 0 0 0 0 0 0 0 0 0
47523- 0 0 0 0 0 0 0 0 0 0 0 0
47524- 0 0 0 0 0 0 0 0 0 0 0 0
47525- 0 0 0 0 0 0 0 0 0 0 0 0
47526- 0 0 0 0 0 0 0 0 0 0 0 0
47527- 0 0 0 0 0 0 0 0 0 0 0 0
47528- 0 0 0 0 0 0 0 0 0 0 0 0
47529- 0 0 0 0 0 0 0 0 0 0 0 0
47530- 0 0 0 0 0 0 0 0 0 0 0 0
47531- 0 0 0 0 0 0 0 0 0 10 10 10
47532- 34 34 34 86 86 86 14 14 14 2 2 6
47533-121 87 25 192 133 9 219 162 10 239 182 13
47534-236 186 11 232 195 16 241 208 19 244 214 54
47535-246 218 60 246 218 38 246 215 20 241 208 19
47536-241 208 19 226 184 13 121 87 25 2 2 6
47537- 2 2 6 2 2 6 2 2 6 2 2 6
47538- 50 50 50 82 82 82 34 34 34 10 10 10
47539- 0 0 0 0 0 0 0 0 0 0 0 0
47540- 0 0 0 0 0 0 0 0 0 0 0 0
47541- 0 0 0 0 0 0 0 0 0 0 0 0
47542- 0 0 0 0 0 0 0 0 0 0 0 0
47543- 0 0 0 0 0 0 0 0 0 0 0 0
47544- 0 0 0 0 0 0 0 0 0 0 0 0
47545- 0 0 0 0 0 0 0 0 0 0 0 0
47546- 0 0 0 0 0 0 0 0 0 0 0 0
47547- 0 0 0 0 0 0 0 0 0 0 0 0
47548- 0 0 0 0 0 0 0 0 0 0 0 0
47549- 0 0 0 0 0 0 0 0 0 0 0 0
47550- 0 0 0 0 0 0 0 0 0 0 0 0
47551- 0 0 0 0 0 0 0 0 0 10 10 10
47552- 34 34 34 82 82 82 30 30 30 61 42 6
47553-180 123 7 206 145 10 230 174 11 239 182 13
47554-234 190 10 238 202 15 241 208 19 246 218 74
47555-246 218 38 246 215 20 246 215 20 246 215 20
47556-226 184 13 215 174 15 184 144 12 6 6 6
47557- 2 2 6 2 2 6 2 2 6 2 2 6
47558- 26 26 26 94 94 94 42 42 42 14 14 14
47559- 0 0 0 0 0 0 0 0 0 0 0 0
47560- 0 0 0 0 0 0 0 0 0 0 0 0
47561- 0 0 0 0 0 0 0 0 0 0 0 0
47562- 0 0 0 0 0 0 0 0 0 0 0 0
47563- 0 0 0 0 0 0 0 0 0 0 0 0
47564- 0 0 0 0 0 0 0 0 0 0 0 0
47565- 0 0 0 0 0 0 0 0 0 0 0 0
47566- 0 0 0 0 0 0 0 0 0 0 0 0
47567- 0 0 0 0 0 0 0 0 0 0 0 0
47568- 0 0 0 0 0 0 0 0 0 0 0 0
47569- 0 0 0 0 0 0 0 0 0 0 0 0
47570- 0 0 0 0 0 0 0 0 0 0 0 0
47571- 0 0 0 0 0 0 0 0 0 10 10 10
47572- 30 30 30 78 78 78 50 50 50 104 69 6
47573-192 133 9 216 158 10 236 178 12 236 186 11
47574-232 195 16 241 208 19 244 214 54 245 215 43
47575-246 215 20 246 215 20 241 208 19 198 155 10
47576-200 144 11 216 158 10 156 118 10 2 2 6
47577- 2 2 6 2 2 6 2 2 6 2 2 6
47578- 6 6 6 90 90 90 54 54 54 18 18 18
47579- 6 6 6 0 0 0 0 0 0 0 0 0
47580- 0 0 0 0 0 0 0 0 0 0 0 0
47581- 0 0 0 0 0 0 0 0 0 0 0 0
47582- 0 0 0 0 0 0 0 0 0 0 0 0
47583- 0 0 0 0 0 0 0 0 0 0 0 0
47584- 0 0 0 0 0 0 0 0 0 0 0 0
47585- 0 0 0 0 0 0 0 0 0 0 0 0
47586- 0 0 0 0 0 0 0 0 0 0 0 0
47587- 0 0 0 0 0 0 0 0 0 0 0 0
47588- 0 0 0 0 0 0 0 0 0 0 0 0
47589- 0 0 0 0 0 0 0 0 0 0 0 0
47590- 0 0 0 0 0 0 0 0 0 0 0 0
47591- 0 0 0 0 0 0 0 0 0 10 10 10
47592- 30 30 30 78 78 78 46 46 46 22 22 22
47593-137 92 6 210 162 10 239 182 13 238 190 10
47594-238 202 15 241 208 19 246 215 20 246 215 20
47595-241 208 19 203 166 17 185 133 11 210 150 10
47596-216 158 10 210 150 10 102 78 10 2 2 6
47597- 6 6 6 54 54 54 14 14 14 2 2 6
47598- 2 2 6 62 62 62 74 74 74 30 30 30
47599- 10 10 10 0 0 0 0 0 0 0 0 0
47600- 0 0 0 0 0 0 0 0 0 0 0 0
47601- 0 0 0 0 0 0 0 0 0 0 0 0
47602- 0 0 0 0 0 0 0 0 0 0 0 0
47603- 0 0 0 0 0 0 0 0 0 0 0 0
47604- 0 0 0 0 0 0 0 0 0 0 0 0
47605- 0 0 0 0 0 0 0 0 0 0 0 0
47606- 0 0 0 0 0 0 0 0 0 0 0 0
47607- 0 0 0 0 0 0 0 0 0 0 0 0
47608- 0 0 0 0 0 0 0 0 0 0 0 0
47609- 0 0 0 0 0 0 0 0 0 0 0 0
47610- 0 0 0 0 0 0 0 0 0 0 0 0
47611- 0 0 0 0 0 0 0 0 0 10 10 10
47612- 34 34 34 78 78 78 50 50 50 6 6 6
47613- 94 70 30 139 102 15 190 146 13 226 184 13
47614-232 200 30 232 195 16 215 174 15 190 146 13
47615-168 122 10 192 133 9 210 150 10 213 154 11
47616-202 150 34 182 157 106 101 98 89 2 2 6
47617- 2 2 6 78 78 78 116 116 116 58 58 58
47618- 2 2 6 22 22 22 90 90 90 46 46 46
47619- 18 18 18 6 6 6 0 0 0 0 0 0
47620- 0 0 0 0 0 0 0 0 0 0 0 0
47621- 0 0 0 0 0 0 0 0 0 0 0 0
47622- 0 0 0 0 0 0 0 0 0 0 0 0
47623- 0 0 0 0 0 0 0 0 0 0 0 0
47624- 0 0 0 0 0 0 0 0 0 0 0 0
47625- 0 0 0 0 0 0 0 0 0 0 0 0
47626- 0 0 0 0 0 0 0 0 0 0 0 0
47627- 0 0 0 0 0 0 0 0 0 0 0 0
47628- 0 0 0 0 0 0 0 0 0 0 0 0
47629- 0 0 0 0 0 0 0 0 0 0 0 0
47630- 0 0 0 0 0 0 0 0 0 0 0 0
47631- 0 0 0 0 0 0 0 0 0 10 10 10
47632- 38 38 38 86 86 86 50 50 50 6 6 6
47633-128 128 128 174 154 114 156 107 11 168 122 10
47634-198 155 10 184 144 12 197 138 11 200 144 11
47635-206 145 10 206 145 10 197 138 11 188 164 115
47636-195 195 195 198 198 198 174 174 174 14 14 14
47637- 2 2 6 22 22 22 116 116 116 116 116 116
47638- 22 22 22 2 2 6 74 74 74 70 70 70
47639- 30 30 30 10 10 10 0 0 0 0 0 0
47640- 0 0 0 0 0 0 0 0 0 0 0 0
47641- 0 0 0 0 0 0 0 0 0 0 0 0
47642- 0 0 0 0 0 0 0 0 0 0 0 0
47643- 0 0 0 0 0 0 0 0 0 0 0 0
47644- 0 0 0 0 0 0 0 0 0 0 0 0
47645- 0 0 0 0 0 0 0 0 0 0 0 0
47646- 0 0 0 0 0 0 0 0 0 0 0 0
47647- 0 0 0 0 0 0 0 0 0 0 0 0
47648- 0 0 0 0 0 0 0 0 0 0 0 0
47649- 0 0 0 0 0 0 0 0 0 0 0 0
47650- 0 0 0 0 0 0 0 0 0 0 0 0
47651- 0 0 0 0 0 0 6 6 6 18 18 18
47652- 50 50 50 101 101 101 26 26 26 10 10 10
47653-138 138 138 190 190 190 174 154 114 156 107 11
47654-197 138 11 200 144 11 197 138 11 192 133 9
47655-180 123 7 190 142 34 190 178 144 187 187 187
47656-202 202 202 221 221 221 214 214 214 66 66 66
47657- 2 2 6 2 2 6 50 50 50 62 62 62
47658- 6 6 6 2 2 6 10 10 10 90 90 90
47659- 50 50 50 18 18 18 6 6 6 0 0 0
47660- 0 0 0 0 0 0 0 0 0 0 0 0
47661- 0 0 0 0 0 0 0 0 0 0 0 0
47662- 0 0 0 0 0 0 0 0 0 0 0 0
47663- 0 0 0 0 0 0 0 0 0 0 0 0
47664- 0 0 0 0 0 0 0 0 0 0 0 0
47665- 0 0 0 0 0 0 0 0 0 0 0 0
47666- 0 0 0 0 0 0 0 0 0 0 0 0
47667- 0 0 0 0 0 0 0 0 0 0 0 0
47668- 0 0 0 0 0 0 0 0 0 0 0 0
47669- 0 0 0 0 0 0 0 0 0 0 0 0
47670- 0 0 0 0 0 0 0 0 0 0 0 0
47671- 0 0 0 0 0 0 10 10 10 34 34 34
47672- 74 74 74 74 74 74 2 2 6 6 6 6
47673-144 144 144 198 198 198 190 190 190 178 166 146
47674-154 121 60 156 107 11 156 107 11 168 124 44
47675-174 154 114 187 187 187 190 190 190 210 210 210
47676-246 246 246 253 253 253 253 253 253 182 182 182
47677- 6 6 6 2 2 6 2 2 6 2 2 6
47678- 2 2 6 2 2 6 2 2 6 62 62 62
47679- 74 74 74 34 34 34 14 14 14 0 0 0
47680- 0 0 0 0 0 0 0 0 0 0 0 0
47681- 0 0 0 0 0 0 0 0 0 0 0 0
47682- 0 0 0 0 0 0 0 0 0 0 0 0
47683- 0 0 0 0 0 0 0 0 0 0 0 0
47684- 0 0 0 0 0 0 0 0 0 0 0 0
47685- 0 0 0 0 0 0 0 0 0 0 0 0
47686- 0 0 0 0 0 0 0 0 0 0 0 0
47687- 0 0 0 0 0 0 0 0 0 0 0 0
47688- 0 0 0 0 0 0 0 0 0 0 0 0
47689- 0 0 0 0 0 0 0 0 0 0 0 0
47690- 0 0 0 0 0 0 0 0 0 0 0 0
47691- 0 0 0 10 10 10 22 22 22 54 54 54
47692- 94 94 94 18 18 18 2 2 6 46 46 46
47693-234 234 234 221 221 221 190 190 190 190 190 190
47694-190 190 190 187 187 187 187 187 187 190 190 190
47695-190 190 190 195 195 195 214 214 214 242 242 242
47696-253 253 253 253 253 253 253 253 253 253 253 253
47697- 82 82 82 2 2 6 2 2 6 2 2 6
47698- 2 2 6 2 2 6 2 2 6 14 14 14
47699- 86 86 86 54 54 54 22 22 22 6 6 6
47700- 0 0 0 0 0 0 0 0 0 0 0 0
47701- 0 0 0 0 0 0 0 0 0 0 0 0
47702- 0 0 0 0 0 0 0 0 0 0 0 0
47703- 0 0 0 0 0 0 0 0 0 0 0 0
47704- 0 0 0 0 0 0 0 0 0 0 0 0
47705- 0 0 0 0 0 0 0 0 0 0 0 0
47706- 0 0 0 0 0 0 0 0 0 0 0 0
47707- 0 0 0 0 0 0 0 0 0 0 0 0
47708- 0 0 0 0 0 0 0 0 0 0 0 0
47709- 0 0 0 0 0 0 0 0 0 0 0 0
47710- 0 0 0 0 0 0 0 0 0 0 0 0
47711- 6 6 6 18 18 18 46 46 46 90 90 90
47712- 46 46 46 18 18 18 6 6 6 182 182 182
47713-253 253 253 246 246 246 206 206 206 190 190 190
47714-190 190 190 190 190 190 190 190 190 190 190 190
47715-206 206 206 231 231 231 250 250 250 253 253 253
47716-253 253 253 253 253 253 253 253 253 253 253 253
47717-202 202 202 14 14 14 2 2 6 2 2 6
47718- 2 2 6 2 2 6 2 2 6 2 2 6
47719- 42 42 42 86 86 86 42 42 42 18 18 18
47720- 6 6 6 0 0 0 0 0 0 0 0 0
47721- 0 0 0 0 0 0 0 0 0 0 0 0
47722- 0 0 0 0 0 0 0 0 0 0 0 0
47723- 0 0 0 0 0 0 0 0 0 0 0 0
47724- 0 0 0 0 0 0 0 0 0 0 0 0
47725- 0 0 0 0 0 0 0 0 0 0 0 0
47726- 0 0 0 0 0 0 0 0 0 0 0 0
47727- 0 0 0 0 0 0 0 0 0 0 0 0
47728- 0 0 0 0 0 0 0 0 0 0 0 0
47729- 0 0 0 0 0 0 0 0 0 0 0 0
47730- 0 0 0 0 0 0 0 0 0 6 6 6
47731- 14 14 14 38 38 38 74 74 74 66 66 66
47732- 2 2 6 6 6 6 90 90 90 250 250 250
47733-253 253 253 253 253 253 238 238 238 198 198 198
47734-190 190 190 190 190 190 195 195 195 221 221 221
47735-246 246 246 253 253 253 253 253 253 253 253 253
47736-253 253 253 253 253 253 253 253 253 253 253 253
47737-253 253 253 82 82 82 2 2 6 2 2 6
47738- 2 2 6 2 2 6 2 2 6 2 2 6
47739- 2 2 6 78 78 78 70 70 70 34 34 34
47740- 14 14 14 6 6 6 0 0 0 0 0 0
47741- 0 0 0 0 0 0 0 0 0 0 0 0
47742- 0 0 0 0 0 0 0 0 0 0 0 0
47743- 0 0 0 0 0 0 0 0 0 0 0 0
47744- 0 0 0 0 0 0 0 0 0 0 0 0
47745- 0 0 0 0 0 0 0 0 0 0 0 0
47746- 0 0 0 0 0 0 0 0 0 0 0 0
47747- 0 0 0 0 0 0 0 0 0 0 0 0
47748- 0 0 0 0 0 0 0 0 0 0 0 0
47749- 0 0 0 0 0 0 0 0 0 0 0 0
47750- 0 0 0 0 0 0 0 0 0 14 14 14
47751- 34 34 34 66 66 66 78 78 78 6 6 6
47752- 2 2 6 18 18 18 218 218 218 253 253 253
47753-253 253 253 253 253 253 253 253 253 246 246 246
47754-226 226 226 231 231 231 246 246 246 253 253 253
47755-253 253 253 253 253 253 253 253 253 253 253 253
47756-253 253 253 253 253 253 253 253 253 253 253 253
47757-253 253 253 178 178 178 2 2 6 2 2 6
47758- 2 2 6 2 2 6 2 2 6 2 2 6
47759- 2 2 6 18 18 18 90 90 90 62 62 62
47760- 30 30 30 10 10 10 0 0 0 0 0 0
47761- 0 0 0 0 0 0 0 0 0 0 0 0
47762- 0 0 0 0 0 0 0 0 0 0 0 0
47763- 0 0 0 0 0 0 0 0 0 0 0 0
47764- 0 0 0 0 0 0 0 0 0 0 0 0
47765- 0 0 0 0 0 0 0 0 0 0 0 0
47766- 0 0 0 0 0 0 0 0 0 0 0 0
47767- 0 0 0 0 0 0 0 0 0 0 0 0
47768- 0 0 0 0 0 0 0 0 0 0 0 0
47769- 0 0 0 0 0 0 0 0 0 0 0 0
47770- 0 0 0 0 0 0 10 10 10 26 26 26
47771- 58 58 58 90 90 90 18 18 18 2 2 6
47772- 2 2 6 110 110 110 253 253 253 253 253 253
47773-253 253 253 253 253 253 253 253 253 253 253 253
47774-250 250 250 253 253 253 253 253 253 253 253 253
47775-253 253 253 253 253 253 253 253 253 253 253 253
47776-253 253 253 253 253 253 253 253 253 253 253 253
47777-253 253 253 231 231 231 18 18 18 2 2 6
47778- 2 2 6 2 2 6 2 2 6 2 2 6
47779- 2 2 6 2 2 6 18 18 18 94 94 94
47780- 54 54 54 26 26 26 10 10 10 0 0 0
47781- 0 0 0 0 0 0 0 0 0 0 0 0
47782- 0 0 0 0 0 0 0 0 0 0 0 0
47783- 0 0 0 0 0 0 0 0 0 0 0 0
47784- 0 0 0 0 0 0 0 0 0 0 0 0
47785- 0 0 0 0 0 0 0 0 0 0 0 0
47786- 0 0 0 0 0 0 0 0 0 0 0 0
47787- 0 0 0 0 0 0 0 0 0 0 0 0
47788- 0 0 0 0 0 0 0 0 0 0 0 0
47789- 0 0 0 0 0 0 0 0 0 0 0 0
47790- 0 0 0 6 6 6 22 22 22 50 50 50
47791- 90 90 90 26 26 26 2 2 6 2 2 6
47792- 14 14 14 195 195 195 250 250 250 253 253 253
47793-253 253 253 253 253 253 253 253 253 253 253 253
47794-253 253 253 253 253 253 253 253 253 253 253 253
47795-253 253 253 253 253 253 253 253 253 253 253 253
47796-253 253 253 253 253 253 253 253 253 253 253 253
47797-250 250 250 242 242 242 54 54 54 2 2 6
47798- 2 2 6 2 2 6 2 2 6 2 2 6
47799- 2 2 6 2 2 6 2 2 6 38 38 38
47800- 86 86 86 50 50 50 22 22 22 6 6 6
47801- 0 0 0 0 0 0 0 0 0 0 0 0
47802- 0 0 0 0 0 0 0 0 0 0 0 0
47803- 0 0 0 0 0 0 0 0 0 0 0 0
47804- 0 0 0 0 0 0 0 0 0 0 0 0
47805- 0 0 0 0 0 0 0 0 0 0 0 0
47806- 0 0 0 0 0 0 0 0 0 0 0 0
47807- 0 0 0 0 0 0 0 0 0 0 0 0
47808- 0 0 0 0 0 0 0 0 0 0 0 0
47809- 0 0 0 0 0 0 0 0 0 0 0 0
47810- 6 6 6 14 14 14 38 38 38 82 82 82
47811- 34 34 34 2 2 6 2 2 6 2 2 6
47812- 42 42 42 195 195 195 246 246 246 253 253 253
47813-253 253 253 253 253 253 253 253 253 250 250 250
47814-242 242 242 242 242 242 250 250 250 253 253 253
47815-253 253 253 253 253 253 253 253 253 253 253 253
47816-253 253 253 250 250 250 246 246 246 238 238 238
47817-226 226 226 231 231 231 101 101 101 6 6 6
47818- 2 2 6 2 2 6 2 2 6 2 2 6
47819- 2 2 6 2 2 6 2 2 6 2 2 6
47820- 38 38 38 82 82 82 42 42 42 14 14 14
47821- 6 6 6 0 0 0 0 0 0 0 0 0
47822- 0 0 0 0 0 0 0 0 0 0 0 0
47823- 0 0 0 0 0 0 0 0 0 0 0 0
47824- 0 0 0 0 0 0 0 0 0 0 0 0
47825- 0 0 0 0 0 0 0 0 0 0 0 0
47826- 0 0 0 0 0 0 0 0 0 0 0 0
47827- 0 0 0 0 0 0 0 0 0 0 0 0
47828- 0 0 0 0 0 0 0 0 0 0 0 0
47829- 0 0 0 0 0 0 0 0 0 0 0 0
47830- 10 10 10 26 26 26 62 62 62 66 66 66
47831- 2 2 6 2 2 6 2 2 6 6 6 6
47832- 70 70 70 170 170 170 206 206 206 234 234 234
47833-246 246 246 250 250 250 250 250 250 238 238 238
47834-226 226 226 231 231 231 238 238 238 250 250 250
47835-250 250 250 250 250 250 246 246 246 231 231 231
47836-214 214 214 206 206 206 202 202 202 202 202 202
47837-198 198 198 202 202 202 182 182 182 18 18 18
47838- 2 2 6 2 2 6 2 2 6 2 2 6
47839- 2 2 6 2 2 6 2 2 6 2 2 6
47840- 2 2 6 62 62 62 66 66 66 30 30 30
47841- 10 10 10 0 0 0 0 0 0 0 0 0
47842- 0 0 0 0 0 0 0 0 0 0 0 0
47843- 0 0 0 0 0 0 0 0 0 0 0 0
47844- 0 0 0 0 0 0 0 0 0 0 0 0
47845- 0 0 0 0 0 0 0 0 0 0 0 0
47846- 0 0 0 0 0 0 0 0 0 0 0 0
47847- 0 0 0 0 0 0 0 0 0 0 0 0
47848- 0 0 0 0 0 0 0 0 0 0 0 0
47849- 0 0 0 0 0 0 0 0 0 0 0 0
47850- 14 14 14 42 42 42 82 82 82 18 18 18
47851- 2 2 6 2 2 6 2 2 6 10 10 10
47852- 94 94 94 182 182 182 218 218 218 242 242 242
47853-250 250 250 253 253 253 253 253 253 250 250 250
47854-234 234 234 253 253 253 253 253 253 253 253 253
47855-253 253 253 253 253 253 253 253 253 246 246 246
47856-238 238 238 226 226 226 210 210 210 202 202 202
47857-195 195 195 195 195 195 210 210 210 158 158 158
47858- 6 6 6 14 14 14 50 50 50 14 14 14
47859- 2 2 6 2 2 6 2 2 6 2 2 6
47860- 2 2 6 6 6 6 86 86 86 46 46 46
47861- 18 18 18 6 6 6 0 0 0 0 0 0
47862- 0 0 0 0 0 0 0 0 0 0 0 0
47863- 0 0 0 0 0 0 0 0 0 0 0 0
47864- 0 0 0 0 0 0 0 0 0 0 0 0
47865- 0 0 0 0 0 0 0 0 0 0 0 0
47866- 0 0 0 0 0 0 0 0 0 0 0 0
47867- 0 0 0 0 0 0 0 0 0 0 0 0
47868- 0 0 0 0 0 0 0 0 0 0 0 0
47869- 0 0 0 0 0 0 0 0 0 6 6 6
47870- 22 22 22 54 54 54 70 70 70 2 2 6
47871- 2 2 6 10 10 10 2 2 6 22 22 22
47872-166 166 166 231 231 231 250 250 250 253 253 253
47873-253 253 253 253 253 253 253 253 253 250 250 250
47874-242 242 242 253 253 253 253 253 253 253 253 253
47875-253 253 253 253 253 253 253 253 253 253 253 253
47876-253 253 253 253 253 253 253 253 253 246 246 246
47877-231 231 231 206 206 206 198 198 198 226 226 226
47878- 94 94 94 2 2 6 6 6 6 38 38 38
47879- 30 30 30 2 2 6 2 2 6 2 2 6
47880- 2 2 6 2 2 6 62 62 62 66 66 66
47881- 26 26 26 10 10 10 0 0 0 0 0 0
47882- 0 0 0 0 0 0 0 0 0 0 0 0
47883- 0 0 0 0 0 0 0 0 0 0 0 0
47884- 0 0 0 0 0 0 0 0 0 0 0 0
47885- 0 0 0 0 0 0 0 0 0 0 0 0
47886- 0 0 0 0 0 0 0 0 0 0 0 0
47887- 0 0 0 0 0 0 0 0 0 0 0 0
47888- 0 0 0 0 0 0 0 0 0 0 0 0
47889- 0 0 0 0 0 0 0 0 0 10 10 10
47890- 30 30 30 74 74 74 50 50 50 2 2 6
47891- 26 26 26 26 26 26 2 2 6 106 106 106
47892-238 238 238 253 253 253 253 253 253 253 253 253
47893-253 253 253 253 253 253 253 253 253 253 253 253
47894-253 253 253 253 253 253 253 253 253 253 253 253
47895-253 253 253 253 253 253 253 253 253 253 253 253
47896-253 253 253 253 253 253 253 253 253 253 253 253
47897-253 253 253 246 246 246 218 218 218 202 202 202
47898-210 210 210 14 14 14 2 2 6 2 2 6
47899- 30 30 30 22 22 22 2 2 6 2 2 6
47900- 2 2 6 2 2 6 18 18 18 86 86 86
47901- 42 42 42 14 14 14 0 0 0 0 0 0
47902- 0 0 0 0 0 0 0 0 0 0 0 0
47903- 0 0 0 0 0 0 0 0 0 0 0 0
47904- 0 0 0 0 0 0 0 0 0 0 0 0
47905- 0 0 0 0 0 0 0 0 0 0 0 0
47906- 0 0 0 0 0 0 0 0 0 0 0 0
47907- 0 0 0 0 0 0 0 0 0 0 0 0
47908- 0 0 0 0 0 0 0 0 0 0 0 0
47909- 0 0 0 0 0 0 0 0 0 14 14 14
47910- 42 42 42 90 90 90 22 22 22 2 2 6
47911- 42 42 42 2 2 6 18 18 18 218 218 218
47912-253 253 253 253 253 253 253 253 253 253 253 253
47913-253 253 253 253 253 253 253 253 253 253 253 253
47914-253 253 253 253 253 253 253 253 253 253 253 253
47915-253 253 253 253 253 253 253 253 253 253 253 253
47916-253 253 253 253 253 253 253 253 253 253 253 253
47917-253 253 253 253 253 253 250 250 250 221 221 221
47918-218 218 218 101 101 101 2 2 6 14 14 14
47919- 18 18 18 38 38 38 10 10 10 2 2 6
47920- 2 2 6 2 2 6 2 2 6 78 78 78
47921- 58 58 58 22 22 22 6 6 6 0 0 0
47922- 0 0 0 0 0 0 0 0 0 0 0 0
47923- 0 0 0 0 0 0 0 0 0 0 0 0
47924- 0 0 0 0 0 0 0 0 0 0 0 0
47925- 0 0 0 0 0 0 0 0 0 0 0 0
47926- 0 0 0 0 0 0 0 0 0 0 0 0
47927- 0 0 0 0 0 0 0 0 0 0 0 0
47928- 0 0 0 0 0 0 0 0 0 0 0 0
47929- 0 0 0 0 0 0 6 6 6 18 18 18
47930- 54 54 54 82 82 82 2 2 6 26 26 26
47931- 22 22 22 2 2 6 123 123 123 253 253 253
47932-253 253 253 253 253 253 253 253 253 253 253 253
47933-253 253 253 253 253 253 253 253 253 253 253 253
47934-253 253 253 253 253 253 253 253 253 253 253 253
47935-253 253 253 253 253 253 253 253 253 253 253 253
47936-253 253 253 253 253 253 253 253 253 253 253 253
47937-253 253 253 253 253 253 253 253 253 250 250 250
47938-238 238 238 198 198 198 6 6 6 38 38 38
47939- 58 58 58 26 26 26 38 38 38 2 2 6
47940- 2 2 6 2 2 6 2 2 6 46 46 46
47941- 78 78 78 30 30 30 10 10 10 0 0 0
47942- 0 0 0 0 0 0 0 0 0 0 0 0
47943- 0 0 0 0 0 0 0 0 0 0 0 0
47944- 0 0 0 0 0 0 0 0 0 0 0 0
47945- 0 0 0 0 0 0 0 0 0 0 0 0
47946- 0 0 0 0 0 0 0 0 0 0 0 0
47947- 0 0 0 0 0 0 0 0 0 0 0 0
47948- 0 0 0 0 0 0 0 0 0 0 0 0
47949- 0 0 0 0 0 0 10 10 10 30 30 30
47950- 74 74 74 58 58 58 2 2 6 42 42 42
47951- 2 2 6 22 22 22 231 231 231 253 253 253
47952-253 253 253 253 253 253 253 253 253 253 253 253
47953-253 253 253 253 253 253 253 253 253 250 250 250
47954-253 253 253 253 253 253 253 253 253 253 253 253
47955-253 253 253 253 253 253 253 253 253 253 253 253
47956-253 253 253 253 253 253 253 253 253 253 253 253
47957-253 253 253 253 253 253 253 253 253 253 253 253
47958-253 253 253 246 246 246 46 46 46 38 38 38
47959- 42 42 42 14 14 14 38 38 38 14 14 14
47960- 2 2 6 2 2 6 2 2 6 6 6 6
47961- 86 86 86 46 46 46 14 14 14 0 0 0
47962- 0 0 0 0 0 0 0 0 0 0 0 0
47963- 0 0 0 0 0 0 0 0 0 0 0 0
47964- 0 0 0 0 0 0 0 0 0 0 0 0
47965- 0 0 0 0 0 0 0 0 0 0 0 0
47966- 0 0 0 0 0 0 0 0 0 0 0 0
47967- 0 0 0 0 0 0 0 0 0 0 0 0
47968- 0 0 0 0 0 0 0 0 0 0 0 0
47969- 0 0 0 6 6 6 14 14 14 42 42 42
47970- 90 90 90 18 18 18 18 18 18 26 26 26
47971- 2 2 6 116 116 116 253 253 253 253 253 253
47972-253 253 253 253 253 253 253 253 253 253 253 253
47973-253 253 253 253 253 253 250 250 250 238 238 238
47974-253 253 253 253 253 253 253 253 253 253 253 253
47975-253 253 253 253 253 253 253 253 253 253 253 253
47976-253 253 253 253 253 253 253 253 253 253 253 253
47977-253 253 253 253 253 253 253 253 253 253 253 253
47978-253 253 253 253 253 253 94 94 94 6 6 6
47979- 2 2 6 2 2 6 10 10 10 34 34 34
47980- 2 2 6 2 2 6 2 2 6 2 2 6
47981- 74 74 74 58 58 58 22 22 22 6 6 6
47982- 0 0 0 0 0 0 0 0 0 0 0 0
47983- 0 0 0 0 0 0 0 0 0 0 0 0
47984- 0 0 0 0 0 0 0 0 0 0 0 0
47985- 0 0 0 0 0 0 0 0 0 0 0 0
47986- 0 0 0 0 0 0 0 0 0 0 0 0
47987- 0 0 0 0 0 0 0 0 0 0 0 0
47988- 0 0 0 0 0 0 0 0 0 0 0 0
47989- 0 0 0 10 10 10 26 26 26 66 66 66
47990- 82 82 82 2 2 6 38 38 38 6 6 6
47991- 14 14 14 210 210 210 253 253 253 253 253 253
47992-253 253 253 253 253 253 253 253 253 253 253 253
47993-253 253 253 253 253 253 246 246 246 242 242 242
47994-253 253 253 253 253 253 253 253 253 253 253 253
47995-253 253 253 253 253 253 253 253 253 253 253 253
47996-253 253 253 253 253 253 253 253 253 253 253 253
47997-253 253 253 253 253 253 253 253 253 253 253 253
47998-253 253 253 253 253 253 144 144 144 2 2 6
47999- 2 2 6 2 2 6 2 2 6 46 46 46
48000- 2 2 6 2 2 6 2 2 6 2 2 6
48001- 42 42 42 74 74 74 30 30 30 10 10 10
48002- 0 0 0 0 0 0 0 0 0 0 0 0
48003- 0 0 0 0 0 0 0 0 0 0 0 0
48004- 0 0 0 0 0 0 0 0 0 0 0 0
48005- 0 0 0 0 0 0 0 0 0 0 0 0
48006- 0 0 0 0 0 0 0 0 0 0 0 0
48007- 0 0 0 0 0 0 0 0 0 0 0 0
48008- 0 0 0 0 0 0 0 0 0 0 0 0
48009- 6 6 6 14 14 14 42 42 42 90 90 90
48010- 26 26 26 6 6 6 42 42 42 2 2 6
48011- 74 74 74 250 250 250 253 253 253 253 253 253
48012-253 253 253 253 253 253 253 253 253 253 253 253
48013-253 253 253 253 253 253 242 242 242 242 242 242
48014-253 253 253 253 253 253 253 253 253 253 253 253
48015-253 253 253 253 253 253 253 253 253 253 253 253
48016-253 253 253 253 253 253 253 253 253 253 253 253
48017-253 253 253 253 253 253 253 253 253 253 253 253
48018-253 253 253 253 253 253 182 182 182 2 2 6
48019- 2 2 6 2 2 6 2 2 6 46 46 46
48020- 2 2 6 2 2 6 2 2 6 2 2 6
48021- 10 10 10 86 86 86 38 38 38 10 10 10
48022- 0 0 0 0 0 0 0 0 0 0 0 0
48023- 0 0 0 0 0 0 0 0 0 0 0 0
48024- 0 0 0 0 0 0 0 0 0 0 0 0
48025- 0 0 0 0 0 0 0 0 0 0 0 0
48026- 0 0 0 0 0 0 0 0 0 0 0 0
48027- 0 0 0 0 0 0 0 0 0 0 0 0
48028- 0 0 0 0 0 0 0 0 0 0 0 0
48029- 10 10 10 26 26 26 66 66 66 82 82 82
48030- 2 2 6 22 22 22 18 18 18 2 2 6
48031-149 149 149 253 253 253 253 253 253 253 253 253
48032-253 253 253 253 253 253 253 253 253 253 253 253
48033-253 253 253 253 253 253 234 234 234 242 242 242
48034-253 253 253 253 253 253 253 253 253 253 253 253
48035-253 253 253 253 253 253 253 253 253 253 253 253
48036-253 253 253 253 253 253 253 253 253 253 253 253
48037-253 253 253 253 253 253 253 253 253 253 253 253
48038-253 253 253 253 253 253 206 206 206 2 2 6
48039- 2 2 6 2 2 6 2 2 6 38 38 38
48040- 2 2 6 2 2 6 2 2 6 2 2 6
48041- 6 6 6 86 86 86 46 46 46 14 14 14
48042- 0 0 0 0 0 0 0 0 0 0 0 0
48043- 0 0 0 0 0 0 0 0 0 0 0 0
48044- 0 0 0 0 0 0 0 0 0 0 0 0
48045- 0 0 0 0 0 0 0 0 0 0 0 0
48046- 0 0 0 0 0 0 0 0 0 0 0 0
48047- 0 0 0 0 0 0 0 0 0 0 0 0
48048- 0 0 0 0 0 0 0 0 0 6 6 6
48049- 18 18 18 46 46 46 86 86 86 18 18 18
48050- 2 2 6 34 34 34 10 10 10 6 6 6
48051-210 210 210 253 253 253 253 253 253 253 253 253
48052-253 253 253 253 253 253 253 253 253 253 253 253
48053-253 253 253 253 253 253 234 234 234 242 242 242
48054-253 253 253 253 253 253 253 253 253 253 253 253
48055-253 253 253 253 253 253 253 253 253 253 253 253
48056-253 253 253 253 253 253 253 253 253 253 253 253
48057-253 253 253 253 253 253 253 253 253 253 253 253
48058-253 253 253 253 253 253 221 221 221 6 6 6
48059- 2 2 6 2 2 6 6 6 6 30 30 30
48060- 2 2 6 2 2 6 2 2 6 2 2 6
48061- 2 2 6 82 82 82 54 54 54 18 18 18
48062- 6 6 6 0 0 0 0 0 0 0 0 0
48063- 0 0 0 0 0 0 0 0 0 0 0 0
48064- 0 0 0 0 0 0 0 0 0 0 0 0
48065- 0 0 0 0 0 0 0 0 0 0 0 0
48066- 0 0 0 0 0 0 0 0 0 0 0 0
48067- 0 0 0 0 0 0 0 0 0 0 0 0
48068- 0 0 0 0 0 0 0 0 0 10 10 10
48069- 26 26 26 66 66 66 62 62 62 2 2 6
48070- 2 2 6 38 38 38 10 10 10 26 26 26
48071-238 238 238 253 253 253 253 253 253 253 253 253
48072-253 253 253 253 253 253 253 253 253 253 253 253
48073-253 253 253 253 253 253 231 231 231 238 238 238
48074-253 253 253 253 253 253 253 253 253 253 253 253
48075-253 253 253 253 253 253 253 253 253 253 253 253
48076-253 253 253 253 253 253 253 253 253 253 253 253
48077-253 253 253 253 253 253 253 253 253 253 253 253
48078-253 253 253 253 253 253 231 231 231 6 6 6
48079- 2 2 6 2 2 6 10 10 10 30 30 30
48080- 2 2 6 2 2 6 2 2 6 2 2 6
48081- 2 2 6 66 66 66 58 58 58 22 22 22
48082- 6 6 6 0 0 0 0 0 0 0 0 0
48083- 0 0 0 0 0 0 0 0 0 0 0 0
48084- 0 0 0 0 0 0 0 0 0 0 0 0
48085- 0 0 0 0 0 0 0 0 0 0 0 0
48086- 0 0 0 0 0 0 0 0 0 0 0 0
48087- 0 0 0 0 0 0 0 0 0 0 0 0
48088- 0 0 0 0 0 0 0 0 0 10 10 10
48089- 38 38 38 78 78 78 6 6 6 2 2 6
48090- 2 2 6 46 46 46 14 14 14 42 42 42
48091-246 246 246 253 253 253 253 253 253 253 253 253
48092-253 253 253 253 253 253 253 253 253 253 253 253
48093-253 253 253 253 253 253 231 231 231 242 242 242
48094-253 253 253 253 253 253 253 253 253 253 253 253
48095-253 253 253 253 253 253 253 253 253 253 253 253
48096-253 253 253 253 253 253 253 253 253 253 253 253
48097-253 253 253 253 253 253 253 253 253 253 253 253
48098-253 253 253 253 253 253 234 234 234 10 10 10
48099- 2 2 6 2 2 6 22 22 22 14 14 14
48100- 2 2 6 2 2 6 2 2 6 2 2 6
48101- 2 2 6 66 66 66 62 62 62 22 22 22
48102- 6 6 6 0 0 0 0 0 0 0 0 0
48103- 0 0 0 0 0 0 0 0 0 0 0 0
48104- 0 0 0 0 0 0 0 0 0 0 0 0
48105- 0 0 0 0 0 0 0 0 0 0 0 0
48106- 0 0 0 0 0 0 0 0 0 0 0 0
48107- 0 0 0 0 0 0 0 0 0 0 0 0
48108- 0 0 0 0 0 0 6 6 6 18 18 18
48109- 50 50 50 74 74 74 2 2 6 2 2 6
48110- 14 14 14 70 70 70 34 34 34 62 62 62
48111-250 250 250 253 253 253 253 253 253 253 253 253
48112-253 253 253 253 253 253 253 253 253 253 253 253
48113-253 253 253 253 253 253 231 231 231 246 246 246
48114-253 253 253 253 253 253 253 253 253 253 253 253
48115-253 253 253 253 253 253 253 253 253 253 253 253
48116-253 253 253 253 253 253 253 253 253 253 253 253
48117-253 253 253 253 253 253 253 253 253 253 253 253
48118-253 253 253 253 253 253 234 234 234 14 14 14
48119- 2 2 6 2 2 6 30 30 30 2 2 6
48120- 2 2 6 2 2 6 2 2 6 2 2 6
48121- 2 2 6 66 66 66 62 62 62 22 22 22
48122- 6 6 6 0 0 0 0 0 0 0 0 0
48123- 0 0 0 0 0 0 0 0 0 0 0 0
48124- 0 0 0 0 0 0 0 0 0 0 0 0
48125- 0 0 0 0 0 0 0 0 0 0 0 0
48126- 0 0 0 0 0 0 0 0 0 0 0 0
48127- 0 0 0 0 0 0 0 0 0 0 0 0
48128- 0 0 0 0 0 0 6 6 6 18 18 18
48129- 54 54 54 62 62 62 2 2 6 2 2 6
48130- 2 2 6 30 30 30 46 46 46 70 70 70
48131-250 250 250 253 253 253 253 253 253 253 253 253
48132-253 253 253 253 253 253 253 253 253 253 253 253
48133-253 253 253 253 253 253 231 231 231 246 246 246
48134-253 253 253 253 253 253 253 253 253 253 253 253
48135-253 253 253 253 253 253 253 253 253 253 253 253
48136-253 253 253 253 253 253 253 253 253 253 253 253
48137-253 253 253 253 253 253 253 253 253 253 253 253
48138-253 253 253 253 253 253 226 226 226 10 10 10
48139- 2 2 6 6 6 6 30 30 30 2 2 6
48140- 2 2 6 2 2 6 2 2 6 2 2 6
48141- 2 2 6 66 66 66 58 58 58 22 22 22
48142- 6 6 6 0 0 0 0 0 0 0 0 0
48143- 0 0 0 0 0 0 0 0 0 0 0 0
48144- 0 0 0 0 0 0 0 0 0 0 0 0
48145- 0 0 0 0 0 0 0 0 0 0 0 0
48146- 0 0 0 0 0 0 0 0 0 0 0 0
48147- 0 0 0 0 0 0 0 0 0 0 0 0
48148- 0 0 0 0 0 0 6 6 6 22 22 22
48149- 58 58 58 62 62 62 2 2 6 2 2 6
48150- 2 2 6 2 2 6 30 30 30 78 78 78
48151-250 250 250 253 253 253 253 253 253 253 253 253
48152-253 253 253 253 253 253 253 253 253 253 253 253
48153-253 253 253 253 253 253 231 231 231 246 246 246
48154-253 253 253 253 253 253 253 253 253 253 253 253
48155-253 253 253 253 253 253 253 253 253 253 253 253
48156-253 253 253 253 253 253 253 253 253 253 253 253
48157-253 253 253 253 253 253 253 253 253 253 253 253
48158-253 253 253 253 253 253 206 206 206 2 2 6
48159- 22 22 22 34 34 34 18 14 6 22 22 22
48160- 26 26 26 18 18 18 6 6 6 2 2 6
48161- 2 2 6 82 82 82 54 54 54 18 18 18
48162- 6 6 6 0 0 0 0 0 0 0 0 0
48163- 0 0 0 0 0 0 0 0 0 0 0 0
48164- 0 0 0 0 0 0 0 0 0 0 0 0
48165- 0 0 0 0 0 0 0 0 0 0 0 0
48166- 0 0 0 0 0 0 0 0 0 0 0 0
48167- 0 0 0 0 0 0 0 0 0 0 0 0
48168- 0 0 0 0 0 0 6 6 6 26 26 26
48169- 62 62 62 106 106 106 74 54 14 185 133 11
48170-210 162 10 121 92 8 6 6 6 62 62 62
48171-238 238 238 253 253 253 253 253 253 253 253 253
48172-253 253 253 253 253 253 253 253 253 253 253 253
48173-253 253 253 253 253 253 231 231 231 246 246 246
48174-253 253 253 253 253 253 253 253 253 253 253 253
48175-253 253 253 253 253 253 253 253 253 253 253 253
48176-253 253 253 253 253 253 253 253 253 253 253 253
48177-253 253 253 253 253 253 253 253 253 253 253 253
48178-253 253 253 253 253 253 158 158 158 18 18 18
48179- 14 14 14 2 2 6 2 2 6 2 2 6
48180- 6 6 6 18 18 18 66 66 66 38 38 38
48181- 6 6 6 94 94 94 50 50 50 18 18 18
48182- 6 6 6 0 0 0 0 0 0 0 0 0
48183- 0 0 0 0 0 0 0 0 0 0 0 0
48184- 0 0 0 0 0 0 0 0 0 0 0 0
48185- 0 0 0 0 0 0 0 0 0 0 0 0
48186- 0 0 0 0 0 0 0 0 0 0 0 0
48187- 0 0 0 0 0 0 0 0 0 6 6 6
48188- 10 10 10 10 10 10 18 18 18 38 38 38
48189- 78 78 78 142 134 106 216 158 10 242 186 14
48190-246 190 14 246 190 14 156 118 10 10 10 10
48191- 90 90 90 238 238 238 253 253 253 253 253 253
48192-253 253 253 253 253 253 253 253 253 253 253 253
48193-253 253 253 253 253 253 231 231 231 250 250 250
48194-253 253 253 253 253 253 253 253 253 253 253 253
48195-253 253 253 253 253 253 253 253 253 253 253 253
48196-253 253 253 253 253 253 253 253 253 253 253 253
48197-253 253 253 253 253 253 253 253 253 246 230 190
48198-238 204 91 238 204 91 181 142 44 37 26 9
48199- 2 2 6 2 2 6 2 2 6 2 2 6
48200- 2 2 6 2 2 6 38 38 38 46 46 46
48201- 26 26 26 106 106 106 54 54 54 18 18 18
48202- 6 6 6 0 0 0 0 0 0 0 0 0
48203- 0 0 0 0 0 0 0 0 0 0 0 0
48204- 0 0 0 0 0 0 0 0 0 0 0 0
48205- 0 0 0 0 0 0 0 0 0 0 0 0
48206- 0 0 0 0 0 0 0 0 0 0 0 0
48207- 0 0 0 6 6 6 14 14 14 22 22 22
48208- 30 30 30 38 38 38 50 50 50 70 70 70
48209-106 106 106 190 142 34 226 170 11 242 186 14
48210-246 190 14 246 190 14 246 190 14 154 114 10
48211- 6 6 6 74 74 74 226 226 226 253 253 253
48212-253 253 253 253 253 253 253 253 253 253 253 253
48213-253 253 253 253 253 253 231 231 231 250 250 250
48214-253 253 253 253 253 253 253 253 253 253 253 253
48215-253 253 253 253 253 253 253 253 253 253 253 253
48216-253 253 253 253 253 253 253 253 253 253 253 253
48217-253 253 253 253 253 253 253 253 253 228 184 62
48218-241 196 14 241 208 19 232 195 16 38 30 10
48219- 2 2 6 2 2 6 2 2 6 2 2 6
48220- 2 2 6 6 6 6 30 30 30 26 26 26
48221-203 166 17 154 142 90 66 66 66 26 26 26
48222- 6 6 6 0 0 0 0 0 0 0 0 0
48223- 0 0 0 0 0 0 0 0 0 0 0 0
48224- 0 0 0 0 0 0 0 0 0 0 0 0
48225- 0 0 0 0 0 0 0 0 0 0 0 0
48226- 0 0 0 0 0 0 0 0 0 0 0 0
48227- 6 6 6 18 18 18 38 38 38 58 58 58
48228- 78 78 78 86 86 86 101 101 101 123 123 123
48229-175 146 61 210 150 10 234 174 13 246 186 14
48230-246 190 14 246 190 14 246 190 14 238 190 10
48231-102 78 10 2 2 6 46 46 46 198 198 198
48232-253 253 253 253 253 253 253 253 253 253 253 253
48233-253 253 253 253 253 253 234 234 234 242 242 242
48234-253 253 253 253 253 253 253 253 253 253 253 253
48235-253 253 253 253 253 253 253 253 253 253 253 253
48236-253 253 253 253 253 253 253 253 253 253 253 253
48237-253 253 253 253 253 253 253 253 253 224 178 62
48238-242 186 14 241 196 14 210 166 10 22 18 6
48239- 2 2 6 2 2 6 2 2 6 2 2 6
48240- 2 2 6 2 2 6 6 6 6 121 92 8
48241-238 202 15 232 195 16 82 82 82 34 34 34
48242- 10 10 10 0 0 0 0 0 0 0 0 0
48243- 0 0 0 0 0 0 0 0 0 0 0 0
48244- 0 0 0 0 0 0 0 0 0 0 0 0
48245- 0 0 0 0 0 0 0 0 0 0 0 0
48246- 0 0 0 0 0 0 0 0 0 0 0 0
48247- 14 14 14 38 38 38 70 70 70 154 122 46
48248-190 142 34 200 144 11 197 138 11 197 138 11
48249-213 154 11 226 170 11 242 186 14 246 190 14
48250-246 190 14 246 190 14 246 190 14 246 190 14
48251-225 175 15 46 32 6 2 2 6 22 22 22
48252-158 158 158 250 250 250 253 253 253 253 253 253
48253-253 253 253 253 253 253 253 253 253 253 253 253
48254-253 253 253 253 253 253 253 253 253 253 253 253
48255-253 253 253 253 253 253 253 253 253 253 253 253
48256-253 253 253 253 253 253 253 253 253 253 253 253
48257-253 253 253 250 250 250 242 242 242 224 178 62
48258-239 182 13 236 186 11 213 154 11 46 32 6
48259- 2 2 6 2 2 6 2 2 6 2 2 6
48260- 2 2 6 2 2 6 61 42 6 225 175 15
48261-238 190 10 236 186 11 112 100 78 42 42 42
48262- 14 14 14 0 0 0 0 0 0 0 0 0
48263- 0 0 0 0 0 0 0 0 0 0 0 0
48264- 0 0 0 0 0 0 0 0 0 0 0 0
48265- 0 0 0 0 0 0 0 0 0 0 0 0
48266- 0 0 0 0 0 0 0 0 0 6 6 6
48267- 22 22 22 54 54 54 154 122 46 213 154 11
48268-226 170 11 230 174 11 226 170 11 226 170 11
48269-236 178 12 242 186 14 246 190 14 246 190 14
48270-246 190 14 246 190 14 246 190 14 246 190 14
48271-241 196 14 184 144 12 10 10 10 2 2 6
48272- 6 6 6 116 116 116 242 242 242 253 253 253
48273-253 253 253 253 253 253 253 253 253 253 253 253
48274-253 253 253 253 253 253 253 253 253 253 253 253
48275-253 253 253 253 253 253 253 253 253 253 253 253
48276-253 253 253 253 253 253 253 253 253 253 253 253
48277-253 253 253 231 231 231 198 198 198 214 170 54
48278-236 178 12 236 178 12 210 150 10 137 92 6
48279- 18 14 6 2 2 6 2 2 6 2 2 6
48280- 6 6 6 70 47 6 200 144 11 236 178 12
48281-239 182 13 239 182 13 124 112 88 58 58 58
48282- 22 22 22 6 6 6 0 0 0 0 0 0
48283- 0 0 0 0 0 0 0 0 0 0 0 0
48284- 0 0 0 0 0 0 0 0 0 0 0 0
48285- 0 0 0 0 0 0 0 0 0 0 0 0
48286- 0 0 0 0 0 0 0 0 0 10 10 10
48287- 30 30 30 70 70 70 180 133 36 226 170 11
48288-239 182 13 242 186 14 242 186 14 246 186 14
48289-246 190 14 246 190 14 246 190 14 246 190 14
48290-246 190 14 246 190 14 246 190 14 246 190 14
48291-246 190 14 232 195 16 98 70 6 2 2 6
48292- 2 2 6 2 2 6 66 66 66 221 221 221
48293-253 253 253 253 253 253 253 253 253 253 253 253
48294-253 253 253 253 253 253 253 253 253 253 253 253
48295-253 253 253 253 253 253 253 253 253 253 253 253
48296-253 253 253 253 253 253 253 253 253 253 253 253
48297-253 253 253 206 206 206 198 198 198 214 166 58
48298-230 174 11 230 174 11 216 158 10 192 133 9
48299-163 110 8 116 81 8 102 78 10 116 81 8
48300-167 114 7 197 138 11 226 170 11 239 182 13
48301-242 186 14 242 186 14 162 146 94 78 78 78
48302- 34 34 34 14 14 14 6 6 6 0 0 0
48303- 0 0 0 0 0 0 0 0 0 0 0 0
48304- 0 0 0 0 0 0 0 0 0 0 0 0
48305- 0 0 0 0 0 0 0 0 0 0 0 0
48306- 0 0 0 0 0 0 0 0 0 6 6 6
48307- 30 30 30 78 78 78 190 142 34 226 170 11
48308-239 182 13 246 190 14 246 190 14 246 190 14
48309-246 190 14 246 190 14 246 190 14 246 190 14
48310-246 190 14 246 190 14 246 190 14 246 190 14
48311-246 190 14 241 196 14 203 166 17 22 18 6
48312- 2 2 6 2 2 6 2 2 6 38 38 38
48313-218 218 218 253 253 253 253 253 253 253 253 253
48314-253 253 253 253 253 253 253 253 253 253 253 253
48315-253 253 253 253 253 253 253 253 253 253 253 253
48316-253 253 253 253 253 253 253 253 253 253 253 253
48317-250 250 250 206 206 206 198 198 198 202 162 69
48318-226 170 11 236 178 12 224 166 10 210 150 10
48319-200 144 11 197 138 11 192 133 9 197 138 11
48320-210 150 10 226 170 11 242 186 14 246 190 14
48321-246 190 14 246 186 14 225 175 15 124 112 88
48322- 62 62 62 30 30 30 14 14 14 6 6 6
48323- 0 0 0 0 0 0 0 0 0 0 0 0
48324- 0 0 0 0 0 0 0 0 0 0 0 0
48325- 0 0 0 0 0 0 0 0 0 0 0 0
48326- 0 0 0 0 0 0 0 0 0 10 10 10
48327- 30 30 30 78 78 78 174 135 50 224 166 10
48328-239 182 13 246 190 14 246 190 14 246 190 14
48329-246 190 14 246 190 14 246 190 14 246 190 14
48330-246 190 14 246 190 14 246 190 14 246 190 14
48331-246 190 14 246 190 14 241 196 14 139 102 15
48332- 2 2 6 2 2 6 2 2 6 2 2 6
48333- 78 78 78 250 250 250 253 253 253 253 253 253
48334-253 253 253 253 253 253 253 253 253 253 253 253
48335-253 253 253 253 253 253 253 253 253 253 253 253
48336-253 253 253 253 253 253 253 253 253 253 253 253
48337-250 250 250 214 214 214 198 198 198 190 150 46
48338-219 162 10 236 178 12 234 174 13 224 166 10
48339-216 158 10 213 154 11 213 154 11 216 158 10
48340-226 170 11 239 182 13 246 190 14 246 190 14
48341-246 190 14 246 190 14 242 186 14 206 162 42
48342-101 101 101 58 58 58 30 30 30 14 14 14
48343- 6 6 6 0 0 0 0 0 0 0 0 0
48344- 0 0 0 0 0 0 0 0 0 0 0 0
48345- 0 0 0 0 0 0 0 0 0 0 0 0
48346- 0 0 0 0 0 0 0 0 0 10 10 10
48347- 30 30 30 74 74 74 174 135 50 216 158 10
48348-236 178 12 246 190 14 246 190 14 246 190 14
48349-246 190 14 246 190 14 246 190 14 246 190 14
48350-246 190 14 246 190 14 246 190 14 246 190 14
48351-246 190 14 246 190 14 241 196 14 226 184 13
48352- 61 42 6 2 2 6 2 2 6 2 2 6
48353- 22 22 22 238 238 238 253 253 253 253 253 253
48354-253 253 253 253 253 253 253 253 253 253 253 253
48355-253 253 253 253 253 253 253 253 253 253 253 253
48356-253 253 253 253 253 253 253 253 253 253 253 253
48357-253 253 253 226 226 226 187 187 187 180 133 36
48358-216 158 10 236 178 12 239 182 13 236 178 12
48359-230 174 11 226 170 11 226 170 11 230 174 11
48360-236 178 12 242 186 14 246 190 14 246 190 14
48361-246 190 14 246 190 14 246 186 14 239 182 13
48362-206 162 42 106 106 106 66 66 66 34 34 34
48363- 14 14 14 6 6 6 0 0 0 0 0 0
48364- 0 0 0 0 0 0 0 0 0 0 0 0
48365- 0 0 0 0 0 0 0 0 0 0 0 0
48366- 0 0 0 0 0 0 0 0 0 6 6 6
48367- 26 26 26 70 70 70 163 133 67 213 154 11
48368-236 178 12 246 190 14 246 190 14 246 190 14
48369-246 190 14 246 190 14 246 190 14 246 190 14
48370-246 190 14 246 190 14 246 190 14 246 190 14
48371-246 190 14 246 190 14 246 190 14 241 196 14
48372-190 146 13 18 14 6 2 2 6 2 2 6
48373- 46 46 46 246 246 246 253 253 253 253 253 253
48374-253 253 253 253 253 253 253 253 253 253 253 253
48375-253 253 253 253 253 253 253 253 253 253 253 253
48376-253 253 253 253 253 253 253 253 253 253 253 253
48377-253 253 253 221 221 221 86 86 86 156 107 11
48378-216 158 10 236 178 12 242 186 14 246 186 14
48379-242 186 14 239 182 13 239 182 13 242 186 14
48380-242 186 14 246 186 14 246 190 14 246 190 14
48381-246 190 14 246 190 14 246 190 14 246 190 14
48382-242 186 14 225 175 15 142 122 72 66 66 66
48383- 30 30 30 10 10 10 0 0 0 0 0 0
48384- 0 0 0 0 0 0 0 0 0 0 0 0
48385- 0 0 0 0 0 0 0 0 0 0 0 0
48386- 0 0 0 0 0 0 0 0 0 6 6 6
48387- 26 26 26 70 70 70 163 133 67 210 150 10
48388-236 178 12 246 190 14 246 190 14 246 190 14
48389-246 190 14 246 190 14 246 190 14 246 190 14
48390-246 190 14 246 190 14 246 190 14 246 190 14
48391-246 190 14 246 190 14 246 190 14 246 190 14
48392-232 195 16 121 92 8 34 34 34 106 106 106
48393-221 221 221 253 253 253 253 253 253 253 253 253
48394-253 253 253 253 253 253 253 253 253 253 253 253
48395-253 253 253 253 253 253 253 253 253 253 253 253
48396-253 253 253 253 253 253 253 253 253 253 253 253
48397-242 242 242 82 82 82 18 14 6 163 110 8
48398-216 158 10 236 178 12 242 186 14 246 190 14
48399-246 190 14 246 190 14 246 190 14 246 190 14
48400-246 190 14 246 190 14 246 190 14 246 190 14
48401-246 190 14 246 190 14 246 190 14 246 190 14
48402-246 190 14 246 190 14 242 186 14 163 133 67
48403- 46 46 46 18 18 18 6 6 6 0 0 0
48404- 0 0 0 0 0 0 0 0 0 0 0 0
48405- 0 0 0 0 0 0 0 0 0 0 0 0
48406- 0 0 0 0 0 0 0 0 0 10 10 10
48407- 30 30 30 78 78 78 163 133 67 210 150 10
48408-236 178 12 246 186 14 246 190 14 246 190 14
48409-246 190 14 246 190 14 246 190 14 246 190 14
48410-246 190 14 246 190 14 246 190 14 246 190 14
48411-246 190 14 246 190 14 246 190 14 246 190 14
48412-241 196 14 215 174 15 190 178 144 253 253 253
48413-253 253 253 253 253 253 253 253 253 253 253 253
48414-253 253 253 253 253 253 253 253 253 253 253 253
48415-253 253 253 253 253 253 253 253 253 253 253 253
48416-253 253 253 253 253 253 253 253 253 218 218 218
48417- 58 58 58 2 2 6 22 18 6 167 114 7
48418-216 158 10 236 178 12 246 186 14 246 190 14
48419-246 190 14 246 190 14 246 190 14 246 190 14
48420-246 190 14 246 190 14 246 190 14 246 190 14
48421-246 190 14 246 190 14 246 190 14 246 190 14
48422-246 190 14 246 186 14 242 186 14 190 150 46
48423- 54 54 54 22 22 22 6 6 6 0 0 0
48424- 0 0 0 0 0 0 0 0 0 0 0 0
48425- 0 0 0 0 0 0 0 0 0 0 0 0
48426- 0 0 0 0 0 0 0 0 0 14 14 14
48427- 38 38 38 86 86 86 180 133 36 213 154 11
48428-236 178 12 246 186 14 246 190 14 246 190 14
48429-246 190 14 246 190 14 246 190 14 246 190 14
48430-246 190 14 246 190 14 246 190 14 246 190 14
48431-246 190 14 246 190 14 246 190 14 246 190 14
48432-246 190 14 232 195 16 190 146 13 214 214 214
48433-253 253 253 253 253 253 253 253 253 253 253 253
48434-253 253 253 253 253 253 253 253 253 253 253 253
48435-253 253 253 253 253 253 253 253 253 253 253 253
48436-253 253 253 250 250 250 170 170 170 26 26 26
48437- 2 2 6 2 2 6 37 26 9 163 110 8
48438-219 162 10 239 182 13 246 186 14 246 190 14
48439-246 190 14 246 190 14 246 190 14 246 190 14
48440-246 190 14 246 190 14 246 190 14 246 190 14
48441-246 190 14 246 190 14 246 190 14 246 190 14
48442-246 186 14 236 178 12 224 166 10 142 122 72
48443- 46 46 46 18 18 18 6 6 6 0 0 0
48444- 0 0 0 0 0 0 0 0 0 0 0 0
48445- 0 0 0 0 0 0 0 0 0 0 0 0
48446- 0 0 0 0 0 0 6 6 6 18 18 18
48447- 50 50 50 109 106 95 192 133 9 224 166 10
48448-242 186 14 246 190 14 246 190 14 246 190 14
48449-246 190 14 246 190 14 246 190 14 246 190 14
48450-246 190 14 246 190 14 246 190 14 246 190 14
48451-246 190 14 246 190 14 246 190 14 246 190 14
48452-242 186 14 226 184 13 210 162 10 142 110 46
48453-226 226 226 253 253 253 253 253 253 253 253 253
48454-253 253 253 253 253 253 253 253 253 253 253 253
48455-253 253 253 253 253 253 253 253 253 253 253 253
48456-198 198 198 66 66 66 2 2 6 2 2 6
48457- 2 2 6 2 2 6 50 34 6 156 107 11
48458-219 162 10 239 182 13 246 186 14 246 190 14
48459-246 190 14 246 190 14 246 190 14 246 190 14
48460-246 190 14 246 190 14 246 190 14 246 190 14
48461-246 190 14 246 190 14 246 190 14 242 186 14
48462-234 174 13 213 154 11 154 122 46 66 66 66
48463- 30 30 30 10 10 10 0 0 0 0 0 0
48464- 0 0 0 0 0 0 0 0 0 0 0 0
48465- 0 0 0 0 0 0 0 0 0 0 0 0
48466- 0 0 0 0 0 0 6 6 6 22 22 22
48467- 58 58 58 154 121 60 206 145 10 234 174 13
48468-242 186 14 246 186 14 246 190 14 246 190 14
48469-246 190 14 246 190 14 246 190 14 246 190 14
48470-246 190 14 246 190 14 246 190 14 246 190 14
48471-246 190 14 246 190 14 246 190 14 246 190 14
48472-246 186 14 236 178 12 210 162 10 163 110 8
48473- 61 42 6 138 138 138 218 218 218 250 250 250
48474-253 253 253 253 253 253 253 253 253 250 250 250
48475-242 242 242 210 210 210 144 144 144 66 66 66
48476- 6 6 6 2 2 6 2 2 6 2 2 6
48477- 2 2 6 2 2 6 61 42 6 163 110 8
48478-216 158 10 236 178 12 246 190 14 246 190 14
48479-246 190 14 246 190 14 246 190 14 246 190 14
48480-246 190 14 246 190 14 246 190 14 246 190 14
48481-246 190 14 239 182 13 230 174 11 216 158 10
48482-190 142 34 124 112 88 70 70 70 38 38 38
48483- 18 18 18 6 6 6 0 0 0 0 0 0
48484- 0 0 0 0 0 0 0 0 0 0 0 0
48485- 0 0 0 0 0 0 0 0 0 0 0 0
48486- 0 0 0 0 0 0 6 6 6 22 22 22
48487- 62 62 62 168 124 44 206 145 10 224 166 10
48488-236 178 12 239 182 13 242 186 14 242 186 14
48489-246 186 14 246 190 14 246 190 14 246 190 14
48490-246 190 14 246 190 14 246 190 14 246 190 14
48491-246 190 14 246 190 14 246 190 14 246 190 14
48492-246 190 14 236 178 12 216 158 10 175 118 6
48493- 80 54 7 2 2 6 6 6 6 30 30 30
48494- 54 54 54 62 62 62 50 50 50 38 38 38
48495- 14 14 14 2 2 6 2 2 6 2 2 6
48496- 2 2 6 2 2 6 2 2 6 2 2 6
48497- 2 2 6 6 6 6 80 54 7 167 114 7
48498-213 154 11 236 178 12 246 190 14 246 190 14
48499-246 190 14 246 190 14 246 190 14 246 190 14
48500-246 190 14 242 186 14 239 182 13 239 182 13
48501-230 174 11 210 150 10 174 135 50 124 112 88
48502- 82 82 82 54 54 54 34 34 34 18 18 18
48503- 6 6 6 0 0 0 0 0 0 0 0 0
48504- 0 0 0 0 0 0 0 0 0 0 0 0
48505- 0 0 0 0 0 0 0 0 0 0 0 0
48506- 0 0 0 0 0 0 6 6 6 18 18 18
48507- 50 50 50 158 118 36 192 133 9 200 144 11
48508-216 158 10 219 162 10 224 166 10 226 170 11
48509-230 174 11 236 178 12 239 182 13 239 182 13
48510-242 186 14 246 186 14 246 190 14 246 190 14
48511-246 190 14 246 190 14 246 190 14 246 190 14
48512-246 186 14 230 174 11 210 150 10 163 110 8
48513-104 69 6 10 10 10 2 2 6 2 2 6
48514- 2 2 6 2 2 6 2 2 6 2 2 6
48515- 2 2 6 2 2 6 2 2 6 2 2 6
48516- 2 2 6 2 2 6 2 2 6 2 2 6
48517- 2 2 6 6 6 6 91 60 6 167 114 7
48518-206 145 10 230 174 11 242 186 14 246 190 14
48519-246 190 14 246 190 14 246 186 14 242 186 14
48520-239 182 13 230 174 11 224 166 10 213 154 11
48521-180 133 36 124 112 88 86 86 86 58 58 58
48522- 38 38 38 22 22 22 10 10 10 6 6 6
48523- 0 0 0 0 0 0 0 0 0 0 0 0
48524- 0 0 0 0 0 0 0 0 0 0 0 0
48525- 0 0 0 0 0 0 0 0 0 0 0 0
48526- 0 0 0 0 0 0 0 0 0 14 14 14
48527- 34 34 34 70 70 70 138 110 50 158 118 36
48528-167 114 7 180 123 7 192 133 9 197 138 11
48529-200 144 11 206 145 10 213 154 11 219 162 10
48530-224 166 10 230 174 11 239 182 13 242 186 14
48531-246 186 14 246 186 14 246 186 14 246 186 14
48532-239 182 13 216 158 10 185 133 11 152 99 6
48533-104 69 6 18 14 6 2 2 6 2 2 6
48534- 2 2 6 2 2 6 2 2 6 2 2 6
48535- 2 2 6 2 2 6 2 2 6 2 2 6
48536- 2 2 6 2 2 6 2 2 6 2 2 6
48537- 2 2 6 6 6 6 80 54 7 152 99 6
48538-192 133 9 219 162 10 236 178 12 239 182 13
48539-246 186 14 242 186 14 239 182 13 236 178 12
48540-224 166 10 206 145 10 192 133 9 154 121 60
48541- 94 94 94 62 62 62 42 42 42 22 22 22
48542- 14 14 14 6 6 6 0 0 0 0 0 0
48543- 0 0 0 0 0 0 0 0 0 0 0 0
48544- 0 0 0 0 0 0 0 0 0 0 0 0
48545- 0 0 0 0 0 0 0 0 0 0 0 0
48546- 0 0 0 0 0 0 0 0 0 6 6 6
48547- 18 18 18 34 34 34 58 58 58 78 78 78
48548-101 98 89 124 112 88 142 110 46 156 107 11
48549-163 110 8 167 114 7 175 118 6 180 123 7
48550-185 133 11 197 138 11 210 150 10 219 162 10
48551-226 170 11 236 178 12 236 178 12 234 174 13
48552-219 162 10 197 138 11 163 110 8 130 83 6
48553- 91 60 6 10 10 10 2 2 6 2 2 6
48554- 18 18 18 38 38 38 38 38 38 38 38 38
48555- 38 38 38 38 38 38 38 38 38 38 38 38
48556- 38 38 38 38 38 38 26 26 26 2 2 6
48557- 2 2 6 6 6 6 70 47 6 137 92 6
48558-175 118 6 200 144 11 219 162 10 230 174 11
48559-234 174 13 230 174 11 219 162 10 210 150 10
48560-192 133 9 163 110 8 124 112 88 82 82 82
48561- 50 50 50 30 30 30 14 14 14 6 6 6
48562- 0 0 0 0 0 0 0 0 0 0 0 0
48563- 0 0 0 0 0 0 0 0 0 0 0 0
48564- 0 0 0 0 0 0 0 0 0 0 0 0
48565- 0 0 0 0 0 0 0 0 0 0 0 0
48566- 0 0 0 0 0 0 0 0 0 0 0 0
48567- 6 6 6 14 14 14 22 22 22 34 34 34
48568- 42 42 42 58 58 58 74 74 74 86 86 86
48569-101 98 89 122 102 70 130 98 46 121 87 25
48570-137 92 6 152 99 6 163 110 8 180 123 7
48571-185 133 11 197 138 11 206 145 10 200 144 11
48572-180 123 7 156 107 11 130 83 6 104 69 6
48573- 50 34 6 54 54 54 110 110 110 101 98 89
48574- 86 86 86 82 82 82 78 78 78 78 78 78
48575- 78 78 78 78 78 78 78 78 78 78 78 78
48576- 78 78 78 82 82 82 86 86 86 94 94 94
48577-106 106 106 101 101 101 86 66 34 124 80 6
48578-156 107 11 180 123 7 192 133 9 200 144 11
48579-206 145 10 200 144 11 192 133 9 175 118 6
48580-139 102 15 109 106 95 70 70 70 42 42 42
48581- 22 22 22 10 10 10 0 0 0 0 0 0
48582- 0 0 0 0 0 0 0 0 0 0 0 0
48583- 0 0 0 0 0 0 0 0 0 0 0 0
48584- 0 0 0 0 0 0 0 0 0 0 0 0
48585- 0 0 0 0 0 0 0 0 0 0 0 0
48586- 0 0 0 0 0 0 0 0 0 0 0 0
48587- 0 0 0 0 0 0 6 6 6 10 10 10
48588- 14 14 14 22 22 22 30 30 30 38 38 38
48589- 50 50 50 62 62 62 74 74 74 90 90 90
48590-101 98 89 112 100 78 121 87 25 124 80 6
48591-137 92 6 152 99 6 152 99 6 152 99 6
48592-138 86 6 124 80 6 98 70 6 86 66 30
48593-101 98 89 82 82 82 58 58 58 46 46 46
48594- 38 38 38 34 34 34 34 34 34 34 34 34
48595- 34 34 34 34 34 34 34 34 34 34 34 34
48596- 34 34 34 34 34 34 38 38 38 42 42 42
48597- 54 54 54 82 82 82 94 86 76 91 60 6
48598-134 86 6 156 107 11 167 114 7 175 118 6
48599-175 118 6 167 114 7 152 99 6 121 87 25
48600-101 98 89 62 62 62 34 34 34 18 18 18
48601- 6 6 6 0 0 0 0 0 0 0 0 0
48602- 0 0 0 0 0 0 0 0 0 0 0 0
48603- 0 0 0 0 0 0 0 0 0 0 0 0
48604- 0 0 0 0 0 0 0 0 0 0 0 0
48605- 0 0 0 0 0 0 0 0 0 0 0 0
48606- 0 0 0 0 0 0 0 0 0 0 0 0
48607- 0 0 0 0 0 0 0 0 0 0 0 0
48608- 0 0 0 6 6 6 6 6 6 10 10 10
48609- 18 18 18 22 22 22 30 30 30 42 42 42
48610- 50 50 50 66 66 66 86 86 86 101 98 89
48611-106 86 58 98 70 6 104 69 6 104 69 6
48612-104 69 6 91 60 6 82 62 34 90 90 90
48613- 62 62 62 38 38 38 22 22 22 14 14 14
48614- 10 10 10 10 10 10 10 10 10 10 10 10
48615- 10 10 10 10 10 10 6 6 6 10 10 10
48616- 10 10 10 10 10 10 10 10 10 14 14 14
48617- 22 22 22 42 42 42 70 70 70 89 81 66
48618- 80 54 7 104 69 6 124 80 6 137 92 6
48619-134 86 6 116 81 8 100 82 52 86 86 86
48620- 58 58 58 30 30 30 14 14 14 6 6 6
48621- 0 0 0 0 0 0 0 0 0 0 0 0
48622- 0 0 0 0 0 0 0 0 0 0 0 0
48623- 0 0 0 0 0 0 0 0 0 0 0 0
48624- 0 0 0 0 0 0 0 0 0 0 0 0
48625- 0 0 0 0 0 0 0 0 0 0 0 0
48626- 0 0 0 0 0 0 0 0 0 0 0 0
48627- 0 0 0 0 0 0 0 0 0 0 0 0
48628- 0 0 0 0 0 0 0 0 0 0 0 0
48629- 0 0 0 6 6 6 10 10 10 14 14 14
48630- 18 18 18 26 26 26 38 38 38 54 54 54
48631- 70 70 70 86 86 86 94 86 76 89 81 66
48632- 89 81 66 86 86 86 74 74 74 50 50 50
48633- 30 30 30 14 14 14 6 6 6 0 0 0
48634- 0 0 0 0 0 0 0 0 0 0 0 0
48635- 0 0 0 0 0 0 0 0 0 0 0 0
48636- 0 0 0 0 0 0 0 0 0 0 0 0
48637- 6 6 6 18 18 18 34 34 34 58 58 58
48638- 82 82 82 89 81 66 89 81 66 89 81 66
48639- 94 86 66 94 86 76 74 74 74 50 50 50
48640- 26 26 26 14 14 14 6 6 6 0 0 0
48641- 0 0 0 0 0 0 0 0 0 0 0 0
48642- 0 0 0 0 0 0 0 0 0 0 0 0
48643- 0 0 0 0 0 0 0 0 0 0 0 0
48644- 0 0 0 0 0 0 0 0 0 0 0 0
48645- 0 0 0 0 0 0 0 0 0 0 0 0
48646- 0 0 0 0 0 0 0 0 0 0 0 0
48647- 0 0 0 0 0 0 0 0 0 0 0 0
48648- 0 0 0 0 0 0 0 0 0 0 0 0
48649- 0 0 0 0 0 0 0 0 0 0 0 0
48650- 6 6 6 6 6 6 14 14 14 18 18 18
48651- 30 30 30 38 38 38 46 46 46 54 54 54
48652- 50 50 50 42 42 42 30 30 30 18 18 18
48653- 10 10 10 0 0 0 0 0 0 0 0 0
48654- 0 0 0 0 0 0 0 0 0 0 0 0
48655- 0 0 0 0 0 0 0 0 0 0 0 0
48656- 0 0 0 0 0 0 0 0 0 0 0 0
48657- 0 0 0 6 6 6 14 14 14 26 26 26
48658- 38 38 38 50 50 50 58 58 58 58 58 58
48659- 54 54 54 42 42 42 30 30 30 18 18 18
48660- 10 10 10 0 0 0 0 0 0 0 0 0
48661- 0 0 0 0 0 0 0 0 0 0 0 0
48662- 0 0 0 0 0 0 0 0 0 0 0 0
48663- 0 0 0 0 0 0 0 0 0 0 0 0
48664- 0 0 0 0 0 0 0 0 0 0 0 0
48665- 0 0 0 0 0 0 0 0 0 0 0 0
48666- 0 0 0 0 0 0 0 0 0 0 0 0
48667- 0 0 0 0 0 0 0 0 0 0 0 0
48668- 0 0 0 0 0 0 0 0 0 0 0 0
48669- 0 0 0 0 0 0 0 0 0 0 0 0
48670- 0 0 0 0 0 0 0 0 0 6 6 6
48671- 6 6 6 10 10 10 14 14 14 18 18 18
48672- 18 18 18 14 14 14 10 10 10 6 6 6
48673- 0 0 0 0 0 0 0 0 0 0 0 0
48674- 0 0 0 0 0 0 0 0 0 0 0 0
48675- 0 0 0 0 0 0 0 0 0 0 0 0
48676- 0 0 0 0 0 0 0 0 0 0 0 0
48677- 0 0 0 0 0 0 0 0 0 6 6 6
48678- 14 14 14 18 18 18 22 22 22 22 22 22
48679- 18 18 18 14 14 14 10 10 10 6 6 6
48680- 0 0 0 0 0 0 0 0 0 0 0 0
48681- 0 0 0 0 0 0 0 0 0 0 0 0
48682- 0 0 0 0 0 0 0 0 0 0 0 0
48683- 0 0 0 0 0 0 0 0 0 0 0 0
48684- 0 0 0 0 0 0 0 0 0 0 0 0
48685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48690+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48696+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48698+4 4 4 4 4 4
48699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48704+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48710+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48712+4 4 4 4 4 4
48713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48724+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48726+4 4 4 4 4 4
48727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48740+4 4 4 4 4 4
48741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48754+4 4 4 4 4 4
48755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48768+4 4 4 4 4 4
48769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48773+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
48774+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
48775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48778+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
48779+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
48780+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
48781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48782+4 4 4 4 4 4
48783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48787+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
48788+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
48789+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48792+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
48793+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
48794+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
48795+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48796+4 4 4 4 4 4
48797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48801+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
48802+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
48803+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
48804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48806+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
48807+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
48808+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
48809+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
48810+4 4 4 4 4 4
48811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48814+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
48815+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
48816+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
48817+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
48818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48819+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
48820+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
48821+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
48822+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
48823+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
48824+4 4 4 4 4 4
48825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48828+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
48829+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
48830+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
48831+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
48832+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
48833+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
48834+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
48835+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
48836+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
48837+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
48838+4 4 4 4 4 4
48839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
48842+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
48843+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
48844+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
48845+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
48846+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
48847+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
48848+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
48849+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
48850+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
48851+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
48852+4 4 4 4 4 4
48853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48855+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
48856+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
48857+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
48858+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
48859+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
48860+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
48861+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
48862+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
48863+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
48864+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
48865+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
48866+4 4 4 4 4 4
48867+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48869+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
48870+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
48871+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
48872+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
48873+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
48874+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
48875+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
48876+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
48877+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
48878+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
48879+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
48880+4 4 4 4 4 4
48881+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48883+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
48884+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
48885+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
48886+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
48887+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
48888+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
48889+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
48890+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
48891+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
48892+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
48893+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
48894+4 4 4 4 4 4
48895+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48897+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
48898+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
48899+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
48900+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
48901+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
48902+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
48903+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
48904+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
48905+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
48906+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
48907+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
48908+4 4 4 4 4 4
48909+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48910+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
48911+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
48912+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
48913+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
48914+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
48915+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
48916+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
48917+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
48918+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
48919+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
48920+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
48921+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
48922+4 4 4 4 4 4
48923+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
48924+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
48925+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
48926+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
48927+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
48928+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
48929+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
48930+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
48931+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
48932+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
48933+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
48934+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
48935+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
48936+0 0 0 4 4 4
48937+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
48938+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
48939+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
48940+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
48941+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
48942+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
48943+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
48944+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
48945+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
48946+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
48947+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
48948+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
48949+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
48950+2 0 0 0 0 0
48951+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
48952+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
48953+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
48954+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
48955+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
48956+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
48957+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
48958+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
48959+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
48960+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
48961+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
48962+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
48963+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
48964+37 38 37 0 0 0
48965+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
48966+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
48967+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
48968+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
48969+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
48970+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
48971+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
48972+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
48973+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
48974+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
48975+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
48976+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
48977+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
48978+85 115 134 4 0 0
48979+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
48980+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
48981+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
48982+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
48983+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
48984+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
48985+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
48986+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
48987+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
48988+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
48989+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
48990+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
48991+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
48992+60 73 81 4 0 0
48993+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
48994+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
48995+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
48996+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
48997+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
48998+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
48999+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
49000+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
49001+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
49002+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
49003+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
49004+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
49005+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
49006+16 19 21 4 0 0
49007+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
49008+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
49009+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
49010+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
49011+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
49012+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
49013+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
49014+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
49015+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
49016+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
49017+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
49018+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
49019+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
49020+4 0 0 4 3 3
49021+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
49022+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
49023+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
49024+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
49025+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
49026+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
49027+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
49028+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
49029+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
49030+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
49031+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
49032+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
49033+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
49034+3 2 2 4 4 4
49035+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
49036+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
49037+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
49038+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
49039+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
49040+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
49041+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49042+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
49043+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
49044+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
49045+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
49046+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
49047+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
49048+4 4 4 4 4 4
49049+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
49050+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
49051+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
49052+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
49053+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
49054+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
49055+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
49056+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
49057+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
49058+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
49059+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
49060+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
49061+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
49062+4 4 4 4 4 4
49063+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
49064+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
49065+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
49066+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
49067+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
49068+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
49069+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
49070+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
49071+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
49072+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
49073+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
49074+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
49075+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
49076+5 5 5 5 5 5
49077+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
49078+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
49079+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
49080+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
49081+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
49082+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
49083+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
49084+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
49085+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
49086+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
49087+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
49088+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
49089+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
49090+5 5 5 4 4 4
49091+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
49092+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
49093+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
49094+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
49095+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
49096+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
49097+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
49098+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
49099+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
49100+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
49101+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
49102+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
49103+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49104+4 4 4 4 4 4
49105+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
49106+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
49107+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
49108+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
49109+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
49110+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
49111+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
49112+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
49113+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
49114+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
49115+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
49116+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
49117+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49118+4 4 4 4 4 4
49119+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
49120+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
49121+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
49122+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
49123+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
49124+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
49125+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
49126+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
49127+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
49128+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
49129+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
49130+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49131+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49132+4 4 4 4 4 4
49133+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
49134+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
49135+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
49136+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
49137+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
49138+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
49139+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
49140+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
49141+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
49142+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
49143+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
49144+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49145+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49146+4 4 4 4 4 4
49147+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
49148+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
49149+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
49150+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
49151+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
49152+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
49153+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
49154+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
49155+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
49156+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
49157+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49158+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49159+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49160+4 4 4 4 4 4
49161+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
49162+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
49163+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
49164+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
49165+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
49166+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
49167+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
49168+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
49169+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
49170+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
49171+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
49172+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49173+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49174+4 4 4 4 4 4
49175+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
49176+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
49177+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
49178+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
49179+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
49180+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
49181+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
49182+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
49183+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
49184+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
49185+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
49186+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49187+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49188+4 4 4 4 4 4
49189+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
49190+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
49191+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
49192+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
49193+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
49194+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
49195+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
49196+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
49197+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
49198+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
49199+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49200+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49201+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49202+4 4 4 4 4 4
49203+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
49204+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
49205+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
49206+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
49207+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
49208+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
49209+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
49210+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
49211+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
49212+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
49213+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49214+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49215+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49216+4 4 4 4 4 4
49217+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
49218+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
49219+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
49220+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
49221+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
49222+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
49223+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
49224+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
49225+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
49226+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
49227+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49228+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49229+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49230+4 4 4 4 4 4
49231+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
49232+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
49233+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
49234+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
49235+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
49236+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
49237+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
49238+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
49239+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
49240+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49241+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49242+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49243+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49244+4 4 4 4 4 4
49245+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
49246+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
49247+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
49248+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
49249+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
49250+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
49251+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
49252+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
49253+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
49254+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49255+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49256+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49257+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49258+4 4 4 4 4 4
49259+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
49260+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
49261+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
49262+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
49263+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
49264+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
49265+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
49266+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
49267+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
49268+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49269+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49270+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49271+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49272+4 4 4 4 4 4
49273+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
49274+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
49275+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
49276+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
49277+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
49278+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
49279+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
49280+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
49281+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
49282+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49283+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49284+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49285+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49286+4 4 4 4 4 4
49287+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
49288+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
49289+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
49290+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
49291+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
49292+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
49293+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
49294+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
49295+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
49296+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49297+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49298+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49299+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49300+4 4 4 4 4 4
49301+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
49302+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
49303+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
49304+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
49305+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
49306+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
49307+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
49308+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
49309+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
49310+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49311+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49312+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49314+4 4 4 4 4 4
49315+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
49316+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
49317+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
49318+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
49319+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
49320+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
49321+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
49322+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
49323+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
49324+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49325+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49326+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49328+4 4 4 4 4 4
49329+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
49330+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
49331+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
49332+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
49333+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
49334+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
49335+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
49336+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
49337+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
49338+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49339+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49340+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49342+4 4 4 4 4 4
49343+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
49344+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
49345+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
49346+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
49347+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
49348+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
49349+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
49350+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
49351+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
49352+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49353+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49354+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49356+4 4 4 4 4 4
49357+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
49358+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
49359+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
49360+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
49361+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
49362+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
49363+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
49364+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
49365+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
49366+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49367+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49370+4 4 4 4 4 4
49371+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
49372+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
49373+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
49374+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
49375+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
49376+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
49377+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
49378+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
49379+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
49380+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49381+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49384+4 4 4 4 4 4
49385+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
49386+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
49387+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
49388+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
49389+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
49390+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
49391+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
49392+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
49393+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
49394+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49395+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49398+4 4 4 4 4 4
49399+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
49400+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
49401+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
49402+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
49403+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
49404+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
49405+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
49406+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
49407+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
49408+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49409+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49412+4 4 4 4 4 4
49413+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
49414+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
49415+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
49416+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
49417+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
49418+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
49419+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
49420+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
49421+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
49422+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49423+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49426+4 4 4 4 4 4
49427+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
49428+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
49429+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
49430+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
49431+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
49432+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
49433+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
49434+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
49435+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
49436+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
49437+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49440+4 4 4 4 4 4
49441+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
49442+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
49443+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
49444+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
49445+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
49446+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
49447+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
49448+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
49449+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
49450+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
49451+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49454+4 4 4 4 4 4
49455+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
49456+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
49457+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
49458+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
49459+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
49460+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
49461+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
49462+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
49463+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
49464+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
49465+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49468+4 4 4 4 4 4
49469+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
49470+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
49471+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
49472+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
49473+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
49474+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
49475+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49476+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
49477+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
49478+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
49479+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
49480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49482+4 4 4 4 4 4
49483+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
49484+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
49485+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
49486+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
49487+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
49488+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
49489+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
49490+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
49491+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
49492+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
49493+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49496+4 4 4 4 4 4
49497+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
49498+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
49499+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
49500+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
49501+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
49502+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
49503+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
49504+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
49505+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
49506+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
49507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49510+4 4 4 4 4 4
49511+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
49512+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
49513+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
49514+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
49515+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
49516+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
49517+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
49518+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
49519+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
49520+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
49521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49524+4 4 4 4 4 4
49525+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
49526+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
49527+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
49528+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
49529+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
49530+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
49531+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
49532+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
49533+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
49534+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
49535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49538+4 4 4 4 4 4
49539+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
49540+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
49541+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
49542+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
49543+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
49544+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
49545+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
49546+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
49547+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
49548+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
49549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49552+4 4 4 4 4 4
49553+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
49554+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
49555+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
49556+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
49557+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
49558+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
49559+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
49560+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
49561+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
49562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49566+4 4 4 4 4 4
49567+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
49568+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
49569+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
49570+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
49571+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
49572+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
49573+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
49574+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
49575+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
49576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49579+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49580+4 4 4 4 4 4
49581+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
49582+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
49583+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
49584+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
49585+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
49586+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
49587+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
49588+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
49589+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49592+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49594+4 4 4 4 4 4
49595+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
49596+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
49597+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
49598+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
49599+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
49600+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
49601+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
49602+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
49603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49606+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49608+4 4 4 4 4 4
49609+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
49610+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
49611+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
49612+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
49613+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
49614+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
49615+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
49616+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
49617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49620+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49622+4 4 4 4 4 4
49623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
49624+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
49625+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
49626+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
49627+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
49628+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
49629+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
49630+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
49631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49633+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49634+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49636+4 4 4 4 4 4
49637+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49638+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
49639+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
49640+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
49641+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
49642+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
49643+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
49644+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
49645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49647+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49648+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49650+4 4 4 4 4 4
49651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49652+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
49653+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
49654+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
49655+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
49656+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
49657+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
49658+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
49659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49661+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49662+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49664+4 4 4 4 4 4
49665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49667+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
49668+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
49669+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
49670+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
49671+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
49672+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
49673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49675+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49676+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49678+4 4 4 4 4 4
49679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
49682+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
49683+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
49684+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
49685+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
49686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49690+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49692+4 4 4 4 4 4
49693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49696+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
49697+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
49698+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
49699+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
49700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49704+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49706+4 4 4 4 4 4
49707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49710+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
49711+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
49712+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
49713+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
49714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49720+4 4 4 4 4 4
49721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49724+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
49725+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
49726+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
49727+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
49728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49734+4 4 4 4 4 4
49735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
49739+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
49740+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
49741+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
49742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49748+4 4 4 4 4 4
49749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49753+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
49754+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
49755+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
49756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49762+4 4 4 4 4 4
49763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49767+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
49768+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
49769+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49776+4 4 4 4 4 4
49777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49778+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49781+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
49782+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
49783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49790+4 4 4 4 4 4
49791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49795+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
49796+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
49797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
49804+4 4 4 4 4 4
49805diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c
49806index fe92eed..106e085 100644
49807--- a/drivers/video/mb862xx/mb862xxfb_accel.c
49808+++ b/drivers/video/mb862xx/mb862xxfb_accel.c
49809@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
49810 struct mb862xxfb_par *par = info->par;
49811
49812 if (info->var.bits_per_pixel == 32) {
49813- info->fbops->fb_fillrect = cfb_fillrect;
49814- info->fbops->fb_copyarea = cfb_copyarea;
49815- info->fbops->fb_imageblit = cfb_imageblit;
49816+ pax_open_kernel();
49817+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
49818+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
49819+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
49820+ pax_close_kernel();
49821 } else {
49822 outreg(disp, GC_L0EM, 3);
49823- info->fbops->fb_fillrect = mb86290fb_fillrect;
49824- info->fbops->fb_copyarea = mb86290fb_copyarea;
49825- info->fbops->fb_imageblit = mb86290fb_imageblit;
49826+ pax_open_kernel();
49827+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
49828+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
49829+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
49830+ pax_close_kernel();
49831 }
49832 outreg(draw, GDC_REG_DRAW_BASE, 0);
49833 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
49834diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
49835index ff22871..b129bed 100644
49836--- a/drivers/video/nvidia/nvidia.c
49837+++ b/drivers/video/nvidia/nvidia.c
49838@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
49839 info->fix.line_length = (info->var.xres_virtual *
49840 info->var.bits_per_pixel) >> 3;
49841 if (info->var.accel_flags) {
49842- info->fbops->fb_imageblit = nvidiafb_imageblit;
49843- info->fbops->fb_fillrect = nvidiafb_fillrect;
49844- info->fbops->fb_copyarea = nvidiafb_copyarea;
49845- info->fbops->fb_sync = nvidiafb_sync;
49846+ pax_open_kernel();
49847+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
49848+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
49849+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
49850+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
49851+ pax_close_kernel();
49852 info->pixmap.scan_align = 4;
49853 info->flags &= ~FBINFO_HWACCEL_DISABLED;
49854 info->flags |= FBINFO_READS_FAST;
49855 NVResetGraphics(info);
49856 } else {
49857- info->fbops->fb_imageblit = cfb_imageblit;
49858- info->fbops->fb_fillrect = cfb_fillrect;
49859- info->fbops->fb_copyarea = cfb_copyarea;
49860- info->fbops->fb_sync = NULL;
49861+ pax_open_kernel();
49862+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
49863+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
49864+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
49865+ *(void **)&info->fbops->fb_sync = NULL;
49866+ pax_close_kernel();
49867 info->pixmap.scan_align = 1;
49868 info->flags |= FBINFO_HWACCEL_DISABLED;
49869 info->flags &= ~FBINFO_READS_FAST;
49870@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
49871 info->pixmap.size = 8 * 1024;
49872 info->pixmap.flags = FB_PIXMAP_SYSTEM;
49873
49874- if (!hwcur)
49875- info->fbops->fb_cursor = NULL;
49876+ if (!hwcur) {
49877+ pax_open_kernel();
49878+ *(void **)&info->fbops->fb_cursor = NULL;
49879+ pax_close_kernel();
49880+ }
49881
49882 info->var.accel_flags = (!noaccel);
49883
49884diff --git a/drivers/video/output.c b/drivers/video/output.c
49885index 0d6f2cd..6285b97 100644
49886--- a/drivers/video/output.c
49887+++ b/drivers/video/output.c
49888@@ -97,7 +97,7 @@ struct output_device *video_output_register(const char *name,
49889 new_dev->props = op;
49890 new_dev->dev.class = &video_output_class;
49891 new_dev->dev.parent = dev;
49892- dev_set_name(&new_dev->dev, name);
49893+ dev_set_name(&new_dev->dev, "%s", name);
49894 dev_set_drvdata(&new_dev->dev, devdata);
49895 ret_code = device_register(&new_dev->dev);
49896 if (ret_code) {
49897diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
49898index 05c2dc3..ea1f391 100644
49899--- a/drivers/video/s1d13xxxfb.c
49900+++ b/drivers/video/s1d13xxxfb.c
49901@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
49902
49903 switch(prod_id) {
49904 case S1D13506_PROD_ID: /* activate acceleration */
49905- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
49906- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
49907+ pax_open_kernel();
49908+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
49909+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
49910+ pax_close_kernel();
49911 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
49912 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
49913 break;
49914diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
49915index b2b33fc..f9f4658 100644
49916--- a/drivers/video/smscufx.c
49917+++ b/drivers/video/smscufx.c
49918@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
49919 fb_deferred_io_cleanup(info);
49920 kfree(info->fbdefio);
49921 info->fbdefio = NULL;
49922- info->fbops->fb_mmap = ufx_ops_mmap;
49923+ pax_open_kernel();
49924+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
49925+ pax_close_kernel();
49926 }
49927
49928 pr_debug("released /dev/fb%d user=%d count=%d",
49929diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
49930index ec03e72..f578436 100644
49931--- a/drivers/video/udlfb.c
49932+++ b/drivers/video/udlfb.c
49933@@ -623,11 +623,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
49934 dlfb_urb_completion(urb);
49935
49936 error:
49937- atomic_add(bytes_sent, &dev->bytes_sent);
49938- atomic_add(bytes_identical, &dev->bytes_identical);
49939- atomic_add(width*height*2, &dev->bytes_rendered);
49940+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
49941+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
49942+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
49943 end_cycles = get_cycles();
49944- atomic_add(((unsigned int) ((end_cycles - start_cycles)
49945+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
49946 >> 10)), /* Kcycles */
49947 &dev->cpu_kcycles_used);
49948
49949@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
49950 dlfb_urb_completion(urb);
49951
49952 error:
49953- atomic_add(bytes_sent, &dev->bytes_sent);
49954- atomic_add(bytes_identical, &dev->bytes_identical);
49955- atomic_add(bytes_rendered, &dev->bytes_rendered);
49956+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
49957+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
49958+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
49959 end_cycles = get_cycles();
49960- atomic_add(((unsigned int) ((end_cycles - start_cycles)
49961+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
49962 >> 10)), /* Kcycles */
49963 &dev->cpu_kcycles_used);
49964 }
49965@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
49966 fb_deferred_io_cleanup(info);
49967 kfree(info->fbdefio);
49968 info->fbdefio = NULL;
49969- info->fbops->fb_mmap = dlfb_ops_mmap;
49970+ pax_open_kernel();
49971+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
49972+ pax_close_kernel();
49973 }
49974
49975 pr_warn("released /dev/fb%d user=%d count=%d\n",
49976@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
49977 struct fb_info *fb_info = dev_get_drvdata(fbdev);
49978 struct dlfb_data *dev = fb_info->par;
49979 return snprintf(buf, PAGE_SIZE, "%u\n",
49980- atomic_read(&dev->bytes_rendered));
49981+ atomic_read_unchecked(&dev->bytes_rendered));
49982 }
49983
49984 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
49985@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
49986 struct fb_info *fb_info = dev_get_drvdata(fbdev);
49987 struct dlfb_data *dev = fb_info->par;
49988 return snprintf(buf, PAGE_SIZE, "%u\n",
49989- atomic_read(&dev->bytes_identical));
49990+ atomic_read_unchecked(&dev->bytes_identical));
49991 }
49992
49993 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
49994@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
49995 struct fb_info *fb_info = dev_get_drvdata(fbdev);
49996 struct dlfb_data *dev = fb_info->par;
49997 return snprintf(buf, PAGE_SIZE, "%u\n",
49998- atomic_read(&dev->bytes_sent));
49999+ atomic_read_unchecked(&dev->bytes_sent));
50000 }
50001
50002 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
50003@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
50004 struct fb_info *fb_info = dev_get_drvdata(fbdev);
50005 struct dlfb_data *dev = fb_info->par;
50006 return snprintf(buf, PAGE_SIZE, "%u\n",
50007- atomic_read(&dev->cpu_kcycles_used));
50008+ atomic_read_unchecked(&dev->cpu_kcycles_used));
50009 }
50010
50011 static ssize_t edid_show(
50012@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
50013 struct fb_info *fb_info = dev_get_drvdata(fbdev);
50014 struct dlfb_data *dev = fb_info->par;
50015
50016- atomic_set(&dev->bytes_rendered, 0);
50017- atomic_set(&dev->bytes_identical, 0);
50018- atomic_set(&dev->bytes_sent, 0);
50019- atomic_set(&dev->cpu_kcycles_used, 0);
50020+ atomic_set_unchecked(&dev->bytes_rendered, 0);
50021+ atomic_set_unchecked(&dev->bytes_identical, 0);
50022+ atomic_set_unchecked(&dev->bytes_sent, 0);
50023+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
50024
50025 return count;
50026 }
50027diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
50028index e328a61..1b08ecb 100644
50029--- a/drivers/video/uvesafb.c
50030+++ b/drivers/video/uvesafb.c
50031@@ -19,6 +19,7 @@
50032 #include <linux/io.h>
50033 #include <linux/mutex.h>
50034 #include <linux/slab.h>
50035+#include <linux/moduleloader.h>
50036 #include <video/edid.h>
50037 #include <video/uvesafb.h>
50038 #ifdef CONFIG_X86
50039@@ -569,10 +570,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
50040 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
50041 par->pmi_setpal = par->ypan = 0;
50042 } else {
50043+
50044+#ifdef CONFIG_PAX_KERNEXEC
50045+#ifdef CONFIG_MODULES
50046+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
50047+#endif
50048+ if (!par->pmi_code) {
50049+ par->pmi_setpal = par->ypan = 0;
50050+ return 0;
50051+ }
50052+#endif
50053+
50054 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
50055 + task->t.regs.edi);
50056+
50057+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50058+ pax_open_kernel();
50059+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
50060+ pax_close_kernel();
50061+
50062+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
50063+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
50064+#else
50065 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
50066 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
50067+#endif
50068+
50069 printk(KERN_INFO "uvesafb: protected mode interface info at "
50070 "%04x:%04x\n",
50071 (u16)task->t.regs.es, (u16)task->t.regs.edi);
50072@@ -817,13 +840,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
50073 par->ypan = ypan;
50074
50075 if (par->pmi_setpal || par->ypan) {
50076+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
50077 if (__supported_pte_mask & _PAGE_NX) {
50078 par->pmi_setpal = par->ypan = 0;
50079 printk(KERN_WARNING "uvesafb: NX protection is actively."
50080 "We have better not to use the PMI.\n");
50081- } else {
50082+ } else
50083+#endif
50084 uvesafb_vbe_getpmi(task, par);
50085- }
50086 }
50087 #else
50088 /* The protected mode interface is not available on non-x86. */
50089@@ -1457,8 +1481,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
50090 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
50091
50092 /* Disable blanking if the user requested so. */
50093- if (!blank)
50094- info->fbops->fb_blank = NULL;
50095+ if (!blank) {
50096+ pax_open_kernel();
50097+ *(void **)&info->fbops->fb_blank = NULL;
50098+ pax_close_kernel();
50099+ }
50100
50101 /*
50102 * Find out how much IO memory is required for the mode with
50103@@ -1534,8 +1561,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
50104 info->flags = FBINFO_FLAG_DEFAULT |
50105 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
50106
50107- if (!par->ypan)
50108- info->fbops->fb_pan_display = NULL;
50109+ if (!par->ypan) {
50110+ pax_open_kernel();
50111+ *(void **)&info->fbops->fb_pan_display = NULL;
50112+ pax_close_kernel();
50113+ }
50114 }
50115
50116 static void uvesafb_init_mtrr(struct fb_info *info)
50117@@ -1836,6 +1866,11 @@ out:
50118 if (par->vbe_modes)
50119 kfree(par->vbe_modes);
50120
50121+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50122+ if (par->pmi_code)
50123+ module_free_exec(NULL, par->pmi_code);
50124+#endif
50125+
50126 framebuffer_release(info);
50127 return err;
50128 }
50129@@ -1862,6 +1897,12 @@ static int uvesafb_remove(struct platform_device *dev)
50130 kfree(par->vbe_state_orig);
50131 if (par->vbe_state_saved)
50132 kfree(par->vbe_state_saved);
50133+
50134+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50135+ if (par->pmi_code)
50136+ module_free_exec(NULL, par->pmi_code);
50137+#endif
50138+
50139 }
50140
50141 framebuffer_release(info);
50142diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
50143index 501b340..d80aa17 100644
50144--- a/drivers/video/vesafb.c
50145+++ b/drivers/video/vesafb.c
50146@@ -9,6 +9,7 @@
50147 */
50148
50149 #include <linux/module.h>
50150+#include <linux/moduleloader.h>
50151 #include <linux/kernel.h>
50152 #include <linux/errno.h>
50153 #include <linux/string.h>
50154@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
50155 static int vram_total __initdata; /* Set total amount of memory */
50156 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
50157 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
50158-static void (*pmi_start)(void) __read_mostly;
50159-static void (*pmi_pal) (void) __read_mostly;
50160+static void (*pmi_start)(void) __read_only;
50161+static void (*pmi_pal) (void) __read_only;
50162 static int depth __read_mostly;
50163 static int vga_compat __read_mostly;
50164 /* --------------------------------------------------------------------- */
50165@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
50166 unsigned int size_vmode;
50167 unsigned int size_remap;
50168 unsigned int size_total;
50169+ void *pmi_code = NULL;
50170
50171 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
50172 return -ENODEV;
50173@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
50174 size_remap = size_total;
50175 vesafb_fix.smem_len = size_remap;
50176
50177-#ifndef __i386__
50178- screen_info.vesapm_seg = 0;
50179-#endif
50180-
50181 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
50182 printk(KERN_WARNING
50183 "vesafb: cannot reserve video memory at 0x%lx\n",
50184@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
50185 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
50186 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
50187
50188+#ifdef __i386__
50189+
50190+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50191+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
50192+ if (!pmi_code)
50193+#elif !defined(CONFIG_PAX_KERNEXEC)
50194+ if (0)
50195+#endif
50196+
50197+#endif
50198+ screen_info.vesapm_seg = 0;
50199+
50200 if (screen_info.vesapm_seg) {
50201- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
50202- screen_info.vesapm_seg,screen_info.vesapm_off);
50203+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
50204+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
50205 }
50206
50207 if (screen_info.vesapm_seg < 0xc000)
50208@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
50209
50210 if (ypan || pmi_setpal) {
50211 unsigned short *pmi_base;
50212+
50213 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
50214- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
50215- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
50216+
50217+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50218+ pax_open_kernel();
50219+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
50220+#else
50221+ pmi_code = pmi_base;
50222+#endif
50223+
50224+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
50225+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
50226+
50227+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50228+ pmi_start = ktva_ktla(pmi_start);
50229+ pmi_pal = ktva_ktla(pmi_pal);
50230+ pax_close_kernel();
50231+#endif
50232+
50233 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
50234 if (pmi_base[3]) {
50235 printk(KERN_INFO "vesafb: pmi: ports = ");
50236@@ -472,8 +498,11 @@ static int __init vesafb_probe(struct platform_device *dev)
50237 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
50238 (ypan ? FBINFO_HWACCEL_YPAN : 0);
50239
50240- if (!ypan)
50241- info->fbops->fb_pan_display = NULL;
50242+ if (!ypan) {
50243+ pax_open_kernel();
50244+ *(void **)&info->fbops->fb_pan_display = NULL;
50245+ pax_close_kernel();
50246+ }
50247
50248 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
50249 err = -ENOMEM;
50250@@ -488,6 +517,11 @@ static int __init vesafb_probe(struct platform_device *dev)
50251 info->node, info->fix.id);
50252 return 0;
50253 err:
50254+
50255+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
50256+ module_free_exec(NULL, pmi_code);
50257+#endif
50258+
50259 if (info->screen_base)
50260 iounmap(info->screen_base);
50261 framebuffer_release(info);
50262diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
50263index 88714ae..16c2e11 100644
50264--- a/drivers/video/via/via_clock.h
50265+++ b/drivers/video/via/via_clock.h
50266@@ -56,7 +56,7 @@ struct via_clock {
50267
50268 void (*set_engine_pll_state)(u8 state);
50269 void (*set_engine_pll)(struct via_pll_config config);
50270-};
50271+} __no_const;
50272
50273
50274 static inline u32 get_pll_internal_frequency(u32 ref_freq,
50275diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
50276index fef20db..d28b1ab 100644
50277--- a/drivers/xen/xenfs/xenstored.c
50278+++ b/drivers/xen/xenfs/xenstored.c
50279@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
50280 static int xsd_kva_open(struct inode *inode, struct file *file)
50281 {
50282 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
50283+#ifdef CONFIG_GRKERNSEC_HIDESYM
50284+ NULL);
50285+#else
50286 xen_store_interface);
50287+#endif
50288+
50289 if (!file->private_data)
50290 return -ENOMEM;
50291 return 0;
50292diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
50293index 055562c..fdfb10d 100644
50294--- a/fs/9p/vfs_addr.c
50295+++ b/fs/9p/vfs_addr.c
50296@@ -186,7 +186,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
50297
50298 retval = v9fs_file_write_internal(inode,
50299 v9inode->writeback_fid,
50300- (__force const char __user *)buffer,
50301+ (const char __force_user *)buffer,
50302 len, &offset, 0);
50303 if (retval > 0)
50304 retval = 0;
50305diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
50306index d86edc8..40ff2fb 100644
50307--- a/fs/9p/vfs_inode.c
50308+++ b/fs/9p/vfs_inode.c
50309@@ -1314,7 +1314,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
50310 void
50311 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
50312 {
50313- char *s = nd_get_link(nd);
50314+ const char *s = nd_get_link(nd);
50315
50316 p9_debug(P9_DEBUG_VFS, " %s %s\n",
50317 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
50318diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
50319index 370b24c..ff0be7b 100644
50320--- a/fs/Kconfig.binfmt
50321+++ b/fs/Kconfig.binfmt
50322@@ -103,7 +103,7 @@ config HAVE_AOUT
50323
50324 config BINFMT_AOUT
50325 tristate "Kernel support for a.out and ECOFF binaries"
50326- depends on HAVE_AOUT
50327+ depends on HAVE_AOUT && BROKEN
50328 ---help---
50329 A.out (Assembler.OUTput) is a set of formats for libraries and
50330 executables used in the earliest versions of UNIX. Linux used
50331diff --git a/fs/aio.c b/fs/aio.c
50332index 2bbcacf..8614116 100644
50333--- a/fs/aio.c
50334+++ b/fs/aio.c
50335@@ -160,7 +160,7 @@ static int aio_setup_ring(struct kioctx *ctx)
50336 size += sizeof(struct io_event) * nr_events;
50337 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
50338
50339- if (nr_pages < 0)
50340+ if (nr_pages <= 0)
50341 return -EINVAL;
50342
50343 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
50344@@ -950,6 +950,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op)
50345 static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat)
50346 {
50347 ssize_t ret;
50348+ struct iovec iovstack;
50349
50350 kiocb->ki_nr_segs = kiocb->ki_nbytes;
50351
50352@@ -957,17 +958,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat)
50353 if (compat)
50354 ret = compat_rw_copy_check_uvector(rw,
50355 (struct compat_iovec __user *)kiocb->ki_buf,
50356- kiocb->ki_nr_segs, 1, &kiocb->ki_inline_vec,
50357+ kiocb->ki_nr_segs, 1, &iovstack,
50358 &kiocb->ki_iovec);
50359 else
50360 #endif
50361 ret = rw_copy_check_uvector(rw,
50362 (struct iovec __user *)kiocb->ki_buf,
50363- kiocb->ki_nr_segs, 1, &kiocb->ki_inline_vec,
50364+ kiocb->ki_nr_segs, 1, &iovstack,
50365 &kiocb->ki_iovec);
50366 if (ret < 0)
50367 return ret;
50368
50369+ if (kiocb->ki_iovec == &iovstack) {
50370+ kiocb->ki_inline_vec = iovstack;
50371+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
50372+ }
50373+
50374 /* ki_nbytes now reflect bytes instead of segs */
50375 kiocb->ki_nbytes = ret;
50376 return 0;
50377diff --git a/fs/attr.c b/fs/attr.c
50378index 1449adb..a2038c2 100644
50379--- a/fs/attr.c
50380+++ b/fs/attr.c
50381@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
50382 unsigned long limit;
50383
50384 limit = rlimit(RLIMIT_FSIZE);
50385+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
50386 if (limit != RLIM_INFINITY && offset > limit)
50387 goto out_sig;
50388 if (offset > inode->i_sb->s_maxbytes)
50389diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
50390index 3db70da..7aeec5b 100644
50391--- a/fs/autofs4/waitq.c
50392+++ b/fs/autofs4/waitq.c
50393@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
50394 {
50395 unsigned long sigpipe, flags;
50396 mm_segment_t fs;
50397- const char *data = (const char *)addr;
50398+ const char __user *data = (const char __force_user *)addr;
50399 ssize_t wr = 0;
50400
50401 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
50402@@ -346,6 +346,10 @@ static int validate_request(struct autofs_wait_queue **wait,
50403 return 1;
50404 }
50405
50406+#ifdef CONFIG_GRKERNSEC_HIDESYM
50407+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
50408+#endif
50409+
50410 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
50411 enum autofs_notify notify)
50412 {
50413@@ -379,7 +383,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
50414
50415 /* If this is a direct mount request create a dummy name */
50416 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
50417+#ifdef CONFIG_GRKERNSEC_HIDESYM
50418+ /* this name does get written to userland via autofs4_write() */
50419+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
50420+#else
50421 qstr.len = sprintf(name, "%p", dentry);
50422+#endif
50423 else {
50424 qstr.len = autofs4_getpath(sbi, dentry, &name);
50425 if (!qstr.len) {
50426diff --git a/fs/befs/endian.h b/fs/befs/endian.h
50427index 2722387..c8dd2a7 100644
50428--- a/fs/befs/endian.h
50429+++ b/fs/befs/endian.h
50430@@ -11,7 +11,7 @@
50431
50432 #include <asm/byteorder.h>
50433
50434-static inline u64
50435+static inline u64 __intentional_overflow(-1)
50436 fs64_to_cpu(const struct super_block *sb, fs64 n)
50437 {
50438 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
50439@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
50440 return (__force fs64)cpu_to_be64(n);
50441 }
50442
50443-static inline u32
50444+static inline u32 __intentional_overflow(-1)
50445 fs32_to_cpu(const struct super_block *sb, fs32 n)
50446 {
50447 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
50448diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
50449index f95dddc..b1e2c1c 100644
50450--- a/fs/befs/linuxvfs.c
50451+++ b/fs/befs/linuxvfs.c
50452@@ -510,7 +510,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
50453 {
50454 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
50455 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
50456- char *link = nd_get_link(nd);
50457+ const char *link = nd_get_link(nd);
50458 if (!IS_ERR(link))
50459 kfree(link);
50460 }
50461diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
50462index bce8769..7fc7544 100644
50463--- a/fs/binfmt_aout.c
50464+++ b/fs/binfmt_aout.c
50465@@ -16,6 +16,7 @@
50466 #include <linux/string.h>
50467 #include <linux/fs.h>
50468 #include <linux/file.h>
50469+#include <linux/security.h>
50470 #include <linux/stat.h>
50471 #include <linux/fcntl.h>
50472 #include <linux/ptrace.h>
50473@@ -59,6 +60,8 @@ static int aout_core_dump(struct coredump_params *cprm)
50474 #endif
50475 # define START_STACK(u) ((void __user *)u.start_stack)
50476
50477+ memset(&dump, 0, sizeof(dump));
50478+
50479 fs = get_fs();
50480 set_fs(KERNEL_DS);
50481 has_dumped = 1;
50482@@ -69,10 +72,12 @@ static int aout_core_dump(struct coredump_params *cprm)
50483
50484 /* If the size of the dump file exceeds the rlimit, then see what would happen
50485 if we wrote the stack, but not the data area. */
50486+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
50487 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
50488 dump.u_dsize = 0;
50489
50490 /* Make sure we have enough room to write the stack and data areas. */
50491+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
50492 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
50493 dump.u_ssize = 0;
50494
50495@@ -233,6 +238,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
50496 rlim = rlimit(RLIMIT_DATA);
50497 if (rlim >= RLIM_INFINITY)
50498 rlim = ~0;
50499+
50500+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
50501 if (ex.a_data + ex.a_bss > rlim)
50502 return -ENOMEM;
50503
50504@@ -267,6 +274,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
50505
50506 install_exec_creds(bprm);
50507
50508+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
50509+ current->mm->pax_flags = 0UL;
50510+#endif
50511+
50512+#ifdef CONFIG_PAX_PAGEEXEC
50513+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
50514+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
50515+
50516+#ifdef CONFIG_PAX_EMUTRAMP
50517+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
50518+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
50519+#endif
50520+
50521+#ifdef CONFIG_PAX_MPROTECT
50522+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
50523+ current->mm->pax_flags |= MF_PAX_MPROTECT;
50524+#endif
50525+
50526+ }
50527+#endif
50528+
50529 if (N_MAGIC(ex) == OMAGIC) {
50530 unsigned long text_addr, map_size;
50531 loff_t pos;
50532@@ -324,7 +352,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
50533 }
50534
50535 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
50536- PROT_READ | PROT_WRITE | PROT_EXEC,
50537+ PROT_READ | PROT_WRITE,
50538 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
50539 fd_offset + ex.a_text);
50540 if (error != N_DATADDR(ex)) {
50541diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
50542index f8a0b0e..6f036ed 100644
50543--- a/fs/binfmt_elf.c
50544+++ b/fs/binfmt_elf.c
50545@@ -34,6 +34,7 @@
50546 #include <linux/utsname.h>
50547 #include <linux/coredump.h>
50548 #include <linux/sched.h>
50549+#include <linux/xattr.h>
50550 #include <asm/uaccess.h>
50551 #include <asm/param.h>
50552 #include <asm/page.h>
50553@@ -60,6 +61,14 @@ static int elf_core_dump(struct coredump_params *cprm);
50554 #define elf_core_dump NULL
50555 #endif
50556
50557+#ifdef CONFIG_PAX_MPROTECT
50558+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
50559+#endif
50560+
50561+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
50562+static void elf_handle_mmap(struct file *file);
50563+#endif
50564+
50565 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
50566 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
50567 #else
50568@@ -79,6 +88,15 @@ static struct linux_binfmt elf_format = {
50569 .load_binary = load_elf_binary,
50570 .load_shlib = load_elf_library,
50571 .core_dump = elf_core_dump,
50572+
50573+#ifdef CONFIG_PAX_MPROTECT
50574+ .handle_mprotect= elf_handle_mprotect,
50575+#endif
50576+
50577+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
50578+ .handle_mmap = elf_handle_mmap,
50579+#endif
50580+
50581 .min_coredump = ELF_EXEC_PAGESIZE,
50582 };
50583
50584@@ -86,6 +104,8 @@ static struct linux_binfmt elf_format = {
50585
50586 static int set_brk(unsigned long start, unsigned long end)
50587 {
50588+ unsigned long e = end;
50589+
50590 start = ELF_PAGEALIGN(start);
50591 end = ELF_PAGEALIGN(end);
50592 if (end > start) {
50593@@ -94,7 +114,7 @@ static int set_brk(unsigned long start, unsigned long end)
50594 if (BAD_ADDR(addr))
50595 return addr;
50596 }
50597- current->mm->start_brk = current->mm->brk = end;
50598+ current->mm->start_brk = current->mm->brk = e;
50599 return 0;
50600 }
50601
50602@@ -155,12 +175,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
50603 elf_addr_t __user *u_rand_bytes;
50604 const char *k_platform = ELF_PLATFORM;
50605 const char *k_base_platform = ELF_BASE_PLATFORM;
50606- unsigned char k_rand_bytes[16];
50607+ u32 k_rand_bytes[4];
50608 int items;
50609 elf_addr_t *elf_info;
50610 int ei_index = 0;
50611 const struct cred *cred = current_cred();
50612 struct vm_area_struct *vma;
50613+ unsigned long saved_auxv[AT_VECTOR_SIZE];
50614
50615 /*
50616 * In some cases (e.g. Hyper-Threading), we want to avoid L1
50617@@ -202,8 +223,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
50618 * Generate 16 random bytes for userspace PRNG seeding.
50619 */
50620 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
50621- u_rand_bytes = (elf_addr_t __user *)
50622- STACK_ALLOC(p, sizeof(k_rand_bytes));
50623+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
50624+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
50625+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
50626+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
50627+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
50628+ u_rand_bytes = (elf_addr_t __user *) p;
50629 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
50630 return -EFAULT;
50631
50632@@ -318,9 +343,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
50633 return -EFAULT;
50634 current->mm->env_end = p;
50635
50636+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
50637+
50638 /* Put the elf_info on the stack in the right place. */
50639 sp = (elf_addr_t __user *)envp + 1;
50640- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
50641+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
50642 return -EFAULT;
50643 return 0;
50644 }
50645@@ -388,15 +415,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
50646 an ELF header */
50647
50648 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
50649- struct file *interpreter, unsigned long *interp_map_addr,
50650- unsigned long no_base)
50651+ struct file *interpreter, unsigned long no_base)
50652 {
50653 struct elf_phdr *elf_phdata;
50654 struct elf_phdr *eppnt;
50655- unsigned long load_addr = 0;
50656+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
50657 int load_addr_set = 0;
50658 unsigned long last_bss = 0, elf_bss = 0;
50659- unsigned long error = ~0UL;
50660+ unsigned long error = -EINVAL;
50661 unsigned long total_size;
50662 int retval, i, size;
50663
50664@@ -442,6 +468,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
50665 goto out_close;
50666 }
50667
50668+#ifdef CONFIG_PAX_SEGMEXEC
50669+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
50670+ pax_task_size = SEGMEXEC_TASK_SIZE;
50671+#endif
50672+
50673 eppnt = elf_phdata;
50674 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
50675 if (eppnt->p_type == PT_LOAD) {
50676@@ -465,8 +496,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
50677 map_addr = elf_map(interpreter, load_addr + vaddr,
50678 eppnt, elf_prot, elf_type, total_size);
50679 total_size = 0;
50680- if (!*interp_map_addr)
50681- *interp_map_addr = map_addr;
50682 error = map_addr;
50683 if (BAD_ADDR(map_addr))
50684 goto out_close;
50685@@ -485,8 +514,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
50686 k = load_addr + eppnt->p_vaddr;
50687 if (BAD_ADDR(k) ||
50688 eppnt->p_filesz > eppnt->p_memsz ||
50689- eppnt->p_memsz > TASK_SIZE ||
50690- TASK_SIZE - eppnt->p_memsz < k) {
50691+ eppnt->p_memsz > pax_task_size ||
50692+ pax_task_size - eppnt->p_memsz < k) {
50693 error = -ENOMEM;
50694 goto out_close;
50695 }
50696@@ -538,6 +567,315 @@ out:
50697 return error;
50698 }
50699
50700+#ifdef CONFIG_PAX_PT_PAX_FLAGS
50701+#ifdef CONFIG_PAX_SOFTMODE
50702+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
50703+{
50704+ unsigned long pax_flags = 0UL;
50705+
50706+#ifdef CONFIG_PAX_PAGEEXEC
50707+ if (elf_phdata->p_flags & PF_PAGEEXEC)
50708+ pax_flags |= MF_PAX_PAGEEXEC;
50709+#endif
50710+
50711+#ifdef CONFIG_PAX_SEGMEXEC
50712+ if (elf_phdata->p_flags & PF_SEGMEXEC)
50713+ pax_flags |= MF_PAX_SEGMEXEC;
50714+#endif
50715+
50716+#ifdef CONFIG_PAX_EMUTRAMP
50717+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
50718+ pax_flags |= MF_PAX_EMUTRAMP;
50719+#endif
50720+
50721+#ifdef CONFIG_PAX_MPROTECT
50722+ if (elf_phdata->p_flags & PF_MPROTECT)
50723+ pax_flags |= MF_PAX_MPROTECT;
50724+#endif
50725+
50726+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
50727+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
50728+ pax_flags |= MF_PAX_RANDMMAP;
50729+#endif
50730+
50731+ return pax_flags;
50732+}
50733+#endif
50734+
50735+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
50736+{
50737+ unsigned long pax_flags = 0UL;
50738+
50739+#ifdef CONFIG_PAX_PAGEEXEC
50740+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
50741+ pax_flags |= MF_PAX_PAGEEXEC;
50742+#endif
50743+
50744+#ifdef CONFIG_PAX_SEGMEXEC
50745+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
50746+ pax_flags |= MF_PAX_SEGMEXEC;
50747+#endif
50748+
50749+#ifdef CONFIG_PAX_EMUTRAMP
50750+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
50751+ pax_flags |= MF_PAX_EMUTRAMP;
50752+#endif
50753+
50754+#ifdef CONFIG_PAX_MPROTECT
50755+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
50756+ pax_flags |= MF_PAX_MPROTECT;
50757+#endif
50758+
50759+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
50760+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
50761+ pax_flags |= MF_PAX_RANDMMAP;
50762+#endif
50763+
50764+ return pax_flags;
50765+}
50766+#endif
50767+
50768+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
50769+#ifdef CONFIG_PAX_SOFTMODE
50770+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
50771+{
50772+ unsigned long pax_flags = 0UL;
50773+
50774+#ifdef CONFIG_PAX_PAGEEXEC
50775+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
50776+ pax_flags |= MF_PAX_PAGEEXEC;
50777+#endif
50778+
50779+#ifdef CONFIG_PAX_SEGMEXEC
50780+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
50781+ pax_flags |= MF_PAX_SEGMEXEC;
50782+#endif
50783+
50784+#ifdef CONFIG_PAX_EMUTRAMP
50785+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
50786+ pax_flags |= MF_PAX_EMUTRAMP;
50787+#endif
50788+
50789+#ifdef CONFIG_PAX_MPROTECT
50790+ if (pax_flags_softmode & MF_PAX_MPROTECT)
50791+ pax_flags |= MF_PAX_MPROTECT;
50792+#endif
50793+
50794+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
50795+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
50796+ pax_flags |= MF_PAX_RANDMMAP;
50797+#endif
50798+
50799+ return pax_flags;
50800+}
50801+#endif
50802+
50803+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
50804+{
50805+ unsigned long pax_flags = 0UL;
50806+
50807+#ifdef CONFIG_PAX_PAGEEXEC
50808+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
50809+ pax_flags |= MF_PAX_PAGEEXEC;
50810+#endif
50811+
50812+#ifdef CONFIG_PAX_SEGMEXEC
50813+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
50814+ pax_flags |= MF_PAX_SEGMEXEC;
50815+#endif
50816+
50817+#ifdef CONFIG_PAX_EMUTRAMP
50818+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
50819+ pax_flags |= MF_PAX_EMUTRAMP;
50820+#endif
50821+
50822+#ifdef CONFIG_PAX_MPROTECT
50823+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
50824+ pax_flags |= MF_PAX_MPROTECT;
50825+#endif
50826+
50827+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
50828+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
50829+ pax_flags |= MF_PAX_RANDMMAP;
50830+#endif
50831+
50832+ return pax_flags;
50833+}
50834+#endif
50835+
50836+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
50837+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
50838+{
50839+ unsigned long pax_flags = 0UL;
50840+
50841+#ifdef CONFIG_PAX_EI_PAX
50842+
50843+#ifdef CONFIG_PAX_PAGEEXEC
50844+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
50845+ pax_flags |= MF_PAX_PAGEEXEC;
50846+#endif
50847+
50848+#ifdef CONFIG_PAX_SEGMEXEC
50849+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
50850+ pax_flags |= MF_PAX_SEGMEXEC;
50851+#endif
50852+
50853+#ifdef CONFIG_PAX_EMUTRAMP
50854+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
50855+ pax_flags |= MF_PAX_EMUTRAMP;
50856+#endif
50857+
50858+#ifdef CONFIG_PAX_MPROTECT
50859+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
50860+ pax_flags |= MF_PAX_MPROTECT;
50861+#endif
50862+
50863+#ifdef CONFIG_PAX_ASLR
50864+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
50865+ pax_flags |= MF_PAX_RANDMMAP;
50866+#endif
50867+
50868+#else
50869+
50870+#ifdef CONFIG_PAX_PAGEEXEC
50871+ pax_flags |= MF_PAX_PAGEEXEC;
50872+#endif
50873+
50874+#ifdef CONFIG_PAX_SEGMEXEC
50875+ pax_flags |= MF_PAX_SEGMEXEC;
50876+#endif
50877+
50878+#ifdef CONFIG_PAX_MPROTECT
50879+ pax_flags |= MF_PAX_MPROTECT;
50880+#endif
50881+
50882+#ifdef CONFIG_PAX_RANDMMAP
50883+ if (randomize_va_space)
50884+ pax_flags |= MF_PAX_RANDMMAP;
50885+#endif
50886+
50887+#endif
50888+
50889+ return pax_flags;
50890+}
50891+
50892+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
50893+{
50894+
50895+#ifdef CONFIG_PAX_PT_PAX_FLAGS
50896+ unsigned long i;
50897+
50898+ for (i = 0UL; i < elf_ex->e_phnum; i++)
50899+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
50900+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
50901+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
50902+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
50903+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
50904+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
50905+ return ~0UL;
50906+
50907+#ifdef CONFIG_PAX_SOFTMODE
50908+ if (pax_softmode)
50909+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
50910+ else
50911+#endif
50912+
50913+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
50914+ break;
50915+ }
50916+#endif
50917+
50918+ return ~0UL;
50919+}
50920+
50921+static unsigned long pax_parse_xattr_pax(struct file * const file)
50922+{
50923+
50924+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
50925+ ssize_t xattr_size, i;
50926+ unsigned char xattr_value[sizeof("pemrs") - 1];
50927+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
50928+
50929+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
50930+ if (xattr_size <= 0 || xattr_size > sizeof xattr_value)
50931+ return ~0UL;
50932+
50933+ for (i = 0; i < xattr_size; i++)
50934+ switch (xattr_value[i]) {
50935+ default:
50936+ return ~0UL;
50937+
50938+#define parse_flag(option1, option2, flag) \
50939+ case option1: \
50940+ if (pax_flags_hardmode & MF_PAX_##flag) \
50941+ return ~0UL; \
50942+ pax_flags_hardmode |= MF_PAX_##flag; \
50943+ break; \
50944+ case option2: \
50945+ if (pax_flags_softmode & MF_PAX_##flag) \
50946+ return ~0UL; \
50947+ pax_flags_softmode |= MF_PAX_##flag; \
50948+ break;
50949+
50950+ parse_flag('p', 'P', PAGEEXEC);
50951+ parse_flag('e', 'E', EMUTRAMP);
50952+ parse_flag('m', 'M', MPROTECT);
50953+ parse_flag('r', 'R', RANDMMAP);
50954+ parse_flag('s', 'S', SEGMEXEC);
50955+
50956+#undef parse_flag
50957+ }
50958+
50959+ if (pax_flags_hardmode & pax_flags_softmode)
50960+ return ~0UL;
50961+
50962+#ifdef CONFIG_PAX_SOFTMODE
50963+ if (pax_softmode)
50964+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
50965+ else
50966+#endif
50967+
50968+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
50969+#else
50970+ return ~0UL;
50971+#endif
50972+
50973+}
50974+
50975+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
50976+{
50977+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
50978+
50979+ pax_flags = pax_parse_ei_pax(elf_ex);
50980+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
50981+ xattr_pax_flags = pax_parse_xattr_pax(file);
50982+
50983+ if (pt_pax_flags == ~0UL)
50984+ pt_pax_flags = xattr_pax_flags;
50985+ else if (xattr_pax_flags == ~0UL)
50986+ xattr_pax_flags = pt_pax_flags;
50987+ if (pt_pax_flags != xattr_pax_flags)
50988+ return -EINVAL;
50989+ if (pt_pax_flags != ~0UL)
50990+ pax_flags = pt_pax_flags;
50991+
50992+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
50993+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
50994+ if ((__supported_pte_mask & _PAGE_NX))
50995+ pax_flags &= ~MF_PAX_SEGMEXEC;
50996+ else
50997+ pax_flags &= ~MF_PAX_PAGEEXEC;
50998+ }
50999+#endif
51000+
51001+ if (0 > pax_check_flags(&pax_flags))
51002+ return -EINVAL;
51003+
51004+ current->mm->pax_flags = pax_flags;
51005+ return 0;
51006+}
51007+#endif
51008+
51009 /*
51010 * These are the functions used to load ELF style executables and shared
51011 * libraries. There is no binary dependent code anywhere else.
51012@@ -554,6 +892,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
51013 {
51014 unsigned int random_variable = 0;
51015
51016+#ifdef CONFIG_PAX_RANDUSTACK
51017+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
51018+ return stack_top - current->mm->delta_stack;
51019+#endif
51020+
51021 if ((current->flags & PF_RANDOMIZE) &&
51022 !(current->personality & ADDR_NO_RANDOMIZE)) {
51023 random_variable = get_random_int() & STACK_RND_MASK;
51024@@ -572,7 +915,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
51025 unsigned long load_addr = 0, load_bias = 0;
51026 int load_addr_set = 0;
51027 char * elf_interpreter = NULL;
51028- unsigned long error;
51029+ unsigned long error = 0;
51030 struct elf_phdr *elf_ppnt, *elf_phdata;
51031 unsigned long elf_bss, elf_brk;
51032 int retval, i;
51033@@ -582,12 +925,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
51034 unsigned long start_code, end_code, start_data, end_data;
51035 unsigned long reloc_func_desc __maybe_unused = 0;
51036 int executable_stack = EXSTACK_DEFAULT;
51037- unsigned long def_flags = 0;
51038 struct pt_regs *regs = current_pt_regs();
51039 struct {
51040 struct elfhdr elf_ex;
51041 struct elfhdr interp_elf_ex;
51042 } *loc;
51043+ unsigned long pax_task_size = TASK_SIZE;
51044
51045 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
51046 if (!loc) {
51047@@ -723,11 +1066,81 @@ static int load_elf_binary(struct linux_binprm *bprm)
51048 goto out_free_dentry;
51049
51050 /* OK, This is the point of no return */
51051- current->mm->def_flags = def_flags;
51052+
51053+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
51054+ current->mm->pax_flags = 0UL;
51055+#endif
51056+
51057+#ifdef CONFIG_PAX_DLRESOLVE
51058+ current->mm->call_dl_resolve = 0UL;
51059+#endif
51060+
51061+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
51062+ current->mm->call_syscall = 0UL;
51063+#endif
51064+
51065+#ifdef CONFIG_PAX_ASLR
51066+ current->mm->delta_mmap = 0UL;
51067+ current->mm->delta_stack = 0UL;
51068+#endif
51069+
51070+ current->mm->def_flags = 0;
51071+
51072+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
51073+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
51074+ send_sig(SIGKILL, current, 0);
51075+ goto out_free_dentry;
51076+ }
51077+#endif
51078+
51079+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
51080+ pax_set_initial_flags(bprm);
51081+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
51082+ if (pax_set_initial_flags_func)
51083+ (pax_set_initial_flags_func)(bprm);
51084+#endif
51085+
51086+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
51087+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
51088+ current->mm->context.user_cs_limit = PAGE_SIZE;
51089+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
51090+ }
51091+#endif
51092+
51093+#ifdef CONFIG_PAX_SEGMEXEC
51094+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
51095+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
51096+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
51097+ pax_task_size = SEGMEXEC_TASK_SIZE;
51098+ current->mm->def_flags |= VM_NOHUGEPAGE;
51099+ }
51100+#endif
51101+
51102+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
51103+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
51104+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
51105+ put_cpu();
51106+ }
51107+#endif
51108
51109 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
51110 may depend on the personality. */
51111 SET_PERSONALITY(loc->elf_ex);
51112+
51113+#ifdef CONFIG_PAX_ASLR
51114+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
51115+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
51116+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
51117+ }
51118+#endif
51119+
51120+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
51121+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
51122+ executable_stack = EXSTACK_DISABLE_X;
51123+ current->personality &= ~READ_IMPLIES_EXEC;
51124+ } else
51125+#endif
51126+
51127 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
51128 current->personality |= READ_IMPLIES_EXEC;
51129
51130@@ -819,6 +1232,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
51131 #else
51132 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
51133 #endif
51134+
51135+#ifdef CONFIG_PAX_RANDMMAP
51136+ /* PaX: randomize base address at the default exe base if requested */
51137+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
51138+#ifdef CONFIG_SPARC64
51139+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
51140+#else
51141+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
51142+#endif
51143+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
51144+ elf_flags |= MAP_FIXED;
51145+ }
51146+#endif
51147+
51148 }
51149
51150 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
51151@@ -851,9 +1278,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
51152 * allowed task size. Note that p_filesz must always be
51153 * <= p_memsz so it is only necessary to check p_memsz.
51154 */
51155- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
51156- elf_ppnt->p_memsz > TASK_SIZE ||
51157- TASK_SIZE - elf_ppnt->p_memsz < k) {
51158+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
51159+ elf_ppnt->p_memsz > pax_task_size ||
51160+ pax_task_size - elf_ppnt->p_memsz < k) {
51161 /* set_brk can never work. Avoid overflows. */
51162 send_sig(SIGKILL, current, 0);
51163 retval = -EINVAL;
51164@@ -892,17 +1319,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
51165 goto out_free_dentry;
51166 }
51167 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
51168- send_sig(SIGSEGV, current, 0);
51169- retval = -EFAULT; /* Nobody gets to see this, but.. */
51170- goto out_free_dentry;
51171+ /*
51172+ * This bss-zeroing can fail if the ELF
51173+ * file specifies odd protections. So
51174+ * we don't check the return value
51175+ */
51176 }
51177
51178+#ifdef CONFIG_PAX_RANDMMAP
51179+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
51180+ unsigned long start, size, flags;
51181+ vm_flags_t vm_flags;
51182+
51183+ start = ELF_PAGEALIGN(elf_brk);
51184+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
51185+ flags = MAP_FIXED | MAP_PRIVATE;
51186+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
51187+
51188+ down_write(&current->mm->mmap_sem);
51189+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
51190+ retval = -ENOMEM;
51191+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
51192+// if (current->personality & ADDR_NO_RANDOMIZE)
51193+// vm_flags |= VM_READ | VM_MAYREAD;
51194+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
51195+ retval = IS_ERR_VALUE(start) ? start : 0;
51196+ }
51197+ up_write(&current->mm->mmap_sem);
51198+ if (retval == 0)
51199+ retval = set_brk(start + size, start + size + PAGE_SIZE);
51200+ if (retval < 0) {
51201+ send_sig(SIGKILL, current, 0);
51202+ goto out_free_dentry;
51203+ }
51204+ }
51205+#endif
51206+
51207 if (elf_interpreter) {
51208- unsigned long interp_map_addr = 0;
51209-
51210 elf_entry = load_elf_interp(&loc->interp_elf_ex,
51211 interpreter,
51212- &interp_map_addr,
51213 load_bias);
51214 if (!IS_ERR((void *)elf_entry)) {
51215 /*
51216@@ -1124,7 +1579,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
51217 * Decide what to dump of a segment, part, all or none.
51218 */
51219 static unsigned long vma_dump_size(struct vm_area_struct *vma,
51220- unsigned long mm_flags)
51221+ unsigned long mm_flags, long signr)
51222 {
51223 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
51224
51225@@ -1162,7 +1617,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
51226 if (vma->vm_file == NULL)
51227 return 0;
51228
51229- if (FILTER(MAPPED_PRIVATE))
51230+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
51231 goto whole;
51232
51233 /*
51234@@ -1387,9 +1842,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
51235 {
51236 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
51237 int i = 0;
51238- do
51239+ do {
51240 i += 2;
51241- while (auxv[i - 2] != AT_NULL);
51242+ } while (auxv[i - 2] != AT_NULL);
51243 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
51244 }
51245
51246@@ -1398,7 +1853,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
51247 {
51248 mm_segment_t old_fs = get_fs();
51249 set_fs(KERNEL_DS);
51250- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
51251+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
51252 set_fs(old_fs);
51253 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
51254 }
51255@@ -2019,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
51256 }
51257
51258 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
51259- unsigned long mm_flags)
51260+ struct coredump_params *cprm)
51261 {
51262 struct vm_area_struct *vma;
51263 size_t size = 0;
51264
51265 for (vma = first_vma(current, gate_vma); vma != NULL;
51266 vma = next_vma(vma, gate_vma))
51267- size += vma_dump_size(vma, mm_flags);
51268+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
51269 return size;
51270 }
51271
51272@@ -2119,7 +2574,7 @@ static int elf_core_dump(struct coredump_params *cprm)
51273
51274 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
51275
51276- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
51277+ offset += elf_core_vma_data_size(gate_vma, cprm);
51278 offset += elf_core_extra_data_size();
51279 e_shoff = offset;
51280
51281@@ -2133,10 +2588,12 @@ static int elf_core_dump(struct coredump_params *cprm)
51282 offset = dataoff;
51283
51284 size += sizeof(*elf);
51285+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
51286 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
51287 goto end_coredump;
51288
51289 size += sizeof(*phdr4note);
51290+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
51291 if (size > cprm->limit
51292 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
51293 goto end_coredump;
51294@@ -2150,7 +2607,7 @@ static int elf_core_dump(struct coredump_params *cprm)
51295 phdr.p_offset = offset;
51296 phdr.p_vaddr = vma->vm_start;
51297 phdr.p_paddr = 0;
51298- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
51299+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
51300 phdr.p_memsz = vma->vm_end - vma->vm_start;
51301 offset += phdr.p_filesz;
51302 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
51303@@ -2161,6 +2618,7 @@ static int elf_core_dump(struct coredump_params *cprm)
51304 phdr.p_align = ELF_EXEC_PAGESIZE;
51305
51306 size += sizeof(phdr);
51307+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
51308 if (size > cprm->limit
51309 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
51310 goto end_coredump;
51311@@ -2185,7 +2643,7 @@ static int elf_core_dump(struct coredump_params *cprm)
51312 unsigned long addr;
51313 unsigned long end;
51314
51315- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
51316+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
51317
51318 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
51319 struct page *page;
51320@@ -2194,6 +2652,7 @@ static int elf_core_dump(struct coredump_params *cprm)
51321 page = get_dump_page(addr);
51322 if (page) {
51323 void *kaddr = kmap(page);
51324+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
51325 stop = ((size += PAGE_SIZE) > cprm->limit) ||
51326 !dump_write(cprm->file, kaddr,
51327 PAGE_SIZE);
51328@@ -2211,6 +2670,7 @@ static int elf_core_dump(struct coredump_params *cprm)
51329
51330 if (e_phnum == PN_XNUM) {
51331 size += sizeof(*shdr4extnum);
51332+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
51333 if (size > cprm->limit
51334 || !dump_write(cprm->file, shdr4extnum,
51335 sizeof(*shdr4extnum)))
51336@@ -2231,6 +2691,167 @@ out:
51337
51338 #endif /* CONFIG_ELF_CORE */
51339
51340+#ifdef CONFIG_PAX_MPROTECT
51341+/* PaX: non-PIC ELF libraries need relocations on their executable segments
51342+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
51343+ * we'll remove VM_MAYWRITE for good on RELRO segments.
51344+ *
51345+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
51346+ * basis because we want to allow the common case and not the special ones.
51347+ */
51348+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
51349+{
51350+ struct elfhdr elf_h;
51351+ struct elf_phdr elf_p;
51352+ unsigned long i;
51353+ unsigned long oldflags;
51354+ bool is_textrel_rw, is_textrel_rx, is_relro;
51355+
51356+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
51357+ return;
51358+
51359+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
51360+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
51361+
51362+#ifdef CONFIG_PAX_ELFRELOCS
51363+ /* possible TEXTREL */
51364+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
51365+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
51366+#else
51367+ is_textrel_rw = false;
51368+ is_textrel_rx = false;
51369+#endif
51370+
51371+ /* possible RELRO */
51372+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
51373+
51374+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
51375+ return;
51376+
51377+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
51378+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
51379+
51380+#ifdef CONFIG_PAX_ETEXECRELOCS
51381+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
51382+#else
51383+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
51384+#endif
51385+
51386+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
51387+ !elf_check_arch(&elf_h) ||
51388+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
51389+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
51390+ return;
51391+
51392+ for (i = 0UL; i < elf_h.e_phnum; i++) {
51393+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
51394+ return;
51395+ switch (elf_p.p_type) {
51396+ case PT_DYNAMIC:
51397+ if (!is_textrel_rw && !is_textrel_rx)
51398+ continue;
51399+ i = 0UL;
51400+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
51401+ elf_dyn dyn;
51402+
51403+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
51404+ break;
51405+ if (dyn.d_tag == DT_NULL)
51406+ break;
51407+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
51408+ gr_log_textrel(vma);
51409+ if (is_textrel_rw)
51410+ vma->vm_flags |= VM_MAYWRITE;
51411+ else
51412+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
51413+ vma->vm_flags &= ~VM_MAYWRITE;
51414+ break;
51415+ }
51416+ i++;
51417+ }
51418+ is_textrel_rw = false;
51419+ is_textrel_rx = false;
51420+ continue;
51421+
51422+ case PT_GNU_RELRO:
51423+ if (!is_relro)
51424+ continue;
51425+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
51426+ vma->vm_flags &= ~VM_MAYWRITE;
51427+ is_relro = false;
51428+ continue;
51429+
51430+#ifdef CONFIG_PAX_PT_PAX_FLAGS
51431+ case PT_PAX_FLAGS: {
51432+ const char *msg_mprotect = "", *msg_emutramp = "";
51433+ char *buffer_lib, *buffer_exe;
51434+
51435+ if (elf_p.p_flags & PF_NOMPROTECT)
51436+ msg_mprotect = "MPROTECT disabled";
51437+
51438+#ifdef CONFIG_PAX_EMUTRAMP
51439+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
51440+ msg_emutramp = "EMUTRAMP enabled";
51441+#endif
51442+
51443+ if (!msg_mprotect[0] && !msg_emutramp[0])
51444+ continue;
51445+
51446+ if (!printk_ratelimit())
51447+ continue;
51448+
51449+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
51450+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
51451+ if (buffer_lib && buffer_exe) {
51452+ char *path_lib, *path_exe;
51453+
51454+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
51455+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
51456+
51457+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
51458+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
51459+
51460+ }
51461+ free_page((unsigned long)buffer_exe);
51462+ free_page((unsigned long)buffer_lib);
51463+ continue;
51464+ }
51465+#endif
51466+
51467+ }
51468+ }
51469+}
51470+#endif
51471+
51472+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
51473+
51474+extern int grsec_enable_log_rwxmaps;
51475+
51476+static void elf_handle_mmap(struct file *file)
51477+{
51478+ struct elfhdr elf_h;
51479+ struct elf_phdr elf_p;
51480+ unsigned long i;
51481+
51482+ if (!grsec_enable_log_rwxmaps)
51483+ return;
51484+
51485+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
51486+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
51487+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
51488+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
51489+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
51490+ return;
51491+
51492+ for (i = 0UL; i < elf_h.e_phnum; i++) {
51493+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
51494+ return;
51495+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
51496+ gr_log_ptgnustack(file);
51497+ }
51498+}
51499+#endif
51500+
51501 static int __init init_elf_binfmt(void)
51502 {
51503 register_binfmt(&elf_format);
51504diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
51505index d50bbe5..af3b649 100644
51506--- a/fs/binfmt_flat.c
51507+++ b/fs/binfmt_flat.c
51508@@ -566,7 +566,9 @@ static int load_flat_file(struct linux_binprm * bprm,
51509 realdatastart = (unsigned long) -ENOMEM;
51510 printk("Unable to allocate RAM for process data, errno %d\n",
51511 (int)-realdatastart);
51512+ down_write(&current->mm->mmap_sem);
51513 vm_munmap(textpos, text_len);
51514+ up_write(&current->mm->mmap_sem);
51515 ret = realdatastart;
51516 goto err;
51517 }
51518@@ -590,8 +592,10 @@ static int load_flat_file(struct linux_binprm * bprm,
51519 }
51520 if (IS_ERR_VALUE(result)) {
51521 printk("Unable to read data+bss, errno %d\n", (int)-result);
51522+ down_write(&current->mm->mmap_sem);
51523 vm_munmap(textpos, text_len);
51524 vm_munmap(realdatastart, len);
51525+ up_write(&current->mm->mmap_sem);
51526 ret = result;
51527 goto err;
51528 }
51529@@ -653,8 +657,10 @@ static int load_flat_file(struct linux_binprm * bprm,
51530 }
51531 if (IS_ERR_VALUE(result)) {
51532 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
51533+ down_write(&current->mm->mmap_sem);
51534 vm_munmap(textpos, text_len + data_len + extra +
51535 MAX_SHARED_LIBS * sizeof(unsigned long));
51536+ up_write(&current->mm->mmap_sem);
51537 ret = result;
51538 goto err;
51539 }
51540diff --git a/fs/bio.c b/fs/bio.c
51541index 94bbc04..6fe78a4 100644
51542--- a/fs/bio.c
51543+++ b/fs/bio.c
51544@@ -1096,7 +1096,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
51545 /*
51546 * Overflow, abort
51547 */
51548- if (end < start)
51549+ if (end < start || end - start > INT_MAX - nr_pages)
51550 return ERR_PTR(-EINVAL);
51551
51552 nr_pages += end - start;
51553@@ -1230,7 +1230,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
51554 /*
51555 * Overflow, abort
51556 */
51557- if (end < start)
51558+ if (end < start || end - start > INT_MAX - nr_pages)
51559 return ERR_PTR(-EINVAL);
51560
51561 nr_pages += end - start;
51562@@ -1492,7 +1492,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
51563 const int read = bio_data_dir(bio) == READ;
51564 struct bio_map_data *bmd = bio->bi_private;
51565 int i;
51566- char *p = bmd->sgvecs[0].iov_base;
51567+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
51568
51569 bio_for_each_segment_all(bvec, bio, i) {
51570 char *addr = page_address(bvec->bv_page);
51571diff --git a/fs/block_dev.c b/fs/block_dev.c
51572index 85f5c85..d6f0b1a 100644
51573--- a/fs/block_dev.c
51574+++ b/fs/block_dev.c
51575@@ -658,7 +658,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
51576 else if (bdev->bd_contains == bdev)
51577 return true; /* is a whole device which isn't held */
51578
51579- else if (whole->bd_holder == bd_may_claim)
51580+ else if (whole->bd_holder == (void *)bd_may_claim)
51581 return true; /* is a partition of a device that is being partitioned */
51582 else if (whole->bd_holder != NULL)
51583 return false; /* is a partition of a held device */
51584diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
51585index 7fb054b..ad36c67 100644
51586--- a/fs/btrfs/ctree.c
51587+++ b/fs/btrfs/ctree.c
51588@@ -1076,9 +1076,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
51589 free_extent_buffer(buf);
51590 add_root_to_dirty_list(root);
51591 } else {
51592- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
51593- parent_start = parent->start;
51594- else
51595+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
51596+ if (parent)
51597+ parent_start = parent->start;
51598+ else
51599+ parent_start = 0;
51600+ } else
51601 parent_start = 0;
51602
51603 WARN_ON(trans->transid != btrfs_header_generation(parent));
51604diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
51605index 0f81d67..0ad55fe 100644
51606--- a/fs/btrfs/ioctl.c
51607+++ b/fs/btrfs/ioctl.c
51608@@ -3084,9 +3084,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
51609 for (i = 0; i < num_types; i++) {
51610 struct btrfs_space_info *tmp;
51611
51612+ /* Don't copy in more than we allocated */
51613 if (!slot_count)
51614 break;
51615
51616+ slot_count--;
51617+
51618 info = NULL;
51619 rcu_read_lock();
51620 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
51621@@ -3108,10 +3111,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
51622 memcpy(dest, &space, sizeof(space));
51623 dest++;
51624 space_args.total_spaces++;
51625- slot_count--;
51626 }
51627- if (!slot_count)
51628- break;
51629 }
51630 up_read(&info->groups_sem);
51631 }
51632diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
51633index f0857e0..e7023c5 100644
51634--- a/fs/btrfs/super.c
51635+++ b/fs/btrfs/super.c
51636@@ -265,7 +265,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
51637 function, line, errstr);
51638 return;
51639 }
51640- ACCESS_ONCE(trans->transaction->aborted) = errno;
51641+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
51642 __btrfs_std_error(root->fs_info, function, line, errno, NULL);
51643 }
51644 /*
51645diff --git a/fs/buffer.c b/fs/buffer.c
51646index d2a4d1b..df798ca 100644
51647--- a/fs/buffer.c
51648+++ b/fs/buffer.c
51649@@ -3367,7 +3367,7 @@ void __init buffer_init(void)
51650 bh_cachep = kmem_cache_create("buffer_head",
51651 sizeof(struct buffer_head), 0,
51652 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
51653- SLAB_MEM_SPREAD),
51654+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
51655 NULL);
51656
51657 /*
51658diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
51659index 622f469..e8d2d55 100644
51660--- a/fs/cachefiles/bind.c
51661+++ b/fs/cachefiles/bind.c
51662@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
51663 args);
51664
51665 /* start by checking things over */
51666- ASSERT(cache->fstop_percent >= 0 &&
51667- cache->fstop_percent < cache->fcull_percent &&
51668+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
51669 cache->fcull_percent < cache->frun_percent &&
51670 cache->frun_percent < 100);
51671
51672- ASSERT(cache->bstop_percent >= 0 &&
51673- cache->bstop_percent < cache->bcull_percent &&
51674+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
51675 cache->bcull_percent < cache->brun_percent &&
51676 cache->brun_percent < 100);
51677
51678diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
51679index 0a1467b..6a53245 100644
51680--- a/fs/cachefiles/daemon.c
51681+++ b/fs/cachefiles/daemon.c
51682@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
51683 if (n > buflen)
51684 return -EMSGSIZE;
51685
51686- if (copy_to_user(_buffer, buffer, n) != 0)
51687+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
51688 return -EFAULT;
51689
51690 return n;
51691@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
51692 if (test_bit(CACHEFILES_DEAD, &cache->flags))
51693 return -EIO;
51694
51695- if (datalen < 0 || datalen > PAGE_SIZE - 1)
51696+ if (datalen > PAGE_SIZE - 1)
51697 return -EOPNOTSUPP;
51698
51699 /* drag the command string into the kernel so we can parse it */
51700@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
51701 if (args[0] != '%' || args[1] != '\0')
51702 return -EINVAL;
51703
51704- if (fstop < 0 || fstop >= cache->fcull_percent)
51705+ if (fstop >= cache->fcull_percent)
51706 return cachefiles_daemon_range_error(cache, args);
51707
51708 cache->fstop_percent = fstop;
51709@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
51710 if (args[0] != '%' || args[1] != '\0')
51711 return -EINVAL;
51712
51713- if (bstop < 0 || bstop >= cache->bcull_percent)
51714+ if (bstop >= cache->bcull_percent)
51715 return cachefiles_daemon_range_error(cache, args);
51716
51717 cache->bstop_percent = bstop;
51718diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
51719index 4938251..7e01445 100644
51720--- a/fs/cachefiles/internal.h
51721+++ b/fs/cachefiles/internal.h
51722@@ -59,7 +59,7 @@ struct cachefiles_cache {
51723 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
51724 struct rb_root active_nodes; /* active nodes (can't be culled) */
51725 rwlock_t active_lock; /* lock for active_nodes */
51726- atomic_t gravecounter; /* graveyard uniquifier */
51727+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
51728 unsigned frun_percent; /* when to stop culling (% files) */
51729 unsigned fcull_percent; /* when to start culling (% files) */
51730 unsigned fstop_percent; /* when to stop allocating (% files) */
51731@@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
51732 * proc.c
51733 */
51734 #ifdef CONFIG_CACHEFILES_HISTOGRAM
51735-extern atomic_t cachefiles_lookup_histogram[HZ];
51736-extern atomic_t cachefiles_mkdir_histogram[HZ];
51737-extern atomic_t cachefiles_create_histogram[HZ];
51738+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
51739+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
51740+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
51741
51742 extern int __init cachefiles_proc_init(void);
51743 extern void cachefiles_proc_cleanup(void);
51744 static inline
51745-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
51746+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
51747 {
51748 unsigned long jif = jiffies - start_jif;
51749 if (jif >= HZ)
51750 jif = HZ - 1;
51751- atomic_inc(&histogram[jif]);
51752+ atomic_inc_unchecked(&histogram[jif]);
51753 }
51754
51755 #else
51756diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
51757index 8c01c5fc..15f982e 100644
51758--- a/fs/cachefiles/namei.c
51759+++ b/fs/cachefiles/namei.c
51760@@ -317,7 +317,7 @@ try_again:
51761 /* first step is to make up a grave dentry in the graveyard */
51762 sprintf(nbuffer, "%08x%08x",
51763 (uint32_t) get_seconds(),
51764- (uint32_t) atomic_inc_return(&cache->gravecounter));
51765+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
51766
51767 /* do the multiway lock magic */
51768 trap = lock_rename(cache->graveyard, dir);
51769diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
51770index eccd339..4c1d995 100644
51771--- a/fs/cachefiles/proc.c
51772+++ b/fs/cachefiles/proc.c
51773@@ -14,9 +14,9 @@
51774 #include <linux/seq_file.h>
51775 #include "internal.h"
51776
51777-atomic_t cachefiles_lookup_histogram[HZ];
51778-atomic_t cachefiles_mkdir_histogram[HZ];
51779-atomic_t cachefiles_create_histogram[HZ];
51780+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
51781+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
51782+atomic_unchecked_t cachefiles_create_histogram[HZ];
51783
51784 /*
51785 * display the latency histogram
51786@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
51787 return 0;
51788 default:
51789 index = (unsigned long) v - 3;
51790- x = atomic_read(&cachefiles_lookup_histogram[index]);
51791- y = atomic_read(&cachefiles_mkdir_histogram[index]);
51792- z = atomic_read(&cachefiles_create_histogram[index]);
51793+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
51794+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
51795+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
51796 if (x == 0 && y == 0 && z == 0)
51797 return 0;
51798
51799diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
51800index 317f9ee..3d24511 100644
51801--- a/fs/cachefiles/rdwr.c
51802+++ b/fs/cachefiles/rdwr.c
51803@@ -966,7 +966,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
51804 old_fs = get_fs();
51805 set_fs(KERNEL_DS);
51806 ret = file->f_op->write(
51807- file, (const void __user *) data, len, &pos);
51808+ file, (const void __force_user *) data, len, &pos);
51809 set_fs(old_fs);
51810 kunmap(page);
51811 file_end_write(file);
51812diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
51813index f02d82b..2632cf86 100644
51814--- a/fs/ceph/dir.c
51815+++ b/fs/ceph/dir.c
51816@@ -243,7 +243,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
51817 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
51818 struct ceph_mds_client *mdsc = fsc->mdsc;
51819 unsigned frag = fpos_frag(filp->f_pos);
51820- int off = fpos_off(filp->f_pos);
51821+ unsigned int off = fpos_off(filp->f_pos);
51822 int err;
51823 u32 ftype;
51824 struct ceph_mds_reply_info_parsed *rinfo;
51825diff --git a/fs/ceph/super.c b/fs/ceph/super.c
51826index 7d377c9..3fb6559 100644
51827--- a/fs/ceph/super.c
51828+++ b/fs/ceph/super.c
51829@@ -839,7 +839,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
51830 /*
51831 * construct our own bdi so we can control readahead, etc.
51832 */
51833-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
51834+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
51835
51836 static int ceph_register_bdi(struct super_block *sb,
51837 struct ceph_fs_client *fsc)
51838@@ -856,7 +856,7 @@ static int ceph_register_bdi(struct super_block *sb,
51839 default_backing_dev_info.ra_pages;
51840
51841 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
51842- atomic_long_inc_return(&bdi_seq));
51843+ atomic_long_inc_return_unchecked(&bdi_seq));
51844 if (!err)
51845 sb->s_bdi = &fsc->backing_dev_info;
51846 return err;
51847diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
51848index d597483..747901b 100644
51849--- a/fs/cifs/cifs_debug.c
51850+++ b/fs/cifs/cifs_debug.c
51851@@ -284,8 +284,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
51852
51853 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
51854 #ifdef CONFIG_CIFS_STATS2
51855- atomic_set(&totBufAllocCount, 0);
51856- atomic_set(&totSmBufAllocCount, 0);
51857+ atomic_set_unchecked(&totBufAllocCount, 0);
51858+ atomic_set_unchecked(&totSmBufAllocCount, 0);
51859 #endif /* CONFIG_CIFS_STATS2 */
51860 spin_lock(&cifs_tcp_ses_lock);
51861 list_for_each(tmp1, &cifs_tcp_ses_list) {
51862@@ -298,7 +298,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
51863 tcon = list_entry(tmp3,
51864 struct cifs_tcon,
51865 tcon_list);
51866- atomic_set(&tcon->num_smbs_sent, 0);
51867+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
51868 if (server->ops->clear_stats)
51869 server->ops->clear_stats(tcon);
51870 }
51871@@ -330,8 +330,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
51872 smBufAllocCount.counter, cifs_min_small);
51873 #ifdef CONFIG_CIFS_STATS2
51874 seq_printf(m, "Total Large %d Small %d Allocations\n",
51875- atomic_read(&totBufAllocCount),
51876- atomic_read(&totSmBufAllocCount));
51877+ atomic_read_unchecked(&totBufAllocCount),
51878+ atomic_read_unchecked(&totSmBufAllocCount));
51879 #endif /* CONFIG_CIFS_STATS2 */
51880
51881 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
51882@@ -360,7 +360,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
51883 if (tcon->need_reconnect)
51884 seq_puts(m, "\tDISCONNECTED ");
51885 seq_printf(m, "\nSMBs: %d",
51886- atomic_read(&tcon->num_smbs_sent));
51887+ atomic_read_unchecked(&tcon->num_smbs_sent));
51888 if (server->ops->print_stats)
51889 server->ops->print_stats(m, tcon);
51890 }
51891diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
51892index 3752b9f..8db5569 100644
51893--- a/fs/cifs/cifsfs.c
51894+++ b/fs/cifs/cifsfs.c
51895@@ -1035,7 +1035,7 @@ cifs_init_request_bufs(void)
51896 */
51897 cifs_req_cachep = kmem_cache_create("cifs_request",
51898 CIFSMaxBufSize + max_hdr_size, 0,
51899- SLAB_HWCACHE_ALIGN, NULL);
51900+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
51901 if (cifs_req_cachep == NULL)
51902 return -ENOMEM;
51903
51904@@ -1062,7 +1062,7 @@ cifs_init_request_bufs(void)
51905 efficient to alloc 1 per page off the slab compared to 17K (5page)
51906 alloc of large cifs buffers even when page debugging is on */
51907 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
51908- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
51909+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
51910 NULL);
51911 if (cifs_sm_req_cachep == NULL) {
51912 mempool_destroy(cifs_req_poolp);
51913@@ -1147,8 +1147,8 @@ init_cifs(void)
51914 atomic_set(&bufAllocCount, 0);
51915 atomic_set(&smBufAllocCount, 0);
51916 #ifdef CONFIG_CIFS_STATS2
51917- atomic_set(&totBufAllocCount, 0);
51918- atomic_set(&totSmBufAllocCount, 0);
51919+ atomic_set_unchecked(&totBufAllocCount, 0);
51920+ atomic_set_unchecked(&totSmBufAllocCount, 0);
51921 #endif /* CONFIG_CIFS_STATS2 */
51922
51923 atomic_set(&midCount, 0);
51924diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
51925index ea3a0b3..0194e39 100644
51926--- a/fs/cifs/cifsglob.h
51927+++ b/fs/cifs/cifsglob.h
51928@@ -752,35 +752,35 @@ struct cifs_tcon {
51929 __u16 Flags; /* optional support bits */
51930 enum statusEnum tidStatus;
51931 #ifdef CONFIG_CIFS_STATS
51932- atomic_t num_smbs_sent;
51933+ atomic_unchecked_t num_smbs_sent;
51934 union {
51935 struct {
51936- atomic_t num_writes;
51937- atomic_t num_reads;
51938- atomic_t num_flushes;
51939- atomic_t num_oplock_brks;
51940- atomic_t num_opens;
51941- atomic_t num_closes;
51942- atomic_t num_deletes;
51943- atomic_t num_mkdirs;
51944- atomic_t num_posixopens;
51945- atomic_t num_posixmkdirs;
51946- atomic_t num_rmdirs;
51947- atomic_t num_renames;
51948- atomic_t num_t2renames;
51949- atomic_t num_ffirst;
51950- atomic_t num_fnext;
51951- atomic_t num_fclose;
51952- atomic_t num_hardlinks;
51953- atomic_t num_symlinks;
51954- atomic_t num_locks;
51955- atomic_t num_acl_get;
51956- atomic_t num_acl_set;
51957+ atomic_unchecked_t num_writes;
51958+ atomic_unchecked_t num_reads;
51959+ atomic_unchecked_t num_flushes;
51960+ atomic_unchecked_t num_oplock_brks;
51961+ atomic_unchecked_t num_opens;
51962+ atomic_unchecked_t num_closes;
51963+ atomic_unchecked_t num_deletes;
51964+ atomic_unchecked_t num_mkdirs;
51965+ atomic_unchecked_t num_posixopens;
51966+ atomic_unchecked_t num_posixmkdirs;
51967+ atomic_unchecked_t num_rmdirs;
51968+ atomic_unchecked_t num_renames;
51969+ atomic_unchecked_t num_t2renames;
51970+ atomic_unchecked_t num_ffirst;
51971+ atomic_unchecked_t num_fnext;
51972+ atomic_unchecked_t num_fclose;
51973+ atomic_unchecked_t num_hardlinks;
51974+ atomic_unchecked_t num_symlinks;
51975+ atomic_unchecked_t num_locks;
51976+ atomic_unchecked_t num_acl_get;
51977+ atomic_unchecked_t num_acl_set;
51978 } cifs_stats;
51979 #ifdef CONFIG_CIFS_SMB2
51980 struct {
51981- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
51982- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
51983+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
51984+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
51985 } smb2_stats;
51986 #endif /* CONFIG_CIFS_SMB2 */
51987 } stats;
51988@@ -1081,7 +1081,7 @@ convert_delimiter(char *path, char delim)
51989 }
51990
51991 #ifdef CONFIG_CIFS_STATS
51992-#define cifs_stats_inc atomic_inc
51993+#define cifs_stats_inc atomic_inc_unchecked
51994
51995 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
51996 unsigned int bytes)
51997@@ -1446,8 +1446,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
51998 /* Various Debug counters */
51999 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
52000 #ifdef CONFIG_CIFS_STATS2
52001-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
52002-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
52003+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
52004+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
52005 #endif
52006 GLOBAL_EXTERN atomic_t smBufAllocCount;
52007 GLOBAL_EXTERN atomic_t midCount;
52008diff --git a/fs/cifs/link.c b/fs/cifs/link.c
52009index b83c3f5..6437caa 100644
52010--- a/fs/cifs/link.c
52011+++ b/fs/cifs/link.c
52012@@ -616,7 +616,7 @@ symlink_exit:
52013
52014 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
52015 {
52016- char *p = nd_get_link(nd);
52017+ const char *p = nd_get_link(nd);
52018 if (!IS_ERR(p))
52019 kfree(p);
52020 }
52021diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
52022index 1bec014..f329411 100644
52023--- a/fs/cifs/misc.c
52024+++ b/fs/cifs/misc.c
52025@@ -169,7 +169,7 @@ cifs_buf_get(void)
52026 memset(ret_buf, 0, buf_size + 3);
52027 atomic_inc(&bufAllocCount);
52028 #ifdef CONFIG_CIFS_STATS2
52029- atomic_inc(&totBufAllocCount);
52030+ atomic_inc_unchecked(&totBufAllocCount);
52031 #endif /* CONFIG_CIFS_STATS2 */
52032 }
52033
52034@@ -204,7 +204,7 @@ cifs_small_buf_get(void)
52035 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
52036 atomic_inc(&smBufAllocCount);
52037 #ifdef CONFIG_CIFS_STATS2
52038- atomic_inc(&totSmBufAllocCount);
52039+ atomic_inc_unchecked(&totSmBufAllocCount);
52040 #endif /* CONFIG_CIFS_STATS2 */
52041
52042 }
52043diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
52044index 3efdb9d..e845a5e 100644
52045--- a/fs/cifs/smb1ops.c
52046+++ b/fs/cifs/smb1ops.c
52047@@ -591,27 +591,27 @@ static void
52048 cifs_clear_stats(struct cifs_tcon *tcon)
52049 {
52050 #ifdef CONFIG_CIFS_STATS
52051- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
52052- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
52053- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
52054- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
52055- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
52056- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
52057- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
52058- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
52059- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
52060- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
52061- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
52062- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
52063- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
52064- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
52065- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
52066- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
52067- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
52068- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
52069- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
52070- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
52071- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
52072+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
52073+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
52074+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
52075+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
52076+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
52077+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
52078+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
52079+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
52080+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
52081+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
52082+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
52083+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
52084+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
52085+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
52086+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
52087+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
52088+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
52089+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
52090+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
52091+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
52092+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
52093 #endif
52094 }
52095
52096@@ -620,36 +620,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
52097 {
52098 #ifdef CONFIG_CIFS_STATS
52099 seq_printf(m, " Oplocks breaks: %d",
52100- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
52101+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
52102 seq_printf(m, "\nReads: %d Bytes: %llu",
52103- atomic_read(&tcon->stats.cifs_stats.num_reads),
52104+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
52105 (long long)(tcon->bytes_read));
52106 seq_printf(m, "\nWrites: %d Bytes: %llu",
52107- atomic_read(&tcon->stats.cifs_stats.num_writes),
52108+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
52109 (long long)(tcon->bytes_written));
52110 seq_printf(m, "\nFlushes: %d",
52111- atomic_read(&tcon->stats.cifs_stats.num_flushes));
52112+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
52113 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
52114- atomic_read(&tcon->stats.cifs_stats.num_locks),
52115- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
52116- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
52117+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
52118+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
52119+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
52120 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
52121- atomic_read(&tcon->stats.cifs_stats.num_opens),
52122- atomic_read(&tcon->stats.cifs_stats.num_closes),
52123- atomic_read(&tcon->stats.cifs_stats.num_deletes));
52124+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
52125+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
52126+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
52127 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
52128- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
52129- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
52130+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
52131+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
52132 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
52133- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
52134- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
52135+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
52136+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
52137 seq_printf(m, "\nRenames: %d T2 Renames %d",
52138- atomic_read(&tcon->stats.cifs_stats.num_renames),
52139- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
52140+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
52141+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
52142 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
52143- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
52144- atomic_read(&tcon->stats.cifs_stats.num_fnext),
52145- atomic_read(&tcon->stats.cifs_stats.num_fclose));
52146+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
52147+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
52148+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
52149 #endif
52150 }
52151
52152diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
52153index f2e76f3..c44fac7 100644
52154--- a/fs/cifs/smb2ops.c
52155+++ b/fs/cifs/smb2ops.c
52156@@ -274,8 +274,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
52157 #ifdef CONFIG_CIFS_STATS
52158 int i;
52159 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
52160- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
52161- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
52162+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
52163+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
52164 }
52165 #endif
52166 }
52167@@ -284,66 +284,66 @@ static void
52168 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
52169 {
52170 #ifdef CONFIG_CIFS_STATS
52171- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
52172- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
52173+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
52174+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
52175 seq_printf(m, "\nNegotiates: %d sent %d failed",
52176- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
52177- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
52178+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
52179+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
52180 seq_printf(m, "\nSessionSetups: %d sent %d failed",
52181- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
52182- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
52183+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
52184+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
52185 #define SMB2LOGOFF 0x0002 /* trivial request/resp */
52186 seq_printf(m, "\nLogoffs: %d sent %d failed",
52187- atomic_read(&sent[SMB2_LOGOFF_HE]),
52188- atomic_read(&failed[SMB2_LOGOFF_HE]));
52189+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
52190+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
52191 seq_printf(m, "\nTreeConnects: %d sent %d failed",
52192- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
52193- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
52194+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
52195+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
52196 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
52197- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
52198- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
52199+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
52200+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
52201 seq_printf(m, "\nCreates: %d sent %d failed",
52202- atomic_read(&sent[SMB2_CREATE_HE]),
52203- atomic_read(&failed[SMB2_CREATE_HE]));
52204+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
52205+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
52206 seq_printf(m, "\nCloses: %d sent %d failed",
52207- atomic_read(&sent[SMB2_CLOSE_HE]),
52208- atomic_read(&failed[SMB2_CLOSE_HE]));
52209+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
52210+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
52211 seq_printf(m, "\nFlushes: %d sent %d failed",
52212- atomic_read(&sent[SMB2_FLUSH_HE]),
52213- atomic_read(&failed[SMB2_FLUSH_HE]));
52214+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
52215+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
52216 seq_printf(m, "\nReads: %d sent %d failed",
52217- atomic_read(&sent[SMB2_READ_HE]),
52218- atomic_read(&failed[SMB2_READ_HE]));
52219+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
52220+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
52221 seq_printf(m, "\nWrites: %d sent %d failed",
52222- atomic_read(&sent[SMB2_WRITE_HE]),
52223- atomic_read(&failed[SMB2_WRITE_HE]));
52224+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
52225+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
52226 seq_printf(m, "\nLocks: %d sent %d failed",
52227- atomic_read(&sent[SMB2_LOCK_HE]),
52228- atomic_read(&failed[SMB2_LOCK_HE]));
52229+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
52230+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
52231 seq_printf(m, "\nIOCTLs: %d sent %d failed",
52232- atomic_read(&sent[SMB2_IOCTL_HE]),
52233- atomic_read(&failed[SMB2_IOCTL_HE]));
52234+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
52235+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
52236 seq_printf(m, "\nCancels: %d sent %d failed",
52237- atomic_read(&sent[SMB2_CANCEL_HE]),
52238- atomic_read(&failed[SMB2_CANCEL_HE]));
52239+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
52240+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
52241 seq_printf(m, "\nEchos: %d sent %d failed",
52242- atomic_read(&sent[SMB2_ECHO_HE]),
52243- atomic_read(&failed[SMB2_ECHO_HE]));
52244+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
52245+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
52246 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
52247- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
52248- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
52249+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
52250+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
52251 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
52252- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
52253- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
52254+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
52255+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
52256 seq_printf(m, "\nQueryInfos: %d sent %d failed",
52257- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
52258- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
52259+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
52260+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
52261 seq_printf(m, "\nSetInfos: %d sent %d failed",
52262- atomic_read(&sent[SMB2_SET_INFO_HE]),
52263- atomic_read(&failed[SMB2_SET_INFO_HE]));
52264+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
52265+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
52266 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
52267- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
52268- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
52269+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
52270+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
52271 #endif
52272 }
52273
52274diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
52275index 2b95ce2..d079d75 100644
52276--- a/fs/cifs/smb2pdu.c
52277+++ b/fs/cifs/smb2pdu.c
52278@@ -1760,8 +1760,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
52279 default:
52280 cifs_dbg(VFS, "info level %u isn't supported\n",
52281 srch_inf->info_level);
52282- rc = -EINVAL;
52283- goto qdir_exit;
52284+ return -EINVAL;
52285 }
52286
52287 req->FileIndex = cpu_to_le32(index);
52288diff --git a/fs/coda/cache.c b/fs/coda/cache.c
52289index 1da168c..8bc7ff6 100644
52290--- a/fs/coda/cache.c
52291+++ b/fs/coda/cache.c
52292@@ -24,7 +24,7 @@
52293 #include "coda_linux.h"
52294 #include "coda_cache.h"
52295
52296-static atomic_t permission_epoch = ATOMIC_INIT(0);
52297+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
52298
52299 /* replace or extend an acl cache hit */
52300 void coda_cache_enter(struct inode *inode, int mask)
52301@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
52302 struct coda_inode_info *cii = ITOC(inode);
52303
52304 spin_lock(&cii->c_lock);
52305- cii->c_cached_epoch = atomic_read(&permission_epoch);
52306+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
52307 if (!uid_eq(cii->c_uid, current_fsuid())) {
52308 cii->c_uid = current_fsuid();
52309 cii->c_cached_perm = mask;
52310@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
52311 {
52312 struct coda_inode_info *cii = ITOC(inode);
52313 spin_lock(&cii->c_lock);
52314- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
52315+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
52316 spin_unlock(&cii->c_lock);
52317 }
52318
52319 /* remove all acl caches */
52320 void coda_cache_clear_all(struct super_block *sb)
52321 {
52322- atomic_inc(&permission_epoch);
52323+ atomic_inc_unchecked(&permission_epoch);
52324 }
52325
52326
52327@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
52328 spin_lock(&cii->c_lock);
52329 hit = (mask & cii->c_cached_perm) == mask &&
52330 uid_eq(cii->c_uid, current_fsuid()) &&
52331- cii->c_cached_epoch == atomic_read(&permission_epoch);
52332+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
52333 spin_unlock(&cii->c_lock);
52334
52335 return hit;
52336diff --git a/fs/compat.c b/fs/compat.c
52337index fc3b55d..7b568ae 100644
52338--- a/fs/compat.c
52339+++ b/fs/compat.c
52340@@ -54,7 +54,7 @@
52341 #include <asm/ioctls.h>
52342 #include "internal.h"
52343
52344-int compat_log = 1;
52345+int compat_log = 0;
52346
52347 int compat_printk(const char *fmt, ...)
52348 {
52349@@ -488,7 +488,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
52350
52351 set_fs(KERNEL_DS);
52352 /* The __user pointer cast is valid because of the set_fs() */
52353- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
52354+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
52355 set_fs(oldfs);
52356 /* truncating is ok because it's a user address */
52357 if (!ret)
52358@@ -546,7 +546,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
52359 goto out;
52360
52361 ret = -EINVAL;
52362- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
52363+ if (nr_segs > UIO_MAXIOV)
52364 goto out;
52365 if (nr_segs > fast_segs) {
52366 ret = -ENOMEM;
52367@@ -833,6 +833,7 @@ struct compat_old_linux_dirent {
52368
52369 struct compat_readdir_callback {
52370 struct compat_old_linux_dirent __user *dirent;
52371+ struct file * file;
52372 int result;
52373 };
52374
52375@@ -850,6 +851,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
52376 buf->result = -EOVERFLOW;
52377 return -EOVERFLOW;
52378 }
52379+
52380+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
52381+ return 0;
52382+
52383 buf->result++;
52384 dirent = buf->dirent;
52385 if (!access_ok(VERIFY_WRITE, dirent,
52386@@ -880,6 +885,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
52387
52388 buf.result = 0;
52389 buf.dirent = dirent;
52390+ buf.file = f.file;
52391
52392 error = vfs_readdir(f.file, compat_fillonedir, &buf);
52393 if (buf.result)
52394@@ -899,6 +905,7 @@ struct compat_linux_dirent {
52395 struct compat_getdents_callback {
52396 struct compat_linux_dirent __user *current_dir;
52397 struct compat_linux_dirent __user *previous;
52398+ struct file * file;
52399 int count;
52400 int error;
52401 };
52402@@ -920,6 +927,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
52403 buf->error = -EOVERFLOW;
52404 return -EOVERFLOW;
52405 }
52406+
52407+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
52408+ return 0;
52409+
52410 dirent = buf->previous;
52411 if (dirent) {
52412 if (__put_user(offset, &dirent->d_off))
52413@@ -965,6 +976,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
52414 buf.previous = NULL;
52415 buf.count = count;
52416 buf.error = 0;
52417+ buf.file = f.file;
52418
52419 error = vfs_readdir(f.file, compat_filldir, &buf);
52420 if (error >= 0)
52421@@ -985,6 +997,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
52422 struct compat_getdents_callback64 {
52423 struct linux_dirent64 __user *current_dir;
52424 struct linux_dirent64 __user *previous;
52425+ struct file * file;
52426 int count;
52427 int error;
52428 };
52429@@ -1001,6 +1014,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
52430 buf->error = -EINVAL; /* only used if we fail.. */
52431 if (reclen > buf->count)
52432 return -EINVAL;
52433+
52434+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
52435+ return 0;
52436+
52437 dirent = buf->previous;
52438
52439 if (dirent) {
52440@@ -1050,13 +1067,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
52441 buf.previous = NULL;
52442 buf.count = count;
52443 buf.error = 0;
52444+ buf.file = f.file;
52445
52446 error = vfs_readdir(f.file, compat_filldir64, &buf);
52447 if (error >= 0)
52448 error = buf.error;
52449 lastdirent = buf.previous;
52450 if (lastdirent) {
52451- typeof(lastdirent->d_off) d_off = f.file->f_pos;
52452+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos;
52453 if (__put_user_unaligned(d_off, &lastdirent->d_off))
52454 error = -EFAULT;
52455 else
52456diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
52457index a81147e..20bf2b5 100644
52458--- a/fs/compat_binfmt_elf.c
52459+++ b/fs/compat_binfmt_elf.c
52460@@ -30,11 +30,13 @@
52461 #undef elf_phdr
52462 #undef elf_shdr
52463 #undef elf_note
52464+#undef elf_dyn
52465 #undef elf_addr_t
52466 #define elfhdr elf32_hdr
52467 #define elf_phdr elf32_phdr
52468 #define elf_shdr elf32_shdr
52469 #define elf_note elf32_note
52470+#define elf_dyn Elf32_Dyn
52471 #define elf_addr_t Elf32_Addr
52472
52473 /*
52474diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
52475index 996cdc5..15e2f33 100644
52476--- a/fs/compat_ioctl.c
52477+++ b/fs/compat_ioctl.c
52478@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
52479 return -EFAULT;
52480 if (__get_user(udata, &ss32->iomem_base))
52481 return -EFAULT;
52482- ss.iomem_base = compat_ptr(udata);
52483+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
52484 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
52485 __get_user(ss.port_high, &ss32->port_high))
52486 return -EFAULT;
52487@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
52488 for (i = 0; i < nmsgs; i++) {
52489 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
52490 return -EFAULT;
52491- if (get_user(datap, &umsgs[i].buf) ||
52492- put_user(compat_ptr(datap), &tmsgs[i].buf))
52493+ if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
52494+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
52495 return -EFAULT;
52496 }
52497 return sys_ioctl(fd, cmd, (unsigned long)tdata);
52498@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
52499 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
52500 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
52501 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
52502- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
52503+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
52504 return -EFAULT;
52505
52506 return ioctl_preallocate(file, p);
52507@@ -1619,8 +1619,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
52508 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
52509 {
52510 unsigned int a, b;
52511- a = *(unsigned int *)p;
52512- b = *(unsigned int *)q;
52513+ a = *(const unsigned int *)p;
52514+ b = *(const unsigned int *)q;
52515 if (a > b)
52516 return 1;
52517 if (a < b)
52518diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
52519index 7aabc6a..34c1197 100644
52520--- a/fs/configfs/dir.c
52521+++ b/fs/configfs/dir.c
52522@@ -1565,7 +1565,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
52523 }
52524 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
52525 struct configfs_dirent *next;
52526- const char * name;
52527+ const unsigned char * name;
52528+ char d_name[sizeof(next->s_dentry->d_iname)];
52529 int len;
52530 struct inode *inode = NULL;
52531
52532@@ -1575,7 +1576,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
52533 continue;
52534
52535 name = configfs_get_name(next);
52536- len = strlen(name);
52537+ if (next->s_dentry && name == next->s_dentry->d_iname) {
52538+ len = next->s_dentry->d_name.len;
52539+ memcpy(d_name, name, len);
52540+ name = d_name;
52541+ } else
52542+ len = strlen(name);
52543
52544 /*
52545 * We'll have a dentry and an inode for
52546diff --git a/fs/coredump.c b/fs/coredump.c
52547index dafafba..10b3b27 100644
52548--- a/fs/coredump.c
52549+++ b/fs/coredump.c
52550@@ -52,7 +52,7 @@ struct core_name {
52551 char *corename;
52552 int used, size;
52553 };
52554-static atomic_t call_count = ATOMIC_INIT(1);
52555+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
52556
52557 /* The maximal length of core_pattern is also specified in sysctl.c */
52558
52559@@ -60,7 +60,7 @@ static int expand_corename(struct core_name *cn)
52560 {
52561 char *old_corename = cn->corename;
52562
52563- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
52564+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
52565 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
52566
52567 if (!cn->corename) {
52568@@ -157,7 +157,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)
52569 int pid_in_pattern = 0;
52570 int err = 0;
52571
52572- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
52573+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
52574 cn->corename = kmalloc(cn->size, GFP_KERNEL);
52575 cn->used = 0;
52576
52577@@ -435,8 +435,8 @@ static void wait_for_dump_helpers(struct file *file)
52578 struct pipe_inode_info *pipe = file->private_data;
52579
52580 pipe_lock(pipe);
52581- pipe->readers++;
52582- pipe->writers--;
52583+ atomic_inc(&pipe->readers);
52584+ atomic_dec(&pipe->writers);
52585 wake_up_interruptible_sync(&pipe->wait);
52586 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
52587 pipe_unlock(pipe);
52588@@ -445,11 +445,11 @@ static void wait_for_dump_helpers(struct file *file)
52589 * We actually want wait_event_freezable() but then we need
52590 * to clear TIF_SIGPENDING and improve dump_interrupted().
52591 */
52592- wait_event_interruptible(pipe->wait, pipe->readers == 1);
52593+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
52594
52595 pipe_lock(pipe);
52596- pipe->readers--;
52597- pipe->writers++;
52598+ atomic_dec(&pipe->readers);
52599+ atomic_inc(&pipe->writers);
52600 pipe_unlock(pipe);
52601 }
52602
52603@@ -496,7 +496,8 @@ void do_coredump(siginfo_t *siginfo)
52604 struct files_struct *displaced;
52605 bool need_nonrelative = false;
52606 bool core_dumped = false;
52607- static atomic_t core_dump_count = ATOMIC_INIT(0);
52608+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
52609+ long signr = siginfo->si_signo;
52610 struct coredump_params cprm = {
52611 .siginfo = siginfo,
52612 .regs = signal_pt_regs(),
52613@@ -509,7 +510,10 @@ void do_coredump(siginfo_t *siginfo)
52614 .mm_flags = mm->flags,
52615 };
52616
52617- audit_core_dumps(siginfo->si_signo);
52618+ audit_core_dumps(signr);
52619+
52620+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
52621+ gr_handle_brute_attach(cprm.mm_flags);
52622
52623 binfmt = mm->binfmt;
52624 if (!binfmt || !binfmt->core_dump)
52625@@ -533,7 +537,7 @@ void do_coredump(siginfo_t *siginfo)
52626 need_nonrelative = true;
52627 }
52628
52629- retval = coredump_wait(siginfo->si_signo, &core_state);
52630+ retval = coredump_wait(signr, &core_state);
52631 if (retval < 0)
52632 goto fail_creds;
52633
52634@@ -576,7 +580,7 @@ void do_coredump(siginfo_t *siginfo)
52635 }
52636 cprm.limit = RLIM_INFINITY;
52637
52638- dump_count = atomic_inc_return(&core_dump_count);
52639+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
52640 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
52641 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
52642 task_tgid_vnr(current), current->comm);
52643@@ -608,6 +612,8 @@ void do_coredump(siginfo_t *siginfo)
52644 } else {
52645 struct inode *inode;
52646
52647+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
52648+
52649 if (cprm.limit < binfmt->min_coredump)
52650 goto fail_unlock;
52651
52652@@ -666,7 +672,7 @@ close_fail:
52653 filp_close(cprm.file, NULL);
52654 fail_dropcount:
52655 if (ispipe)
52656- atomic_dec(&core_dump_count);
52657+ atomic_dec_unchecked(&core_dump_count);
52658 fail_unlock:
52659 kfree(cn.corename);
52660 fail_corename:
52661@@ -687,7 +693,7 @@ int dump_write(struct file *file, const void *addr, int nr)
52662 {
52663 return !dump_interrupted() &&
52664 access_ok(VERIFY_READ, addr, nr) &&
52665- file->f_op->write(file, addr, nr, &file->f_pos) == nr;
52666+ file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
52667 }
52668 EXPORT_SYMBOL(dump_write);
52669
52670diff --git a/fs/dcache.c b/fs/dcache.c
52671index f09b908..04b9690 100644
52672--- a/fs/dcache.c
52673+++ b/fs/dcache.c
52674@@ -3086,7 +3086,8 @@ void __init vfs_caches_init(unsigned long mempages)
52675 mempages -= reserve;
52676
52677 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
52678- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
52679+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
52680+ SLAB_NO_SANITIZE, NULL);
52681
52682 dcache_init();
52683 inode_init();
52684diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
52685index c7c83ff..bda9461 100644
52686--- a/fs/debugfs/inode.c
52687+++ b/fs/debugfs/inode.c
52688@@ -415,7 +415,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
52689 */
52690 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
52691 {
52692+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
52693+ return __create_file(name, S_IFDIR | S_IRWXU,
52694+#else
52695 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
52696+#endif
52697 parent, NULL, NULL);
52698 }
52699 EXPORT_SYMBOL_GPL(debugfs_create_dir);
52700diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
52701index 5eab400..810a3f5 100644
52702--- a/fs/ecryptfs/inode.c
52703+++ b/fs/ecryptfs/inode.c
52704@@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
52705 old_fs = get_fs();
52706 set_fs(get_ds());
52707 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
52708- (char __user *)lower_buf,
52709+ (char __force_user *)lower_buf,
52710 PATH_MAX);
52711 set_fs(old_fs);
52712 if (rc < 0)
52713@@ -706,7 +706,7 @@ out:
52714 static void
52715 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
52716 {
52717- char *buf = nd_get_link(nd);
52718+ const char *buf = nd_get_link(nd);
52719 if (!IS_ERR(buf)) {
52720 /* Free the char* */
52721 kfree(buf);
52722diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
52723index e4141f2..d8263e8 100644
52724--- a/fs/ecryptfs/miscdev.c
52725+++ b/fs/ecryptfs/miscdev.c
52726@@ -304,7 +304,7 @@ check_list:
52727 goto out_unlock_msg_ctx;
52728 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
52729 if (msg_ctx->msg) {
52730- if (copy_to_user(&buf[i], packet_length, packet_length_size))
52731+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
52732 goto out_unlock_msg_ctx;
52733 i += packet_length_size;
52734 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
52735diff --git a/fs/exec.c b/fs/exec.c
52736index 1f44670..3c84660 100644
52737--- a/fs/exec.c
52738+++ b/fs/exec.c
52739@@ -55,8 +55,20 @@
52740 #include <linux/pipe_fs_i.h>
52741 #include <linux/oom.h>
52742 #include <linux/compat.h>
52743+#include <linux/random.h>
52744+#include <linux/seq_file.h>
52745+#include <linux/coredump.h>
52746+#include <linux/mman.h>
52747+
52748+#ifdef CONFIG_PAX_REFCOUNT
52749+#include <linux/kallsyms.h>
52750+#include <linux/kdebug.h>
52751+#endif
52752+
52753+#include <trace/events/fs.h>
52754
52755 #include <asm/uaccess.h>
52756+#include <asm/sections.h>
52757 #include <asm/mmu_context.h>
52758 #include <asm/tlb.h>
52759
52760@@ -66,17 +78,32 @@
52761
52762 #include <trace/events/sched.h>
52763
52764+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
52765+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
52766+{
52767+ pr_warn_once("PAX: PAX_HAVE_ACL_FLAGS was enabled without providing the pax_set_initial_flags callback, this is probably not what you wanted.\n");
52768+}
52769+#endif
52770+
52771+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
52772+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
52773+EXPORT_SYMBOL(pax_set_initial_flags_func);
52774+#endif
52775+
52776 int suid_dumpable = 0;
52777
52778 static LIST_HEAD(formats);
52779 static DEFINE_RWLOCK(binfmt_lock);
52780
52781+extern int gr_process_kernel_exec_ban(void);
52782+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
52783+
52784 void __register_binfmt(struct linux_binfmt * fmt, int insert)
52785 {
52786 BUG_ON(!fmt);
52787 write_lock(&binfmt_lock);
52788- insert ? list_add(&fmt->lh, &formats) :
52789- list_add_tail(&fmt->lh, &formats);
52790+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
52791+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
52792 write_unlock(&binfmt_lock);
52793 }
52794
52795@@ -85,7 +112,7 @@ EXPORT_SYMBOL(__register_binfmt);
52796 void unregister_binfmt(struct linux_binfmt * fmt)
52797 {
52798 write_lock(&binfmt_lock);
52799- list_del(&fmt->lh);
52800+ pax_list_del((struct list_head *)&fmt->lh);
52801 write_unlock(&binfmt_lock);
52802 }
52803
52804@@ -180,18 +207,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
52805 int write)
52806 {
52807 struct page *page;
52808- int ret;
52809
52810-#ifdef CONFIG_STACK_GROWSUP
52811- if (write) {
52812- ret = expand_downwards(bprm->vma, pos);
52813- if (ret < 0)
52814- return NULL;
52815- }
52816-#endif
52817- ret = get_user_pages(current, bprm->mm, pos,
52818- 1, write, 1, &page, NULL);
52819- if (ret <= 0)
52820+ if (0 > expand_downwards(bprm->vma, pos))
52821+ return NULL;
52822+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
52823 return NULL;
52824
52825 if (write) {
52826@@ -207,6 +226,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
52827 if (size <= ARG_MAX)
52828 return page;
52829
52830+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52831+ // only allow 512KB for argv+env on suid/sgid binaries
52832+ // to prevent easy ASLR exhaustion
52833+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
52834+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
52835+ (size > (512 * 1024))) {
52836+ put_page(page);
52837+ return NULL;
52838+ }
52839+#endif
52840+
52841 /*
52842 * Limit to 1/4-th the stack size for the argv+env strings.
52843 * This ensures that:
52844@@ -266,6 +296,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
52845 vma->vm_end = STACK_TOP_MAX;
52846 vma->vm_start = vma->vm_end - PAGE_SIZE;
52847 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
52848+
52849+#ifdef CONFIG_PAX_SEGMEXEC
52850+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
52851+#endif
52852+
52853 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
52854 INIT_LIST_HEAD(&vma->anon_vma_chain);
52855
52856@@ -276,6 +311,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
52857 mm->stack_vm = mm->total_vm = 1;
52858 up_write(&mm->mmap_sem);
52859 bprm->p = vma->vm_end - sizeof(void *);
52860+
52861+#ifdef CONFIG_PAX_RANDUSTACK
52862+ if (randomize_va_space)
52863+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
52864+#endif
52865+
52866 return 0;
52867 err:
52868 up_write(&mm->mmap_sem);
52869@@ -396,7 +437,7 @@ struct user_arg_ptr {
52870 } ptr;
52871 };
52872
52873-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
52874+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
52875 {
52876 const char __user *native;
52877
52878@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
52879 compat_uptr_t compat;
52880
52881 if (get_user(compat, argv.ptr.compat + nr))
52882- return ERR_PTR(-EFAULT);
52883+ return (const char __force_user *)ERR_PTR(-EFAULT);
52884
52885 return compat_ptr(compat);
52886 }
52887 #endif
52888
52889 if (get_user(native, argv.ptr.native + nr))
52890- return ERR_PTR(-EFAULT);
52891+ return (const char __force_user *)ERR_PTR(-EFAULT);
52892
52893 return native;
52894 }
52895@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
52896 if (!p)
52897 break;
52898
52899- if (IS_ERR(p))
52900+ if (IS_ERR((const char __force_kernel *)p))
52901 return -EFAULT;
52902
52903 if (i >= max)
52904@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
52905
52906 ret = -EFAULT;
52907 str = get_user_arg_ptr(argv, argc);
52908- if (IS_ERR(str))
52909+ if (IS_ERR((const char __force_kernel *)str))
52910 goto out;
52911
52912 len = strnlen_user(str, MAX_ARG_STRLEN);
52913@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
52914 int r;
52915 mm_segment_t oldfs = get_fs();
52916 struct user_arg_ptr argv = {
52917- .ptr.native = (const char __user *const __user *)__argv,
52918+ .ptr.native = (const char __force_user * const __force_user *)__argv,
52919 };
52920
52921 set_fs(KERNEL_DS);
52922@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
52923 unsigned long new_end = old_end - shift;
52924 struct mmu_gather tlb;
52925
52926- BUG_ON(new_start > new_end);
52927+ if (new_start >= new_end || new_start < mmap_min_addr)
52928+ return -ENOMEM;
52929
52930 /*
52931 * ensure there are no vmas between where we want to go
52932@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
52933 if (vma != find_vma(mm, new_start))
52934 return -EFAULT;
52935
52936+#ifdef CONFIG_PAX_SEGMEXEC
52937+ BUG_ON(pax_find_mirror_vma(vma));
52938+#endif
52939+
52940 /*
52941 * cover the whole range: [new_start, old_end)
52942 */
52943@@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
52944 stack_top = arch_align_stack(stack_top);
52945 stack_top = PAGE_ALIGN(stack_top);
52946
52947- if (unlikely(stack_top < mmap_min_addr) ||
52948- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
52949- return -ENOMEM;
52950-
52951 stack_shift = vma->vm_end - stack_top;
52952
52953 bprm->p -= stack_shift;
52954@@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
52955 bprm->exec -= stack_shift;
52956
52957 down_write(&mm->mmap_sem);
52958+
52959+ /* Move stack pages down in memory. */
52960+ if (stack_shift) {
52961+ ret = shift_arg_pages(vma, stack_shift);
52962+ if (ret)
52963+ goto out_unlock;
52964+ }
52965+
52966 vm_flags = VM_STACK_FLAGS;
52967
52968+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
52969+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
52970+ vm_flags &= ~VM_EXEC;
52971+
52972+#ifdef CONFIG_PAX_MPROTECT
52973+ if (mm->pax_flags & MF_PAX_MPROTECT)
52974+ vm_flags &= ~VM_MAYEXEC;
52975+#endif
52976+
52977+ }
52978+#endif
52979+
52980 /*
52981 * Adjust stack execute permissions; explicitly enable for
52982 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
52983@@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
52984 goto out_unlock;
52985 BUG_ON(prev != vma);
52986
52987- /* Move stack pages down in memory. */
52988- if (stack_shift) {
52989- ret = shift_arg_pages(vma, stack_shift);
52990- if (ret)
52991- goto out_unlock;
52992- }
52993-
52994 /* mprotect_fixup is overkill to remove the temporary stack flags */
52995 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
52996
52997@@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
52998 #endif
52999 current->mm->start_stack = bprm->p;
53000 ret = expand_stack(vma, stack_base);
53001+
53002+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
53003+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
53004+ unsigned long size;
53005+ vm_flags_t vm_flags;
53006+
53007+ size = STACK_TOP - vma->vm_end;
53008+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
53009+
53010+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
53011+
53012+#ifdef CONFIG_X86
53013+ if (!ret) {
53014+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
53015+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
53016+ }
53017+#endif
53018+
53019+ }
53020+#endif
53021+
53022 if (ret)
53023 ret = -EFAULT;
53024
53025@@ -772,6 +848,8 @@ struct file *open_exec(const char *name)
53026
53027 fsnotify_open(file);
53028
53029+ trace_open_exec(name);
53030+
53031 err = deny_write_access(file);
53032 if (err)
53033 goto exit;
53034@@ -795,7 +873,7 @@ int kernel_read(struct file *file, loff_t offset,
53035 old_fs = get_fs();
53036 set_fs(get_ds());
53037 /* The cast to a user pointer is valid due to the set_fs() */
53038- result = vfs_read(file, (void __user *)addr, count, &pos);
53039+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
53040 set_fs(old_fs);
53041 return result;
53042 }
53043@@ -1251,7 +1329,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
53044 }
53045 rcu_read_unlock();
53046
53047- if (p->fs->users > n_fs) {
53048+ if (atomic_read(&p->fs->users) > n_fs) {
53049 bprm->unsafe |= LSM_UNSAFE_SHARE;
53050 } else {
53051 res = -EAGAIN;
53052@@ -1451,6 +1529,31 @@ int search_binary_handler(struct linux_binprm *bprm)
53053
53054 EXPORT_SYMBOL(search_binary_handler);
53055
53056+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53057+static DEFINE_PER_CPU(u64, exec_counter);
53058+static int __init init_exec_counters(void)
53059+{
53060+ unsigned int cpu;
53061+
53062+ for_each_possible_cpu(cpu) {
53063+ per_cpu(exec_counter, cpu) = (u64)cpu;
53064+ }
53065+
53066+ return 0;
53067+}
53068+early_initcall(init_exec_counters);
53069+static inline void increment_exec_counter(void)
53070+{
53071+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
53072+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
53073+}
53074+#else
53075+static inline void increment_exec_counter(void) {}
53076+#endif
53077+
53078+extern void gr_handle_exec_args(struct linux_binprm *bprm,
53079+ struct user_arg_ptr argv);
53080+
53081 /*
53082 * sys_execve() executes a new program.
53083 */
53084@@ -1458,6 +1561,11 @@ static int do_execve_common(const char *filename,
53085 struct user_arg_ptr argv,
53086 struct user_arg_ptr envp)
53087 {
53088+#ifdef CONFIG_GRKERNSEC
53089+ struct file *old_exec_file;
53090+ struct acl_subject_label *old_acl;
53091+ struct rlimit old_rlim[RLIM_NLIMITS];
53092+#endif
53093 struct linux_binprm *bprm;
53094 struct file *file;
53095 struct files_struct *displaced;
53096@@ -1465,6 +1573,8 @@ static int do_execve_common(const char *filename,
53097 int retval;
53098 const struct cred *cred = current_cred();
53099
53100+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&cred->user->processes), 1);
53101+
53102 /*
53103 * We move the actual failure in case of RLIMIT_NPROC excess from
53104 * set*uid() to execve() because too many poorly written programs
53105@@ -1505,12 +1615,22 @@ static int do_execve_common(const char *filename,
53106 if (IS_ERR(file))
53107 goto out_unmark;
53108
53109+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
53110+ retval = -EPERM;
53111+ goto out_file;
53112+ }
53113+
53114 sched_exec();
53115
53116 bprm->file = file;
53117 bprm->filename = filename;
53118 bprm->interp = filename;
53119
53120+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
53121+ retval = -EACCES;
53122+ goto out_file;
53123+ }
53124+
53125 retval = bprm_mm_init(bprm);
53126 if (retval)
53127 goto out_file;
53128@@ -1527,24 +1647,70 @@ static int do_execve_common(const char *filename,
53129 if (retval < 0)
53130 goto out;
53131
53132+#ifdef CONFIG_GRKERNSEC
53133+ old_acl = current->acl;
53134+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
53135+ old_exec_file = current->exec_file;
53136+ get_file(file);
53137+ current->exec_file = file;
53138+#endif
53139+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53140+ /* limit suid stack to 8MB
53141+ * we saved the old limits above and will restore them if this exec fails
53142+ */
53143+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
53144+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
53145+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
53146+#endif
53147+
53148+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
53149+ retval = -EPERM;
53150+ goto out_fail;
53151+ }
53152+
53153+ if (!gr_tpe_allow(file)) {
53154+ retval = -EACCES;
53155+ goto out_fail;
53156+ }
53157+
53158+ if (gr_check_crash_exec(file)) {
53159+ retval = -EACCES;
53160+ goto out_fail;
53161+ }
53162+
53163+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
53164+ bprm->unsafe);
53165+ if (retval < 0)
53166+ goto out_fail;
53167+
53168 retval = copy_strings_kernel(1, &bprm->filename, bprm);
53169 if (retval < 0)
53170- goto out;
53171+ goto out_fail;
53172
53173 bprm->exec = bprm->p;
53174 retval = copy_strings(bprm->envc, envp, bprm);
53175 if (retval < 0)
53176- goto out;
53177+ goto out_fail;
53178
53179 retval = copy_strings(bprm->argc, argv, bprm);
53180 if (retval < 0)
53181- goto out;
53182+ goto out_fail;
53183+
53184+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
53185+
53186+ gr_handle_exec_args(bprm, argv);
53187
53188 retval = search_binary_handler(bprm);
53189 if (retval < 0)
53190- goto out;
53191+ goto out_fail;
53192+#ifdef CONFIG_GRKERNSEC
53193+ if (old_exec_file)
53194+ fput(old_exec_file);
53195+#endif
53196
53197 /* execve succeeded */
53198+
53199+ increment_exec_counter();
53200 current->fs->in_exec = 0;
53201 current->in_execve = 0;
53202 acct_update_integrals(current);
53203@@ -1553,6 +1719,14 @@ static int do_execve_common(const char *filename,
53204 put_files_struct(displaced);
53205 return retval;
53206
53207+out_fail:
53208+#ifdef CONFIG_GRKERNSEC
53209+ current->acl = old_acl;
53210+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
53211+ fput(current->exec_file);
53212+ current->exec_file = old_exec_file;
53213+#endif
53214+
53215 out:
53216 if (bprm->mm) {
53217 acct_arg_size(bprm, 0);
53218@@ -1701,3 +1875,287 @@ asmlinkage long compat_sys_execve(const char __user * filename,
53219 return error;
53220 }
53221 #endif
53222+
53223+int pax_check_flags(unsigned long *flags)
53224+{
53225+ int retval = 0;
53226+
53227+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
53228+ if (*flags & MF_PAX_SEGMEXEC)
53229+ {
53230+ *flags &= ~MF_PAX_SEGMEXEC;
53231+ retval = -EINVAL;
53232+ }
53233+#endif
53234+
53235+ if ((*flags & MF_PAX_PAGEEXEC)
53236+
53237+#ifdef CONFIG_PAX_PAGEEXEC
53238+ && (*flags & MF_PAX_SEGMEXEC)
53239+#endif
53240+
53241+ )
53242+ {
53243+ *flags &= ~MF_PAX_PAGEEXEC;
53244+ retval = -EINVAL;
53245+ }
53246+
53247+ if ((*flags & MF_PAX_MPROTECT)
53248+
53249+#ifdef CONFIG_PAX_MPROTECT
53250+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
53251+#endif
53252+
53253+ )
53254+ {
53255+ *flags &= ~MF_PAX_MPROTECT;
53256+ retval = -EINVAL;
53257+ }
53258+
53259+ if ((*flags & MF_PAX_EMUTRAMP)
53260+
53261+#ifdef CONFIG_PAX_EMUTRAMP
53262+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
53263+#endif
53264+
53265+ )
53266+ {
53267+ *flags &= ~MF_PAX_EMUTRAMP;
53268+ retval = -EINVAL;
53269+ }
53270+
53271+ return retval;
53272+}
53273+
53274+EXPORT_SYMBOL(pax_check_flags);
53275+
53276+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
53277+char *pax_get_path(const struct path *path, char *buf, int buflen)
53278+{
53279+ char *pathname = d_path(path, buf, buflen);
53280+
53281+ if (IS_ERR(pathname))
53282+ goto toolong;
53283+
53284+ pathname = mangle_path(buf, pathname, "\t\n\\");
53285+ if (!pathname)
53286+ goto toolong;
53287+
53288+ *pathname = 0;
53289+ return buf;
53290+
53291+toolong:
53292+ return "<path too long>";
53293+}
53294+EXPORT_SYMBOL(pax_get_path);
53295+
53296+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
53297+{
53298+ struct task_struct *tsk = current;
53299+ struct mm_struct *mm = current->mm;
53300+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
53301+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
53302+ char *path_exec = NULL;
53303+ char *path_fault = NULL;
53304+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
53305+ siginfo_t info = { };
53306+
53307+ if (buffer_exec && buffer_fault) {
53308+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
53309+
53310+ down_read(&mm->mmap_sem);
53311+ vma = mm->mmap;
53312+ while (vma && (!vma_exec || !vma_fault)) {
53313+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
53314+ vma_exec = vma;
53315+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
53316+ vma_fault = vma;
53317+ vma = vma->vm_next;
53318+ }
53319+ if (vma_exec)
53320+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
53321+ if (vma_fault) {
53322+ start = vma_fault->vm_start;
53323+ end = vma_fault->vm_end;
53324+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
53325+ if (vma_fault->vm_file)
53326+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
53327+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
53328+ path_fault = "<heap>";
53329+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
53330+ path_fault = "<stack>";
53331+ else
53332+ path_fault = "<anonymous mapping>";
53333+ }
53334+ up_read(&mm->mmap_sem);
53335+ }
53336+ if (tsk->signal->curr_ip)
53337+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
53338+ else
53339+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
53340+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
53341+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
53342+ free_page((unsigned long)buffer_exec);
53343+ free_page((unsigned long)buffer_fault);
53344+ pax_report_insns(regs, pc, sp);
53345+ info.si_signo = SIGKILL;
53346+ info.si_errno = 0;
53347+ info.si_code = SI_KERNEL;
53348+ info.si_pid = 0;
53349+ info.si_uid = 0;
53350+ do_coredump(&info);
53351+}
53352+#endif
53353+
53354+#ifdef CONFIG_PAX_REFCOUNT
53355+void pax_report_refcount_overflow(struct pt_regs *regs)
53356+{
53357+ if (current->signal->curr_ip)
53358+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
53359+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
53360+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
53361+ else
53362+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
53363+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
53364+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
53365+ preempt_disable();
53366+ show_regs(regs);
53367+ preempt_enable();
53368+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
53369+}
53370+#endif
53371+
53372+#ifdef CONFIG_PAX_USERCOPY
53373+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
53374+static noinline int check_stack_object(const void *obj, unsigned long len)
53375+{
53376+ const void * const stack = task_stack_page(current);
53377+ const void * const stackend = stack + THREAD_SIZE;
53378+
53379+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
53380+ const void *frame = NULL;
53381+ const void *oldframe;
53382+#endif
53383+
53384+ if (obj + len < obj)
53385+ return -1;
53386+
53387+ if (obj + len <= stack || stackend <= obj)
53388+ return 0;
53389+
53390+ if (obj < stack || stackend < obj + len)
53391+ return -1;
53392+
53393+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
53394+ oldframe = __builtin_frame_address(1);
53395+ if (oldframe)
53396+ frame = __builtin_frame_address(2);
53397+ /*
53398+ low ----------------------------------------------> high
53399+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
53400+ ^----------------^
53401+ allow copies only within here
53402+ */
53403+ while (stack <= frame && frame < stackend) {
53404+ /* if obj + len extends past the last frame, this
53405+ check won't pass and the next frame will be 0,
53406+ causing us to bail out and correctly report
53407+ the copy as invalid
53408+ */
53409+ if (obj + len <= frame)
53410+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
53411+ oldframe = frame;
53412+ frame = *(const void * const *)frame;
53413+ }
53414+ return -1;
53415+#else
53416+ return 1;
53417+#endif
53418+}
53419+
53420+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
53421+{
53422+ if (current->signal->curr_ip)
53423+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
53424+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
53425+ else
53426+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
53427+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
53428+ dump_stack();
53429+ gr_handle_kernel_exploit();
53430+ do_group_exit(SIGKILL);
53431+}
53432+#endif
53433+
53434+#ifdef CONFIG_PAX_USERCOPY
53435+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
53436+{
53437+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
53438+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
53439+#ifdef CONFIG_MODULES
53440+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
53441+#else
53442+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
53443+#endif
53444+
53445+#else
53446+ unsigned long textlow = (unsigned long)_stext;
53447+ unsigned long texthigh = (unsigned long)_etext;
53448+#endif
53449+
53450+ if (high <= textlow || low > texthigh)
53451+ return false;
53452+ else
53453+ return true;
53454+}
53455+#endif
53456+
53457+void __check_object_size(const void *ptr, unsigned long n, bool to_user)
53458+{
53459+
53460+#ifdef CONFIG_PAX_USERCOPY
53461+ const char *type;
53462+
53463+ if (!n)
53464+ return;
53465+
53466+ type = check_heap_object(ptr, n);
53467+ if (!type) {
53468+ int ret = check_stack_object(ptr, n);
53469+ if (ret == 1 || ret == 2)
53470+ return;
53471+ if (ret == 0) {
53472+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
53473+ type = "<kernel text>";
53474+ else
53475+ return;
53476+ } else
53477+ type = "<process stack>";
53478+ }
53479+
53480+ pax_report_usercopy(ptr, n, to_user, type);
53481+#endif
53482+
53483+}
53484+EXPORT_SYMBOL(__check_object_size);
53485+
53486+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
53487+void pax_track_stack(void)
53488+{
53489+ unsigned long sp = (unsigned long)&sp;
53490+ if (sp < current_thread_info()->lowest_stack &&
53491+ sp > (unsigned long)task_stack_page(current))
53492+ current_thread_info()->lowest_stack = sp;
53493+}
53494+EXPORT_SYMBOL(pax_track_stack);
53495+#endif
53496+
53497+#ifdef CONFIG_PAX_SIZE_OVERFLOW
53498+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
53499+{
53500+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
53501+ dump_stack();
53502+ do_group_exit(SIGKILL);
53503+}
53504+EXPORT_SYMBOL(report_size_overflow);
53505+#endif
53506diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
53507index 9f9992b..8b59411 100644
53508--- a/fs/ext2/balloc.c
53509+++ b/fs/ext2/balloc.c
53510@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
53511
53512 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
53513 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
53514- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
53515+ if (free_blocks < root_blocks + 1 &&
53516 !uid_eq(sbi->s_resuid, current_fsuid()) &&
53517 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
53518- !in_group_p (sbi->s_resgid))) {
53519+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
53520 return 0;
53521 }
53522 return 1;
53523diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
53524index 22548f5..41521d8 100644
53525--- a/fs/ext3/balloc.c
53526+++ b/fs/ext3/balloc.c
53527@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
53528
53529 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
53530 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
53531- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
53532+ if (free_blocks < root_blocks + 1 &&
53533 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
53534 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
53535- !in_group_p (sbi->s_resgid))) {
53536+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
53537 return 0;
53538 }
53539 return 1;
53540diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
53541index 3742e4c..69a797f 100644
53542--- a/fs/ext4/balloc.c
53543+++ b/fs/ext4/balloc.c
53544@@ -528,8 +528,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
53545 /* Hm, nope. Are (enough) root reserved clusters available? */
53546 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
53547 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
53548- capable(CAP_SYS_RESOURCE) ||
53549- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
53550+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
53551+ capable_nolog(CAP_SYS_RESOURCE)) {
53552
53553 if (free_clusters >= (nclusters + dirty_clusters +
53554 resv_clusters))
53555diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
53556index 5aae3d1..b5da7f8 100644
53557--- a/fs/ext4/ext4.h
53558+++ b/fs/ext4/ext4.h
53559@@ -1252,19 +1252,19 @@ struct ext4_sb_info {
53560 unsigned long s_mb_last_start;
53561
53562 /* stats for buddy allocator */
53563- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
53564- atomic_t s_bal_success; /* we found long enough chunks */
53565- atomic_t s_bal_allocated; /* in blocks */
53566- atomic_t s_bal_ex_scanned; /* total extents scanned */
53567- atomic_t s_bal_goals; /* goal hits */
53568- atomic_t s_bal_breaks; /* too long searches */
53569- atomic_t s_bal_2orders; /* 2^order hits */
53570+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
53571+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
53572+ atomic_unchecked_t s_bal_allocated; /* in blocks */
53573+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
53574+ atomic_unchecked_t s_bal_goals; /* goal hits */
53575+ atomic_unchecked_t s_bal_breaks; /* too long searches */
53576+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
53577 spinlock_t s_bal_lock;
53578 unsigned long s_mb_buddies_generated;
53579 unsigned long long s_mb_generation_time;
53580- atomic_t s_mb_lost_chunks;
53581- atomic_t s_mb_preallocated;
53582- atomic_t s_mb_discarded;
53583+ atomic_unchecked_t s_mb_lost_chunks;
53584+ atomic_unchecked_t s_mb_preallocated;
53585+ atomic_unchecked_t s_mb_discarded;
53586 atomic_t s_lock_busy;
53587
53588 /* locality groups */
53589diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
53590index 59c6750..a549154 100644
53591--- a/fs/ext4/mballoc.c
53592+++ b/fs/ext4/mballoc.c
53593@@ -1865,7 +1865,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
53594 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
53595
53596 if (EXT4_SB(sb)->s_mb_stats)
53597- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
53598+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
53599
53600 break;
53601 }
53602@@ -2170,7 +2170,7 @@ repeat:
53603 ac->ac_status = AC_STATUS_CONTINUE;
53604 ac->ac_flags |= EXT4_MB_HINT_FIRST;
53605 cr = 3;
53606- atomic_inc(&sbi->s_mb_lost_chunks);
53607+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
53608 goto repeat;
53609 }
53610 }
53611@@ -2678,25 +2678,25 @@ int ext4_mb_release(struct super_block *sb)
53612 if (sbi->s_mb_stats) {
53613 ext4_msg(sb, KERN_INFO,
53614 "mballoc: %u blocks %u reqs (%u success)",
53615- atomic_read(&sbi->s_bal_allocated),
53616- atomic_read(&sbi->s_bal_reqs),
53617- atomic_read(&sbi->s_bal_success));
53618+ atomic_read_unchecked(&sbi->s_bal_allocated),
53619+ atomic_read_unchecked(&sbi->s_bal_reqs),
53620+ atomic_read_unchecked(&sbi->s_bal_success));
53621 ext4_msg(sb, KERN_INFO,
53622 "mballoc: %u extents scanned, %u goal hits, "
53623 "%u 2^N hits, %u breaks, %u lost",
53624- atomic_read(&sbi->s_bal_ex_scanned),
53625- atomic_read(&sbi->s_bal_goals),
53626- atomic_read(&sbi->s_bal_2orders),
53627- atomic_read(&sbi->s_bal_breaks),
53628- atomic_read(&sbi->s_mb_lost_chunks));
53629+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
53630+ atomic_read_unchecked(&sbi->s_bal_goals),
53631+ atomic_read_unchecked(&sbi->s_bal_2orders),
53632+ atomic_read_unchecked(&sbi->s_bal_breaks),
53633+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
53634 ext4_msg(sb, KERN_INFO,
53635 "mballoc: %lu generated and it took %Lu",
53636 sbi->s_mb_buddies_generated,
53637 sbi->s_mb_generation_time);
53638 ext4_msg(sb, KERN_INFO,
53639 "mballoc: %u preallocated, %u discarded",
53640- atomic_read(&sbi->s_mb_preallocated),
53641- atomic_read(&sbi->s_mb_discarded));
53642+ atomic_read_unchecked(&sbi->s_mb_preallocated),
53643+ atomic_read_unchecked(&sbi->s_mb_discarded));
53644 }
53645
53646 free_percpu(sbi->s_locality_groups);
53647@@ -3150,16 +3150,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
53648 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
53649
53650 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
53651- atomic_inc(&sbi->s_bal_reqs);
53652- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
53653+ atomic_inc_unchecked(&sbi->s_bal_reqs);
53654+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
53655 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
53656- atomic_inc(&sbi->s_bal_success);
53657- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
53658+ atomic_inc_unchecked(&sbi->s_bal_success);
53659+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
53660 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
53661 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
53662- atomic_inc(&sbi->s_bal_goals);
53663+ atomic_inc_unchecked(&sbi->s_bal_goals);
53664 if (ac->ac_found > sbi->s_mb_max_to_scan)
53665- atomic_inc(&sbi->s_bal_breaks);
53666+ atomic_inc_unchecked(&sbi->s_bal_breaks);
53667 }
53668
53669 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
53670@@ -3559,7 +3559,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
53671 trace_ext4_mb_new_inode_pa(ac, pa);
53672
53673 ext4_mb_use_inode_pa(ac, pa);
53674- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
53675+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
53676
53677 ei = EXT4_I(ac->ac_inode);
53678 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
53679@@ -3619,7 +3619,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
53680 trace_ext4_mb_new_group_pa(ac, pa);
53681
53682 ext4_mb_use_group_pa(ac, pa);
53683- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
53684+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
53685
53686 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
53687 lg = ac->ac_lg;
53688@@ -3708,7 +3708,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
53689 * from the bitmap and continue.
53690 */
53691 }
53692- atomic_add(free, &sbi->s_mb_discarded);
53693+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
53694
53695 return err;
53696 }
53697@@ -3726,7 +3726,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
53698 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
53699 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
53700 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
53701- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
53702+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
53703 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
53704
53705 return 0;
53706diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
53707index 214461e..3614c89 100644
53708--- a/fs/ext4/mmp.c
53709+++ b/fs/ext4/mmp.c
53710@@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
53711 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
53712 const char *function, unsigned int line, const char *msg)
53713 {
53714- __ext4_warning(sb, function, line, msg);
53715+ __ext4_warning(sb, function, line, "%s", msg);
53716 __ext4_warning(sb, function, line,
53717 "MMP failure info: last update time: %llu, last update "
53718 "node: %s, last update device: %s\n",
53719diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
53720index 49d3c01..9579efd 100644
53721--- a/fs/ext4/resize.c
53722+++ b/fs/ext4/resize.c
53723@@ -79,12 +79,20 @@ static int verify_group_input(struct super_block *sb,
53724 ext4_fsblk_t end = start + input->blocks_count;
53725 ext4_group_t group = input->group;
53726 ext4_fsblk_t itend = input->inode_table + sbi->s_itb_per_group;
53727- unsigned overhead = ext4_group_overhead_blocks(sb, group);
53728- ext4_fsblk_t metaend = start + overhead;
53729+ unsigned overhead;
53730+ ext4_fsblk_t metaend;
53731 struct buffer_head *bh = NULL;
53732 ext4_grpblk_t free_blocks_count, offset;
53733 int err = -EINVAL;
53734
53735+ if (group != sbi->s_groups_count) {
53736+ ext4_warning(sb, "Cannot add at group %u (only %u groups)",
53737+ input->group, sbi->s_groups_count);
53738+ return -EINVAL;
53739+ }
53740+
53741+ overhead = ext4_group_overhead_blocks(sb, group);
53742+ metaend = start + overhead;
53743 input->free_blocks_count = free_blocks_count =
53744 input->blocks_count - 2 - overhead - sbi->s_itb_per_group;
53745
53746@@ -96,10 +104,7 @@ static int verify_group_input(struct super_block *sb,
53747 free_blocks_count, input->reserved_blocks);
53748
53749 ext4_get_group_no_and_offset(sb, start, NULL, &offset);
53750- if (group != sbi->s_groups_count)
53751- ext4_warning(sb, "Cannot add at group %u (only %u groups)",
53752- input->group, sbi->s_groups_count);
53753- else if (offset != 0)
53754+ if (offset != 0)
53755 ext4_warning(sb, "Last group not full");
53756 else if (input->reserved_blocks > input->blocks_count / 5)
53757 ext4_warning(sb, "Reserved blocks too high (%u)",
53758diff --git a/fs/ext4/super.c b/fs/ext4/super.c
53759index 3f7c39e..227f24f 100644
53760--- a/fs/ext4/super.c
53761+++ b/fs/ext4/super.c
53762@@ -1236,7 +1236,7 @@ static ext4_fsblk_t get_sb_block(void **data)
53763 }
53764
53765 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
53766-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
53767+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
53768 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
53769
53770 #ifdef CONFIG_QUOTA
53771@@ -2372,7 +2372,7 @@ struct ext4_attr {
53772 ssize_t (*store)(struct ext4_attr *, struct ext4_sb_info *,
53773 const char *, size_t);
53774 int offset;
53775-};
53776+} __do_const;
53777
53778 static int parse_strtoull(const char *buf,
53779 unsigned long long max, unsigned long long *value)
53780diff --git a/fs/fcntl.c b/fs/fcntl.c
53781index 6599222..e7bf0de 100644
53782--- a/fs/fcntl.c
53783+++ b/fs/fcntl.c
53784@@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
53785 if (err)
53786 return err;
53787
53788+ if (gr_handle_chroot_fowner(pid, type))
53789+ return -ENOENT;
53790+ if (gr_check_protected_task_fowner(pid, type))
53791+ return -EACCES;
53792+
53793 f_modown(filp, pid, type, force);
53794 return 0;
53795 }
53796diff --git a/fs/fhandle.c b/fs/fhandle.c
53797index 999ff5c..41f4109 100644
53798--- a/fs/fhandle.c
53799+++ b/fs/fhandle.c
53800@@ -67,8 +67,7 @@ static long do_sys_name_to_handle(struct path *path,
53801 } else
53802 retval = 0;
53803 /* copy the mount id */
53804- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
53805- sizeof(*mnt_id)) ||
53806+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
53807 copy_to_user(ufh, handle,
53808 sizeof(struct file_handle) + handle_bytes))
53809 retval = -EFAULT;
53810diff --git a/fs/file.c b/fs/file.c
53811index 4a78f98..9447397 100644
53812--- a/fs/file.c
53813+++ b/fs/file.c
53814@@ -16,6 +16,7 @@
53815 #include <linux/slab.h>
53816 #include <linux/vmalloc.h>
53817 #include <linux/file.h>
53818+#include <linux/security.h>
53819 #include <linux/fdtable.h>
53820 #include <linux/bitops.h>
53821 #include <linux/interrupt.h>
53822@@ -828,6 +829,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
53823 if (!file)
53824 return __close_fd(files, fd);
53825
53826+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
53827 if (fd >= rlimit(RLIMIT_NOFILE))
53828 return -EBADF;
53829
53830@@ -854,6 +856,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
53831 if (unlikely(oldfd == newfd))
53832 return -EINVAL;
53833
53834+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
53835 if (newfd >= rlimit(RLIMIT_NOFILE))
53836 return -EBADF;
53837
53838@@ -909,6 +912,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
53839 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
53840 {
53841 int err;
53842+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
53843 if (from >= rlimit(RLIMIT_NOFILE))
53844 return -EINVAL;
53845 err = alloc_fd(from, flags);
53846diff --git a/fs/filesystems.c b/fs/filesystems.c
53847index 92567d9..fcd8cbf 100644
53848--- a/fs/filesystems.c
53849+++ b/fs/filesystems.c
53850@@ -273,7 +273,11 @@ struct file_system_type *get_fs_type(const char *name)
53851 int len = dot ? dot - name : strlen(name);
53852
53853 fs = __get_fs_type(name, len);
53854+#ifdef CONFIG_GRKERNSEC_MODHARDEN
53855+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
53856+#else
53857 if (!fs && (request_module("fs-%.*s", len, name) == 0))
53858+#endif
53859 fs = __get_fs_type(name, len);
53860
53861 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
53862diff --git a/fs/fs_struct.c b/fs/fs_struct.c
53863index d8ac61d..79a36f0 100644
53864--- a/fs/fs_struct.c
53865+++ b/fs/fs_struct.c
53866@@ -4,6 +4,7 @@
53867 #include <linux/path.h>
53868 #include <linux/slab.h>
53869 #include <linux/fs_struct.h>
53870+#include <linux/grsecurity.h>
53871 #include "internal.h"
53872
53873 /*
53874@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
53875 write_seqcount_begin(&fs->seq);
53876 old_root = fs->root;
53877 fs->root = *path;
53878+ gr_set_chroot_entries(current, path);
53879 write_seqcount_end(&fs->seq);
53880 spin_unlock(&fs->lock);
53881 if (old_root.dentry)
53882@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
53883 int hits = 0;
53884 spin_lock(&fs->lock);
53885 write_seqcount_begin(&fs->seq);
53886+ /* this root replacement is only done by pivot_root,
53887+ leave grsec's chroot tagging alone for this task
53888+ so that a pivoted root isn't treated as a chroot
53889+ */
53890 hits += replace_path(&fs->root, old_root, new_root);
53891 hits += replace_path(&fs->pwd, old_root, new_root);
53892 write_seqcount_end(&fs->seq);
53893@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
53894 task_lock(tsk);
53895 spin_lock(&fs->lock);
53896 tsk->fs = NULL;
53897- kill = !--fs->users;
53898+ gr_clear_chroot_entries(tsk);
53899+ kill = !atomic_dec_return(&fs->users);
53900 spin_unlock(&fs->lock);
53901 task_unlock(tsk);
53902 if (kill)
53903@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
53904 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
53905 /* We don't need to lock fs - think why ;-) */
53906 if (fs) {
53907- fs->users = 1;
53908+ atomic_set(&fs->users, 1);
53909 fs->in_exec = 0;
53910 spin_lock_init(&fs->lock);
53911 seqcount_init(&fs->seq);
53912@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
53913 spin_lock(&old->lock);
53914 fs->root = old->root;
53915 path_get(&fs->root);
53916+ /* instead of calling gr_set_chroot_entries here,
53917+ we call it from every caller of this function
53918+ */
53919 fs->pwd = old->pwd;
53920 path_get(&fs->pwd);
53921 spin_unlock(&old->lock);
53922@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
53923
53924 task_lock(current);
53925 spin_lock(&fs->lock);
53926- kill = !--fs->users;
53927+ kill = !atomic_dec_return(&fs->users);
53928 current->fs = new_fs;
53929+ gr_set_chroot_entries(current, &new_fs->root);
53930 spin_unlock(&fs->lock);
53931 task_unlock(current);
53932
53933@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
53934
53935 int current_umask(void)
53936 {
53937- return current->fs->umask;
53938+ return current->fs->umask | gr_acl_umask();
53939 }
53940 EXPORT_SYMBOL(current_umask);
53941
53942 /* to be mentioned only in INIT_TASK */
53943 struct fs_struct init_fs = {
53944- .users = 1,
53945+ .users = ATOMIC_INIT(1),
53946 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
53947 .seq = SEQCNT_ZERO,
53948 .umask = 0022,
53949diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
53950index e2cba1f..17a25bb 100644
53951--- a/fs/fscache/cookie.c
53952+++ b/fs/fscache/cookie.c
53953@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
53954 parent ? (char *) parent->def->name : "<no-parent>",
53955 def->name, netfs_data);
53956
53957- fscache_stat(&fscache_n_acquires);
53958+ fscache_stat_unchecked(&fscache_n_acquires);
53959
53960 /* if there's no parent cookie, then we don't create one here either */
53961 if (!parent) {
53962- fscache_stat(&fscache_n_acquires_null);
53963+ fscache_stat_unchecked(&fscache_n_acquires_null);
53964 _leave(" [no parent]");
53965 return NULL;
53966 }
53967@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
53968 /* allocate and initialise a cookie */
53969 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
53970 if (!cookie) {
53971- fscache_stat(&fscache_n_acquires_oom);
53972+ fscache_stat_unchecked(&fscache_n_acquires_oom);
53973 _leave(" [ENOMEM]");
53974 return NULL;
53975 }
53976@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
53977
53978 switch (cookie->def->type) {
53979 case FSCACHE_COOKIE_TYPE_INDEX:
53980- fscache_stat(&fscache_n_cookie_index);
53981+ fscache_stat_unchecked(&fscache_n_cookie_index);
53982 break;
53983 case FSCACHE_COOKIE_TYPE_DATAFILE:
53984- fscache_stat(&fscache_n_cookie_data);
53985+ fscache_stat_unchecked(&fscache_n_cookie_data);
53986 break;
53987 default:
53988- fscache_stat(&fscache_n_cookie_special);
53989+ fscache_stat_unchecked(&fscache_n_cookie_special);
53990 break;
53991 }
53992
53993@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
53994 if (fscache_acquire_non_index_cookie(cookie) < 0) {
53995 atomic_dec(&parent->n_children);
53996 __fscache_cookie_put(cookie);
53997- fscache_stat(&fscache_n_acquires_nobufs);
53998+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
53999 _leave(" = NULL");
54000 return NULL;
54001 }
54002 }
54003
54004- fscache_stat(&fscache_n_acquires_ok);
54005+ fscache_stat_unchecked(&fscache_n_acquires_ok);
54006 _leave(" = %p", cookie);
54007 return cookie;
54008 }
54009@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
54010 cache = fscache_select_cache_for_object(cookie->parent);
54011 if (!cache) {
54012 up_read(&fscache_addremove_sem);
54013- fscache_stat(&fscache_n_acquires_no_cache);
54014+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
54015 _leave(" = -ENOMEDIUM [no cache]");
54016 return -ENOMEDIUM;
54017 }
54018@@ -255,12 +255,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
54019 object = cache->ops->alloc_object(cache, cookie);
54020 fscache_stat_d(&fscache_n_cop_alloc_object);
54021 if (IS_ERR(object)) {
54022- fscache_stat(&fscache_n_object_no_alloc);
54023+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
54024 ret = PTR_ERR(object);
54025 goto error;
54026 }
54027
54028- fscache_stat(&fscache_n_object_alloc);
54029+ fscache_stat_unchecked(&fscache_n_object_alloc);
54030
54031 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
54032
54033@@ -376,7 +376,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
54034
54035 _enter("{%s}", cookie->def->name);
54036
54037- fscache_stat(&fscache_n_invalidates);
54038+ fscache_stat_unchecked(&fscache_n_invalidates);
54039
54040 /* Only permit invalidation of data files. Invalidating an index will
54041 * require the caller to release all its attachments to the tree rooted
54042@@ -434,10 +434,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
54043 {
54044 struct fscache_object *object;
54045
54046- fscache_stat(&fscache_n_updates);
54047+ fscache_stat_unchecked(&fscache_n_updates);
54048
54049 if (!cookie) {
54050- fscache_stat(&fscache_n_updates_null);
54051+ fscache_stat_unchecked(&fscache_n_updates_null);
54052 _leave(" [no cookie]");
54053 return;
54054 }
54055@@ -471,12 +471,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
54056 struct fscache_object *object;
54057 unsigned long event;
54058
54059- fscache_stat(&fscache_n_relinquishes);
54060+ fscache_stat_unchecked(&fscache_n_relinquishes);
54061 if (retire)
54062- fscache_stat(&fscache_n_relinquishes_retire);
54063+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
54064
54065 if (!cookie) {
54066- fscache_stat(&fscache_n_relinquishes_null);
54067+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
54068 _leave(" [no cookie]");
54069 return;
54070 }
54071@@ -492,7 +492,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
54072
54073 /* wait for the cookie to finish being instantiated (or to fail) */
54074 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
54075- fscache_stat(&fscache_n_relinquishes_waitcrt);
54076+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
54077 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
54078 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
54079 }
54080diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
54081index ee38fef..0a326d4 100644
54082--- a/fs/fscache/internal.h
54083+++ b/fs/fscache/internal.h
54084@@ -148,101 +148,101 @@ extern void fscache_proc_cleanup(void);
54085 * stats.c
54086 */
54087 #ifdef CONFIG_FSCACHE_STATS
54088-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
54089-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
54090+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
54091+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
54092
54093-extern atomic_t fscache_n_op_pend;
54094-extern atomic_t fscache_n_op_run;
54095-extern atomic_t fscache_n_op_enqueue;
54096-extern atomic_t fscache_n_op_deferred_release;
54097-extern atomic_t fscache_n_op_release;
54098-extern atomic_t fscache_n_op_gc;
54099-extern atomic_t fscache_n_op_cancelled;
54100-extern atomic_t fscache_n_op_rejected;
54101+extern atomic_unchecked_t fscache_n_op_pend;
54102+extern atomic_unchecked_t fscache_n_op_run;
54103+extern atomic_unchecked_t fscache_n_op_enqueue;
54104+extern atomic_unchecked_t fscache_n_op_deferred_release;
54105+extern atomic_unchecked_t fscache_n_op_release;
54106+extern atomic_unchecked_t fscache_n_op_gc;
54107+extern atomic_unchecked_t fscache_n_op_cancelled;
54108+extern atomic_unchecked_t fscache_n_op_rejected;
54109
54110-extern atomic_t fscache_n_attr_changed;
54111-extern atomic_t fscache_n_attr_changed_ok;
54112-extern atomic_t fscache_n_attr_changed_nobufs;
54113-extern atomic_t fscache_n_attr_changed_nomem;
54114-extern atomic_t fscache_n_attr_changed_calls;
54115+extern atomic_unchecked_t fscache_n_attr_changed;
54116+extern atomic_unchecked_t fscache_n_attr_changed_ok;
54117+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
54118+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
54119+extern atomic_unchecked_t fscache_n_attr_changed_calls;
54120
54121-extern atomic_t fscache_n_allocs;
54122-extern atomic_t fscache_n_allocs_ok;
54123-extern atomic_t fscache_n_allocs_wait;
54124-extern atomic_t fscache_n_allocs_nobufs;
54125-extern atomic_t fscache_n_allocs_intr;
54126-extern atomic_t fscache_n_allocs_object_dead;
54127-extern atomic_t fscache_n_alloc_ops;
54128-extern atomic_t fscache_n_alloc_op_waits;
54129+extern atomic_unchecked_t fscache_n_allocs;
54130+extern atomic_unchecked_t fscache_n_allocs_ok;
54131+extern atomic_unchecked_t fscache_n_allocs_wait;
54132+extern atomic_unchecked_t fscache_n_allocs_nobufs;
54133+extern atomic_unchecked_t fscache_n_allocs_intr;
54134+extern atomic_unchecked_t fscache_n_allocs_object_dead;
54135+extern atomic_unchecked_t fscache_n_alloc_ops;
54136+extern atomic_unchecked_t fscache_n_alloc_op_waits;
54137
54138-extern atomic_t fscache_n_retrievals;
54139-extern atomic_t fscache_n_retrievals_ok;
54140-extern atomic_t fscache_n_retrievals_wait;
54141-extern atomic_t fscache_n_retrievals_nodata;
54142-extern atomic_t fscache_n_retrievals_nobufs;
54143-extern atomic_t fscache_n_retrievals_intr;
54144-extern atomic_t fscache_n_retrievals_nomem;
54145-extern atomic_t fscache_n_retrievals_object_dead;
54146-extern atomic_t fscache_n_retrieval_ops;
54147-extern atomic_t fscache_n_retrieval_op_waits;
54148+extern atomic_unchecked_t fscache_n_retrievals;
54149+extern atomic_unchecked_t fscache_n_retrievals_ok;
54150+extern atomic_unchecked_t fscache_n_retrievals_wait;
54151+extern atomic_unchecked_t fscache_n_retrievals_nodata;
54152+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
54153+extern atomic_unchecked_t fscache_n_retrievals_intr;
54154+extern atomic_unchecked_t fscache_n_retrievals_nomem;
54155+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
54156+extern atomic_unchecked_t fscache_n_retrieval_ops;
54157+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
54158
54159-extern atomic_t fscache_n_stores;
54160-extern atomic_t fscache_n_stores_ok;
54161-extern atomic_t fscache_n_stores_again;
54162-extern atomic_t fscache_n_stores_nobufs;
54163-extern atomic_t fscache_n_stores_oom;
54164-extern atomic_t fscache_n_store_ops;
54165-extern atomic_t fscache_n_store_calls;
54166-extern atomic_t fscache_n_store_pages;
54167-extern atomic_t fscache_n_store_radix_deletes;
54168-extern atomic_t fscache_n_store_pages_over_limit;
54169+extern atomic_unchecked_t fscache_n_stores;
54170+extern atomic_unchecked_t fscache_n_stores_ok;
54171+extern atomic_unchecked_t fscache_n_stores_again;
54172+extern atomic_unchecked_t fscache_n_stores_nobufs;
54173+extern atomic_unchecked_t fscache_n_stores_oom;
54174+extern atomic_unchecked_t fscache_n_store_ops;
54175+extern atomic_unchecked_t fscache_n_store_calls;
54176+extern atomic_unchecked_t fscache_n_store_pages;
54177+extern atomic_unchecked_t fscache_n_store_radix_deletes;
54178+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
54179
54180-extern atomic_t fscache_n_store_vmscan_not_storing;
54181-extern atomic_t fscache_n_store_vmscan_gone;
54182-extern atomic_t fscache_n_store_vmscan_busy;
54183-extern atomic_t fscache_n_store_vmscan_cancelled;
54184-extern atomic_t fscache_n_store_vmscan_wait;
54185+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
54186+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
54187+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
54188+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
54189+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
54190
54191-extern atomic_t fscache_n_marks;
54192-extern atomic_t fscache_n_uncaches;
54193+extern atomic_unchecked_t fscache_n_marks;
54194+extern atomic_unchecked_t fscache_n_uncaches;
54195
54196-extern atomic_t fscache_n_acquires;
54197-extern atomic_t fscache_n_acquires_null;
54198-extern atomic_t fscache_n_acquires_no_cache;
54199-extern atomic_t fscache_n_acquires_ok;
54200-extern atomic_t fscache_n_acquires_nobufs;
54201-extern atomic_t fscache_n_acquires_oom;
54202+extern atomic_unchecked_t fscache_n_acquires;
54203+extern atomic_unchecked_t fscache_n_acquires_null;
54204+extern atomic_unchecked_t fscache_n_acquires_no_cache;
54205+extern atomic_unchecked_t fscache_n_acquires_ok;
54206+extern atomic_unchecked_t fscache_n_acquires_nobufs;
54207+extern atomic_unchecked_t fscache_n_acquires_oom;
54208
54209-extern atomic_t fscache_n_invalidates;
54210-extern atomic_t fscache_n_invalidates_run;
54211+extern atomic_unchecked_t fscache_n_invalidates;
54212+extern atomic_unchecked_t fscache_n_invalidates_run;
54213
54214-extern atomic_t fscache_n_updates;
54215-extern atomic_t fscache_n_updates_null;
54216-extern atomic_t fscache_n_updates_run;
54217+extern atomic_unchecked_t fscache_n_updates;
54218+extern atomic_unchecked_t fscache_n_updates_null;
54219+extern atomic_unchecked_t fscache_n_updates_run;
54220
54221-extern atomic_t fscache_n_relinquishes;
54222-extern atomic_t fscache_n_relinquishes_null;
54223-extern atomic_t fscache_n_relinquishes_waitcrt;
54224-extern atomic_t fscache_n_relinquishes_retire;
54225+extern atomic_unchecked_t fscache_n_relinquishes;
54226+extern atomic_unchecked_t fscache_n_relinquishes_null;
54227+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
54228+extern atomic_unchecked_t fscache_n_relinquishes_retire;
54229
54230-extern atomic_t fscache_n_cookie_index;
54231-extern atomic_t fscache_n_cookie_data;
54232-extern atomic_t fscache_n_cookie_special;
54233+extern atomic_unchecked_t fscache_n_cookie_index;
54234+extern atomic_unchecked_t fscache_n_cookie_data;
54235+extern atomic_unchecked_t fscache_n_cookie_special;
54236
54237-extern atomic_t fscache_n_object_alloc;
54238-extern atomic_t fscache_n_object_no_alloc;
54239-extern atomic_t fscache_n_object_lookups;
54240-extern atomic_t fscache_n_object_lookups_negative;
54241-extern atomic_t fscache_n_object_lookups_positive;
54242-extern atomic_t fscache_n_object_lookups_timed_out;
54243-extern atomic_t fscache_n_object_created;
54244-extern atomic_t fscache_n_object_avail;
54245-extern atomic_t fscache_n_object_dead;
54246+extern atomic_unchecked_t fscache_n_object_alloc;
54247+extern atomic_unchecked_t fscache_n_object_no_alloc;
54248+extern atomic_unchecked_t fscache_n_object_lookups;
54249+extern atomic_unchecked_t fscache_n_object_lookups_negative;
54250+extern atomic_unchecked_t fscache_n_object_lookups_positive;
54251+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
54252+extern atomic_unchecked_t fscache_n_object_created;
54253+extern atomic_unchecked_t fscache_n_object_avail;
54254+extern atomic_unchecked_t fscache_n_object_dead;
54255
54256-extern atomic_t fscache_n_checkaux_none;
54257-extern atomic_t fscache_n_checkaux_okay;
54258-extern atomic_t fscache_n_checkaux_update;
54259-extern atomic_t fscache_n_checkaux_obsolete;
54260+extern atomic_unchecked_t fscache_n_checkaux_none;
54261+extern atomic_unchecked_t fscache_n_checkaux_okay;
54262+extern atomic_unchecked_t fscache_n_checkaux_update;
54263+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
54264
54265 extern atomic_t fscache_n_cop_alloc_object;
54266 extern atomic_t fscache_n_cop_lookup_object;
54267@@ -267,6 +267,11 @@ static inline void fscache_stat(atomic_t *stat)
54268 atomic_inc(stat);
54269 }
54270
54271+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
54272+{
54273+ atomic_inc_unchecked(stat);
54274+}
54275+
54276 static inline void fscache_stat_d(atomic_t *stat)
54277 {
54278 atomic_dec(stat);
54279@@ -279,6 +284,7 @@ extern const struct file_operations fscache_stats_fops;
54280
54281 #define __fscache_stat(stat) (NULL)
54282 #define fscache_stat(stat) do {} while (0)
54283+#define fscache_stat_unchecked(stat) do {} while (0)
54284 #define fscache_stat_d(stat) do {} while (0)
54285 #endif
54286
54287diff --git a/fs/fscache/object.c b/fs/fscache/object.c
54288index 50d41c1..10ee117 100644
54289--- a/fs/fscache/object.c
54290+++ b/fs/fscache/object.c
54291@@ -143,7 +143,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
54292 /* Invalidate an object on disk */
54293 case FSCACHE_OBJECT_INVALIDATING:
54294 clear_bit(FSCACHE_OBJECT_EV_INVALIDATE, &object->events);
54295- fscache_stat(&fscache_n_invalidates_run);
54296+ fscache_stat_unchecked(&fscache_n_invalidates_run);
54297 fscache_stat(&fscache_n_cop_invalidate_object);
54298 fscache_invalidate_object(object);
54299 fscache_stat_d(&fscache_n_cop_invalidate_object);
54300@@ -153,7 +153,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
54301 /* update the object metadata on disk */
54302 case FSCACHE_OBJECT_UPDATING:
54303 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
54304- fscache_stat(&fscache_n_updates_run);
54305+ fscache_stat_unchecked(&fscache_n_updates_run);
54306 fscache_stat(&fscache_n_cop_update_object);
54307 object->cache->ops->update_object(object);
54308 fscache_stat_d(&fscache_n_cop_update_object);
54309@@ -242,7 +242,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
54310 spin_lock(&object->lock);
54311 object->state = FSCACHE_OBJECT_DEAD;
54312 spin_unlock(&object->lock);
54313- fscache_stat(&fscache_n_object_dead);
54314+ fscache_stat_unchecked(&fscache_n_object_dead);
54315 goto terminal_transit;
54316
54317 /* handle the parent cache of this object being withdrawn from
54318@@ -257,7 +257,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
54319 spin_lock(&object->lock);
54320 object->state = FSCACHE_OBJECT_DEAD;
54321 spin_unlock(&object->lock);
54322- fscache_stat(&fscache_n_object_dead);
54323+ fscache_stat_unchecked(&fscache_n_object_dead);
54324 goto terminal_transit;
54325
54326 /* complain about the object being woken up once it is
54327@@ -495,7 +495,7 @@ static void fscache_lookup_object(struct fscache_object *object)
54328 parent->cookie->def->name, cookie->def->name,
54329 object->cache->tag->name);
54330
54331- fscache_stat(&fscache_n_object_lookups);
54332+ fscache_stat_unchecked(&fscache_n_object_lookups);
54333 fscache_stat(&fscache_n_cop_lookup_object);
54334 ret = object->cache->ops->lookup_object(object);
54335 fscache_stat_d(&fscache_n_cop_lookup_object);
54336@@ -506,7 +506,7 @@ static void fscache_lookup_object(struct fscache_object *object)
54337 if (ret == -ETIMEDOUT) {
54338 /* probably stuck behind another object, so move this one to
54339 * the back of the queue */
54340- fscache_stat(&fscache_n_object_lookups_timed_out);
54341+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
54342 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
54343 }
54344
54345@@ -529,7 +529,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
54346
54347 spin_lock(&object->lock);
54348 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
54349- fscache_stat(&fscache_n_object_lookups_negative);
54350+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
54351
54352 /* transit here to allow write requests to begin stacking up
54353 * and read requests to begin returning ENODATA */
54354@@ -575,7 +575,7 @@ void fscache_obtained_object(struct fscache_object *object)
54355 * result, in which case there may be data available */
54356 spin_lock(&object->lock);
54357 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
54358- fscache_stat(&fscache_n_object_lookups_positive);
54359+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
54360
54361 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
54362
54363@@ -589,7 +589,7 @@ void fscache_obtained_object(struct fscache_object *object)
54364 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
54365 } else {
54366 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
54367- fscache_stat(&fscache_n_object_created);
54368+ fscache_stat_unchecked(&fscache_n_object_created);
54369
54370 object->state = FSCACHE_OBJECT_AVAILABLE;
54371 spin_unlock(&object->lock);
54372@@ -634,7 +634,7 @@ static void fscache_object_available(struct fscache_object *object)
54373 fscache_enqueue_dependents(object);
54374
54375 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
54376- fscache_stat(&fscache_n_object_avail);
54377+ fscache_stat_unchecked(&fscache_n_object_avail);
54378
54379 _leave("");
54380 }
54381@@ -894,7 +894,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
54382 enum fscache_checkaux result;
54383
54384 if (!object->cookie->def->check_aux) {
54385- fscache_stat(&fscache_n_checkaux_none);
54386+ fscache_stat_unchecked(&fscache_n_checkaux_none);
54387 return FSCACHE_CHECKAUX_OKAY;
54388 }
54389
54390@@ -903,17 +903,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
54391 switch (result) {
54392 /* entry okay as is */
54393 case FSCACHE_CHECKAUX_OKAY:
54394- fscache_stat(&fscache_n_checkaux_okay);
54395+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
54396 break;
54397
54398 /* entry requires update */
54399 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
54400- fscache_stat(&fscache_n_checkaux_update);
54401+ fscache_stat_unchecked(&fscache_n_checkaux_update);
54402 break;
54403
54404 /* entry requires deletion */
54405 case FSCACHE_CHECKAUX_OBSOLETE:
54406- fscache_stat(&fscache_n_checkaux_obsolete);
54407+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
54408 break;
54409
54410 default:
54411diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
54412index 762a9ec..2023284 100644
54413--- a/fs/fscache/operation.c
54414+++ b/fs/fscache/operation.c
54415@@ -17,7 +17,7 @@
54416 #include <linux/slab.h>
54417 #include "internal.h"
54418
54419-atomic_t fscache_op_debug_id;
54420+atomic_unchecked_t fscache_op_debug_id;
54421 EXPORT_SYMBOL(fscache_op_debug_id);
54422
54423 /**
54424@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
54425 ASSERTCMP(atomic_read(&op->usage), >, 0);
54426 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
54427
54428- fscache_stat(&fscache_n_op_enqueue);
54429+ fscache_stat_unchecked(&fscache_n_op_enqueue);
54430 switch (op->flags & FSCACHE_OP_TYPE) {
54431 case FSCACHE_OP_ASYNC:
54432 _debug("queue async");
54433@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
54434 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
54435 if (op->processor)
54436 fscache_enqueue_operation(op);
54437- fscache_stat(&fscache_n_op_run);
54438+ fscache_stat_unchecked(&fscache_n_op_run);
54439 }
54440
54441 /*
54442@@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
54443 if (object->n_in_progress > 0) {
54444 atomic_inc(&op->usage);
54445 list_add_tail(&op->pend_link, &object->pending_ops);
54446- fscache_stat(&fscache_n_op_pend);
54447+ fscache_stat_unchecked(&fscache_n_op_pend);
54448 } else if (!list_empty(&object->pending_ops)) {
54449 atomic_inc(&op->usage);
54450 list_add_tail(&op->pend_link, &object->pending_ops);
54451- fscache_stat(&fscache_n_op_pend);
54452+ fscache_stat_unchecked(&fscache_n_op_pend);
54453 fscache_start_operations(object);
54454 } else {
54455 ASSERTCMP(object->n_in_progress, ==, 0);
54456@@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
54457 object->n_exclusive++; /* reads and writes must wait */
54458 atomic_inc(&op->usage);
54459 list_add_tail(&op->pend_link, &object->pending_ops);
54460- fscache_stat(&fscache_n_op_pend);
54461+ fscache_stat_unchecked(&fscache_n_op_pend);
54462 ret = 0;
54463 } else {
54464 /* If we're in any other state, there must have been an I/O
54465@@ -215,11 +215,11 @@ int fscache_submit_op(struct fscache_object *object,
54466 if (object->n_exclusive > 0) {
54467 atomic_inc(&op->usage);
54468 list_add_tail(&op->pend_link, &object->pending_ops);
54469- fscache_stat(&fscache_n_op_pend);
54470+ fscache_stat_unchecked(&fscache_n_op_pend);
54471 } else if (!list_empty(&object->pending_ops)) {
54472 atomic_inc(&op->usage);
54473 list_add_tail(&op->pend_link, &object->pending_ops);
54474- fscache_stat(&fscache_n_op_pend);
54475+ fscache_stat_unchecked(&fscache_n_op_pend);
54476 fscache_start_operations(object);
54477 } else {
54478 ASSERTCMP(object->n_exclusive, ==, 0);
54479@@ -231,12 +231,12 @@ int fscache_submit_op(struct fscache_object *object,
54480 object->n_ops++;
54481 atomic_inc(&op->usage);
54482 list_add_tail(&op->pend_link, &object->pending_ops);
54483- fscache_stat(&fscache_n_op_pend);
54484+ fscache_stat_unchecked(&fscache_n_op_pend);
54485 ret = 0;
54486 } else if (object->state == FSCACHE_OBJECT_DYING ||
54487 object->state == FSCACHE_OBJECT_LC_DYING ||
54488 object->state == FSCACHE_OBJECT_WITHDRAWING) {
54489- fscache_stat(&fscache_n_op_rejected);
54490+ fscache_stat_unchecked(&fscache_n_op_rejected);
54491 op->state = FSCACHE_OP_ST_CANCELLED;
54492 ret = -ENOBUFS;
54493 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
54494@@ -315,7 +315,7 @@ int fscache_cancel_op(struct fscache_operation *op,
54495 ret = -EBUSY;
54496 if (op->state == FSCACHE_OP_ST_PENDING) {
54497 ASSERT(!list_empty(&op->pend_link));
54498- fscache_stat(&fscache_n_op_cancelled);
54499+ fscache_stat_unchecked(&fscache_n_op_cancelled);
54500 list_del_init(&op->pend_link);
54501 if (do_cancel)
54502 do_cancel(op);
54503@@ -347,7 +347,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
54504 while (!list_empty(&object->pending_ops)) {
54505 op = list_entry(object->pending_ops.next,
54506 struct fscache_operation, pend_link);
54507- fscache_stat(&fscache_n_op_cancelled);
54508+ fscache_stat_unchecked(&fscache_n_op_cancelled);
54509 list_del_init(&op->pend_link);
54510
54511 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
54512@@ -419,7 +419,7 @@ void fscache_put_operation(struct fscache_operation *op)
54513 op->state, ==, FSCACHE_OP_ST_CANCELLED);
54514 op->state = FSCACHE_OP_ST_DEAD;
54515
54516- fscache_stat(&fscache_n_op_release);
54517+ fscache_stat_unchecked(&fscache_n_op_release);
54518
54519 if (op->release) {
54520 op->release(op);
54521@@ -442,7 +442,7 @@ void fscache_put_operation(struct fscache_operation *op)
54522 * lock, and defer it otherwise */
54523 if (!spin_trylock(&object->lock)) {
54524 _debug("defer put");
54525- fscache_stat(&fscache_n_op_deferred_release);
54526+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
54527
54528 cache = object->cache;
54529 spin_lock(&cache->op_gc_list_lock);
54530@@ -495,7 +495,7 @@ void fscache_operation_gc(struct work_struct *work)
54531
54532 _debug("GC DEFERRED REL OBJ%x OP%x",
54533 object->debug_id, op->debug_id);
54534- fscache_stat(&fscache_n_op_gc);
54535+ fscache_stat_unchecked(&fscache_n_op_gc);
54536
54537 ASSERTCMP(atomic_read(&op->usage), ==, 0);
54538 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
54539diff --git a/fs/fscache/page.c b/fs/fscache/page.c
54540index ff000e5..c44ec6d 100644
54541--- a/fs/fscache/page.c
54542+++ b/fs/fscache/page.c
54543@@ -61,7 +61,7 @@ try_again:
54544 val = radix_tree_lookup(&cookie->stores, page->index);
54545 if (!val) {
54546 rcu_read_unlock();
54547- fscache_stat(&fscache_n_store_vmscan_not_storing);
54548+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
54549 __fscache_uncache_page(cookie, page);
54550 return true;
54551 }
54552@@ -91,11 +91,11 @@ try_again:
54553 spin_unlock(&cookie->stores_lock);
54554
54555 if (xpage) {
54556- fscache_stat(&fscache_n_store_vmscan_cancelled);
54557- fscache_stat(&fscache_n_store_radix_deletes);
54558+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
54559+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
54560 ASSERTCMP(xpage, ==, page);
54561 } else {
54562- fscache_stat(&fscache_n_store_vmscan_gone);
54563+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
54564 }
54565
54566 wake_up_bit(&cookie->flags, 0);
54567@@ -110,11 +110,11 @@ page_busy:
54568 * sleeping on memory allocation, so we may need to impose a timeout
54569 * too. */
54570 if (!(gfp & __GFP_WAIT)) {
54571- fscache_stat(&fscache_n_store_vmscan_busy);
54572+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
54573 return false;
54574 }
54575
54576- fscache_stat(&fscache_n_store_vmscan_wait);
54577+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
54578 __fscache_wait_on_page_write(cookie, page);
54579 gfp &= ~__GFP_WAIT;
54580 goto try_again;
54581@@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
54582 FSCACHE_COOKIE_STORING_TAG);
54583 if (!radix_tree_tag_get(&cookie->stores, page->index,
54584 FSCACHE_COOKIE_PENDING_TAG)) {
54585- fscache_stat(&fscache_n_store_radix_deletes);
54586+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
54587 xpage = radix_tree_delete(&cookie->stores, page->index);
54588 }
54589 spin_unlock(&cookie->stores_lock);
54590@@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
54591
54592 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
54593
54594- fscache_stat(&fscache_n_attr_changed_calls);
54595+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
54596
54597 if (fscache_object_is_active(object)) {
54598 fscache_stat(&fscache_n_cop_attr_changed);
54599@@ -187,11 +187,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
54600
54601 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
54602
54603- fscache_stat(&fscache_n_attr_changed);
54604+ fscache_stat_unchecked(&fscache_n_attr_changed);
54605
54606 op = kzalloc(sizeof(*op), GFP_KERNEL);
54607 if (!op) {
54608- fscache_stat(&fscache_n_attr_changed_nomem);
54609+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
54610 _leave(" = -ENOMEM");
54611 return -ENOMEM;
54612 }
54613@@ -209,7 +209,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
54614 if (fscache_submit_exclusive_op(object, op) < 0)
54615 goto nobufs;
54616 spin_unlock(&cookie->lock);
54617- fscache_stat(&fscache_n_attr_changed_ok);
54618+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
54619 fscache_put_operation(op);
54620 _leave(" = 0");
54621 return 0;
54622@@ -217,7 +217,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
54623 nobufs:
54624 spin_unlock(&cookie->lock);
54625 kfree(op);
54626- fscache_stat(&fscache_n_attr_changed_nobufs);
54627+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
54628 _leave(" = %d", -ENOBUFS);
54629 return -ENOBUFS;
54630 }
54631@@ -255,7 +255,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
54632 /* allocate a retrieval operation and attempt to submit it */
54633 op = kzalloc(sizeof(*op), GFP_NOIO);
54634 if (!op) {
54635- fscache_stat(&fscache_n_retrievals_nomem);
54636+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
54637 return NULL;
54638 }
54639
54640@@ -283,13 +283,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
54641 return 0;
54642 }
54643
54644- fscache_stat(&fscache_n_retrievals_wait);
54645+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
54646
54647 jif = jiffies;
54648 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
54649 fscache_wait_bit_interruptible,
54650 TASK_INTERRUPTIBLE) != 0) {
54651- fscache_stat(&fscache_n_retrievals_intr);
54652+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
54653 _leave(" = -ERESTARTSYS");
54654 return -ERESTARTSYS;
54655 }
54656@@ -318,8 +318,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
54657 */
54658 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
54659 struct fscache_retrieval *op,
54660- atomic_t *stat_op_waits,
54661- atomic_t *stat_object_dead)
54662+ atomic_unchecked_t *stat_op_waits,
54663+ atomic_unchecked_t *stat_object_dead)
54664 {
54665 int ret;
54666
54667@@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
54668 goto check_if_dead;
54669
54670 _debug(">>> WT");
54671- fscache_stat(stat_op_waits);
54672+ fscache_stat_unchecked(stat_op_waits);
54673 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
54674 fscache_wait_bit_interruptible,
54675 TASK_INTERRUPTIBLE) != 0) {
54676@@ -344,14 +344,14 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
54677
54678 check_if_dead:
54679 if (op->op.state == FSCACHE_OP_ST_CANCELLED) {
54680- fscache_stat(stat_object_dead);
54681+ fscache_stat_unchecked(stat_object_dead);
54682 _leave(" = -ENOBUFS [cancelled]");
54683 return -ENOBUFS;
54684 }
54685 if (unlikely(fscache_object_is_dead(object))) {
54686 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->op.state);
54687 fscache_cancel_op(&op->op, fscache_do_cancel_retrieval);
54688- fscache_stat(stat_object_dead);
54689+ fscache_stat_unchecked(stat_object_dead);
54690 return -ENOBUFS;
54691 }
54692 return 0;
54693@@ -378,7 +378,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
54694
54695 _enter("%p,%p,,,", cookie, page);
54696
54697- fscache_stat(&fscache_n_retrievals);
54698+ fscache_stat_unchecked(&fscache_n_retrievals);
54699
54700 if (hlist_empty(&cookie->backing_objects))
54701 goto nobufs;
54702@@ -417,7 +417,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
54703 goto nobufs_unlock_dec;
54704 spin_unlock(&cookie->lock);
54705
54706- fscache_stat(&fscache_n_retrieval_ops);
54707+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
54708
54709 /* pin the netfs read context in case we need to do the actual netfs
54710 * read because we've encountered a cache read failure */
54711@@ -447,15 +447,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
54712
54713 error:
54714 if (ret == -ENOMEM)
54715- fscache_stat(&fscache_n_retrievals_nomem);
54716+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
54717 else if (ret == -ERESTARTSYS)
54718- fscache_stat(&fscache_n_retrievals_intr);
54719+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
54720 else if (ret == -ENODATA)
54721- fscache_stat(&fscache_n_retrievals_nodata);
54722+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
54723 else if (ret < 0)
54724- fscache_stat(&fscache_n_retrievals_nobufs);
54725+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
54726 else
54727- fscache_stat(&fscache_n_retrievals_ok);
54728+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
54729
54730 fscache_put_retrieval(op);
54731 _leave(" = %d", ret);
54732@@ -467,7 +467,7 @@ nobufs_unlock:
54733 spin_unlock(&cookie->lock);
54734 kfree(op);
54735 nobufs:
54736- fscache_stat(&fscache_n_retrievals_nobufs);
54737+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
54738 _leave(" = -ENOBUFS");
54739 return -ENOBUFS;
54740 }
54741@@ -505,7 +505,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
54742
54743 _enter("%p,,%d,,,", cookie, *nr_pages);
54744
54745- fscache_stat(&fscache_n_retrievals);
54746+ fscache_stat_unchecked(&fscache_n_retrievals);
54747
54748 if (hlist_empty(&cookie->backing_objects))
54749 goto nobufs;
54750@@ -541,7 +541,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
54751 goto nobufs_unlock_dec;
54752 spin_unlock(&cookie->lock);
54753
54754- fscache_stat(&fscache_n_retrieval_ops);
54755+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
54756
54757 /* pin the netfs read context in case we need to do the actual netfs
54758 * read because we've encountered a cache read failure */
54759@@ -571,15 +571,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
54760
54761 error:
54762 if (ret == -ENOMEM)
54763- fscache_stat(&fscache_n_retrievals_nomem);
54764+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
54765 else if (ret == -ERESTARTSYS)
54766- fscache_stat(&fscache_n_retrievals_intr);
54767+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
54768 else if (ret == -ENODATA)
54769- fscache_stat(&fscache_n_retrievals_nodata);
54770+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
54771 else if (ret < 0)
54772- fscache_stat(&fscache_n_retrievals_nobufs);
54773+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
54774 else
54775- fscache_stat(&fscache_n_retrievals_ok);
54776+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
54777
54778 fscache_put_retrieval(op);
54779 _leave(" = %d", ret);
54780@@ -591,7 +591,7 @@ nobufs_unlock:
54781 spin_unlock(&cookie->lock);
54782 kfree(op);
54783 nobufs:
54784- fscache_stat(&fscache_n_retrievals_nobufs);
54785+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
54786 _leave(" = -ENOBUFS");
54787 return -ENOBUFS;
54788 }
54789@@ -615,7 +615,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
54790
54791 _enter("%p,%p,,,", cookie, page);
54792
54793- fscache_stat(&fscache_n_allocs);
54794+ fscache_stat_unchecked(&fscache_n_allocs);
54795
54796 if (hlist_empty(&cookie->backing_objects))
54797 goto nobufs;
54798@@ -647,7 +647,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
54799 goto nobufs_unlock;
54800 spin_unlock(&cookie->lock);
54801
54802- fscache_stat(&fscache_n_alloc_ops);
54803+ fscache_stat_unchecked(&fscache_n_alloc_ops);
54804
54805 ret = fscache_wait_for_retrieval_activation(
54806 object, op,
54807@@ -663,11 +663,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
54808
54809 error:
54810 if (ret == -ERESTARTSYS)
54811- fscache_stat(&fscache_n_allocs_intr);
54812+ fscache_stat_unchecked(&fscache_n_allocs_intr);
54813 else if (ret < 0)
54814- fscache_stat(&fscache_n_allocs_nobufs);
54815+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
54816 else
54817- fscache_stat(&fscache_n_allocs_ok);
54818+ fscache_stat_unchecked(&fscache_n_allocs_ok);
54819
54820 fscache_put_retrieval(op);
54821 _leave(" = %d", ret);
54822@@ -677,7 +677,7 @@ nobufs_unlock:
54823 spin_unlock(&cookie->lock);
54824 kfree(op);
54825 nobufs:
54826- fscache_stat(&fscache_n_allocs_nobufs);
54827+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
54828 _leave(" = -ENOBUFS");
54829 return -ENOBUFS;
54830 }
54831@@ -736,7 +736,7 @@ static void fscache_write_op(struct fscache_operation *_op)
54832
54833 spin_lock(&cookie->stores_lock);
54834
54835- fscache_stat(&fscache_n_store_calls);
54836+ fscache_stat_unchecked(&fscache_n_store_calls);
54837
54838 /* find a page to store */
54839 page = NULL;
54840@@ -747,7 +747,7 @@ static void fscache_write_op(struct fscache_operation *_op)
54841 page = results[0];
54842 _debug("gang %d [%lx]", n, page->index);
54843 if (page->index > op->store_limit) {
54844- fscache_stat(&fscache_n_store_pages_over_limit);
54845+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
54846 goto superseded;
54847 }
54848
54849@@ -759,7 +759,7 @@ static void fscache_write_op(struct fscache_operation *_op)
54850 spin_unlock(&cookie->stores_lock);
54851 spin_unlock(&object->lock);
54852
54853- fscache_stat(&fscache_n_store_pages);
54854+ fscache_stat_unchecked(&fscache_n_store_pages);
54855 fscache_stat(&fscache_n_cop_write_page);
54856 ret = object->cache->ops->write_page(op, page);
54857 fscache_stat_d(&fscache_n_cop_write_page);
54858@@ -860,7 +860,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
54859 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
54860 ASSERT(PageFsCache(page));
54861
54862- fscache_stat(&fscache_n_stores);
54863+ fscache_stat_unchecked(&fscache_n_stores);
54864
54865 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
54866 _leave(" = -ENOBUFS [invalidating]");
54867@@ -916,7 +916,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
54868 spin_unlock(&cookie->stores_lock);
54869 spin_unlock(&object->lock);
54870
54871- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
54872+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
54873 op->store_limit = object->store_limit;
54874
54875 if (fscache_submit_op(object, &op->op) < 0)
54876@@ -924,8 +924,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
54877
54878 spin_unlock(&cookie->lock);
54879 radix_tree_preload_end();
54880- fscache_stat(&fscache_n_store_ops);
54881- fscache_stat(&fscache_n_stores_ok);
54882+ fscache_stat_unchecked(&fscache_n_store_ops);
54883+ fscache_stat_unchecked(&fscache_n_stores_ok);
54884
54885 /* the work queue now carries its own ref on the object */
54886 fscache_put_operation(&op->op);
54887@@ -933,14 +933,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
54888 return 0;
54889
54890 already_queued:
54891- fscache_stat(&fscache_n_stores_again);
54892+ fscache_stat_unchecked(&fscache_n_stores_again);
54893 already_pending:
54894 spin_unlock(&cookie->stores_lock);
54895 spin_unlock(&object->lock);
54896 spin_unlock(&cookie->lock);
54897 radix_tree_preload_end();
54898 kfree(op);
54899- fscache_stat(&fscache_n_stores_ok);
54900+ fscache_stat_unchecked(&fscache_n_stores_ok);
54901 _leave(" = 0");
54902 return 0;
54903
54904@@ -959,14 +959,14 @@ nobufs:
54905 spin_unlock(&cookie->lock);
54906 radix_tree_preload_end();
54907 kfree(op);
54908- fscache_stat(&fscache_n_stores_nobufs);
54909+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
54910 _leave(" = -ENOBUFS");
54911 return -ENOBUFS;
54912
54913 nomem_free:
54914 kfree(op);
54915 nomem:
54916- fscache_stat(&fscache_n_stores_oom);
54917+ fscache_stat_unchecked(&fscache_n_stores_oom);
54918 _leave(" = -ENOMEM");
54919 return -ENOMEM;
54920 }
54921@@ -984,7 +984,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
54922 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
54923 ASSERTCMP(page, !=, NULL);
54924
54925- fscache_stat(&fscache_n_uncaches);
54926+ fscache_stat_unchecked(&fscache_n_uncaches);
54927
54928 /* cache withdrawal may beat us to it */
54929 if (!PageFsCache(page))
54930@@ -1035,7 +1035,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
54931 struct fscache_cookie *cookie = op->op.object->cookie;
54932
54933 #ifdef CONFIG_FSCACHE_STATS
54934- atomic_inc(&fscache_n_marks);
54935+ atomic_inc_unchecked(&fscache_n_marks);
54936 #endif
54937
54938 _debug("- mark %p{%lx}", page, page->index);
54939diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
54940index 40d13c7..ddf52b9 100644
54941--- a/fs/fscache/stats.c
54942+++ b/fs/fscache/stats.c
54943@@ -18,99 +18,99 @@
54944 /*
54945 * operation counters
54946 */
54947-atomic_t fscache_n_op_pend;
54948-atomic_t fscache_n_op_run;
54949-atomic_t fscache_n_op_enqueue;
54950-atomic_t fscache_n_op_requeue;
54951-atomic_t fscache_n_op_deferred_release;
54952-atomic_t fscache_n_op_release;
54953-atomic_t fscache_n_op_gc;
54954-atomic_t fscache_n_op_cancelled;
54955-atomic_t fscache_n_op_rejected;
54956+atomic_unchecked_t fscache_n_op_pend;
54957+atomic_unchecked_t fscache_n_op_run;
54958+atomic_unchecked_t fscache_n_op_enqueue;
54959+atomic_unchecked_t fscache_n_op_requeue;
54960+atomic_unchecked_t fscache_n_op_deferred_release;
54961+atomic_unchecked_t fscache_n_op_release;
54962+atomic_unchecked_t fscache_n_op_gc;
54963+atomic_unchecked_t fscache_n_op_cancelled;
54964+atomic_unchecked_t fscache_n_op_rejected;
54965
54966-atomic_t fscache_n_attr_changed;
54967-atomic_t fscache_n_attr_changed_ok;
54968-atomic_t fscache_n_attr_changed_nobufs;
54969-atomic_t fscache_n_attr_changed_nomem;
54970-atomic_t fscache_n_attr_changed_calls;
54971+atomic_unchecked_t fscache_n_attr_changed;
54972+atomic_unchecked_t fscache_n_attr_changed_ok;
54973+atomic_unchecked_t fscache_n_attr_changed_nobufs;
54974+atomic_unchecked_t fscache_n_attr_changed_nomem;
54975+atomic_unchecked_t fscache_n_attr_changed_calls;
54976
54977-atomic_t fscache_n_allocs;
54978-atomic_t fscache_n_allocs_ok;
54979-atomic_t fscache_n_allocs_wait;
54980-atomic_t fscache_n_allocs_nobufs;
54981-atomic_t fscache_n_allocs_intr;
54982-atomic_t fscache_n_allocs_object_dead;
54983-atomic_t fscache_n_alloc_ops;
54984-atomic_t fscache_n_alloc_op_waits;
54985+atomic_unchecked_t fscache_n_allocs;
54986+atomic_unchecked_t fscache_n_allocs_ok;
54987+atomic_unchecked_t fscache_n_allocs_wait;
54988+atomic_unchecked_t fscache_n_allocs_nobufs;
54989+atomic_unchecked_t fscache_n_allocs_intr;
54990+atomic_unchecked_t fscache_n_allocs_object_dead;
54991+atomic_unchecked_t fscache_n_alloc_ops;
54992+atomic_unchecked_t fscache_n_alloc_op_waits;
54993
54994-atomic_t fscache_n_retrievals;
54995-atomic_t fscache_n_retrievals_ok;
54996-atomic_t fscache_n_retrievals_wait;
54997-atomic_t fscache_n_retrievals_nodata;
54998-atomic_t fscache_n_retrievals_nobufs;
54999-atomic_t fscache_n_retrievals_intr;
55000-atomic_t fscache_n_retrievals_nomem;
55001-atomic_t fscache_n_retrievals_object_dead;
55002-atomic_t fscache_n_retrieval_ops;
55003-atomic_t fscache_n_retrieval_op_waits;
55004+atomic_unchecked_t fscache_n_retrievals;
55005+atomic_unchecked_t fscache_n_retrievals_ok;
55006+atomic_unchecked_t fscache_n_retrievals_wait;
55007+atomic_unchecked_t fscache_n_retrievals_nodata;
55008+atomic_unchecked_t fscache_n_retrievals_nobufs;
55009+atomic_unchecked_t fscache_n_retrievals_intr;
55010+atomic_unchecked_t fscache_n_retrievals_nomem;
55011+atomic_unchecked_t fscache_n_retrievals_object_dead;
55012+atomic_unchecked_t fscache_n_retrieval_ops;
55013+atomic_unchecked_t fscache_n_retrieval_op_waits;
55014
55015-atomic_t fscache_n_stores;
55016-atomic_t fscache_n_stores_ok;
55017-atomic_t fscache_n_stores_again;
55018-atomic_t fscache_n_stores_nobufs;
55019-atomic_t fscache_n_stores_oom;
55020-atomic_t fscache_n_store_ops;
55021-atomic_t fscache_n_store_calls;
55022-atomic_t fscache_n_store_pages;
55023-atomic_t fscache_n_store_radix_deletes;
55024-atomic_t fscache_n_store_pages_over_limit;
55025+atomic_unchecked_t fscache_n_stores;
55026+atomic_unchecked_t fscache_n_stores_ok;
55027+atomic_unchecked_t fscache_n_stores_again;
55028+atomic_unchecked_t fscache_n_stores_nobufs;
55029+atomic_unchecked_t fscache_n_stores_oom;
55030+atomic_unchecked_t fscache_n_store_ops;
55031+atomic_unchecked_t fscache_n_store_calls;
55032+atomic_unchecked_t fscache_n_store_pages;
55033+atomic_unchecked_t fscache_n_store_radix_deletes;
55034+atomic_unchecked_t fscache_n_store_pages_over_limit;
55035
55036-atomic_t fscache_n_store_vmscan_not_storing;
55037-atomic_t fscache_n_store_vmscan_gone;
55038-atomic_t fscache_n_store_vmscan_busy;
55039-atomic_t fscache_n_store_vmscan_cancelled;
55040-atomic_t fscache_n_store_vmscan_wait;
55041+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
55042+atomic_unchecked_t fscache_n_store_vmscan_gone;
55043+atomic_unchecked_t fscache_n_store_vmscan_busy;
55044+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
55045+atomic_unchecked_t fscache_n_store_vmscan_wait;
55046
55047-atomic_t fscache_n_marks;
55048-atomic_t fscache_n_uncaches;
55049+atomic_unchecked_t fscache_n_marks;
55050+atomic_unchecked_t fscache_n_uncaches;
55051
55052-atomic_t fscache_n_acquires;
55053-atomic_t fscache_n_acquires_null;
55054-atomic_t fscache_n_acquires_no_cache;
55055-atomic_t fscache_n_acquires_ok;
55056-atomic_t fscache_n_acquires_nobufs;
55057-atomic_t fscache_n_acquires_oom;
55058+atomic_unchecked_t fscache_n_acquires;
55059+atomic_unchecked_t fscache_n_acquires_null;
55060+atomic_unchecked_t fscache_n_acquires_no_cache;
55061+atomic_unchecked_t fscache_n_acquires_ok;
55062+atomic_unchecked_t fscache_n_acquires_nobufs;
55063+atomic_unchecked_t fscache_n_acquires_oom;
55064
55065-atomic_t fscache_n_invalidates;
55066-atomic_t fscache_n_invalidates_run;
55067+atomic_unchecked_t fscache_n_invalidates;
55068+atomic_unchecked_t fscache_n_invalidates_run;
55069
55070-atomic_t fscache_n_updates;
55071-atomic_t fscache_n_updates_null;
55072-atomic_t fscache_n_updates_run;
55073+atomic_unchecked_t fscache_n_updates;
55074+atomic_unchecked_t fscache_n_updates_null;
55075+atomic_unchecked_t fscache_n_updates_run;
55076
55077-atomic_t fscache_n_relinquishes;
55078-atomic_t fscache_n_relinquishes_null;
55079-atomic_t fscache_n_relinquishes_waitcrt;
55080-atomic_t fscache_n_relinquishes_retire;
55081+atomic_unchecked_t fscache_n_relinquishes;
55082+atomic_unchecked_t fscache_n_relinquishes_null;
55083+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
55084+atomic_unchecked_t fscache_n_relinquishes_retire;
55085
55086-atomic_t fscache_n_cookie_index;
55087-atomic_t fscache_n_cookie_data;
55088-atomic_t fscache_n_cookie_special;
55089+atomic_unchecked_t fscache_n_cookie_index;
55090+atomic_unchecked_t fscache_n_cookie_data;
55091+atomic_unchecked_t fscache_n_cookie_special;
55092
55093-atomic_t fscache_n_object_alloc;
55094-atomic_t fscache_n_object_no_alloc;
55095-atomic_t fscache_n_object_lookups;
55096-atomic_t fscache_n_object_lookups_negative;
55097-atomic_t fscache_n_object_lookups_positive;
55098-atomic_t fscache_n_object_lookups_timed_out;
55099-atomic_t fscache_n_object_created;
55100-atomic_t fscache_n_object_avail;
55101-atomic_t fscache_n_object_dead;
55102+atomic_unchecked_t fscache_n_object_alloc;
55103+atomic_unchecked_t fscache_n_object_no_alloc;
55104+atomic_unchecked_t fscache_n_object_lookups;
55105+atomic_unchecked_t fscache_n_object_lookups_negative;
55106+atomic_unchecked_t fscache_n_object_lookups_positive;
55107+atomic_unchecked_t fscache_n_object_lookups_timed_out;
55108+atomic_unchecked_t fscache_n_object_created;
55109+atomic_unchecked_t fscache_n_object_avail;
55110+atomic_unchecked_t fscache_n_object_dead;
55111
55112-atomic_t fscache_n_checkaux_none;
55113-atomic_t fscache_n_checkaux_okay;
55114-atomic_t fscache_n_checkaux_update;
55115-atomic_t fscache_n_checkaux_obsolete;
55116+atomic_unchecked_t fscache_n_checkaux_none;
55117+atomic_unchecked_t fscache_n_checkaux_okay;
55118+atomic_unchecked_t fscache_n_checkaux_update;
55119+atomic_unchecked_t fscache_n_checkaux_obsolete;
55120
55121 atomic_t fscache_n_cop_alloc_object;
55122 atomic_t fscache_n_cop_lookup_object;
55123@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
55124 seq_puts(m, "FS-Cache statistics\n");
55125
55126 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
55127- atomic_read(&fscache_n_cookie_index),
55128- atomic_read(&fscache_n_cookie_data),
55129- atomic_read(&fscache_n_cookie_special));
55130+ atomic_read_unchecked(&fscache_n_cookie_index),
55131+ atomic_read_unchecked(&fscache_n_cookie_data),
55132+ atomic_read_unchecked(&fscache_n_cookie_special));
55133
55134 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
55135- atomic_read(&fscache_n_object_alloc),
55136- atomic_read(&fscache_n_object_no_alloc),
55137- atomic_read(&fscache_n_object_avail),
55138- atomic_read(&fscache_n_object_dead));
55139+ atomic_read_unchecked(&fscache_n_object_alloc),
55140+ atomic_read_unchecked(&fscache_n_object_no_alloc),
55141+ atomic_read_unchecked(&fscache_n_object_avail),
55142+ atomic_read_unchecked(&fscache_n_object_dead));
55143 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
55144- atomic_read(&fscache_n_checkaux_none),
55145- atomic_read(&fscache_n_checkaux_okay),
55146- atomic_read(&fscache_n_checkaux_update),
55147- atomic_read(&fscache_n_checkaux_obsolete));
55148+ atomic_read_unchecked(&fscache_n_checkaux_none),
55149+ atomic_read_unchecked(&fscache_n_checkaux_okay),
55150+ atomic_read_unchecked(&fscache_n_checkaux_update),
55151+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
55152
55153 seq_printf(m, "Pages : mrk=%u unc=%u\n",
55154- atomic_read(&fscache_n_marks),
55155- atomic_read(&fscache_n_uncaches));
55156+ atomic_read_unchecked(&fscache_n_marks),
55157+ atomic_read_unchecked(&fscache_n_uncaches));
55158
55159 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
55160 " oom=%u\n",
55161- atomic_read(&fscache_n_acquires),
55162- atomic_read(&fscache_n_acquires_null),
55163- atomic_read(&fscache_n_acquires_no_cache),
55164- atomic_read(&fscache_n_acquires_ok),
55165- atomic_read(&fscache_n_acquires_nobufs),
55166- atomic_read(&fscache_n_acquires_oom));
55167+ atomic_read_unchecked(&fscache_n_acquires),
55168+ atomic_read_unchecked(&fscache_n_acquires_null),
55169+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
55170+ atomic_read_unchecked(&fscache_n_acquires_ok),
55171+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
55172+ atomic_read_unchecked(&fscache_n_acquires_oom));
55173
55174 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
55175- atomic_read(&fscache_n_object_lookups),
55176- atomic_read(&fscache_n_object_lookups_negative),
55177- atomic_read(&fscache_n_object_lookups_positive),
55178- atomic_read(&fscache_n_object_created),
55179- atomic_read(&fscache_n_object_lookups_timed_out));
55180+ atomic_read_unchecked(&fscache_n_object_lookups),
55181+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
55182+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
55183+ atomic_read_unchecked(&fscache_n_object_created),
55184+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
55185
55186 seq_printf(m, "Invals : n=%u run=%u\n",
55187- atomic_read(&fscache_n_invalidates),
55188- atomic_read(&fscache_n_invalidates_run));
55189+ atomic_read_unchecked(&fscache_n_invalidates),
55190+ atomic_read_unchecked(&fscache_n_invalidates_run));
55191
55192 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
55193- atomic_read(&fscache_n_updates),
55194- atomic_read(&fscache_n_updates_null),
55195- atomic_read(&fscache_n_updates_run));
55196+ atomic_read_unchecked(&fscache_n_updates),
55197+ atomic_read_unchecked(&fscache_n_updates_null),
55198+ atomic_read_unchecked(&fscache_n_updates_run));
55199
55200 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
55201- atomic_read(&fscache_n_relinquishes),
55202- atomic_read(&fscache_n_relinquishes_null),
55203- atomic_read(&fscache_n_relinquishes_waitcrt),
55204- atomic_read(&fscache_n_relinquishes_retire));
55205+ atomic_read_unchecked(&fscache_n_relinquishes),
55206+ atomic_read_unchecked(&fscache_n_relinquishes_null),
55207+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
55208+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
55209
55210 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
55211- atomic_read(&fscache_n_attr_changed),
55212- atomic_read(&fscache_n_attr_changed_ok),
55213- atomic_read(&fscache_n_attr_changed_nobufs),
55214- atomic_read(&fscache_n_attr_changed_nomem),
55215- atomic_read(&fscache_n_attr_changed_calls));
55216+ atomic_read_unchecked(&fscache_n_attr_changed),
55217+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
55218+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
55219+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
55220+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
55221
55222 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
55223- atomic_read(&fscache_n_allocs),
55224- atomic_read(&fscache_n_allocs_ok),
55225- atomic_read(&fscache_n_allocs_wait),
55226- atomic_read(&fscache_n_allocs_nobufs),
55227- atomic_read(&fscache_n_allocs_intr));
55228+ atomic_read_unchecked(&fscache_n_allocs),
55229+ atomic_read_unchecked(&fscache_n_allocs_ok),
55230+ atomic_read_unchecked(&fscache_n_allocs_wait),
55231+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
55232+ atomic_read_unchecked(&fscache_n_allocs_intr));
55233 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
55234- atomic_read(&fscache_n_alloc_ops),
55235- atomic_read(&fscache_n_alloc_op_waits),
55236- atomic_read(&fscache_n_allocs_object_dead));
55237+ atomic_read_unchecked(&fscache_n_alloc_ops),
55238+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
55239+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
55240
55241 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
55242 " int=%u oom=%u\n",
55243- atomic_read(&fscache_n_retrievals),
55244- atomic_read(&fscache_n_retrievals_ok),
55245- atomic_read(&fscache_n_retrievals_wait),
55246- atomic_read(&fscache_n_retrievals_nodata),
55247- atomic_read(&fscache_n_retrievals_nobufs),
55248- atomic_read(&fscache_n_retrievals_intr),
55249- atomic_read(&fscache_n_retrievals_nomem));
55250+ atomic_read_unchecked(&fscache_n_retrievals),
55251+ atomic_read_unchecked(&fscache_n_retrievals_ok),
55252+ atomic_read_unchecked(&fscache_n_retrievals_wait),
55253+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
55254+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
55255+ atomic_read_unchecked(&fscache_n_retrievals_intr),
55256+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
55257 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
55258- atomic_read(&fscache_n_retrieval_ops),
55259- atomic_read(&fscache_n_retrieval_op_waits),
55260- atomic_read(&fscache_n_retrievals_object_dead));
55261+ atomic_read_unchecked(&fscache_n_retrieval_ops),
55262+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
55263+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
55264
55265 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
55266- atomic_read(&fscache_n_stores),
55267- atomic_read(&fscache_n_stores_ok),
55268- atomic_read(&fscache_n_stores_again),
55269- atomic_read(&fscache_n_stores_nobufs),
55270- atomic_read(&fscache_n_stores_oom));
55271+ atomic_read_unchecked(&fscache_n_stores),
55272+ atomic_read_unchecked(&fscache_n_stores_ok),
55273+ atomic_read_unchecked(&fscache_n_stores_again),
55274+ atomic_read_unchecked(&fscache_n_stores_nobufs),
55275+ atomic_read_unchecked(&fscache_n_stores_oom));
55276 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
55277- atomic_read(&fscache_n_store_ops),
55278- atomic_read(&fscache_n_store_calls),
55279- atomic_read(&fscache_n_store_pages),
55280- atomic_read(&fscache_n_store_radix_deletes),
55281- atomic_read(&fscache_n_store_pages_over_limit));
55282+ atomic_read_unchecked(&fscache_n_store_ops),
55283+ atomic_read_unchecked(&fscache_n_store_calls),
55284+ atomic_read_unchecked(&fscache_n_store_pages),
55285+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
55286+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
55287
55288 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
55289- atomic_read(&fscache_n_store_vmscan_not_storing),
55290- atomic_read(&fscache_n_store_vmscan_gone),
55291- atomic_read(&fscache_n_store_vmscan_busy),
55292- atomic_read(&fscache_n_store_vmscan_cancelled),
55293- atomic_read(&fscache_n_store_vmscan_wait));
55294+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
55295+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
55296+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
55297+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
55298+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
55299
55300 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
55301- atomic_read(&fscache_n_op_pend),
55302- atomic_read(&fscache_n_op_run),
55303- atomic_read(&fscache_n_op_enqueue),
55304- atomic_read(&fscache_n_op_cancelled),
55305- atomic_read(&fscache_n_op_rejected));
55306+ atomic_read_unchecked(&fscache_n_op_pend),
55307+ atomic_read_unchecked(&fscache_n_op_run),
55308+ atomic_read_unchecked(&fscache_n_op_enqueue),
55309+ atomic_read_unchecked(&fscache_n_op_cancelled),
55310+ atomic_read_unchecked(&fscache_n_op_rejected));
55311 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
55312- atomic_read(&fscache_n_op_deferred_release),
55313- atomic_read(&fscache_n_op_release),
55314- atomic_read(&fscache_n_op_gc));
55315+ atomic_read_unchecked(&fscache_n_op_deferred_release),
55316+ atomic_read_unchecked(&fscache_n_op_release),
55317+ atomic_read_unchecked(&fscache_n_op_gc));
55318
55319 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
55320 atomic_read(&fscache_n_cop_alloc_object),
55321diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
55322index aef34b1..59bfd7b 100644
55323--- a/fs/fuse/cuse.c
55324+++ b/fs/fuse/cuse.c
55325@@ -600,10 +600,12 @@ static int __init cuse_init(void)
55326 INIT_LIST_HEAD(&cuse_conntbl[i]);
55327
55328 /* inherit and extend fuse_dev_operations */
55329- cuse_channel_fops = fuse_dev_operations;
55330- cuse_channel_fops.owner = THIS_MODULE;
55331- cuse_channel_fops.open = cuse_channel_open;
55332- cuse_channel_fops.release = cuse_channel_release;
55333+ pax_open_kernel();
55334+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
55335+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
55336+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
55337+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
55338+ pax_close_kernel();
55339
55340 cuse_class = class_create(THIS_MODULE, "cuse");
55341 if (IS_ERR(cuse_class))
55342diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
55343index 1d55f94..088da65 100644
55344--- a/fs/fuse/dev.c
55345+++ b/fs/fuse/dev.c
55346@@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
55347 ret = 0;
55348 pipe_lock(pipe);
55349
55350- if (!pipe->readers) {
55351+ if (!atomic_read(&pipe->readers)) {
55352 send_sig(SIGPIPE, current, 0);
55353 if (!ret)
55354 ret = -EPIPE;
55355@@ -1364,7 +1364,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
55356 page_nr++;
55357 ret += buf->len;
55358
55359- if (pipe->files)
55360+ if (atomic_read(&pipe->files))
55361 do_wakeup = 1;
55362 }
55363
55364diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
55365index 5b12746..b481b03 100644
55366--- a/fs/fuse/dir.c
55367+++ b/fs/fuse/dir.c
55368@@ -1437,7 +1437,7 @@ static char *read_link(struct dentry *dentry)
55369 return link;
55370 }
55371
55372-static void free_link(char *link)
55373+static void free_link(const char *link)
55374 {
55375 if (!IS_ERR(link))
55376 free_page((unsigned long) link);
55377diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
55378index 62b484e..0f9a140 100644
55379--- a/fs/gfs2/inode.c
55380+++ b/fs/gfs2/inode.c
55381@@ -1441,7 +1441,7 @@ out:
55382
55383 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
55384 {
55385- char *s = nd_get_link(nd);
55386+ const char *s = nd_get_link(nd);
55387 if (!IS_ERR(s))
55388 kfree(s);
55389 }
55390diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
55391index a3f868a..bb308ae 100644
55392--- a/fs/hugetlbfs/inode.c
55393+++ b/fs/hugetlbfs/inode.c
55394@@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
55395 struct mm_struct *mm = current->mm;
55396 struct vm_area_struct *vma;
55397 struct hstate *h = hstate_file(file);
55398+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
55399 struct vm_unmapped_area_info info;
55400
55401 if (len & ~huge_page_mask(h))
55402@@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
55403 return addr;
55404 }
55405
55406+#ifdef CONFIG_PAX_RANDMMAP
55407+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
55408+#endif
55409+
55410 if (addr) {
55411 addr = ALIGN(addr, huge_page_size(h));
55412 vma = find_vma(mm, addr);
55413- if (TASK_SIZE - len >= addr &&
55414- (!vma || addr + len <= vma->vm_start))
55415+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
55416 return addr;
55417 }
55418
55419 info.flags = 0;
55420 info.length = len;
55421 info.low_limit = TASK_UNMAPPED_BASE;
55422+
55423+#ifdef CONFIG_PAX_RANDMMAP
55424+ if (mm->pax_flags & MF_PAX_RANDMMAP)
55425+ info.low_limit += mm->delta_mmap;
55426+#endif
55427+
55428 info.high_limit = TASK_SIZE;
55429 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
55430 info.align_offset = 0;
55431@@ -898,7 +908,7 @@ static struct file_system_type hugetlbfs_fs_type = {
55432 };
55433 MODULE_ALIAS_FS("hugetlbfs");
55434
55435-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
55436+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
55437
55438 static int can_do_hugetlb_shm(void)
55439 {
55440diff --git a/fs/inode.c b/fs/inode.c
55441index 00d5fc3..98ce7d7 100644
55442--- a/fs/inode.c
55443+++ b/fs/inode.c
55444@@ -878,8 +878,8 @@ unsigned int get_next_ino(void)
55445
55446 #ifdef CONFIG_SMP
55447 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
55448- static atomic_t shared_last_ino;
55449- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
55450+ static atomic_unchecked_t shared_last_ino;
55451+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
55452
55453 res = next - LAST_INO_BATCH;
55454 }
55455diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
55456index 4a6cf28..d3a29d3 100644
55457--- a/fs/jffs2/erase.c
55458+++ b/fs/jffs2/erase.c
55459@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
55460 struct jffs2_unknown_node marker = {
55461 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
55462 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
55463- .totlen = cpu_to_je32(c->cleanmarker_size)
55464+ .totlen = cpu_to_je32(c->cleanmarker_size),
55465+ .hdr_crc = cpu_to_je32(0)
55466 };
55467
55468 jffs2_prealloc_raw_node_refs(c, jeb, 1);
55469diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
55470index a6597d6..41b30ec 100644
55471--- a/fs/jffs2/wbuf.c
55472+++ b/fs/jffs2/wbuf.c
55473@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
55474 {
55475 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
55476 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
55477- .totlen = constant_cpu_to_je32(8)
55478+ .totlen = constant_cpu_to_je32(8),
55479+ .hdr_crc = constant_cpu_to_je32(0)
55480 };
55481
55482 /*
55483diff --git a/fs/jfs/super.c b/fs/jfs/super.c
55484index 788e0a9..8433098 100644
55485--- a/fs/jfs/super.c
55486+++ b/fs/jfs/super.c
55487@@ -878,7 +878,7 @@ static int __init init_jfs_fs(void)
55488
55489 jfs_inode_cachep =
55490 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
55491- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
55492+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
55493 init_once);
55494 if (jfs_inode_cachep == NULL)
55495 return -ENOMEM;
55496diff --git a/fs/libfs.c b/fs/libfs.c
55497index 916da8c..1588998 100644
55498--- a/fs/libfs.c
55499+++ b/fs/libfs.c
55500@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
55501
55502 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
55503 struct dentry *next;
55504+ char d_name[sizeof(next->d_iname)];
55505+ const unsigned char *name;
55506+
55507 next = list_entry(p, struct dentry, d_u.d_child);
55508 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
55509 if (!simple_positive(next)) {
55510@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
55511
55512 spin_unlock(&next->d_lock);
55513 spin_unlock(&dentry->d_lock);
55514- if (filldir(dirent, next->d_name.name,
55515+ name = next->d_name.name;
55516+ if (name == next->d_iname) {
55517+ memcpy(d_name, name, next->d_name.len);
55518+ name = d_name;
55519+ }
55520+ if (filldir(dirent, name,
55521 next->d_name.len, filp->f_pos,
55522 next->d_inode->i_ino,
55523 dt_type(next->d_inode)) < 0)
55524diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
55525index acd3947..1f896e2 100644
55526--- a/fs/lockd/clntproc.c
55527+++ b/fs/lockd/clntproc.c
55528@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
55529 /*
55530 * Cookie counter for NLM requests
55531 */
55532-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
55533+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
55534
55535 void nlmclnt_next_cookie(struct nlm_cookie *c)
55536 {
55537- u32 cookie = atomic_inc_return(&nlm_cookie);
55538+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
55539
55540 memcpy(c->data, &cookie, 4);
55541 c->len=4;
55542diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
55543index a2aa97d..10d6c41 100644
55544--- a/fs/lockd/svc.c
55545+++ b/fs/lockd/svc.c
55546@@ -305,7 +305,7 @@ static int lockd_start_svc(struct svc_serv *serv)
55547 svc_sock_update_bufs(serv);
55548 serv->sv_maxconn = nlm_max_connections;
55549
55550- nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, serv->sv_name);
55551+ nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, "%s", serv->sv_name);
55552 if (IS_ERR(nlmsvc_task)) {
55553 error = PTR_ERR(nlmsvc_task);
55554 printk(KERN_WARNING
55555diff --git a/fs/locks.c b/fs/locks.c
55556index cb424a4..850e4dd 100644
55557--- a/fs/locks.c
55558+++ b/fs/locks.c
55559@@ -2064,16 +2064,16 @@ void locks_remove_flock(struct file *filp)
55560 return;
55561
55562 if (filp->f_op && filp->f_op->flock) {
55563- struct file_lock fl = {
55564+ struct file_lock flock = {
55565 .fl_pid = current->tgid,
55566 .fl_file = filp,
55567 .fl_flags = FL_FLOCK,
55568 .fl_type = F_UNLCK,
55569 .fl_end = OFFSET_MAX,
55570 };
55571- filp->f_op->flock(filp, F_SETLKW, &fl);
55572- if (fl.fl_ops && fl.fl_ops->fl_release_private)
55573- fl.fl_ops->fl_release_private(&fl);
55574+ filp->f_op->flock(filp, F_SETLKW, &flock);
55575+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
55576+ flock.fl_ops->fl_release_private(&flock);
55577 }
55578
55579 lock_flocks();
55580diff --git a/fs/namei.c b/fs/namei.c
55581index 9ed9361..2b72db1 100644
55582--- a/fs/namei.c
55583+++ b/fs/namei.c
55584@@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
55585 if (ret != -EACCES)
55586 return ret;
55587
55588+#ifdef CONFIG_GRKERNSEC
55589+ /* we'll block if we have to log due to a denied capability use */
55590+ if (mask & MAY_NOT_BLOCK)
55591+ return -ECHILD;
55592+#endif
55593+
55594 if (S_ISDIR(inode->i_mode)) {
55595 /* DACs are overridable for directories */
55596- if (inode_capable(inode, CAP_DAC_OVERRIDE))
55597- return 0;
55598 if (!(mask & MAY_WRITE))
55599- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
55600+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
55601+ inode_capable(inode, CAP_DAC_READ_SEARCH))
55602 return 0;
55603+ if (inode_capable(inode, CAP_DAC_OVERRIDE))
55604+ return 0;
55605 return -EACCES;
55606 }
55607 /*
55608+ * Searching includes executable on directories, else just read.
55609+ */
55610+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
55611+ if (mask == MAY_READ)
55612+ if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
55613+ inode_capable(inode, CAP_DAC_READ_SEARCH))
55614+ return 0;
55615+
55616+ /*
55617 * Read/write DACs are always overridable.
55618 * Executable DACs are overridable when there is
55619 * at least one exec bit set.
55620@@ -337,14 +353,6 @@ int generic_permission(struct inode *inode, int mask)
55621 if (inode_capable(inode, CAP_DAC_OVERRIDE))
55622 return 0;
55623
55624- /*
55625- * Searching includes executable on directories, else just read.
55626- */
55627- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
55628- if (mask == MAY_READ)
55629- if (inode_capable(inode, CAP_DAC_READ_SEARCH))
55630- return 0;
55631-
55632 return -EACCES;
55633 }
55634
55635@@ -820,7 +828,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
55636 {
55637 struct dentry *dentry = link->dentry;
55638 int error;
55639- char *s;
55640+ const char *s;
55641
55642 BUG_ON(nd->flags & LOOKUP_RCU);
55643
55644@@ -841,6 +849,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
55645 if (error)
55646 goto out_put_nd_path;
55647
55648+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
55649+ dentry->d_inode, dentry, nd->path.mnt)) {
55650+ error = -EACCES;
55651+ goto out_put_nd_path;
55652+ }
55653+
55654 nd->last_type = LAST_BIND;
55655 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
55656 error = PTR_ERR(*p);
55657@@ -1588,6 +1602,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
55658 if (res)
55659 break;
55660 res = walk_component(nd, path, LOOKUP_FOLLOW);
55661+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
55662+ res = -EACCES;
55663 put_link(nd, &link, cookie);
55664 } while (res > 0);
55665
55666@@ -1686,7 +1702,7 @@ EXPORT_SYMBOL(full_name_hash);
55667 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
55668 {
55669 unsigned long a, b, adata, bdata, mask, hash, len;
55670- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
55671+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
55672
55673 hash = a = 0;
55674 len = -sizeof(unsigned long);
55675@@ -1968,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
55676 if (err)
55677 break;
55678 err = lookup_last(nd, &path);
55679+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
55680+ err = -EACCES;
55681 put_link(nd, &link, cookie);
55682 }
55683 }
55684@@ -1975,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
55685 if (!err)
55686 err = complete_walk(nd);
55687
55688+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
55689+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
55690+ path_put(&nd->path);
55691+ err = -ENOENT;
55692+ }
55693+ }
55694+
55695 if (!err && nd->flags & LOOKUP_DIRECTORY) {
55696 if (!can_lookup(nd->inode)) {
55697 path_put(&nd->path);
55698@@ -2002,8 +2027,15 @@ static int filename_lookup(int dfd, struct filename *name,
55699 retval = path_lookupat(dfd, name->name,
55700 flags | LOOKUP_REVAL, nd);
55701
55702- if (likely(!retval))
55703+ if (likely(!retval)) {
55704 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
55705+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
55706+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
55707+ path_put(&nd->path);
55708+ return -ENOENT;
55709+ }
55710+ }
55711+ }
55712 return retval;
55713 }
55714
55715@@ -2381,6 +2413,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
55716 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
55717 return -EPERM;
55718
55719+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
55720+ return -EPERM;
55721+ if (gr_handle_rawio(inode))
55722+ return -EPERM;
55723+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
55724+ return -EACCES;
55725+
55726 return 0;
55727 }
55728
55729@@ -2602,7 +2641,7 @@ looked_up:
55730 * cleared otherwise prior to returning.
55731 */
55732 static int lookup_open(struct nameidata *nd, struct path *path,
55733- struct file *file,
55734+ struct path *link, struct file *file,
55735 const struct open_flags *op,
55736 bool got_write, int *opened)
55737 {
55738@@ -2637,6 +2676,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
55739 /* Negative dentry, just create the file */
55740 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
55741 umode_t mode = op->mode;
55742+
55743+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
55744+ error = -EACCES;
55745+ goto out_dput;
55746+ }
55747+
55748+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
55749+ error = -EACCES;
55750+ goto out_dput;
55751+ }
55752+
55753 if (!IS_POSIXACL(dir->d_inode))
55754 mode &= ~current_umask();
55755 /*
55756@@ -2658,6 +2708,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
55757 nd->flags & LOOKUP_EXCL);
55758 if (error)
55759 goto out_dput;
55760+ else
55761+ gr_handle_create(dentry, nd->path.mnt);
55762 }
55763 out_no_open:
55764 path->dentry = dentry;
55765@@ -2672,7 +2724,7 @@ out_dput:
55766 /*
55767 * Handle the last step of open()
55768 */
55769-static int do_last(struct nameidata *nd, struct path *path,
55770+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
55771 struct file *file, const struct open_flags *op,
55772 int *opened, struct filename *name)
55773 {
55774@@ -2701,16 +2753,32 @@ static int do_last(struct nameidata *nd, struct path *path,
55775 error = complete_walk(nd);
55776 if (error)
55777 return error;
55778+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
55779+ error = -ENOENT;
55780+ goto out;
55781+ }
55782 audit_inode(name, nd->path.dentry, 0);
55783 if (open_flag & O_CREAT) {
55784 error = -EISDIR;
55785 goto out;
55786 }
55787+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
55788+ error = -EACCES;
55789+ goto out;
55790+ }
55791 goto finish_open;
55792 case LAST_BIND:
55793 error = complete_walk(nd);
55794 if (error)
55795 return error;
55796+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
55797+ error = -ENOENT;
55798+ goto out;
55799+ }
55800+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
55801+ error = -EACCES;
55802+ goto out;
55803+ }
55804 audit_inode(name, dir, 0);
55805 goto finish_open;
55806 }
55807@@ -2759,7 +2827,7 @@ retry_lookup:
55808 */
55809 }
55810 mutex_lock(&dir->d_inode->i_mutex);
55811- error = lookup_open(nd, path, file, op, got_write, opened);
55812+ error = lookup_open(nd, path, link, file, op, got_write, opened);
55813 mutex_unlock(&dir->d_inode->i_mutex);
55814
55815 if (error <= 0) {
55816@@ -2783,11 +2851,28 @@ retry_lookup:
55817 goto finish_open_created;
55818 }
55819
55820+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
55821+ error = -ENOENT;
55822+ goto exit_dput;
55823+ }
55824+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
55825+ error = -EACCES;
55826+ goto exit_dput;
55827+ }
55828+
55829 /*
55830 * create/update audit record if it already exists.
55831 */
55832- if (path->dentry->d_inode)
55833+ if (path->dentry->d_inode) {
55834+ /* only check if O_CREAT is specified, all other checks need to go
55835+ into may_open */
55836+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
55837+ error = -EACCES;
55838+ goto exit_dput;
55839+ }
55840+
55841 audit_inode(name, path->dentry, 0);
55842+ }
55843
55844 /*
55845 * If atomic_open() acquired write access it is dropped now due to
55846@@ -2828,6 +2913,11 @@ finish_lookup:
55847 }
55848 }
55849 BUG_ON(inode != path->dentry->d_inode);
55850+ /* if we're resolving a symlink to another symlink */
55851+ if (link && gr_handle_symlink_owner(link, inode)) {
55852+ error = -EACCES;
55853+ goto out;
55854+ }
55855 return 1;
55856 }
55857
55858@@ -2837,7 +2927,6 @@ finish_lookup:
55859 save_parent.dentry = nd->path.dentry;
55860 save_parent.mnt = mntget(path->mnt);
55861 nd->path.dentry = path->dentry;
55862-
55863 }
55864 nd->inode = inode;
55865 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
55866@@ -2846,6 +2935,16 @@ finish_lookup:
55867 path_put(&save_parent);
55868 return error;
55869 }
55870+
55871+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
55872+ error = -ENOENT;
55873+ goto out;
55874+ }
55875+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
55876+ error = -EACCES;
55877+ goto out;
55878+ }
55879+
55880 error = -EISDIR;
55881 if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
55882 goto out;
55883@@ -2944,7 +3043,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
55884 if (unlikely(error))
55885 goto out;
55886
55887- error = do_last(nd, &path, file, op, &opened, pathname);
55888+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
55889 while (unlikely(error > 0)) { /* trailing symlink */
55890 struct path link = path;
55891 void *cookie;
55892@@ -2962,7 +3061,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
55893 error = follow_link(&link, nd, &cookie);
55894 if (unlikely(error))
55895 break;
55896- error = do_last(nd, &path, file, op, &opened, pathname);
55897+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
55898 put_link(nd, &link, cookie);
55899 }
55900 out:
55901@@ -3062,8 +3161,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
55902 goto unlock;
55903
55904 error = -EEXIST;
55905- if (dentry->d_inode)
55906+ if (dentry->d_inode) {
55907+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
55908+ error = -ENOENT;
55909+ }
55910 goto fail;
55911+ }
55912 /*
55913 * Special case - lookup gave negative, but... we had foo/bar/
55914 * From the vfs_mknod() POV we just have a negative dentry -
55915@@ -3115,6 +3218,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
55916 }
55917 EXPORT_SYMBOL(user_path_create);
55918
55919+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
55920+{
55921+ struct filename *tmp = getname(pathname);
55922+ struct dentry *res;
55923+ if (IS_ERR(tmp))
55924+ return ERR_CAST(tmp);
55925+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
55926+ if (IS_ERR(res))
55927+ putname(tmp);
55928+ else
55929+ *to = tmp;
55930+ return res;
55931+}
55932+
55933 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
55934 {
55935 int error = may_create(dir, dentry);
55936@@ -3177,6 +3294,17 @@ retry:
55937
55938 if (!IS_POSIXACL(path.dentry->d_inode))
55939 mode &= ~current_umask();
55940+
55941+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
55942+ error = -EPERM;
55943+ goto out;
55944+ }
55945+
55946+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
55947+ error = -EACCES;
55948+ goto out;
55949+ }
55950+
55951 error = security_path_mknod(&path, dentry, mode, dev);
55952 if (error)
55953 goto out;
55954@@ -3193,6 +3321,8 @@ retry:
55955 break;
55956 }
55957 out:
55958+ if (!error)
55959+ gr_handle_create(dentry, path.mnt);
55960 done_path_create(&path, dentry);
55961 if (retry_estale(error, lookup_flags)) {
55962 lookup_flags |= LOOKUP_REVAL;
55963@@ -3245,9 +3375,16 @@ retry:
55964
55965 if (!IS_POSIXACL(path.dentry->d_inode))
55966 mode &= ~current_umask();
55967+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
55968+ error = -EACCES;
55969+ goto out;
55970+ }
55971 error = security_path_mkdir(&path, dentry, mode);
55972 if (!error)
55973 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
55974+ if (!error)
55975+ gr_handle_create(dentry, path.mnt);
55976+out:
55977 done_path_create(&path, dentry);
55978 if (retry_estale(error, lookup_flags)) {
55979 lookup_flags |= LOOKUP_REVAL;
55980@@ -3328,6 +3465,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
55981 struct filename *name;
55982 struct dentry *dentry;
55983 struct nameidata nd;
55984+ ino_t saved_ino = 0;
55985+ dev_t saved_dev = 0;
55986 unsigned int lookup_flags = 0;
55987 retry:
55988 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
55989@@ -3360,10 +3499,21 @@ retry:
55990 error = -ENOENT;
55991 goto exit3;
55992 }
55993+
55994+ saved_ino = dentry->d_inode->i_ino;
55995+ saved_dev = gr_get_dev_from_dentry(dentry);
55996+
55997+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
55998+ error = -EACCES;
55999+ goto exit3;
56000+ }
56001+
56002 error = security_path_rmdir(&nd.path, dentry);
56003 if (error)
56004 goto exit3;
56005 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
56006+ if (!error && (saved_dev || saved_ino))
56007+ gr_handle_delete(saved_ino, saved_dev);
56008 exit3:
56009 dput(dentry);
56010 exit2:
56011@@ -3429,6 +3579,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
56012 struct dentry *dentry;
56013 struct nameidata nd;
56014 struct inode *inode = NULL;
56015+ ino_t saved_ino = 0;
56016+ dev_t saved_dev = 0;
56017 unsigned int lookup_flags = 0;
56018 retry:
56019 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
56020@@ -3455,10 +3607,22 @@ retry:
56021 if (!inode)
56022 goto slashes;
56023 ihold(inode);
56024+
56025+ if (inode->i_nlink <= 1) {
56026+ saved_ino = inode->i_ino;
56027+ saved_dev = gr_get_dev_from_dentry(dentry);
56028+ }
56029+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
56030+ error = -EACCES;
56031+ goto exit2;
56032+ }
56033+
56034 error = security_path_unlink(&nd.path, dentry);
56035 if (error)
56036 goto exit2;
56037 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
56038+ if (!error && (saved_ino || saved_dev))
56039+ gr_handle_delete(saved_ino, saved_dev);
56040 exit2:
56041 dput(dentry);
56042 }
56043@@ -3536,9 +3700,17 @@ retry:
56044 if (IS_ERR(dentry))
56045 goto out_putname;
56046
56047+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
56048+ error = -EACCES;
56049+ goto out;
56050+ }
56051+
56052 error = security_path_symlink(&path, dentry, from->name);
56053 if (!error)
56054 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
56055+ if (!error)
56056+ gr_handle_create(dentry, path.mnt);
56057+out:
56058 done_path_create(&path, dentry);
56059 if (retry_estale(error, lookup_flags)) {
56060 lookup_flags |= LOOKUP_REVAL;
56061@@ -3612,6 +3784,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
56062 {
56063 struct dentry *new_dentry;
56064 struct path old_path, new_path;
56065+ struct filename *to = NULL;
56066 int how = 0;
56067 int error;
56068
56069@@ -3635,7 +3808,7 @@ retry:
56070 if (error)
56071 return error;
56072
56073- new_dentry = user_path_create(newdfd, newname, &new_path,
56074+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
56075 (how & LOOKUP_REVAL));
56076 error = PTR_ERR(new_dentry);
56077 if (IS_ERR(new_dentry))
56078@@ -3647,11 +3820,28 @@ retry:
56079 error = may_linkat(&old_path);
56080 if (unlikely(error))
56081 goto out_dput;
56082+
56083+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
56084+ old_path.dentry->d_inode,
56085+ old_path.dentry->d_inode->i_mode, to)) {
56086+ error = -EACCES;
56087+ goto out_dput;
56088+ }
56089+
56090+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
56091+ old_path.dentry, old_path.mnt, to)) {
56092+ error = -EACCES;
56093+ goto out_dput;
56094+ }
56095+
56096 error = security_path_link(old_path.dentry, &new_path, new_dentry);
56097 if (error)
56098 goto out_dput;
56099 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
56100+ if (!error)
56101+ gr_handle_create(new_dentry, new_path.mnt);
56102 out_dput:
56103+ putname(to);
56104 done_path_create(&new_path, new_dentry);
56105 if (retry_estale(error, how)) {
56106 how |= LOOKUP_REVAL;
56107@@ -3897,12 +4087,21 @@ retry:
56108 if (new_dentry == trap)
56109 goto exit5;
56110
56111+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
56112+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
56113+ to);
56114+ if (error)
56115+ goto exit5;
56116+
56117 error = security_path_rename(&oldnd.path, old_dentry,
56118 &newnd.path, new_dentry);
56119 if (error)
56120 goto exit5;
56121 error = vfs_rename(old_dir->d_inode, old_dentry,
56122 new_dir->d_inode, new_dentry);
56123+ if (!error)
56124+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
56125+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
56126 exit5:
56127 dput(new_dentry);
56128 exit4:
56129@@ -3934,6 +4133,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
56130
56131 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
56132 {
56133+ char tmpbuf[64];
56134+ const char *newlink;
56135 int len;
56136
56137 len = PTR_ERR(link);
56138@@ -3943,7 +4144,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
56139 len = strlen(link);
56140 if (len > (unsigned) buflen)
56141 len = buflen;
56142- if (copy_to_user(buffer, link, len))
56143+
56144+ if (len < sizeof(tmpbuf)) {
56145+ memcpy(tmpbuf, link, len);
56146+ newlink = tmpbuf;
56147+ } else
56148+ newlink = link;
56149+
56150+ if (copy_to_user(buffer, newlink, len))
56151 len = -EFAULT;
56152 out:
56153 return len;
56154diff --git a/fs/namespace.c b/fs/namespace.c
56155index 7b1ca9b..6faeccf 100644
56156--- a/fs/namespace.c
56157+++ b/fs/namespace.c
56158@@ -1265,6 +1265,9 @@ static int do_umount(struct mount *mnt, int flags)
56159 if (!(sb->s_flags & MS_RDONLY))
56160 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
56161 up_write(&sb->s_umount);
56162+
56163+ gr_log_remount(mnt->mnt_devname, retval);
56164+
56165 return retval;
56166 }
56167
56168@@ -1283,6 +1286,9 @@ static int do_umount(struct mount *mnt, int flags)
56169 }
56170 br_write_unlock(&vfsmount_lock);
56171 namespace_unlock();
56172+
56173+ gr_log_unmount(mnt->mnt_devname, retval);
56174+
56175 return retval;
56176 }
56177
56178@@ -1302,7 +1308,7 @@ static inline bool may_mount(void)
56179 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
56180 */
56181
56182-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
56183+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
56184 {
56185 struct path path;
56186 struct mount *mnt;
56187@@ -1342,7 +1348,7 @@ out:
56188 /*
56189 * The 2.0 compatible umount. No flags.
56190 */
56191-SYSCALL_DEFINE1(oldumount, char __user *, name)
56192+SYSCALL_DEFINE1(oldumount, const char __user *, name)
56193 {
56194 return sys_umount(name, 0);
56195 }
56196@@ -2313,6 +2319,16 @@ long do_mount(const char *dev_name, const char *dir_name,
56197 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
56198 MS_STRICTATIME);
56199
56200+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
56201+ retval = -EPERM;
56202+ goto dput_out;
56203+ }
56204+
56205+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
56206+ retval = -EPERM;
56207+ goto dput_out;
56208+ }
56209+
56210 if (flags & MS_REMOUNT)
56211 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
56212 data_page);
56213@@ -2327,6 +2343,9 @@ long do_mount(const char *dev_name, const char *dir_name,
56214 dev_name, data_page);
56215 dput_out:
56216 path_put(&path);
56217+
56218+ gr_log_mount(dev_name, dir_name, retval);
56219+
56220 return retval;
56221 }
56222
56223@@ -2500,8 +2519,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
56224 }
56225 EXPORT_SYMBOL(mount_subtree);
56226
56227-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
56228- char __user *, type, unsigned long, flags, void __user *, data)
56229+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
56230+ const char __user *, type, unsigned long, flags, void __user *, data)
56231 {
56232 int ret;
56233 char *kernel_type;
56234@@ -2614,6 +2633,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
56235 if (error)
56236 goto out2;
56237
56238+ if (gr_handle_chroot_pivot()) {
56239+ error = -EPERM;
56240+ goto out2;
56241+ }
56242+
56243 get_fs_root(current->fs, &root);
56244 old_mp = lock_mount(&old);
56245 error = PTR_ERR(old_mp);
56246@@ -2864,7 +2888,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
56247 !nsown_capable(CAP_SYS_ADMIN))
56248 return -EPERM;
56249
56250- if (fs->users != 1)
56251+ if (atomic_read(&fs->users) != 1)
56252 return -EINVAL;
56253
56254 get_mnt_ns(mnt_ns);
56255diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
56256index cff089a..4c3d57a 100644
56257--- a/fs/nfs/callback.c
56258+++ b/fs/nfs/callback.c
56259@@ -211,7 +211,6 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
56260 struct svc_rqst *rqstp;
56261 int (*callback_svc)(void *vrqstp);
56262 struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
56263- char svc_name[12];
56264 int ret;
56265
56266 nfs_callback_bc_serv(minorversion, xprt, serv);
56267@@ -235,10 +234,9 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
56268
56269 svc_sock_update_bufs(serv);
56270
56271- sprintf(svc_name, "nfsv4.%u-svc", minorversion);
56272 cb_info->serv = serv;
56273 cb_info->rqst = rqstp;
56274- cb_info->task = kthread_run(callback_svc, cb_info->rqst, svc_name);
56275+ cb_info->task = kthread_run(callback_svc, cb_info->rqst, "nfsv4.%u-svc", minorversion);
56276 if (IS_ERR(cb_info->task)) {
56277 ret = PTR_ERR(cb_info->task);
56278 svc_exit_thread(cb_info->rqst);
56279diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
56280index a35582c..ebbdcd5 100644
56281--- a/fs/nfs/callback_xdr.c
56282+++ b/fs/nfs/callback_xdr.c
56283@@ -51,7 +51,7 @@ struct callback_op {
56284 callback_decode_arg_t decode_args;
56285 callback_encode_res_t encode_res;
56286 long res_maxsize;
56287-};
56288+} __do_const;
56289
56290 static struct callback_op callback_ops[];
56291
56292diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
56293index c1c7a9d..7afa0b8 100644
56294--- a/fs/nfs/inode.c
56295+++ b/fs/nfs/inode.c
56296@@ -1043,16 +1043,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
56297 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
56298 }
56299
56300-static atomic_long_t nfs_attr_generation_counter;
56301+static atomic_long_unchecked_t nfs_attr_generation_counter;
56302
56303 static unsigned long nfs_read_attr_generation_counter(void)
56304 {
56305- return atomic_long_read(&nfs_attr_generation_counter);
56306+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
56307 }
56308
56309 unsigned long nfs_inc_attr_generation_counter(void)
56310 {
56311- return atomic_long_inc_return(&nfs_attr_generation_counter);
56312+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
56313 }
56314
56315 void nfs_fattr_init(struct nfs_fattr *fattr)
56316diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
56317index 2c37442..9b9538b 100644
56318--- a/fs/nfs/nfs4state.c
56319+++ b/fs/nfs/nfs4state.c
56320@@ -1193,7 +1193,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)
56321 snprintf(buf, sizeof(buf), "%s-manager",
56322 rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR));
56323 rcu_read_unlock();
56324- task = kthread_run(nfs4_run_state_manager, clp, buf);
56325+ task = kthread_run(nfs4_run_state_manager, clp, "%s", buf);
56326 if (IS_ERR(task)) {
56327 printk(KERN_ERR "%s: kthread_run: %ld\n",
56328 __func__, PTR_ERR(task));
56329diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
56330index 27d74a2..c4c2a73 100644
56331--- a/fs/nfsd/nfs4proc.c
56332+++ b/fs/nfsd/nfs4proc.c
56333@@ -1126,7 +1126,7 @@ struct nfsd4_operation {
56334 nfsd4op_rsize op_rsize_bop;
56335 stateid_getter op_get_currentstateid;
56336 stateid_setter op_set_currentstateid;
56337-};
56338+} __do_const;
56339
56340 static struct nfsd4_operation nfsd4_ops[];
56341
56342diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
56343index 582321a..0224663 100644
56344--- a/fs/nfsd/nfs4xdr.c
56345+++ b/fs/nfsd/nfs4xdr.c
56346@@ -1458,7 +1458,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
56347
56348 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
56349
56350-static nfsd4_dec nfsd4_dec_ops[] = {
56351+static const nfsd4_dec nfsd4_dec_ops[] = {
56352 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
56353 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
56354 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
56355@@ -1498,7 +1498,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
56356 [OP_RELEASE_LOCKOWNER] = (nfsd4_dec)nfsd4_decode_release_lockowner,
56357 };
56358
56359-static nfsd4_dec nfsd41_dec_ops[] = {
56360+static const nfsd4_dec nfsd41_dec_ops[] = {
56361 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
56362 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
56363 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
56364@@ -1560,7 +1560,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
56365 };
56366
56367 struct nfsd4_minorversion_ops {
56368- nfsd4_dec *decoders;
56369+ const nfsd4_dec *decoders;
56370 int nops;
56371 };
56372
56373diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
56374index e76244e..9fe8f2f1 100644
56375--- a/fs/nfsd/nfscache.c
56376+++ b/fs/nfsd/nfscache.c
56377@@ -526,14 +526,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
56378 {
56379 struct svc_cacherep *rp = rqstp->rq_cacherep;
56380 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
56381- int len;
56382+ long len;
56383 size_t bufsize = 0;
56384
56385 if (!rp)
56386 return;
56387
56388- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
56389- len >>= 2;
56390+ if (statp) {
56391+ len = (char*)statp - (char*)resv->iov_base;
56392+ len = resv->iov_len - len;
56393+ len >>= 2;
56394+ }
56395
56396 /* Don't cache excessive amounts of data and XDR failures */
56397 if (!statp || len > (256 >> 2)) {
56398diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
56399index baf149a..76b86ad 100644
56400--- a/fs/nfsd/vfs.c
56401+++ b/fs/nfsd/vfs.c
56402@@ -940,7 +940,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
56403 } else {
56404 oldfs = get_fs();
56405 set_fs(KERNEL_DS);
56406- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
56407+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
56408 set_fs(oldfs);
56409 }
56410
56411@@ -1027,7 +1027,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
56412
56413 /* Write the data. */
56414 oldfs = get_fs(); set_fs(KERNEL_DS);
56415- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
56416+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
56417 set_fs(oldfs);
56418 if (host_err < 0)
56419 goto out_nfserr;
56420@@ -1573,7 +1573,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
56421 */
56422
56423 oldfs = get_fs(); set_fs(KERNEL_DS);
56424- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
56425+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
56426 set_fs(oldfs);
56427
56428 if (host_err < 0)
56429diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
56430index fea6bd5..8ee9d81 100644
56431--- a/fs/nls/nls_base.c
56432+++ b/fs/nls/nls_base.c
56433@@ -234,20 +234,22 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
56434
56435 int register_nls(struct nls_table * nls)
56436 {
56437- struct nls_table ** tmp = &tables;
56438+ struct nls_table *tmp = tables;
56439
56440 if (nls->next)
56441 return -EBUSY;
56442
56443 spin_lock(&nls_lock);
56444- while (*tmp) {
56445- if (nls == *tmp) {
56446+ while (tmp) {
56447+ if (nls == tmp) {
56448 spin_unlock(&nls_lock);
56449 return -EBUSY;
56450 }
56451- tmp = &(*tmp)->next;
56452+ tmp = tmp->next;
56453 }
56454- nls->next = tables;
56455+ pax_open_kernel();
56456+ *(struct nls_table **)&nls->next = tables;
56457+ pax_close_kernel();
56458 tables = nls;
56459 spin_unlock(&nls_lock);
56460 return 0;
56461@@ -255,12 +257,14 @@ int register_nls(struct nls_table * nls)
56462
56463 int unregister_nls(struct nls_table * nls)
56464 {
56465- struct nls_table ** tmp = &tables;
56466+ struct nls_table * const * tmp = &tables;
56467
56468 spin_lock(&nls_lock);
56469 while (*tmp) {
56470 if (nls == *tmp) {
56471- *tmp = nls->next;
56472+ pax_open_kernel();
56473+ *(struct nls_table **)tmp = nls->next;
56474+ pax_close_kernel();
56475 spin_unlock(&nls_lock);
56476 return 0;
56477 }
56478diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
56479index 7424929..35f6be5 100644
56480--- a/fs/nls/nls_euc-jp.c
56481+++ b/fs/nls/nls_euc-jp.c
56482@@ -561,8 +561,10 @@ static int __init init_nls_euc_jp(void)
56483 p_nls = load_nls("cp932");
56484
56485 if (p_nls) {
56486- table.charset2upper = p_nls->charset2upper;
56487- table.charset2lower = p_nls->charset2lower;
56488+ pax_open_kernel();
56489+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
56490+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
56491+ pax_close_kernel();
56492 return register_nls(&table);
56493 }
56494
56495diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
56496index e7bc1d7..06bd4bb 100644
56497--- a/fs/nls/nls_koi8-ru.c
56498+++ b/fs/nls/nls_koi8-ru.c
56499@@ -63,8 +63,10 @@ static int __init init_nls_koi8_ru(void)
56500 p_nls = load_nls("koi8-u");
56501
56502 if (p_nls) {
56503- table.charset2upper = p_nls->charset2upper;
56504- table.charset2lower = p_nls->charset2lower;
56505+ pax_open_kernel();
56506+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
56507+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
56508+ pax_close_kernel();
56509 return register_nls(&table);
56510 }
56511
56512diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
56513index 77cc85d..a1e6299 100644
56514--- a/fs/notify/fanotify/fanotify_user.c
56515+++ b/fs/notify/fanotify/fanotify_user.c
56516@@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
56517
56518 fd = fanotify_event_metadata.fd;
56519 ret = -EFAULT;
56520- if (copy_to_user(buf, &fanotify_event_metadata,
56521- fanotify_event_metadata.event_len))
56522+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
56523+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
56524 goto out_close_fd;
56525
56526 ret = prepare_for_access_response(group, event, fd);
56527diff --git a/fs/notify/notification.c b/fs/notify/notification.c
56528index 7b51b05..5ea5ef6 100644
56529--- a/fs/notify/notification.c
56530+++ b/fs/notify/notification.c
56531@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
56532 * get set to 0 so it will never get 'freed'
56533 */
56534 static struct fsnotify_event *q_overflow_event;
56535-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
56536+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
56537
56538 /**
56539 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
56540@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
56541 */
56542 u32 fsnotify_get_cookie(void)
56543 {
56544- return atomic_inc_return(&fsnotify_sync_cookie);
56545+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
56546 }
56547 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
56548
56549diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
56550index aa411c3..c260a84 100644
56551--- a/fs/ntfs/dir.c
56552+++ b/fs/ntfs/dir.c
56553@@ -1329,7 +1329,7 @@ find_next_index_buffer:
56554 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
56555 ~(s64)(ndir->itype.index.block_size - 1)));
56556 /* Bounds checks. */
56557- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
56558+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
56559 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
56560 "inode 0x%lx or driver bug.", vdir->i_ino);
56561 goto err_out;
56562diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
56563index c5670b8..01a3656 100644
56564--- a/fs/ntfs/file.c
56565+++ b/fs/ntfs/file.c
56566@@ -2241,6 +2241,6 @@ const struct inode_operations ntfs_file_inode_ops = {
56567 #endif /* NTFS_RW */
56568 };
56569
56570-const struct file_operations ntfs_empty_file_ops = {};
56571+const struct file_operations ntfs_empty_file_ops __read_only;
56572
56573-const struct inode_operations ntfs_empty_inode_ops = {};
56574+const struct inode_operations ntfs_empty_inode_ops __read_only;
56575diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
56576index 20dfec7..e238cb7 100644
56577--- a/fs/ocfs2/aops.c
56578+++ b/fs/ocfs2/aops.c
56579@@ -1756,7 +1756,7 @@ try_again:
56580 goto out;
56581 } else if (ret == 1) {
56582 clusters_need = wc->w_clen;
56583- ret = ocfs2_refcount_cow(inode, filp, di_bh,
56584+ ret = ocfs2_refcount_cow(inode, di_bh,
56585 wc->w_cpos, wc->w_clen, UINT_MAX);
56586 if (ret) {
56587 mlog_errno(ret);
56588diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
56589index ff54014..ff125fd 100644
56590--- a/fs/ocfs2/file.c
56591+++ b/fs/ocfs2/file.c
56592@@ -370,7 +370,7 @@ static int ocfs2_cow_file_pos(struct inode *inode,
56593 if (!(ext_flags & OCFS2_EXT_REFCOUNTED))
56594 goto out;
56595
56596- return ocfs2_refcount_cow(inode, NULL, fe_bh, cpos, 1, cpos+1);
56597+ return ocfs2_refcount_cow(inode, fe_bh, cpos, 1, cpos+1);
56598
56599 out:
56600 return status;
56601@@ -899,7 +899,7 @@ static int ocfs2_zero_extend_get_range(struct inode *inode,
56602 zero_clusters = last_cpos - zero_cpos;
56603
56604 if (needs_cow) {
56605- rc = ocfs2_refcount_cow(inode, NULL, di_bh, zero_cpos,
56606+ rc = ocfs2_refcount_cow(inode, di_bh, zero_cpos,
56607 zero_clusters, UINT_MAX);
56608 if (rc) {
56609 mlog_errno(rc);
56610@@ -2078,7 +2078,7 @@ static int ocfs2_prepare_inode_for_refcount(struct inode *inode,
56611
56612 *meta_level = 1;
56613
56614- ret = ocfs2_refcount_cow(inode, file, di_bh, cpos, clusters, UINT_MAX);
56615+ ret = ocfs2_refcount_cow(inode, di_bh, cpos, clusters, UINT_MAX);
56616 if (ret)
56617 mlog_errno(ret);
56618 out:
56619diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
56620index aebeacd..0dcdd26 100644
56621--- a/fs/ocfs2/localalloc.c
56622+++ b/fs/ocfs2/localalloc.c
56623@@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
56624 goto bail;
56625 }
56626
56627- atomic_inc(&osb->alloc_stats.moves);
56628+ atomic_inc_unchecked(&osb->alloc_stats.moves);
56629
56630 bail:
56631 if (handle)
56632diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
56633index f1fc172..452068b 100644
56634--- a/fs/ocfs2/move_extents.c
56635+++ b/fs/ocfs2/move_extents.c
56636@@ -69,7 +69,7 @@ static int __ocfs2_move_extent(handle_t *handle,
56637 u64 ino = ocfs2_metadata_cache_owner(context->et.et_ci);
56638 u64 old_blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cpos);
56639
56640- ret = ocfs2_duplicate_clusters_by_page(handle, context->file, cpos,
56641+ ret = ocfs2_duplicate_clusters_by_page(handle, inode, cpos,
56642 p_cpos, new_p_cpos, len);
56643 if (ret) {
56644 mlog_errno(ret);
56645diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
56646index d355e6e..578d905 100644
56647--- a/fs/ocfs2/ocfs2.h
56648+++ b/fs/ocfs2/ocfs2.h
56649@@ -235,11 +235,11 @@ enum ocfs2_vol_state
56650
56651 struct ocfs2_alloc_stats
56652 {
56653- atomic_t moves;
56654- atomic_t local_data;
56655- atomic_t bitmap_data;
56656- atomic_t bg_allocs;
56657- atomic_t bg_extends;
56658+ atomic_unchecked_t moves;
56659+ atomic_unchecked_t local_data;
56660+ atomic_unchecked_t bitmap_data;
56661+ atomic_unchecked_t bg_allocs;
56662+ atomic_unchecked_t bg_extends;
56663 };
56664
56665 enum ocfs2_local_alloc_state
56666diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
56667index 998b17e..aefe414 100644
56668--- a/fs/ocfs2/refcounttree.c
56669+++ b/fs/ocfs2/refcounttree.c
56670@@ -49,7 +49,6 @@
56671
56672 struct ocfs2_cow_context {
56673 struct inode *inode;
56674- struct file *file;
56675 u32 cow_start;
56676 u32 cow_len;
56677 struct ocfs2_extent_tree data_et;
56678@@ -66,7 +65,7 @@ struct ocfs2_cow_context {
56679 u32 *num_clusters,
56680 unsigned int *extent_flags);
56681 int (*cow_duplicate_clusters)(handle_t *handle,
56682- struct file *file,
56683+ struct inode *inode,
56684 u32 cpos, u32 old_cluster,
56685 u32 new_cluster, u32 new_len);
56686 };
56687@@ -2922,14 +2921,12 @@ static int ocfs2_clear_cow_buffer(handle_t *handle, struct buffer_head *bh)
56688 }
56689
56690 int ocfs2_duplicate_clusters_by_page(handle_t *handle,
56691- struct file *file,
56692+ struct inode *inode,
56693 u32 cpos, u32 old_cluster,
56694 u32 new_cluster, u32 new_len)
56695 {
56696 int ret = 0, partial;
56697- struct inode *inode = file_inode(file);
56698- struct ocfs2_caching_info *ci = INODE_CACHE(inode);
56699- struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
56700+ struct super_block *sb = inode->i_sb;
56701 u64 new_block = ocfs2_clusters_to_blocks(sb, new_cluster);
56702 struct page *page;
56703 pgoff_t page_index;
56704@@ -2973,13 +2970,6 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,
56705 if (PAGE_CACHE_SIZE <= OCFS2_SB(sb)->s_clustersize)
56706 BUG_ON(PageDirty(page));
56707
56708- if (PageReadahead(page)) {
56709- page_cache_async_readahead(mapping,
56710- &file->f_ra, file,
56711- page, page_index,
56712- readahead_pages);
56713- }
56714-
56715 if (!PageUptodate(page)) {
56716 ret = block_read_full_page(page, ocfs2_get_block);
56717 if (ret) {
56718@@ -2999,7 +2989,8 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,
56719 }
56720 }
56721
56722- ocfs2_map_and_dirty_page(inode, handle, from, to,
56723+ ocfs2_map_and_dirty_page(inode,
56724+ handle, from, to,
56725 page, 0, &new_block);
56726 mark_page_accessed(page);
56727 unlock:
56728@@ -3015,12 +3006,11 @@ unlock:
56729 }
56730
56731 int ocfs2_duplicate_clusters_by_jbd(handle_t *handle,
56732- struct file *file,
56733+ struct inode *inode,
56734 u32 cpos, u32 old_cluster,
56735 u32 new_cluster, u32 new_len)
56736 {
56737 int ret = 0;
56738- struct inode *inode = file_inode(file);
56739 struct super_block *sb = inode->i_sb;
56740 struct ocfs2_caching_info *ci = INODE_CACHE(inode);
56741 int i, blocks = ocfs2_clusters_to_blocks(sb, new_len);
56742@@ -3145,7 +3135,7 @@ static int ocfs2_replace_clusters(handle_t *handle,
56743
56744 /*If the old clusters is unwritten, no need to duplicate. */
56745 if (!(ext_flags & OCFS2_EXT_UNWRITTEN)) {
56746- ret = context->cow_duplicate_clusters(handle, context->file,
56747+ ret = context->cow_duplicate_clusters(handle, context->inode,
56748 cpos, old, new, len);
56749 if (ret) {
56750 mlog_errno(ret);
56751@@ -3423,35 +3413,12 @@ static int ocfs2_replace_cow(struct ocfs2_cow_context *context)
56752 return ret;
56753 }
56754
56755-static void ocfs2_readahead_for_cow(struct inode *inode,
56756- struct file *file,
56757- u32 start, u32 len)
56758-{
56759- struct address_space *mapping;
56760- pgoff_t index;
56761- unsigned long num_pages;
56762- int cs_bits = OCFS2_SB(inode->i_sb)->s_clustersize_bits;
56763-
56764- if (!file)
56765- return;
56766-
56767- mapping = file->f_mapping;
56768- num_pages = (len << cs_bits) >> PAGE_CACHE_SHIFT;
56769- if (!num_pages)
56770- num_pages = 1;
56771-
56772- index = ((loff_t)start << cs_bits) >> PAGE_CACHE_SHIFT;
56773- page_cache_sync_readahead(mapping, &file->f_ra, file,
56774- index, num_pages);
56775-}
56776-
56777 /*
56778 * Starting at cpos, try to CoW write_len clusters. Don't CoW
56779 * past max_cpos. This will stop when it runs into a hole or an
56780 * unrefcounted extent.
56781 */
56782 static int ocfs2_refcount_cow_hunk(struct inode *inode,
56783- struct file *file,
56784 struct buffer_head *di_bh,
56785 u32 cpos, u32 write_len, u32 max_cpos)
56786 {
56787@@ -3480,8 +3447,6 @@ static int ocfs2_refcount_cow_hunk(struct inode *inode,
56788
56789 BUG_ON(cow_len == 0);
56790
56791- ocfs2_readahead_for_cow(inode, file, cow_start, cow_len);
56792-
56793 context = kzalloc(sizeof(struct ocfs2_cow_context), GFP_NOFS);
56794 if (!context) {
56795 ret = -ENOMEM;
56796@@ -3503,7 +3468,6 @@ static int ocfs2_refcount_cow_hunk(struct inode *inode,
56797 context->ref_root_bh = ref_root_bh;
56798 context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_page;
56799 context->get_clusters = ocfs2_di_get_clusters;
56800- context->file = file;
56801
56802 ocfs2_init_dinode_extent_tree(&context->data_et,
56803 INODE_CACHE(inode), di_bh);
56804@@ -3532,7 +3496,6 @@ out:
56805 * clusters between cpos and cpos+write_len are safe to modify.
56806 */
56807 int ocfs2_refcount_cow(struct inode *inode,
56808- struct file *file,
56809 struct buffer_head *di_bh,
56810 u32 cpos, u32 write_len, u32 max_cpos)
56811 {
56812@@ -3552,7 +3515,7 @@ int ocfs2_refcount_cow(struct inode *inode,
56813 num_clusters = write_len;
56814
56815 if (ext_flags & OCFS2_EXT_REFCOUNTED) {
56816- ret = ocfs2_refcount_cow_hunk(inode, file, di_bh, cpos,
56817+ ret = ocfs2_refcount_cow_hunk(inode, di_bh, cpos,
56818 num_clusters, max_cpos);
56819 if (ret) {
56820 mlog_errno(ret);
56821diff --git a/fs/ocfs2/refcounttree.h b/fs/ocfs2/refcounttree.h
56822index 7754608..6422bbcdb 100644
56823--- a/fs/ocfs2/refcounttree.h
56824+++ b/fs/ocfs2/refcounttree.h
56825@@ -53,7 +53,7 @@ int ocfs2_prepare_refcount_change_for_del(struct inode *inode,
56826 int *credits,
56827 int *ref_blocks);
56828 int ocfs2_refcount_cow(struct inode *inode,
56829- struct file *filep, struct buffer_head *di_bh,
56830+ struct buffer_head *di_bh,
56831 u32 cpos, u32 write_len, u32 max_cpos);
56832
56833 typedef int (ocfs2_post_refcount_func)(struct inode *inode,
56834@@ -85,11 +85,11 @@ int ocfs2_refcount_cow_xattr(struct inode *inode,
56835 u32 cpos, u32 write_len,
56836 struct ocfs2_post_refcount *post);
56837 int ocfs2_duplicate_clusters_by_page(handle_t *handle,
56838- struct file *file,
56839+ struct inode *inode,
56840 u32 cpos, u32 old_cluster,
56841 u32 new_cluster, u32 new_len);
56842 int ocfs2_duplicate_clusters_by_jbd(handle_t *handle,
56843- struct file *file,
56844+ struct inode *inode,
56845 u32 cpos, u32 old_cluster,
56846 u32 new_cluster, u32 new_len);
56847 int ocfs2_cow_sync_writeback(struct super_block *sb,
56848diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
56849index b7e74b5..19c6536 100644
56850--- a/fs/ocfs2/suballoc.c
56851+++ b/fs/ocfs2/suballoc.c
56852@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
56853 mlog_errno(status);
56854 goto bail;
56855 }
56856- atomic_inc(&osb->alloc_stats.bg_extends);
56857+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
56858
56859 /* You should never ask for this much metadata */
56860 BUG_ON(bits_wanted >
56861@@ -2007,7 +2007,7 @@ int ocfs2_claim_metadata(handle_t *handle,
56862 mlog_errno(status);
56863 goto bail;
56864 }
56865- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
56866+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
56867
56868 *suballoc_loc = res.sr_bg_blkno;
56869 *suballoc_bit_start = res.sr_bit_offset;
56870@@ -2171,7 +2171,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
56871 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
56872 res->sr_bits);
56873
56874- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
56875+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
56876
56877 BUG_ON(res->sr_bits != 1);
56878
56879@@ -2213,7 +2213,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
56880 mlog_errno(status);
56881 goto bail;
56882 }
56883- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
56884+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
56885
56886 BUG_ON(res.sr_bits != 1);
56887
56888@@ -2317,7 +2317,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
56889 cluster_start,
56890 num_clusters);
56891 if (!status)
56892- atomic_inc(&osb->alloc_stats.local_data);
56893+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
56894 } else {
56895 if (min_clusters > (osb->bitmap_cpg - 1)) {
56896 /* The only paths asking for contiguousness
56897@@ -2343,7 +2343,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
56898 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
56899 res.sr_bg_blkno,
56900 res.sr_bit_offset);
56901- atomic_inc(&osb->alloc_stats.bitmap_data);
56902+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
56903 *num_clusters = res.sr_bits;
56904 }
56905 }
56906diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
56907index 01b8516..579c4df 100644
56908--- a/fs/ocfs2/super.c
56909+++ b/fs/ocfs2/super.c
56910@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
56911 "%10s => GlobalAllocs: %d LocalAllocs: %d "
56912 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
56913 "Stats",
56914- atomic_read(&osb->alloc_stats.bitmap_data),
56915- atomic_read(&osb->alloc_stats.local_data),
56916- atomic_read(&osb->alloc_stats.bg_allocs),
56917- atomic_read(&osb->alloc_stats.moves),
56918- atomic_read(&osb->alloc_stats.bg_extends));
56919+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
56920+ atomic_read_unchecked(&osb->alloc_stats.local_data),
56921+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
56922+ atomic_read_unchecked(&osb->alloc_stats.moves),
56923+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
56924
56925 out += snprintf(buf + out, len - out,
56926 "%10s => State: %u Descriptor: %llu Size: %u bits "
56927@@ -2122,11 +2122,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
56928 spin_lock_init(&osb->osb_xattr_lock);
56929 ocfs2_init_steal_slots(osb);
56930
56931- atomic_set(&osb->alloc_stats.moves, 0);
56932- atomic_set(&osb->alloc_stats.local_data, 0);
56933- atomic_set(&osb->alloc_stats.bitmap_data, 0);
56934- atomic_set(&osb->alloc_stats.bg_allocs, 0);
56935- atomic_set(&osb->alloc_stats.bg_extends, 0);
56936+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
56937+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
56938+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
56939+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
56940+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
56941
56942 /* Copy the blockcheck stats from the superblock probe */
56943 osb->osb_ecc_stats = *stats;
56944diff --git a/fs/open.c b/fs/open.c
56945index 8c74100..4239c48 100644
56946--- a/fs/open.c
56947+++ b/fs/open.c
56948@@ -32,6 +32,8 @@
56949 #include <linux/dnotify.h>
56950 #include <linux/compat.h>
56951
56952+#define CREATE_TRACE_POINTS
56953+#include <trace/events/fs.h>
56954 #include "internal.h"
56955
56956 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
56957@@ -102,6 +104,8 @@ long vfs_truncate(struct path *path, loff_t length)
56958 error = locks_verify_truncate(inode, NULL, length);
56959 if (!error)
56960 error = security_path_truncate(path);
56961+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
56962+ error = -EACCES;
56963 if (!error)
56964 error = do_truncate(path->dentry, length, 0, NULL);
56965
56966@@ -186,6 +190,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
56967 error = locks_verify_truncate(inode, f.file, length);
56968 if (!error)
56969 error = security_path_truncate(&f.file->f_path);
56970+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
56971+ error = -EACCES;
56972 if (!error)
56973 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
56974 sb_end_write(inode->i_sb);
56975@@ -360,6 +366,9 @@ retry:
56976 if (__mnt_is_readonly(path.mnt))
56977 res = -EROFS;
56978
56979+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
56980+ res = -EACCES;
56981+
56982 out_path_release:
56983 path_put(&path);
56984 if (retry_estale(res, lookup_flags)) {
56985@@ -391,6 +400,8 @@ retry:
56986 if (error)
56987 goto dput_and_out;
56988
56989+ gr_log_chdir(path.dentry, path.mnt);
56990+
56991 set_fs_pwd(current->fs, &path);
56992
56993 dput_and_out:
56994@@ -420,6 +431,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
56995 goto out_putf;
56996
56997 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
56998+
56999+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
57000+ error = -EPERM;
57001+
57002+ if (!error)
57003+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
57004+
57005 if (!error)
57006 set_fs_pwd(current->fs, &f.file->f_path);
57007 out_putf:
57008@@ -449,7 +467,13 @@ retry:
57009 if (error)
57010 goto dput_and_out;
57011
57012+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
57013+ goto dput_and_out;
57014+
57015 set_fs_root(current->fs, &path);
57016+
57017+ gr_handle_chroot_chdir(&path);
57018+
57019 error = 0;
57020 dput_and_out:
57021 path_put(&path);
57022@@ -471,6 +495,16 @@ static int chmod_common(struct path *path, umode_t mode)
57023 if (error)
57024 return error;
57025 mutex_lock(&inode->i_mutex);
57026+
57027+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
57028+ error = -EACCES;
57029+ goto out_unlock;
57030+ }
57031+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
57032+ error = -EACCES;
57033+ goto out_unlock;
57034+ }
57035+
57036 error = security_path_chmod(path, mode);
57037 if (error)
57038 goto out_unlock;
57039@@ -531,6 +565,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
57040 uid = make_kuid(current_user_ns(), user);
57041 gid = make_kgid(current_user_ns(), group);
57042
57043+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
57044+ return -EACCES;
57045+
57046 newattrs.ia_valid = ATTR_CTIME;
57047 if (user != (uid_t) -1) {
57048 if (!uid_valid(uid))
57049@@ -946,6 +983,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
57050 } else {
57051 fsnotify_open(f);
57052 fd_install(fd, f);
57053+ trace_do_sys_open(tmp->name, flags, mode);
57054 }
57055 }
57056 putname(tmp);
57057diff --git a/fs/pipe.c b/fs/pipe.c
57058index d2c45e1..009fe1c 100644
57059--- a/fs/pipe.c
57060+++ b/fs/pipe.c
57061@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
57062
57063 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
57064 {
57065- if (pipe->files)
57066+ if (atomic_read(&pipe->files))
57067 mutex_lock_nested(&pipe->mutex, subclass);
57068 }
57069
57070@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
57071
57072 void pipe_unlock(struct pipe_inode_info *pipe)
57073 {
57074- if (pipe->files)
57075+ if (atomic_read(&pipe->files))
57076 mutex_unlock(&pipe->mutex);
57077 }
57078 EXPORT_SYMBOL(pipe_unlock);
57079@@ -449,9 +449,9 @@ redo:
57080 }
57081 if (bufs) /* More to do? */
57082 continue;
57083- if (!pipe->writers)
57084+ if (!atomic_read(&pipe->writers))
57085 break;
57086- if (!pipe->waiting_writers) {
57087+ if (!atomic_read(&pipe->waiting_writers)) {
57088 /* syscall merging: Usually we must not sleep
57089 * if O_NONBLOCK is set, or if we got some data.
57090 * But if a writer sleeps in kernel space, then
57091@@ -513,7 +513,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
57092 ret = 0;
57093 __pipe_lock(pipe);
57094
57095- if (!pipe->readers) {
57096+ if (!atomic_read(&pipe->readers)) {
57097 send_sig(SIGPIPE, current, 0);
57098 ret = -EPIPE;
57099 goto out;
57100@@ -562,7 +562,7 @@ redo1:
57101 for (;;) {
57102 int bufs;
57103
57104- if (!pipe->readers) {
57105+ if (!atomic_read(&pipe->readers)) {
57106 send_sig(SIGPIPE, current, 0);
57107 if (!ret)
57108 ret = -EPIPE;
57109@@ -653,9 +653,9 @@ redo2:
57110 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
57111 do_wakeup = 0;
57112 }
57113- pipe->waiting_writers++;
57114+ atomic_inc(&pipe->waiting_writers);
57115 pipe_wait(pipe);
57116- pipe->waiting_writers--;
57117+ atomic_dec(&pipe->waiting_writers);
57118 }
57119 out:
57120 __pipe_unlock(pipe);
57121@@ -709,7 +709,7 @@ pipe_poll(struct file *filp, poll_table *wait)
57122 mask = 0;
57123 if (filp->f_mode & FMODE_READ) {
57124 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
57125- if (!pipe->writers && filp->f_version != pipe->w_counter)
57126+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
57127 mask |= POLLHUP;
57128 }
57129
57130@@ -719,7 +719,7 @@ pipe_poll(struct file *filp, poll_table *wait)
57131 * Most Unices do not set POLLERR for FIFOs but on Linux they
57132 * behave exactly like pipes for poll().
57133 */
57134- if (!pipe->readers)
57135+ if (!atomic_read(&pipe->readers))
57136 mask |= POLLERR;
57137 }
57138
57139@@ -734,17 +734,17 @@ pipe_release(struct inode *inode, struct file *file)
57140
57141 __pipe_lock(pipe);
57142 if (file->f_mode & FMODE_READ)
57143- pipe->readers--;
57144+ atomic_dec(&pipe->readers);
57145 if (file->f_mode & FMODE_WRITE)
57146- pipe->writers--;
57147+ atomic_dec(&pipe->writers);
57148
57149- if (pipe->readers || pipe->writers) {
57150+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
57151 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
57152 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
57153 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
57154 }
57155 spin_lock(&inode->i_lock);
57156- if (!--pipe->files) {
57157+ if (atomic_dec_and_test(&pipe->files)) {
57158 inode->i_pipe = NULL;
57159 kill = 1;
57160 }
57161@@ -811,7 +811,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
57162 kfree(pipe);
57163 }
57164
57165-static struct vfsmount *pipe_mnt __read_mostly;
57166+struct vfsmount *pipe_mnt __read_mostly;
57167
57168 /*
57169 * pipefs_dname() is called from d_path().
57170@@ -841,8 +841,9 @@ static struct inode * get_pipe_inode(void)
57171 goto fail_iput;
57172
57173 inode->i_pipe = pipe;
57174- pipe->files = 2;
57175- pipe->readers = pipe->writers = 1;
57176+ atomic_set(&pipe->files, 2);
57177+ atomic_set(&pipe->readers, 1);
57178+ atomic_set(&pipe->writers, 1);
57179 inode->i_fop = &pipefifo_fops;
57180
57181 /*
57182@@ -1022,17 +1023,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
57183 spin_lock(&inode->i_lock);
57184 if (inode->i_pipe) {
57185 pipe = inode->i_pipe;
57186- pipe->files++;
57187+ atomic_inc(&pipe->files);
57188 spin_unlock(&inode->i_lock);
57189 } else {
57190 spin_unlock(&inode->i_lock);
57191 pipe = alloc_pipe_info();
57192 if (!pipe)
57193 return -ENOMEM;
57194- pipe->files = 1;
57195+ atomic_set(&pipe->files, 1);
57196 spin_lock(&inode->i_lock);
57197 if (unlikely(inode->i_pipe)) {
57198- inode->i_pipe->files++;
57199+ atomic_inc(&inode->i_pipe->files);
57200 spin_unlock(&inode->i_lock);
57201 free_pipe_info(pipe);
57202 pipe = inode->i_pipe;
57203@@ -1057,10 +1058,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
57204 * opened, even when there is no process writing the FIFO.
57205 */
57206 pipe->r_counter++;
57207- if (pipe->readers++ == 0)
57208+ if (atomic_inc_return(&pipe->readers) == 1)
57209 wake_up_partner(pipe);
57210
57211- if (!is_pipe && !pipe->writers) {
57212+ if (!is_pipe && !atomic_read(&pipe->writers)) {
57213 if ((filp->f_flags & O_NONBLOCK)) {
57214 /* suppress POLLHUP until we have
57215 * seen a writer */
57216@@ -1079,14 +1080,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
57217 * errno=ENXIO when there is no process reading the FIFO.
57218 */
57219 ret = -ENXIO;
57220- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
57221+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
57222 goto err;
57223
57224 pipe->w_counter++;
57225- if (!pipe->writers++)
57226+ if (atomic_inc_return(&pipe->writers) == 1)
57227 wake_up_partner(pipe);
57228
57229- if (!is_pipe && !pipe->readers) {
57230+ if (!is_pipe && !atomic_read(&pipe->readers)) {
57231 if (wait_for_partner(pipe, &pipe->r_counter))
57232 goto err_wr;
57233 }
57234@@ -1100,11 +1101,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
57235 * the process can at least talk to itself.
57236 */
57237
57238- pipe->readers++;
57239- pipe->writers++;
57240+ atomic_inc(&pipe->readers);
57241+ atomic_inc(&pipe->writers);
57242 pipe->r_counter++;
57243 pipe->w_counter++;
57244- if (pipe->readers == 1 || pipe->writers == 1)
57245+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
57246 wake_up_partner(pipe);
57247 break;
57248
57249@@ -1118,20 +1119,20 @@ static int fifo_open(struct inode *inode, struct file *filp)
57250 return 0;
57251
57252 err_rd:
57253- if (!--pipe->readers)
57254+ if (atomic_dec_and_test(&pipe->readers))
57255 wake_up_interruptible(&pipe->wait);
57256 ret = -ERESTARTSYS;
57257 goto err;
57258
57259 err_wr:
57260- if (!--pipe->writers)
57261+ if (atomic_dec_and_test(&pipe->writers))
57262 wake_up_interruptible(&pipe->wait);
57263 ret = -ERESTARTSYS;
57264 goto err;
57265
57266 err:
57267 spin_lock(&inode->i_lock);
57268- if (!--pipe->files) {
57269+ if (atomic_dec_and_test(&pipe->files)) {
57270 inode->i_pipe = NULL;
57271 kill = 1;
57272 }
57273diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
57274index 15af622..0e9f4467 100644
57275--- a/fs/proc/Kconfig
57276+++ b/fs/proc/Kconfig
57277@@ -30,12 +30,12 @@ config PROC_FS
57278
57279 config PROC_KCORE
57280 bool "/proc/kcore support" if !ARM
57281- depends on PROC_FS && MMU
57282+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
57283
57284 config PROC_VMCORE
57285 bool "/proc/vmcore support"
57286- depends on PROC_FS && CRASH_DUMP
57287- default y
57288+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
57289+ default n
57290 help
57291 Exports the dump image of crashed kernel in ELF format.
57292
57293@@ -59,8 +59,8 @@ config PROC_SYSCTL
57294 limited in memory.
57295
57296 config PROC_PAGE_MONITOR
57297- default y
57298- depends on PROC_FS && MMU
57299+ default n
57300+ depends on PROC_FS && MMU && !GRKERNSEC
57301 bool "Enable /proc page monitoring" if EXPERT
57302 help
57303 Various /proc files exist to monitor process memory utilization:
57304diff --git a/fs/proc/array.c b/fs/proc/array.c
57305index cbd0f1b..adec3f0 100644
57306--- a/fs/proc/array.c
57307+++ b/fs/proc/array.c
57308@@ -60,6 +60,7 @@
57309 #include <linux/tty.h>
57310 #include <linux/string.h>
57311 #include <linux/mman.h>
57312+#include <linux/grsecurity.h>
57313 #include <linux/proc_fs.h>
57314 #include <linux/ioport.h>
57315 #include <linux/uaccess.h>
57316@@ -363,6 +364,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
57317 seq_putc(m, '\n');
57318 }
57319
57320+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
57321+static inline void task_pax(struct seq_file *m, struct task_struct *p)
57322+{
57323+ if (p->mm)
57324+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
57325+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
57326+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
57327+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
57328+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
57329+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
57330+ else
57331+ seq_printf(m, "PaX:\t-----\n");
57332+}
57333+#endif
57334+
57335 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
57336 struct pid *pid, struct task_struct *task)
57337 {
57338@@ -381,9 +397,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
57339 task_cpus_allowed(m, task);
57340 cpuset_task_status_allowed(m, task);
57341 task_context_switch_counts(m, task);
57342+
57343+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
57344+ task_pax(m, task);
57345+#endif
57346+
57347+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
57348+ task_grsec_rbac(m, task);
57349+#endif
57350+
57351 return 0;
57352 }
57353
57354+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57355+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
57356+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
57357+ _mm->pax_flags & MF_PAX_SEGMEXEC))
57358+#endif
57359+
57360 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
57361 struct pid *pid, struct task_struct *task, int whole)
57362 {
57363@@ -405,6 +436,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
57364 char tcomm[sizeof(task->comm)];
57365 unsigned long flags;
57366
57367+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57368+ if (current->exec_id != m->exec_id) {
57369+ gr_log_badprocpid("stat");
57370+ return 0;
57371+ }
57372+#endif
57373+
57374 state = *get_task_state(task);
57375 vsize = eip = esp = 0;
57376 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
57377@@ -476,6 +514,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
57378 gtime = task_gtime(task);
57379 }
57380
57381+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57382+ if (PAX_RAND_FLAGS(mm)) {
57383+ eip = 0;
57384+ esp = 0;
57385+ wchan = 0;
57386+ }
57387+#endif
57388+#ifdef CONFIG_GRKERNSEC_HIDESYM
57389+ wchan = 0;
57390+ eip =0;
57391+ esp =0;
57392+#endif
57393+
57394 /* scale priority and nice values from timeslices to -20..20 */
57395 /* to make it look like a "normal" Unix priority/nice value */
57396 priority = task_prio(task);
57397@@ -512,9 +563,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
57398 seq_put_decimal_ull(m, ' ', vsize);
57399 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
57400 seq_put_decimal_ull(m, ' ', rsslim);
57401+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57402+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
57403+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
57404+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
57405+#else
57406 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
57407 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
57408 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
57409+#endif
57410 seq_put_decimal_ull(m, ' ', esp);
57411 seq_put_decimal_ull(m, ' ', eip);
57412 /* The signal information here is obsolete.
57413@@ -536,7 +593,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
57414 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
57415 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
57416
57417- if (mm && permitted) {
57418+ if (mm && permitted
57419+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57420+ && !PAX_RAND_FLAGS(mm)
57421+#endif
57422+ ) {
57423 seq_put_decimal_ull(m, ' ', mm->start_data);
57424 seq_put_decimal_ull(m, ' ', mm->end_data);
57425 seq_put_decimal_ull(m, ' ', mm->start_brk);
57426@@ -574,8 +635,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
57427 struct pid *pid, struct task_struct *task)
57428 {
57429 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
57430- struct mm_struct *mm = get_task_mm(task);
57431+ struct mm_struct *mm;
57432
57433+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57434+ if (current->exec_id != m->exec_id) {
57435+ gr_log_badprocpid("statm");
57436+ return 0;
57437+ }
57438+#endif
57439+ mm = get_task_mm(task);
57440 if (mm) {
57441 size = task_statm(mm, &shared, &text, &data, &resident);
57442 mmput(mm);
57443@@ -598,6 +666,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
57444 return 0;
57445 }
57446
57447+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
57448+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
57449+{
57450+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
57451+}
57452+#endif
57453+
57454 #ifdef CONFIG_CHECKPOINT_RESTORE
57455 static struct pid *
57456 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
57457diff --git a/fs/proc/base.c b/fs/proc/base.c
57458index c3834da..b402b2b 100644
57459--- a/fs/proc/base.c
57460+++ b/fs/proc/base.c
57461@@ -113,6 +113,14 @@ struct pid_entry {
57462 union proc_op op;
57463 };
57464
57465+struct getdents_callback {
57466+ struct linux_dirent __user * current_dir;
57467+ struct linux_dirent __user * previous;
57468+ struct file * file;
57469+ int count;
57470+ int error;
57471+};
57472+
57473 #define NOD(NAME, MODE, IOP, FOP, OP) { \
57474 .name = (NAME), \
57475 .len = sizeof(NAME) - 1, \
57476@@ -210,6 +218,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
57477 if (!mm->arg_end)
57478 goto out_mm; /* Shh! No looking before we're done */
57479
57480+ if (gr_acl_handle_procpidmem(task))
57481+ goto out_mm;
57482+
57483 len = mm->arg_end - mm->arg_start;
57484
57485 if (len > PAGE_SIZE)
57486@@ -237,12 +248,28 @@ out:
57487 return res;
57488 }
57489
57490+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57491+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
57492+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
57493+ _mm->pax_flags & MF_PAX_SEGMEXEC))
57494+#endif
57495+
57496 static int proc_pid_auxv(struct task_struct *task, char *buffer)
57497 {
57498 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
57499 int res = PTR_ERR(mm);
57500 if (mm && !IS_ERR(mm)) {
57501 unsigned int nwords = 0;
57502+
57503+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57504+ /* allow if we're currently ptracing this task */
57505+ if (PAX_RAND_FLAGS(mm) &&
57506+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
57507+ mmput(mm);
57508+ return 0;
57509+ }
57510+#endif
57511+
57512 do {
57513 nwords += 2;
57514 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
57515@@ -256,7 +283,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
57516 }
57517
57518
57519-#ifdef CONFIG_KALLSYMS
57520+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
57521 /*
57522 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
57523 * Returns the resolved symbol. If that fails, simply return the address.
57524@@ -295,7 +322,7 @@ static void unlock_trace(struct task_struct *task)
57525 mutex_unlock(&task->signal->cred_guard_mutex);
57526 }
57527
57528-#ifdef CONFIG_STACKTRACE
57529+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
57530
57531 #define MAX_STACK_TRACE_DEPTH 64
57532
57533@@ -518,7 +545,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
57534 return count;
57535 }
57536
57537-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
57538+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
57539 static int proc_pid_syscall(struct task_struct *task, char *buffer)
57540 {
57541 long nr;
57542@@ -547,7 +574,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
57543 /************************************************************************/
57544
57545 /* permission checks */
57546-static int proc_fd_access_allowed(struct inode *inode)
57547+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
57548 {
57549 struct task_struct *task;
57550 int allowed = 0;
57551@@ -557,7 +584,10 @@ static int proc_fd_access_allowed(struct inode *inode)
57552 */
57553 task = get_proc_task(inode);
57554 if (task) {
57555- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
57556+ if (log)
57557+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
57558+ else
57559+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
57560 put_task_struct(task);
57561 }
57562 return allowed;
57563@@ -588,10 +618,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
57564 struct task_struct *task,
57565 int hide_pid_min)
57566 {
57567+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
57568+ return false;
57569+
57570+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
57571+ rcu_read_lock();
57572+ {
57573+ const struct cred *tmpcred = current_cred();
57574+ const struct cred *cred = __task_cred(task);
57575+
57576+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
57577+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
57578+ || in_group_p(grsec_proc_gid)
57579+#endif
57580+ ) {
57581+ rcu_read_unlock();
57582+ return true;
57583+ }
57584+ }
57585+ rcu_read_unlock();
57586+
57587+ if (!pid->hide_pid)
57588+ return false;
57589+#endif
57590+
57591 if (pid->hide_pid < hide_pid_min)
57592 return true;
57593 if (in_group_p(pid->pid_gid))
57594 return true;
57595+
57596 return ptrace_may_access(task, PTRACE_MODE_READ);
57597 }
57598
57599@@ -609,7 +664,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
57600 put_task_struct(task);
57601
57602 if (!has_perms) {
57603+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
57604+ {
57605+#else
57606 if (pid->hide_pid == 2) {
57607+#endif
57608 /*
57609 * Let's make getdents(), stat(), and open()
57610 * consistent with each other. If a process
57611@@ -707,6 +766,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
57612 if (!task)
57613 return -ESRCH;
57614
57615+ if (gr_acl_handle_procpidmem(task)) {
57616+ put_task_struct(task);
57617+ return -EPERM;
57618+ }
57619+
57620 mm = mm_access(task, mode);
57621 put_task_struct(task);
57622
57623@@ -722,6 +786,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
57624
57625 file->private_data = mm;
57626
57627+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57628+ file->f_version = current->exec_id;
57629+#endif
57630+
57631 return 0;
57632 }
57633
57634@@ -743,6 +811,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
57635 ssize_t copied;
57636 char *page;
57637
57638+#ifdef CONFIG_GRKERNSEC
57639+ if (write)
57640+ return -EPERM;
57641+#endif
57642+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57643+ if (file->f_version != current->exec_id) {
57644+ gr_log_badprocpid("mem");
57645+ return 0;
57646+ }
57647+#endif
57648+
57649 if (!mm)
57650 return 0;
57651
57652@@ -755,7 +834,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
57653 goto free;
57654
57655 while (count > 0) {
57656- int this_len = min_t(int, count, PAGE_SIZE);
57657+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
57658
57659 if (write && copy_from_user(page, buf, this_len)) {
57660 copied = -EFAULT;
57661@@ -847,6 +926,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
57662 if (!mm)
57663 return 0;
57664
57665+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
57666+ if (file->f_version != current->exec_id) {
57667+ gr_log_badprocpid("environ");
57668+ return 0;
57669+ }
57670+#endif
57671+
57672 page = (char *)__get_free_page(GFP_TEMPORARY);
57673 if (!page)
57674 return -ENOMEM;
57675@@ -856,7 +942,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
57676 goto free;
57677 while (count > 0) {
57678 size_t this_len, max_len;
57679- int retval;
57680+ ssize_t retval;
57681
57682 if (src >= (mm->env_end - mm->env_start))
57683 break;
57684@@ -1461,7 +1547,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
57685 int error = -EACCES;
57686
57687 /* Are we allowed to snoop on the tasks file descriptors? */
57688- if (!proc_fd_access_allowed(inode))
57689+ if (!proc_fd_access_allowed(inode, 0))
57690 goto out;
57691
57692 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
57693@@ -1505,8 +1591,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
57694 struct path path;
57695
57696 /* Are we allowed to snoop on the tasks file descriptors? */
57697- if (!proc_fd_access_allowed(inode))
57698- goto out;
57699+ /* logging this is needed for learning on chromium to work properly,
57700+ but we don't want to flood the logs from 'ps' which does a readlink
57701+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
57702+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
57703+ */
57704+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
57705+ if (!proc_fd_access_allowed(inode,0))
57706+ goto out;
57707+ } else {
57708+ if (!proc_fd_access_allowed(inode,1))
57709+ goto out;
57710+ }
57711
57712 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
57713 if (error)
57714@@ -1556,7 +1652,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
57715 rcu_read_lock();
57716 cred = __task_cred(task);
57717 inode->i_uid = cred->euid;
57718+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
57719+ inode->i_gid = grsec_proc_gid;
57720+#else
57721 inode->i_gid = cred->egid;
57722+#endif
57723 rcu_read_unlock();
57724 }
57725 security_task_to_inode(task, inode);
57726@@ -1592,10 +1692,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
57727 return -ENOENT;
57728 }
57729 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
57730+#ifdef CONFIG_GRKERNSEC_PROC_USER
57731+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
57732+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
57733+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
57734+#endif
57735 task_dumpable(task)) {
57736 cred = __task_cred(task);
57737 stat->uid = cred->euid;
57738+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
57739+ stat->gid = grsec_proc_gid;
57740+#else
57741 stat->gid = cred->egid;
57742+#endif
57743 }
57744 }
57745 rcu_read_unlock();
57746@@ -1633,11 +1742,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
57747
57748 if (task) {
57749 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
57750+#ifdef CONFIG_GRKERNSEC_PROC_USER
57751+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
57752+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
57753+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
57754+#endif
57755 task_dumpable(task)) {
57756 rcu_read_lock();
57757 cred = __task_cred(task);
57758 inode->i_uid = cred->euid;
57759+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
57760+ inode->i_gid = grsec_proc_gid;
57761+#else
57762 inode->i_gid = cred->egid;
57763+#endif
57764 rcu_read_unlock();
57765 } else {
57766 inode->i_uid = GLOBAL_ROOT_UID;
57767@@ -2196,6 +2314,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
57768 if (!task)
57769 goto out_no_task;
57770
57771+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
57772+ goto out;
57773+
57774 /*
57775 * Yes, it does not scale. And it should not. Don't add
57776 * new entries into /proc/<tgid>/ without very good reasons.
57777@@ -2240,6 +2361,9 @@ static int proc_pident_readdir(struct file *filp,
57778 if (!task)
57779 goto out_no_task;
57780
57781+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
57782+ goto out;
57783+
57784 ret = 0;
57785 i = filp->f_pos;
57786 switch (i) {
57787@@ -2653,7 +2777,7 @@ static const struct pid_entry tgid_base_stuff[] = {
57788 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
57789 #endif
57790 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
57791-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
57792+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
57793 INF("syscall", S_IRUGO, proc_pid_syscall),
57794 #endif
57795 INF("cmdline", S_IRUGO, proc_pid_cmdline),
57796@@ -2678,10 +2802,10 @@ static const struct pid_entry tgid_base_stuff[] = {
57797 #ifdef CONFIG_SECURITY
57798 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
57799 #endif
57800-#ifdef CONFIG_KALLSYMS
57801+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
57802 INF("wchan", S_IRUGO, proc_pid_wchan),
57803 #endif
57804-#ifdef CONFIG_STACKTRACE
57805+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
57806 ONE("stack", S_IRUGO, proc_pid_stack),
57807 #endif
57808 #ifdef CONFIG_SCHEDSTATS
57809@@ -2715,6 +2839,9 @@ static const struct pid_entry tgid_base_stuff[] = {
57810 #ifdef CONFIG_HARDWALL
57811 INF("hardwall", S_IRUGO, proc_pid_hardwall),
57812 #endif
57813+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
57814+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
57815+#endif
57816 #ifdef CONFIG_USER_NS
57817 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
57818 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
57819@@ -2847,7 +2974,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
57820 if (!inode)
57821 goto out;
57822
57823+#ifdef CONFIG_GRKERNSEC_PROC_USER
57824+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
57825+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
57826+ inode->i_gid = grsec_proc_gid;
57827+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
57828+#else
57829 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
57830+#endif
57831 inode->i_op = &proc_tgid_base_inode_operations;
57832 inode->i_fop = &proc_tgid_base_operations;
57833 inode->i_flags|=S_IMMUTABLE;
57834@@ -2885,7 +3019,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
57835 if (!task)
57836 goto out;
57837
57838+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
57839+ goto out_put_task;
57840+
57841 result = proc_pid_instantiate(dir, dentry, task, NULL);
57842+out_put_task:
57843 put_task_struct(task);
57844 out:
57845 return result;
57846@@ -2948,6 +3086,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
57847 static int fake_filldir(void *buf, const char *name, int namelen,
57848 loff_t offset, u64 ino, unsigned d_type)
57849 {
57850+ struct getdents_callback * __buf = (struct getdents_callback *) buf;
57851+ __buf->error = -EINVAL;
57852 return 0;
57853 }
57854
57855@@ -3007,7 +3147,7 @@ static const struct pid_entry tid_base_stuff[] = {
57856 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
57857 #endif
57858 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
57859-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
57860+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
57861 INF("syscall", S_IRUGO, proc_pid_syscall),
57862 #endif
57863 INF("cmdline", S_IRUGO, proc_pid_cmdline),
57864@@ -3034,10 +3174,10 @@ static const struct pid_entry tid_base_stuff[] = {
57865 #ifdef CONFIG_SECURITY
57866 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
57867 #endif
57868-#ifdef CONFIG_KALLSYMS
57869+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
57870 INF("wchan", S_IRUGO, proc_pid_wchan),
57871 #endif
57872-#ifdef CONFIG_STACKTRACE
57873+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
57874 ONE("stack", S_IRUGO, proc_pid_stack),
57875 #endif
57876 #ifdef CONFIG_SCHEDSTATS
57877diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
57878index 82676e3..5f8518a 100644
57879--- a/fs/proc/cmdline.c
57880+++ b/fs/proc/cmdline.c
57881@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
57882
57883 static int __init proc_cmdline_init(void)
57884 {
57885+#ifdef CONFIG_GRKERNSEC_PROC_ADD
57886+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
57887+#else
57888 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
57889+#endif
57890 return 0;
57891 }
57892 module_init(proc_cmdline_init);
57893diff --git a/fs/proc/devices.c b/fs/proc/devices.c
57894index b143471..bb105e5 100644
57895--- a/fs/proc/devices.c
57896+++ b/fs/proc/devices.c
57897@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
57898
57899 static int __init proc_devices_init(void)
57900 {
57901+#ifdef CONFIG_GRKERNSEC_PROC_ADD
57902+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
57903+#else
57904 proc_create("devices", 0, NULL, &proc_devinfo_operations);
57905+#endif
57906 return 0;
57907 }
57908 module_init(proc_devices_init);
57909diff --git a/fs/proc/fd.c b/fs/proc/fd.c
57910index d7a4a28..0201742 100644
57911--- a/fs/proc/fd.c
57912+++ b/fs/proc/fd.c
57913@@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
57914 if (!task)
57915 return -ENOENT;
57916
57917- files = get_files_struct(task);
57918+ if (!gr_acl_handle_procpidmem(task))
57919+ files = get_files_struct(task);
57920 put_task_struct(task);
57921
57922 if (files) {
57923@@ -302,11 +303,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
57924 */
57925 int proc_fd_permission(struct inode *inode, int mask)
57926 {
57927+ struct task_struct *task;
57928 int rv = generic_permission(inode, mask);
57929- if (rv == 0)
57930- return 0;
57931+
57932 if (task_pid(current) == proc_pid(inode))
57933 rv = 0;
57934+
57935+ task = get_proc_task(inode);
57936+ if (task == NULL)
57937+ return rv;
57938+
57939+ if (gr_acl_handle_procpidmem(task))
57940+ rv = -EACCES;
57941+
57942+ put_task_struct(task);
57943+
57944 return rv;
57945 }
57946
57947diff --git a/fs/proc/inode.c b/fs/proc/inode.c
57948index 073aea6..0630370 100644
57949--- a/fs/proc/inode.c
57950+++ b/fs/proc/inode.c
57951@@ -23,11 +23,17 @@
57952 #include <linux/slab.h>
57953 #include <linux/mount.h>
57954 #include <linux/magic.h>
57955+#include <linux/grsecurity.h>
57956
57957 #include <asm/uaccess.h>
57958
57959 #include "internal.h"
57960
57961+#ifdef CONFIG_PROC_SYSCTL
57962+extern const struct inode_operations proc_sys_inode_operations;
57963+extern const struct inode_operations proc_sys_dir_operations;
57964+#endif
57965+
57966 static void proc_evict_inode(struct inode *inode)
57967 {
57968 struct proc_dir_entry *de;
57969@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
57970 ns = PROC_I(inode)->ns.ns;
57971 if (ns_ops && ns)
57972 ns_ops->put(ns);
57973+
57974+#ifdef CONFIG_PROC_SYSCTL
57975+ if (inode->i_op == &proc_sys_inode_operations ||
57976+ inode->i_op == &proc_sys_dir_operations)
57977+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
57978+#endif
57979+
57980 }
57981
57982 static struct kmem_cache * proc_inode_cachep;
57983@@ -385,7 +398,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
57984 if (de->mode) {
57985 inode->i_mode = de->mode;
57986 inode->i_uid = de->uid;
57987+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
57988+ inode->i_gid = grsec_proc_gid;
57989+#else
57990 inode->i_gid = de->gid;
57991+#endif
57992 }
57993 if (de->size)
57994 inode->i_size = de->size;
57995diff --git a/fs/proc/internal.h b/fs/proc/internal.h
57996index d600fb0..3b495fe 100644
57997--- a/fs/proc/internal.h
57998+++ b/fs/proc/internal.h
57999@@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
58000 struct pid *, struct task_struct *);
58001 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
58002 struct pid *, struct task_struct *);
58003+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
58004+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
58005+#endif
58006
58007 /*
58008 * base.c
58009diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
58010index 0a22194..a9fc8c1 100644
58011--- a/fs/proc/kcore.c
58012+++ b/fs/proc/kcore.c
58013@@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
58014 * the addresses in the elf_phdr on our list.
58015 */
58016 start = kc_offset_to_vaddr(*fpos - elf_buflen);
58017- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
58018+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
58019+ if (tsz > buflen)
58020 tsz = buflen;
58021-
58022+
58023 while (buflen) {
58024 struct kcore_list *m;
58025
58026@@ -515,20 +516,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
58027 kfree(elf_buf);
58028 } else {
58029 if (kern_addr_valid(start)) {
58030- unsigned long n;
58031+ char *elf_buf;
58032+ mm_segment_t oldfs;
58033
58034- n = copy_to_user(buffer, (char *)start, tsz);
58035- /*
58036- * We cannot distinguish between fault on source
58037- * and fault on destination. When this happens
58038- * we clear too and hope it will trigger the
58039- * EFAULT again.
58040- */
58041- if (n) {
58042- if (clear_user(buffer + tsz - n,
58043- n))
58044+ elf_buf = kmalloc(tsz, GFP_KERNEL);
58045+ if (!elf_buf)
58046+ return -ENOMEM;
58047+ oldfs = get_fs();
58048+ set_fs(KERNEL_DS);
58049+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
58050+ set_fs(oldfs);
58051+ if (copy_to_user(buffer, elf_buf, tsz)) {
58052+ kfree(elf_buf);
58053 return -EFAULT;
58054+ }
58055 }
58056+ set_fs(oldfs);
58057+ kfree(elf_buf);
58058 } else {
58059 if (clear_user(buffer, tsz))
58060 return -EFAULT;
58061@@ -548,6 +552,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
58062
58063 static int open_kcore(struct inode *inode, struct file *filp)
58064 {
58065+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
58066+ return -EPERM;
58067+#endif
58068 if (!capable(CAP_SYS_RAWIO))
58069 return -EPERM;
58070 if (kcore_need_update)
58071diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
58072index 5aa847a..f77c8d4 100644
58073--- a/fs/proc/meminfo.c
58074+++ b/fs/proc/meminfo.c
58075@@ -159,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
58076 vmi.used >> 10,
58077 vmi.largest_chunk >> 10
58078 #ifdef CONFIG_MEMORY_FAILURE
58079- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
58080+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
58081 #endif
58082 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
58083 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
58084diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
58085index ccfd99b..1b7e255 100644
58086--- a/fs/proc/nommu.c
58087+++ b/fs/proc/nommu.c
58088@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
58089 if (len < 1)
58090 len = 1;
58091 seq_printf(m, "%*c", len, ' ');
58092- seq_path(m, &file->f_path, "");
58093+ seq_path(m, &file->f_path, "\n\\");
58094 }
58095
58096 seq_putc(m, '\n');
58097diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
58098index 986e832..6e8e859 100644
58099--- a/fs/proc/proc_net.c
58100+++ b/fs/proc/proc_net.c
58101@@ -23,6 +23,7 @@
58102 #include <linux/nsproxy.h>
58103 #include <net/net_namespace.h>
58104 #include <linux/seq_file.h>
58105+#include <linux/grsecurity.h>
58106
58107 #include "internal.h"
58108
58109@@ -109,6 +110,17 @@ static struct net *get_proc_task_net(struct inode *dir)
58110 struct task_struct *task;
58111 struct nsproxy *ns;
58112 struct net *net = NULL;
58113+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
58114+ const struct cred *cred = current_cred();
58115+#endif
58116+
58117+#ifdef CONFIG_GRKERNSEC_PROC_USER
58118+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
58119+ return net;
58120+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
58121+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
58122+ return net;
58123+#endif
58124
58125 rcu_read_lock();
58126 task = pid_task(proc_pid(dir), PIDTYPE_PID);
58127diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
58128index ac05f33..1e6dc7e 100644
58129--- a/fs/proc/proc_sysctl.c
58130+++ b/fs/proc/proc_sysctl.c
58131@@ -13,11 +13,15 @@
58132 #include <linux/module.h>
58133 #include "internal.h"
58134
58135+extern int gr_handle_chroot_sysctl(const int op);
58136+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
58137+ const int op);
58138+
58139 static const struct dentry_operations proc_sys_dentry_operations;
58140 static const struct file_operations proc_sys_file_operations;
58141-static const struct inode_operations proc_sys_inode_operations;
58142+const struct inode_operations proc_sys_inode_operations;
58143 static const struct file_operations proc_sys_dir_file_operations;
58144-static const struct inode_operations proc_sys_dir_operations;
58145+const struct inode_operations proc_sys_dir_operations;
58146
58147 void proc_sys_poll_notify(struct ctl_table_poll *poll)
58148 {
58149@@ -467,6 +471,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
58150
58151 err = NULL;
58152 d_set_d_op(dentry, &proc_sys_dentry_operations);
58153+
58154+ gr_handle_proc_create(dentry, inode);
58155+
58156 d_add(dentry, inode);
58157
58158 out:
58159@@ -482,6 +489,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
58160 struct inode *inode = file_inode(filp);
58161 struct ctl_table_header *head = grab_header(inode);
58162 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
58163+ int op = write ? MAY_WRITE : MAY_READ;
58164 ssize_t error;
58165 size_t res;
58166
58167@@ -493,7 +501,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
58168 * and won't be until we finish.
58169 */
58170 error = -EPERM;
58171- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
58172+ if (sysctl_perm(head, table, op))
58173 goto out;
58174
58175 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
58176@@ -501,6 +509,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
58177 if (!table->proc_handler)
58178 goto out;
58179
58180+#ifdef CONFIG_GRKERNSEC
58181+ error = -EPERM;
58182+ if (gr_handle_chroot_sysctl(op))
58183+ goto out;
58184+ dget(filp->f_path.dentry);
58185+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
58186+ dput(filp->f_path.dentry);
58187+ goto out;
58188+ }
58189+ dput(filp->f_path.dentry);
58190+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
58191+ goto out;
58192+ if (write && !capable(CAP_SYS_ADMIN))
58193+ goto out;
58194+#endif
58195+
58196 /* careful: calling conventions are nasty here */
58197 res = count;
58198 error = table->proc_handler(table, write, buf, &res, ppos);
58199@@ -598,6 +622,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
58200 return -ENOMEM;
58201 } else {
58202 d_set_d_op(child, &proc_sys_dentry_operations);
58203+
58204+ gr_handle_proc_create(child, inode);
58205+
58206 d_add(child, inode);
58207 }
58208 } else {
58209@@ -641,6 +668,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
58210 if ((*pos)++ < file->f_pos)
58211 return 0;
58212
58213+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
58214+ return 0;
58215+
58216 if (unlikely(S_ISLNK(table->mode)))
58217 res = proc_sys_link_fill_cache(file, dirent, filldir, head, table);
58218 else
58219@@ -751,6 +781,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
58220 if (IS_ERR(head))
58221 return PTR_ERR(head);
58222
58223+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
58224+ return -ENOENT;
58225+
58226 generic_fillattr(inode, stat);
58227 if (table)
58228 stat->mode = (stat->mode & S_IFMT) | table->mode;
58229@@ -773,13 +806,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
58230 .llseek = generic_file_llseek,
58231 };
58232
58233-static const struct inode_operations proc_sys_inode_operations = {
58234+const struct inode_operations proc_sys_inode_operations = {
58235 .permission = proc_sys_permission,
58236 .setattr = proc_sys_setattr,
58237 .getattr = proc_sys_getattr,
58238 };
58239
58240-static const struct inode_operations proc_sys_dir_operations = {
58241+const struct inode_operations proc_sys_dir_operations = {
58242 .lookup = proc_sys_lookup,
58243 .permission = proc_sys_permission,
58244 .setattr = proc_sys_setattr,
58245@@ -855,7 +888,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
58246 static struct ctl_dir *new_dir(struct ctl_table_set *set,
58247 const char *name, int namelen)
58248 {
58249- struct ctl_table *table;
58250+ ctl_table_no_const *table;
58251 struct ctl_dir *new;
58252 struct ctl_node *node;
58253 char *new_name;
58254@@ -867,7 +900,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
58255 return NULL;
58256
58257 node = (struct ctl_node *)(new + 1);
58258- table = (struct ctl_table *)(node + 1);
58259+ table = (ctl_table_no_const *)(node + 1);
58260 new_name = (char *)(table + 2);
58261 memcpy(new_name, name, namelen);
58262 new_name[namelen] = '\0';
58263@@ -1036,7 +1069,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
58264 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
58265 struct ctl_table_root *link_root)
58266 {
58267- struct ctl_table *link_table, *entry, *link;
58268+ ctl_table_no_const *link_table, *link;
58269+ struct ctl_table *entry;
58270 struct ctl_table_header *links;
58271 struct ctl_node *node;
58272 char *link_name;
58273@@ -1059,7 +1093,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
58274 return NULL;
58275
58276 node = (struct ctl_node *)(links + 1);
58277- link_table = (struct ctl_table *)(node + nr_entries);
58278+ link_table = (ctl_table_no_const *)(node + nr_entries);
58279 link_name = (char *)&link_table[nr_entries + 1];
58280
58281 for (link = link_table, entry = table; entry->procname; link++, entry++) {
58282@@ -1307,8 +1341,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
58283 struct ctl_table_header ***subheader, struct ctl_table_set *set,
58284 struct ctl_table *table)
58285 {
58286- struct ctl_table *ctl_table_arg = NULL;
58287- struct ctl_table *entry, *files;
58288+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
58289+ struct ctl_table *entry;
58290 int nr_files = 0;
58291 int nr_dirs = 0;
58292 int err = -ENOMEM;
58293@@ -1320,10 +1354,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
58294 nr_files++;
58295 }
58296
58297- files = table;
58298 /* If there are mixed files and directories we need a new table */
58299 if (nr_dirs && nr_files) {
58300- struct ctl_table *new;
58301+ ctl_table_no_const *new;
58302 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
58303 GFP_KERNEL);
58304 if (!files)
58305@@ -1341,7 +1374,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
58306 /* Register everything except a directory full of subdirectories */
58307 if (nr_files || !nr_dirs) {
58308 struct ctl_table_header *header;
58309- header = __register_sysctl_table(set, path, files);
58310+ header = __register_sysctl_table(set, path, files ? files : table);
58311 if (!header) {
58312 kfree(ctl_table_arg);
58313 goto out;
58314diff --git a/fs/proc/root.c b/fs/proc/root.c
58315index 41a6ea9..23eaa92 100644
58316--- a/fs/proc/root.c
58317+++ b/fs/proc/root.c
58318@@ -182,7 +182,15 @@ void __init proc_root_init(void)
58319 #ifdef CONFIG_PROC_DEVICETREE
58320 proc_device_tree_init();
58321 #endif
58322+#ifdef CONFIG_GRKERNSEC_PROC_ADD
58323+#ifdef CONFIG_GRKERNSEC_PROC_USER
58324+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
58325+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
58326+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
58327+#endif
58328+#else
58329 proc_mkdir("bus", NULL);
58330+#endif
58331 proc_sys_init();
58332 }
58333
58334diff --git a/fs/proc/self.c b/fs/proc/self.c
58335index 6b6a993..807cccc 100644
58336--- a/fs/proc/self.c
58337+++ b/fs/proc/self.c
58338@@ -39,7 +39,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
58339 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
58340 void *cookie)
58341 {
58342- char *s = nd_get_link(nd);
58343+ const char *s = nd_get_link(nd);
58344 if (!IS_ERR(s))
58345 kfree(s);
58346 }
58347diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
58348index 65fc60a..350cc48 100644
58349--- a/fs/proc/task_mmu.c
58350+++ b/fs/proc/task_mmu.c
58351@@ -11,12 +11,19 @@
58352 #include <linux/rmap.h>
58353 #include <linux/swap.h>
58354 #include <linux/swapops.h>
58355+#include <linux/grsecurity.h>
58356
58357 #include <asm/elf.h>
58358 #include <asm/uaccess.h>
58359 #include <asm/tlbflush.h>
58360 #include "internal.h"
58361
58362+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58363+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
58364+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
58365+ _mm->pax_flags & MF_PAX_SEGMEXEC))
58366+#endif
58367+
58368 void task_mem(struct seq_file *m, struct mm_struct *mm)
58369 {
58370 unsigned long data, text, lib, swap;
58371@@ -52,8 +59,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
58372 "VmExe:\t%8lu kB\n"
58373 "VmLib:\t%8lu kB\n"
58374 "VmPTE:\t%8lu kB\n"
58375- "VmSwap:\t%8lu kB\n",
58376- hiwater_vm << (PAGE_SHIFT-10),
58377+ "VmSwap:\t%8lu kB\n"
58378+
58379+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58380+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
58381+#endif
58382+
58383+ ,hiwater_vm << (PAGE_SHIFT-10),
58384 total_vm << (PAGE_SHIFT-10),
58385 mm->locked_vm << (PAGE_SHIFT-10),
58386 mm->pinned_vm << (PAGE_SHIFT-10),
58387@@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
58388 data << (PAGE_SHIFT-10),
58389 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
58390 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
58391- swap << (PAGE_SHIFT-10));
58392+ swap << (PAGE_SHIFT-10)
58393+
58394+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58395+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58396+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
58397+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
58398+#else
58399+ , mm->context.user_cs_base
58400+ , mm->context.user_cs_limit
58401+#endif
58402+#endif
58403+
58404+ );
58405 }
58406
58407 unsigned long task_vsize(struct mm_struct *mm)
58408@@ -277,13 +301,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
58409 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
58410 }
58411
58412- /* We don't show the stack guard page in /proc/maps */
58413+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58414+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
58415+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
58416+#else
58417 start = vma->vm_start;
58418- if (stack_guard_page_start(vma, start))
58419- start += PAGE_SIZE;
58420 end = vma->vm_end;
58421- if (stack_guard_page_end(vma, end))
58422- end -= PAGE_SIZE;
58423+#endif
58424
58425 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
58426 start,
58427@@ -292,7 +316,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
58428 flags & VM_WRITE ? 'w' : '-',
58429 flags & VM_EXEC ? 'x' : '-',
58430 flags & VM_MAYSHARE ? 's' : 'p',
58431+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58432+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
58433+#else
58434 pgoff,
58435+#endif
58436 MAJOR(dev), MINOR(dev), ino, &len);
58437
58438 /*
58439@@ -301,7 +329,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
58440 */
58441 if (file) {
58442 pad_len_spaces(m, len);
58443- seq_path(m, &file->f_path, "\n");
58444+ seq_path(m, &file->f_path, "\n\\");
58445 goto done;
58446 }
58447
58448@@ -327,8 +355,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
58449 * Thread stack in /proc/PID/task/TID/maps or
58450 * the main process stack.
58451 */
58452- if (!is_pid || (vma->vm_start <= mm->start_stack &&
58453- vma->vm_end >= mm->start_stack)) {
58454+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
58455+ (vma->vm_start <= mm->start_stack &&
58456+ vma->vm_end >= mm->start_stack)) {
58457 name = "[stack]";
58458 } else {
58459 /* Thread stack in /proc/PID/maps */
58460@@ -352,6 +381,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
58461 struct proc_maps_private *priv = m->private;
58462 struct task_struct *task = priv->task;
58463
58464+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58465+ if (current->exec_id != m->exec_id) {
58466+ gr_log_badprocpid("maps");
58467+ return 0;
58468+ }
58469+#endif
58470+
58471 show_map_vma(m, vma, is_pid);
58472
58473 if (m->count < m->size) /* vma is copied successfully */
58474@@ -589,12 +625,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
58475 .private = &mss,
58476 };
58477
58478+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58479+ if (current->exec_id != m->exec_id) {
58480+ gr_log_badprocpid("smaps");
58481+ return 0;
58482+ }
58483+#endif
58484 memset(&mss, 0, sizeof mss);
58485- mss.vma = vma;
58486- /* mmap_sem is held in m_start */
58487- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
58488- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
58489-
58490+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58491+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
58492+#endif
58493+ mss.vma = vma;
58494+ /* mmap_sem is held in m_start */
58495+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
58496+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
58497+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58498+ }
58499+#endif
58500 show_map_vma(m, vma, is_pid);
58501
58502 seq_printf(m,
58503@@ -612,7 +659,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
58504 "KernelPageSize: %8lu kB\n"
58505 "MMUPageSize: %8lu kB\n"
58506 "Locked: %8lu kB\n",
58507+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58508+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
58509+#else
58510 (vma->vm_end - vma->vm_start) >> 10,
58511+#endif
58512 mss.resident >> 10,
58513 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
58514 mss.shared_clean >> 10,
58515@@ -1264,6 +1315,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
58516 int n;
58517 char buffer[50];
58518
58519+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58520+ if (current->exec_id != m->exec_id) {
58521+ gr_log_badprocpid("numa_maps");
58522+ return 0;
58523+ }
58524+#endif
58525+
58526 if (!mm)
58527 return 0;
58528
58529@@ -1281,11 +1339,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
58530 mpol_to_str(buffer, sizeof(buffer), pol);
58531 mpol_cond_put(pol);
58532
58533+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58534+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
58535+#else
58536 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
58537+#endif
58538
58539 if (file) {
58540 seq_printf(m, " file=");
58541- seq_path(m, &file->f_path, "\n\t= ");
58542+ seq_path(m, &file->f_path, "\n\t\\= ");
58543 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
58544 seq_printf(m, " heap");
58545 } else {
58546diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
58547index 56123a6..5a2f6ec 100644
58548--- a/fs/proc/task_nommu.c
58549+++ b/fs/proc/task_nommu.c
58550@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
58551 else
58552 bytes += kobjsize(mm);
58553
58554- if (current->fs && current->fs->users > 1)
58555+ if (current->fs && atomic_read(&current->fs->users) > 1)
58556 sbytes += kobjsize(current->fs);
58557 else
58558 bytes += kobjsize(current->fs);
58559@@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
58560
58561 if (file) {
58562 pad_len_spaces(m, len);
58563- seq_path(m, &file->f_path, "");
58564+ seq_path(m, &file->f_path, "\n\\");
58565 } else if (mm) {
58566 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
58567
58568diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
58569index 17f7e08..e4b1529 100644
58570--- a/fs/proc/vmcore.c
58571+++ b/fs/proc/vmcore.c
58572@@ -99,9 +99,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
58573 nr_bytes = count;
58574
58575 /* If pfn is not ram, return zeros for sparse dump files */
58576- if (pfn_is_ram(pfn) == 0)
58577- memset(buf, 0, nr_bytes);
58578- else {
58579+ if (pfn_is_ram(pfn) == 0) {
58580+ if (userbuf) {
58581+ if (clear_user((char __force_user *)buf, nr_bytes))
58582+ return -EFAULT;
58583+ } else
58584+ memset(buf, 0, nr_bytes);
58585+ } else {
58586 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
58587 offset, userbuf);
58588 if (tmp < 0)
58589@@ -186,7 +190,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
58590 if (tsz > nr_bytes)
58591 tsz = nr_bytes;
58592
58593- tmp = read_from_oldmem(buffer, tsz, &start, 1);
58594+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, 1);
58595 if (tmp < 0)
58596 return tmp;
58597 buflen -= tsz;
58598diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
58599index b00fcc9..e0c6381 100644
58600--- a/fs/qnx6/qnx6.h
58601+++ b/fs/qnx6/qnx6.h
58602@@ -74,7 +74,7 @@ enum {
58603 BYTESEX_BE,
58604 };
58605
58606-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
58607+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
58608 {
58609 if (sbi->s_bytesex == BYTESEX_LE)
58610 return le64_to_cpu((__force __le64)n);
58611@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
58612 return (__force __fs64)cpu_to_be64(n);
58613 }
58614
58615-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
58616+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
58617 {
58618 if (sbi->s_bytesex == BYTESEX_LE)
58619 return le32_to_cpu((__force __le32)n);
58620diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
58621index 16e8abb..2dcf914 100644
58622--- a/fs/quota/netlink.c
58623+++ b/fs/quota/netlink.c
58624@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
58625 void quota_send_warning(struct kqid qid, dev_t dev,
58626 const char warntype)
58627 {
58628- static atomic_t seq;
58629+ static atomic_unchecked_t seq;
58630 struct sk_buff *skb;
58631 void *msg_head;
58632 int ret;
58633@@ -49,7 +49,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
58634 "VFS: Not enough memory to send quota warning.\n");
58635 return;
58636 }
58637- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
58638+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
58639 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
58640 if (!msg_head) {
58641 printk(KERN_ERR
58642diff --git a/fs/read_write.c b/fs/read_write.c
58643index 2cefa41..c7e2fe0 100644
58644--- a/fs/read_write.c
58645+++ b/fs/read_write.c
58646@@ -411,7 +411,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
58647
58648 old_fs = get_fs();
58649 set_fs(get_ds());
58650- p = (__force const char __user *)buf;
58651+ p = (const char __force_user *)buf;
58652 if (count > MAX_RW_COUNT)
58653 count = MAX_RW_COUNT;
58654 if (file->f_op->write)
58655diff --git a/fs/readdir.c b/fs/readdir.c
58656index fee38e0..12fdf47 100644
58657--- a/fs/readdir.c
58658+++ b/fs/readdir.c
58659@@ -17,6 +17,7 @@
58660 #include <linux/security.h>
58661 #include <linux/syscalls.h>
58662 #include <linux/unistd.h>
58663+#include <linux/namei.h>
58664
58665 #include <asm/uaccess.h>
58666
58667@@ -67,6 +68,7 @@ struct old_linux_dirent {
58668
58669 struct readdir_callback {
58670 struct old_linux_dirent __user * dirent;
58671+ struct file * file;
58672 int result;
58673 };
58674
58675@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
58676 buf->result = -EOVERFLOW;
58677 return -EOVERFLOW;
58678 }
58679+
58680+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58681+ return 0;
58682+
58683 buf->result++;
58684 dirent = buf->dirent;
58685 if (!access_ok(VERIFY_WRITE, dirent,
58686@@ -114,6 +120,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
58687
58688 buf.result = 0;
58689 buf.dirent = dirent;
58690+ buf.file = f.file;
58691
58692 error = vfs_readdir(f.file, fillonedir, &buf);
58693 if (buf.result)
58694@@ -139,6 +146,7 @@ struct linux_dirent {
58695 struct getdents_callback {
58696 struct linux_dirent __user * current_dir;
58697 struct linux_dirent __user * previous;
58698+ struct file * file;
58699 int count;
58700 int error;
58701 };
58702@@ -160,6 +168,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
58703 buf->error = -EOVERFLOW;
58704 return -EOVERFLOW;
58705 }
58706+
58707+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58708+ return 0;
58709+
58710 dirent = buf->previous;
58711 if (dirent) {
58712 if (__put_user(offset, &dirent->d_off))
58713@@ -205,6 +217,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
58714 buf.previous = NULL;
58715 buf.count = count;
58716 buf.error = 0;
58717+ buf.file = f.file;
58718
58719 error = vfs_readdir(f.file, filldir, &buf);
58720 if (error >= 0)
58721@@ -223,6 +236,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
58722 struct getdents_callback64 {
58723 struct linux_dirent64 __user * current_dir;
58724 struct linux_dirent64 __user * previous;
58725+ struct file *file;
58726 int count;
58727 int error;
58728 };
58729@@ -238,6 +252,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
58730 buf->error = -EINVAL; /* only used if we fail.. */
58731 if (reclen > buf->count)
58732 return -EINVAL;
58733+
58734+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58735+ return 0;
58736+
58737 dirent = buf->previous;
58738 if (dirent) {
58739 if (__put_user(offset, &dirent->d_off))
58740@@ -283,6 +301,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
58741
58742 buf.current_dir = dirent;
58743 buf.previous = NULL;
58744+ buf.file = f.file;
58745 buf.count = count;
58746 buf.error = 0;
58747
58748@@ -291,7 +310,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
58749 error = buf.error;
58750 lastdirent = buf.previous;
58751 if (lastdirent) {
58752- typeof(lastdirent->d_off) d_off = f.file->f_pos;
58753+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos;
58754 if (__put_user(d_off, &lastdirent->d_off))
58755 error = -EFAULT;
58756 else
58757diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
58758index 2b7882b..1c5ef48 100644
58759--- a/fs/reiserfs/do_balan.c
58760+++ b/fs/reiserfs/do_balan.c
58761@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
58762 return;
58763 }
58764
58765- atomic_inc(&(fs_generation(tb->tb_sb)));
58766+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
58767 do_balance_starts(tb);
58768
58769 /* balance leaf returns 0 except if combining L R and S into
58770diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
58771index 1d48974..2f8f4e0 100644
58772--- a/fs/reiserfs/procfs.c
58773+++ b/fs/reiserfs/procfs.c
58774@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
58775 "SMALL_TAILS " : "NO_TAILS ",
58776 replay_only(sb) ? "REPLAY_ONLY " : "",
58777 convert_reiserfs(sb) ? "CONV " : "",
58778- atomic_read(&r->s_generation_counter),
58779+ atomic_read_unchecked(&r->s_generation_counter),
58780 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
58781 SF(s_do_balance), SF(s_unneeded_left_neighbor),
58782 SF(s_good_search_by_key_reada), SF(s_bmaps),
58783diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
58784index 157e474..65a6114 100644
58785--- a/fs/reiserfs/reiserfs.h
58786+++ b/fs/reiserfs/reiserfs.h
58787@@ -453,7 +453,7 @@ struct reiserfs_sb_info {
58788 /* Comment? -Hans */
58789 wait_queue_head_t s_wait;
58790 /* To be obsoleted soon by per buffer seals.. -Hans */
58791- atomic_t s_generation_counter; // increased by one every time the
58792+ atomic_unchecked_t s_generation_counter; // increased by one every time the
58793 // tree gets re-balanced
58794 unsigned long s_properties; /* File system properties. Currently holds
58795 on-disk FS format */
58796@@ -1978,7 +1978,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
58797 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
58798
58799 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
58800-#define get_generation(s) atomic_read (&fs_generation(s))
58801+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
58802 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
58803 #define __fs_changed(gen,s) (gen != get_generation (s))
58804 #define fs_changed(gen,s) \
58805diff --git a/fs/select.c b/fs/select.c
58806index 8c1c96c..a0f9b6d 100644
58807--- a/fs/select.c
58808+++ b/fs/select.c
58809@@ -20,6 +20,7 @@
58810 #include <linux/export.h>
58811 #include <linux/slab.h>
58812 #include <linux/poll.h>
58813+#include <linux/security.h>
58814 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
58815 #include <linux/file.h>
58816 #include <linux/fdtable.h>
58817@@ -827,6 +828,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
58818 struct poll_list *walk = head;
58819 unsigned long todo = nfds;
58820
58821+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
58822 if (nfds > rlimit(RLIMIT_NOFILE))
58823 return -EINVAL;
58824
58825diff --git a/fs/seq_file.c b/fs/seq_file.c
58826index 774c1eb..b67582a 100644
58827--- a/fs/seq_file.c
58828+++ b/fs/seq_file.c
58829@@ -10,6 +10,7 @@
58830 #include <linux/seq_file.h>
58831 #include <linux/slab.h>
58832 #include <linux/cred.h>
58833+#include <linux/sched.h>
58834
58835 #include <asm/uaccess.h>
58836 #include <asm/page.h>
58837@@ -60,6 +61,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
58838 #ifdef CONFIG_USER_NS
58839 p->user_ns = file->f_cred->user_ns;
58840 #endif
58841+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58842+ p->exec_id = current->exec_id;
58843+#endif
58844
58845 /*
58846 * Wrappers around seq_open(e.g. swaps_open) need to be
58847@@ -96,7 +100,7 @@ static int traverse(struct seq_file *m, loff_t offset)
58848 return 0;
58849 }
58850 if (!m->buf) {
58851- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
58852+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
58853 if (!m->buf)
58854 return -ENOMEM;
58855 }
58856@@ -136,7 +140,7 @@ static int traverse(struct seq_file *m, loff_t offset)
58857 Eoverflow:
58858 m->op->stop(m, p);
58859 kfree(m->buf);
58860- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
58861+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
58862 return !m->buf ? -ENOMEM : -EAGAIN;
58863 }
58864
58865@@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
58866
58867 /* grab buffer if we didn't have one */
58868 if (!m->buf) {
58869- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
58870+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
58871 if (!m->buf)
58872 goto Enomem;
58873 }
58874@@ -232,7 +236,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
58875 goto Fill;
58876 m->op->stop(m, p);
58877 kfree(m->buf);
58878- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
58879+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
58880 if (!m->buf)
58881 goto Enomem;
58882 m->count = 0;
58883@@ -581,7 +585,7 @@ static void single_stop(struct seq_file *p, void *v)
58884 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
58885 void *data)
58886 {
58887- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
58888+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
58889 int res = -ENOMEM;
58890
58891 if (op) {
58892diff --git a/fs/splice.c b/fs/splice.c
58893index d37431d..81c3044 100644
58894--- a/fs/splice.c
58895+++ b/fs/splice.c
58896@@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
58897 pipe_lock(pipe);
58898
58899 for (;;) {
58900- if (!pipe->readers) {
58901+ if (!atomic_read(&pipe->readers)) {
58902 send_sig(SIGPIPE, current, 0);
58903 if (!ret)
58904 ret = -EPIPE;
58905@@ -219,7 +219,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
58906 page_nr++;
58907 ret += buf->len;
58908
58909- if (pipe->files)
58910+ if (atomic_read(&pipe->files))
58911 do_wakeup = 1;
58912
58913 if (!--spd->nr_pages)
58914@@ -250,9 +250,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
58915 do_wakeup = 0;
58916 }
58917
58918- pipe->waiting_writers++;
58919+ atomic_inc(&pipe->waiting_writers);
58920 pipe_wait(pipe);
58921- pipe->waiting_writers--;
58922+ atomic_dec(&pipe->waiting_writers);
58923 }
58924
58925 pipe_unlock(pipe);
58926@@ -565,7 +565,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
58927 old_fs = get_fs();
58928 set_fs(get_ds());
58929 /* The cast to a user pointer is valid due to the set_fs() */
58930- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
58931+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
58932 set_fs(old_fs);
58933
58934 return res;
58935@@ -580,7 +580,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
58936 old_fs = get_fs();
58937 set_fs(get_ds());
58938 /* The cast to a user pointer is valid due to the set_fs() */
58939- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
58940+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
58941 set_fs(old_fs);
58942
58943 return res;
58944@@ -633,7 +633,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
58945 goto err;
58946
58947 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
58948- vec[i].iov_base = (void __user *) page_address(page);
58949+ vec[i].iov_base = (void __force_user *) page_address(page);
58950 vec[i].iov_len = this_len;
58951 spd.pages[i] = page;
58952 spd.nr_pages++;
58953@@ -829,7 +829,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
58954 ops->release(pipe, buf);
58955 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
58956 pipe->nrbufs--;
58957- if (pipe->files)
58958+ if (atomic_read(&pipe->files))
58959 sd->need_wakeup = true;
58960 }
58961
58962@@ -854,10 +854,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
58963 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
58964 {
58965 while (!pipe->nrbufs) {
58966- if (!pipe->writers)
58967+ if (!atomic_read(&pipe->writers))
58968 return 0;
58969
58970- if (!pipe->waiting_writers && sd->num_spliced)
58971+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
58972 return 0;
58973
58974 if (sd->flags & SPLICE_F_NONBLOCK)
58975@@ -1193,7 +1193,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
58976 * out of the pipe right after the splice_to_pipe(). So set
58977 * PIPE_READERS appropriately.
58978 */
58979- pipe->readers = 1;
58980+ atomic_set(&pipe->readers, 1);
58981
58982 current->splice_pipe = pipe;
58983 }
58984@@ -1769,9 +1769,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
58985 ret = -ERESTARTSYS;
58986 break;
58987 }
58988- if (!pipe->writers)
58989+ if (!atomic_read(&pipe->writers))
58990 break;
58991- if (!pipe->waiting_writers) {
58992+ if (!atomic_read(&pipe->waiting_writers)) {
58993 if (flags & SPLICE_F_NONBLOCK) {
58994 ret = -EAGAIN;
58995 break;
58996@@ -1803,7 +1803,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
58997 pipe_lock(pipe);
58998
58999 while (pipe->nrbufs >= pipe->buffers) {
59000- if (!pipe->readers) {
59001+ if (!atomic_read(&pipe->readers)) {
59002 send_sig(SIGPIPE, current, 0);
59003 ret = -EPIPE;
59004 break;
59005@@ -1816,9 +1816,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
59006 ret = -ERESTARTSYS;
59007 break;
59008 }
59009- pipe->waiting_writers++;
59010+ atomic_inc(&pipe->waiting_writers);
59011 pipe_wait(pipe);
59012- pipe->waiting_writers--;
59013+ atomic_dec(&pipe->waiting_writers);
59014 }
59015
59016 pipe_unlock(pipe);
59017@@ -1854,14 +1854,14 @@ retry:
59018 pipe_double_lock(ipipe, opipe);
59019
59020 do {
59021- if (!opipe->readers) {
59022+ if (!atomic_read(&opipe->readers)) {
59023 send_sig(SIGPIPE, current, 0);
59024 if (!ret)
59025 ret = -EPIPE;
59026 break;
59027 }
59028
59029- if (!ipipe->nrbufs && !ipipe->writers)
59030+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
59031 break;
59032
59033 /*
59034@@ -1958,7 +1958,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
59035 pipe_double_lock(ipipe, opipe);
59036
59037 do {
59038- if (!opipe->readers) {
59039+ if (!atomic_read(&opipe->readers)) {
59040 send_sig(SIGPIPE, current, 0);
59041 if (!ret)
59042 ret = -EPIPE;
59043@@ -2003,7 +2003,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
59044 * return EAGAIN if we have the potential of some data in the
59045 * future, otherwise just return 0
59046 */
59047- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
59048+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
59049 ret = -EAGAIN;
59050
59051 pipe_unlock(ipipe);
59052diff --git a/fs/stat.c b/fs/stat.c
59053index 04ce1ac..a13dd1e 100644
59054--- a/fs/stat.c
59055+++ b/fs/stat.c
59056@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
59057 stat->gid = inode->i_gid;
59058 stat->rdev = inode->i_rdev;
59059 stat->size = i_size_read(inode);
59060- stat->atime = inode->i_atime;
59061- stat->mtime = inode->i_mtime;
59062+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
59063+ stat->atime = inode->i_ctime;
59064+ stat->mtime = inode->i_ctime;
59065+ } else {
59066+ stat->atime = inode->i_atime;
59067+ stat->mtime = inode->i_mtime;
59068+ }
59069 stat->ctime = inode->i_ctime;
59070 stat->blksize = (1 << inode->i_blkbits);
59071 stat->blocks = inode->i_blocks;
59072@@ -46,8 +51,14 @@ int vfs_getattr(struct path *path, struct kstat *stat)
59073 if (retval)
59074 return retval;
59075
59076- if (inode->i_op->getattr)
59077- return inode->i_op->getattr(path->mnt, path->dentry, stat);
59078+ if (inode->i_op->getattr) {
59079+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
59080+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
59081+ stat->atime = stat->ctime;
59082+ stat->mtime = stat->ctime;
59083+ }
59084+ return retval;
59085+ }
59086
59087 generic_fillattr(inode, stat);
59088 return 0;
59089diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
59090index 15c68f9..36a8b3e 100644
59091--- a/fs/sysfs/bin.c
59092+++ b/fs/sysfs/bin.c
59093@@ -235,13 +235,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
59094 return ret;
59095 }
59096
59097-static int bin_access(struct vm_area_struct *vma, unsigned long addr,
59098- void *buf, int len, int write)
59099+static ssize_t bin_access(struct vm_area_struct *vma, unsigned long addr,
59100+ void *buf, size_t len, int write)
59101 {
59102 struct file *file = vma->vm_file;
59103 struct bin_buffer *bb = file->private_data;
59104 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
59105- int ret;
59106+ ssize_t ret;
59107
59108 if (!bb->vm_ops)
59109 return -EINVAL;
59110diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
59111index e8e0e71..79c28ac5 100644
59112--- a/fs/sysfs/dir.c
59113+++ b/fs/sysfs/dir.c
59114@@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida);
59115 *
59116 * Returns 31 bit hash of ns + name (so it fits in an off_t )
59117 */
59118-static unsigned int sysfs_name_hash(const void *ns, const char *name)
59119+static unsigned int sysfs_name_hash(const void *ns, const unsigned char *name)
59120 {
59121 unsigned long hash = init_name_hash();
59122 unsigned int len = strlen(name);
59123@@ -679,6 +679,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
59124 struct sysfs_dirent *sd;
59125 int rc;
59126
59127+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
59128+ const char *parent_name = parent_sd->s_name;
59129+
59130+ mode = S_IFDIR | S_IRWXU;
59131+
59132+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
59133+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
59134+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
59135+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
59136+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
59137+#endif
59138+
59139 /* allocate */
59140 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
59141 if (!sd)
59142diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
59143index 602f56d..6853db8 100644
59144--- a/fs/sysfs/file.c
59145+++ b/fs/sysfs/file.c
59146@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
59147
59148 struct sysfs_open_dirent {
59149 atomic_t refcnt;
59150- atomic_t event;
59151+ atomic_unchecked_t event;
59152 wait_queue_head_t poll;
59153 struct list_head buffers; /* goes through sysfs_buffer.list */
59154 };
59155@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
59156 if (!sysfs_get_active(attr_sd))
59157 return -ENODEV;
59158
59159- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
59160+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
59161 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
59162
59163 sysfs_put_active(attr_sd);
59164@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
59165 return -ENOMEM;
59166
59167 atomic_set(&new_od->refcnt, 0);
59168- atomic_set(&new_od->event, 1);
59169+ atomic_set_unchecked(&new_od->event, 1);
59170 init_waitqueue_head(&new_od->poll);
59171 INIT_LIST_HEAD(&new_od->buffers);
59172 goto retry;
59173@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
59174
59175 sysfs_put_active(attr_sd);
59176
59177- if (buffer->event != atomic_read(&od->event))
59178+ if (buffer->event != atomic_read_unchecked(&od->event))
59179 goto trigger;
59180
59181 return DEFAULT_POLLMASK;
59182@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
59183
59184 od = sd->s_attr.open;
59185 if (od) {
59186- atomic_inc(&od->event);
59187+ atomic_inc_unchecked(&od->event);
59188 wake_up_interruptible(&od->poll);
59189 }
59190
59191diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
59192index 8c940df..25b733e 100644
59193--- a/fs/sysfs/symlink.c
59194+++ b/fs/sysfs/symlink.c
59195@@ -305,7 +305,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
59196
59197 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
59198 {
59199- char *page = nd_get_link(nd);
59200+ const char *page = nd_get_link(nd);
59201 if (!IS_ERR(page))
59202 free_page((unsigned long)page);
59203 }
59204diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
59205index 69d4889..a810bd4 100644
59206--- a/fs/sysv/sysv.h
59207+++ b/fs/sysv/sysv.h
59208@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
59209 #endif
59210 }
59211
59212-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
59213+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
59214 {
59215 if (sbi->s_bytesex == BYTESEX_PDP)
59216 return PDP_swab((__force __u32)n);
59217diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
59218index e18b988..f1d4ad0f 100644
59219--- a/fs/ubifs/io.c
59220+++ b/fs/ubifs/io.c
59221@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
59222 return err;
59223 }
59224
59225-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
59226+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
59227 {
59228 int err;
59229
59230diff --git a/fs/udf/misc.c b/fs/udf/misc.c
59231index c175b4d..8f36a16 100644
59232--- a/fs/udf/misc.c
59233+++ b/fs/udf/misc.c
59234@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
59235
59236 u8 udf_tag_checksum(const struct tag *t)
59237 {
59238- u8 *data = (u8 *)t;
59239+ const u8 *data = (const u8 *)t;
59240 u8 checksum = 0;
59241 int i;
59242 for (i = 0; i < sizeof(struct tag); ++i)
59243diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
59244index 8d974c4..b82f6ec 100644
59245--- a/fs/ufs/swab.h
59246+++ b/fs/ufs/swab.h
59247@@ -22,7 +22,7 @@ enum {
59248 BYTESEX_BE
59249 };
59250
59251-static inline u64
59252+static inline u64 __intentional_overflow(-1)
59253 fs64_to_cpu(struct super_block *sbp, __fs64 n)
59254 {
59255 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
59256@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
59257 return (__force __fs64)cpu_to_be64(n);
59258 }
59259
59260-static inline u32
59261+static inline u32 __intentional_overflow(-1)
59262 fs32_to_cpu(struct super_block *sbp, __fs32 n)
59263 {
59264 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
59265diff --git a/fs/utimes.c b/fs/utimes.c
59266index f4fb7ec..3fe03c0 100644
59267--- a/fs/utimes.c
59268+++ b/fs/utimes.c
59269@@ -1,6 +1,7 @@
59270 #include <linux/compiler.h>
59271 #include <linux/file.h>
59272 #include <linux/fs.h>
59273+#include <linux/security.h>
59274 #include <linux/linkage.h>
59275 #include <linux/mount.h>
59276 #include <linux/namei.h>
59277@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
59278 goto mnt_drop_write_and_out;
59279 }
59280 }
59281+
59282+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
59283+ error = -EACCES;
59284+ goto mnt_drop_write_and_out;
59285+ }
59286+
59287 mutex_lock(&inode->i_mutex);
59288 error = notify_change(path->dentry, &newattrs);
59289 mutex_unlock(&inode->i_mutex);
59290diff --git a/fs/xattr.c b/fs/xattr.c
59291index 3377dff..4d074d9 100644
59292--- a/fs/xattr.c
59293+++ b/fs/xattr.c
59294@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
59295 return rc;
59296 }
59297
59298+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59299+ssize_t
59300+pax_getxattr(struct dentry *dentry, void *value, size_t size)
59301+{
59302+ struct inode *inode = dentry->d_inode;
59303+ ssize_t error;
59304+
59305+ error = inode_permission(inode, MAY_EXEC);
59306+ if (error)
59307+ return error;
59308+
59309+ if (inode->i_op->getxattr)
59310+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
59311+ else
59312+ error = -EOPNOTSUPP;
59313+
59314+ return error;
59315+}
59316+EXPORT_SYMBOL(pax_getxattr);
59317+#endif
59318+
59319 ssize_t
59320 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
59321 {
59322@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
59323 * Extended attribute SET operations
59324 */
59325 static long
59326-setxattr(struct dentry *d, const char __user *name, const void __user *value,
59327+setxattr(struct path *path, const char __user *name, const void __user *value,
59328 size_t size, int flags)
59329 {
59330 int error;
59331@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
59332 posix_acl_fix_xattr_from_user(kvalue, size);
59333 }
59334
59335- error = vfs_setxattr(d, kname, kvalue, size, flags);
59336+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
59337+ error = -EACCES;
59338+ goto out;
59339+ }
59340+
59341+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
59342 out:
59343 if (vvalue)
59344 vfree(vvalue);
59345@@ -377,7 +403,7 @@ retry:
59346 return error;
59347 error = mnt_want_write(path.mnt);
59348 if (!error) {
59349- error = setxattr(path.dentry, name, value, size, flags);
59350+ error = setxattr(&path, name, value, size, flags);
59351 mnt_drop_write(path.mnt);
59352 }
59353 path_put(&path);
59354@@ -401,7 +427,7 @@ retry:
59355 return error;
59356 error = mnt_want_write(path.mnt);
59357 if (!error) {
59358- error = setxattr(path.dentry, name, value, size, flags);
59359+ error = setxattr(&path, name, value, size, flags);
59360 mnt_drop_write(path.mnt);
59361 }
59362 path_put(&path);
59363@@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
59364 const void __user *,value, size_t, size, int, flags)
59365 {
59366 struct fd f = fdget(fd);
59367- struct dentry *dentry;
59368 int error = -EBADF;
59369
59370 if (!f.file)
59371 return error;
59372- dentry = f.file->f_path.dentry;
59373- audit_inode(NULL, dentry, 0);
59374+ audit_inode(NULL, f.file->f_path.dentry, 0);
59375 error = mnt_want_write_file(f.file);
59376 if (!error) {
59377- error = setxattr(dentry, name, value, size, flags);
59378+ error = setxattr(&f.file->f_path, name, value, size, flags);
59379 mnt_drop_write_file(f.file);
59380 }
59381 fdput(f);
59382diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
59383index 9fbea87..6b19972 100644
59384--- a/fs/xattr_acl.c
59385+++ b/fs/xattr_acl.c
59386@@ -76,8 +76,8 @@ struct posix_acl *
59387 posix_acl_from_xattr(struct user_namespace *user_ns,
59388 const void *value, size_t size)
59389 {
59390- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
59391- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
59392+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
59393+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
59394 int count;
59395 struct posix_acl *acl;
59396 struct posix_acl_entry *acl_e;
59397diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
59398index 8904284..ee0e14b 100644
59399--- a/fs/xfs/xfs_bmap.c
59400+++ b/fs/xfs/xfs_bmap.c
59401@@ -765,7 +765,7 @@ xfs_bmap_validate_ret(
59402
59403 #else
59404 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
59405-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
59406+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
59407 #endif /* DEBUG */
59408
59409 /*
59410diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
59411index 6157424..ac98f6d 100644
59412--- a/fs/xfs/xfs_dir2_sf.c
59413+++ b/fs/xfs/xfs_dir2_sf.c
59414@@ -851,7 +851,15 @@ xfs_dir2_sf_getdents(
59415 }
59416
59417 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
59418- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
59419+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
59420+ char name[sfep->namelen];
59421+ memcpy(name, sfep->name, sfep->namelen);
59422+ if (filldir(dirent, name, sfep->namelen,
59423+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
59424+ *offset = off & 0x7fffffff;
59425+ return 0;
59426+ }
59427+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
59428 off & 0x7fffffff, ino, DT_UNKNOWN)) {
59429 *offset = off & 0x7fffffff;
59430 return 0;
59431diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
59432index 5e99968..45bd327 100644
59433--- a/fs/xfs/xfs_ioctl.c
59434+++ b/fs/xfs/xfs_ioctl.c
59435@@ -127,7 +127,7 @@ xfs_find_handle(
59436 }
59437
59438 error = -EFAULT;
59439- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
59440+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
59441 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
59442 goto out_put;
59443
59444diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
59445index ca9ecaa..60100c7 100644
59446--- a/fs/xfs/xfs_iops.c
59447+++ b/fs/xfs/xfs_iops.c
59448@@ -395,7 +395,7 @@ xfs_vn_put_link(
59449 struct nameidata *nd,
59450 void *p)
59451 {
59452- char *s = nd_get_link(nd);
59453+ const char *s = nd_get_link(nd);
59454
59455 if (!IS_ERR(s))
59456 kfree(s);
59457diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
59458new file mode 100644
59459index 0000000..712a85d
59460--- /dev/null
59461+++ b/grsecurity/Kconfig
59462@@ -0,0 +1,1043 @@
59463+#
59464+# grecurity configuration
59465+#
59466+menu "Memory Protections"
59467+depends on GRKERNSEC
59468+
59469+config GRKERNSEC_KMEM
59470+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
59471+ default y if GRKERNSEC_CONFIG_AUTO
59472+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
59473+ help
59474+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
59475+ be written to or read from to modify or leak the contents of the running
59476+ kernel. /dev/port will also not be allowed to be opened and support
59477+ for /dev/cpu/*/msr will be removed. If you have module
59478+ support disabled, enabling this will close up five ways that are
59479+ currently used to insert malicious code into the running kernel.
59480+
59481+ Even with all these features enabled, we still highly recommend that
59482+ you use the RBAC system, as it is still possible for an attacker to
59483+ modify the running kernel through privileged I/O granted by ioperm/iopl.
59484+
59485+ If you are not using XFree86, you may be able to stop this additional
59486+ case by enabling the 'Disable privileged I/O' option. Though nothing
59487+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
59488+ but only to video memory, which is the only writing we allow in this
59489+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
59490+ not be allowed to mprotect it with PROT_WRITE later.
59491+ Enabling this feature will prevent the "cpupower" and "powertop" tools
59492+ from working.
59493+
59494+ It is highly recommended that you say Y here if you meet all the
59495+ conditions above.
59496+
59497+config GRKERNSEC_VM86
59498+ bool "Restrict VM86 mode"
59499+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
59500+ depends on X86_32
59501+
59502+ help
59503+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
59504+ make use of a special execution mode on 32bit x86 processors called
59505+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
59506+ video cards and will still work with this option enabled. The purpose
59507+ of the option is to prevent exploitation of emulation errors in
59508+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
59509+ Nearly all users should be able to enable this option.
59510+
59511+config GRKERNSEC_IO
59512+ bool "Disable privileged I/O"
59513+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
59514+ depends on X86
59515+ select RTC_CLASS
59516+ select RTC_INTF_DEV
59517+ select RTC_DRV_CMOS
59518+
59519+ help
59520+ If you say Y here, all ioperm and iopl calls will return an error.
59521+ Ioperm and iopl can be used to modify the running kernel.
59522+ Unfortunately, some programs need this access to operate properly,
59523+ the most notable of which are XFree86 and hwclock. hwclock can be
59524+ remedied by having RTC support in the kernel, so real-time
59525+ clock support is enabled if this option is enabled, to ensure
59526+ that hwclock operates correctly. XFree86 still will not
59527+ operate correctly with this option enabled, so DO NOT CHOOSE Y
59528+ IF YOU USE XFree86. If you use XFree86 and you still want to
59529+ protect your kernel against modification, use the RBAC system.
59530+
59531+config GRKERNSEC_JIT_HARDEN
59532+ bool "Harden BPF JIT against spray attacks"
59533+ default y if GRKERNSEC_CONFIG_AUTO
59534+ depends on BPF_JIT
59535+ help
59536+ If you say Y here, the native code generated by the kernel's Berkeley
59537+ Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
59538+ attacks that attempt to fit attacker-beneficial instructions in
59539+ 32bit immediate fields of JIT-generated native instructions. The
59540+ attacker will generally aim to cause an unintended instruction sequence
59541+ of JIT-generated native code to execute by jumping into the middle of
59542+ a generated instruction. This feature effectively randomizes the 32bit
59543+ immediate constants present in the generated code to thwart such attacks.
59544+
59545+ If you're using KERNEXEC, it's recommended that you enable this option
59546+ to supplement the hardening of the kernel.
59547+
59548+config GRKERNSEC_PERF_HARDEN
59549+ bool "Disable unprivileged PERF_EVENTS usage by default"
59550+ default y if GRKERNSEC_CONFIG_AUTO
59551+ depends on PERF_EVENTS
59552+ help
59553+ If you say Y here, the range of acceptable values for the
59554+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
59555+ default to a new value: 3. When the sysctl is set to this value, no
59556+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
59557+
59558+ Though PERF_EVENTS can be used legitimately for performance monitoring
59559+ and low-level application profiling, it is forced on regardless of
59560+ configuration, has been at fault for several vulnerabilities, and
59561+ creates new opportunities for side channels and other information leaks.
59562+
59563+ This feature puts PERF_EVENTS into a secure default state and permits
59564+ the administrator to change out of it temporarily if unprivileged
59565+ application profiling is needed.
59566+
59567+config GRKERNSEC_RAND_THREADSTACK
59568+ bool "Insert random gaps between thread stacks"
59569+ default y if GRKERNSEC_CONFIG_AUTO
59570+ depends on PAX_RANDMMAP && !PPC
59571+ help
59572+ If you say Y here, a random-sized gap will be enforced between allocated
59573+ thread stacks. Glibc's NPTL and other threading libraries that
59574+ pass MAP_STACK to the kernel for thread stack allocation are supported.
59575+ The implementation currently provides 8 bits of entropy for the gap.
59576+
59577+ Many distributions do not compile threaded remote services with the
59578+ -fstack-check argument to GCC, causing the variable-sized stack-based
59579+ allocator, alloca(), to not probe the stack on allocation. This
59580+ permits an unbounded alloca() to skip over any guard page and potentially
59581+ modify another thread's stack reliably. An enforced random gap
59582+ reduces the reliability of such an attack and increases the chance
59583+ that such a read/write to another thread's stack instead lands in
59584+ an unmapped area, causing a crash and triggering grsecurity's
59585+ anti-bruteforcing logic.
59586+
59587+config GRKERNSEC_PROC_MEMMAP
59588+ bool "Harden ASLR against information leaks and entropy reduction"
59589+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
59590+ depends on PAX_NOEXEC || PAX_ASLR
59591+ help
59592+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
59593+ give no information about the addresses of its mappings if
59594+ PaX features that rely on random addresses are enabled on the task.
59595+ In addition to sanitizing this information and disabling other
59596+ dangerous sources of information, this option causes reads of sensitive
59597+ /proc/<pid> entries where the file descriptor was opened in a different
59598+ task than the one performing the read. Such attempts are logged.
59599+ This option also limits argv/env strings for suid/sgid binaries
59600+ to 512KB to prevent a complete exhaustion of the stack entropy provided
59601+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
59602+ binaries to prevent alternative mmap layouts from being abused.
59603+
59604+ If you use PaX it is essential that you say Y here as it closes up
59605+ several holes that make full ASLR useless locally.
59606+
59607+config GRKERNSEC_BRUTE
59608+ bool "Deter exploit bruteforcing"
59609+ default y if GRKERNSEC_CONFIG_AUTO
59610+ help
59611+ If you say Y here, attempts to bruteforce exploits against forking
59612+ daemons such as apache or sshd, as well as against suid/sgid binaries
59613+ will be deterred. When a child of a forking daemon is killed by PaX
59614+ or crashes due to an illegal instruction or other suspicious signal,
59615+ the parent process will be delayed 30 seconds upon every subsequent
59616+ fork until the administrator is able to assess the situation and
59617+ restart the daemon.
59618+ In the suid/sgid case, the attempt is logged, the user has all their
59619+ existing instances of the suid/sgid binary terminated and will
59620+ be unable to execute any suid/sgid binaries for 15 minutes.
59621+
59622+ It is recommended that you also enable signal logging in the auditing
59623+ section so that logs are generated when a process triggers a suspicious
59624+ signal.
59625+ If the sysctl option is enabled, a sysctl option with name
59626+ "deter_bruteforce" is created.
59627+
59628+
59629+config GRKERNSEC_MODHARDEN
59630+ bool "Harden module auto-loading"
59631+ default y if GRKERNSEC_CONFIG_AUTO
59632+ depends on MODULES
59633+ help
59634+ If you say Y here, module auto-loading in response to use of some
59635+ feature implemented by an unloaded module will be restricted to
59636+ root users. Enabling this option helps defend against attacks
59637+ by unprivileged users who abuse the auto-loading behavior to
59638+ cause a vulnerable module to load that is then exploited.
59639+
59640+ If this option prevents a legitimate use of auto-loading for a
59641+ non-root user, the administrator can execute modprobe manually
59642+ with the exact name of the module mentioned in the alert log.
59643+ Alternatively, the administrator can add the module to the list
59644+ of modules loaded at boot by modifying init scripts.
59645+
59646+ Modification of init scripts will most likely be needed on
59647+ Ubuntu servers with encrypted home directory support enabled,
59648+ as the first non-root user logging in will cause the ecb(aes),
59649+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
59650+
59651+config GRKERNSEC_HIDESYM
59652+ bool "Hide kernel symbols"
59653+ default y if GRKERNSEC_CONFIG_AUTO
59654+ select PAX_USERCOPY_SLABS
59655+ help
59656+ If you say Y here, getting information on loaded modules, and
59657+ displaying all kernel symbols through a syscall will be restricted
59658+ to users with CAP_SYS_MODULE. For software compatibility reasons,
59659+ /proc/kallsyms will be restricted to the root user. The RBAC
59660+ system can hide that entry even from root.
59661+
59662+ This option also prevents leaking of kernel addresses through
59663+ several /proc entries.
59664+
59665+ Note that this option is only effective provided the following
59666+ conditions are met:
59667+ 1) The kernel using grsecurity is not precompiled by some distribution
59668+ 2) You have also enabled GRKERNSEC_DMESG
59669+ 3) You are using the RBAC system and hiding other files such as your
59670+ kernel image and System.map. Alternatively, enabling this option
59671+ causes the permissions on /boot, /lib/modules, and the kernel
59672+ source directory to change at compile time to prevent
59673+ reading by non-root users.
59674+ If the above conditions are met, this option will aid in providing a
59675+ useful protection against local kernel exploitation of overflows
59676+ and arbitrary read/write vulnerabilities.
59677+
59678+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
59679+ in addition to this feature.
59680+
59681+config GRKERNSEC_KERN_LOCKOUT
59682+ bool "Active kernel exploit response"
59683+ default y if GRKERNSEC_CONFIG_AUTO
59684+ depends on X86 || ARM || PPC || SPARC
59685+ help
59686+ If you say Y here, when a PaX alert is triggered due to suspicious
59687+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
59688+ or an OOPS occurs due to bad memory accesses, instead of just
59689+ terminating the offending process (and potentially allowing
59690+ a subsequent exploit from the same user), we will take one of two
59691+ actions:
59692+ If the user was root, we will panic the system
59693+ If the user was non-root, we will log the attempt, terminate
59694+ all processes owned by the user, then prevent them from creating
59695+ any new processes until the system is restarted
59696+ This deters repeated kernel exploitation/bruteforcing attempts
59697+ and is useful for later forensics.
59698+
59699+endmenu
59700+menu "Role Based Access Control Options"
59701+depends on GRKERNSEC
59702+
59703+config GRKERNSEC_RBAC_DEBUG
59704+ bool
59705+
59706+config GRKERNSEC_NO_RBAC
59707+ bool "Disable RBAC system"
59708+ help
59709+ If you say Y here, the /dev/grsec device will be removed from the kernel,
59710+ preventing the RBAC system from being enabled. You should only say Y
59711+ here if you have no intention of using the RBAC system, so as to prevent
59712+ an attacker with root access from misusing the RBAC system to hide files
59713+ and processes when loadable module support and /dev/[k]mem have been
59714+ locked down.
59715+
59716+config GRKERNSEC_ACL_HIDEKERN
59717+ bool "Hide kernel processes"
59718+ help
59719+ If you say Y here, all kernel threads will be hidden to all
59720+ processes but those whose subject has the "view hidden processes"
59721+ flag.
59722+
59723+config GRKERNSEC_ACL_MAXTRIES
59724+ int "Maximum tries before password lockout"
59725+ default 3
59726+ help
59727+ This option enforces the maximum number of times a user can attempt
59728+ to authorize themselves with the grsecurity RBAC system before being
59729+ denied the ability to attempt authorization again for a specified time.
59730+ The lower the number, the harder it will be to brute-force a password.
59731+
59732+config GRKERNSEC_ACL_TIMEOUT
59733+ int "Time to wait after max password tries, in seconds"
59734+ default 30
59735+ help
59736+ This option specifies the time the user must wait after attempting to
59737+ authorize to the RBAC system with the maximum number of invalid
59738+ passwords. The higher the number, the harder it will be to brute-force
59739+ a password.
59740+
59741+endmenu
59742+menu "Filesystem Protections"
59743+depends on GRKERNSEC
59744+
59745+config GRKERNSEC_PROC
59746+ bool "Proc restrictions"
59747+ default y if GRKERNSEC_CONFIG_AUTO
59748+ help
59749+ If you say Y here, the permissions of the /proc filesystem
59750+ will be altered to enhance system security and privacy. You MUST
59751+ choose either a user only restriction or a user and group restriction.
59752+ Depending upon the option you choose, you can either restrict users to
59753+ see only the processes they themselves run, or choose a group that can
59754+ view all processes and files normally restricted to root if you choose
59755+ the "restrict to user only" option. NOTE: If you're running identd or
59756+ ntpd as a non-root user, you will have to run it as the group you
59757+ specify here.
59758+
59759+config GRKERNSEC_PROC_USER
59760+ bool "Restrict /proc to user only"
59761+ depends on GRKERNSEC_PROC
59762+ help
59763+ If you say Y here, non-root users will only be able to view their own
59764+ processes, and restricts them from viewing network-related information,
59765+ and viewing kernel symbol and module information.
59766+
59767+config GRKERNSEC_PROC_USERGROUP
59768+ bool "Allow special group"
59769+ default y if GRKERNSEC_CONFIG_AUTO
59770+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
59771+ help
59772+ If you say Y here, you will be able to select a group that will be
59773+ able to view all processes and network-related information. If you've
59774+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
59775+ remain hidden. This option is useful if you want to run identd as
59776+ a non-root user. The group you select may also be chosen at boot time
59777+ via "grsec_proc_gid=" on the kernel commandline.
59778+
59779+config GRKERNSEC_PROC_GID
59780+ int "GID for special group"
59781+ depends on GRKERNSEC_PROC_USERGROUP
59782+ default 1001
59783+
59784+config GRKERNSEC_PROC_ADD
59785+ bool "Additional restrictions"
59786+ default y if GRKERNSEC_CONFIG_AUTO
59787+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
59788+ help
59789+ If you say Y here, additional restrictions will be placed on
59790+ /proc that keep normal users from viewing device information and
59791+ slabinfo information that could be useful for exploits.
59792+
59793+config GRKERNSEC_LINK
59794+ bool "Linking restrictions"
59795+ default y if GRKERNSEC_CONFIG_AUTO
59796+ help
59797+ If you say Y here, /tmp race exploits will be prevented, since users
59798+ will no longer be able to follow symlinks owned by other users in
59799+ world-writable +t directories (e.g. /tmp), unless the owner of the
59800+ symlink is the owner of the directory. users will also not be
59801+ able to hardlink to files they do not own. If the sysctl option is
59802+ enabled, a sysctl option with name "linking_restrictions" is created.
59803+
59804+config GRKERNSEC_SYMLINKOWN
59805+ bool "Kernel-enforced SymlinksIfOwnerMatch"
59806+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
59807+ help
59808+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
59809+ that prevents it from being used as a security feature. As Apache
59810+ verifies the symlink by performing a stat() against the target of
59811+ the symlink before it is followed, an attacker can setup a symlink
59812+ to point to a same-owned file, then replace the symlink with one
59813+ that targets another user's file just after Apache "validates" the
59814+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
59815+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
59816+ will be in place for the group you specify. If the sysctl option
59817+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
59818+ created.
59819+
59820+config GRKERNSEC_SYMLINKOWN_GID
59821+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
59822+ depends on GRKERNSEC_SYMLINKOWN
59823+ default 1006
59824+ help
59825+ Setting this GID determines what group kernel-enforced
59826+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
59827+ is enabled, a sysctl option with name "symlinkown_gid" is created.
59828+
59829+config GRKERNSEC_FIFO
59830+ bool "FIFO restrictions"
59831+ default y if GRKERNSEC_CONFIG_AUTO
59832+ help
59833+ If you say Y here, users will not be able to write to FIFOs they don't
59834+ own in world-writable +t directories (e.g. /tmp), unless the owner of
59835+ the FIFO is the same owner of the directory it's held in. If the sysctl
59836+ option is enabled, a sysctl option with name "fifo_restrictions" is
59837+ created.
59838+
59839+config GRKERNSEC_SYSFS_RESTRICT
59840+ bool "Sysfs/debugfs restriction"
59841+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
59842+ depends on SYSFS
59843+ help
59844+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
59845+ any filesystem normally mounted under it (e.g. debugfs) will be
59846+ mostly accessible only by root. These filesystems generally provide access
59847+ to hardware and debug information that isn't appropriate for unprivileged
59848+ users of the system. Sysfs and debugfs have also become a large source
59849+ of new vulnerabilities, ranging from infoleaks to local compromise.
59850+ There has been very little oversight with an eye toward security involved
59851+ in adding new exporters of information to these filesystems, so their
59852+ use is discouraged.
59853+ For reasons of compatibility, a few directories have been whitelisted
59854+ for access by non-root users:
59855+ /sys/fs/selinux
59856+ /sys/fs/fuse
59857+ /sys/devices/system/cpu
59858+
59859+config GRKERNSEC_ROFS
59860+ bool "Runtime read-only mount protection"
59861+ help
59862+ If you say Y here, a sysctl option with name "romount_protect" will
59863+ be created. By setting this option to 1 at runtime, filesystems
59864+ will be protected in the following ways:
59865+ * No new writable mounts will be allowed
59866+ * Existing read-only mounts won't be able to be remounted read/write
59867+ * Write operations will be denied on all block devices
59868+ This option acts independently of grsec_lock: once it is set to 1,
59869+ it cannot be turned off. Therefore, please be mindful of the resulting
59870+ behavior if this option is enabled in an init script on a read-only
59871+ filesystem. This feature is mainly intended for secure embedded systems.
59872+
59873+config GRKERNSEC_DEVICE_SIDECHANNEL
59874+ bool "Eliminate stat/notify-based device sidechannels"
59875+ default y if GRKERNSEC_CONFIG_AUTO
59876+ help
59877+ If you say Y here, timing analyses on block or character
59878+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
59879+ will be thwarted for unprivileged users. If a process without
59880+ CAP_MKNOD stats such a device, the last access and last modify times
59881+ will match the device's create time. No access or modify events
59882+ will be triggered through inotify/dnotify/fanotify for such devices.
59883+ This feature will prevent attacks that may at a minimum
59884+ allow an attacker to determine the administrator's password length.
59885+
59886+config GRKERNSEC_CHROOT
59887+ bool "Chroot jail restrictions"
59888+ default y if GRKERNSEC_CONFIG_AUTO
59889+ help
59890+ If you say Y here, you will be able to choose several options that will
59891+ make breaking out of a chrooted jail much more difficult. If you
59892+ encounter no software incompatibilities with the following options, it
59893+ is recommended that you enable each one.
59894+
59895+config GRKERNSEC_CHROOT_MOUNT
59896+ bool "Deny mounts"
59897+ default y if GRKERNSEC_CONFIG_AUTO
59898+ depends on GRKERNSEC_CHROOT
59899+ help
59900+ If you say Y here, processes inside a chroot will not be able to
59901+ mount or remount filesystems. If the sysctl option is enabled, a
59902+ sysctl option with name "chroot_deny_mount" is created.
59903+
59904+config GRKERNSEC_CHROOT_DOUBLE
59905+ bool "Deny double-chroots"
59906+ default y if GRKERNSEC_CONFIG_AUTO
59907+ depends on GRKERNSEC_CHROOT
59908+ help
59909+ If you say Y here, processes inside a chroot will not be able to chroot
59910+ again outside the chroot. This is a widely used method of breaking
59911+ out of a chroot jail and should not be allowed. If the sysctl
59912+ option is enabled, a sysctl option with name
59913+ "chroot_deny_chroot" is created.
59914+
59915+config GRKERNSEC_CHROOT_PIVOT
59916+ bool "Deny pivot_root in chroot"
59917+ default y if GRKERNSEC_CONFIG_AUTO
59918+ depends on GRKERNSEC_CHROOT
59919+ help
59920+ If you say Y here, processes inside a chroot will not be able to use
59921+ a function called pivot_root() that was introduced in Linux 2.3.41. It
59922+ works similar to chroot in that it changes the root filesystem. This
59923+ function could be misused in a chrooted process to attempt to break out
59924+ of the chroot, and therefore should not be allowed. If the sysctl
59925+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
59926+ created.
59927+
59928+config GRKERNSEC_CHROOT_CHDIR
59929+ bool "Enforce chdir(\"/\") on all chroots"
59930+ default y if GRKERNSEC_CONFIG_AUTO
59931+ depends on GRKERNSEC_CHROOT
59932+ help
59933+ If you say Y here, the current working directory of all newly-chrooted
59934+ applications will be set to the the root directory of the chroot.
59935+ The man page on chroot(2) states:
59936+ Note that this call does not change the current working
59937+ directory, so that `.' can be outside the tree rooted at
59938+ `/'. In particular, the super-user can escape from a
59939+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
59940+
59941+ It is recommended that you say Y here, since it's not known to break
59942+ any software. If the sysctl option is enabled, a sysctl option with
59943+ name "chroot_enforce_chdir" is created.
59944+
59945+config GRKERNSEC_CHROOT_CHMOD
59946+ bool "Deny (f)chmod +s"
59947+ default y if GRKERNSEC_CONFIG_AUTO
59948+ depends on GRKERNSEC_CHROOT
59949+ help
59950+ If you say Y here, processes inside a chroot will not be able to chmod
59951+ or fchmod files to make them have suid or sgid bits. This protects
59952+ against another published method of breaking a chroot. If the sysctl
59953+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
59954+ created.
59955+
59956+config GRKERNSEC_CHROOT_FCHDIR
59957+ bool "Deny fchdir out of chroot"
59958+ default y if GRKERNSEC_CONFIG_AUTO
59959+ depends on GRKERNSEC_CHROOT
59960+ help
59961+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
59962+ to a file descriptor of the chrooting process that points to a directory
59963+ outside the filesystem will be stopped. If the sysctl option
59964+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
59965+
59966+config GRKERNSEC_CHROOT_MKNOD
59967+ bool "Deny mknod"
59968+ default y if GRKERNSEC_CONFIG_AUTO
59969+ depends on GRKERNSEC_CHROOT
59970+ help
59971+ If you say Y here, processes inside a chroot will not be allowed to
59972+ mknod. The problem with using mknod inside a chroot is that it
59973+ would allow an attacker to create a device entry that is the same
59974+ as one on the physical root of your system, which could range from
59975+ anything from the console device to a device for your harddrive (which
59976+ they could then use to wipe the drive or steal data). It is recommended
59977+ that you say Y here, unless you run into software incompatibilities.
59978+ If the sysctl option is enabled, a sysctl option with name
59979+ "chroot_deny_mknod" is created.
59980+
59981+config GRKERNSEC_CHROOT_SHMAT
59982+ bool "Deny shmat() out of chroot"
59983+ default y if GRKERNSEC_CONFIG_AUTO
59984+ depends on GRKERNSEC_CHROOT
59985+ help
59986+ If you say Y here, processes inside a chroot will not be able to attach
59987+ to shared memory segments that were created outside of the chroot jail.
59988+ It is recommended that you say Y here. If the sysctl option is enabled,
59989+ a sysctl option with name "chroot_deny_shmat" is created.
59990+
59991+config GRKERNSEC_CHROOT_UNIX
59992+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
59993+ default y if GRKERNSEC_CONFIG_AUTO
59994+ depends on GRKERNSEC_CHROOT
59995+ help
59996+ If you say Y here, processes inside a chroot will not be able to
59997+ connect to abstract (meaning not belonging to a filesystem) Unix
59998+ domain sockets that were bound outside of a chroot. It is recommended
59999+ that you say Y here. If the sysctl option is enabled, a sysctl option
60000+ with name "chroot_deny_unix" is created.
60001+
60002+config GRKERNSEC_CHROOT_FINDTASK
60003+ bool "Protect outside processes"
60004+ default y if GRKERNSEC_CONFIG_AUTO
60005+ depends on GRKERNSEC_CHROOT
60006+ help
60007+ If you say Y here, processes inside a chroot will not be able to
60008+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
60009+ getsid, or view any process outside of the chroot. If the sysctl
60010+ option is enabled, a sysctl option with name "chroot_findtask" is
60011+ created.
60012+
60013+config GRKERNSEC_CHROOT_NICE
60014+ bool "Restrict priority changes"
60015+ default y if GRKERNSEC_CONFIG_AUTO
60016+ depends on GRKERNSEC_CHROOT
60017+ help
60018+ If you say Y here, processes inside a chroot will not be able to raise
60019+ the priority of processes in the chroot, or alter the priority of
60020+ processes outside the chroot. This provides more security than simply
60021+ removing CAP_SYS_NICE from the process' capability set. If the
60022+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
60023+ is created.
60024+
60025+config GRKERNSEC_CHROOT_SYSCTL
60026+ bool "Deny sysctl writes"
60027+ default y if GRKERNSEC_CONFIG_AUTO
60028+ depends on GRKERNSEC_CHROOT
60029+ help
60030+ If you say Y here, an attacker in a chroot will not be able to
60031+ write to sysctl entries, either by sysctl(2) or through a /proc
60032+ interface. It is strongly recommended that you say Y here. If the
60033+ sysctl option is enabled, a sysctl option with name
60034+ "chroot_deny_sysctl" is created.
60035+
60036+config GRKERNSEC_CHROOT_CAPS
60037+ bool "Capability restrictions"
60038+ default y if GRKERNSEC_CONFIG_AUTO
60039+ depends on GRKERNSEC_CHROOT
60040+ help
60041+ If you say Y here, the capabilities on all processes within a
60042+ chroot jail will be lowered to stop module insertion, raw i/o,
60043+ system and net admin tasks, rebooting the system, modifying immutable
60044+ files, modifying IPC owned by another, and changing the system time.
60045+ This is left an option because it can break some apps. Disable this
60046+ if your chrooted apps are having problems performing those kinds of
60047+ tasks. If the sysctl option is enabled, a sysctl option with
60048+ name "chroot_caps" is created.
60049+
60050+config GRKERNSEC_CHROOT_INITRD
60051+ bool "Exempt initrd tasks from restrictions"
60052+ default y if GRKERNSEC_CONFIG_AUTO
60053+ depends on GRKERNSEC_CHROOT && BLK_DEV_RAM
60054+ help
60055+ If you say Y here, tasks started prior to init will be exempted from
60056+ grsecurity's chroot restrictions. This option is mainly meant to
60057+ resolve Plymouth's performing privileged operations unnecessarily
60058+ in a chroot.
60059+
60060+endmenu
60061+menu "Kernel Auditing"
60062+depends on GRKERNSEC
60063+
60064+config GRKERNSEC_AUDIT_GROUP
60065+ bool "Single group for auditing"
60066+ help
60067+ If you say Y here, the exec and chdir logging features will only operate
60068+ on a group you specify. This option is recommended if you only want to
60069+ watch certain users instead of having a large amount of logs from the
60070+ entire system. If the sysctl option is enabled, a sysctl option with
60071+ name "audit_group" is created.
60072+
60073+config GRKERNSEC_AUDIT_GID
60074+ int "GID for auditing"
60075+ depends on GRKERNSEC_AUDIT_GROUP
60076+ default 1007
60077+
60078+config GRKERNSEC_EXECLOG
60079+ bool "Exec logging"
60080+ help
60081+ If you say Y here, all execve() calls will be logged (since the
60082+ other exec*() calls are frontends to execve(), all execution
60083+ will be logged). Useful for shell-servers that like to keep track
60084+ of their users. If the sysctl option is enabled, a sysctl option with
60085+ name "exec_logging" is created.
60086+ WARNING: This option when enabled will produce a LOT of logs, especially
60087+ on an active system.
60088+
60089+config GRKERNSEC_RESLOG
60090+ bool "Resource logging"
60091+ default y if GRKERNSEC_CONFIG_AUTO
60092+ help
60093+ If you say Y here, all attempts to overstep resource limits will
60094+ be logged with the resource name, the requested size, and the current
60095+ limit. It is highly recommended that you say Y here. If the sysctl
60096+ option is enabled, a sysctl option with name "resource_logging" is
60097+ created. If the RBAC system is enabled, the sysctl value is ignored.
60098+
60099+config GRKERNSEC_CHROOT_EXECLOG
60100+ bool "Log execs within chroot"
60101+ help
60102+ If you say Y here, all executions inside a chroot jail will be logged
60103+ to syslog. This can cause a large amount of logs if certain
60104+ applications (eg. djb's daemontools) are installed on the system, and
60105+ is therefore left as an option. If the sysctl option is enabled, a
60106+ sysctl option with name "chroot_execlog" is created.
60107+
60108+config GRKERNSEC_AUDIT_PTRACE
60109+ bool "Ptrace logging"
60110+ help
60111+ If you say Y here, all attempts to attach to a process via ptrace
60112+ will be logged. If the sysctl option is enabled, a sysctl option
60113+ with name "audit_ptrace" is created.
60114+
60115+config GRKERNSEC_AUDIT_CHDIR
60116+ bool "Chdir logging"
60117+ help
60118+ If you say Y here, all chdir() calls will be logged. If the sysctl
60119+ option is enabled, a sysctl option with name "audit_chdir" is created.
60120+
60121+config GRKERNSEC_AUDIT_MOUNT
60122+ bool "(Un)Mount logging"
60123+ help
60124+ If you say Y here, all mounts and unmounts will be logged. If the
60125+ sysctl option is enabled, a sysctl option with name "audit_mount" is
60126+ created.
60127+
60128+config GRKERNSEC_SIGNAL
60129+ bool "Signal logging"
60130+ default y if GRKERNSEC_CONFIG_AUTO
60131+ help
60132+ If you say Y here, certain important signals will be logged, such as
60133+ SIGSEGV, which will as a result inform you of when a error in a program
60134+ occurred, which in some cases could mean a possible exploit attempt.
60135+ If the sysctl option is enabled, a sysctl option with name
60136+ "signal_logging" is created.
60137+
60138+config GRKERNSEC_FORKFAIL
60139+ bool "Fork failure logging"
60140+ help
60141+ If you say Y here, all failed fork() attempts will be logged.
60142+ This could suggest a fork bomb, or someone attempting to overstep
60143+ their process limit. If the sysctl option is enabled, a sysctl option
60144+ with name "forkfail_logging" is created.
60145+
60146+config GRKERNSEC_TIME
60147+ bool "Time change logging"
60148+ default y if GRKERNSEC_CONFIG_AUTO
60149+ help
60150+ If you say Y here, any changes of the system clock will be logged.
60151+ If the sysctl option is enabled, a sysctl option with name
60152+ "timechange_logging" is created.
60153+
60154+config GRKERNSEC_PROC_IPADDR
60155+ bool "/proc/<pid>/ipaddr support"
60156+ default y if GRKERNSEC_CONFIG_AUTO
60157+ help
60158+ If you say Y here, a new entry will be added to each /proc/<pid>
60159+ directory that contains the IP address of the person using the task.
60160+ The IP is carried across local TCP and AF_UNIX stream sockets.
60161+ This information can be useful for IDS/IPSes to perform remote response
60162+ to a local attack. The entry is readable by only the owner of the
60163+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
60164+ the RBAC system), and thus does not create privacy concerns.
60165+
60166+config GRKERNSEC_RWXMAP_LOG
60167+ bool 'Denied RWX mmap/mprotect logging'
60168+ default y if GRKERNSEC_CONFIG_AUTO
60169+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
60170+ help
60171+ If you say Y here, calls to mmap() and mprotect() with explicit
60172+ usage of PROT_WRITE and PROT_EXEC together will be logged when
60173+ denied by the PAX_MPROTECT feature. This feature will also
60174+ log other problematic scenarios that can occur when PAX_MPROTECT
60175+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
60176+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
60177+ is created.
60178+
60179+endmenu
60180+
60181+menu "Executable Protections"
60182+depends on GRKERNSEC
60183+
60184+config GRKERNSEC_DMESG
60185+ bool "Dmesg(8) restriction"
60186+ default y if GRKERNSEC_CONFIG_AUTO
60187+ help
60188+ If you say Y here, non-root users will not be able to use dmesg(8)
60189+ to view the contents of the kernel's circular log buffer.
60190+ The kernel's log buffer often contains kernel addresses and other
60191+ identifying information useful to an attacker in fingerprinting a
60192+ system for a targeted exploit.
60193+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
60194+ created.
60195+
60196+config GRKERNSEC_HARDEN_PTRACE
60197+ bool "Deter ptrace-based process snooping"
60198+ default y if GRKERNSEC_CONFIG_AUTO
60199+ help
60200+ If you say Y here, TTY sniffers and other malicious monitoring
60201+ programs implemented through ptrace will be defeated. If you
60202+ have been using the RBAC system, this option has already been
60203+ enabled for several years for all users, with the ability to make
60204+ fine-grained exceptions.
60205+
60206+ This option only affects the ability of non-root users to ptrace
60207+ processes that are not a descendent of the ptracing process.
60208+ This means that strace ./binary and gdb ./binary will still work,
60209+ but attaching to arbitrary processes will not. If the sysctl
60210+ option is enabled, a sysctl option with name "harden_ptrace" is
60211+ created.
60212+
60213+config GRKERNSEC_PTRACE_READEXEC
60214+ bool "Require read access to ptrace sensitive binaries"
60215+ default y if GRKERNSEC_CONFIG_AUTO
60216+ help
60217+ If you say Y here, unprivileged users will not be able to ptrace unreadable
60218+ binaries. This option is useful in environments that
60219+ remove the read bits (e.g. file mode 4711) from suid binaries to
60220+ prevent infoleaking of their contents. This option adds
60221+ consistency to the use of that file mode, as the binary could normally
60222+ be read out when run without privileges while ptracing.
60223+
60224+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
60225+ is created.
60226+
60227+config GRKERNSEC_SETXID
60228+ bool "Enforce consistent multithreaded privileges"
60229+ default y if GRKERNSEC_CONFIG_AUTO
60230+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
60231+ help
60232+ If you say Y here, a change from a root uid to a non-root uid
60233+ in a multithreaded application will cause the resulting uids,
60234+ gids, supplementary groups, and capabilities in that thread
60235+ to be propagated to the other threads of the process. In most
60236+ cases this is unnecessary, as glibc will emulate this behavior
60237+ on behalf of the application. Other libcs do not act in the
60238+ same way, allowing the other threads of the process to continue
60239+ running with root privileges. If the sysctl option is enabled,
60240+ a sysctl option with name "consistent_setxid" is created.
60241+
60242+config GRKERNSEC_TPE
60243+ bool "Trusted Path Execution (TPE)"
60244+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
60245+ help
60246+ If you say Y here, you will be able to choose a gid to add to the
60247+ supplementary groups of users you want to mark as "untrusted."
60248+ These users will not be able to execute any files that are not in
60249+ root-owned directories writable only by root. If the sysctl option
60250+ is enabled, a sysctl option with name "tpe" is created.
60251+
60252+config GRKERNSEC_TPE_ALL
60253+ bool "Partially restrict all non-root users"
60254+ depends on GRKERNSEC_TPE
60255+ help
60256+ If you say Y here, all non-root users will be covered under
60257+ a weaker TPE restriction. This is separate from, and in addition to,
60258+ the main TPE options that you have selected elsewhere. Thus, if a
60259+ "trusted" GID is chosen, this restriction applies to even that GID.
60260+ Under this restriction, all non-root users will only be allowed to
60261+ execute files in directories they own that are not group or
60262+ world-writable, or in directories owned by root and writable only by
60263+ root. If the sysctl option is enabled, a sysctl option with name
60264+ "tpe_restrict_all" is created.
60265+
60266+config GRKERNSEC_TPE_INVERT
60267+ bool "Invert GID option"
60268+ depends on GRKERNSEC_TPE
60269+ help
60270+ If you say Y here, the group you specify in the TPE configuration will
60271+ decide what group TPE restrictions will be *disabled* for. This
60272+ option is useful if you want TPE restrictions to be applied to most
60273+ users on the system. If the sysctl option is enabled, a sysctl option
60274+ with name "tpe_invert" is created. Unlike other sysctl options, this
60275+ entry will default to on for backward-compatibility.
60276+
60277+config GRKERNSEC_TPE_GID
60278+ int
60279+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
60280+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
60281+
60282+config GRKERNSEC_TPE_UNTRUSTED_GID
60283+ int "GID for TPE-untrusted users"
60284+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
60285+ default 1005
60286+ help
60287+ Setting this GID determines what group TPE restrictions will be
60288+ *enabled* for. If the sysctl option is enabled, a sysctl option
60289+ with name "tpe_gid" is created.
60290+
60291+config GRKERNSEC_TPE_TRUSTED_GID
60292+ int "GID for TPE-trusted users"
60293+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
60294+ default 1005
60295+ help
60296+ Setting this GID determines what group TPE restrictions will be
60297+ *disabled* for. If the sysctl option is enabled, a sysctl option
60298+ with name "tpe_gid" is created.
60299+
60300+endmenu
60301+menu "Network Protections"
60302+depends on GRKERNSEC
60303+
60304+config GRKERNSEC_RANDNET
60305+ bool "Larger entropy pools"
60306+ default y if GRKERNSEC_CONFIG_AUTO
60307+ help
60308+ If you say Y here, the entropy pools used for many features of Linux
60309+ and grsecurity will be doubled in size. Since several grsecurity
60310+ features use additional randomness, it is recommended that you say Y
60311+ here. Saying Y here has a similar effect as modifying
60312+ /proc/sys/kernel/random/poolsize.
60313+
60314+config GRKERNSEC_BLACKHOLE
60315+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
60316+ default y if GRKERNSEC_CONFIG_AUTO
60317+ depends on NET
60318+ help
60319+ If you say Y here, neither TCP resets nor ICMP
60320+ destination-unreachable packets will be sent in response to packets
60321+ sent to ports for which no associated listening process exists.
60322+ This feature supports both IPV4 and IPV6 and exempts the
60323+ loopback interface from blackholing. Enabling this feature
60324+ makes a host more resilient to DoS attacks and reduces network
60325+ visibility against scanners.
60326+
60327+ The blackhole feature as-implemented is equivalent to the FreeBSD
60328+ blackhole feature, as it prevents RST responses to all packets, not
60329+ just SYNs. Under most application behavior this causes no
60330+ problems, but applications (like haproxy) may not close certain
60331+ connections in a way that cleanly terminates them on the remote
60332+ end, leaving the remote host in LAST_ACK state. Because of this
60333+ side-effect and to prevent intentional LAST_ACK DoSes, this
60334+ feature also adds automatic mitigation against such attacks.
60335+ The mitigation drastically reduces the amount of time a socket
60336+ can spend in LAST_ACK state. If you're using haproxy and not
60337+ all servers it connects to have this option enabled, consider
60338+ disabling this feature on the haproxy host.
60339+
60340+ If the sysctl option is enabled, two sysctl options with names
60341+ "ip_blackhole" and "lastack_retries" will be created.
60342+ While "ip_blackhole" takes the standard zero/non-zero on/off
60343+ toggle, "lastack_retries" uses the same kinds of values as
60344+ "tcp_retries1" and "tcp_retries2". The default value of 4
60345+ prevents a socket from lasting more than 45 seconds in LAST_ACK
60346+ state.
60347+
60348+config GRKERNSEC_NO_SIMULT_CONNECT
60349+ bool "Disable TCP Simultaneous Connect"
60350+ default y if GRKERNSEC_CONFIG_AUTO
60351+ depends on NET
60352+ help
60353+ If you say Y here, a feature by Willy Tarreau will be enabled that
60354+ removes a weakness in Linux's strict implementation of TCP that
60355+ allows two clients to connect to each other without either entering
60356+ a listening state. The weakness allows an attacker to easily prevent
60357+ a client from connecting to a known server provided the source port
60358+ for the connection is guessed correctly.
60359+
60360+ As the weakness could be used to prevent an antivirus or IPS from
60361+ fetching updates, or prevent an SSL gateway from fetching a CRL,
60362+ it should be eliminated by enabling this option. Though Linux is
60363+ one of few operating systems supporting simultaneous connect, it
60364+ has no legitimate use in practice and is rarely supported by firewalls.
60365+
60366+config GRKERNSEC_SOCKET
60367+ bool "Socket restrictions"
60368+ depends on NET
60369+ help
60370+ If you say Y here, you will be able to choose from several options.
60371+ If you assign a GID on your system and add it to the supplementary
60372+ groups of users you want to restrict socket access to, this patch
60373+ will perform up to three things, based on the option(s) you choose.
60374+
60375+config GRKERNSEC_SOCKET_ALL
60376+ bool "Deny any sockets to group"
60377+ depends on GRKERNSEC_SOCKET
60378+ help
60379+ If you say Y here, you will be able to choose a GID of whose users will
60380+ be unable to connect to other hosts from your machine or run server
60381+ applications from your machine. If the sysctl option is enabled, a
60382+ sysctl option with name "socket_all" is created.
60383+
60384+config GRKERNSEC_SOCKET_ALL_GID
60385+ int "GID to deny all sockets for"
60386+ depends on GRKERNSEC_SOCKET_ALL
60387+ default 1004
60388+ help
60389+ Here you can choose the GID to disable socket access for. Remember to
60390+ add the users you want socket access disabled for to the GID
60391+ specified here. If the sysctl option is enabled, a sysctl option
60392+ with name "socket_all_gid" is created.
60393+
60394+config GRKERNSEC_SOCKET_CLIENT
60395+ bool "Deny client sockets to group"
60396+ depends on GRKERNSEC_SOCKET
60397+ help
60398+ If you say Y here, you will be able to choose a GID of whose users will
60399+ be unable to connect to other hosts from your machine, but will be
60400+ able to run servers. If this option is enabled, all users in the group
60401+ you specify will have to use passive mode when initiating ftp transfers
60402+ from the shell on your machine. If the sysctl option is enabled, a
60403+ sysctl option with name "socket_client" is created.
60404+
60405+config GRKERNSEC_SOCKET_CLIENT_GID
60406+ int "GID to deny client sockets for"
60407+ depends on GRKERNSEC_SOCKET_CLIENT
60408+ default 1003
60409+ help
60410+ Here you can choose the GID to disable client socket access for.
60411+ Remember to add the users you want client socket access disabled for to
60412+ the GID specified here. If the sysctl option is enabled, a sysctl
60413+ option with name "socket_client_gid" is created.
60414+
60415+config GRKERNSEC_SOCKET_SERVER
60416+ bool "Deny server sockets to group"
60417+ depends on GRKERNSEC_SOCKET
60418+ help
60419+ If you say Y here, you will be able to choose a GID of whose users will
60420+ be unable to run server applications from your machine. If the sysctl
60421+ option is enabled, a sysctl option with name "socket_server" is created.
60422+
60423+config GRKERNSEC_SOCKET_SERVER_GID
60424+ int "GID to deny server sockets for"
60425+ depends on GRKERNSEC_SOCKET_SERVER
60426+ default 1002
60427+ help
60428+ Here you can choose the GID to disable server socket access for.
60429+ Remember to add the users you want server socket access disabled for to
60430+ the GID specified here. If the sysctl option is enabled, a sysctl
60431+ option with name "socket_server_gid" is created.
60432+
60433+endmenu
60434+menu "Sysctl Support"
60435+depends on GRKERNSEC && SYSCTL
60436+
60437+config GRKERNSEC_SYSCTL
60438+ bool "Sysctl support"
60439+ default y if GRKERNSEC_CONFIG_AUTO
60440+ help
60441+ If you say Y here, you will be able to change the options that
60442+ grsecurity runs with at bootup, without having to recompile your
60443+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
60444+ to enable (1) or disable (0) various features. All the sysctl entries
60445+ are mutable until the "grsec_lock" entry is set to a non-zero value.
60446+ All features enabled in the kernel configuration are disabled at boot
60447+ if you do not say Y to the "Turn on features by default" option.
60448+ All options should be set at startup, and the grsec_lock entry should
60449+ be set to a non-zero value after all the options are set.
60450+ *THIS IS EXTREMELY IMPORTANT*
60451+
60452+config GRKERNSEC_SYSCTL_DISTRO
60453+ bool "Extra sysctl support for distro makers (READ HELP)"
60454+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
60455+ help
60456+ If you say Y here, additional sysctl options will be created
60457+ for features that affect processes running as root. Therefore,
60458+ it is critical when using this option that the grsec_lock entry be
60459+ enabled after boot. Only distros with prebuilt kernel packages
60460+ with this option enabled that can ensure grsec_lock is enabled
60461+ after boot should use this option.
60462+ *Failure to set grsec_lock after boot makes all grsec features
60463+ this option covers useless*
60464+
60465+ Currently this option creates the following sysctl entries:
60466+ "Disable Privileged I/O": "disable_priv_io"
60467+
60468+config GRKERNSEC_SYSCTL_ON
60469+ bool "Turn on features by default"
60470+ default y if GRKERNSEC_CONFIG_AUTO
60471+ depends on GRKERNSEC_SYSCTL
60472+ help
60473+ If you say Y here, instead of having all features enabled in the
60474+ kernel configuration disabled at boot time, the features will be
60475+ enabled at boot time. It is recommended you say Y here unless
60476+ there is some reason you would want all sysctl-tunable features to
60477+ be disabled by default. As mentioned elsewhere, it is important
60478+ to enable the grsec_lock entry once you have finished modifying
60479+ the sysctl entries.
60480+
60481+endmenu
60482+menu "Logging Options"
60483+depends on GRKERNSEC
60484+
60485+config GRKERNSEC_FLOODTIME
60486+ int "Seconds in between log messages (minimum)"
60487+ default 10
60488+ help
60489+ This option allows you to enforce the number of seconds between
60490+ grsecurity log messages. The default should be suitable for most
60491+ people, however, if you choose to change it, choose a value small enough
60492+ to allow informative logs to be produced, but large enough to
60493+ prevent flooding.
60494+
60495+config GRKERNSEC_FLOODBURST
60496+ int "Number of messages in a burst (maximum)"
60497+ default 6
60498+ help
60499+ This option allows you to choose the maximum number of messages allowed
60500+ within the flood time interval you chose in a separate option. The
60501+ default should be suitable for most people, however if you find that
60502+ many of your logs are being interpreted as flooding, you may want to
60503+ raise this value.
60504+
60505+endmenu
60506diff --git a/grsecurity/Makefile b/grsecurity/Makefile
60507new file mode 100644
60508index 0000000..36845aa
60509--- /dev/null
60510+++ b/grsecurity/Makefile
60511@@ -0,0 +1,42 @@
60512+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
60513+# during 2001-2009 it has been completely redesigned by Brad Spengler
60514+# into an RBAC system
60515+#
60516+# All code in this directory and various hooks inserted throughout the kernel
60517+# are copyright Brad Spengler - Open Source Security, Inc., and released
60518+# under the GPL v2 or higher
60519+
60520+KBUILD_CFLAGS += -Werror
60521+
60522+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
60523+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
60524+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
60525+
60526+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
60527+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
60528+ gracl_learn.o grsec_log.o
60529+ifdef CONFIG_COMPAT
60530+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
60531+endif
60532+
60533+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
60534+
60535+ifdef CONFIG_NET
60536+obj-y += grsec_sock.o
60537+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
60538+endif
60539+
60540+ifndef CONFIG_GRKERNSEC
60541+obj-y += grsec_disabled.o
60542+endif
60543+
60544+ifdef CONFIG_GRKERNSEC_HIDESYM
60545+extra-y := grsec_hidesym.o
60546+$(obj)/grsec_hidesym.o:
60547+ @-chmod -f 500 /boot
60548+ @-chmod -f 500 /lib/modules
60549+ @-chmod -f 500 /lib64/modules
60550+ @-chmod -f 500 /lib32/modules
60551+ @-chmod -f 700 .
60552+ @echo ' grsec: protected kernel image paths'
60553+endif
60554diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
60555new file mode 100644
60556index 0000000..c0793fd
60557--- /dev/null
60558+++ b/grsecurity/gracl.c
60559@@ -0,0 +1,4178 @@
60560+#include <linux/kernel.h>
60561+#include <linux/module.h>
60562+#include <linux/sched.h>
60563+#include <linux/mm.h>
60564+#include <linux/file.h>
60565+#include <linux/fs.h>
60566+#include <linux/namei.h>
60567+#include <linux/mount.h>
60568+#include <linux/tty.h>
60569+#include <linux/proc_fs.h>
60570+#include <linux/lglock.h>
60571+#include <linux/slab.h>
60572+#include <linux/vmalloc.h>
60573+#include <linux/types.h>
60574+#include <linux/sysctl.h>
60575+#include <linux/netdevice.h>
60576+#include <linux/ptrace.h>
60577+#include <linux/gracl.h>
60578+#include <linux/gralloc.h>
60579+#include <linux/security.h>
60580+#include <linux/grinternal.h>
60581+#include <linux/pid_namespace.h>
60582+#include <linux/stop_machine.h>
60583+#include <linux/fdtable.h>
60584+#include <linux/percpu.h>
60585+#include <linux/lglock.h>
60586+#include <linux/hugetlb.h>
60587+#include <linux/posix-timers.h>
60588+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
60589+#include <linux/magic.h>
60590+#include <linux/pagemap.h>
60591+#include "../fs/btrfs/async-thread.h"
60592+#include "../fs/btrfs/ctree.h"
60593+#include "../fs/btrfs/btrfs_inode.h"
60594+#endif
60595+#include "../fs/mount.h"
60596+
60597+#include <asm/uaccess.h>
60598+#include <asm/errno.h>
60599+#include <asm/mman.h>
60600+
60601+extern struct lglock vfsmount_lock;
60602+
60603+static struct acl_role_db acl_role_set;
60604+static struct name_db name_set;
60605+static struct inodev_db inodev_set;
60606+
60607+/* for keeping track of userspace pointers used for subjects, so we
60608+ can share references in the kernel as well
60609+*/
60610+
60611+static struct path real_root;
60612+
60613+static struct acl_subj_map_db subj_map_set;
60614+
60615+static struct acl_role_label *default_role;
60616+
60617+static struct acl_role_label *role_list;
60618+
60619+static u16 acl_sp_role_value;
60620+
60621+extern char *gr_shared_page[4];
60622+static DEFINE_MUTEX(gr_dev_mutex);
60623+DEFINE_RWLOCK(gr_inode_lock);
60624+
60625+struct gr_arg *gr_usermode;
60626+
60627+static unsigned int gr_status __read_only = GR_STATUS_INIT;
60628+
60629+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
60630+extern void gr_clear_learn_entries(void);
60631+
60632+unsigned char *gr_system_salt;
60633+unsigned char *gr_system_sum;
60634+
60635+static struct sprole_pw **acl_special_roles = NULL;
60636+static __u16 num_sprole_pws = 0;
60637+
60638+static struct acl_role_label *kernel_role = NULL;
60639+
60640+static unsigned int gr_auth_attempts = 0;
60641+static unsigned long gr_auth_expires = 0UL;
60642+
60643+#ifdef CONFIG_NET
60644+extern struct vfsmount *sock_mnt;
60645+#endif
60646+
60647+extern struct vfsmount *pipe_mnt;
60648+extern struct vfsmount *shm_mnt;
60649+
60650+#ifdef CONFIG_HUGETLBFS
60651+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
60652+#endif
60653+
60654+static struct acl_object_label *fakefs_obj_rw;
60655+static struct acl_object_label *fakefs_obj_rwx;
60656+
60657+extern int gr_init_uidset(void);
60658+extern void gr_free_uidset(void);
60659+extern void gr_remove_uid(uid_t uid);
60660+extern int gr_find_uid(uid_t uid);
60661+
60662+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
60663+{
60664+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
60665+ return -EFAULT;
60666+
60667+ return 0;
60668+}
60669+
60670+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
60671+{
60672+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
60673+ return -EFAULT;
60674+
60675+ return 0;
60676+}
60677+
60678+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
60679+{
60680+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
60681+ return -EFAULT;
60682+
60683+ return 0;
60684+}
60685+
60686+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
60687+{
60688+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
60689+ return -EFAULT;
60690+
60691+ return 0;
60692+}
60693+
60694+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
60695+{
60696+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
60697+ return -EFAULT;
60698+
60699+ return 0;
60700+}
60701+
60702+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
60703+{
60704+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
60705+ return -EFAULT;
60706+
60707+ return 0;
60708+}
60709+
60710+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
60711+{
60712+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
60713+ return -EFAULT;
60714+
60715+ return 0;
60716+}
60717+
60718+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
60719+{
60720+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
60721+ return -EFAULT;
60722+
60723+ return 0;
60724+}
60725+
60726+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
60727+{
60728+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
60729+ return -EFAULT;
60730+
60731+ return 0;
60732+}
60733+
60734+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
60735+{
60736+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
60737+ return -EFAULT;
60738+
60739+ if ((uwrap->version != GRSECURITY_VERSION) || (uwrap->size != sizeof(struct gr_arg)))
60740+ return -EINVAL;
60741+
60742+ return 0;
60743+}
60744+
60745+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
60746+{
60747+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
60748+ return -EFAULT;
60749+
60750+ return 0;
60751+}
60752+
60753+static size_t get_gr_arg_wrapper_size_normal(void)
60754+{
60755+ return sizeof(struct gr_arg_wrapper);
60756+}
60757+
60758+#ifdef CONFIG_COMPAT
60759+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
60760+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
60761+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
60762+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
60763+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
60764+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
60765+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
60766+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
60767+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
60768+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
60769+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
60770+extern size_t get_gr_arg_wrapper_size_compat(void);
60771+
60772+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
60773+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
60774+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
60775+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
60776+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
60777+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
60778+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
60779+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
60780+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
60781+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
60782+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
60783+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
60784+
60785+#else
60786+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
60787+#define copy_gr_arg copy_gr_arg_normal
60788+#define copy_gr_hash_struct copy_gr_hash_struct_normal
60789+#define copy_acl_object_label copy_acl_object_label_normal
60790+#define copy_acl_subject_label copy_acl_subject_label_normal
60791+#define copy_acl_role_label copy_acl_role_label_normal
60792+#define copy_acl_ip_label copy_acl_ip_label_normal
60793+#define copy_pointer_from_array copy_pointer_from_array_normal
60794+#define copy_sprole_pw copy_sprole_pw_normal
60795+#define copy_role_transition copy_role_transition_normal
60796+#define copy_role_allowed_ip copy_role_allowed_ip_normal
60797+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
60798+#endif
60799+
60800+__inline__ int
60801+gr_acl_is_enabled(void)
60802+{
60803+ return (gr_status & GR_READY);
60804+}
60805+
60806+static inline dev_t __get_dev(const struct dentry *dentry)
60807+{
60808+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
60809+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
60810+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
60811+ else
60812+#endif
60813+ return dentry->d_sb->s_dev;
60814+}
60815+
60816+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
60817+{
60818+ return __get_dev(dentry);
60819+}
60820+
60821+static char gr_task_roletype_to_char(struct task_struct *task)
60822+{
60823+ switch (task->role->roletype &
60824+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
60825+ GR_ROLE_SPECIAL)) {
60826+ case GR_ROLE_DEFAULT:
60827+ return 'D';
60828+ case GR_ROLE_USER:
60829+ return 'U';
60830+ case GR_ROLE_GROUP:
60831+ return 'G';
60832+ case GR_ROLE_SPECIAL:
60833+ return 'S';
60834+ }
60835+
60836+ return 'X';
60837+}
60838+
60839+char gr_roletype_to_char(void)
60840+{
60841+ return gr_task_roletype_to_char(current);
60842+}
60843+
60844+__inline__ int
60845+gr_acl_tpe_check(void)
60846+{
60847+ if (unlikely(!(gr_status & GR_READY)))
60848+ return 0;
60849+ if (current->role->roletype & GR_ROLE_TPE)
60850+ return 1;
60851+ else
60852+ return 0;
60853+}
60854+
60855+int
60856+gr_handle_rawio(const struct inode *inode)
60857+{
60858+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
60859+ if (inode && S_ISBLK(inode->i_mode) &&
60860+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
60861+ !capable(CAP_SYS_RAWIO))
60862+ return 1;
60863+#endif
60864+ return 0;
60865+}
60866+
60867+static int
60868+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
60869+{
60870+ if (likely(lena != lenb))
60871+ return 0;
60872+
60873+ return !memcmp(a, b, lena);
60874+}
60875+
60876+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
60877+{
60878+ *buflen -= namelen;
60879+ if (*buflen < 0)
60880+ return -ENAMETOOLONG;
60881+ *buffer -= namelen;
60882+ memcpy(*buffer, str, namelen);
60883+ return 0;
60884+}
60885+
60886+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
60887+{
60888+ return prepend(buffer, buflen, name->name, name->len);
60889+}
60890+
60891+static int prepend_path(const struct path *path, struct path *root,
60892+ char **buffer, int *buflen)
60893+{
60894+ struct dentry *dentry = path->dentry;
60895+ struct vfsmount *vfsmnt = path->mnt;
60896+ struct mount *mnt = real_mount(vfsmnt);
60897+ bool slash = false;
60898+ int error = 0;
60899+
60900+ while (dentry != root->dentry || vfsmnt != root->mnt) {
60901+ struct dentry * parent;
60902+
60903+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
60904+ /* Global root? */
60905+ if (!mnt_has_parent(mnt)) {
60906+ goto out;
60907+ }
60908+ dentry = mnt->mnt_mountpoint;
60909+ mnt = mnt->mnt_parent;
60910+ vfsmnt = &mnt->mnt;
60911+ continue;
60912+ }
60913+ parent = dentry->d_parent;
60914+ prefetch(parent);
60915+ spin_lock(&dentry->d_lock);
60916+ error = prepend_name(buffer, buflen, &dentry->d_name);
60917+ spin_unlock(&dentry->d_lock);
60918+ if (!error)
60919+ error = prepend(buffer, buflen, "/", 1);
60920+ if (error)
60921+ break;
60922+
60923+ slash = true;
60924+ dentry = parent;
60925+ }
60926+
60927+out:
60928+ if (!error && !slash)
60929+ error = prepend(buffer, buflen, "/", 1);
60930+
60931+ return error;
60932+}
60933+
60934+/* this must be called with vfsmount_lock and rename_lock held */
60935+
60936+static char *__our_d_path(const struct path *path, struct path *root,
60937+ char *buf, int buflen)
60938+{
60939+ char *res = buf + buflen;
60940+ int error;
60941+
60942+ prepend(&res, &buflen, "\0", 1);
60943+ error = prepend_path(path, root, &res, &buflen);
60944+ if (error)
60945+ return ERR_PTR(error);
60946+
60947+ return res;
60948+}
60949+
60950+static char *
60951+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
60952+{
60953+ char *retval;
60954+
60955+ retval = __our_d_path(path, root, buf, buflen);
60956+ if (unlikely(IS_ERR(retval)))
60957+ retval = strcpy(buf, "<path too long>");
60958+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
60959+ retval[1] = '\0';
60960+
60961+ return retval;
60962+}
60963+
60964+static char *
60965+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
60966+ char *buf, int buflen)
60967+{
60968+ struct path path;
60969+ char *res;
60970+
60971+ path.dentry = (struct dentry *)dentry;
60972+ path.mnt = (struct vfsmount *)vfsmnt;
60973+
60974+ /* we can use real_root.dentry, real_root.mnt, because this is only called
60975+ by the RBAC system */
60976+ res = gen_full_path(&path, &real_root, buf, buflen);
60977+
60978+ return res;
60979+}
60980+
60981+static char *
60982+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
60983+ char *buf, int buflen)
60984+{
60985+ char *res;
60986+ struct path path;
60987+ struct path root;
60988+ struct task_struct *reaper = init_pid_ns.child_reaper;
60989+
60990+ path.dentry = (struct dentry *)dentry;
60991+ path.mnt = (struct vfsmount *)vfsmnt;
60992+
60993+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
60994+ get_fs_root(reaper->fs, &root);
60995+
60996+ br_read_lock(&vfsmount_lock);
60997+ write_seqlock(&rename_lock);
60998+ res = gen_full_path(&path, &root, buf, buflen);
60999+ write_sequnlock(&rename_lock);
61000+ br_read_unlock(&vfsmount_lock);
61001+
61002+ path_put(&root);
61003+ return res;
61004+}
61005+
61006+static char *
61007+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
61008+{
61009+ char *ret;
61010+ br_read_lock(&vfsmount_lock);
61011+ write_seqlock(&rename_lock);
61012+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
61013+ PAGE_SIZE);
61014+ write_sequnlock(&rename_lock);
61015+ br_read_unlock(&vfsmount_lock);
61016+ return ret;
61017+}
61018+
61019+static char *
61020+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
61021+{
61022+ char *ret;
61023+ char *buf;
61024+ int buflen;
61025+
61026+ br_read_lock(&vfsmount_lock);
61027+ write_seqlock(&rename_lock);
61028+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
61029+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
61030+ buflen = (int)(ret - buf);
61031+ if (buflen >= 5)
61032+ prepend(&ret, &buflen, "/proc", 5);
61033+ else
61034+ ret = strcpy(buf, "<path too long>");
61035+ write_sequnlock(&rename_lock);
61036+ br_read_unlock(&vfsmount_lock);
61037+ return ret;
61038+}
61039+
61040+char *
61041+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
61042+{
61043+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
61044+ PAGE_SIZE);
61045+}
61046+
61047+char *
61048+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
61049+{
61050+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
61051+ PAGE_SIZE);
61052+}
61053+
61054+char *
61055+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
61056+{
61057+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
61058+ PAGE_SIZE);
61059+}
61060+
61061+char *
61062+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
61063+{
61064+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
61065+ PAGE_SIZE);
61066+}
61067+
61068+char *
61069+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
61070+{
61071+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
61072+ PAGE_SIZE);
61073+}
61074+
61075+__inline__ __u32
61076+to_gr_audit(const __u32 reqmode)
61077+{
61078+ /* masks off auditable permission flags, then shifts them to create
61079+ auditing flags, and adds the special case of append auditing if
61080+ we're requesting write */
61081+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
61082+}
61083+
61084+struct acl_subject_label *
61085+lookup_subject_map(const struct acl_subject_label *userp)
61086+{
61087+ unsigned int index = gr_shash(userp, subj_map_set.s_size);
61088+ struct subject_map *match;
61089+
61090+ match = subj_map_set.s_hash[index];
61091+
61092+ while (match && match->user != userp)
61093+ match = match->next;
61094+
61095+ if (match != NULL)
61096+ return match->kernel;
61097+ else
61098+ return NULL;
61099+}
61100+
61101+static void
61102+insert_subj_map_entry(struct subject_map *subjmap)
61103+{
61104+ unsigned int index = gr_shash(subjmap->user, subj_map_set.s_size);
61105+ struct subject_map **curr;
61106+
61107+ subjmap->prev = NULL;
61108+
61109+ curr = &subj_map_set.s_hash[index];
61110+ if (*curr != NULL)
61111+ (*curr)->prev = subjmap;
61112+
61113+ subjmap->next = *curr;
61114+ *curr = subjmap;
61115+
61116+ return;
61117+}
61118+
61119+static struct acl_role_label *
61120+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
61121+ const gid_t gid)
61122+{
61123+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
61124+ struct acl_role_label *match;
61125+ struct role_allowed_ip *ipp;
61126+ unsigned int x;
61127+ u32 curr_ip = task->signal->curr_ip;
61128+
61129+ task->signal->saved_ip = curr_ip;
61130+
61131+ match = acl_role_set.r_hash[index];
61132+
61133+ while (match) {
61134+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
61135+ for (x = 0; x < match->domain_child_num; x++) {
61136+ if (match->domain_children[x] == uid)
61137+ goto found;
61138+ }
61139+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
61140+ break;
61141+ match = match->next;
61142+ }
61143+found:
61144+ if (match == NULL) {
61145+ try_group:
61146+ index = gr_rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
61147+ match = acl_role_set.r_hash[index];
61148+
61149+ while (match) {
61150+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
61151+ for (x = 0; x < match->domain_child_num; x++) {
61152+ if (match->domain_children[x] == gid)
61153+ goto found2;
61154+ }
61155+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
61156+ break;
61157+ match = match->next;
61158+ }
61159+found2:
61160+ if (match == NULL)
61161+ match = default_role;
61162+ if (match->allowed_ips == NULL)
61163+ return match;
61164+ else {
61165+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
61166+ if (likely
61167+ ((ntohl(curr_ip) & ipp->netmask) ==
61168+ (ntohl(ipp->addr) & ipp->netmask)))
61169+ return match;
61170+ }
61171+ match = default_role;
61172+ }
61173+ } else if (match->allowed_ips == NULL) {
61174+ return match;
61175+ } else {
61176+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
61177+ if (likely
61178+ ((ntohl(curr_ip) & ipp->netmask) ==
61179+ (ntohl(ipp->addr) & ipp->netmask)))
61180+ return match;
61181+ }
61182+ goto try_group;
61183+ }
61184+
61185+ return match;
61186+}
61187+
61188+struct acl_subject_label *
61189+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
61190+ const struct acl_role_label *role)
61191+{
61192+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
61193+ struct acl_subject_label *match;
61194+
61195+ match = role->subj_hash[index];
61196+
61197+ while (match && (match->inode != ino || match->device != dev ||
61198+ (match->mode & GR_DELETED))) {
61199+ match = match->next;
61200+ }
61201+
61202+ if (match && !(match->mode & GR_DELETED))
61203+ return match;
61204+ else
61205+ return NULL;
61206+}
61207+
61208+struct acl_subject_label *
61209+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
61210+ const struct acl_role_label *role)
61211+{
61212+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
61213+ struct acl_subject_label *match;
61214+
61215+ match = role->subj_hash[index];
61216+
61217+ while (match && (match->inode != ino || match->device != dev ||
61218+ !(match->mode & GR_DELETED))) {
61219+ match = match->next;
61220+ }
61221+
61222+ if (match && (match->mode & GR_DELETED))
61223+ return match;
61224+ else
61225+ return NULL;
61226+}
61227+
61228+static struct acl_object_label *
61229+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
61230+ const struct acl_subject_label *subj)
61231+{
61232+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
61233+ struct acl_object_label *match;
61234+
61235+ match = subj->obj_hash[index];
61236+
61237+ while (match && (match->inode != ino || match->device != dev ||
61238+ (match->mode & GR_DELETED))) {
61239+ match = match->next;
61240+ }
61241+
61242+ if (match && !(match->mode & GR_DELETED))
61243+ return match;
61244+ else
61245+ return NULL;
61246+}
61247+
61248+static struct acl_object_label *
61249+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
61250+ const struct acl_subject_label *subj)
61251+{
61252+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
61253+ struct acl_object_label *match;
61254+
61255+ match = subj->obj_hash[index];
61256+
61257+ while (match && (match->inode != ino || match->device != dev ||
61258+ !(match->mode & GR_DELETED))) {
61259+ match = match->next;
61260+ }
61261+
61262+ if (match && (match->mode & GR_DELETED))
61263+ return match;
61264+
61265+ match = subj->obj_hash[index];
61266+
61267+ while (match && (match->inode != ino || match->device != dev ||
61268+ (match->mode & GR_DELETED))) {
61269+ match = match->next;
61270+ }
61271+
61272+ if (match && !(match->mode & GR_DELETED))
61273+ return match;
61274+ else
61275+ return NULL;
61276+}
61277+
61278+static struct name_entry *
61279+lookup_name_entry(const char *name)
61280+{
61281+ unsigned int len = strlen(name);
61282+ unsigned int key = full_name_hash(name, len);
61283+ unsigned int index = key % name_set.n_size;
61284+ struct name_entry *match;
61285+
61286+ match = name_set.n_hash[index];
61287+
61288+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
61289+ match = match->next;
61290+
61291+ return match;
61292+}
61293+
61294+static struct name_entry *
61295+lookup_name_entry_create(const char *name)
61296+{
61297+ unsigned int len = strlen(name);
61298+ unsigned int key = full_name_hash(name, len);
61299+ unsigned int index = key % name_set.n_size;
61300+ struct name_entry *match;
61301+
61302+ match = name_set.n_hash[index];
61303+
61304+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
61305+ !match->deleted))
61306+ match = match->next;
61307+
61308+ if (match && match->deleted)
61309+ return match;
61310+
61311+ match = name_set.n_hash[index];
61312+
61313+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
61314+ match->deleted))
61315+ match = match->next;
61316+
61317+ if (match && !match->deleted)
61318+ return match;
61319+ else
61320+ return NULL;
61321+}
61322+
61323+static struct inodev_entry *
61324+lookup_inodev_entry(const ino_t ino, const dev_t dev)
61325+{
61326+ unsigned int index = gr_fhash(ino, dev, inodev_set.i_size);
61327+ struct inodev_entry *match;
61328+
61329+ match = inodev_set.i_hash[index];
61330+
61331+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
61332+ match = match->next;
61333+
61334+ return match;
61335+}
61336+
61337+static void
61338+insert_inodev_entry(struct inodev_entry *entry)
61339+{
61340+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
61341+ inodev_set.i_size);
61342+ struct inodev_entry **curr;
61343+
61344+ entry->prev = NULL;
61345+
61346+ curr = &inodev_set.i_hash[index];
61347+ if (*curr != NULL)
61348+ (*curr)->prev = entry;
61349+
61350+ entry->next = *curr;
61351+ *curr = entry;
61352+
61353+ return;
61354+}
61355+
61356+static void
61357+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
61358+{
61359+ unsigned int index =
61360+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
61361+ struct acl_role_label **curr;
61362+ struct acl_role_label *tmp, *tmp2;
61363+
61364+ curr = &acl_role_set.r_hash[index];
61365+
61366+ /* simple case, slot is empty, just set it to our role */
61367+ if (*curr == NULL) {
61368+ *curr = role;
61369+ } else {
61370+ /* example:
61371+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
61372+ 2 -> 3
61373+ */
61374+ /* first check to see if we can already be reached via this slot */
61375+ tmp = *curr;
61376+ while (tmp && tmp != role)
61377+ tmp = tmp->next;
61378+ if (tmp == role) {
61379+ /* we don't need to add ourselves to this slot's chain */
61380+ return;
61381+ }
61382+ /* we need to add ourselves to this chain, two cases */
61383+ if (role->next == NULL) {
61384+ /* simple case, append the current chain to our role */
61385+ role->next = *curr;
61386+ *curr = role;
61387+ } else {
61388+ /* 1 -> 2 -> 3 -> 4
61389+ 2 -> 3 -> 4
61390+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
61391+ */
61392+ /* trickier case: walk our role's chain until we find
61393+ the role for the start of the current slot's chain */
61394+ tmp = role;
61395+ tmp2 = *curr;
61396+ while (tmp->next && tmp->next != tmp2)
61397+ tmp = tmp->next;
61398+ if (tmp->next == tmp2) {
61399+ /* from example above, we found 3, so just
61400+ replace this slot's chain with ours */
61401+ *curr = role;
61402+ } else {
61403+ /* we didn't find a subset of our role's chain
61404+ in the current slot's chain, so append their
61405+ chain to ours, and set us as the first role in
61406+ the slot's chain
61407+
61408+ we could fold this case with the case above,
61409+ but making it explicit for clarity
61410+ */
61411+ tmp->next = tmp2;
61412+ *curr = role;
61413+ }
61414+ }
61415+ }
61416+
61417+ return;
61418+}
61419+
61420+static void
61421+insert_acl_role_label(struct acl_role_label *role)
61422+{
61423+ int i;
61424+
61425+ if (role_list == NULL) {
61426+ role_list = role;
61427+ role->prev = NULL;
61428+ } else {
61429+ role->prev = role_list;
61430+ role_list = role;
61431+ }
61432+
61433+ /* used for hash chains */
61434+ role->next = NULL;
61435+
61436+ if (role->roletype & GR_ROLE_DOMAIN) {
61437+ for (i = 0; i < role->domain_child_num; i++)
61438+ __insert_acl_role_label(role, role->domain_children[i]);
61439+ } else
61440+ __insert_acl_role_label(role, role->uidgid);
61441+}
61442+
61443+static int
61444+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
61445+{
61446+ struct name_entry **curr, *nentry;
61447+ struct inodev_entry *ientry;
61448+ unsigned int len = strlen(name);
61449+ unsigned int key = full_name_hash(name, len);
61450+ unsigned int index = key % name_set.n_size;
61451+
61452+ curr = &name_set.n_hash[index];
61453+
61454+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
61455+ curr = &((*curr)->next);
61456+
61457+ if (*curr != NULL)
61458+ return 1;
61459+
61460+ nentry = acl_alloc(sizeof (struct name_entry));
61461+ if (nentry == NULL)
61462+ return 0;
61463+ ientry = acl_alloc(sizeof (struct inodev_entry));
61464+ if (ientry == NULL)
61465+ return 0;
61466+ ientry->nentry = nentry;
61467+
61468+ nentry->key = key;
61469+ nentry->name = name;
61470+ nentry->inode = inode;
61471+ nentry->device = device;
61472+ nentry->len = len;
61473+ nentry->deleted = deleted;
61474+
61475+ nentry->prev = NULL;
61476+ curr = &name_set.n_hash[index];
61477+ if (*curr != NULL)
61478+ (*curr)->prev = nentry;
61479+ nentry->next = *curr;
61480+ *curr = nentry;
61481+
61482+ /* insert us into the table searchable by inode/dev */
61483+ insert_inodev_entry(ientry);
61484+
61485+ return 1;
61486+}
61487+
61488+static void
61489+insert_acl_obj_label(struct acl_object_label *obj,
61490+ struct acl_subject_label *subj)
61491+{
61492+ unsigned int index =
61493+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
61494+ struct acl_object_label **curr;
61495+
61496+
61497+ obj->prev = NULL;
61498+
61499+ curr = &subj->obj_hash[index];
61500+ if (*curr != NULL)
61501+ (*curr)->prev = obj;
61502+
61503+ obj->next = *curr;
61504+ *curr = obj;
61505+
61506+ return;
61507+}
61508+
61509+static void
61510+insert_acl_subj_label(struct acl_subject_label *obj,
61511+ struct acl_role_label *role)
61512+{
61513+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
61514+ struct acl_subject_label **curr;
61515+
61516+ obj->prev = NULL;
61517+
61518+ curr = &role->subj_hash[index];
61519+ if (*curr != NULL)
61520+ (*curr)->prev = obj;
61521+
61522+ obj->next = *curr;
61523+ *curr = obj;
61524+
61525+ return;
61526+}
61527+
61528+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
61529+
61530+static void *
61531+create_table(__u32 * len, int elementsize)
61532+{
61533+ unsigned int table_sizes[] = {
61534+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
61535+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
61536+ 4194301, 8388593, 16777213, 33554393, 67108859
61537+ };
61538+ void *newtable = NULL;
61539+ unsigned int pwr = 0;
61540+
61541+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
61542+ table_sizes[pwr] <= *len)
61543+ pwr++;
61544+
61545+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
61546+ return newtable;
61547+
61548+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
61549+ newtable =
61550+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
61551+ else
61552+ newtable = vmalloc(table_sizes[pwr] * elementsize);
61553+
61554+ *len = table_sizes[pwr];
61555+
61556+ return newtable;
61557+}
61558+
61559+static int
61560+init_variables(const struct gr_arg *arg)
61561+{
61562+ struct task_struct *reaper = init_pid_ns.child_reaper;
61563+ unsigned int stacksize;
61564+
61565+ subj_map_set.s_size = arg->role_db.num_subjects;
61566+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
61567+ name_set.n_size = arg->role_db.num_objects;
61568+ inodev_set.i_size = arg->role_db.num_objects;
61569+
61570+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
61571+ !name_set.n_size || !inodev_set.i_size)
61572+ return 1;
61573+
61574+ if (!gr_init_uidset())
61575+ return 1;
61576+
61577+ /* set up the stack that holds allocation info */
61578+
61579+ stacksize = arg->role_db.num_pointers + 5;
61580+
61581+ if (!acl_alloc_stack_init(stacksize))
61582+ return 1;
61583+
61584+ /* grab reference for the real root dentry and vfsmount */
61585+ get_fs_root(reaper->fs, &real_root);
61586+
61587+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
61588+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
61589+#endif
61590+
61591+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
61592+ if (fakefs_obj_rw == NULL)
61593+ return 1;
61594+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
61595+
61596+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
61597+ if (fakefs_obj_rwx == NULL)
61598+ return 1;
61599+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
61600+
61601+ subj_map_set.s_hash =
61602+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
61603+ acl_role_set.r_hash =
61604+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
61605+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
61606+ inodev_set.i_hash =
61607+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
61608+
61609+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
61610+ !name_set.n_hash || !inodev_set.i_hash)
61611+ return 1;
61612+
61613+ memset(subj_map_set.s_hash, 0,
61614+ sizeof(struct subject_map *) * subj_map_set.s_size);
61615+ memset(acl_role_set.r_hash, 0,
61616+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
61617+ memset(name_set.n_hash, 0,
61618+ sizeof (struct name_entry *) * name_set.n_size);
61619+ memset(inodev_set.i_hash, 0,
61620+ sizeof (struct inodev_entry *) * inodev_set.i_size);
61621+
61622+ return 0;
61623+}
61624+
61625+/* free information not needed after startup
61626+ currently contains user->kernel pointer mappings for subjects
61627+*/
61628+
61629+static void
61630+free_init_variables(void)
61631+{
61632+ __u32 i;
61633+
61634+ if (subj_map_set.s_hash) {
61635+ for (i = 0; i < subj_map_set.s_size; i++) {
61636+ if (subj_map_set.s_hash[i]) {
61637+ kfree(subj_map_set.s_hash[i]);
61638+ subj_map_set.s_hash[i] = NULL;
61639+ }
61640+ }
61641+
61642+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
61643+ PAGE_SIZE)
61644+ kfree(subj_map_set.s_hash);
61645+ else
61646+ vfree(subj_map_set.s_hash);
61647+ }
61648+
61649+ return;
61650+}
61651+
61652+static void
61653+free_variables(void)
61654+{
61655+ struct acl_subject_label *s;
61656+ struct acl_role_label *r;
61657+ struct task_struct *task, *task2;
61658+ unsigned int x;
61659+
61660+ gr_clear_learn_entries();
61661+
61662+ read_lock(&tasklist_lock);
61663+ do_each_thread(task2, task) {
61664+ task->acl_sp_role = 0;
61665+ task->acl_role_id = 0;
61666+ task->acl = NULL;
61667+ task->role = NULL;
61668+ } while_each_thread(task2, task);
61669+ read_unlock(&tasklist_lock);
61670+
61671+ /* release the reference to the real root dentry and vfsmount */
61672+ path_put(&real_root);
61673+ memset(&real_root, 0, sizeof(real_root));
61674+
61675+ /* free all object hash tables */
61676+
61677+ FOR_EACH_ROLE_START(r)
61678+ if (r->subj_hash == NULL)
61679+ goto next_role;
61680+ FOR_EACH_SUBJECT_START(r, s, x)
61681+ if (s->obj_hash == NULL)
61682+ break;
61683+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
61684+ kfree(s->obj_hash);
61685+ else
61686+ vfree(s->obj_hash);
61687+ FOR_EACH_SUBJECT_END(s, x)
61688+ FOR_EACH_NESTED_SUBJECT_START(r, s)
61689+ if (s->obj_hash == NULL)
61690+ break;
61691+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
61692+ kfree(s->obj_hash);
61693+ else
61694+ vfree(s->obj_hash);
61695+ FOR_EACH_NESTED_SUBJECT_END(s)
61696+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
61697+ kfree(r->subj_hash);
61698+ else
61699+ vfree(r->subj_hash);
61700+ r->subj_hash = NULL;
61701+next_role:
61702+ FOR_EACH_ROLE_END(r)
61703+
61704+ acl_free_all();
61705+
61706+ if (acl_role_set.r_hash) {
61707+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
61708+ PAGE_SIZE)
61709+ kfree(acl_role_set.r_hash);
61710+ else
61711+ vfree(acl_role_set.r_hash);
61712+ }
61713+ if (name_set.n_hash) {
61714+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
61715+ PAGE_SIZE)
61716+ kfree(name_set.n_hash);
61717+ else
61718+ vfree(name_set.n_hash);
61719+ }
61720+
61721+ if (inodev_set.i_hash) {
61722+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
61723+ PAGE_SIZE)
61724+ kfree(inodev_set.i_hash);
61725+ else
61726+ vfree(inodev_set.i_hash);
61727+ }
61728+
61729+ gr_free_uidset();
61730+
61731+ memset(&name_set, 0, sizeof (struct name_db));
61732+ memset(&inodev_set, 0, sizeof (struct inodev_db));
61733+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
61734+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
61735+
61736+ default_role = NULL;
61737+ kernel_role = NULL;
61738+ role_list = NULL;
61739+
61740+ return;
61741+}
61742+
61743+static struct acl_subject_label *
61744+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
61745+
61746+static int alloc_and_copy_string(char **name, unsigned int maxlen)
61747+{
61748+ unsigned int len = strnlen_user(*name, maxlen);
61749+ char *tmp;
61750+
61751+ if (!len || len >= maxlen)
61752+ return -EINVAL;
61753+
61754+ if ((tmp = (char *) acl_alloc(len)) == NULL)
61755+ return -ENOMEM;
61756+
61757+ if (copy_from_user(tmp, *name, len))
61758+ return -EFAULT;
61759+
61760+ tmp[len-1] = '\0';
61761+ *name = tmp;
61762+
61763+ return 0;
61764+}
61765+
61766+static int
61767+copy_user_glob(struct acl_object_label *obj)
61768+{
61769+ struct acl_object_label *g_tmp, **guser;
61770+ int error;
61771+
61772+ if (obj->globbed == NULL)
61773+ return 0;
61774+
61775+ guser = &obj->globbed;
61776+ while (*guser) {
61777+ g_tmp = (struct acl_object_label *)
61778+ acl_alloc(sizeof (struct acl_object_label));
61779+ if (g_tmp == NULL)
61780+ return -ENOMEM;
61781+
61782+ if (copy_acl_object_label(g_tmp, *guser))
61783+ return -EFAULT;
61784+
61785+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
61786+ if (error)
61787+ return error;
61788+
61789+ *guser = g_tmp;
61790+ guser = &(g_tmp->next);
61791+ }
61792+
61793+ return 0;
61794+}
61795+
61796+static int
61797+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
61798+ struct acl_role_label *role)
61799+{
61800+ struct acl_object_label *o_tmp;
61801+ int ret;
61802+
61803+ while (userp) {
61804+ if ((o_tmp = (struct acl_object_label *)
61805+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
61806+ return -ENOMEM;
61807+
61808+ if (copy_acl_object_label(o_tmp, userp))
61809+ return -EFAULT;
61810+
61811+ userp = o_tmp->prev;
61812+
61813+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
61814+ if (ret)
61815+ return ret;
61816+
61817+ insert_acl_obj_label(o_tmp, subj);
61818+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
61819+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
61820+ return -ENOMEM;
61821+
61822+ ret = copy_user_glob(o_tmp);
61823+ if (ret)
61824+ return ret;
61825+
61826+ if (o_tmp->nested) {
61827+ int already_copied;
61828+
61829+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
61830+ if (IS_ERR(o_tmp->nested))
61831+ return PTR_ERR(o_tmp->nested);
61832+
61833+ /* insert into nested subject list if we haven't copied this one yet
61834+ to prevent duplicate entries */
61835+ if (!already_copied) {
61836+ o_tmp->nested->next = role->hash->first;
61837+ role->hash->first = o_tmp->nested;
61838+ }
61839+ }
61840+ }
61841+
61842+ return 0;
61843+}
61844+
61845+static __u32
61846+count_user_subjs(struct acl_subject_label *userp)
61847+{
61848+ struct acl_subject_label s_tmp;
61849+ __u32 num = 0;
61850+
61851+ while (userp) {
61852+ if (copy_acl_subject_label(&s_tmp, userp))
61853+ break;
61854+
61855+ userp = s_tmp.prev;
61856+ }
61857+
61858+ return num;
61859+}
61860+
61861+static int
61862+copy_user_allowedips(struct acl_role_label *rolep)
61863+{
61864+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
61865+
61866+ ruserip = rolep->allowed_ips;
61867+
61868+ while (ruserip) {
61869+ rlast = rtmp;
61870+
61871+ if ((rtmp = (struct role_allowed_ip *)
61872+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
61873+ return -ENOMEM;
61874+
61875+ if (copy_role_allowed_ip(rtmp, ruserip))
61876+ return -EFAULT;
61877+
61878+ ruserip = rtmp->prev;
61879+
61880+ if (!rlast) {
61881+ rtmp->prev = NULL;
61882+ rolep->allowed_ips = rtmp;
61883+ } else {
61884+ rlast->next = rtmp;
61885+ rtmp->prev = rlast;
61886+ }
61887+
61888+ if (!ruserip)
61889+ rtmp->next = NULL;
61890+ }
61891+
61892+ return 0;
61893+}
61894+
61895+static int
61896+copy_user_transitions(struct acl_role_label *rolep)
61897+{
61898+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
61899+ int error;
61900+
61901+ rusertp = rolep->transitions;
61902+
61903+ while (rusertp) {
61904+ rlast = rtmp;
61905+
61906+ if ((rtmp = (struct role_transition *)
61907+ acl_alloc(sizeof (struct role_transition))) == NULL)
61908+ return -ENOMEM;
61909+
61910+ if (copy_role_transition(rtmp, rusertp))
61911+ return -EFAULT;
61912+
61913+ rusertp = rtmp->prev;
61914+
61915+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
61916+ if (error)
61917+ return error;
61918+
61919+ if (!rlast) {
61920+ rtmp->prev = NULL;
61921+ rolep->transitions = rtmp;
61922+ } else {
61923+ rlast->next = rtmp;
61924+ rtmp->prev = rlast;
61925+ }
61926+
61927+ if (!rusertp)
61928+ rtmp->next = NULL;
61929+ }
61930+
61931+ return 0;
61932+}
61933+
61934+static __u32 count_user_objs(const struct acl_object_label __user *userp)
61935+{
61936+ struct acl_object_label o_tmp;
61937+ __u32 num = 0;
61938+
61939+ while (userp) {
61940+ if (copy_acl_object_label(&o_tmp, userp))
61941+ break;
61942+
61943+ userp = o_tmp.prev;
61944+ num++;
61945+ }
61946+
61947+ return num;
61948+}
61949+
61950+static struct acl_subject_label *
61951+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
61952+{
61953+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
61954+ __u32 num_objs;
61955+ struct acl_ip_label **i_tmp, *i_utmp2;
61956+ struct gr_hash_struct ghash;
61957+ struct subject_map *subjmap;
61958+ unsigned int i_num;
61959+ int err;
61960+
61961+ if (already_copied != NULL)
61962+ *already_copied = 0;
61963+
61964+ s_tmp = lookup_subject_map(userp);
61965+
61966+ /* we've already copied this subject into the kernel, just return
61967+ the reference to it, and don't copy it over again
61968+ */
61969+ if (s_tmp) {
61970+ if (already_copied != NULL)
61971+ *already_copied = 1;
61972+ return(s_tmp);
61973+ }
61974+
61975+ if ((s_tmp = (struct acl_subject_label *)
61976+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
61977+ return ERR_PTR(-ENOMEM);
61978+
61979+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
61980+ if (subjmap == NULL)
61981+ return ERR_PTR(-ENOMEM);
61982+
61983+ subjmap->user = userp;
61984+ subjmap->kernel = s_tmp;
61985+ insert_subj_map_entry(subjmap);
61986+
61987+ if (copy_acl_subject_label(s_tmp, userp))
61988+ return ERR_PTR(-EFAULT);
61989+
61990+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
61991+ if (err)
61992+ return ERR_PTR(err);
61993+
61994+ if (!strcmp(s_tmp->filename, "/"))
61995+ role->root_label = s_tmp;
61996+
61997+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
61998+ return ERR_PTR(-EFAULT);
61999+
62000+ /* copy user and group transition tables */
62001+
62002+ if (s_tmp->user_trans_num) {
62003+ uid_t *uidlist;
62004+
62005+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
62006+ if (uidlist == NULL)
62007+ return ERR_PTR(-ENOMEM);
62008+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
62009+ return ERR_PTR(-EFAULT);
62010+
62011+ s_tmp->user_transitions = uidlist;
62012+ }
62013+
62014+ if (s_tmp->group_trans_num) {
62015+ gid_t *gidlist;
62016+
62017+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
62018+ if (gidlist == NULL)
62019+ return ERR_PTR(-ENOMEM);
62020+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
62021+ return ERR_PTR(-EFAULT);
62022+
62023+ s_tmp->group_transitions = gidlist;
62024+ }
62025+
62026+ /* set up object hash table */
62027+ num_objs = count_user_objs(ghash.first);
62028+
62029+ s_tmp->obj_hash_size = num_objs;
62030+ s_tmp->obj_hash =
62031+ (struct acl_object_label **)
62032+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
62033+
62034+ if (!s_tmp->obj_hash)
62035+ return ERR_PTR(-ENOMEM);
62036+
62037+ memset(s_tmp->obj_hash, 0,
62038+ s_tmp->obj_hash_size *
62039+ sizeof (struct acl_object_label *));
62040+
62041+ /* add in objects */
62042+ err = copy_user_objs(ghash.first, s_tmp, role);
62043+
62044+ if (err)
62045+ return ERR_PTR(err);
62046+
62047+ /* set pointer for parent subject */
62048+ if (s_tmp->parent_subject) {
62049+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
62050+
62051+ if (IS_ERR(s_tmp2))
62052+ return s_tmp2;
62053+
62054+ s_tmp->parent_subject = s_tmp2;
62055+ }
62056+
62057+ /* add in ip acls */
62058+
62059+ if (!s_tmp->ip_num) {
62060+ s_tmp->ips = NULL;
62061+ goto insert;
62062+ }
62063+
62064+ i_tmp =
62065+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
62066+ sizeof (struct acl_ip_label *));
62067+
62068+ if (!i_tmp)
62069+ return ERR_PTR(-ENOMEM);
62070+
62071+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
62072+ *(i_tmp + i_num) =
62073+ (struct acl_ip_label *)
62074+ acl_alloc(sizeof (struct acl_ip_label));
62075+ if (!*(i_tmp + i_num))
62076+ return ERR_PTR(-ENOMEM);
62077+
62078+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
62079+ return ERR_PTR(-EFAULT);
62080+
62081+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
62082+ return ERR_PTR(-EFAULT);
62083+
62084+ if ((*(i_tmp + i_num))->iface == NULL)
62085+ continue;
62086+
62087+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
62088+ if (err)
62089+ return ERR_PTR(err);
62090+ }
62091+
62092+ s_tmp->ips = i_tmp;
62093+
62094+insert:
62095+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
62096+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
62097+ return ERR_PTR(-ENOMEM);
62098+
62099+ return s_tmp;
62100+}
62101+
62102+static int
62103+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
62104+{
62105+ struct acl_subject_label s_pre;
62106+ struct acl_subject_label * ret;
62107+ int err;
62108+
62109+ while (userp) {
62110+ if (copy_acl_subject_label(&s_pre, userp))
62111+ return -EFAULT;
62112+
62113+ ret = do_copy_user_subj(userp, role, NULL);
62114+
62115+ err = PTR_ERR(ret);
62116+ if (IS_ERR(ret))
62117+ return err;
62118+
62119+ insert_acl_subj_label(ret, role);
62120+
62121+ userp = s_pre.prev;
62122+ }
62123+
62124+ return 0;
62125+}
62126+
62127+static int
62128+copy_user_acl(struct gr_arg *arg)
62129+{
62130+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
62131+ struct acl_subject_label *subj_list;
62132+ struct sprole_pw *sptmp;
62133+ struct gr_hash_struct *ghash;
62134+ uid_t *domainlist;
62135+ unsigned int r_num;
62136+ int err = 0;
62137+ __u16 i;
62138+ __u32 num_subjs;
62139+
62140+ /* we need a default and kernel role */
62141+ if (arg->role_db.num_roles < 2)
62142+ return -EINVAL;
62143+
62144+ /* copy special role authentication info from userspace */
62145+
62146+ num_sprole_pws = arg->num_sprole_pws;
62147+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
62148+
62149+ if (!acl_special_roles && num_sprole_pws)
62150+ return -ENOMEM;
62151+
62152+ for (i = 0; i < num_sprole_pws; i++) {
62153+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
62154+ if (!sptmp)
62155+ return -ENOMEM;
62156+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
62157+ return -EFAULT;
62158+
62159+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
62160+ if (err)
62161+ return err;
62162+
62163+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
62164+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
62165+#endif
62166+
62167+ acl_special_roles[i] = sptmp;
62168+ }
62169+
62170+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
62171+
62172+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
62173+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
62174+
62175+ if (!r_tmp)
62176+ return -ENOMEM;
62177+
62178+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
62179+ return -EFAULT;
62180+
62181+ if (copy_acl_role_label(r_tmp, r_utmp2))
62182+ return -EFAULT;
62183+
62184+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
62185+ if (err)
62186+ return err;
62187+
62188+ if (!strcmp(r_tmp->rolename, "default")
62189+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
62190+ default_role = r_tmp;
62191+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
62192+ kernel_role = r_tmp;
62193+ }
62194+
62195+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
62196+ return -ENOMEM;
62197+
62198+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
62199+ return -EFAULT;
62200+
62201+ r_tmp->hash = ghash;
62202+
62203+ num_subjs = count_user_subjs(r_tmp->hash->first);
62204+
62205+ r_tmp->subj_hash_size = num_subjs;
62206+ r_tmp->subj_hash =
62207+ (struct acl_subject_label **)
62208+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
62209+
62210+ if (!r_tmp->subj_hash)
62211+ return -ENOMEM;
62212+
62213+ err = copy_user_allowedips(r_tmp);
62214+ if (err)
62215+ return err;
62216+
62217+ /* copy domain info */
62218+ if (r_tmp->domain_children != NULL) {
62219+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
62220+ if (domainlist == NULL)
62221+ return -ENOMEM;
62222+
62223+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
62224+ return -EFAULT;
62225+
62226+ r_tmp->domain_children = domainlist;
62227+ }
62228+
62229+ err = copy_user_transitions(r_tmp);
62230+ if (err)
62231+ return err;
62232+
62233+ memset(r_tmp->subj_hash, 0,
62234+ r_tmp->subj_hash_size *
62235+ sizeof (struct acl_subject_label *));
62236+
62237+ /* acquire the list of subjects, then NULL out
62238+ the list prior to parsing the subjects for this role,
62239+ as during this parsing the list is replaced with a list
62240+ of *nested* subjects for the role
62241+ */
62242+ subj_list = r_tmp->hash->first;
62243+
62244+ /* set nested subject list to null */
62245+ r_tmp->hash->first = NULL;
62246+
62247+ err = copy_user_subjs(subj_list, r_tmp);
62248+
62249+ if (err)
62250+ return err;
62251+
62252+ insert_acl_role_label(r_tmp);
62253+ }
62254+
62255+ if (default_role == NULL || kernel_role == NULL)
62256+ return -EINVAL;
62257+
62258+ return err;
62259+}
62260+
62261+static int
62262+gracl_init(struct gr_arg *args)
62263+{
62264+ int error = 0;
62265+
62266+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
62267+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
62268+
62269+ if (init_variables(args)) {
62270+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
62271+ error = -ENOMEM;
62272+ free_variables();
62273+ goto out;
62274+ }
62275+
62276+ error = copy_user_acl(args);
62277+ free_init_variables();
62278+ if (error) {
62279+ free_variables();
62280+ goto out;
62281+ }
62282+
62283+ if ((error = gr_set_acls(0))) {
62284+ free_variables();
62285+ goto out;
62286+ }
62287+
62288+ pax_open_kernel();
62289+ gr_status |= GR_READY;
62290+ pax_close_kernel();
62291+
62292+ out:
62293+ return error;
62294+}
62295+
62296+/* derived from glibc fnmatch() 0: match, 1: no match*/
62297+
62298+static int
62299+glob_match(const char *p, const char *n)
62300+{
62301+ char c;
62302+
62303+ while ((c = *p++) != '\0') {
62304+ switch (c) {
62305+ case '?':
62306+ if (*n == '\0')
62307+ return 1;
62308+ else if (*n == '/')
62309+ return 1;
62310+ break;
62311+ case '\\':
62312+ if (*n != c)
62313+ return 1;
62314+ break;
62315+ case '*':
62316+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
62317+ if (*n == '/')
62318+ return 1;
62319+ else if (c == '?') {
62320+ if (*n == '\0')
62321+ return 1;
62322+ else
62323+ ++n;
62324+ }
62325+ }
62326+ if (c == '\0') {
62327+ return 0;
62328+ } else {
62329+ const char *endp;
62330+
62331+ if ((endp = strchr(n, '/')) == NULL)
62332+ endp = n + strlen(n);
62333+
62334+ if (c == '[') {
62335+ for (--p; n < endp; ++n)
62336+ if (!glob_match(p, n))
62337+ return 0;
62338+ } else if (c == '/') {
62339+ while (*n != '\0' && *n != '/')
62340+ ++n;
62341+ if (*n == '/' && !glob_match(p, n + 1))
62342+ return 0;
62343+ } else {
62344+ for (--p; n < endp; ++n)
62345+ if (*n == c && !glob_match(p, n))
62346+ return 0;
62347+ }
62348+
62349+ return 1;
62350+ }
62351+ case '[':
62352+ {
62353+ int not;
62354+ char cold;
62355+
62356+ if (*n == '\0' || *n == '/')
62357+ return 1;
62358+
62359+ not = (*p == '!' || *p == '^');
62360+ if (not)
62361+ ++p;
62362+
62363+ c = *p++;
62364+ for (;;) {
62365+ unsigned char fn = (unsigned char)*n;
62366+
62367+ if (c == '\0')
62368+ return 1;
62369+ else {
62370+ if (c == fn)
62371+ goto matched;
62372+ cold = c;
62373+ c = *p++;
62374+
62375+ if (c == '-' && *p != ']') {
62376+ unsigned char cend = *p++;
62377+
62378+ if (cend == '\0')
62379+ return 1;
62380+
62381+ if (cold <= fn && fn <= cend)
62382+ goto matched;
62383+
62384+ c = *p++;
62385+ }
62386+ }
62387+
62388+ if (c == ']')
62389+ break;
62390+ }
62391+ if (!not)
62392+ return 1;
62393+ break;
62394+ matched:
62395+ while (c != ']') {
62396+ if (c == '\0')
62397+ return 1;
62398+
62399+ c = *p++;
62400+ }
62401+ if (not)
62402+ return 1;
62403+ }
62404+ break;
62405+ default:
62406+ if (c != *n)
62407+ return 1;
62408+ }
62409+
62410+ ++n;
62411+ }
62412+
62413+ if (*n == '\0')
62414+ return 0;
62415+
62416+ if (*n == '/')
62417+ return 0;
62418+
62419+ return 1;
62420+}
62421+
62422+static struct acl_object_label *
62423+chk_glob_label(struct acl_object_label *globbed,
62424+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
62425+{
62426+ struct acl_object_label *tmp;
62427+
62428+ if (*path == NULL)
62429+ *path = gr_to_filename_nolock(dentry, mnt);
62430+
62431+ tmp = globbed;
62432+
62433+ while (tmp) {
62434+ if (!glob_match(tmp->filename, *path))
62435+ return tmp;
62436+ tmp = tmp->next;
62437+ }
62438+
62439+ return NULL;
62440+}
62441+
62442+static struct acl_object_label *
62443+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
62444+ const ino_t curr_ino, const dev_t curr_dev,
62445+ const struct acl_subject_label *subj, char **path, const int checkglob)
62446+{
62447+ struct acl_subject_label *tmpsubj;
62448+ struct acl_object_label *retval;
62449+ struct acl_object_label *retval2;
62450+
62451+ tmpsubj = (struct acl_subject_label *) subj;
62452+ read_lock(&gr_inode_lock);
62453+ do {
62454+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
62455+ if (retval) {
62456+ if (checkglob && retval->globbed) {
62457+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
62458+ if (retval2)
62459+ retval = retval2;
62460+ }
62461+ break;
62462+ }
62463+ } while ((tmpsubj = tmpsubj->parent_subject));
62464+ read_unlock(&gr_inode_lock);
62465+
62466+ return retval;
62467+}
62468+
62469+static __inline__ struct acl_object_label *
62470+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
62471+ struct dentry *curr_dentry,
62472+ const struct acl_subject_label *subj, char **path, const int checkglob)
62473+{
62474+ int newglob = checkglob;
62475+ ino_t inode;
62476+ dev_t device;
62477+
62478+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
62479+ as we don't want a / * rule to match instead of the / object
62480+ don't do this for create lookups that call this function though, since they're looking up
62481+ on the parent and thus need globbing checks on all paths
62482+ */
62483+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
62484+ newglob = GR_NO_GLOB;
62485+
62486+ spin_lock(&curr_dentry->d_lock);
62487+ inode = curr_dentry->d_inode->i_ino;
62488+ device = __get_dev(curr_dentry);
62489+ spin_unlock(&curr_dentry->d_lock);
62490+
62491+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
62492+}
62493+
62494+#ifdef CONFIG_HUGETLBFS
62495+static inline bool
62496+is_hugetlbfs_mnt(const struct vfsmount *mnt)
62497+{
62498+ int i;
62499+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
62500+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
62501+ return true;
62502+ }
62503+
62504+ return false;
62505+}
62506+#endif
62507+
62508+static struct acl_object_label *
62509+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
62510+ const struct acl_subject_label *subj, char *path, const int checkglob)
62511+{
62512+ struct dentry *dentry = (struct dentry *) l_dentry;
62513+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
62514+ struct mount *real_mnt = real_mount(mnt);
62515+ struct acl_object_label *retval;
62516+ struct dentry *parent;
62517+
62518+ br_read_lock(&vfsmount_lock);
62519+ write_seqlock(&rename_lock);
62520+
62521+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
62522+#ifdef CONFIG_NET
62523+ mnt == sock_mnt ||
62524+#endif
62525+#ifdef CONFIG_HUGETLBFS
62526+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
62527+#endif
62528+ /* ignore Eric Biederman */
62529+ IS_PRIVATE(l_dentry->d_inode))) {
62530+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
62531+ goto out;
62532+ }
62533+
62534+ for (;;) {
62535+ if (dentry == real_root.dentry && mnt == real_root.mnt)
62536+ break;
62537+
62538+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
62539+ if (!mnt_has_parent(real_mnt))
62540+ break;
62541+
62542+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
62543+ if (retval != NULL)
62544+ goto out;
62545+
62546+ dentry = real_mnt->mnt_mountpoint;
62547+ real_mnt = real_mnt->mnt_parent;
62548+ mnt = &real_mnt->mnt;
62549+ continue;
62550+ }
62551+
62552+ parent = dentry->d_parent;
62553+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
62554+ if (retval != NULL)
62555+ goto out;
62556+
62557+ dentry = parent;
62558+ }
62559+
62560+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
62561+
62562+ /* real_root is pinned so we don't have to hold a reference */
62563+ if (retval == NULL)
62564+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
62565+out:
62566+ write_sequnlock(&rename_lock);
62567+ br_read_unlock(&vfsmount_lock);
62568+
62569+ BUG_ON(retval == NULL);
62570+
62571+ return retval;
62572+}
62573+
62574+static __inline__ struct acl_object_label *
62575+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
62576+ const struct acl_subject_label *subj)
62577+{
62578+ char *path = NULL;
62579+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
62580+}
62581+
62582+static __inline__ struct acl_object_label *
62583+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
62584+ const struct acl_subject_label *subj)
62585+{
62586+ char *path = NULL;
62587+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
62588+}
62589+
62590+static __inline__ struct acl_object_label *
62591+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
62592+ const struct acl_subject_label *subj, char *path)
62593+{
62594+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
62595+}
62596+
62597+static struct acl_subject_label *
62598+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
62599+ const struct acl_role_label *role)
62600+{
62601+ struct dentry *dentry = (struct dentry *) l_dentry;
62602+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
62603+ struct mount *real_mnt = real_mount(mnt);
62604+ struct acl_subject_label *retval;
62605+ struct dentry *parent;
62606+
62607+ br_read_lock(&vfsmount_lock);
62608+ write_seqlock(&rename_lock);
62609+
62610+ for (;;) {
62611+ if (dentry == real_root.dentry && mnt == real_root.mnt)
62612+ break;
62613+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
62614+ if (!mnt_has_parent(real_mnt))
62615+ break;
62616+
62617+ spin_lock(&dentry->d_lock);
62618+ read_lock(&gr_inode_lock);
62619+ retval =
62620+ lookup_acl_subj_label(dentry->d_inode->i_ino,
62621+ __get_dev(dentry), role);
62622+ read_unlock(&gr_inode_lock);
62623+ spin_unlock(&dentry->d_lock);
62624+ if (retval != NULL)
62625+ goto out;
62626+
62627+ dentry = real_mnt->mnt_mountpoint;
62628+ real_mnt = real_mnt->mnt_parent;
62629+ mnt = &real_mnt->mnt;
62630+ continue;
62631+ }
62632+
62633+ spin_lock(&dentry->d_lock);
62634+ read_lock(&gr_inode_lock);
62635+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
62636+ __get_dev(dentry), role);
62637+ read_unlock(&gr_inode_lock);
62638+ parent = dentry->d_parent;
62639+ spin_unlock(&dentry->d_lock);
62640+
62641+ if (retval != NULL)
62642+ goto out;
62643+
62644+ dentry = parent;
62645+ }
62646+
62647+ spin_lock(&dentry->d_lock);
62648+ read_lock(&gr_inode_lock);
62649+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
62650+ __get_dev(dentry), role);
62651+ read_unlock(&gr_inode_lock);
62652+ spin_unlock(&dentry->d_lock);
62653+
62654+ if (unlikely(retval == NULL)) {
62655+ /* real_root is pinned, we don't need to hold a reference */
62656+ read_lock(&gr_inode_lock);
62657+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
62658+ __get_dev(real_root.dentry), role);
62659+ read_unlock(&gr_inode_lock);
62660+ }
62661+out:
62662+ write_sequnlock(&rename_lock);
62663+ br_read_unlock(&vfsmount_lock);
62664+
62665+ BUG_ON(retval == NULL);
62666+
62667+ return retval;
62668+}
62669+
62670+static void
62671+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
62672+{
62673+ struct task_struct *task = current;
62674+ const struct cred *cred = current_cred();
62675+
62676+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
62677+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
62678+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
62679+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
62680+
62681+ return;
62682+}
62683+
62684+static void
62685+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
62686+{
62687+ struct task_struct *task = current;
62688+ const struct cred *cred = current_cred();
62689+
62690+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
62691+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
62692+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
62693+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
62694+
62695+ return;
62696+}
62697+
62698+static void
62699+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
62700+{
62701+ struct task_struct *task = current;
62702+ const struct cred *cred = current_cred();
62703+
62704+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
62705+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
62706+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
62707+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
62708+
62709+ return;
62710+}
62711+
62712+__u32
62713+gr_search_file(const struct dentry * dentry, const __u32 mode,
62714+ const struct vfsmount * mnt)
62715+{
62716+ __u32 retval = mode;
62717+ struct acl_subject_label *curracl;
62718+ struct acl_object_label *currobj;
62719+
62720+ if (unlikely(!(gr_status & GR_READY)))
62721+ return (mode & ~GR_AUDITS);
62722+
62723+ curracl = current->acl;
62724+
62725+ currobj = chk_obj_label(dentry, mnt, curracl);
62726+ retval = currobj->mode & mode;
62727+
62728+ /* if we're opening a specified transfer file for writing
62729+ (e.g. /dev/initctl), then transfer our role to init
62730+ */
62731+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
62732+ current->role->roletype & GR_ROLE_PERSIST)) {
62733+ struct task_struct *task = init_pid_ns.child_reaper;
62734+
62735+ if (task->role != current->role) {
62736+ task->acl_sp_role = 0;
62737+ task->acl_role_id = current->acl_role_id;
62738+ task->role = current->role;
62739+ rcu_read_lock();
62740+ read_lock(&grsec_exec_file_lock);
62741+ gr_apply_subject_to_task(task);
62742+ read_unlock(&grsec_exec_file_lock);
62743+ rcu_read_unlock();
62744+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
62745+ }
62746+ }
62747+
62748+ if (unlikely
62749+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
62750+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
62751+ __u32 new_mode = mode;
62752+
62753+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
62754+
62755+ retval = new_mode;
62756+
62757+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
62758+ new_mode |= GR_INHERIT;
62759+
62760+ if (!(mode & GR_NOLEARN))
62761+ gr_log_learn(dentry, mnt, new_mode);
62762+ }
62763+
62764+ return retval;
62765+}
62766+
62767+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
62768+ const struct dentry *parent,
62769+ const struct vfsmount *mnt)
62770+{
62771+ struct name_entry *match;
62772+ struct acl_object_label *matchpo;
62773+ struct acl_subject_label *curracl;
62774+ char *path;
62775+
62776+ if (unlikely(!(gr_status & GR_READY)))
62777+ return NULL;
62778+
62779+ preempt_disable();
62780+ path = gr_to_filename_rbac(new_dentry, mnt);
62781+ match = lookup_name_entry_create(path);
62782+
62783+ curracl = current->acl;
62784+
62785+ if (match) {
62786+ read_lock(&gr_inode_lock);
62787+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
62788+ read_unlock(&gr_inode_lock);
62789+
62790+ if (matchpo) {
62791+ preempt_enable();
62792+ return matchpo;
62793+ }
62794+ }
62795+
62796+ // lookup parent
62797+
62798+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
62799+
62800+ preempt_enable();
62801+ return matchpo;
62802+}
62803+
62804+__u32
62805+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
62806+ const struct vfsmount * mnt, const __u32 mode)
62807+{
62808+ struct acl_object_label *matchpo;
62809+ __u32 retval;
62810+
62811+ if (unlikely(!(gr_status & GR_READY)))
62812+ return (mode & ~GR_AUDITS);
62813+
62814+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
62815+
62816+ retval = matchpo->mode & mode;
62817+
62818+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
62819+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
62820+ __u32 new_mode = mode;
62821+
62822+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
62823+
62824+ gr_log_learn(new_dentry, mnt, new_mode);
62825+ return new_mode;
62826+ }
62827+
62828+ return retval;
62829+}
62830+
62831+__u32
62832+gr_check_link(const struct dentry * new_dentry,
62833+ const struct dentry * parent_dentry,
62834+ const struct vfsmount * parent_mnt,
62835+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
62836+{
62837+ struct acl_object_label *obj;
62838+ __u32 oldmode, newmode;
62839+ __u32 needmode;
62840+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
62841+ GR_DELETE | GR_INHERIT;
62842+
62843+ if (unlikely(!(gr_status & GR_READY)))
62844+ return (GR_CREATE | GR_LINK);
62845+
62846+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
62847+ oldmode = obj->mode;
62848+
62849+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
62850+ newmode = obj->mode;
62851+
62852+ needmode = newmode & checkmodes;
62853+
62854+ // old name for hardlink must have at least the permissions of the new name
62855+ if ((oldmode & needmode) != needmode)
62856+ goto bad;
62857+
62858+ // if old name had restrictions/auditing, make sure the new name does as well
62859+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
62860+
62861+ // don't allow hardlinking of suid/sgid/fcapped files without permission
62862+ if (is_privileged_binary(old_dentry))
62863+ needmode |= GR_SETID;
62864+
62865+ if ((newmode & needmode) != needmode)
62866+ goto bad;
62867+
62868+ // enforce minimum permissions
62869+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
62870+ return newmode;
62871+bad:
62872+ needmode = oldmode;
62873+ if (is_privileged_binary(old_dentry))
62874+ needmode |= GR_SETID;
62875+
62876+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
62877+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
62878+ return (GR_CREATE | GR_LINK);
62879+ } else if (newmode & GR_SUPPRESS)
62880+ return GR_SUPPRESS;
62881+ else
62882+ return 0;
62883+}
62884+
62885+int
62886+gr_check_hidden_task(const struct task_struct *task)
62887+{
62888+ if (unlikely(!(gr_status & GR_READY)))
62889+ return 0;
62890+
62891+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
62892+ return 1;
62893+
62894+ return 0;
62895+}
62896+
62897+int
62898+gr_check_protected_task(const struct task_struct *task)
62899+{
62900+ if (unlikely(!(gr_status & GR_READY) || !task))
62901+ return 0;
62902+
62903+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
62904+ task->acl != current->acl)
62905+ return 1;
62906+
62907+ return 0;
62908+}
62909+
62910+int
62911+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
62912+{
62913+ struct task_struct *p;
62914+ int ret = 0;
62915+
62916+ if (unlikely(!(gr_status & GR_READY) || !pid))
62917+ return ret;
62918+
62919+ read_lock(&tasklist_lock);
62920+ do_each_pid_task(pid, type, p) {
62921+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
62922+ p->acl != current->acl) {
62923+ ret = 1;
62924+ goto out;
62925+ }
62926+ } while_each_pid_task(pid, type, p);
62927+out:
62928+ read_unlock(&tasklist_lock);
62929+
62930+ return ret;
62931+}
62932+
62933+void
62934+gr_copy_label(struct task_struct *tsk)
62935+{
62936+ tsk->signal->used_accept = 0;
62937+ tsk->acl_sp_role = 0;
62938+ tsk->acl_role_id = current->acl_role_id;
62939+ tsk->acl = current->acl;
62940+ tsk->role = current->role;
62941+ tsk->signal->curr_ip = current->signal->curr_ip;
62942+ tsk->signal->saved_ip = current->signal->saved_ip;
62943+ if (current->exec_file)
62944+ get_file(current->exec_file);
62945+ tsk->exec_file = current->exec_file;
62946+ tsk->is_writable = current->is_writable;
62947+ if (unlikely(current->signal->used_accept)) {
62948+ current->signal->curr_ip = 0;
62949+ current->signal->saved_ip = 0;
62950+ }
62951+
62952+ return;
62953+}
62954+
62955+static void
62956+gr_set_proc_res(struct task_struct *task)
62957+{
62958+ struct acl_subject_label *proc;
62959+ unsigned short i;
62960+
62961+ proc = task->acl;
62962+
62963+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
62964+ return;
62965+
62966+ for (i = 0; i < RLIM_NLIMITS; i++) {
62967+ if (!(proc->resmask & (1U << i)))
62968+ continue;
62969+
62970+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
62971+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
62972+
62973+ if (i == RLIMIT_CPU)
62974+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
62975+ }
62976+
62977+ return;
62978+}
62979+
62980+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
62981+
62982+int
62983+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
62984+{
62985+ unsigned int i;
62986+ __u16 num;
62987+ uid_t *uidlist;
62988+ uid_t curuid;
62989+ int realok = 0;
62990+ int effectiveok = 0;
62991+ int fsok = 0;
62992+ uid_t globalreal, globaleffective, globalfs;
62993+
62994+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
62995+ struct user_struct *user;
62996+
62997+ if (!uid_valid(real))
62998+ goto skipit;
62999+
63000+ /* find user based on global namespace */
63001+
63002+ globalreal = GR_GLOBAL_UID(real);
63003+
63004+ user = find_user(make_kuid(&init_user_ns, globalreal));
63005+ if (user == NULL)
63006+ goto skipit;
63007+
63008+ if (gr_process_kernel_setuid_ban(user)) {
63009+ /* for find_user */
63010+ free_uid(user);
63011+ return 1;
63012+ }
63013+
63014+ /* for find_user */
63015+ free_uid(user);
63016+
63017+skipit:
63018+#endif
63019+
63020+ if (unlikely(!(gr_status & GR_READY)))
63021+ return 0;
63022+
63023+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
63024+ gr_log_learn_uid_change(real, effective, fs);
63025+
63026+ num = current->acl->user_trans_num;
63027+ uidlist = current->acl->user_transitions;
63028+
63029+ if (uidlist == NULL)
63030+ return 0;
63031+
63032+ if (!uid_valid(real)) {
63033+ realok = 1;
63034+ globalreal = (uid_t)-1;
63035+ } else {
63036+ globalreal = GR_GLOBAL_UID(real);
63037+ }
63038+ if (!uid_valid(effective)) {
63039+ effectiveok = 1;
63040+ globaleffective = (uid_t)-1;
63041+ } else {
63042+ globaleffective = GR_GLOBAL_UID(effective);
63043+ }
63044+ if (!uid_valid(fs)) {
63045+ fsok = 1;
63046+ globalfs = (uid_t)-1;
63047+ } else {
63048+ globalfs = GR_GLOBAL_UID(fs);
63049+ }
63050+
63051+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
63052+ for (i = 0; i < num; i++) {
63053+ curuid = uidlist[i];
63054+ if (globalreal == curuid)
63055+ realok = 1;
63056+ if (globaleffective == curuid)
63057+ effectiveok = 1;
63058+ if (globalfs == curuid)
63059+ fsok = 1;
63060+ }
63061+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
63062+ for (i = 0; i < num; i++) {
63063+ curuid = uidlist[i];
63064+ if (globalreal == curuid)
63065+ break;
63066+ if (globaleffective == curuid)
63067+ break;
63068+ if (globalfs == curuid)
63069+ break;
63070+ }
63071+ /* not in deny list */
63072+ if (i == num) {
63073+ realok = 1;
63074+ effectiveok = 1;
63075+ fsok = 1;
63076+ }
63077+ }
63078+
63079+ if (realok && effectiveok && fsok)
63080+ return 0;
63081+ else {
63082+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
63083+ return 1;
63084+ }
63085+}
63086+
63087+int
63088+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
63089+{
63090+ unsigned int i;
63091+ __u16 num;
63092+ gid_t *gidlist;
63093+ gid_t curgid;
63094+ int realok = 0;
63095+ int effectiveok = 0;
63096+ int fsok = 0;
63097+ gid_t globalreal, globaleffective, globalfs;
63098+
63099+ if (unlikely(!(gr_status & GR_READY)))
63100+ return 0;
63101+
63102+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
63103+ gr_log_learn_gid_change(real, effective, fs);
63104+
63105+ num = current->acl->group_trans_num;
63106+ gidlist = current->acl->group_transitions;
63107+
63108+ if (gidlist == NULL)
63109+ return 0;
63110+
63111+ if (!gid_valid(real)) {
63112+ realok = 1;
63113+ globalreal = (gid_t)-1;
63114+ } else {
63115+ globalreal = GR_GLOBAL_GID(real);
63116+ }
63117+ if (!gid_valid(effective)) {
63118+ effectiveok = 1;
63119+ globaleffective = (gid_t)-1;
63120+ } else {
63121+ globaleffective = GR_GLOBAL_GID(effective);
63122+ }
63123+ if (!gid_valid(fs)) {
63124+ fsok = 1;
63125+ globalfs = (gid_t)-1;
63126+ } else {
63127+ globalfs = GR_GLOBAL_GID(fs);
63128+ }
63129+
63130+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
63131+ for (i = 0; i < num; i++) {
63132+ curgid = gidlist[i];
63133+ if (globalreal == curgid)
63134+ realok = 1;
63135+ if (globaleffective == curgid)
63136+ effectiveok = 1;
63137+ if (globalfs == curgid)
63138+ fsok = 1;
63139+ }
63140+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
63141+ for (i = 0; i < num; i++) {
63142+ curgid = gidlist[i];
63143+ if (globalreal == curgid)
63144+ break;
63145+ if (globaleffective == curgid)
63146+ break;
63147+ if (globalfs == curgid)
63148+ break;
63149+ }
63150+ /* not in deny list */
63151+ if (i == num) {
63152+ realok = 1;
63153+ effectiveok = 1;
63154+ fsok = 1;
63155+ }
63156+ }
63157+
63158+ if (realok && effectiveok && fsok)
63159+ return 0;
63160+ else {
63161+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
63162+ return 1;
63163+ }
63164+}
63165+
63166+extern int gr_acl_is_capable(const int cap);
63167+
63168+void
63169+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
63170+{
63171+ struct acl_role_label *role = task->role;
63172+ struct acl_subject_label *subj = NULL;
63173+ struct acl_object_label *obj;
63174+ struct file *filp;
63175+ uid_t uid;
63176+ gid_t gid;
63177+
63178+ if (unlikely(!(gr_status & GR_READY)))
63179+ return;
63180+
63181+ uid = GR_GLOBAL_UID(kuid);
63182+ gid = GR_GLOBAL_GID(kgid);
63183+
63184+ filp = task->exec_file;
63185+
63186+ /* kernel process, we'll give them the kernel role */
63187+ if (unlikely(!filp)) {
63188+ task->role = kernel_role;
63189+ task->acl = kernel_role->root_label;
63190+ return;
63191+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
63192+ role = lookup_acl_role_label(task, uid, gid);
63193+
63194+ /* don't change the role if we're not a privileged process */
63195+ if (role && task->role != role &&
63196+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
63197+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
63198+ return;
63199+
63200+ /* perform subject lookup in possibly new role
63201+ we can use this result below in the case where role == task->role
63202+ */
63203+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
63204+
63205+ /* if we changed uid/gid, but result in the same role
63206+ and are using inheritance, don't lose the inherited subject
63207+ if current subject is other than what normal lookup
63208+ would result in, we arrived via inheritance, don't
63209+ lose subject
63210+ */
63211+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
63212+ (subj == task->acl)))
63213+ task->acl = subj;
63214+
63215+ task->role = role;
63216+
63217+ task->is_writable = 0;
63218+
63219+ /* ignore additional mmap checks for processes that are writable
63220+ by the default ACL */
63221+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
63222+ if (unlikely(obj->mode & GR_WRITE))
63223+ task->is_writable = 1;
63224+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
63225+ if (unlikely(obj->mode & GR_WRITE))
63226+ task->is_writable = 1;
63227+
63228+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
63229+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
63230+#endif
63231+
63232+ gr_set_proc_res(task);
63233+
63234+ return;
63235+}
63236+
63237+int
63238+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
63239+ const int unsafe_flags)
63240+{
63241+ struct task_struct *task = current;
63242+ struct acl_subject_label *newacl;
63243+ struct acl_object_label *obj;
63244+ __u32 retmode;
63245+
63246+ if (unlikely(!(gr_status & GR_READY)))
63247+ return 0;
63248+
63249+ newacl = chk_subj_label(dentry, mnt, task->role);
63250+
63251+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
63252+ did an exec
63253+ */
63254+ rcu_read_lock();
63255+ read_lock(&tasklist_lock);
63256+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
63257+ (task->parent->acl->mode & GR_POVERRIDE))) {
63258+ read_unlock(&tasklist_lock);
63259+ rcu_read_unlock();
63260+ goto skip_check;
63261+ }
63262+ read_unlock(&tasklist_lock);
63263+ rcu_read_unlock();
63264+
63265+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
63266+ !(task->role->roletype & GR_ROLE_GOD) &&
63267+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
63268+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
63269+ if (unsafe_flags & LSM_UNSAFE_SHARE)
63270+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
63271+ else
63272+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
63273+ return -EACCES;
63274+ }
63275+
63276+skip_check:
63277+
63278+ obj = chk_obj_label(dentry, mnt, task->acl);
63279+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
63280+
63281+ if (!(task->acl->mode & GR_INHERITLEARN) &&
63282+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
63283+ if (obj->nested)
63284+ task->acl = obj->nested;
63285+ else
63286+ task->acl = newacl;
63287+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
63288+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
63289+
63290+ task->is_writable = 0;
63291+
63292+ /* ignore additional mmap checks for processes that are writable
63293+ by the default ACL */
63294+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
63295+ if (unlikely(obj->mode & GR_WRITE))
63296+ task->is_writable = 1;
63297+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
63298+ if (unlikely(obj->mode & GR_WRITE))
63299+ task->is_writable = 1;
63300+
63301+ gr_set_proc_res(task);
63302+
63303+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
63304+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
63305+#endif
63306+ return 0;
63307+}
63308+
63309+/* always called with valid inodev ptr */
63310+static void
63311+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
63312+{
63313+ struct acl_object_label *matchpo;
63314+ struct acl_subject_label *matchps;
63315+ struct acl_subject_label *subj;
63316+ struct acl_role_label *role;
63317+ unsigned int x;
63318+
63319+ FOR_EACH_ROLE_START(role)
63320+ FOR_EACH_SUBJECT_START(role, subj, x)
63321+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
63322+ matchpo->mode |= GR_DELETED;
63323+ FOR_EACH_SUBJECT_END(subj,x)
63324+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
63325+ /* nested subjects aren't in the role's subj_hash table */
63326+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
63327+ matchpo->mode |= GR_DELETED;
63328+ FOR_EACH_NESTED_SUBJECT_END(subj)
63329+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
63330+ matchps->mode |= GR_DELETED;
63331+ FOR_EACH_ROLE_END(role)
63332+
63333+ inodev->nentry->deleted = 1;
63334+
63335+ return;
63336+}
63337+
63338+void
63339+gr_handle_delete(const ino_t ino, const dev_t dev)
63340+{
63341+ struct inodev_entry *inodev;
63342+
63343+ if (unlikely(!(gr_status & GR_READY)))
63344+ return;
63345+
63346+ write_lock(&gr_inode_lock);
63347+ inodev = lookup_inodev_entry(ino, dev);
63348+ if (inodev != NULL)
63349+ do_handle_delete(inodev, ino, dev);
63350+ write_unlock(&gr_inode_lock);
63351+
63352+ return;
63353+}
63354+
63355+static void
63356+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
63357+ const ino_t newinode, const dev_t newdevice,
63358+ struct acl_subject_label *subj)
63359+{
63360+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
63361+ struct acl_object_label *match;
63362+
63363+ match = subj->obj_hash[index];
63364+
63365+ while (match && (match->inode != oldinode ||
63366+ match->device != olddevice ||
63367+ !(match->mode & GR_DELETED)))
63368+ match = match->next;
63369+
63370+ if (match && (match->inode == oldinode)
63371+ && (match->device == olddevice)
63372+ && (match->mode & GR_DELETED)) {
63373+ if (match->prev == NULL) {
63374+ subj->obj_hash[index] = match->next;
63375+ if (match->next != NULL)
63376+ match->next->prev = NULL;
63377+ } else {
63378+ match->prev->next = match->next;
63379+ if (match->next != NULL)
63380+ match->next->prev = match->prev;
63381+ }
63382+ match->prev = NULL;
63383+ match->next = NULL;
63384+ match->inode = newinode;
63385+ match->device = newdevice;
63386+ match->mode &= ~GR_DELETED;
63387+
63388+ insert_acl_obj_label(match, subj);
63389+ }
63390+
63391+ return;
63392+}
63393+
63394+static void
63395+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
63396+ const ino_t newinode, const dev_t newdevice,
63397+ struct acl_role_label *role)
63398+{
63399+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
63400+ struct acl_subject_label *match;
63401+
63402+ match = role->subj_hash[index];
63403+
63404+ while (match && (match->inode != oldinode ||
63405+ match->device != olddevice ||
63406+ !(match->mode & GR_DELETED)))
63407+ match = match->next;
63408+
63409+ if (match && (match->inode == oldinode)
63410+ && (match->device == olddevice)
63411+ && (match->mode & GR_DELETED)) {
63412+ if (match->prev == NULL) {
63413+ role->subj_hash[index] = match->next;
63414+ if (match->next != NULL)
63415+ match->next->prev = NULL;
63416+ } else {
63417+ match->prev->next = match->next;
63418+ if (match->next != NULL)
63419+ match->next->prev = match->prev;
63420+ }
63421+ match->prev = NULL;
63422+ match->next = NULL;
63423+ match->inode = newinode;
63424+ match->device = newdevice;
63425+ match->mode &= ~GR_DELETED;
63426+
63427+ insert_acl_subj_label(match, role);
63428+ }
63429+
63430+ return;
63431+}
63432+
63433+static void
63434+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
63435+ const ino_t newinode, const dev_t newdevice)
63436+{
63437+ unsigned int index = gr_fhash(oldinode, olddevice, inodev_set.i_size);
63438+ struct inodev_entry *match;
63439+
63440+ match = inodev_set.i_hash[index];
63441+
63442+ while (match && (match->nentry->inode != oldinode ||
63443+ match->nentry->device != olddevice || !match->nentry->deleted))
63444+ match = match->next;
63445+
63446+ if (match && (match->nentry->inode == oldinode)
63447+ && (match->nentry->device == olddevice) &&
63448+ match->nentry->deleted) {
63449+ if (match->prev == NULL) {
63450+ inodev_set.i_hash[index] = match->next;
63451+ if (match->next != NULL)
63452+ match->next->prev = NULL;
63453+ } else {
63454+ match->prev->next = match->next;
63455+ if (match->next != NULL)
63456+ match->next->prev = match->prev;
63457+ }
63458+ match->prev = NULL;
63459+ match->next = NULL;
63460+ match->nentry->inode = newinode;
63461+ match->nentry->device = newdevice;
63462+ match->nentry->deleted = 0;
63463+
63464+ insert_inodev_entry(match);
63465+ }
63466+
63467+ return;
63468+}
63469+
63470+static void
63471+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
63472+{
63473+ struct acl_subject_label *subj;
63474+ struct acl_role_label *role;
63475+ unsigned int x;
63476+
63477+ FOR_EACH_ROLE_START(role)
63478+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
63479+
63480+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
63481+ if ((subj->inode == ino) && (subj->device == dev)) {
63482+ subj->inode = ino;
63483+ subj->device = dev;
63484+ }
63485+ /* nested subjects aren't in the role's subj_hash table */
63486+ update_acl_obj_label(matchn->inode, matchn->device,
63487+ ino, dev, subj);
63488+ FOR_EACH_NESTED_SUBJECT_END(subj)
63489+ FOR_EACH_SUBJECT_START(role, subj, x)
63490+ update_acl_obj_label(matchn->inode, matchn->device,
63491+ ino, dev, subj);
63492+ FOR_EACH_SUBJECT_END(subj,x)
63493+ FOR_EACH_ROLE_END(role)
63494+
63495+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
63496+
63497+ return;
63498+}
63499+
63500+static void
63501+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
63502+ const struct vfsmount *mnt)
63503+{
63504+ ino_t ino = dentry->d_inode->i_ino;
63505+ dev_t dev = __get_dev(dentry);
63506+
63507+ __do_handle_create(matchn, ino, dev);
63508+
63509+ return;
63510+}
63511+
63512+void
63513+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
63514+{
63515+ struct name_entry *matchn;
63516+
63517+ if (unlikely(!(gr_status & GR_READY)))
63518+ return;
63519+
63520+ preempt_disable();
63521+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
63522+
63523+ if (unlikely((unsigned long)matchn)) {
63524+ write_lock(&gr_inode_lock);
63525+ do_handle_create(matchn, dentry, mnt);
63526+ write_unlock(&gr_inode_lock);
63527+ }
63528+ preempt_enable();
63529+
63530+ return;
63531+}
63532+
63533+void
63534+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
63535+{
63536+ struct name_entry *matchn;
63537+
63538+ if (unlikely(!(gr_status & GR_READY)))
63539+ return;
63540+
63541+ preempt_disable();
63542+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
63543+
63544+ if (unlikely((unsigned long)matchn)) {
63545+ write_lock(&gr_inode_lock);
63546+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
63547+ write_unlock(&gr_inode_lock);
63548+ }
63549+ preempt_enable();
63550+
63551+ return;
63552+}
63553+
63554+void
63555+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
63556+ struct dentry *old_dentry,
63557+ struct dentry *new_dentry,
63558+ struct vfsmount *mnt, const __u8 replace)
63559+{
63560+ struct name_entry *matchn;
63561+ struct inodev_entry *inodev;
63562+ struct inode *inode = new_dentry->d_inode;
63563+ ino_t old_ino = old_dentry->d_inode->i_ino;
63564+ dev_t old_dev = __get_dev(old_dentry);
63565+
63566+ /* vfs_rename swaps the name and parent link for old_dentry and
63567+ new_dentry
63568+ at this point, old_dentry has the new name, parent link, and inode
63569+ for the renamed file
63570+ if a file is being replaced by a rename, new_dentry has the inode
63571+ and name for the replaced file
63572+ */
63573+
63574+ if (unlikely(!(gr_status & GR_READY)))
63575+ return;
63576+
63577+ preempt_disable();
63578+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
63579+
63580+ /* we wouldn't have to check d_inode if it weren't for
63581+ NFS silly-renaming
63582+ */
63583+
63584+ write_lock(&gr_inode_lock);
63585+ if (unlikely(replace && inode)) {
63586+ ino_t new_ino = inode->i_ino;
63587+ dev_t new_dev = __get_dev(new_dentry);
63588+
63589+ inodev = lookup_inodev_entry(new_ino, new_dev);
63590+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
63591+ do_handle_delete(inodev, new_ino, new_dev);
63592+ }
63593+
63594+ inodev = lookup_inodev_entry(old_ino, old_dev);
63595+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
63596+ do_handle_delete(inodev, old_ino, old_dev);
63597+
63598+ if (unlikely((unsigned long)matchn))
63599+ do_handle_create(matchn, old_dentry, mnt);
63600+
63601+ write_unlock(&gr_inode_lock);
63602+ preempt_enable();
63603+
63604+ return;
63605+}
63606+
63607+static int
63608+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
63609+ unsigned char **sum)
63610+{
63611+ struct acl_role_label *r;
63612+ struct role_allowed_ip *ipp;
63613+ struct role_transition *trans;
63614+ unsigned int i;
63615+ int found = 0;
63616+ u32 curr_ip = current->signal->curr_ip;
63617+
63618+ current->signal->saved_ip = curr_ip;
63619+
63620+ /* check transition table */
63621+
63622+ for (trans = current->role->transitions; trans; trans = trans->next) {
63623+ if (!strcmp(rolename, trans->rolename)) {
63624+ found = 1;
63625+ break;
63626+ }
63627+ }
63628+
63629+ if (!found)
63630+ return 0;
63631+
63632+ /* handle special roles that do not require authentication
63633+ and check ip */
63634+
63635+ FOR_EACH_ROLE_START(r)
63636+ if (!strcmp(rolename, r->rolename) &&
63637+ (r->roletype & GR_ROLE_SPECIAL)) {
63638+ found = 0;
63639+ if (r->allowed_ips != NULL) {
63640+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
63641+ if ((ntohl(curr_ip) & ipp->netmask) ==
63642+ (ntohl(ipp->addr) & ipp->netmask))
63643+ found = 1;
63644+ }
63645+ } else
63646+ found = 2;
63647+ if (!found)
63648+ return 0;
63649+
63650+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
63651+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
63652+ *salt = NULL;
63653+ *sum = NULL;
63654+ return 1;
63655+ }
63656+ }
63657+ FOR_EACH_ROLE_END(r)
63658+
63659+ for (i = 0; i < num_sprole_pws; i++) {
63660+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
63661+ *salt = acl_special_roles[i]->salt;
63662+ *sum = acl_special_roles[i]->sum;
63663+ return 1;
63664+ }
63665+ }
63666+
63667+ return 0;
63668+}
63669+
63670+static void
63671+assign_special_role(char *rolename)
63672+{
63673+ struct acl_object_label *obj;
63674+ struct acl_role_label *r;
63675+ struct acl_role_label *assigned = NULL;
63676+ struct task_struct *tsk;
63677+ struct file *filp;
63678+
63679+ FOR_EACH_ROLE_START(r)
63680+ if (!strcmp(rolename, r->rolename) &&
63681+ (r->roletype & GR_ROLE_SPECIAL)) {
63682+ assigned = r;
63683+ break;
63684+ }
63685+ FOR_EACH_ROLE_END(r)
63686+
63687+ if (!assigned)
63688+ return;
63689+
63690+ read_lock(&tasklist_lock);
63691+ read_lock(&grsec_exec_file_lock);
63692+
63693+ tsk = current->real_parent;
63694+ if (tsk == NULL)
63695+ goto out_unlock;
63696+
63697+ filp = tsk->exec_file;
63698+ if (filp == NULL)
63699+ goto out_unlock;
63700+
63701+ tsk->is_writable = 0;
63702+
63703+ tsk->acl_sp_role = 1;
63704+ tsk->acl_role_id = ++acl_sp_role_value;
63705+ tsk->role = assigned;
63706+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
63707+
63708+ /* ignore additional mmap checks for processes that are writable
63709+ by the default ACL */
63710+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
63711+ if (unlikely(obj->mode & GR_WRITE))
63712+ tsk->is_writable = 1;
63713+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
63714+ if (unlikely(obj->mode & GR_WRITE))
63715+ tsk->is_writable = 1;
63716+
63717+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
63718+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
63719+#endif
63720+
63721+out_unlock:
63722+ read_unlock(&grsec_exec_file_lock);
63723+ read_unlock(&tasklist_lock);
63724+ return;
63725+}
63726+
63727+int gr_check_secure_terminal(struct task_struct *task)
63728+{
63729+ struct task_struct *p, *p2, *p3;
63730+ struct files_struct *files;
63731+ struct fdtable *fdt;
63732+ struct file *our_file = NULL, *file;
63733+ int i;
63734+
63735+ if (task->signal->tty == NULL)
63736+ return 1;
63737+
63738+ files = get_files_struct(task);
63739+ if (files != NULL) {
63740+ rcu_read_lock();
63741+ fdt = files_fdtable(files);
63742+ for (i=0; i < fdt->max_fds; i++) {
63743+ file = fcheck_files(files, i);
63744+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
63745+ get_file(file);
63746+ our_file = file;
63747+ }
63748+ }
63749+ rcu_read_unlock();
63750+ put_files_struct(files);
63751+ }
63752+
63753+ if (our_file == NULL)
63754+ return 1;
63755+
63756+ read_lock(&tasklist_lock);
63757+ do_each_thread(p2, p) {
63758+ files = get_files_struct(p);
63759+ if (files == NULL ||
63760+ (p->signal && p->signal->tty == task->signal->tty)) {
63761+ if (files != NULL)
63762+ put_files_struct(files);
63763+ continue;
63764+ }
63765+ rcu_read_lock();
63766+ fdt = files_fdtable(files);
63767+ for (i=0; i < fdt->max_fds; i++) {
63768+ file = fcheck_files(files, i);
63769+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
63770+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
63771+ p3 = task;
63772+ while (task_pid_nr(p3) > 0) {
63773+ if (p3 == p)
63774+ break;
63775+ p3 = p3->real_parent;
63776+ }
63777+ if (p3 == p)
63778+ break;
63779+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
63780+ gr_handle_alertkill(p);
63781+ rcu_read_unlock();
63782+ put_files_struct(files);
63783+ read_unlock(&tasklist_lock);
63784+ fput(our_file);
63785+ return 0;
63786+ }
63787+ }
63788+ rcu_read_unlock();
63789+ put_files_struct(files);
63790+ } while_each_thread(p2, p);
63791+ read_unlock(&tasklist_lock);
63792+
63793+ fput(our_file);
63794+ return 1;
63795+}
63796+
63797+static int gr_rbac_disable(void *unused)
63798+{
63799+ pax_open_kernel();
63800+ gr_status &= ~GR_READY;
63801+ pax_close_kernel();
63802+
63803+ return 0;
63804+}
63805+
63806+ssize_t
63807+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
63808+{
63809+ struct gr_arg_wrapper uwrap;
63810+ unsigned char *sprole_salt = NULL;
63811+ unsigned char *sprole_sum = NULL;
63812+ int error = 0;
63813+ int error2 = 0;
63814+ size_t req_count = 0;
63815+
63816+ mutex_lock(&gr_dev_mutex);
63817+
63818+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
63819+ error = -EPERM;
63820+ goto out;
63821+ }
63822+
63823+#ifdef CONFIG_COMPAT
63824+ pax_open_kernel();
63825+ if (is_compat_task()) {
63826+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
63827+ copy_gr_arg = &copy_gr_arg_compat;
63828+ copy_acl_object_label = &copy_acl_object_label_compat;
63829+ copy_acl_subject_label = &copy_acl_subject_label_compat;
63830+ copy_acl_role_label = &copy_acl_role_label_compat;
63831+ copy_acl_ip_label = &copy_acl_ip_label_compat;
63832+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
63833+ copy_role_transition = &copy_role_transition_compat;
63834+ copy_sprole_pw = &copy_sprole_pw_compat;
63835+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
63836+ copy_pointer_from_array = &copy_pointer_from_array_compat;
63837+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
63838+ } else {
63839+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
63840+ copy_gr_arg = &copy_gr_arg_normal;
63841+ copy_acl_object_label = &copy_acl_object_label_normal;
63842+ copy_acl_subject_label = &copy_acl_subject_label_normal;
63843+ copy_acl_role_label = &copy_acl_role_label_normal;
63844+ copy_acl_ip_label = &copy_acl_ip_label_normal;
63845+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
63846+ copy_role_transition = &copy_role_transition_normal;
63847+ copy_sprole_pw = &copy_sprole_pw_normal;
63848+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
63849+ copy_pointer_from_array = &copy_pointer_from_array_normal;
63850+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
63851+ }
63852+ pax_close_kernel();
63853+#endif
63854+
63855+ req_count = get_gr_arg_wrapper_size();
63856+
63857+ if (count != req_count) {
63858+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
63859+ error = -EINVAL;
63860+ goto out;
63861+ }
63862+
63863+
63864+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
63865+ gr_auth_expires = 0;
63866+ gr_auth_attempts = 0;
63867+ }
63868+
63869+ error = copy_gr_arg_wrapper(buf, &uwrap);
63870+ if (error)
63871+ goto out;
63872+
63873+ error = copy_gr_arg(uwrap.arg, gr_usermode);
63874+ if (error)
63875+ goto out;
63876+
63877+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
63878+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
63879+ time_after(gr_auth_expires, get_seconds())) {
63880+ error = -EBUSY;
63881+ goto out;
63882+ }
63883+
63884+ /* if non-root trying to do anything other than use a special role,
63885+ do not attempt authentication, do not count towards authentication
63886+ locking
63887+ */
63888+
63889+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
63890+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
63891+ gr_is_global_nonroot(current_uid())) {
63892+ error = -EPERM;
63893+ goto out;
63894+ }
63895+
63896+ /* ensure pw and special role name are null terminated */
63897+
63898+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
63899+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
63900+
63901+ /* Okay.
63902+ * We have our enough of the argument structure..(we have yet
63903+ * to copy_from_user the tables themselves) . Copy the tables
63904+ * only if we need them, i.e. for loading operations. */
63905+
63906+ switch (gr_usermode->mode) {
63907+ case GR_STATUS:
63908+ if (gr_status & GR_READY) {
63909+ error = 1;
63910+ if (!gr_check_secure_terminal(current))
63911+ error = 3;
63912+ } else
63913+ error = 2;
63914+ goto out;
63915+ case GR_SHUTDOWN:
63916+ if ((gr_status & GR_READY)
63917+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
63918+ stop_machine(gr_rbac_disable, NULL, NULL);
63919+ free_variables();
63920+ memset(gr_usermode, 0, sizeof (struct gr_arg));
63921+ memset(gr_system_salt, 0, GR_SALT_LEN);
63922+ memset(gr_system_sum, 0, GR_SHA_LEN);
63923+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
63924+ } else if (gr_status & GR_READY) {
63925+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
63926+ error = -EPERM;
63927+ } else {
63928+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
63929+ error = -EAGAIN;
63930+ }
63931+ break;
63932+ case GR_ENABLE:
63933+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
63934+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
63935+ else {
63936+ if (gr_status & GR_READY)
63937+ error = -EAGAIN;
63938+ else
63939+ error = error2;
63940+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
63941+ }
63942+ break;
63943+ case GR_RELOAD:
63944+ if (!(gr_status & GR_READY)) {
63945+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
63946+ error = -EAGAIN;
63947+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
63948+ stop_machine(gr_rbac_disable, NULL, NULL);
63949+ free_variables();
63950+ error2 = gracl_init(gr_usermode);
63951+ if (!error2)
63952+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
63953+ else {
63954+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
63955+ error = error2;
63956+ }
63957+ } else {
63958+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
63959+ error = -EPERM;
63960+ }
63961+ break;
63962+ case GR_SEGVMOD:
63963+ if (unlikely(!(gr_status & GR_READY))) {
63964+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
63965+ error = -EAGAIN;
63966+ break;
63967+ }
63968+
63969+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
63970+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
63971+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
63972+ struct acl_subject_label *segvacl;
63973+ segvacl =
63974+ lookup_acl_subj_label(gr_usermode->segv_inode,
63975+ gr_usermode->segv_device,
63976+ current->role);
63977+ if (segvacl) {
63978+ segvacl->crashes = 0;
63979+ segvacl->expires = 0;
63980+ }
63981+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
63982+ gr_remove_uid(gr_usermode->segv_uid);
63983+ }
63984+ } else {
63985+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
63986+ error = -EPERM;
63987+ }
63988+ break;
63989+ case GR_SPROLE:
63990+ case GR_SPROLEPAM:
63991+ if (unlikely(!(gr_status & GR_READY))) {
63992+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
63993+ error = -EAGAIN;
63994+ break;
63995+ }
63996+
63997+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
63998+ current->role->expires = 0;
63999+ current->role->auth_attempts = 0;
64000+ }
64001+
64002+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
64003+ time_after(current->role->expires, get_seconds())) {
64004+ error = -EBUSY;
64005+ goto out;
64006+ }
64007+
64008+ if (lookup_special_role_auth
64009+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
64010+ && ((!sprole_salt && !sprole_sum)
64011+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
64012+ char *p = "";
64013+ assign_special_role(gr_usermode->sp_role);
64014+ read_lock(&tasklist_lock);
64015+ if (current->real_parent)
64016+ p = current->real_parent->role->rolename;
64017+ read_unlock(&tasklist_lock);
64018+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
64019+ p, acl_sp_role_value);
64020+ } else {
64021+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
64022+ error = -EPERM;
64023+ if(!(current->role->auth_attempts++))
64024+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
64025+
64026+ goto out;
64027+ }
64028+ break;
64029+ case GR_UNSPROLE:
64030+ if (unlikely(!(gr_status & GR_READY))) {
64031+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
64032+ error = -EAGAIN;
64033+ break;
64034+ }
64035+
64036+ if (current->role->roletype & GR_ROLE_SPECIAL) {
64037+ char *p = "";
64038+ int i = 0;
64039+
64040+ read_lock(&tasklist_lock);
64041+ if (current->real_parent) {
64042+ p = current->real_parent->role->rolename;
64043+ i = current->real_parent->acl_role_id;
64044+ }
64045+ read_unlock(&tasklist_lock);
64046+
64047+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
64048+ gr_set_acls(1);
64049+ } else {
64050+ error = -EPERM;
64051+ goto out;
64052+ }
64053+ break;
64054+ default:
64055+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
64056+ error = -EINVAL;
64057+ break;
64058+ }
64059+
64060+ if (error != -EPERM)
64061+ goto out;
64062+
64063+ if(!(gr_auth_attempts++))
64064+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
64065+
64066+ out:
64067+ mutex_unlock(&gr_dev_mutex);
64068+
64069+ if (!error)
64070+ error = req_count;
64071+
64072+ return error;
64073+}
64074+
64075+/* must be called with
64076+ rcu_read_lock();
64077+ read_lock(&tasklist_lock);
64078+ read_lock(&grsec_exec_file_lock);
64079+*/
64080+int gr_apply_subject_to_task(struct task_struct *task)
64081+{
64082+ struct acl_object_label *obj;
64083+ char *tmpname;
64084+ struct acl_subject_label *tmpsubj;
64085+ struct file *filp;
64086+ struct name_entry *nmatch;
64087+
64088+ filp = task->exec_file;
64089+ if (filp == NULL)
64090+ return 0;
64091+
64092+ /* the following is to apply the correct subject
64093+ on binaries running when the RBAC system
64094+ is enabled, when the binaries have been
64095+ replaced or deleted since their execution
64096+ -----
64097+ when the RBAC system starts, the inode/dev
64098+ from exec_file will be one the RBAC system
64099+ is unaware of. It only knows the inode/dev
64100+ of the present file on disk, or the absence
64101+ of it.
64102+ */
64103+ preempt_disable();
64104+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
64105+
64106+ nmatch = lookup_name_entry(tmpname);
64107+ preempt_enable();
64108+ tmpsubj = NULL;
64109+ if (nmatch) {
64110+ if (nmatch->deleted)
64111+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
64112+ else
64113+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
64114+ if (tmpsubj != NULL)
64115+ task->acl = tmpsubj;
64116+ }
64117+ if (tmpsubj == NULL)
64118+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
64119+ task->role);
64120+ if (task->acl) {
64121+ task->is_writable = 0;
64122+ /* ignore additional mmap checks for processes that are writable
64123+ by the default ACL */
64124+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
64125+ if (unlikely(obj->mode & GR_WRITE))
64126+ task->is_writable = 1;
64127+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
64128+ if (unlikely(obj->mode & GR_WRITE))
64129+ task->is_writable = 1;
64130+
64131+ gr_set_proc_res(task);
64132+
64133+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
64134+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
64135+#endif
64136+ } else {
64137+ return 1;
64138+ }
64139+
64140+ return 0;
64141+}
64142+
64143+int
64144+gr_set_acls(const int type)
64145+{
64146+ struct task_struct *task, *task2;
64147+ struct acl_role_label *role = current->role;
64148+ __u16 acl_role_id = current->acl_role_id;
64149+ const struct cred *cred;
64150+ int ret;
64151+
64152+ rcu_read_lock();
64153+ read_lock(&tasklist_lock);
64154+ read_lock(&grsec_exec_file_lock);
64155+ do_each_thread(task2, task) {
64156+ /* check to see if we're called from the exit handler,
64157+ if so, only replace ACLs that have inherited the admin
64158+ ACL */
64159+
64160+ if (type && (task->role != role ||
64161+ task->acl_role_id != acl_role_id))
64162+ continue;
64163+
64164+ task->acl_role_id = 0;
64165+ task->acl_sp_role = 0;
64166+
64167+ if (task->exec_file) {
64168+ cred = __task_cred(task);
64169+ task->role = lookup_acl_role_label(task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
64170+ ret = gr_apply_subject_to_task(task);
64171+ if (ret) {
64172+ read_unlock(&grsec_exec_file_lock);
64173+ read_unlock(&tasklist_lock);
64174+ rcu_read_unlock();
64175+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
64176+ return ret;
64177+ }
64178+ } else {
64179+ // it's a kernel process
64180+ task->role = kernel_role;
64181+ task->acl = kernel_role->root_label;
64182+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
64183+ task->acl->mode &= ~GR_PROCFIND;
64184+#endif
64185+ }
64186+ } while_each_thread(task2, task);
64187+ read_unlock(&grsec_exec_file_lock);
64188+ read_unlock(&tasklist_lock);
64189+ rcu_read_unlock();
64190+
64191+ return 0;
64192+}
64193+
64194+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
64195+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
64196+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
64197+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
64198+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
64199+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
64200+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
64201+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
64202+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
64203+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
64204+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
64205+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
64206+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
64207+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
64208+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
64209+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
64210+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
64211+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
64212+};
64213+
64214+void
64215+gr_learn_resource(const struct task_struct *task,
64216+ const int res, const unsigned long wanted, const int gt)
64217+{
64218+ struct acl_subject_label *acl;
64219+ const struct cred *cred;
64220+
64221+ if (unlikely((gr_status & GR_READY) &&
64222+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
64223+ goto skip_reslog;
64224+
64225+ gr_log_resource(task, res, wanted, gt);
64226+skip_reslog:
64227+
64228+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
64229+ return;
64230+
64231+ acl = task->acl;
64232+
64233+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
64234+ !(acl->resmask & (1U << (unsigned short) res))))
64235+ return;
64236+
64237+ if (wanted >= acl->res[res].rlim_cur) {
64238+ unsigned long res_add;
64239+
64240+ res_add = wanted + res_learn_bumps[res];
64241+
64242+ acl->res[res].rlim_cur = res_add;
64243+
64244+ if (wanted > acl->res[res].rlim_max)
64245+ acl->res[res].rlim_max = res_add;
64246+
64247+ /* only log the subject filename, since resource logging is supported for
64248+ single-subject learning only */
64249+ rcu_read_lock();
64250+ cred = __task_cred(task);
64251+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
64252+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
64253+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
64254+ "", (unsigned long) res, &task->signal->saved_ip);
64255+ rcu_read_unlock();
64256+ }
64257+
64258+ return;
64259+}
64260+EXPORT_SYMBOL(gr_learn_resource);
64261+#endif
64262+
64263+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
64264+void
64265+pax_set_initial_flags(struct linux_binprm *bprm)
64266+{
64267+ struct task_struct *task = current;
64268+ struct acl_subject_label *proc;
64269+ unsigned long flags;
64270+
64271+ if (unlikely(!(gr_status & GR_READY)))
64272+ return;
64273+
64274+ flags = pax_get_flags(task);
64275+
64276+ proc = task->acl;
64277+
64278+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
64279+ flags &= ~MF_PAX_PAGEEXEC;
64280+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
64281+ flags &= ~MF_PAX_SEGMEXEC;
64282+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
64283+ flags &= ~MF_PAX_RANDMMAP;
64284+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
64285+ flags &= ~MF_PAX_EMUTRAMP;
64286+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
64287+ flags &= ~MF_PAX_MPROTECT;
64288+
64289+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
64290+ flags |= MF_PAX_PAGEEXEC;
64291+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
64292+ flags |= MF_PAX_SEGMEXEC;
64293+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
64294+ flags |= MF_PAX_RANDMMAP;
64295+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
64296+ flags |= MF_PAX_EMUTRAMP;
64297+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
64298+ flags |= MF_PAX_MPROTECT;
64299+
64300+ pax_set_flags(task, flags);
64301+
64302+ return;
64303+}
64304+#endif
64305+
64306+int
64307+gr_handle_proc_ptrace(struct task_struct *task)
64308+{
64309+ struct file *filp;
64310+ struct task_struct *tmp = task;
64311+ struct task_struct *curtemp = current;
64312+ __u32 retmode;
64313+
64314+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
64315+ if (unlikely(!(gr_status & GR_READY)))
64316+ return 0;
64317+#endif
64318+
64319+ read_lock(&tasklist_lock);
64320+ read_lock(&grsec_exec_file_lock);
64321+ filp = task->exec_file;
64322+
64323+ while (task_pid_nr(tmp) > 0) {
64324+ if (tmp == curtemp)
64325+ break;
64326+ tmp = tmp->real_parent;
64327+ }
64328+
64329+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
64330+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
64331+ read_unlock(&grsec_exec_file_lock);
64332+ read_unlock(&tasklist_lock);
64333+ return 1;
64334+ }
64335+
64336+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
64337+ if (!(gr_status & GR_READY)) {
64338+ read_unlock(&grsec_exec_file_lock);
64339+ read_unlock(&tasklist_lock);
64340+ return 0;
64341+ }
64342+#endif
64343+
64344+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
64345+ read_unlock(&grsec_exec_file_lock);
64346+ read_unlock(&tasklist_lock);
64347+
64348+ if (retmode & GR_NOPTRACE)
64349+ return 1;
64350+
64351+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
64352+ && (current->acl != task->acl || (current->acl != current->role->root_label
64353+ && task_pid_nr(current) != task_pid_nr(task))))
64354+ return 1;
64355+
64356+ return 0;
64357+}
64358+
64359+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
64360+{
64361+ if (unlikely(!(gr_status & GR_READY)))
64362+ return;
64363+
64364+ if (!(current->role->roletype & GR_ROLE_GOD))
64365+ return;
64366+
64367+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
64368+ p->role->rolename, gr_task_roletype_to_char(p),
64369+ p->acl->filename);
64370+}
64371+
64372+int
64373+gr_handle_ptrace(struct task_struct *task, const long request)
64374+{
64375+ struct task_struct *tmp = task;
64376+ struct task_struct *curtemp = current;
64377+ __u32 retmode;
64378+
64379+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
64380+ if (unlikely(!(gr_status & GR_READY)))
64381+ return 0;
64382+#endif
64383+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
64384+ read_lock(&tasklist_lock);
64385+ while (task_pid_nr(tmp) > 0) {
64386+ if (tmp == curtemp)
64387+ break;
64388+ tmp = tmp->real_parent;
64389+ }
64390+
64391+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
64392+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
64393+ read_unlock(&tasklist_lock);
64394+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
64395+ return 1;
64396+ }
64397+ read_unlock(&tasklist_lock);
64398+ }
64399+
64400+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
64401+ if (!(gr_status & GR_READY))
64402+ return 0;
64403+#endif
64404+
64405+ read_lock(&grsec_exec_file_lock);
64406+ if (unlikely(!task->exec_file)) {
64407+ read_unlock(&grsec_exec_file_lock);
64408+ return 0;
64409+ }
64410+
64411+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
64412+ read_unlock(&grsec_exec_file_lock);
64413+
64414+ if (retmode & GR_NOPTRACE) {
64415+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
64416+ return 1;
64417+ }
64418+
64419+ if (retmode & GR_PTRACERD) {
64420+ switch (request) {
64421+ case PTRACE_SEIZE:
64422+ case PTRACE_POKETEXT:
64423+ case PTRACE_POKEDATA:
64424+ case PTRACE_POKEUSR:
64425+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
64426+ case PTRACE_SETREGS:
64427+ case PTRACE_SETFPREGS:
64428+#endif
64429+#ifdef CONFIG_X86
64430+ case PTRACE_SETFPXREGS:
64431+#endif
64432+#ifdef CONFIG_ALTIVEC
64433+ case PTRACE_SETVRREGS:
64434+#endif
64435+ return 1;
64436+ default:
64437+ return 0;
64438+ }
64439+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
64440+ !(current->role->roletype & GR_ROLE_GOD) &&
64441+ (current->acl != task->acl)) {
64442+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
64443+ return 1;
64444+ }
64445+
64446+ return 0;
64447+}
64448+
64449+static int is_writable_mmap(const struct file *filp)
64450+{
64451+ struct task_struct *task = current;
64452+ struct acl_object_label *obj, *obj2;
64453+
64454+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
64455+ !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))) {
64456+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
64457+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
64458+ task->role->root_label);
64459+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
64460+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
64461+ return 1;
64462+ }
64463+ }
64464+ return 0;
64465+}
64466+
64467+int
64468+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
64469+{
64470+ __u32 mode;
64471+
64472+ if (unlikely(!file || !(prot & PROT_EXEC)))
64473+ return 1;
64474+
64475+ if (is_writable_mmap(file))
64476+ return 0;
64477+
64478+ mode =
64479+ gr_search_file(file->f_path.dentry,
64480+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
64481+ file->f_path.mnt);
64482+
64483+ if (!gr_tpe_allow(file))
64484+ return 0;
64485+
64486+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
64487+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
64488+ return 0;
64489+ } else if (unlikely(!(mode & GR_EXEC))) {
64490+ return 0;
64491+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
64492+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
64493+ return 1;
64494+ }
64495+
64496+ return 1;
64497+}
64498+
64499+int
64500+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
64501+{
64502+ __u32 mode;
64503+
64504+ if (unlikely(!file || !(prot & PROT_EXEC)))
64505+ return 1;
64506+
64507+ if (is_writable_mmap(file))
64508+ return 0;
64509+
64510+ mode =
64511+ gr_search_file(file->f_path.dentry,
64512+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
64513+ file->f_path.mnt);
64514+
64515+ if (!gr_tpe_allow(file))
64516+ return 0;
64517+
64518+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
64519+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
64520+ return 0;
64521+ } else if (unlikely(!(mode & GR_EXEC))) {
64522+ return 0;
64523+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
64524+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
64525+ return 1;
64526+ }
64527+
64528+ return 1;
64529+}
64530+
64531+void
64532+gr_acl_handle_psacct(struct task_struct *task, const long code)
64533+{
64534+ unsigned long runtime;
64535+ unsigned long cputime;
64536+ unsigned int wday, cday;
64537+ __u8 whr, chr;
64538+ __u8 wmin, cmin;
64539+ __u8 wsec, csec;
64540+ struct timespec timeval;
64541+
64542+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
64543+ !(task->acl->mode & GR_PROCACCT)))
64544+ return;
64545+
64546+ do_posix_clock_monotonic_gettime(&timeval);
64547+ runtime = timeval.tv_sec - task->start_time.tv_sec;
64548+ wday = runtime / (3600 * 24);
64549+ runtime -= wday * (3600 * 24);
64550+ whr = runtime / 3600;
64551+ runtime -= whr * 3600;
64552+ wmin = runtime / 60;
64553+ runtime -= wmin * 60;
64554+ wsec = runtime;
64555+
64556+ cputime = (task->utime + task->stime) / HZ;
64557+ cday = cputime / (3600 * 24);
64558+ cputime -= cday * (3600 * 24);
64559+ chr = cputime / 3600;
64560+ cputime -= chr * 3600;
64561+ cmin = cputime / 60;
64562+ cputime -= cmin * 60;
64563+ csec = cputime;
64564+
64565+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
64566+
64567+ return;
64568+}
64569+
64570+void gr_set_kernel_label(struct task_struct *task)
64571+{
64572+ if (gr_status & GR_READY) {
64573+ task->role = kernel_role;
64574+ task->acl = kernel_role->root_label;
64575+ }
64576+ return;
64577+}
64578+
64579+#ifdef CONFIG_TASKSTATS
64580+int gr_is_taskstats_denied(int pid)
64581+{
64582+ struct task_struct *task;
64583+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64584+ const struct cred *cred;
64585+#endif
64586+ int ret = 0;
64587+
64588+ /* restrict taskstats viewing to un-chrooted root users
64589+ who have the 'view' subject flag if the RBAC system is enabled
64590+ */
64591+
64592+ rcu_read_lock();
64593+ read_lock(&tasklist_lock);
64594+ task = find_task_by_vpid(pid);
64595+ if (task) {
64596+#ifdef CONFIG_GRKERNSEC_CHROOT
64597+ if (proc_is_chrooted(task))
64598+ ret = -EACCES;
64599+#endif
64600+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64601+ cred = __task_cred(task);
64602+#ifdef CONFIG_GRKERNSEC_PROC_USER
64603+ if (gr_is_global_nonroot(cred->uid))
64604+ ret = -EACCES;
64605+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64606+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
64607+ ret = -EACCES;
64608+#endif
64609+#endif
64610+ if (gr_status & GR_READY) {
64611+ if (!(task->acl->mode & GR_VIEW))
64612+ ret = -EACCES;
64613+ }
64614+ } else
64615+ ret = -ENOENT;
64616+
64617+ read_unlock(&tasklist_lock);
64618+ rcu_read_unlock();
64619+
64620+ return ret;
64621+}
64622+#endif
64623+
64624+/* AUXV entries are filled via a descendant of search_binary_handler
64625+ after we've already applied the subject for the target
64626+*/
64627+int gr_acl_enable_at_secure(void)
64628+{
64629+ if (unlikely(!(gr_status & GR_READY)))
64630+ return 0;
64631+
64632+ if (current->acl->mode & GR_ATSECURE)
64633+ return 1;
64634+
64635+ return 0;
64636+}
64637+
64638+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
64639+{
64640+ struct task_struct *task = current;
64641+ struct dentry *dentry = file->f_path.dentry;
64642+ struct vfsmount *mnt = file->f_path.mnt;
64643+ struct acl_object_label *obj, *tmp;
64644+ struct acl_subject_label *subj;
64645+ unsigned int bufsize;
64646+ int is_not_root;
64647+ char *path;
64648+ dev_t dev = __get_dev(dentry);
64649+
64650+ if (unlikely(!(gr_status & GR_READY)))
64651+ return 1;
64652+
64653+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
64654+ return 1;
64655+
64656+ /* ignore Eric Biederman */
64657+ if (IS_PRIVATE(dentry->d_inode))
64658+ return 1;
64659+
64660+ subj = task->acl;
64661+ read_lock(&gr_inode_lock);
64662+ do {
64663+ obj = lookup_acl_obj_label(ino, dev, subj);
64664+ if (obj != NULL) {
64665+ read_unlock(&gr_inode_lock);
64666+ return (obj->mode & GR_FIND) ? 1 : 0;
64667+ }
64668+ } while ((subj = subj->parent_subject));
64669+ read_unlock(&gr_inode_lock);
64670+
64671+ /* this is purely an optimization since we're looking for an object
64672+ for the directory we're doing a readdir on
64673+ if it's possible for any globbed object to match the entry we're
64674+ filling into the directory, then the object we find here will be
64675+ an anchor point with attached globbed objects
64676+ */
64677+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
64678+ if (obj->globbed == NULL)
64679+ return (obj->mode & GR_FIND) ? 1 : 0;
64680+
64681+ is_not_root = ((obj->filename[0] == '/') &&
64682+ (obj->filename[1] == '\0')) ? 0 : 1;
64683+ bufsize = PAGE_SIZE - namelen - is_not_root;
64684+
64685+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
64686+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
64687+ return 1;
64688+
64689+ preempt_disable();
64690+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
64691+ bufsize);
64692+
64693+ bufsize = strlen(path);
64694+
64695+ /* if base is "/", don't append an additional slash */
64696+ if (is_not_root)
64697+ *(path + bufsize) = '/';
64698+ memcpy(path + bufsize + is_not_root, name, namelen);
64699+ *(path + bufsize + namelen + is_not_root) = '\0';
64700+
64701+ tmp = obj->globbed;
64702+ while (tmp) {
64703+ if (!glob_match(tmp->filename, path)) {
64704+ preempt_enable();
64705+ return (tmp->mode & GR_FIND) ? 1 : 0;
64706+ }
64707+ tmp = tmp->next;
64708+ }
64709+ preempt_enable();
64710+ return (obj->mode & GR_FIND) ? 1 : 0;
64711+}
64712+
64713+void gr_put_exec_file(struct task_struct *task)
64714+{
64715+ struct file *filp;
64716+
64717+ write_lock(&grsec_exec_file_lock);
64718+ filp = task->exec_file;
64719+ task->exec_file = NULL;
64720+ write_unlock(&grsec_exec_file_lock);
64721+
64722+ if (filp)
64723+ fput(filp);
64724+
64725+ return;
64726+}
64727+
64728+
64729+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
64730+EXPORT_SYMBOL(gr_acl_is_enabled);
64731+#endif
64732+EXPORT_SYMBOL(gr_set_kernel_label);
64733+#ifdef CONFIG_SECURITY
64734+EXPORT_SYMBOL(gr_check_user_change);
64735+EXPORT_SYMBOL(gr_check_group_change);
64736+#endif
64737+
64738diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
64739new file mode 100644
64740index 0000000..34fefda
64741--- /dev/null
64742+++ b/grsecurity/gracl_alloc.c
64743@@ -0,0 +1,105 @@
64744+#include <linux/kernel.h>
64745+#include <linux/mm.h>
64746+#include <linux/slab.h>
64747+#include <linux/vmalloc.h>
64748+#include <linux/gracl.h>
64749+#include <linux/grsecurity.h>
64750+
64751+static unsigned long alloc_stack_next = 1;
64752+static unsigned long alloc_stack_size = 1;
64753+static void **alloc_stack;
64754+
64755+static __inline__ int
64756+alloc_pop(void)
64757+{
64758+ if (alloc_stack_next == 1)
64759+ return 0;
64760+
64761+ kfree(alloc_stack[alloc_stack_next - 2]);
64762+
64763+ alloc_stack_next--;
64764+
64765+ return 1;
64766+}
64767+
64768+static __inline__ int
64769+alloc_push(void *buf)
64770+{
64771+ if (alloc_stack_next >= alloc_stack_size)
64772+ return 1;
64773+
64774+ alloc_stack[alloc_stack_next - 1] = buf;
64775+
64776+ alloc_stack_next++;
64777+
64778+ return 0;
64779+}
64780+
64781+void *
64782+acl_alloc(unsigned long len)
64783+{
64784+ void *ret = NULL;
64785+
64786+ if (!len || len > PAGE_SIZE)
64787+ goto out;
64788+
64789+ ret = kmalloc(len, GFP_KERNEL);
64790+
64791+ if (ret) {
64792+ if (alloc_push(ret)) {
64793+ kfree(ret);
64794+ ret = NULL;
64795+ }
64796+ }
64797+
64798+out:
64799+ return ret;
64800+}
64801+
64802+void *
64803+acl_alloc_num(unsigned long num, unsigned long len)
64804+{
64805+ if (!len || (num > (PAGE_SIZE / len)))
64806+ return NULL;
64807+
64808+ return acl_alloc(num * len);
64809+}
64810+
64811+void
64812+acl_free_all(void)
64813+{
64814+ if (gr_acl_is_enabled() || !alloc_stack)
64815+ return;
64816+
64817+ while (alloc_pop()) ;
64818+
64819+ if (alloc_stack) {
64820+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
64821+ kfree(alloc_stack);
64822+ else
64823+ vfree(alloc_stack);
64824+ }
64825+
64826+ alloc_stack = NULL;
64827+ alloc_stack_size = 1;
64828+ alloc_stack_next = 1;
64829+
64830+ return;
64831+}
64832+
64833+int
64834+acl_alloc_stack_init(unsigned long size)
64835+{
64836+ if ((size * sizeof (void *)) <= PAGE_SIZE)
64837+ alloc_stack =
64838+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
64839+ else
64840+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
64841+
64842+ alloc_stack_size = size;
64843+
64844+ if (!alloc_stack)
64845+ return 0;
64846+ else
64847+ return 1;
64848+}
64849diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
64850new file mode 100644
64851index 0000000..bdd51ea
64852--- /dev/null
64853+++ b/grsecurity/gracl_cap.c
64854@@ -0,0 +1,110 @@
64855+#include <linux/kernel.h>
64856+#include <linux/module.h>
64857+#include <linux/sched.h>
64858+#include <linux/gracl.h>
64859+#include <linux/grsecurity.h>
64860+#include <linux/grinternal.h>
64861+
64862+extern const char *captab_log[];
64863+extern int captab_log_entries;
64864+
64865+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
64866+{
64867+ struct acl_subject_label *curracl;
64868+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
64869+ kernel_cap_t cap_audit = __cap_empty_set;
64870+
64871+ if (!gr_acl_is_enabled())
64872+ return 1;
64873+
64874+ curracl = task->acl;
64875+
64876+ cap_drop = curracl->cap_lower;
64877+ cap_mask = curracl->cap_mask;
64878+ cap_audit = curracl->cap_invert_audit;
64879+
64880+ while ((curracl = curracl->parent_subject)) {
64881+ /* if the cap isn't specified in the current computed mask but is specified in the
64882+ current level subject, and is lowered in the current level subject, then add
64883+ it to the set of dropped capabilities
64884+ otherwise, add the current level subject's mask to the current computed mask
64885+ */
64886+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
64887+ cap_raise(cap_mask, cap);
64888+ if (cap_raised(curracl->cap_lower, cap))
64889+ cap_raise(cap_drop, cap);
64890+ if (cap_raised(curracl->cap_invert_audit, cap))
64891+ cap_raise(cap_audit, cap);
64892+ }
64893+ }
64894+
64895+ if (!cap_raised(cap_drop, cap)) {
64896+ if (cap_raised(cap_audit, cap))
64897+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
64898+ return 1;
64899+ }
64900+
64901+ curracl = task->acl;
64902+
64903+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
64904+ && cap_raised(cred->cap_effective, cap)) {
64905+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
64906+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
64907+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
64908+ gr_to_filename(task->exec_file->f_path.dentry,
64909+ task->exec_file->f_path.mnt) : curracl->filename,
64910+ curracl->filename, 0UL,
64911+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
64912+ return 1;
64913+ }
64914+
64915+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
64916+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
64917+
64918+ return 0;
64919+}
64920+
64921+int
64922+gr_acl_is_capable(const int cap)
64923+{
64924+ return gr_task_acl_is_capable(current, current_cred(), cap);
64925+}
64926+
64927+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
64928+{
64929+ struct acl_subject_label *curracl;
64930+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
64931+
64932+ if (!gr_acl_is_enabled())
64933+ return 1;
64934+
64935+ curracl = task->acl;
64936+
64937+ cap_drop = curracl->cap_lower;
64938+ cap_mask = curracl->cap_mask;
64939+
64940+ while ((curracl = curracl->parent_subject)) {
64941+ /* if the cap isn't specified in the current computed mask but is specified in the
64942+ current level subject, and is lowered in the current level subject, then add
64943+ it to the set of dropped capabilities
64944+ otherwise, add the current level subject's mask to the current computed mask
64945+ */
64946+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
64947+ cap_raise(cap_mask, cap);
64948+ if (cap_raised(curracl->cap_lower, cap))
64949+ cap_raise(cap_drop, cap);
64950+ }
64951+ }
64952+
64953+ if (!cap_raised(cap_drop, cap))
64954+ return 1;
64955+
64956+ return 0;
64957+}
64958+
64959+int
64960+gr_acl_is_capable_nolog(const int cap)
64961+{
64962+ return gr_task_acl_is_capable_nolog(current, cap);
64963+}
64964+
64965diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
64966new file mode 100644
64967index 0000000..a43dd06
64968--- /dev/null
64969+++ b/grsecurity/gracl_compat.c
64970@@ -0,0 +1,269 @@
64971+#include <linux/kernel.h>
64972+#include <linux/gracl.h>
64973+#include <linux/compat.h>
64974+#include <linux/gracl_compat.h>
64975+
64976+#include <asm/uaccess.h>
64977+
64978+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
64979+{
64980+ struct gr_arg_wrapper_compat uwrapcompat;
64981+
64982+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
64983+ return -EFAULT;
64984+
64985+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
64986+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
64987+ return -EINVAL;
64988+
64989+ uwrap->arg = compat_ptr(uwrapcompat.arg);
64990+ uwrap->version = uwrapcompat.version;
64991+ uwrap->size = sizeof(struct gr_arg);
64992+
64993+ return 0;
64994+}
64995+
64996+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
64997+{
64998+ struct gr_arg_compat argcompat;
64999+
65000+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
65001+ return -EFAULT;
65002+
65003+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
65004+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
65005+ arg->role_db.num_roles = argcompat.role_db.num_roles;
65006+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
65007+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
65008+ arg->role_db.num_objects = argcompat.role_db.num_objects;
65009+
65010+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
65011+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
65012+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
65013+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
65014+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
65015+ arg->segv_device = argcompat.segv_device;
65016+ arg->segv_inode = argcompat.segv_inode;
65017+ arg->segv_uid = argcompat.segv_uid;
65018+ arg->num_sprole_pws = argcompat.num_sprole_pws;
65019+ arg->mode = argcompat.mode;
65020+
65021+ return 0;
65022+}
65023+
65024+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
65025+{
65026+ struct acl_object_label_compat objcompat;
65027+
65028+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
65029+ return -EFAULT;
65030+
65031+ obj->filename = compat_ptr(objcompat.filename);
65032+ obj->inode = objcompat.inode;
65033+ obj->device = objcompat.device;
65034+ obj->mode = objcompat.mode;
65035+
65036+ obj->nested = compat_ptr(objcompat.nested);
65037+ obj->globbed = compat_ptr(objcompat.globbed);
65038+
65039+ obj->prev = compat_ptr(objcompat.prev);
65040+ obj->next = compat_ptr(objcompat.next);
65041+
65042+ return 0;
65043+}
65044+
65045+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
65046+{
65047+ unsigned int i;
65048+ struct acl_subject_label_compat subjcompat;
65049+
65050+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
65051+ return -EFAULT;
65052+
65053+ subj->filename = compat_ptr(subjcompat.filename);
65054+ subj->inode = subjcompat.inode;
65055+ subj->device = subjcompat.device;
65056+ subj->mode = subjcompat.mode;
65057+ subj->cap_mask = subjcompat.cap_mask;
65058+ subj->cap_lower = subjcompat.cap_lower;
65059+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
65060+
65061+ for (i = 0; i < GR_NLIMITS; i++) {
65062+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
65063+ subj->res[i].rlim_cur = RLIM_INFINITY;
65064+ else
65065+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
65066+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
65067+ subj->res[i].rlim_max = RLIM_INFINITY;
65068+ else
65069+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
65070+ }
65071+ subj->resmask = subjcompat.resmask;
65072+
65073+ subj->user_trans_type = subjcompat.user_trans_type;
65074+ subj->group_trans_type = subjcompat.group_trans_type;
65075+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
65076+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
65077+ subj->user_trans_num = subjcompat.user_trans_num;
65078+ subj->group_trans_num = subjcompat.group_trans_num;
65079+
65080+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
65081+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
65082+ subj->ip_type = subjcompat.ip_type;
65083+ subj->ips = compat_ptr(subjcompat.ips);
65084+ subj->ip_num = subjcompat.ip_num;
65085+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
65086+
65087+ subj->crashes = subjcompat.crashes;
65088+ subj->expires = subjcompat.expires;
65089+
65090+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
65091+ subj->hash = compat_ptr(subjcompat.hash);
65092+ subj->prev = compat_ptr(subjcompat.prev);
65093+ subj->next = compat_ptr(subjcompat.next);
65094+
65095+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
65096+ subj->obj_hash_size = subjcompat.obj_hash_size;
65097+ subj->pax_flags = subjcompat.pax_flags;
65098+
65099+ return 0;
65100+}
65101+
65102+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
65103+{
65104+ struct acl_role_label_compat rolecompat;
65105+
65106+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
65107+ return -EFAULT;
65108+
65109+ role->rolename = compat_ptr(rolecompat.rolename);
65110+ role->uidgid = rolecompat.uidgid;
65111+ role->roletype = rolecompat.roletype;
65112+
65113+ role->auth_attempts = rolecompat.auth_attempts;
65114+ role->expires = rolecompat.expires;
65115+
65116+ role->root_label = compat_ptr(rolecompat.root_label);
65117+ role->hash = compat_ptr(rolecompat.hash);
65118+
65119+ role->prev = compat_ptr(rolecompat.prev);
65120+ role->next = compat_ptr(rolecompat.next);
65121+
65122+ role->transitions = compat_ptr(rolecompat.transitions);
65123+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
65124+ role->domain_children = compat_ptr(rolecompat.domain_children);
65125+ role->domain_child_num = rolecompat.domain_child_num;
65126+
65127+ role->umask = rolecompat.umask;
65128+
65129+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
65130+ role->subj_hash_size = rolecompat.subj_hash_size;
65131+
65132+ return 0;
65133+}
65134+
65135+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
65136+{
65137+ struct role_allowed_ip_compat roleip_compat;
65138+
65139+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
65140+ return -EFAULT;
65141+
65142+ roleip->addr = roleip_compat.addr;
65143+ roleip->netmask = roleip_compat.netmask;
65144+
65145+ roleip->prev = compat_ptr(roleip_compat.prev);
65146+ roleip->next = compat_ptr(roleip_compat.next);
65147+
65148+ return 0;
65149+}
65150+
65151+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
65152+{
65153+ struct role_transition_compat trans_compat;
65154+
65155+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
65156+ return -EFAULT;
65157+
65158+ trans->rolename = compat_ptr(trans_compat.rolename);
65159+
65160+ trans->prev = compat_ptr(trans_compat.prev);
65161+ trans->next = compat_ptr(trans_compat.next);
65162+
65163+ return 0;
65164+
65165+}
65166+
65167+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
65168+{
65169+ struct gr_hash_struct_compat hash_compat;
65170+
65171+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
65172+ return -EFAULT;
65173+
65174+ hash->table = compat_ptr(hash_compat.table);
65175+ hash->nametable = compat_ptr(hash_compat.nametable);
65176+ hash->first = compat_ptr(hash_compat.first);
65177+
65178+ hash->table_size = hash_compat.table_size;
65179+ hash->used_size = hash_compat.used_size;
65180+
65181+ hash->type = hash_compat.type;
65182+
65183+ return 0;
65184+}
65185+
65186+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
65187+{
65188+ compat_uptr_t ptrcompat;
65189+
65190+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
65191+ return -EFAULT;
65192+
65193+ *(void **)ptr = compat_ptr(ptrcompat);
65194+
65195+ return 0;
65196+}
65197+
65198+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
65199+{
65200+ struct acl_ip_label_compat ip_compat;
65201+
65202+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
65203+ return -EFAULT;
65204+
65205+ ip->iface = compat_ptr(ip_compat.iface);
65206+ ip->addr = ip_compat.addr;
65207+ ip->netmask = ip_compat.netmask;
65208+ ip->low = ip_compat.low;
65209+ ip->high = ip_compat.high;
65210+ ip->mode = ip_compat.mode;
65211+ ip->type = ip_compat.type;
65212+
65213+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
65214+
65215+ ip->prev = compat_ptr(ip_compat.prev);
65216+ ip->next = compat_ptr(ip_compat.next);
65217+
65218+ return 0;
65219+}
65220+
65221+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
65222+{
65223+ struct sprole_pw_compat pw_compat;
65224+
65225+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
65226+ return -EFAULT;
65227+
65228+ pw->rolename = compat_ptr(pw_compat.rolename);
65229+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
65230+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
65231+
65232+ return 0;
65233+}
65234+
65235+size_t get_gr_arg_wrapper_size_compat(void)
65236+{
65237+ return sizeof(struct gr_arg_wrapper_compat);
65238+}
65239+
65240diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
65241new file mode 100644
65242index 0000000..a340c17
65243--- /dev/null
65244+++ b/grsecurity/gracl_fs.c
65245@@ -0,0 +1,431 @@
65246+#include <linux/kernel.h>
65247+#include <linux/sched.h>
65248+#include <linux/types.h>
65249+#include <linux/fs.h>
65250+#include <linux/file.h>
65251+#include <linux/stat.h>
65252+#include <linux/grsecurity.h>
65253+#include <linux/grinternal.h>
65254+#include <linux/gracl.h>
65255+
65256+umode_t
65257+gr_acl_umask(void)
65258+{
65259+ if (unlikely(!gr_acl_is_enabled()))
65260+ return 0;
65261+
65262+ return current->role->umask;
65263+}
65264+
65265+__u32
65266+gr_acl_handle_hidden_file(const struct dentry * dentry,
65267+ const struct vfsmount * mnt)
65268+{
65269+ __u32 mode;
65270+
65271+ if (unlikely(!dentry->d_inode))
65272+ return GR_FIND;
65273+
65274+ mode =
65275+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
65276+
65277+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
65278+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
65279+ return mode;
65280+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
65281+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
65282+ return 0;
65283+ } else if (unlikely(!(mode & GR_FIND)))
65284+ return 0;
65285+
65286+ return GR_FIND;
65287+}
65288+
65289+__u32
65290+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
65291+ int acc_mode)
65292+{
65293+ __u32 reqmode = GR_FIND;
65294+ __u32 mode;
65295+
65296+ if (unlikely(!dentry->d_inode))
65297+ return reqmode;
65298+
65299+ if (acc_mode & MAY_APPEND)
65300+ reqmode |= GR_APPEND;
65301+ else if (acc_mode & MAY_WRITE)
65302+ reqmode |= GR_WRITE;
65303+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
65304+ reqmode |= GR_READ;
65305+
65306+ mode =
65307+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
65308+ mnt);
65309+
65310+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
65311+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
65312+ reqmode & GR_READ ? " reading" : "",
65313+ reqmode & GR_WRITE ? " writing" : reqmode &
65314+ GR_APPEND ? " appending" : "");
65315+ return reqmode;
65316+ } else
65317+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
65318+ {
65319+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
65320+ reqmode & GR_READ ? " reading" : "",
65321+ reqmode & GR_WRITE ? " writing" : reqmode &
65322+ GR_APPEND ? " appending" : "");
65323+ return 0;
65324+ } else if (unlikely((mode & reqmode) != reqmode))
65325+ return 0;
65326+
65327+ return reqmode;
65328+}
65329+
65330+__u32
65331+gr_acl_handle_creat(const struct dentry * dentry,
65332+ const struct dentry * p_dentry,
65333+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
65334+ const int imode)
65335+{
65336+ __u32 reqmode = GR_WRITE | GR_CREATE;
65337+ __u32 mode;
65338+
65339+ if (acc_mode & MAY_APPEND)
65340+ reqmode |= GR_APPEND;
65341+ // if a directory was required or the directory already exists, then
65342+ // don't count this open as a read
65343+ if ((acc_mode & MAY_READ) &&
65344+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
65345+ reqmode |= GR_READ;
65346+ if ((open_flags & O_CREAT) &&
65347+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
65348+ reqmode |= GR_SETID;
65349+
65350+ mode =
65351+ gr_check_create(dentry, p_dentry, p_mnt,
65352+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
65353+
65354+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
65355+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
65356+ reqmode & GR_READ ? " reading" : "",
65357+ reqmode & GR_WRITE ? " writing" : reqmode &
65358+ GR_APPEND ? " appending" : "");
65359+ return reqmode;
65360+ } else
65361+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
65362+ {
65363+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
65364+ reqmode & GR_READ ? " reading" : "",
65365+ reqmode & GR_WRITE ? " writing" : reqmode &
65366+ GR_APPEND ? " appending" : "");
65367+ return 0;
65368+ } else if (unlikely((mode & reqmode) != reqmode))
65369+ return 0;
65370+
65371+ return reqmode;
65372+}
65373+
65374+__u32
65375+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
65376+ const int fmode)
65377+{
65378+ __u32 mode, reqmode = GR_FIND;
65379+
65380+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
65381+ reqmode |= GR_EXEC;
65382+ if (fmode & S_IWOTH)
65383+ reqmode |= GR_WRITE;
65384+ if (fmode & S_IROTH)
65385+ reqmode |= GR_READ;
65386+
65387+ mode =
65388+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
65389+ mnt);
65390+
65391+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
65392+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
65393+ reqmode & GR_READ ? " reading" : "",
65394+ reqmode & GR_WRITE ? " writing" : "",
65395+ reqmode & GR_EXEC ? " executing" : "");
65396+ return reqmode;
65397+ } else
65398+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
65399+ {
65400+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
65401+ reqmode & GR_READ ? " reading" : "",
65402+ reqmode & GR_WRITE ? " writing" : "",
65403+ reqmode & GR_EXEC ? " executing" : "");
65404+ return 0;
65405+ } else if (unlikely((mode & reqmode) != reqmode))
65406+ return 0;
65407+
65408+ return reqmode;
65409+}
65410+
65411+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
65412+{
65413+ __u32 mode;
65414+
65415+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
65416+
65417+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
65418+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
65419+ return mode;
65420+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
65421+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
65422+ return 0;
65423+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
65424+ return 0;
65425+
65426+ return (reqmode);
65427+}
65428+
65429+__u32
65430+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
65431+{
65432+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
65433+}
65434+
65435+__u32
65436+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
65437+{
65438+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
65439+}
65440+
65441+__u32
65442+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
65443+{
65444+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
65445+}
65446+
65447+__u32
65448+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
65449+{
65450+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
65451+}
65452+
65453+__u32
65454+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
65455+ umode_t *modeptr)
65456+{
65457+ umode_t mode;
65458+
65459+ *modeptr &= ~gr_acl_umask();
65460+ mode = *modeptr;
65461+
65462+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
65463+ return 1;
65464+
65465+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
65466+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
65467+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
65468+ GR_CHMOD_ACL_MSG);
65469+ } else {
65470+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
65471+ }
65472+}
65473+
65474+__u32
65475+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
65476+{
65477+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
65478+}
65479+
65480+__u32
65481+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
65482+{
65483+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
65484+}
65485+
65486+__u32
65487+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
65488+{
65489+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
65490+}
65491+
65492+__u32
65493+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
65494+{
65495+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
65496+ GR_UNIXCONNECT_ACL_MSG);
65497+}
65498+
65499+/* hardlinks require at minimum create and link permission,
65500+ any additional privilege required is based on the
65501+ privilege of the file being linked to
65502+*/
65503+__u32
65504+gr_acl_handle_link(const struct dentry * new_dentry,
65505+ const struct dentry * parent_dentry,
65506+ const struct vfsmount * parent_mnt,
65507+ const struct dentry * old_dentry,
65508+ const struct vfsmount * old_mnt, const struct filename *to)
65509+{
65510+ __u32 mode;
65511+ __u32 needmode = GR_CREATE | GR_LINK;
65512+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
65513+
65514+ mode =
65515+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
65516+ old_mnt);
65517+
65518+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
65519+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
65520+ return mode;
65521+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
65522+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
65523+ return 0;
65524+ } else if (unlikely((mode & needmode) != needmode))
65525+ return 0;
65526+
65527+ return 1;
65528+}
65529+
65530+__u32
65531+gr_acl_handle_symlink(const struct dentry * new_dentry,
65532+ const struct dentry * parent_dentry,
65533+ const struct vfsmount * parent_mnt, const struct filename *from)
65534+{
65535+ __u32 needmode = GR_WRITE | GR_CREATE;
65536+ __u32 mode;
65537+
65538+ mode =
65539+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
65540+ GR_CREATE | GR_AUDIT_CREATE |
65541+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
65542+
65543+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
65544+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
65545+ return mode;
65546+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
65547+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
65548+ return 0;
65549+ } else if (unlikely((mode & needmode) != needmode))
65550+ return 0;
65551+
65552+ return (GR_WRITE | GR_CREATE);
65553+}
65554+
65555+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)
65556+{
65557+ __u32 mode;
65558+
65559+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
65560+
65561+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
65562+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
65563+ return mode;
65564+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
65565+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
65566+ return 0;
65567+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
65568+ return 0;
65569+
65570+ return (reqmode);
65571+}
65572+
65573+__u32
65574+gr_acl_handle_mknod(const struct dentry * new_dentry,
65575+ const struct dentry * parent_dentry,
65576+ const struct vfsmount * parent_mnt,
65577+ const int mode)
65578+{
65579+ __u32 reqmode = GR_WRITE | GR_CREATE;
65580+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
65581+ reqmode |= GR_SETID;
65582+
65583+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
65584+ reqmode, GR_MKNOD_ACL_MSG);
65585+}
65586+
65587+__u32
65588+gr_acl_handle_mkdir(const struct dentry *new_dentry,
65589+ const struct dentry *parent_dentry,
65590+ const struct vfsmount *parent_mnt)
65591+{
65592+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
65593+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
65594+}
65595+
65596+#define RENAME_CHECK_SUCCESS(old, new) \
65597+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
65598+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
65599+
65600+int
65601+gr_acl_handle_rename(struct dentry *new_dentry,
65602+ struct dentry *parent_dentry,
65603+ const struct vfsmount *parent_mnt,
65604+ struct dentry *old_dentry,
65605+ struct inode *old_parent_inode,
65606+ struct vfsmount *old_mnt, const struct filename *newname)
65607+{
65608+ __u32 comp1, comp2;
65609+ int error = 0;
65610+
65611+ if (unlikely(!gr_acl_is_enabled()))
65612+ return 0;
65613+
65614+ if (!new_dentry->d_inode) {
65615+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
65616+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
65617+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
65618+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
65619+ GR_DELETE | GR_AUDIT_DELETE |
65620+ GR_AUDIT_READ | GR_AUDIT_WRITE |
65621+ GR_SUPPRESS, old_mnt);
65622+ } else {
65623+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
65624+ GR_CREATE | GR_DELETE |
65625+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
65626+ GR_AUDIT_READ | GR_AUDIT_WRITE |
65627+ GR_SUPPRESS, parent_mnt);
65628+ comp2 =
65629+ gr_search_file(old_dentry,
65630+ GR_READ | GR_WRITE | GR_AUDIT_READ |
65631+ GR_DELETE | GR_AUDIT_DELETE |
65632+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
65633+ }
65634+
65635+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
65636+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
65637+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
65638+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
65639+ && !(comp2 & GR_SUPPRESS)) {
65640+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
65641+ error = -EACCES;
65642+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
65643+ error = -EACCES;
65644+
65645+ return error;
65646+}
65647+
65648+void
65649+gr_acl_handle_exit(void)
65650+{
65651+ u16 id;
65652+ char *rolename;
65653+
65654+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
65655+ !(current->role->roletype & GR_ROLE_PERSIST))) {
65656+ id = current->acl_role_id;
65657+ rolename = current->role->rolename;
65658+ gr_set_acls(1);
65659+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
65660+ }
65661+
65662+ gr_put_exec_file(current);
65663+ return;
65664+}
65665+
65666+int
65667+gr_acl_handle_procpidmem(const struct task_struct *task)
65668+{
65669+ if (unlikely(!gr_acl_is_enabled()))
65670+ return 0;
65671+
65672+ if (task != current && task->acl->mode & GR_PROTPROCFD)
65673+ return -EACCES;
65674+
65675+ return 0;
65676+}
65677diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
65678new file mode 100644
65679index 0000000..8132048
65680--- /dev/null
65681+++ b/grsecurity/gracl_ip.c
65682@@ -0,0 +1,387 @@
65683+#include <linux/kernel.h>
65684+#include <asm/uaccess.h>
65685+#include <asm/errno.h>
65686+#include <net/sock.h>
65687+#include <linux/file.h>
65688+#include <linux/fs.h>
65689+#include <linux/net.h>
65690+#include <linux/in.h>
65691+#include <linux/skbuff.h>
65692+#include <linux/ip.h>
65693+#include <linux/udp.h>
65694+#include <linux/types.h>
65695+#include <linux/sched.h>
65696+#include <linux/netdevice.h>
65697+#include <linux/inetdevice.h>
65698+#include <linux/gracl.h>
65699+#include <linux/grsecurity.h>
65700+#include <linux/grinternal.h>
65701+
65702+#define GR_BIND 0x01
65703+#define GR_CONNECT 0x02
65704+#define GR_INVERT 0x04
65705+#define GR_BINDOVERRIDE 0x08
65706+#define GR_CONNECTOVERRIDE 0x10
65707+#define GR_SOCK_FAMILY 0x20
65708+
65709+static const char * gr_protocols[IPPROTO_MAX] = {
65710+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
65711+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
65712+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
65713+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
65714+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
65715+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
65716+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
65717+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
65718+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
65719+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
65720+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
65721+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
65722+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
65723+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
65724+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
65725+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
65726+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
65727+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
65728+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
65729+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
65730+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
65731+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
65732+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
65733+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
65734+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
65735+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
65736+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
65737+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
65738+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
65739+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
65740+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
65741+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
65742+ };
65743+
65744+static const char * gr_socktypes[SOCK_MAX] = {
65745+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
65746+ "unknown:7", "unknown:8", "unknown:9", "packet"
65747+ };
65748+
65749+static const char * gr_sockfamilies[AF_MAX+1] = {
65750+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
65751+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
65752+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
65753+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
65754+ };
65755+
65756+const char *
65757+gr_proto_to_name(unsigned char proto)
65758+{
65759+ return gr_protocols[proto];
65760+}
65761+
65762+const char *
65763+gr_socktype_to_name(unsigned char type)
65764+{
65765+ return gr_socktypes[type];
65766+}
65767+
65768+const char *
65769+gr_sockfamily_to_name(unsigned char family)
65770+{
65771+ return gr_sockfamilies[family];
65772+}
65773+
65774+int
65775+gr_search_socket(const int domain, const int type, const int protocol)
65776+{
65777+ struct acl_subject_label *curr;
65778+ const struct cred *cred = current_cred();
65779+
65780+ if (unlikely(!gr_acl_is_enabled()))
65781+ goto exit;
65782+
65783+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
65784+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
65785+ goto exit; // let the kernel handle it
65786+
65787+ curr = current->acl;
65788+
65789+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
65790+ /* the family is allowed, if this is PF_INET allow it only if
65791+ the extra sock type/protocol checks pass */
65792+ if (domain == PF_INET)
65793+ goto inet_check;
65794+ goto exit;
65795+ } else {
65796+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
65797+ __u32 fakeip = 0;
65798+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
65799+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
65800+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
65801+ gr_to_filename(current->exec_file->f_path.dentry,
65802+ current->exec_file->f_path.mnt) :
65803+ curr->filename, curr->filename,
65804+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
65805+ &current->signal->saved_ip);
65806+ goto exit;
65807+ }
65808+ goto exit_fail;
65809+ }
65810+
65811+inet_check:
65812+ /* the rest of this checking is for IPv4 only */
65813+ if (!curr->ips)
65814+ goto exit;
65815+
65816+ if ((curr->ip_type & (1U << type)) &&
65817+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
65818+ goto exit;
65819+
65820+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
65821+ /* we don't place acls on raw sockets , and sometimes
65822+ dgram/ip sockets are opened for ioctl and not
65823+ bind/connect, so we'll fake a bind learn log */
65824+ if (type == SOCK_RAW || type == SOCK_PACKET) {
65825+ __u32 fakeip = 0;
65826+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
65827+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
65828+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
65829+ gr_to_filename(current->exec_file->f_path.dentry,
65830+ current->exec_file->f_path.mnt) :
65831+ curr->filename, curr->filename,
65832+ &fakeip, 0, type,
65833+ protocol, GR_CONNECT, &current->signal->saved_ip);
65834+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
65835+ __u32 fakeip = 0;
65836+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
65837+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
65838+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
65839+ gr_to_filename(current->exec_file->f_path.dentry,
65840+ current->exec_file->f_path.mnt) :
65841+ curr->filename, curr->filename,
65842+ &fakeip, 0, type,
65843+ protocol, GR_BIND, &current->signal->saved_ip);
65844+ }
65845+ /* we'll log when they use connect or bind */
65846+ goto exit;
65847+ }
65848+
65849+exit_fail:
65850+ if (domain == PF_INET)
65851+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
65852+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
65853+ else
65854+#ifndef CONFIG_IPV6
65855+ if (domain != PF_INET6)
65856+#endif
65857+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
65858+ gr_socktype_to_name(type), protocol);
65859+
65860+ return 0;
65861+exit:
65862+ return 1;
65863+}
65864+
65865+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)
65866+{
65867+ if ((ip->mode & mode) &&
65868+ (ip_port >= ip->low) &&
65869+ (ip_port <= ip->high) &&
65870+ ((ntohl(ip_addr) & our_netmask) ==
65871+ (ntohl(our_addr) & our_netmask))
65872+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
65873+ && (ip->type & (1U << type))) {
65874+ if (ip->mode & GR_INVERT)
65875+ return 2; // specifically denied
65876+ else
65877+ return 1; // allowed
65878+ }
65879+
65880+ return 0; // not specifically allowed, may continue parsing
65881+}
65882+
65883+static int
65884+gr_search_connectbind(const int full_mode, struct sock *sk,
65885+ struct sockaddr_in *addr, const int type)
65886+{
65887+ char iface[IFNAMSIZ] = {0};
65888+ struct acl_subject_label *curr;
65889+ struct acl_ip_label *ip;
65890+ struct inet_sock *isk;
65891+ struct net_device *dev;
65892+ struct in_device *idev;
65893+ unsigned long i;
65894+ int ret;
65895+ int mode = full_mode & (GR_BIND | GR_CONNECT);
65896+ __u32 ip_addr = 0;
65897+ __u32 our_addr;
65898+ __u32 our_netmask;
65899+ char *p;
65900+ __u16 ip_port = 0;
65901+ const struct cred *cred = current_cred();
65902+
65903+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
65904+ return 0;
65905+
65906+ curr = current->acl;
65907+ isk = inet_sk(sk);
65908+
65909+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
65910+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
65911+ addr->sin_addr.s_addr = curr->inaddr_any_override;
65912+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
65913+ struct sockaddr_in saddr;
65914+ int err;
65915+
65916+ saddr.sin_family = AF_INET;
65917+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
65918+ saddr.sin_port = isk->inet_sport;
65919+
65920+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
65921+ if (err)
65922+ return err;
65923+
65924+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
65925+ if (err)
65926+ return err;
65927+ }
65928+
65929+ if (!curr->ips)
65930+ return 0;
65931+
65932+ ip_addr = addr->sin_addr.s_addr;
65933+ ip_port = ntohs(addr->sin_port);
65934+
65935+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
65936+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
65937+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
65938+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
65939+ gr_to_filename(current->exec_file->f_path.dentry,
65940+ current->exec_file->f_path.mnt) :
65941+ curr->filename, curr->filename,
65942+ &ip_addr, ip_port, type,
65943+ sk->sk_protocol, mode, &current->signal->saved_ip);
65944+ return 0;
65945+ }
65946+
65947+ for (i = 0; i < curr->ip_num; i++) {
65948+ ip = *(curr->ips + i);
65949+ if (ip->iface != NULL) {
65950+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
65951+ p = strchr(iface, ':');
65952+ if (p != NULL)
65953+ *p = '\0';
65954+ dev = dev_get_by_name(sock_net(sk), iface);
65955+ if (dev == NULL)
65956+ continue;
65957+ idev = in_dev_get(dev);
65958+ if (idev == NULL) {
65959+ dev_put(dev);
65960+ continue;
65961+ }
65962+ rcu_read_lock();
65963+ for_ifa(idev) {
65964+ if (!strcmp(ip->iface, ifa->ifa_label)) {
65965+ our_addr = ifa->ifa_address;
65966+ our_netmask = 0xffffffff;
65967+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
65968+ if (ret == 1) {
65969+ rcu_read_unlock();
65970+ in_dev_put(idev);
65971+ dev_put(dev);
65972+ return 0;
65973+ } else if (ret == 2) {
65974+ rcu_read_unlock();
65975+ in_dev_put(idev);
65976+ dev_put(dev);
65977+ goto denied;
65978+ }
65979+ }
65980+ } endfor_ifa(idev);
65981+ rcu_read_unlock();
65982+ in_dev_put(idev);
65983+ dev_put(dev);
65984+ } else {
65985+ our_addr = ip->addr;
65986+ our_netmask = ip->netmask;
65987+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
65988+ if (ret == 1)
65989+ return 0;
65990+ else if (ret == 2)
65991+ goto denied;
65992+ }
65993+ }
65994+
65995+denied:
65996+ if (mode == GR_BIND)
65997+ 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));
65998+ else if (mode == GR_CONNECT)
65999+ 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));
66000+
66001+ return -EACCES;
66002+}
66003+
66004+int
66005+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
66006+{
66007+ /* always allow disconnection of dgram sockets with connect */
66008+ if (addr->sin_family == AF_UNSPEC)
66009+ return 0;
66010+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
66011+}
66012+
66013+int
66014+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
66015+{
66016+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
66017+}
66018+
66019+int gr_search_listen(struct socket *sock)
66020+{
66021+ struct sock *sk = sock->sk;
66022+ struct sockaddr_in addr;
66023+
66024+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
66025+ addr.sin_port = inet_sk(sk)->inet_sport;
66026+
66027+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
66028+}
66029+
66030+int gr_search_accept(struct socket *sock)
66031+{
66032+ struct sock *sk = sock->sk;
66033+ struct sockaddr_in addr;
66034+
66035+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
66036+ addr.sin_port = inet_sk(sk)->inet_sport;
66037+
66038+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
66039+}
66040+
66041+int
66042+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
66043+{
66044+ if (addr)
66045+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
66046+ else {
66047+ struct sockaddr_in sin;
66048+ const struct inet_sock *inet = inet_sk(sk);
66049+
66050+ sin.sin_addr.s_addr = inet->inet_daddr;
66051+ sin.sin_port = inet->inet_dport;
66052+
66053+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
66054+ }
66055+}
66056+
66057+int
66058+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
66059+{
66060+ struct sockaddr_in sin;
66061+
66062+ if (unlikely(skb->len < sizeof (struct udphdr)))
66063+ return 0; // skip this packet
66064+
66065+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
66066+ sin.sin_port = udp_hdr(skb)->source;
66067+
66068+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
66069+}
66070diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
66071new file mode 100644
66072index 0000000..25f54ef
66073--- /dev/null
66074+++ b/grsecurity/gracl_learn.c
66075@@ -0,0 +1,207 @@
66076+#include <linux/kernel.h>
66077+#include <linux/mm.h>
66078+#include <linux/sched.h>
66079+#include <linux/poll.h>
66080+#include <linux/string.h>
66081+#include <linux/file.h>
66082+#include <linux/types.h>
66083+#include <linux/vmalloc.h>
66084+#include <linux/grinternal.h>
66085+
66086+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
66087+ size_t count, loff_t *ppos);
66088+extern int gr_acl_is_enabled(void);
66089+
66090+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
66091+static int gr_learn_attached;
66092+
66093+/* use a 512k buffer */
66094+#define LEARN_BUFFER_SIZE (512 * 1024)
66095+
66096+static DEFINE_SPINLOCK(gr_learn_lock);
66097+static DEFINE_MUTEX(gr_learn_user_mutex);
66098+
66099+/* we need to maintain two buffers, so that the kernel context of grlearn
66100+ uses a semaphore around the userspace copying, and the other kernel contexts
66101+ use a spinlock when copying into the buffer, since they cannot sleep
66102+*/
66103+static char *learn_buffer;
66104+static char *learn_buffer_user;
66105+static int learn_buffer_len;
66106+static int learn_buffer_user_len;
66107+
66108+static ssize_t
66109+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
66110+{
66111+ DECLARE_WAITQUEUE(wait, current);
66112+ ssize_t retval = 0;
66113+
66114+ add_wait_queue(&learn_wait, &wait);
66115+ set_current_state(TASK_INTERRUPTIBLE);
66116+ do {
66117+ mutex_lock(&gr_learn_user_mutex);
66118+ spin_lock(&gr_learn_lock);
66119+ if (learn_buffer_len)
66120+ break;
66121+ spin_unlock(&gr_learn_lock);
66122+ mutex_unlock(&gr_learn_user_mutex);
66123+ if (file->f_flags & O_NONBLOCK) {
66124+ retval = -EAGAIN;
66125+ goto out;
66126+ }
66127+ if (signal_pending(current)) {
66128+ retval = -ERESTARTSYS;
66129+ goto out;
66130+ }
66131+
66132+ schedule();
66133+ } while (1);
66134+
66135+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
66136+ learn_buffer_user_len = learn_buffer_len;
66137+ retval = learn_buffer_len;
66138+ learn_buffer_len = 0;
66139+
66140+ spin_unlock(&gr_learn_lock);
66141+
66142+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
66143+ retval = -EFAULT;
66144+
66145+ mutex_unlock(&gr_learn_user_mutex);
66146+out:
66147+ set_current_state(TASK_RUNNING);
66148+ remove_wait_queue(&learn_wait, &wait);
66149+ return retval;
66150+}
66151+
66152+static unsigned int
66153+poll_learn(struct file * file, poll_table * wait)
66154+{
66155+ poll_wait(file, &learn_wait, wait);
66156+
66157+ if (learn_buffer_len)
66158+ return (POLLIN | POLLRDNORM);
66159+
66160+ return 0;
66161+}
66162+
66163+void
66164+gr_clear_learn_entries(void)
66165+{
66166+ char *tmp;
66167+
66168+ mutex_lock(&gr_learn_user_mutex);
66169+ spin_lock(&gr_learn_lock);
66170+ tmp = learn_buffer;
66171+ learn_buffer = NULL;
66172+ spin_unlock(&gr_learn_lock);
66173+ if (tmp)
66174+ vfree(tmp);
66175+ if (learn_buffer_user != NULL) {
66176+ vfree(learn_buffer_user);
66177+ learn_buffer_user = NULL;
66178+ }
66179+ learn_buffer_len = 0;
66180+ mutex_unlock(&gr_learn_user_mutex);
66181+
66182+ return;
66183+}
66184+
66185+void
66186+gr_add_learn_entry(const char *fmt, ...)
66187+{
66188+ va_list args;
66189+ unsigned int len;
66190+
66191+ if (!gr_learn_attached)
66192+ return;
66193+
66194+ spin_lock(&gr_learn_lock);
66195+
66196+ /* leave a gap at the end so we know when it's "full" but don't have to
66197+ compute the exact length of the string we're trying to append
66198+ */
66199+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
66200+ spin_unlock(&gr_learn_lock);
66201+ wake_up_interruptible(&learn_wait);
66202+ return;
66203+ }
66204+ if (learn_buffer == NULL) {
66205+ spin_unlock(&gr_learn_lock);
66206+ return;
66207+ }
66208+
66209+ va_start(args, fmt);
66210+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
66211+ va_end(args);
66212+
66213+ learn_buffer_len += len + 1;
66214+
66215+ spin_unlock(&gr_learn_lock);
66216+ wake_up_interruptible(&learn_wait);
66217+
66218+ return;
66219+}
66220+
66221+static int
66222+open_learn(struct inode *inode, struct file *file)
66223+{
66224+ if (file->f_mode & FMODE_READ && gr_learn_attached)
66225+ return -EBUSY;
66226+ if (file->f_mode & FMODE_READ) {
66227+ int retval = 0;
66228+ mutex_lock(&gr_learn_user_mutex);
66229+ if (learn_buffer == NULL)
66230+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
66231+ if (learn_buffer_user == NULL)
66232+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
66233+ if (learn_buffer == NULL) {
66234+ retval = -ENOMEM;
66235+ goto out_error;
66236+ }
66237+ if (learn_buffer_user == NULL) {
66238+ retval = -ENOMEM;
66239+ goto out_error;
66240+ }
66241+ learn_buffer_len = 0;
66242+ learn_buffer_user_len = 0;
66243+ gr_learn_attached = 1;
66244+out_error:
66245+ mutex_unlock(&gr_learn_user_mutex);
66246+ return retval;
66247+ }
66248+ return 0;
66249+}
66250+
66251+static int
66252+close_learn(struct inode *inode, struct file *file)
66253+{
66254+ if (file->f_mode & FMODE_READ) {
66255+ char *tmp = NULL;
66256+ mutex_lock(&gr_learn_user_mutex);
66257+ spin_lock(&gr_learn_lock);
66258+ tmp = learn_buffer;
66259+ learn_buffer = NULL;
66260+ spin_unlock(&gr_learn_lock);
66261+ if (tmp)
66262+ vfree(tmp);
66263+ if (learn_buffer_user != NULL) {
66264+ vfree(learn_buffer_user);
66265+ learn_buffer_user = NULL;
66266+ }
66267+ learn_buffer_len = 0;
66268+ learn_buffer_user_len = 0;
66269+ gr_learn_attached = 0;
66270+ mutex_unlock(&gr_learn_user_mutex);
66271+ }
66272+
66273+ return 0;
66274+}
66275+
66276+const struct file_operations grsec_fops = {
66277+ .read = read_learn,
66278+ .write = write_grsec_handler,
66279+ .open = open_learn,
66280+ .release = close_learn,
66281+ .poll = poll_learn,
66282+};
66283diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
66284new file mode 100644
66285index 0000000..39645c9
66286--- /dev/null
66287+++ b/grsecurity/gracl_res.c
66288@@ -0,0 +1,68 @@
66289+#include <linux/kernel.h>
66290+#include <linux/sched.h>
66291+#include <linux/gracl.h>
66292+#include <linux/grinternal.h>
66293+
66294+static const char *restab_log[] = {
66295+ [RLIMIT_CPU] = "RLIMIT_CPU",
66296+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
66297+ [RLIMIT_DATA] = "RLIMIT_DATA",
66298+ [RLIMIT_STACK] = "RLIMIT_STACK",
66299+ [RLIMIT_CORE] = "RLIMIT_CORE",
66300+ [RLIMIT_RSS] = "RLIMIT_RSS",
66301+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
66302+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
66303+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
66304+ [RLIMIT_AS] = "RLIMIT_AS",
66305+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
66306+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
66307+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
66308+ [RLIMIT_NICE] = "RLIMIT_NICE",
66309+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
66310+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
66311+ [GR_CRASH_RES] = "RLIMIT_CRASH"
66312+};
66313+
66314+void
66315+gr_log_resource(const struct task_struct *task,
66316+ const int res, const unsigned long wanted, const int gt)
66317+{
66318+ const struct cred *cred;
66319+ unsigned long rlim;
66320+
66321+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
66322+ return;
66323+
66324+ // not yet supported resource
66325+ if (unlikely(!restab_log[res]))
66326+ return;
66327+
66328+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
66329+ rlim = task_rlimit_max(task, res);
66330+ else
66331+ rlim = task_rlimit(task, res);
66332+
66333+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
66334+ return;
66335+
66336+ rcu_read_lock();
66337+ cred = __task_cred(task);
66338+
66339+ if (res == RLIMIT_NPROC &&
66340+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
66341+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
66342+ goto out_rcu_unlock;
66343+ else if (res == RLIMIT_MEMLOCK &&
66344+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
66345+ goto out_rcu_unlock;
66346+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
66347+ goto out_rcu_unlock;
66348+ rcu_read_unlock();
66349+
66350+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
66351+
66352+ return;
66353+out_rcu_unlock:
66354+ rcu_read_unlock();
66355+ return;
66356+}
66357diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
66358new file mode 100644
66359index 0000000..3c38bfe
66360--- /dev/null
66361+++ b/grsecurity/gracl_segv.c
66362@@ -0,0 +1,305 @@
66363+#include <linux/kernel.h>
66364+#include <linux/mm.h>
66365+#include <asm/uaccess.h>
66366+#include <asm/errno.h>
66367+#include <asm/mman.h>
66368+#include <net/sock.h>
66369+#include <linux/file.h>
66370+#include <linux/fs.h>
66371+#include <linux/net.h>
66372+#include <linux/in.h>
66373+#include <linux/slab.h>
66374+#include <linux/types.h>
66375+#include <linux/sched.h>
66376+#include <linux/timer.h>
66377+#include <linux/gracl.h>
66378+#include <linux/grsecurity.h>
66379+#include <linux/grinternal.h>
66380+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
66381+#include <linux/magic.h>
66382+#include <linux/pagemap.h>
66383+#include "../fs/btrfs/async-thread.h"
66384+#include "../fs/btrfs/ctree.h"
66385+#include "../fs/btrfs/btrfs_inode.h"
66386+#endif
66387+
66388+static struct crash_uid *uid_set;
66389+static unsigned short uid_used;
66390+static DEFINE_SPINLOCK(gr_uid_lock);
66391+extern rwlock_t gr_inode_lock;
66392+extern struct acl_subject_label *
66393+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
66394+ struct acl_role_label *role);
66395+
66396+static inline dev_t __get_dev(const struct dentry *dentry)
66397+{
66398+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
66399+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
66400+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
66401+ else
66402+#endif
66403+ return dentry->d_sb->s_dev;
66404+}
66405+
66406+int
66407+gr_init_uidset(void)
66408+{
66409+ uid_set =
66410+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
66411+ uid_used = 0;
66412+
66413+ return uid_set ? 1 : 0;
66414+}
66415+
66416+void
66417+gr_free_uidset(void)
66418+{
66419+ if (uid_set)
66420+ kfree(uid_set);
66421+
66422+ return;
66423+}
66424+
66425+int
66426+gr_find_uid(const uid_t uid)
66427+{
66428+ struct crash_uid *tmp = uid_set;
66429+ uid_t buid;
66430+ int low = 0, high = uid_used - 1, mid;
66431+
66432+ while (high >= low) {
66433+ mid = (low + high) >> 1;
66434+ buid = tmp[mid].uid;
66435+ if (buid == uid)
66436+ return mid;
66437+ if (buid > uid)
66438+ high = mid - 1;
66439+ if (buid < uid)
66440+ low = mid + 1;
66441+ }
66442+
66443+ return -1;
66444+}
66445+
66446+static __inline__ void
66447+gr_insertsort(void)
66448+{
66449+ unsigned short i, j;
66450+ struct crash_uid index;
66451+
66452+ for (i = 1; i < uid_used; i++) {
66453+ index = uid_set[i];
66454+ j = i;
66455+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
66456+ uid_set[j] = uid_set[j - 1];
66457+ j--;
66458+ }
66459+ uid_set[j] = index;
66460+ }
66461+
66462+ return;
66463+}
66464+
66465+static __inline__ void
66466+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
66467+{
66468+ int loc;
66469+ uid_t uid = GR_GLOBAL_UID(kuid);
66470+
66471+ if (uid_used == GR_UIDTABLE_MAX)
66472+ return;
66473+
66474+ loc = gr_find_uid(uid);
66475+
66476+ if (loc >= 0) {
66477+ uid_set[loc].expires = expires;
66478+ return;
66479+ }
66480+
66481+ uid_set[uid_used].uid = uid;
66482+ uid_set[uid_used].expires = expires;
66483+ uid_used++;
66484+
66485+ gr_insertsort();
66486+
66487+ return;
66488+}
66489+
66490+void
66491+gr_remove_uid(const unsigned short loc)
66492+{
66493+ unsigned short i;
66494+
66495+ for (i = loc + 1; i < uid_used; i++)
66496+ uid_set[i - 1] = uid_set[i];
66497+
66498+ uid_used--;
66499+
66500+ return;
66501+}
66502+
66503+int
66504+gr_check_crash_uid(const kuid_t kuid)
66505+{
66506+ int loc;
66507+ int ret = 0;
66508+ uid_t uid;
66509+
66510+ if (unlikely(!gr_acl_is_enabled()))
66511+ return 0;
66512+
66513+ uid = GR_GLOBAL_UID(kuid);
66514+
66515+ spin_lock(&gr_uid_lock);
66516+ loc = gr_find_uid(uid);
66517+
66518+ if (loc < 0)
66519+ goto out_unlock;
66520+
66521+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
66522+ gr_remove_uid(loc);
66523+ else
66524+ ret = 1;
66525+
66526+out_unlock:
66527+ spin_unlock(&gr_uid_lock);
66528+ return ret;
66529+}
66530+
66531+static __inline__ int
66532+proc_is_setxid(const struct cred *cred)
66533+{
66534+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
66535+ !uid_eq(cred->uid, cred->fsuid))
66536+ return 1;
66537+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
66538+ !gid_eq(cred->gid, cred->fsgid))
66539+ return 1;
66540+
66541+ return 0;
66542+}
66543+
66544+extern int gr_fake_force_sig(int sig, struct task_struct *t);
66545+
66546+void
66547+gr_handle_crash(struct task_struct *task, const int sig)
66548+{
66549+ struct acl_subject_label *curr;
66550+ struct task_struct *tsk, *tsk2;
66551+ const struct cred *cred;
66552+ const struct cred *cred2;
66553+
66554+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
66555+ return;
66556+
66557+ if (unlikely(!gr_acl_is_enabled()))
66558+ return;
66559+
66560+ curr = task->acl;
66561+
66562+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
66563+ return;
66564+
66565+ if (time_before_eq(curr->expires, get_seconds())) {
66566+ curr->expires = 0;
66567+ curr->crashes = 0;
66568+ }
66569+
66570+ curr->crashes++;
66571+
66572+ if (!curr->expires)
66573+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
66574+
66575+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
66576+ time_after(curr->expires, get_seconds())) {
66577+ rcu_read_lock();
66578+ cred = __task_cred(task);
66579+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
66580+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
66581+ spin_lock(&gr_uid_lock);
66582+ gr_insert_uid(cred->uid, curr->expires);
66583+ spin_unlock(&gr_uid_lock);
66584+ curr->expires = 0;
66585+ curr->crashes = 0;
66586+ read_lock(&tasklist_lock);
66587+ do_each_thread(tsk2, tsk) {
66588+ cred2 = __task_cred(tsk);
66589+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
66590+ gr_fake_force_sig(SIGKILL, tsk);
66591+ } while_each_thread(tsk2, tsk);
66592+ read_unlock(&tasklist_lock);
66593+ } else {
66594+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
66595+ read_lock(&tasklist_lock);
66596+ read_lock(&grsec_exec_file_lock);
66597+ do_each_thread(tsk2, tsk) {
66598+ if (likely(tsk != task)) {
66599+ // if this thread has the same subject as the one that triggered
66600+ // RES_CRASH and it's the same binary, kill it
66601+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
66602+ gr_fake_force_sig(SIGKILL, tsk);
66603+ }
66604+ } while_each_thread(tsk2, tsk);
66605+ read_unlock(&grsec_exec_file_lock);
66606+ read_unlock(&tasklist_lock);
66607+ }
66608+ rcu_read_unlock();
66609+ }
66610+
66611+ return;
66612+}
66613+
66614+int
66615+gr_check_crash_exec(const struct file *filp)
66616+{
66617+ struct acl_subject_label *curr;
66618+
66619+ if (unlikely(!gr_acl_is_enabled()))
66620+ return 0;
66621+
66622+ read_lock(&gr_inode_lock);
66623+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
66624+ __get_dev(filp->f_path.dentry),
66625+ current->role);
66626+ read_unlock(&gr_inode_lock);
66627+
66628+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
66629+ (!curr->crashes && !curr->expires))
66630+ return 0;
66631+
66632+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
66633+ time_after(curr->expires, get_seconds()))
66634+ return 1;
66635+ else if (time_before_eq(curr->expires, get_seconds())) {
66636+ curr->crashes = 0;
66637+ curr->expires = 0;
66638+ }
66639+
66640+ return 0;
66641+}
66642+
66643+void
66644+gr_handle_alertkill(struct task_struct *task)
66645+{
66646+ struct acl_subject_label *curracl;
66647+ __u32 curr_ip;
66648+ struct task_struct *p, *p2;
66649+
66650+ if (unlikely(!gr_acl_is_enabled()))
66651+ return;
66652+
66653+ curracl = task->acl;
66654+ curr_ip = task->signal->curr_ip;
66655+
66656+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
66657+ read_lock(&tasklist_lock);
66658+ do_each_thread(p2, p) {
66659+ if (p->signal->curr_ip == curr_ip)
66660+ gr_fake_force_sig(SIGKILL, p);
66661+ } while_each_thread(p2, p);
66662+ read_unlock(&tasklist_lock);
66663+ } else if (curracl->mode & GR_KILLPROC)
66664+ gr_fake_force_sig(SIGKILL, task);
66665+
66666+ return;
66667+}
66668diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
66669new file mode 100644
66670index 0000000..98011b0
66671--- /dev/null
66672+++ b/grsecurity/gracl_shm.c
66673@@ -0,0 +1,40 @@
66674+#include <linux/kernel.h>
66675+#include <linux/mm.h>
66676+#include <linux/sched.h>
66677+#include <linux/file.h>
66678+#include <linux/ipc.h>
66679+#include <linux/gracl.h>
66680+#include <linux/grsecurity.h>
66681+#include <linux/grinternal.h>
66682+
66683+int
66684+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
66685+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
66686+{
66687+ struct task_struct *task;
66688+
66689+ if (!gr_acl_is_enabled())
66690+ return 1;
66691+
66692+ rcu_read_lock();
66693+ read_lock(&tasklist_lock);
66694+
66695+ task = find_task_by_vpid(shm_cprid);
66696+
66697+ if (unlikely(!task))
66698+ task = find_task_by_vpid(shm_lapid);
66699+
66700+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
66701+ (task_pid_nr(task) == shm_lapid)) &&
66702+ (task->acl->mode & GR_PROTSHM) &&
66703+ (task->acl != current->acl))) {
66704+ read_unlock(&tasklist_lock);
66705+ rcu_read_unlock();
66706+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
66707+ return 0;
66708+ }
66709+ read_unlock(&tasklist_lock);
66710+ rcu_read_unlock();
66711+
66712+ return 1;
66713+}
66714diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
66715new file mode 100644
66716index 0000000..bc0be01
66717--- /dev/null
66718+++ b/grsecurity/grsec_chdir.c
66719@@ -0,0 +1,19 @@
66720+#include <linux/kernel.h>
66721+#include <linux/sched.h>
66722+#include <linux/fs.h>
66723+#include <linux/file.h>
66724+#include <linux/grsecurity.h>
66725+#include <linux/grinternal.h>
66726+
66727+void
66728+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
66729+{
66730+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
66731+ if ((grsec_enable_chdir && grsec_enable_group &&
66732+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
66733+ !grsec_enable_group)) {
66734+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
66735+ }
66736+#endif
66737+ return;
66738+}
66739diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
66740new file mode 100644
66741index 0000000..bd6e105
66742--- /dev/null
66743+++ b/grsecurity/grsec_chroot.c
66744@@ -0,0 +1,370 @@
66745+#include <linux/kernel.h>
66746+#include <linux/module.h>
66747+#include <linux/sched.h>
66748+#include <linux/file.h>
66749+#include <linux/fs.h>
66750+#include <linux/mount.h>
66751+#include <linux/types.h>
66752+#include "../fs/mount.h"
66753+#include <linux/grsecurity.h>
66754+#include <linux/grinternal.h>
66755+
66756+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
66757+static int gr_init_ran;
66758+#endif
66759+
66760+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
66761+{
66762+#ifdef CONFIG_GRKERNSEC
66763+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
66764+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
66765+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
66766+ && gr_init_ran
66767+#endif
66768+ )
66769+ task->gr_is_chrooted = 1;
66770+ else {
66771+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
66772+ if (task_pid_nr(task) == 1 && !gr_init_ran)
66773+ gr_init_ran = 1;
66774+#endif
66775+ task->gr_is_chrooted = 0;
66776+ }
66777+
66778+ task->gr_chroot_dentry = path->dentry;
66779+#endif
66780+ return;
66781+}
66782+
66783+void gr_clear_chroot_entries(struct task_struct *task)
66784+{
66785+#ifdef CONFIG_GRKERNSEC
66786+ task->gr_is_chrooted = 0;
66787+ task->gr_chroot_dentry = NULL;
66788+#endif
66789+ return;
66790+}
66791+
66792+int
66793+gr_handle_chroot_unix(const pid_t pid)
66794+{
66795+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
66796+ struct task_struct *p;
66797+
66798+ if (unlikely(!grsec_enable_chroot_unix))
66799+ return 1;
66800+
66801+ if (likely(!proc_is_chrooted(current)))
66802+ return 1;
66803+
66804+ rcu_read_lock();
66805+ read_lock(&tasklist_lock);
66806+ p = find_task_by_vpid_unrestricted(pid);
66807+ if (unlikely(p && !have_same_root(current, p))) {
66808+ read_unlock(&tasklist_lock);
66809+ rcu_read_unlock();
66810+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
66811+ return 0;
66812+ }
66813+ read_unlock(&tasklist_lock);
66814+ rcu_read_unlock();
66815+#endif
66816+ return 1;
66817+}
66818+
66819+int
66820+gr_handle_chroot_nice(void)
66821+{
66822+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
66823+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
66824+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
66825+ return -EPERM;
66826+ }
66827+#endif
66828+ return 0;
66829+}
66830+
66831+int
66832+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
66833+{
66834+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
66835+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
66836+ && proc_is_chrooted(current)) {
66837+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
66838+ return -EACCES;
66839+ }
66840+#endif
66841+ return 0;
66842+}
66843+
66844+int
66845+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
66846+{
66847+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
66848+ struct task_struct *p;
66849+ int ret = 0;
66850+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
66851+ return ret;
66852+
66853+ read_lock(&tasklist_lock);
66854+ do_each_pid_task(pid, type, p) {
66855+ if (!have_same_root(current, p)) {
66856+ ret = 1;
66857+ goto out;
66858+ }
66859+ } while_each_pid_task(pid, type, p);
66860+out:
66861+ read_unlock(&tasklist_lock);
66862+ return ret;
66863+#endif
66864+ return 0;
66865+}
66866+
66867+int
66868+gr_pid_is_chrooted(struct task_struct *p)
66869+{
66870+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
66871+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
66872+ return 0;
66873+
66874+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
66875+ !have_same_root(current, p)) {
66876+ return 1;
66877+ }
66878+#endif
66879+ return 0;
66880+}
66881+
66882+EXPORT_SYMBOL(gr_pid_is_chrooted);
66883+
66884+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
66885+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
66886+{
66887+ struct path path, currentroot;
66888+ int ret = 0;
66889+
66890+ path.dentry = (struct dentry *)u_dentry;
66891+ path.mnt = (struct vfsmount *)u_mnt;
66892+ get_fs_root(current->fs, &currentroot);
66893+ if (path_is_under(&path, &currentroot))
66894+ ret = 1;
66895+ path_put(&currentroot);
66896+
66897+ return ret;
66898+}
66899+#endif
66900+
66901+int
66902+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
66903+{
66904+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
66905+ if (!grsec_enable_chroot_fchdir)
66906+ return 1;
66907+
66908+ if (!proc_is_chrooted(current))
66909+ return 1;
66910+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
66911+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
66912+ return 0;
66913+ }
66914+#endif
66915+ return 1;
66916+}
66917+
66918+int
66919+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
66920+ const time_t shm_createtime)
66921+{
66922+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
66923+ struct task_struct *p;
66924+ time_t starttime;
66925+
66926+ if (unlikely(!grsec_enable_chroot_shmat))
66927+ return 1;
66928+
66929+ if (likely(!proc_is_chrooted(current)))
66930+ return 1;
66931+
66932+ rcu_read_lock();
66933+ read_lock(&tasklist_lock);
66934+
66935+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
66936+ starttime = p->start_time.tv_sec;
66937+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
66938+ if (have_same_root(current, p)) {
66939+ goto allow;
66940+ } else {
66941+ read_unlock(&tasklist_lock);
66942+ rcu_read_unlock();
66943+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
66944+ return 0;
66945+ }
66946+ }
66947+ /* creator exited, pid reuse, fall through to next check */
66948+ }
66949+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
66950+ if (unlikely(!have_same_root(current, p))) {
66951+ read_unlock(&tasklist_lock);
66952+ rcu_read_unlock();
66953+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
66954+ return 0;
66955+ }
66956+ }
66957+
66958+allow:
66959+ read_unlock(&tasklist_lock);
66960+ rcu_read_unlock();
66961+#endif
66962+ return 1;
66963+}
66964+
66965+void
66966+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
66967+{
66968+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
66969+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
66970+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
66971+#endif
66972+ return;
66973+}
66974+
66975+int
66976+gr_handle_chroot_mknod(const struct dentry *dentry,
66977+ const struct vfsmount *mnt, const int mode)
66978+{
66979+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
66980+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
66981+ proc_is_chrooted(current)) {
66982+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
66983+ return -EPERM;
66984+ }
66985+#endif
66986+ return 0;
66987+}
66988+
66989+int
66990+gr_handle_chroot_mount(const struct dentry *dentry,
66991+ const struct vfsmount *mnt, const char *dev_name)
66992+{
66993+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
66994+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
66995+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
66996+ return -EPERM;
66997+ }
66998+#endif
66999+ return 0;
67000+}
67001+
67002+int
67003+gr_handle_chroot_pivot(void)
67004+{
67005+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
67006+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
67007+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
67008+ return -EPERM;
67009+ }
67010+#endif
67011+ return 0;
67012+}
67013+
67014+int
67015+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
67016+{
67017+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
67018+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
67019+ !gr_is_outside_chroot(dentry, mnt)) {
67020+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
67021+ return -EPERM;
67022+ }
67023+#endif
67024+ return 0;
67025+}
67026+
67027+extern const char *captab_log[];
67028+extern int captab_log_entries;
67029+
67030+int
67031+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
67032+{
67033+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
67034+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
67035+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
67036+ if (cap_raised(chroot_caps, cap)) {
67037+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
67038+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
67039+ }
67040+ return 0;
67041+ }
67042+ }
67043+#endif
67044+ return 1;
67045+}
67046+
67047+int
67048+gr_chroot_is_capable(const int cap)
67049+{
67050+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
67051+ return gr_task_chroot_is_capable(current, current_cred(), cap);
67052+#endif
67053+ return 1;
67054+}
67055+
67056+int
67057+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
67058+{
67059+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
67060+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
67061+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
67062+ if (cap_raised(chroot_caps, cap)) {
67063+ return 0;
67064+ }
67065+ }
67066+#endif
67067+ return 1;
67068+}
67069+
67070+int
67071+gr_chroot_is_capable_nolog(const int cap)
67072+{
67073+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
67074+ return gr_task_chroot_is_capable_nolog(current, cap);
67075+#endif
67076+ return 1;
67077+}
67078+
67079+int
67080+gr_handle_chroot_sysctl(const int op)
67081+{
67082+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
67083+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
67084+ proc_is_chrooted(current))
67085+ return -EACCES;
67086+#endif
67087+ return 0;
67088+}
67089+
67090+void
67091+gr_handle_chroot_chdir(const struct path *path)
67092+{
67093+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
67094+ if (grsec_enable_chroot_chdir)
67095+ set_fs_pwd(current->fs, path);
67096+#endif
67097+ return;
67098+}
67099+
67100+int
67101+gr_handle_chroot_chmod(const struct dentry *dentry,
67102+ const struct vfsmount *mnt, const int mode)
67103+{
67104+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
67105+ /* allow chmod +s on directories, but not files */
67106+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
67107+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
67108+ proc_is_chrooted(current)) {
67109+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
67110+ return -EPERM;
67111+ }
67112+#endif
67113+ return 0;
67114+}
67115diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
67116new file mode 100644
67117index 0000000..ce65ceb
67118--- /dev/null
67119+++ b/grsecurity/grsec_disabled.c
67120@@ -0,0 +1,434 @@
67121+#include <linux/kernel.h>
67122+#include <linux/module.h>
67123+#include <linux/sched.h>
67124+#include <linux/file.h>
67125+#include <linux/fs.h>
67126+#include <linux/kdev_t.h>
67127+#include <linux/net.h>
67128+#include <linux/in.h>
67129+#include <linux/ip.h>
67130+#include <linux/skbuff.h>
67131+#include <linux/sysctl.h>
67132+
67133+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
67134+void
67135+pax_set_initial_flags(struct linux_binprm *bprm)
67136+{
67137+ return;
67138+}
67139+#endif
67140+
67141+#ifdef CONFIG_SYSCTL
67142+__u32
67143+gr_handle_sysctl(const struct ctl_table * table, const int op)
67144+{
67145+ return 0;
67146+}
67147+#endif
67148+
67149+#ifdef CONFIG_TASKSTATS
67150+int gr_is_taskstats_denied(int pid)
67151+{
67152+ return 0;
67153+}
67154+#endif
67155+
67156+int
67157+gr_acl_is_enabled(void)
67158+{
67159+ return 0;
67160+}
67161+
67162+void
67163+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
67164+{
67165+ return;
67166+}
67167+
67168+int
67169+gr_handle_rawio(const struct inode *inode)
67170+{
67171+ return 0;
67172+}
67173+
67174+void
67175+gr_acl_handle_psacct(struct task_struct *task, const long code)
67176+{
67177+ return;
67178+}
67179+
67180+int
67181+gr_handle_ptrace(struct task_struct *task, const long request)
67182+{
67183+ return 0;
67184+}
67185+
67186+int
67187+gr_handle_proc_ptrace(struct task_struct *task)
67188+{
67189+ return 0;
67190+}
67191+
67192+int
67193+gr_set_acls(const int type)
67194+{
67195+ return 0;
67196+}
67197+
67198+int
67199+gr_check_hidden_task(const struct task_struct *tsk)
67200+{
67201+ return 0;
67202+}
67203+
67204+int
67205+gr_check_protected_task(const struct task_struct *task)
67206+{
67207+ return 0;
67208+}
67209+
67210+int
67211+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
67212+{
67213+ return 0;
67214+}
67215+
67216+void
67217+gr_copy_label(struct task_struct *tsk)
67218+{
67219+ return;
67220+}
67221+
67222+void
67223+gr_set_pax_flags(struct task_struct *task)
67224+{
67225+ return;
67226+}
67227+
67228+int
67229+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
67230+ const int unsafe_share)
67231+{
67232+ return 0;
67233+}
67234+
67235+void
67236+gr_handle_delete(const ino_t ino, const dev_t dev)
67237+{
67238+ return;
67239+}
67240+
67241+void
67242+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
67243+{
67244+ return;
67245+}
67246+
67247+void
67248+gr_handle_crash(struct task_struct *task, const int sig)
67249+{
67250+ return;
67251+}
67252+
67253+int
67254+gr_check_crash_exec(const struct file *filp)
67255+{
67256+ return 0;
67257+}
67258+
67259+int
67260+gr_check_crash_uid(const kuid_t uid)
67261+{
67262+ return 0;
67263+}
67264+
67265+void
67266+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
67267+ struct dentry *old_dentry,
67268+ struct dentry *new_dentry,
67269+ struct vfsmount *mnt, const __u8 replace)
67270+{
67271+ return;
67272+}
67273+
67274+int
67275+gr_search_socket(const int family, const int type, const int protocol)
67276+{
67277+ return 1;
67278+}
67279+
67280+int
67281+gr_search_connectbind(const int mode, const struct socket *sock,
67282+ const struct sockaddr_in *addr)
67283+{
67284+ return 0;
67285+}
67286+
67287+void
67288+gr_handle_alertkill(struct task_struct *task)
67289+{
67290+ return;
67291+}
67292+
67293+__u32
67294+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
67295+{
67296+ return 1;
67297+}
67298+
67299+__u32
67300+gr_acl_handle_hidden_file(const struct dentry * dentry,
67301+ const struct vfsmount * mnt)
67302+{
67303+ return 1;
67304+}
67305+
67306+__u32
67307+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
67308+ int acc_mode)
67309+{
67310+ return 1;
67311+}
67312+
67313+__u32
67314+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
67315+{
67316+ return 1;
67317+}
67318+
67319+__u32
67320+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
67321+{
67322+ return 1;
67323+}
67324+
67325+int
67326+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
67327+ unsigned int *vm_flags)
67328+{
67329+ return 1;
67330+}
67331+
67332+__u32
67333+gr_acl_handle_truncate(const struct dentry * dentry,
67334+ const struct vfsmount * mnt)
67335+{
67336+ return 1;
67337+}
67338+
67339+__u32
67340+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
67341+{
67342+ return 1;
67343+}
67344+
67345+__u32
67346+gr_acl_handle_access(const struct dentry * dentry,
67347+ const struct vfsmount * mnt, const int fmode)
67348+{
67349+ return 1;
67350+}
67351+
67352+__u32
67353+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
67354+ umode_t *mode)
67355+{
67356+ return 1;
67357+}
67358+
67359+__u32
67360+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
67361+{
67362+ return 1;
67363+}
67364+
67365+__u32
67366+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
67367+{
67368+ return 1;
67369+}
67370+
67371+void
67372+grsecurity_init(void)
67373+{
67374+ return;
67375+}
67376+
67377+umode_t gr_acl_umask(void)
67378+{
67379+ return 0;
67380+}
67381+
67382+__u32
67383+gr_acl_handle_mknod(const struct dentry * new_dentry,
67384+ const struct dentry * parent_dentry,
67385+ const struct vfsmount * parent_mnt,
67386+ const int mode)
67387+{
67388+ return 1;
67389+}
67390+
67391+__u32
67392+gr_acl_handle_mkdir(const struct dentry * new_dentry,
67393+ const struct dentry * parent_dentry,
67394+ const struct vfsmount * parent_mnt)
67395+{
67396+ return 1;
67397+}
67398+
67399+__u32
67400+gr_acl_handle_symlink(const struct dentry * new_dentry,
67401+ const struct dentry * parent_dentry,
67402+ const struct vfsmount * parent_mnt, const struct filename *from)
67403+{
67404+ return 1;
67405+}
67406+
67407+__u32
67408+gr_acl_handle_link(const struct dentry * new_dentry,
67409+ const struct dentry * parent_dentry,
67410+ const struct vfsmount * parent_mnt,
67411+ const struct dentry * old_dentry,
67412+ const struct vfsmount * old_mnt, const struct filename *to)
67413+{
67414+ return 1;
67415+}
67416+
67417+int
67418+gr_acl_handle_rename(const struct dentry *new_dentry,
67419+ const struct dentry *parent_dentry,
67420+ const struct vfsmount *parent_mnt,
67421+ const struct dentry *old_dentry,
67422+ const struct inode *old_parent_inode,
67423+ const struct vfsmount *old_mnt, const struct filename *newname)
67424+{
67425+ return 0;
67426+}
67427+
67428+int
67429+gr_acl_handle_filldir(const struct file *file, const char *name,
67430+ const int namelen, const ino_t ino)
67431+{
67432+ return 1;
67433+}
67434+
67435+int
67436+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
67437+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
67438+{
67439+ return 1;
67440+}
67441+
67442+int
67443+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
67444+{
67445+ return 0;
67446+}
67447+
67448+int
67449+gr_search_accept(const struct socket *sock)
67450+{
67451+ return 0;
67452+}
67453+
67454+int
67455+gr_search_listen(const struct socket *sock)
67456+{
67457+ return 0;
67458+}
67459+
67460+int
67461+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
67462+{
67463+ return 0;
67464+}
67465+
67466+__u32
67467+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
67468+{
67469+ return 1;
67470+}
67471+
67472+__u32
67473+gr_acl_handle_creat(const struct dentry * dentry,
67474+ const struct dentry * p_dentry,
67475+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
67476+ const int imode)
67477+{
67478+ return 1;
67479+}
67480+
67481+void
67482+gr_acl_handle_exit(void)
67483+{
67484+ return;
67485+}
67486+
67487+int
67488+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
67489+{
67490+ return 1;
67491+}
67492+
67493+void
67494+gr_set_role_label(const kuid_t uid, const kgid_t gid)
67495+{
67496+ return;
67497+}
67498+
67499+int
67500+gr_acl_handle_procpidmem(const struct task_struct *task)
67501+{
67502+ return 0;
67503+}
67504+
67505+int
67506+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
67507+{
67508+ return 0;
67509+}
67510+
67511+int
67512+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
67513+{
67514+ return 0;
67515+}
67516+
67517+void
67518+gr_set_kernel_label(struct task_struct *task)
67519+{
67520+ return;
67521+}
67522+
67523+int
67524+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
67525+{
67526+ return 0;
67527+}
67528+
67529+int
67530+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
67531+{
67532+ return 0;
67533+}
67534+
67535+int gr_acl_enable_at_secure(void)
67536+{
67537+ return 0;
67538+}
67539+
67540+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
67541+{
67542+ return dentry->d_sb->s_dev;
67543+}
67544+
67545+void gr_put_exec_file(struct task_struct *task)
67546+{
67547+ return;
67548+}
67549+
67550+EXPORT_SYMBOL(gr_set_kernel_label);
67551+#ifdef CONFIG_SECURITY
67552+EXPORT_SYMBOL(gr_check_user_change);
67553+EXPORT_SYMBOL(gr_check_group_change);
67554+#endif
67555diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
67556new file mode 100644
67557index 0000000..387032b
67558--- /dev/null
67559+++ b/grsecurity/grsec_exec.c
67560@@ -0,0 +1,187 @@
67561+#include <linux/kernel.h>
67562+#include <linux/sched.h>
67563+#include <linux/file.h>
67564+#include <linux/binfmts.h>
67565+#include <linux/fs.h>
67566+#include <linux/types.h>
67567+#include <linux/grdefs.h>
67568+#include <linux/grsecurity.h>
67569+#include <linux/grinternal.h>
67570+#include <linux/capability.h>
67571+#include <linux/module.h>
67572+#include <linux/compat.h>
67573+
67574+#include <asm/uaccess.h>
67575+
67576+#ifdef CONFIG_GRKERNSEC_EXECLOG
67577+static char gr_exec_arg_buf[132];
67578+static DEFINE_MUTEX(gr_exec_arg_mutex);
67579+#endif
67580+
67581+struct user_arg_ptr {
67582+#ifdef CONFIG_COMPAT
67583+ bool is_compat;
67584+#endif
67585+ union {
67586+ const char __user *const __user *native;
67587+#ifdef CONFIG_COMPAT
67588+ const compat_uptr_t __user *compat;
67589+#endif
67590+ } ptr;
67591+};
67592+
67593+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
67594+
67595+void
67596+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
67597+{
67598+#ifdef CONFIG_GRKERNSEC_EXECLOG
67599+ char *grarg = gr_exec_arg_buf;
67600+ unsigned int i, x, execlen = 0;
67601+ char c;
67602+
67603+ if (!((grsec_enable_execlog && grsec_enable_group &&
67604+ in_group_p(grsec_audit_gid))
67605+ || (grsec_enable_execlog && !grsec_enable_group)))
67606+ return;
67607+
67608+ mutex_lock(&gr_exec_arg_mutex);
67609+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
67610+
67611+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
67612+ const char __user *p;
67613+ unsigned int len;
67614+
67615+ p = get_user_arg_ptr(argv, i);
67616+ if (IS_ERR(p))
67617+ goto log;
67618+
67619+ len = strnlen_user(p, 128 - execlen);
67620+ if (len > 128 - execlen)
67621+ len = 128 - execlen;
67622+ else if (len > 0)
67623+ len--;
67624+ if (copy_from_user(grarg + execlen, p, len))
67625+ goto log;
67626+
67627+ /* rewrite unprintable characters */
67628+ for (x = 0; x < len; x++) {
67629+ c = *(grarg + execlen + x);
67630+ if (c < 32 || c > 126)
67631+ *(grarg + execlen + x) = ' ';
67632+ }
67633+
67634+ execlen += len;
67635+ *(grarg + execlen) = ' ';
67636+ *(grarg + execlen + 1) = '\0';
67637+ execlen++;
67638+ }
67639+
67640+ log:
67641+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
67642+ bprm->file->f_path.mnt, grarg);
67643+ mutex_unlock(&gr_exec_arg_mutex);
67644+#endif
67645+ return;
67646+}
67647+
67648+#ifdef CONFIG_GRKERNSEC
67649+extern int gr_acl_is_capable(const int cap);
67650+extern int gr_acl_is_capable_nolog(const int cap);
67651+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
67652+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
67653+extern int gr_chroot_is_capable(const int cap);
67654+extern int gr_chroot_is_capable_nolog(const int cap);
67655+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
67656+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
67657+#endif
67658+
67659+const char *captab_log[] = {
67660+ "CAP_CHOWN",
67661+ "CAP_DAC_OVERRIDE",
67662+ "CAP_DAC_READ_SEARCH",
67663+ "CAP_FOWNER",
67664+ "CAP_FSETID",
67665+ "CAP_KILL",
67666+ "CAP_SETGID",
67667+ "CAP_SETUID",
67668+ "CAP_SETPCAP",
67669+ "CAP_LINUX_IMMUTABLE",
67670+ "CAP_NET_BIND_SERVICE",
67671+ "CAP_NET_BROADCAST",
67672+ "CAP_NET_ADMIN",
67673+ "CAP_NET_RAW",
67674+ "CAP_IPC_LOCK",
67675+ "CAP_IPC_OWNER",
67676+ "CAP_SYS_MODULE",
67677+ "CAP_SYS_RAWIO",
67678+ "CAP_SYS_CHROOT",
67679+ "CAP_SYS_PTRACE",
67680+ "CAP_SYS_PACCT",
67681+ "CAP_SYS_ADMIN",
67682+ "CAP_SYS_BOOT",
67683+ "CAP_SYS_NICE",
67684+ "CAP_SYS_RESOURCE",
67685+ "CAP_SYS_TIME",
67686+ "CAP_SYS_TTY_CONFIG",
67687+ "CAP_MKNOD",
67688+ "CAP_LEASE",
67689+ "CAP_AUDIT_WRITE",
67690+ "CAP_AUDIT_CONTROL",
67691+ "CAP_SETFCAP",
67692+ "CAP_MAC_OVERRIDE",
67693+ "CAP_MAC_ADMIN",
67694+ "CAP_SYSLOG",
67695+ "CAP_WAKE_ALARM"
67696+};
67697+
67698+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
67699+
67700+int gr_is_capable(const int cap)
67701+{
67702+#ifdef CONFIG_GRKERNSEC
67703+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
67704+ return 1;
67705+ return 0;
67706+#else
67707+ return 1;
67708+#endif
67709+}
67710+
67711+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
67712+{
67713+#ifdef CONFIG_GRKERNSEC
67714+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
67715+ return 1;
67716+ return 0;
67717+#else
67718+ return 1;
67719+#endif
67720+}
67721+
67722+int gr_is_capable_nolog(const int cap)
67723+{
67724+#ifdef CONFIG_GRKERNSEC
67725+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
67726+ return 1;
67727+ return 0;
67728+#else
67729+ return 1;
67730+#endif
67731+}
67732+
67733+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
67734+{
67735+#ifdef CONFIG_GRKERNSEC
67736+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
67737+ return 1;
67738+ return 0;
67739+#else
67740+ return 1;
67741+#endif
67742+}
67743+
67744+EXPORT_SYMBOL(gr_is_capable);
67745+EXPORT_SYMBOL(gr_is_capable_nolog);
67746+EXPORT_SYMBOL(gr_task_is_capable);
67747+EXPORT_SYMBOL(gr_task_is_capable_nolog);
67748diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
67749new file mode 100644
67750index 0000000..06cc6ea
67751--- /dev/null
67752+++ b/grsecurity/grsec_fifo.c
67753@@ -0,0 +1,24 @@
67754+#include <linux/kernel.h>
67755+#include <linux/sched.h>
67756+#include <linux/fs.h>
67757+#include <linux/file.h>
67758+#include <linux/grinternal.h>
67759+
67760+int
67761+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
67762+ const struct dentry *dir, const int flag, const int acc_mode)
67763+{
67764+#ifdef CONFIG_GRKERNSEC_FIFO
67765+ const struct cred *cred = current_cred();
67766+
67767+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
67768+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
67769+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
67770+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
67771+ if (!inode_permission(dentry->d_inode, acc_mode))
67772+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(dentry->d_inode->i_uid), GR_GLOBAL_GID(dentry->d_inode->i_gid));
67773+ return -EACCES;
67774+ }
67775+#endif
67776+ return 0;
67777+}
67778diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
67779new file mode 100644
67780index 0000000..8ca18bf
67781--- /dev/null
67782+++ b/grsecurity/grsec_fork.c
67783@@ -0,0 +1,23 @@
67784+#include <linux/kernel.h>
67785+#include <linux/sched.h>
67786+#include <linux/grsecurity.h>
67787+#include <linux/grinternal.h>
67788+#include <linux/errno.h>
67789+
67790+void
67791+gr_log_forkfail(const int retval)
67792+{
67793+#ifdef CONFIG_GRKERNSEC_FORKFAIL
67794+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
67795+ switch (retval) {
67796+ case -EAGAIN:
67797+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
67798+ break;
67799+ case -ENOMEM:
67800+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
67801+ break;
67802+ }
67803+ }
67804+#endif
67805+ return;
67806+}
67807diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
67808new file mode 100644
67809index 0000000..ab2d875
67810--- /dev/null
67811+++ b/grsecurity/grsec_init.c
67812@@ -0,0 +1,279 @@
67813+#include <linux/kernel.h>
67814+#include <linux/sched.h>
67815+#include <linux/mm.h>
67816+#include <linux/gracl.h>
67817+#include <linux/slab.h>
67818+#include <linux/vmalloc.h>
67819+#include <linux/percpu.h>
67820+#include <linux/module.h>
67821+
67822+int grsec_enable_ptrace_readexec;
67823+int grsec_enable_setxid;
67824+int grsec_enable_symlinkown;
67825+kgid_t grsec_symlinkown_gid;
67826+int grsec_enable_brute;
67827+int grsec_enable_link;
67828+int grsec_enable_dmesg;
67829+int grsec_enable_harden_ptrace;
67830+int grsec_enable_fifo;
67831+int grsec_enable_execlog;
67832+int grsec_enable_signal;
67833+int grsec_enable_forkfail;
67834+int grsec_enable_audit_ptrace;
67835+int grsec_enable_time;
67836+int grsec_enable_group;
67837+kgid_t grsec_audit_gid;
67838+int grsec_enable_chdir;
67839+int grsec_enable_mount;
67840+int grsec_enable_rofs;
67841+int grsec_enable_chroot_findtask;
67842+int grsec_enable_chroot_mount;
67843+int grsec_enable_chroot_shmat;
67844+int grsec_enable_chroot_fchdir;
67845+int grsec_enable_chroot_double;
67846+int grsec_enable_chroot_pivot;
67847+int grsec_enable_chroot_chdir;
67848+int grsec_enable_chroot_chmod;
67849+int grsec_enable_chroot_mknod;
67850+int grsec_enable_chroot_nice;
67851+int grsec_enable_chroot_execlog;
67852+int grsec_enable_chroot_caps;
67853+int grsec_enable_chroot_sysctl;
67854+int grsec_enable_chroot_unix;
67855+int grsec_enable_tpe;
67856+kgid_t grsec_tpe_gid;
67857+int grsec_enable_blackhole;
67858+#ifdef CONFIG_IPV6_MODULE
67859+EXPORT_SYMBOL(grsec_enable_blackhole);
67860+#endif
67861+int grsec_lastack_retries;
67862+int grsec_enable_tpe_all;
67863+int grsec_enable_tpe_invert;
67864+int grsec_enable_socket_all;
67865+kgid_t grsec_socket_all_gid;
67866+int grsec_enable_socket_client;
67867+kgid_t grsec_socket_client_gid;
67868+int grsec_enable_socket_server;
67869+kgid_t grsec_socket_server_gid;
67870+int grsec_resource_logging;
67871+int grsec_disable_privio;
67872+int grsec_enable_log_rwxmaps;
67873+int grsec_lock;
67874+
67875+DEFINE_SPINLOCK(grsec_alert_lock);
67876+unsigned long grsec_alert_wtime = 0;
67877+unsigned long grsec_alert_fyet = 0;
67878+
67879+DEFINE_SPINLOCK(grsec_audit_lock);
67880+
67881+DEFINE_RWLOCK(grsec_exec_file_lock);
67882+
67883+char *gr_shared_page[4];
67884+
67885+char *gr_alert_log_fmt;
67886+char *gr_audit_log_fmt;
67887+char *gr_alert_log_buf;
67888+char *gr_audit_log_buf;
67889+
67890+extern struct gr_arg *gr_usermode;
67891+extern unsigned char *gr_system_salt;
67892+extern unsigned char *gr_system_sum;
67893+
67894+void __init
67895+grsecurity_init(void)
67896+{
67897+ int j;
67898+ /* create the per-cpu shared pages */
67899+
67900+#ifdef CONFIG_X86
67901+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
67902+#endif
67903+
67904+ for (j = 0; j < 4; j++) {
67905+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
67906+ if (gr_shared_page[j] == NULL) {
67907+ panic("Unable to allocate grsecurity shared page");
67908+ return;
67909+ }
67910+ }
67911+
67912+ /* allocate log buffers */
67913+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
67914+ if (!gr_alert_log_fmt) {
67915+ panic("Unable to allocate grsecurity alert log format buffer");
67916+ return;
67917+ }
67918+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
67919+ if (!gr_audit_log_fmt) {
67920+ panic("Unable to allocate grsecurity audit log format buffer");
67921+ return;
67922+ }
67923+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
67924+ if (!gr_alert_log_buf) {
67925+ panic("Unable to allocate grsecurity alert log buffer");
67926+ return;
67927+ }
67928+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
67929+ if (!gr_audit_log_buf) {
67930+ panic("Unable to allocate grsecurity audit log buffer");
67931+ return;
67932+ }
67933+
67934+ /* allocate memory for authentication structure */
67935+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
67936+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
67937+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
67938+
67939+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
67940+ panic("Unable to allocate grsecurity authentication structure");
67941+ return;
67942+ }
67943+
67944+
67945+#ifdef CONFIG_GRKERNSEC_IO
67946+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
67947+ grsec_disable_privio = 1;
67948+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
67949+ grsec_disable_privio = 1;
67950+#else
67951+ grsec_disable_privio = 0;
67952+#endif
67953+#endif
67954+
67955+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
67956+ /* for backward compatibility, tpe_invert always defaults to on if
67957+ enabled in the kernel
67958+ */
67959+ grsec_enable_tpe_invert = 1;
67960+#endif
67961+
67962+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
67963+#ifndef CONFIG_GRKERNSEC_SYSCTL
67964+ grsec_lock = 1;
67965+#endif
67966+
67967+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
67968+ grsec_enable_log_rwxmaps = 1;
67969+#endif
67970+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
67971+ grsec_enable_group = 1;
67972+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
67973+#endif
67974+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
67975+ grsec_enable_ptrace_readexec = 1;
67976+#endif
67977+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
67978+ grsec_enable_chdir = 1;
67979+#endif
67980+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
67981+ grsec_enable_harden_ptrace = 1;
67982+#endif
67983+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
67984+ grsec_enable_mount = 1;
67985+#endif
67986+#ifdef CONFIG_GRKERNSEC_LINK
67987+ grsec_enable_link = 1;
67988+#endif
67989+#ifdef CONFIG_GRKERNSEC_BRUTE
67990+ grsec_enable_brute = 1;
67991+#endif
67992+#ifdef CONFIG_GRKERNSEC_DMESG
67993+ grsec_enable_dmesg = 1;
67994+#endif
67995+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
67996+ grsec_enable_blackhole = 1;
67997+ grsec_lastack_retries = 4;
67998+#endif
67999+#ifdef CONFIG_GRKERNSEC_FIFO
68000+ grsec_enable_fifo = 1;
68001+#endif
68002+#ifdef CONFIG_GRKERNSEC_EXECLOG
68003+ grsec_enable_execlog = 1;
68004+#endif
68005+#ifdef CONFIG_GRKERNSEC_SETXID
68006+ grsec_enable_setxid = 1;
68007+#endif
68008+#ifdef CONFIG_GRKERNSEC_SIGNAL
68009+ grsec_enable_signal = 1;
68010+#endif
68011+#ifdef CONFIG_GRKERNSEC_FORKFAIL
68012+ grsec_enable_forkfail = 1;
68013+#endif
68014+#ifdef CONFIG_GRKERNSEC_TIME
68015+ grsec_enable_time = 1;
68016+#endif
68017+#ifdef CONFIG_GRKERNSEC_RESLOG
68018+ grsec_resource_logging = 1;
68019+#endif
68020+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
68021+ grsec_enable_chroot_findtask = 1;
68022+#endif
68023+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
68024+ grsec_enable_chroot_unix = 1;
68025+#endif
68026+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
68027+ grsec_enable_chroot_mount = 1;
68028+#endif
68029+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
68030+ grsec_enable_chroot_fchdir = 1;
68031+#endif
68032+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
68033+ grsec_enable_chroot_shmat = 1;
68034+#endif
68035+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
68036+ grsec_enable_audit_ptrace = 1;
68037+#endif
68038+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
68039+ grsec_enable_chroot_double = 1;
68040+#endif
68041+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
68042+ grsec_enable_chroot_pivot = 1;
68043+#endif
68044+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
68045+ grsec_enable_chroot_chdir = 1;
68046+#endif
68047+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
68048+ grsec_enable_chroot_chmod = 1;
68049+#endif
68050+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
68051+ grsec_enable_chroot_mknod = 1;
68052+#endif
68053+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
68054+ grsec_enable_chroot_nice = 1;
68055+#endif
68056+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
68057+ grsec_enable_chroot_execlog = 1;
68058+#endif
68059+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
68060+ grsec_enable_chroot_caps = 1;
68061+#endif
68062+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
68063+ grsec_enable_chroot_sysctl = 1;
68064+#endif
68065+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
68066+ grsec_enable_symlinkown = 1;
68067+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
68068+#endif
68069+#ifdef CONFIG_GRKERNSEC_TPE
68070+ grsec_enable_tpe = 1;
68071+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
68072+#ifdef CONFIG_GRKERNSEC_TPE_ALL
68073+ grsec_enable_tpe_all = 1;
68074+#endif
68075+#endif
68076+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
68077+ grsec_enable_socket_all = 1;
68078+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
68079+#endif
68080+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
68081+ grsec_enable_socket_client = 1;
68082+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
68083+#endif
68084+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
68085+ grsec_enable_socket_server = 1;
68086+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
68087+#endif
68088+#endif
68089+
68090+ return;
68091+}
68092diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
68093new file mode 100644
68094index 0000000..5e05e20
68095--- /dev/null
68096+++ b/grsecurity/grsec_link.c
68097@@ -0,0 +1,58 @@
68098+#include <linux/kernel.h>
68099+#include <linux/sched.h>
68100+#include <linux/fs.h>
68101+#include <linux/file.h>
68102+#include <linux/grinternal.h>
68103+
68104+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
68105+{
68106+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
68107+ const struct inode *link_inode = link->dentry->d_inode;
68108+
68109+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
68110+ /* ignore root-owned links, e.g. /proc/self */
68111+ gr_is_global_nonroot(link_inode->i_uid) && target &&
68112+ !uid_eq(link_inode->i_uid, target->i_uid)) {
68113+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
68114+ return 1;
68115+ }
68116+#endif
68117+ return 0;
68118+}
68119+
68120+int
68121+gr_handle_follow_link(const struct inode *parent,
68122+ const struct inode *inode,
68123+ const struct dentry *dentry, const struct vfsmount *mnt)
68124+{
68125+#ifdef CONFIG_GRKERNSEC_LINK
68126+ const struct cred *cred = current_cred();
68127+
68128+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
68129+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
68130+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
68131+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
68132+ return -EACCES;
68133+ }
68134+#endif
68135+ return 0;
68136+}
68137+
68138+int
68139+gr_handle_hardlink(const struct dentry *dentry,
68140+ const struct vfsmount *mnt,
68141+ struct inode *inode, const int mode, const struct filename *to)
68142+{
68143+#ifdef CONFIG_GRKERNSEC_LINK
68144+ const struct cred *cred = current_cred();
68145+
68146+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
68147+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
68148+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
68149+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
68150+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
68151+ return -EPERM;
68152+ }
68153+#endif
68154+ return 0;
68155+}
68156diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
68157new file mode 100644
68158index 0000000..dbe0a6b
68159--- /dev/null
68160+++ b/grsecurity/grsec_log.c
68161@@ -0,0 +1,341 @@
68162+#include <linux/kernel.h>
68163+#include <linux/sched.h>
68164+#include <linux/file.h>
68165+#include <linux/tty.h>
68166+#include <linux/fs.h>
68167+#include <linux/mm.h>
68168+#include <linux/grinternal.h>
68169+
68170+#ifdef CONFIG_TREE_PREEMPT_RCU
68171+#define DISABLE_PREEMPT() preempt_disable()
68172+#define ENABLE_PREEMPT() preempt_enable()
68173+#else
68174+#define DISABLE_PREEMPT()
68175+#define ENABLE_PREEMPT()
68176+#endif
68177+
68178+#define BEGIN_LOCKS(x) \
68179+ DISABLE_PREEMPT(); \
68180+ rcu_read_lock(); \
68181+ read_lock(&tasklist_lock); \
68182+ read_lock(&grsec_exec_file_lock); \
68183+ if (x != GR_DO_AUDIT) \
68184+ spin_lock(&grsec_alert_lock); \
68185+ else \
68186+ spin_lock(&grsec_audit_lock)
68187+
68188+#define END_LOCKS(x) \
68189+ if (x != GR_DO_AUDIT) \
68190+ spin_unlock(&grsec_alert_lock); \
68191+ else \
68192+ spin_unlock(&grsec_audit_lock); \
68193+ read_unlock(&grsec_exec_file_lock); \
68194+ read_unlock(&tasklist_lock); \
68195+ rcu_read_unlock(); \
68196+ ENABLE_PREEMPT(); \
68197+ if (x == GR_DONT_AUDIT) \
68198+ gr_handle_alertkill(current)
68199+
68200+enum {
68201+ FLOODING,
68202+ NO_FLOODING
68203+};
68204+
68205+extern char *gr_alert_log_fmt;
68206+extern char *gr_audit_log_fmt;
68207+extern char *gr_alert_log_buf;
68208+extern char *gr_audit_log_buf;
68209+
68210+static int gr_log_start(int audit)
68211+{
68212+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
68213+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
68214+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
68215+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
68216+ unsigned long curr_secs = get_seconds();
68217+
68218+ if (audit == GR_DO_AUDIT)
68219+ goto set_fmt;
68220+
68221+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
68222+ grsec_alert_wtime = curr_secs;
68223+ grsec_alert_fyet = 0;
68224+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
68225+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
68226+ grsec_alert_fyet++;
68227+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
68228+ grsec_alert_wtime = curr_secs;
68229+ grsec_alert_fyet++;
68230+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
68231+ return FLOODING;
68232+ }
68233+ else return FLOODING;
68234+
68235+set_fmt:
68236+#endif
68237+ memset(buf, 0, PAGE_SIZE);
68238+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
68239+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
68240+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
68241+ } else if (current->signal->curr_ip) {
68242+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
68243+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
68244+ } else if (gr_acl_is_enabled()) {
68245+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
68246+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
68247+ } else {
68248+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
68249+ strcpy(buf, fmt);
68250+ }
68251+
68252+ return NO_FLOODING;
68253+}
68254+
68255+static void gr_log_middle(int audit, const char *msg, va_list ap)
68256+ __attribute__ ((format (printf, 2, 0)));
68257+
68258+static void gr_log_middle(int audit, const char *msg, va_list ap)
68259+{
68260+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
68261+ unsigned int len = strlen(buf);
68262+
68263+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
68264+
68265+ return;
68266+}
68267+
68268+static void gr_log_middle_varargs(int audit, const char *msg, ...)
68269+ __attribute__ ((format (printf, 2, 3)));
68270+
68271+static void gr_log_middle_varargs(int audit, const char *msg, ...)
68272+{
68273+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
68274+ unsigned int len = strlen(buf);
68275+ va_list ap;
68276+
68277+ va_start(ap, msg);
68278+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
68279+ va_end(ap);
68280+
68281+ return;
68282+}
68283+
68284+static void gr_log_end(int audit, int append_default)
68285+{
68286+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
68287+ if (append_default) {
68288+ struct task_struct *task = current;
68289+ struct task_struct *parent = task->real_parent;
68290+ const struct cred *cred = __task_cred(task);
68291+ const struct cred *pcred = __task_cred(parent);
68292+ unsigned int len = strlen(buf);
68293+
68294+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
68295+ }
68296+
68297+ printk("%s\n", buf);
68298+
68299+ return;
68300+}
68301+
68302+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
68303+{
68304+ int logtype;
68305+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
68306+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
68307+ void *voidptr = NULL;
68308+ int num1 = 0, num2 = 0;
68309+ unsigned long ulong1 = 0, ulong2 = 0;
68310+ struct dentry *dentry = NULL;
68311+ struct vfsmount *mnt = NULL;
68312+ struct file *file = NULL;
68313+ struct task_struct *task = NULL;
68314+ struct vm_area_struct *vma = NULL;
68315+ const struct cred *cred, *pcred;
68316+ va_list ap;
68317+
68318+ BEGIN_LOCKS(audit);
68319+ logtype = gr_log_start(audit);
68320+ if (logtype == FLOODING) {
68321+ END_LOCKS(audit);
68322+ return;
68323+ }
68324+ va_start(ap, argtypes);
68325+ switch (argtypes) {
68326+ case GR_TTYSNIFF:
68327+ task = va_arg(ap, struct task_struct *);
68328+ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task_pid_nr(task), gr_parent_task_fullpath0(task), task->real_parent->comm, task_pid_nr(task->real_parent));
68329+ break;
68330+ case GR_SYSCTL_HIDDEN:
68331+ str1 = va_arg(ap, char *);
68332+ gr_log_middle_varargs(audit, msg, result, str1);
68333+ break;
68334+ case GR_RBAC:
68335+ dentry = va_arg(ap, struct dentry *);
68336+ mnt = va_arg(ap, struct vfsmount *);
68337+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
68338+ break;
68339+ case GR_RBAC_STR:
68340+ dentry = va_arg(ap, struct dentry *);
68341+ mnt = va_arg(ap, struct vfsmount *);
68342+ str1 = va_arg(ap, char *);
68343+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
68344+ break;
68345+ case GR_STR_RBAC:
68346+ str1 = va_arg(ap, char *);
68347+ dentry = va_arg(ap, struct dentry *);
68348+ mnt = va_arg(ap, struct vfsmount *);
68349+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
68350+ break;
68351+ case GR_RBAC_MODE2:
68352+ dentry = va_arg(ap, struct dentry *);
68353+ mnt = va_arg(ap, struct vfsmount *);
68354+ str1 = va_arg(ap, char *);
68355+ str2 = va_arg(ap, char *);
68356+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
68357+ break;
68358+ case GR_RBAC_MODE3:
68359+ dentry = va_arg(ap, struct dentry *);
68360+ mnt = va_arg(ap, struct vfsmount *);
68361+ str1 = va_arg(ap, char *);
68362+ str2 = va_arg(ap, char *);
68363+ str3 = va_arg(ap, char *);
68364+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
68365+ break;
68366+ case GR_FILENAME:
68367+ dentry = va_arg(ap, struct dentry *);
68368+ mnt = va_arg(ap, struct vfsmount *);
68369+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
68370+ break;
68371+ case GR_STR_FILENAME:
68372+ str1 = va_arg(ap, char *);
68373+ dentry = va_arg(ap, struct dentry *);
68374+ mnt = va_arg(ap, struct vfsmount *);
68375+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
68376+ break;
68377+ case GR_FILENAME_STR:
68378+ dentry = va_arg(ap, struct dentry *);
68379+ mnt = va_arg(ap, struct vfsmount *);
68380+ str1 = va_arg(ap, char *);
68381+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
68382+ break;
68383+ case GR_FILENAME_TWO_INT:
68384+ dentry = va_arg(ap, struct dentry *);
68385+ mnt = va_arg(ap, struct vfsmount *);
68386+ num1 = va_arg(ap, int);
68387+ num2 = va_arg(ap, int);
68388+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
68389+ break;
68390+ case GR_FILENAME_TWO_INT_STR:
68391+ dentry = va_arg(ap, struct dentry *);
68392+ mnt = va_arg(ap, struct vfsmount *);
68393+ num1 = va_arg(ap, int);
68394+ num2 = va_arg(ap, int);
68395+ str1 = va_arg(ap, char *);
68396+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
68397+ break;
68398+ case GR_TEXTREL:
68399+ file = va_arg(ap, struct file *);
68400+ ulong1 = va_arg(ap, unsigned long);
68401+ ulong2 = va_arg(ap, unsigned long);
68402+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
68403+ break;
68404+ case GR_PTRACE:
68405+ task = va_arg(ap, struct task_struct *);
68406+ 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_nr(task));
68407+ break;
68408+ case GR_RESOURCE:
68409+ task = va_arg(ap, struct task_struct *);
68410+ cred = __task_cred(task);
68411+ pcred = __task_cred(task->real_parent);
68412+ ulong1 = va_arg(ap, unsigned long);
68413+ str1 = va_arg(ap, char *);
68414+ ulong2 = va_arg(ap, unsigned long);
68415+ gr_log_middle_varargs(audit, msg, ulong1, str1, ulong2, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
68416+ break;
68417+ case GR_CAP:
68418+ task = va_arg(ap, struct task_struct *);
68419+ cred = __task_cred(task);
68420+ pcred = __task_cred(task->real_parent);
68421+ str1 = va_arg(ap, char *);
68422+ gr_log_middle_varargs(audit, msg, str1, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
68423+ break;
68424+ case GR_SIG:
68425+ str1 = va_arg(ap, char *);
68426+ voidptr = va_arg(ap, void *);
68427+ gr_log_middle_varargs(audit, msg, str1, voidptr);
68428+ break;
68429+ case GR_SIG2:
68430+ task = va_arg(ap, struct task_struct *);
68431+ cred = __task_cred(task);
68432+ pcred = __task_cred(task->real_parent);
68433+ num1 = va_arg(ap, int);
68434+ gr_log_middle_varargs(audit, msg, num1, gr_task_fullpath0(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath0(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
68435+ break;
68436+ case GR_CRASH1:
68437+ task = va_arg(ap, struct task_struct *);
68438+ cred = __task_cred(task);
68439+ pcred = __task_cred(task->real_parent);
68440+ ulong1 = va_arg(ap, unsigned long);
68441+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid), GR_GLOBAL_UID(cred->uid), ulong1);
68442+ break;
68443+ case GR_CRASH2:
68444+ task = va_arg(ap, struct task_struct *);
68445+ cred = __task_cred(task);
68446+ pcred = __task_cred(task->real_parent);
68447+ ulong1 = va_arg(ap, unsigned long);
68448+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task_pid_nr(task), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_GID(cred->egid), gr_parent_task_fullpath(task), task->real_parent->comm, task_pid_nr(task->real_parent), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid), ulong1);
68449+ break;
68450+ case GR_RWXMAP:
68451+ file = va_arg(ap, struct file *);
68452+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
68453+ break;
68454+ case GR_RWXMAPVMA:
68455+ vma = va_arg(ap, struct vm_area_struct *);
68456+ if (vma->vm_file)
68457+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
68458+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
68459+ str1 = "<stack>";
68460+ else if (vma->vm_start <= current->mm->brk &&
68461+ vma->vm_end >= current->mm->start_brk)
68462+ str1 = "<heap>";
68463+ else
68464+ str1 = "<anonymous mapping>";
68465+ gr_log_middle_varargs(audit, msg, str1);
68466+ break;
68467+ case GR_PSACCT:
68468+ {
68469+ unsigned int wday, cday;
68470+ __u8 whr, chr;
68471+ __u8 wmin, cmin;
68472+ __u8 wsec, csec;
68473+ char cur_tty[64] = { 0 };
68474+ char parent_tty[64] = { 0 };
68475+
68476+ task = va_arg(ap, struct task_struct *);
68477+ wday = va_arg(ap, unsigned int);
68478+ cday = va_arg(ap, unsigned int);
68479+ whr = va_arg(ap, int);
68480+ chr = va_arg(ap, int);
68481+ wmin = va_arg(ap, int);
68482+ cmin = va_arg(ap, int);
68483+ wsec = va_arg(ap, int);
68484+ csec = va_arg(ap, int);
68485+ ulong1 = va_arg(ap, unsigned long);
68486+ cred = __task_cred(task);
68487+ pcred = __task_cred(task->real_parent);
68488+
68489+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task_pid_nr(task), &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), GR_GLOBAL_UID(cred->uid), GR_GLOBAL_UID(cred->euid), GR_GLOBAL_GID(cred->gid), GR_GLOBAL_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_pid_nr(task->real_parent), &task->real_parent->signal->curr_ip, tty_name(task->real_parent->signal->tty, parent_tty), GR_GLOBAL_UID(pcred->uid), GR_GLOBAL_UID(pcred->euid), GR_GLOBAL_GID(pcred->gid), GR_GLOBAL_GID(pcred->egid));
68490+ }
68491+ break;
68492+ default:
68493+ gr_log_middle(audit, msg, ap);
68494+ }
68495+ va_end(ap);
68496+ // these don't need DEFAULTSECARGS printed on the end
68497+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
68498+ gr_log_end(audit, 0);
68499+ else
68500+ gr_log_end(audit, 1);
68501+ END_LOCKS(audit);
68502+}
68503diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
68504new file mode 100644
68505index 0000000..f536303
68506--- /dev/null
68507+++ b/grsecurity/grsec_mem.c
68508@@ -0,0 +1,40 @@
68509+#include <linux/kernel.h>
68510+#include <linux/sched.h>
68511+#include <linux/mm.h>
68512+#include <linux/mman.h>
68513+#include <linux/grinternal.h>
68514+
68515+void
68516+gr_handle_ioperm(void)
68517+{
68518+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
68519+ return;
68520+}
68521+
68522+void
68523+gr_handle_iopl(void)
68524+{
68525+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
68526+ return;
68527+}
68528+
68529+void
68530+gr_handle_mem_readwrite(u64 from, u64 to)
68531+{
68532+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
68533+ return;
68534+}
68535+
68536+void
68537+gr_handle_vm86(void)
68538+{
68539+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
68540+ return;
68541+}
68542+
68543+void
68544+gr_log_badprocpid(const char *entry)
68545+{
68546+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
68547+ return;
68548+}
68549diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
68550new file mode 100644
68551index 0000000..2131422
68552--- /dev/null
68553+++ b/grsecurity/grsec_mount.c
68554@@ -0,0 +1,62 @@
68555+#include <linux/kernel.h>
68556+#include <linux/sched.h>
68557+#include <linux/mount.h>
68558+#include <linux/grsecurity.h>
68559+#include <linux/grinternal.h>
68560+
68561+void
68562+gr_log_remount(const char *devname, const int retval)
68563+{
68564+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
68565+ if (grsec_enable_mount && (retval >= 0))
68566+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
68567+#endif
68568+ return;
68569+}
68570+
68571+void
68572+gr_log_unmount(const char *devname, const int retval)
68573+{
68574+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
68575+ if (grsec_enable_mount && (retval >= 0))
68576+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
68577+#endif
68578+ return;
68579+}
68580+
68581+void
68582+gr_log_mount(const char *from, const char *to, const int retval)
68583+{
68584+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
68585+ if (grsec_enable_mount && (retval >= 0))
68586+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
68587+#endif
68588+ return;
68589+}
68590+
68591+int
68592+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
68593+{
68594+#ifdef CONFIG_GRKERNSEC_ROFS
68595+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
68596+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
68597+ return -EPERM;
68598+ } else
68599+ return 0;
68600+#endif
68601+ return 0;
68602+}
68603+
68604+int
68605+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
68606+{
68607+#ifdef CONFIG_GRKERNSEC_ROFS
68608+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
68609+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
68610+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
68611+ return -EPERM;
68612+ } else
68613+ return 0;
68614+#endif
68615+ return 0;
68616+}
68617diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
68618new file mode 100644
68619index 0000000..6ee9d50
68620--- /dev/null
68621+++ b/grsecurity/grsec_pax.c
68622@@ -0,0 +1,45 @@
68623+#include <linux/kernel.h>
68624+#include <linux/sched.h>
68625+#include <linux/mm.h>
68626+#include <linux/file.h>
68627+#include <linux/grinternal.h>
68628+#include <linux/grsecurity.h>
68629+
68630+void
68631+gr_log_textrel(struct vm_area_struct * vma)
68632+{
68633+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
68634+ if (grsec_enable_log_rwxmaps)
68635+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
68636+#endif
68637+ return;
68638+}
68639+
68640+void gr_log_ptgnustack(struct file *file)
68641+{
68642+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
68643+ if (grsec_enable_log_rwxmaps)
68644+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
68645+#endif
68646+ return;
68647+}
68648+
68649+void
68650+gr_log_rwxmmap(struct file *file)
68651+{
68652+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
68653+ if (grsec_enable_log_rwxmaps)
68654+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
68655+#endif
68656+ return;
68657+}
68658+
68659+void
68660+gr_log_rwxmprotect(struct vm_area_struct *vma)
68661+{
68662+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
68663+ if (grsec_enable_log_rwxmaps)
68664+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
68665+#endif
68666+ return;
68667+}
68668diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
68669new file mode 100644
68670index 0000000..f7f29aa
68671--- /dev/null
68672+++ b/grsecurity/grsec_ptrace.c
68673@@ -0,0 +1,30 @@
68674+#include <linux/kernel.h>
68675+#include <linux/sched.h>
68676+#include <linux/grinternal.h>
68677+#include <linux/security.h>
68678+
68679+void
68680+gr_audit_ptrace(struct task_struct *task)
68681+{
68682+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
68683+ if (grsec_enable_audit_ptrace)
68684+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
68685+#endif
68686+ return;
68687+}
68688+
68689+int
68690+gr_ptrace_readexec(struct file *file, int unsafe_flags)
68691+{
68692+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
68693+ const struct dentry *dentry = file->f_path.dentry;
68694+ const struct vfsmount *mnt = file->f_path.mnt;
68695+
68696+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
68697+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
68698+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
68699+ return -EACCES;
68700+ }
68701+#endif
68702+ return 0;
68703+}
68704diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
68705new file mode 100644
68706index 0000000..4e29cc7
68707--- /dev/null
68708+++ b/grsecurity/grsec_sig.c
68709@@ -0,0 +1,246 @@
68710+#include <linux/kernel.h>
68711+#include <linux/sched.h>
68712+#include <linux/fs.h>
68713+#include <linux/delay.h>
68714+#include <linux/grsecurity.h>
68715+#include <linux/grinternal.h>
68716+#include <linux/hardirq.h>
68717+
68718+char *signames[] = {
68719+ [SIGSEGV] = "Segmentation fault",
68720+ [SIGILL] = "Illegal instruction",
68721+ [SIGABRT] = "Abort",
68722+ [SIGBUS] = "Invalid alignment/Bus error"
68723+};
68724+
68725+void
68726+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
68727+{
68728+#ifdef CONFIG_GRKERNSEC_SIGNAL
68729+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
68730+ (sig == SIGABRT) || (sig == SIGBUS))) {
68731+ if (task_pid_nr(t) == task_pid_nr(current)) {
68732+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
68733+ } else {
68734+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
68735+ }
68736+ }
68737+#endif
68738+ return;
68739+}
68740+
68741+int
68742+gr_handle_signal(const struct task_struct *p, const int sig)
68743+{
68744+#ifdef CONFIG_GRKERNSEC
68745+ /* ignore the 0 signal for protected task checks */
68746+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
68747+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
68748+ return -EPERM;
68749+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
68750+ return -EPERM;
68751+ }
68752+#endif
68753+ return 0;
68754+}
68755+
68756+#ifdef CONFIG_GRKERNSEC
68757+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
68758+
68759+int gr_fake_force_sig(int sig, struct task_struct *t)
68760+{
68761+ unsigned long int flags;
68762+ int ret, blocked, ignored;
68763+ struct k_sigaction *action;
68764+
68765+ spin_lock_irqsave(&t->sighand->siglock, flags);
68766+ action = &t->sighand->action[sig-1];
68767+ ignored = action->sa.sa_handler == SIG_IGN;
68768+ blocked = sigismember(&t->blocked, sig);
68769+ if (blocked || ignored) {
68770+ action->sa.sa_handler = SIG_DFL;
68771+ if (blocked) {
68772+ sigdelset(&t->blocked, sig);
68773+ recalc_sigpending_and_wake(t);
68774+ }
68775+ }
68776+ if (action->sa.sa_handler == SIG_DFL)
68777+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
68778+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
68779+
68780+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
68781+
68782+ return ret;
68783+}
68784+#endif
68785+
68786+#ifdef CONFIG_GRKERNSEC_BRUTE
68787+#define GR_USER_BAN_TIME (15 * 60)
68788+#define GR_DAEMON_BRUTE_TIME (30 * 60)
68789+
68790+static int __get_dumpable(unsigned long mm_flags)
68791+{
68792+ int ret;
68793+
68794+ ret = mm_flags & MMF_DUMPABLE_MASK;
68795+ return (ret >= 2) ? 2 : ret;
68796+}
68797+#endif
68798+
68799+void gr_handle_brute_attach(unsigned long mm_flags)
68800+{
68801+#ifdef CONFIG_GRKERNSEC_BRUTE
68802+ struct task_struct *p = current;
68803+ kuid_t uid = GLOBAL_ROOT_UID;
68804+ int daemon = 0;
68805+
68806+ if (!grsec_enable_brute)
68807+ return;
68808+
68809+ rcu_read_lock();
68810+ read_lock(&tasklist_lock);
68811+ read_lock(&grsec_exec_file_lock);
68812+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
68813+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
68814+ p->real_parent->brute = 1;
68815+ daemon = 1;
68816+ } else {
68817+ const struct cred *cred = __task_cred(p), *cred2;
68818+ struct task_struct *tsk, *tsk2;
68819+
68820+ if (!__get_dumpable(mm_flags) && gr_is_global_nonroot(cred->uid)) {
68821+ struct user_struct *user;
68822+
68823+ uid = cred->uid;
68824+
68825+ /* this is put upon execution past expiration */
68826+ user = find_user(uid);
68827+ if (user == NULL)
68828+ goto unlock;
68829+ user->suid_banned = 1;
68830+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
68831+ if (user->suid_ban_expires == ~0UL)
68832+ user->suid_ban_expires--;
68833+
68834+ /* only kill other threads of the same binary, from the same user */
68835+ do_each_thread(tsk2, tsk) {
68836+ cred2 = __task_cred(tsk);
68837+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
68838+ gr_fake_force_sig(SIGKILL, tsk);
68839+ } while_each_thread(tsk2, tsk);
68840+ }
68841+ }
68842+unlock:
68843+ read_unlock(&grsec_exec_file_lock);
68844+ read_unlock(&tasklist_lock);
68845+ rcu_read_unlock();
68846+
68847+ if (gr_is_global_nonroot(uid))
68848+ gr_log_fs_int2(GR_DONT_AUDIT, GR_BRUTE_SUID_MSG, p->exec_file->f_path.dentry, p->exec_file->f_path.mnt, GR_GLOBAL_UID(uid), GR_USER_BAN_TIME / 60);
68849+ else if (daemon)
68850+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
68851+
68852+#endif
68853+ return;
68854+}
68855+
68856+void gr_handle_brute_check(void)
68857+{
68858+#ifdef CONFIG_GRKERNSEC_BRUTE
68859+ struct task_struct *p = current;
68860+
68861+ if (unlikely(p->brute)) {
68862+ if (!grsec_enable_brute)
68863+ p->brute = 0;
68864+ else if (time_before(get_seconds(), p->brute_expires))
68865+ msleep(30 * 1000);
68866+ }
68867+#endif
68868+ return;
68869+}
68870+
68871+void gr_handle_kernel_exploit(void)
68872+{
68873+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
68874+ const struct cred *cred;
68875+ struct task_struct *tsk, *tsk2;
68876+ struct user_struct *user;
68877+ kuid_t uid;
68878+
68879+ if (in_irq() || in_serving_softirq() || in_nmi())
68880+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
68881+
68882+ uid = current_uid();
68883+
68884+ if (gr_is_global_root(uid))
68885+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
68886+ else {
68887+ /* kill all the processes of this user, hold a reference
68888+ to their creds struct, and prevent them from creating
68889+ another process until system reset
68890+ */
68891+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
68892+ GR_GLOBAL_UID(uid));
68893+ /* we intentionally leak this ref */
68894+ user = get_uid(current->cred->user);
68895+ if (user)
68896+ user->kernel_banned = 1;
68897+
68898+ /* kill all processes of this user */
68899+ read_lock(&tasklist_lock);
68900+ do_each_thread(tsk2, tsk) {
68901+ cred = __task_cred(tsk);
68902+ if (uid_eq(cred->uid, uid))
68903+ gr_fake_force_sig(SIGKILL, tsk);
68904+ } while_each_thread(tsk2, tsk);
68905+ read_unlock(&tasklist_lock);
68906+ }
68907+#endif
68908+}
68909+
68910+#ifdef CONFIG_GRKERNSEC_BRUTE
68911+static bool suid_ban_expired(struct user_struct *user)
68912+{
68913+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
68914+ user->suid_banned = 0;
68915+ user->suid_ban_expires = 0;
68916+ free_uid(user);
68917+ return true;
68918+ }
68919+
68920+ return false;
68921+}
68922+#endif
68923+
68924+int gr_process_kernel_exec_ban(void)
68925+{
68926+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
68927+ if (unlikely(current->cred->user->kernel_banned))
68928+ return -EPERM;
68929+#endif
68930+ return 0;
68931+}
68932+
68933+int gr_process_kernel_setuid_ban(struct user_struct *user)
68934+{
68935+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
68936+ if (unlikely(user->kernel_banned))
68937+ gr_fake_force_sig(SIGKILL, current);
68938+#endif
68939+ return 0;
68940+}
68941+
68942+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
68943+{
68944+#ifdef CONFIG_GRKERNSEC_BRUTE
68945+ struct user_struct *user = current->cred->user;
68946+ if (unlikely(user->suid_banned)) {
68947+ if (suid_ban_expired(user))
68948+ return 0;
68949+ /* disallow execution of suid binaries only */
68950+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
68951+ return -EPERM;
68952+ }
68953+#endif
68954+ return 0;
68955+}
68956diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
68957new file mode 100644
68958index 0000000..4030d57
68959--- /dev/null
68960+++ b/grsecurity/grsec_sock.c
68961@@ -0,0 +1,244 @@
68962+#include <linux/kernel.h>
68963+#include <linux/module.h>
68964+#include <linux/sched.h>
68965+#include <linux/file.h>
68966+#include <linux/net.h>
68967+#include <linux/in.h>
68968+#include <linux/ip.h>
68969+#include <net/sock.h>
68970+#include <net/inet_sock.h>
68971+#include <linux/grsecurity.h>
68972+#include <linux/grinternal.h>
68973+#include <linux/gracl.h>
68974+
68975+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
68976+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
68977+
68978+EXPORT_SYMBOL(gr_search_udp_recvmsg);
68979+EXPORT_SYMBOL(gr_search_udp_sendmsg);
68980+
68981+#ifdef CONFIG_UNIX_MODULE
68982+EXPORT_SYMBOL(gr_acl_handle_unix);
68983+EXPORT_SYMBOL(gr_acl_handle_mknod);
68984+EXPORT_SYMBOL(gr_handle_chroot_unix);
68985+EXPORT_SYMBOL(gr_handle_create);
68986+#endif
68987+
68988+#ifdef CONFIG_GRKERNSEC
68989+#define gr_conn_table_size 32749
68990+struct conn_table_entry {
68991+ struct conn_table_entry *next;
68992+ struct signal_struct *sig;
68993+};
68994+
68995+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
68996+DEFINE_SPINLOCK(gr_conn_table_lock);
68997+
68998+extern const char * gr_socktype_to_name(unsigned char type);
68999+extern const char * gr_proto_to_name(unsigned char proto);
69000+extern const char * gr_sockfamily_to_name(unsigned char family);
69001+
69002+static __inline__ int
69003+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
69004+{
69005+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
69006+}
69007+
69008+static __inline__ int
69009+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
69010+ __u16 sport, __u16 dport)
69011+{
69012+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
69013+ sig->gr_sport == sport && sig->gr_dport == dport))
69014+ return 1;
69015+ else
69016+ return 0;
69017+}
69018+
69019+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
69020+{
69021+ struct conn_table_entry **match;
69022+ unsigned int index;
69023+
69024+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
69025+ sig->gr_sport, sig->gr_dport,
69026+ gr_conn_table_size);
69027+
69028+ newent->sig = sig;
69029+
69030+ match = &gr_conn_table[index];
69031+ newent->next = *match;
69032+ *match = newent;
69033+
69034+ return;
69035+}
69036+
69037+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
69038+{
69039+ struct conn_table_entry *match, *last = NULL;
69040+ unsigned int index;
69041+
69042+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
69043+ sig->gr_sport, sig->gr_dport,
69044+ gr_conn_table_size);
69045+
69046+ match = gr_conn_table[index];
69047+ while (match && !conn_match(match->sig,
69048+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
69049+ sig->gr_dport)) {
69050+ last = match;
69051+ match = match->next;
69052+ }
69053+
69054+ if (match) {
69055+ if (last)
69056+ last->next = match->next;
69057+ else
69058+ gr_conn_table[index] = NULL;
69059+ kfree(match);
69060+ }
69061+
69062+ return;
69063+}
69064+
69065+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
69066+ __u16 sport, __u16 dport)
69067+{
69068+ struct conn_table_entry *match;
69069+ unsigned int index;
69070+
69071+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
69072+
69073+ match = gr_conn_table[index];
69074+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
69075+ match = match->next;
69076+
69077+ if (match)
69078+ return match->sig;
69079+ else
69080+ return NULL;
69081+}
69082+
69083+#endif
69084+
69085+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
69086+{
69087+#ifdef CONFIG_GRKERNSEC
69088+ struct signal_struct *sig = task->signal;
69089+ struct conn_table_entry *newent;
69090+
69091+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
69092+ if (newent == NULL)
69093+ return;
69094+ /* no bh lock needed since we are called with bh disabled */
69095+ spin_lock(&gr_conn_table_lock);
69096+ gr_del_task_from_ip_table_nolock(sig);
69097+ sig->gr_saddr = inet->inet_rcv_saddr;
69098+ sig->gr_daddr = inet->inet_daddr;
69099+ sig->gr_sport = inet->inet_sport;
69100+ sig->gr_dport = inet->inet_dport;
69101+ gr_add_to_task_ip_table_nolock(sig, newent);
69102+ spin_unlock(&gr_conn_table_lock);
69103+#endif
69104+ return;
69105+}
69106+
69107+void gr_del_task_from_ip_table(struct task_struct *task)
69108+{
69109+#ifdef CONFIG_GRKERNSEC
69110+ spin_lock_bh(&gr_conn_table_lock);
69111+ gr_del_task_from_ip_table_nolock(task->signal);
69112+ spin_unlock_bh(&gr_conn_table_lock);
69113+#endif
69114+ return;
69115+}
69116+
69117+void
69118+gr_attach_curr_ip(const struct sock *sk)
69119+{
69120+#ifdef CONFIG_GRKERNSEC
69121+ struct signal_struct *p, *set;
69122+ const struct inet_sock *inet = inet_sk(sk);
69123+
69124+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
69125+ return;
69126+
69127+ set = current->signal;
69128+
69129+ spin_lock_bh(&gr_conn_table_lock);
69130+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
69131+ inet->inet_dport, inet->inet_sport);
69132+ if (unlikely(p != NULL)) {
69133+ set->curr_ip = p->curr_ip;
69134+ set->used_accept = 1;
69135+ gr_del_task_from_ip_table_nolock(p);
69136+ spin_unlock_bh(&gr_conn_table_lock);
69137+ return;
69138+ }
69139+ spin_unlock_bh(&gr_conn_table_lock);
69140+
69141+ set->curr_ip = inet->inet_daddr;
69142+ set->used_accept = 1;
69143+#endif
69144+ return;
69145+}
69146+
69147+int
69148+gr_handle_sock_all(const int family, const int type, const int protocol)
69149+{
69150+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
69151+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
69152+ (family != AF_UNIX)) {
69153+ if (family == AF_INET)
69154+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
69155+ else
69156+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
69157+ return -EACCES;
69158+ }
69159+#endif
69160+ return 0;
69161+}
69162+
69163+int
69164+gr_handle_sock_server(const struct sockaddr *sck)
69165+{
69166+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
69167+ if (grsec_enable_socket_server &&
69168+ in_group_p(grsec_socket_server_gid) &&
69169+ sck && (sck->sa_family != AF_UNIX) &&
69170+ (sck->sa_family != AF_LOCAL)) {
69171+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
69172+ return -EACCES;
69173+ }
69174+#endif
69175+ return 0;
69176+}
69177+
69178+int
69179+gr_handle_sock_server_other(const struct sock *sck)
69180+{
69181+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
69182+ if (grsec_enable_socket_server &&
69183+ in_group_p(grsec_socket_server_gid) &&
69184+ sck && (sck->sk_family != AF_UNIX) &&
69185+ (sck->sk_family != AF_LOCAL)) {
69186+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
69187+ return -EACCES;
69188+ }
69189+#endif
69190+ return 0;
69191+}
69192+
69193+int
69194+gr_handle_sock_client(const struct sockaddr *sck)
69195+{
69196+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
69197+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
69198+ sck && (sck->sa_family != AF_UNIX) &&
69199+ (sck->sa_family != AF_LOCAL)) {
69200+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
69201+ return -EACCES;
69202+ }
69203+#endif
69204+ return 0;
69205+}
69206diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
69207new file mode 100644
69208index 0000000..7624d1c
69209--- /dev/null
69210+++ b/grsecurity/grsec_sysctl.c
69211@@ -0,0 +1,460 @@
69212+#include <linux/kernel.h>
69213+#include <linux/sched.h>
69214+#include <linux/sysctl.h>
69215+#include <linux/grsecurity.h>
69216+#include <linux/grinternal.h>
69217+
69218+int
69219+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
69220+{
69221+#ifdef CONFIG_GRKERNSEC_SYSCTL
69222+ if (dirname == NULL || name == NULL)
69223+ return 0;
69224+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
69225+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
69226+ return -EACCES;
69227+ }
69228+#endif
69229+ return 0;
69230+}
69231+
69232+#ifdef CONFIG_GRKERNSEC_ROFS
69233+static int __maybe_unused one = 1;
69234+#endif
69235+
69236+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69237+struct ctl_table grsecurity_table[] = {
69238+#ifdef CONFIG_GRKERNSEC_SYSCTL
69239+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
69240+#ifdef CONFIG_GRKERNSEC_IO
69241+ {
69242+ .procname = "disable_priv_io",
69243+ .data = &grsec_disable_privio,
69244+ .maxlen = sizeof(int),
69245+ .mode = 0600,
69246+ .proc_handler = &proc_dointvec,
69247+ },
69248+#endif
69249+#endif
69250+#ifdef CONFIG_GRKERNSEC_LINK
69251+ {
69252+ .procname = "linking_restrictions",
69253+ .data = &grsec_enable_link,
69254+ .maxlen = sizeof(int),
69255+ .mode = 0600,
69256+ .proc_handler = &proc_dointvec,
69257+ },
69258+#endif
69259+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
69260+ {
69261+ .procname = "enforce_symlinksifowner",
69262+ .data = &grsec_enable_symlinkown,
69263+ .maxlen = sizeof(int),
69264+ .mode = 0600,
69265+ .proc_handler = &proc_dointvec,
69266+ },
69267+ {
69268+ .procname = "symlinkown_gid",
69269+ .data = &grsec_symlinkown_gid,
69270+ .maxlen = sizeof(int),
69271+ .mode = 0600,
69272+ .proc_handler = &proc_dointvec,
69273+ },
69274+#endif
69275+#ifdef CONFIG_GRKERNSEC_BRUTE
69276+ {
69277+ .procname = "deter_bruteforce",
69278+ .data = &grsec_enable_brute,
69279+ .maxlen = sizeof(int),
69280+ .mode = 0600,
69281+ .proc_handler = &proc_dointvec,
69282+ },
69283+#endif
69284+#ifdef CONFIG_GRKERNSEC_FIFO
69285+ {
69286+ .procname = "fifo_restrictions",
69287+ .data = &grsec_enable_fifo,
69288+ .maxlen = sizeof(int),
69289+ .mode = 0600,
69290+ .proc_handler = &proc_dointvec,
69291+ },
69292+#endif
69293+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
69294+ {
69295+ .procname = "ptrace_readexec",
69296+ .data = &grsec_enable_ptrace_readexec,
69297+ .maxlen = sizeof(int),
69298+ .mode = 0600,
69299+ .proc_handler = &proc_dointvec,
69300+ },
69301+#endif
69302+#ifdef CONFIG_GRKERNSEC_SETXID
69303+ {
69304+ .procname = "consistent_setxid",
69305+ .data = &grsec_enable_setxid,
69306+ .maxlen = sizeof(int),
69307+ .mode = 0600,
69308+ .proc_handler = &proc_dointvec,
69309+ },
69310+#endif
69311+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
69312+ {
69313+ .procname = "ip_blackhole",
69314+ .data = &grsec_enable_blackhole,
69315+ .maxlen = sizeof(int),
69316+ .mode = 0600,
69317+ .proc_handler = &proc_dointvec,
69318+ },
69319+ {
69320+ .procname = "lastack_retries",
69321+ .data = &grsec_lastack_retries,
69322+ .maxlen = sizeof(int),
69323+ .mode = 0600,
69324+ .proc_handler = &proc_dointvec,
69325+ },
69326+#endif
69327+#ifdef CONFIG_GRKERNSEC_EXECLOG
69328+ {
69329+ .procname = "exec_logging",
69330+ .data = &grsec_enable_execlog,
69331+ .maxlen = sizeof(int),
69332+ .mode = 0600,
69333+ .proc_handler = &proc_dointvec,
69334+ },
69335+#endif
69336+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
69337+ {
69338+ .procname = "rwxmap_logging",
69339+ .data = &grsec_enable_log_rwxmaps,
69340+ .maxlen = sizeof(int),
69341+ .mode = 0600,
69342+ .proc_handler = &proc_dointvec,
69343+ },
69344+#endif
69345+#ifdef CONFIG_GRKERNSEC_SIGNAL
69346+ {
69347+ .procname = "signal_logging",
69348+ .data = &grsec_enable_signal,
69349+ .maxlen = sizeof(int),
69350+ .mode = 0600,
69351+ .proc_handler = &proc_dointvec,
69352+ },
69353+#endif
69354+#ifdef CONFIG_GRKERNSEC_FORKFAIL
69355+ {
69356+ .procname = "forkfail_logging",
69357+ .data = &grsec_enable_forkfail,
69358+ .maxlen = sizeof(int),
69359+ .mode = 0600,
69360+ .proc_handler = &proc_dointvec,
69361+ },
69362+#endif
69363+#ifdef CONFIG_GRKERNSEC_TIME
69364+ {
69365+ .procname = "timechange_logging",
69366+ .data = &grsec_enable_time,
69367+ .maxlen = sizeof(int),
69368+ .mode = 0600,
69369+ .proc_handler = &proc_dointvec,
69370+ },
69371+#endif
69372+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
69373+ {
69374+ .procname = "chroot_deny_shmat",
69375+ .data = &grsec_enable_chroot_shmat,
69376+ .maxlen = sizeof(int),
69377+ .mode = 0600,
69378+ .proc_handler = &proc_dointvec,
69379+ },
69380+#endif
69381+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
69382+ {
69383+ .procname = "chroot_deny_unix",
69384+ .data = &grsec_enable_chroot_unix,
69385+ .maxlen = sizeof(int),
69386+ .mode = 0600,
69387+ .proc_handler = &proc_dointvec,
69388+ },
69389+#endif
69390+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
69391+ {
69392+ .procname = "chroot_deny_mount",
69393+ .data = &grsec_enable_chroot_mount,
69394+ .maxlen = sizeof(int),
69395+ .mode = 0600,
69396+ .proc_handler = &proc_dointvec,
69397+ },
69398+#endif
69399+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
69400+ {
69401+ .procname = "chroot_deny_fchdir",
69402+ .data = &grsec_enable_chroot_fchdir,
69403+ .maxlen = sizeof(int),
69404+ .mode = 0600,
69405+ .proc_handler = &proc_dointvec,
69406+ },
69407+#endif
69408+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
69409+ {
69410+ .procname = "chroot_deny_chroot",
69411+ .data = &grsec_enable_chroot_double,
69412+ .maxlen = sizeof(int),
69413+ .mode = 0600,
69414+ .proc_handler = &proc_dointvec,
69415+ },
69416+#endif
69417+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
69418+ {
69419+ .procname = "chroot_deny_pivot",
69420+ .data = &grsec_enable_chroot_pivot,
69421+ .maxlen = sizeof(int),
69422+ .mode = 0600,
69423+ .proc_handler = &proc_dointvec,
69424+ },
69425+#endif
69426+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
69427+ {
69428+ .procname = "chroot_enforce_chdir",
69429+ .data = &grsec_enable_chroot_chdir,
69430+ .maxlen = sizeof(int),
69431+ .mode = 0600,
69432+ .proc_handler = &proc_dointvec,
69433+ },
69434+#endif
69435+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
69436+ {
69437+ .procname = "chroot_deny_chmod",
69438+ .data = &grsec_enable_chroot_chmod,
69439+ .maxlen = sizeof(int),
69440+ .mode = 0600,
69441+ .proc_handler = &proc_dointvec,
69442+ },
69443+#endif
69444+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
69445+ {
69446+ .procname = "chroot_deny_mknod",
69447+ .data = &grsec_enable_chroot_mknod,
69448+ .maxlen = sizeof(int),
69449+ .mode = 0600,
69450+ .proc_handler = &proc_dointvec,
69451+ },
69452+#endif
69453+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
69454+ {
69455+ .procname = "chroot_restrict_nice",
69456+ .data = &grsec_enable_chroot_nice,
69457+ .maxlen = sizeof(int),
69458+ .mode = 0600,
69459+ .proc_handler = &proc_dointvec,
69460+ },
69461+#endif
69462+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
69463+ {
69464+ .procname = "chroot_execlog",
69465+ .data = &grsec_enable_chroot_execlog,
69466+ .maxlen = sizeof(int),
69467+ .mode = 0600,
69468+ .proc_handler = &proc_dointvec,
69469+ },
69470+#endif
69471+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69472+ {
69473+ .procname = "chroot_caps",
69474+ .data = &grsec_enable_chroot_caps,
69475+ .maxlen = sizeof(int),
69476+ .mode = 0600,
69477+ .proc_handler = &proc_dointvec,
69478+ },
69479+#endif
69480+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
69481+ {
69482+ .procname = "chroot_deny_sysctl",
69483+ .data = &grsec_enable_chroot_sysctl,
69484+ .maxlen = sizeof(int),
69485+ .mode = 0600,
69486+ .proc_handler = &proc_dointvec,
69487+ },
69488+#endif
69489+#ifdef CONFIG_GRKERNSEC_TPE
69490+ {
69491+ .procname = "tpe",
69492+ .data = &grsec_enable_tpe,
69493+ .maxlen = sizeof(int),
69494+ .mode = 0600,
69495+ .proc_handler = &proc_dointvec,
69496+ },
69497+ {
69498+ .procname = "tpe_gid",
69499+ .data = &grsec_tpe_gid,
69500+ .maxlen = sizeof(int),
69501+ .mode = 0600,
69502+ .proc_handler = &proc_dointvec,
69503+ },
69504+#endif
69505+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
69506+ {
69507+ .procname = "tpe_invert",
69508+ .data = &grsec_enable_tpe_invert,
69509+ .maxlen = sizeof(int),
69510+ .mode = 0600,
69511+ .proc_handler = &proc_dointvec,
69512+ },
69513+#endif
69514+#ifdef CONFIG_GRKERNSEC_TPE_ALL
69515+ {
69516+ .procname = "tpe_restrict_all",
69517+ .data = &grsec_enable_tpe_all,
69518+ .maxlen = sizeof(int),
69519+ .mode = 0600,
69520+ .proc_handler = &proc_dointvec,
69521+ },
69522+#endif
69523+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
69524+ {
69525+ .procname = "socket_all",
69526+ .data = &grsec_enable_socket_all,
69527+ .maxlen = sizeof(int),
69528+ .mode = 0600,
69529+ .proc_handler = &proc_dointvec,
69530+ },
69531+ {
69532+ .procname = "socket_all_gid",
69533+ .data = &grsec_socket_all_gid,
69534+ .maxlen = sizeof(int),
69535+ .mode = 0600,
69536+ .proc_handler = &proc_dointvec,
69537+ },
69538+#endif
69539+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
69540+ {
69541+ .procname = "socket_client",
69542+ .data = &grsec_enable_socket_client,
69543+ .maxlen = sizeof(int),
69544+ .mode = 0600,
69545+ .proc_handler = &proc_dointvec,
69546+ },
69547+ {
69548+ .procname = "socket_client_gid",
69549+ .data = &grsec_socket_client_gid,
69550+ .maxlen = sizeof(int),
69551+ .mode = 0600,
69552+ .proc_handler = &proc_dointvec,
69553+ },
69554+#endif
69555+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
69556+ {
69557+ .procname = "socket_server",
69558+ .data = &grsec_enable_socket_server,
69559+ .maxlen = sizeof(int),
69560+ .mode = 0600,
69561+ .proc_handler = &proc_dointvec,
69562+ },
69563+ {
69564+ .procname = "socket_server_gid",
69565+ .data = &grsec_socket_server_gid,
69566+ .maxlen = sizeof(int),
69567+ .mode = 0600,
69568+ .proc_handler = &proc_dointvec,
69569+ },
69570+#endif
69571+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
69572+ {
69573+ .procname = "audit_group",
69574+ .data = &grsec_enable_group,
69575+ .maxlen = sizeof(int),
69576+ .mode = 0600,
69577+ .proc_handler = &proc_dointvec,
69578+ },
69579+ {
69580+ .procname = "audit_gid",
69581+ .data = &grsec_audit_gid,
69582+ .maxlen = sizeof(int),
69583+ .mode = 0600,
69584+ .proc_handler = &proc_dointvec,
69585+ },
69586+#endif
69587+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
69588+ {
69589+ .procname = "audit_chdir",
69590+ .data = &grsec_enable_chdir,
69591+ .maxlen = sizeof(int),
69592+ .mode = 0600,
69593+ .proc_handler = &proc_dointvec,
69594+ },
69595+#endif
69596+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
69597+ {
69598+ .procname = "audit_mount",
69599+ .data = &grsec_enable_mount,
69600+ .maxlen = sizeof(int),
69601+ .mode = 0600,
69602+ .proc_handler = &proc_dointvec,
69603+ },
69604+#endif
69605+#ifdef CONFIG_GRKERNSEC_DMESG
69606+ {
69607+ .procname = "dmesg",
69608+ .data = &grsec_enable_dmesg,
69609+ .maxlen = sizeof(int),
69610+ .mode = 0600,
69611+ .proc_handler = &proc_dointvec,
69612+ },
69613+#endif
69614+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69615+ {
69616+ .procname = "chroot_findtask",
69617+ .data = &grsec_enable_chroot_findtask,
69618+ .maxlen = sizeof(int),
69619+ .mode = 0600,
69620+ .proc_handler = &proc_dointvec,
69621+ },
69622+#endif
69623+#ifdef CONFIG_GRKERNSEC_RESLOG
69624+ {
69625+ .procname = "resource_logging",
69626+ .data = &grsec_resource_logging,
69627+ .maxlen = sizeof(int),
69628+ .mode = 0600,
69629+ .proc_handler = &proc_dointvec,
69630+ },
69631+#endif
69632+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
69633+ {
69634+ .procname = "audit_ptrace",
69635+ .data = &grsec_enable_audit_ptrace,
69636+ .maxlen = sizeof(int),
69637+ .mode = 0600,
69638+ .proc_handler = &proc_dointvec,
69639+ },
69640+#endif
69641+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
69642+ {
69643+ .procname = "harden_ptrace",
69644+ .data = &grsec_enable_harden_ptrace,
69645+ .maxlen = sizeof(int),
69646+ .mode = 0600,
69647+ .proc_handler = &proc_dointvec,
69648+ },
69649+#endif
69650+ {
69651+ .procname = "grsec_lock",
69652+ .data = &grsec_lock,
69653+ .maxlen = sizeof(int),
69654+ .mode = 0600,
69655+ .proc_handler = &proc_dointvec,
69656+ },
69657+#endif
69658+#ifdef CONFIG_GRKERNSEC_ROFS
69659+ {
69660+ .procname = "romount_protect",
69661+ .data = &grsec_enable_rofs,
69662+ .maxlen = sizeof(int),
69663+ .mode = 0600,
69664+ .proc_handler = &proc_dointvec_minmax,
69665+ .extra1 = &one,
69666+ .extra2 = &one,
69667+ },
69668+#endif
69669+ { }
69670+};
69671+#endif
69672diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
69673new file mode 100644
69674index 0000000..0dc13c3
69675--- /dev/null
69676+++ b/grsecurity/grsec_time.c
69677@@ -0,0 +1,16 @@
69678+#include <linux/kernel.h>
69679+#include <linux/sched.h>
69680+#include <linux/grinternal.h>
69681+#include <linux/module.h>
69682+
69683+void
69684+gr_log_timechange(void)
69685+{
69686+#ifdef CONFIG_GRKERNSEC_TIME
69687+ if (grsec_enable_time)
69688+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
69689+#endif
69690+ return;
69691+}
69692+
69693+EXPORT_SYMBOL(gr_log_timechange);
69694diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
69695new file mode 100644
69696index 0000000..ee57dcf
69697--- /dev/null
69698+++ b/grsecurity/grsec_tpe.c
69699@@ -0,0 +1,73 @@
69700+#include <linux/kernel.h>
69701+#include <linux/sched.h>
69702+#include <linux/file.h>
69703+#include <linux/fs.h>
69704+#include <linux/grinternal.h>
69705+
69706+extern int gr_acl_tpe_check(void);
69707+
69708+int
69709+gr_tpe_allow(const struct file *file)
69710+{
69711+#ifdef CONFIG_GRKERNSEC
69712+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
69713+ const struct cred *cred = current_cred();
69714+ char *msg = NULL;
69715+ char *msg2 = NULL;
69716+
69717+ // never restrict root
69718+ if (gr_is_global_root(cred->uid))
69719+ return 1;
69720+
69721+ if (grsec_enable_tpe) {
69722+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
69723+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
69724+ msg = "not being in trusted group";
69725+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
69726+ msg = "being in untrusted group";
69727+#else
69728+ if (in_group_p(grsec_tpe_gid))
69729+ msg = "being in untrusted group";
69730+#endif
69731+ }
69732+ if (!msg && gr_acl_tpe_check())
69733+ msg = "being in untrusted role";
69734+
69735+ // not in any affected group/role
69736+ if (!msg)
69737+ goto next_check;
69738+
69739+ if (gr_is_global_nonroot(inode->i_uid))
69740+ msg2 = "file in non-root-owned directory";
69741+ else if (inode->i_mode & S_IWOTH)
69742+ msg2 = "file in world-writable directory";
69743+ else if (inode->i_mode & S_IWGRP)
69744+ msg2 = "file in group-writable directory";
69745+
69746+ if (msg && msg2) {
69747+ char fullmsg[70] = {0};
69748+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
69749+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
69750+ return 0;
69751+ }
69752+ msg = NULL;
69753+next_check:
69754+#ifdef CONFIG_GRKERNSEC_TPE_ALL
69755+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
69756+ return 1;
69757+
69758+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
69759+ msg = "directory not owned by user";
69760+ else if (inode->i_mode & S_IWOTH)
69761+ msg = "file in world-writable directory";
69762+ else if (inode->i_mode & S_IWGRP)
69763+ msg = "file in group-writable directory";
69764+
69765+ if (msg) {
69766+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
69767+ return 0;
69768+ }
69769+#endif
69770+#endif
69771+ return 1;
69772+}
69773diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
69774new file mode 100644
69775index 0000000..9f7b1ac
69776--- /dev/null
69777+++ b/grsecurity/grsum.c
69778@@ -0,0 +1,61 @@
69779+#include <linux/err.h>
69780+#include <linux/kernel.h>
69781+#include <linux/sched.h>
69782+#include <linux/mm.h>
69783+#include <linux/scatterlist.h>
69784+#include <linux/crypto.h>
69785+#include <linux/gracl.h>
69786+
69787+
69788+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
69789+#error "crypto and sha256 must be built into the kernel"
69790+#endif
69791+
69792+int
69793+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
69794+{
69795+ char *p;
69796+ struct crypto_hash *tfm;
69797+ struct hash_desc desc;
69798+ struct scatterlist sg;
69799+ unsigned char temp_sum[GR_SHA_LEN];
69800+ volatile int retval = 0;
69801+ volatile int dummy = 0;
69802+ unsigned int i;
69803+
69804+ sg_init_table(&sg, 1);
69805+
69806+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
69807+ if (IS_ERR(tfm)) {
69808+ /* should never happen, since sha256 should be built in */
69809+ return 1;
69810+ }
69811+
69812+ desc.tfm = tfm;
69813+ desc.flags = 0;
69814+
69815+ crypto_hash_init(&desc);
69816+
69817+ p = salt;
69818+ sg_set_buf(&sg, p, GR_SALT_LEN);
69819+ crypto_hash_update(&desc, &sg, sg.length);
69820+
69821+ p = entry->pw;
69822+ sg_set_buf(&sg, p, strlen(p));
69823+
69824+ crypto_hash_update(&desc, &sg, sg.length);
69825+
69826+ crypto_hash_final(&desc, temp_sum);
69827+
69828+ memset(entry->pw, 0, GR_PW_LEN);
69829+
69830+ for (i = 0; i < GR_SHA_LEN; i++)
69831+ if (sum[i] != temp_sum[i])
69832+ retval = 1;
69833+ else
69834+ dummy = 1; // waste a cycle
69835+
69836+ crypto_free_hash(tfm);
69837+
69838+ return retval;
69839+}
69840diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
69841index 77ff547..181834f 100644
69842--- a/include/asm-generic/4level-fixup.h
69843+++ b/include/asm-generic/4level-fixup.h
69844@@ -13,8 +13,10 @@
69845 #define pmd_alloc(mm, pud, address) \
69846 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
69847 NULL: pmd_offset(pud, address))
69848+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
69849
69850 #define pud_alloc(mm, pgd, address) (pgd)
69851+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
69852 #define pud_offset(pgd, start) (pgd)
69853 #define pud_none(pud) 0
69854 #define pud_bad(pud) 0
69855diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
69856index b7babf0..04ad282 100644
69857--- a/include/asm-generic/atomic-long.h
69858+++ b/include/asm-generic/atomic-long.h
69859@@ -22,6 +22,12 @@
69860
69861 typedef atomic64_t atomic_long_t;
69862
69863+#ifdef CONFIG_PAX_REFCOUNT
69864+typedef atomic64_unchecked_t atomic_long_unchecked_t;
69865+#else
69866+typedef atomic64_t atomic_long_unchecked_t;
69867+#endif
69868+
69869 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
69870
69871 static inline long atomic_long_read(atomic_long_t *l)
69872@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
69873 return (long)atomic64_read(v);
69874 }
69875
69876+#ifdef CONFIG_PAX_REFCOUNT
69877+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
69878+{
69879+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69880+
69881+ return (long)atomic64_read_unchecked(v);
69882+}
69883+#endif
69884+
69885 static inline void atomic_long_set(atomic_long_t *l, long i)
69886 {
69887 atomic64_t *v = (atomic64_t *)l;
69888@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
69889 atomic64_set(v, i);
69890 }
69891
69892+#ifdef CONFIG_PAX_REFCOUNT
69893+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
69894+{
69895+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69896+
69897+ atomic64_set_unchecked(v, i);
69898+}
69899+#endif
69900+
69901 static inline void atomic_long_inc(atomic_long_t *l)
69902 {
69903 atomic64_t *v = (atomic64_t *)l;
69904@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
69905 atomic64_inc(v);
69906 }
69907
69908+#ifdef CONFIG_PAX_REFCOUNT
69909+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
69910+{
69911+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69912+
69913+ atomic64_inc_unchecked(v);
69914+}
69915+#endif
69916+
69917 static inline void atomic_long_dec(atomic_long_t *l)
69918 {
69919 atomic64_t *v = (atomic64_t *)l;
69920@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
69921 atomic64_dec(v);
69922 }
69923
69924+#ifdef CONFIG_PAX_REFCOUNT
69925+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
69926+{
69927+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69928+
69929+ atomic64_dec_unchecked(v);
69930+}
69931+#endif
69932+
69933 static inline void atomic_long_add(long i, atomic_long_t *l)
69934 {
69935 atomic64_t *v = (atomic64_t *)l;
69936@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
69937 atomic64_add(i, v);
69938 }
69939
69940+#ifdef CONFIG_PAX_REFCOUNT
69941+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
69942+{
69943+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69944+
69945+ atomic64_add_unchecked(i, v);
69946+}
69947+#endif
69948+
69949 static inline void atomic_long_sub(long i, atomic_long_t *l)
69950 {
69951 atomic64_t *v = (atomic64_t *)l;
69952@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
69953 atomic64_sub(i, v);
69954 }
69955
69956+#ifdef CONFIG_PAX_REFCOUNT
69957+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
69958+{
69959+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69960+
69961+ atomic64_sub_unchecked(i, v);
69962+}
69963+#endif
69964+
69965 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
69966 {
69967 atomic64_t *v = (atomic64_t *)l;
69968@@ -101,6 +161,15 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
69969 return (long)atomic64_add_return(i, v);
69970 }
69971
69972+#ifdef CONFIG_PAX_REFCOUNT
69973+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
69974+{
69975+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69976+
69977+ return (long)atomic64_add_return_unchecked(i, v);
69978+}
69979+#endif
69980+
69981 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
69982 {
69983 atomic64_t *v = (atomic64_t *)l;
69984@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
69985 return (long)atomic64_inc_return(v);
69986 }
69987
69988+#ifdef CONFIG_PAX_REFCOUNT
69989+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
69990+{
69991+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
69992+
69993+ return (long)atomic64_inc_return_unchecked(v);
69994+}
69995+#endif
69996+
69997 static inline long atomic_long_dec_return(atomic_long_t *l)
69998 {
69999 atomic64_t *v = (atomic64_t *)l;
70000@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
70001
70002 typedef atomic_t atomic_long_t;
70003
70004+#ifdef CONFIG_PAX_REFCOUNT
70005+typedef atomic_unchecked_t atomic_long_unchecked_t;
70006+#else
70007+typedef atomic_t atomic_long_unchecked_t;
70008+#endif
70009+
70010 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
70011 static inline long atomic_long_read(atomic_long_t *l)
70012 {
70013@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
70014 return (long)atomic_read(v);
70015 }
70016
70017+#ifdef CONFIG_PAX_REFCOUNT
70018+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
70019+{
70020+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70021+
70022+ return (long)atomic_read_unchecked(v);
70023+}
70024+#endif
70025+
70026 static inline void atomic_long_set(atomic_long_t *l, long i)
70027 {
70028 atomic_t *v = (atomic_t *)l;
70029@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
70030 atomic_set(v, i);
70031 }
70032
70033+#ifdef CONFIG_PAX_REFCOUNT
70034+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
70035+{
70036+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70037+
70038+ atomic_set_unchecked(v, i);
70039+}
70040+#endif
70041+
70042 static inline void atomic_long_inc(atomic_long_t *l)
70043 {
70044 atomic_t *v = (atomic_t *)l;
70045@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
70046 atomic_inc(v);
70047 }
70048
70049+#ifdef CONFIG_PAX_REFCOUNT
70050+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
70051+{
70052+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70053+
70054+ atomic_inc_unchecked(v);
70055+}
70056+#endif
70057+
70058 static inline void atomic_long_dec(atomic_long_t *l)
70059 {
70060 atomic_t *v = (atomic_t *)l;
70061@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
70062 atomic_dec(v);
70063 }
70064
70065+#ifdef CONFIG_PAX_REFCOUNT
70066+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
70067+{
70068+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70069+
70070+ atomic_dec_unchecked(v);
70071+}
70072+#endif
70073+
70074 static inline void atomic_long_add(long i, atomic_long_t *l)
70075 {
70076 atomic_t *v = (atomic_t *)l;
70077@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
70078 atomic_add(i, v);
70079 }
70080
70081+#ifdef CONFIG_PAX_REFCOUNT
70082+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
70083+{
70084+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70085+
70086+ atomic_add_unchecked(i, v);
70087+}
70088+#endif
70089+
70090 static inline void atomic_long_sub(long i, atomic_long_t *l)
70091 {
70092 atomic_t *v = (atomic_t *)l;
70093@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
70094 atomic_sub(i, v);
70095 }
70096
70097+#ifdef CONFIG_PAX_REFCOUNT
70098+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
70099+{
70100+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70101+
70102+ atomic_sub_unchecked(i, v);
70103+}
70104+#endif
70105+
70106 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
70107 {
70108 atomic_t *v = (atomic_t *)l;
70109@@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
70110 return (long)atomic_add_return(i, v);
70111 }
70112
70113+#ifdef CONFIG_PAX_REFCOUNT
70114+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
70115+{
70116+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70117+
70118+ return (long)atomic_add_return_unchecked(i, v);
70119+}
70120+
70121+#endif
70122+
70123 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
70124 {
70125 atomic_t *v = (atomic_t *)l;
70126@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
70127 return (long)atomic_inc_return(v);
70128 }
70129
70130+#ifdef CONFIG_PAX_REFCOUNT
70131+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
70132+{
70133+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
70134+
70135+ return (long)atomic_inc_return_unchecked(v);
70136+}
70137+#endif
70138+
70139 static inline long atomic_long_dec_return(atomic_long_t *l)
70140 {
70141 atomic_t *v = (atomic_t *)l;
70142@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
70143
70144 #endif /* BITS_PER_LONG == 64 */
70145
70146+#ifdef CONFIG_PAX_REFCOUNT
70147+static inline void pax_refcount_needs_these_functions(void)
70148+{
70149+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
70150+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
70151+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
70152+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
70153+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
70154+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
70155+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
70156+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
70157+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
70158+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
70159+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
70160+#ifdef CONFIG_X86
70161+ atomic_clear_mask_unchecked(0, NULL);
70162+ atomic_set_mask_unchecked(0, NULL);
70163+#endif
70164+
70165+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
70166+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
70167+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
70168+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
70169+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
70170+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
70171+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
70172+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
70173+}
70174+#else
70175+#define atomic_read_unchecked(v) atomic_read(v)
70176+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
70177+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
70178+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
70179+#define atomic_inc_unchecked(v) atomic_inc(v)
70180+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
70181+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
70182+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
70183+#define atomic_dec_unchecked(v) atomic_dec(v)
70184+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
70185+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
70186+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
70187+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
70188+
70189+#define atomic_long_read_unchecked(v) atomic_long_read(v)
70190+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
70191+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
70192+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
70193+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
70194+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
70195+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
70196+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
70197+#endif
70198+
70199 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
70200diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
70201index 33bd2de..f31bff97 100644
70202--- a/include/asm-generic/atomic.h
70203+++ b/include/asm-generic/atomic.h
70204@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
70205 * Atomically clears the bits set in @mask from @v
70206 */
70207 #ifndef atomic_clear_mask
70208-static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
70209+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
70210 {
70211 unsigned long flags;
70212
70213diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
70214index b18ce4f..2ee2843 100644
70215--- a/include/asm-generic/atomic64.h
70216+++ b/include/asm-generic/atomic64.h
70217@@ -16,6 +16,8 @@ typedef struct {
70218 long long counter;
70219 } atomic64_t;
70220
70221+typedef atomic64_t atomic64_unchecked_t;
70222+
70223 #define ATOMIC64_INIT(i) { (i) }
70224
70225 extern long long atomic64_read(const atomic64_t *v);
70226@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
70227 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
70228 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
70229
70230+#define atomic64_read_unchecked(v) atomic64_read(v)
70231+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
70232+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
70233+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
70234+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
70235+#define atomic64_inc_unchecked(v) atomic64_inc(v)
70236+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
70237+#define atomic64_dec_unchecked(v) atomic64_dec(v)
70238+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
70239+
70240 #endif /* _ASM_GENERIC_ATOMIC64_H */
70241diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
70242index 1bfcfe5..e04c5c9 100644
70243--- a/include/asm-generic/cache.h
70244+++ b/include/asm-generic/cache.h
70245@@ -6,7 +6,7 @@
70246 * cache lines need to provide their own cache.h.
70247 */
70248
70249-#define L1_CACHE_SHIFT 5
70250-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
70251+#define L1_CACHE_SHIFT 5UL
70252+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
70253
70254 #endif /* __ASM_GENERIC_CACHE_H */
70255diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
70256index 0d68a1e..b74a761 100644
70257--- a/include/asm-generic/emergency-restart.h
70258+++ b/include/asm-generic/emergency-restart.h
70259@@ -1,7 +1,7 @@
70260 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
70261 #define _ASM_GENERIC_EMERGENCY_RESTART_H
70262
70263-static inline void machine_emergency_restart(void)
70264+static inline __noreturn void machine_emergency_restart(void)
70265 {
70266 machine_restart(NULL);
70267 }
70268diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
70269index 90f99c7..00ce236 100644
70270--- a/include/asm-generic/kmap_types.h
70271+++ b/include/asm-generic/kmap_types.h
70272@@ -2,9 +2,9 @@
70273 #define _ASM_GENERIC_KMAP_TYPES_H
70274
70275 #ifdef __WITH_KM_FENCE
70276-# define KM_TYPE_NR 41
70277+# define KM_TYPE_NR 42
70278 #else
70279-# define KM_TYPE_NR 20
70280+# define KM_TYPE_NR 21
70281 #endif
70282
70283 #endif
70284diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
70285index 9ceb03b..62b0b8f 100644
70286--- a/include/asm-generic/local.h
70287+++ b/include/asm-generic/local.h
70288@@ -23,24 +23,37 @@ typedef struct
70289 atomic_long_t a;
70290 } local_t;
70291
70292+typedef struct {
70293+ atomic_long_unchecked_t a;
70294+} local_unchecked_t;
70295+
70296 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
70297
70298 #define local_read(l) atomic_long_read(&(l)->a)
70299+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
70300 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
70301+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
70302 #define local_inc(l) atomic_long_inc(&(l)->a)
70303+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
70304 #define local_dec(l) atomic_long_dec(&(l)->a)
70305+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
70306 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
70307+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
70308 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
70309+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
70310
70311 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
70312 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
70313 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
70314 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
70315 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
70316+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
70317 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
70318 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
70319+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
70320
70321 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
70322+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
70323 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
70324 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
70325 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
70326diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
70327index 725612b..9cc513a 100644
70328--- a/include/asm-generic/pgtable-nopmd.h
70329+++ b/include/asm-generic/pgtable-nopmd.h
70330@@ -1,14 +1,19 @@
70331 #ifndef _PGTABLE_NOPMD_H
70332 #define _PGTABLE_NOPMD_H
70333
70334-#ifndef __ASSEMBLY__
70335-
70336 #include <asm-generic/pgtable-nopud.h>
70337
70338-struct mm_struct;
70339-
70340 #define __PAGETABLE_PMD_FOLDED
70341
70342+#define PMD_SHIFT PUD_SHIFT
70343+#define PTRS_PER_PMD 1
70344+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
70345+#define PMD_MASK (~(PMD_SIZE-1))
70346+
70347+#ifndef __ASSEMBLY__
70348+
70349+struct mm_struct;
70350+
70351 /*
70352 * Having the pmd type consist of a pud gets the size right, and allows
70353 * us to conceptually access the pud entry that this pmd is folded into
70354@@ -16,11 +21,6 @@ struct mm_struct;
70355 */
70356 typedef struct { pud_t pud; } pmd_t;
70357
70358-#define PMD_SHIFT PUD_SHIFT
70359-#define PTRS_PER_PMD 1
70360-#define PMD_SIZE (1UL << PMD_SHIFT)
70361-#define PMD_MASK (~(PMD_SIZE-1))
70362-
70363 /*
70364 * The "pud_xxx()" functions here are trivial for a folded two-level
70365 * setup: the pmd is never bad, and a pmd always exists (as it's folded
70366diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
70367index 810431d..0ec4804f 100644
70368--- a/include/asm-generic/pgtable-nopud.h
70369+++ b/include/asm-generic/pgtable-nopud.h
70370@@ -1,10 +1,15 @@
70371 #ifndef _PGTABLE_NOPUD_H
70372 #define _PGTABLE_NOPUD_H
70373
70374-#ifndef __ASSEMBLY__
70375-
70376 #define __PAGETABLE_PUD_FOLDED
70377
70378+#define PUD_SHIFT PGDIR_SHIFT
70379+#define PTRS_PER_PUD 1
70380+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
70381+#define PUD_MASK (~(PUD_SIZE-1))
70382+
70383+#ifndef __ASSEMBLY__
70384+
70385 /*
70386 * Having the pud type consist of a pgd gets the size right, and allows
70387 * us to conceptually access the pgd entry that this pud is folded into
70388@@ -12,11 +17,6 @@
70389 */
70390 typedef struct { pgd_t pgd; } pud_t;
70391
70392-#define PUD_SHIFT PGDIR_SHIFT
70393-#define PTRS_PER_PUD 1
70394-#define PUD_SIZE (1UL << PUD_SHIFT)
70395-#define PUD_MASK (~(PUD_SIZE-1))
70396-
70397 /*
70398 * The "pgd_xxx()" functions here are trivial for a folded two-level
70399 * setup: the pud is never bad, and a pud always exists (as it's folded
70400@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
70401 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
70402
70403 #define pgd_populate(mm, pgd, pud) do { } while (0)
70404+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
70405 /*
70406 * (puds are folded into pgds so this doesn't get actually called,
70407 * but the define is needed for a generic inline function.)
70408diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
70409index a59ff51..2594a70 100644
70410--- a/include/asm-generic/pgtable.h
70411+++ b/include/asm-generic/pgtable.h
70412@@ -688,6 +688,14 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
70413 }
70414 #endif /* CONFIG_NUMA_BALANCING */
70415
70416+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
70417+static inline unsigned long pax_open_kernel(void) { return 0; }
70418+#endif
70419+
70420+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
70421+static inline unsigned long pax_close_kernel(void) { return 0; }
70422+#endif
70423+
70424 #endif /* CONFIG_MMU */
70425
70426 #endif /* !__ASSEMBLY__ */
70427diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
70428index c184aa8..d049942 100644
70429--- a/include/asm-generic/uaccess.h
70430+++ b/include/asm-generic/uaccess.h
70431@@ -343,4 +343,12 @@ clear_user(void __user *to, unsigned long n)
70432 return __clear_user(to, n);
70433 }
70434
70435+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
70436+//static inline unsigned long pax_open_userland(void) { return 0; }
70437+#endif
70438+
70439+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
70440+//static inline unsigned long pax_close_userland(void) { return 0; }
70441+#endif
70442+
70443 #endif /* __ASM_GENERIC_UACCESS_H */
70444diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
70445index eb58d2d..df131bf 100644
70446--- a/include/asm-generic/vmlinux.lds.h
70447+++ b/include/asm-generic/vmlinux.lds.h
70448@@ -239,6 +239,7 @@
70449 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
70450 VMLINUX_SYMBOL(__start_rodata) = .; \
70451 *(.rodata) *(.rodata.*) \
70452+ *(.data..read_only) \
70453 *(__vermagic) /* Kernel version magic */ \
70454 . = ALIGN(8); \
70455 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
70456@@ -749,17 +750,18 @@
70457 * section in the linker script will go there too. @phdr should have
70458 * a leading colon.
70459 *
70460- * Note that this macros defines __per_cpu_load as an absolute symbol.
70461+ * Note that this macros defines per_cpu_load as an absolute symbol.
70462 * If there is no need to put the percpu section at a predetermined
70463 * address, use PERCPU_SECTION.
70464 */
70465 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
70466- VMLINUX_SYMBOL(__per_cpu_load) = .; \
70467- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
70468+ per_cpu_load = .; \
70469+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
70470 - LOAD_OFFSET) { \
70471+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
70472 PERCPU_INPUT(cacheline) \
70473 } phdr \
70474- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
70475+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
70476
70477 /**
70478 * PERCPU_SECTION - define output section for percpu area, simple version
70479diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
70480index 418d270..bfd2794 100644
70481--- a/include/crypto/algapi.h
70482+++ b/include/crypto/algapi.h
70483@@ -34,7 +34,7 @@ struct crypto_type {
70484 unsigned int maskclear;
70485 unsigned int maskset;
70486 unsigned int tfmsize;
70487-};
70488+} __do_const;
70489
70490 struct crypto_instance {
70491 struct crypto_alg alg;
70492diff --git a/include/drm/drmP.h b/include/drm/drmP.h
70493index 63d17ee..716de2b 100644
70494--- a/include/drm/drmP.h
70495+++ b/include/drm/drmP.h
70496@@ -72,6 +72,7 @@
70497 #include <linux/workqueue.h>
70498 #include <linux/poll.h>
70499 #include <asm/pgalloc.h>
70500+#include <asm/local.h>
70501 #include <drm/drm.h>
70502 #include <drm/drm_sarea.h>
70503
70504@@ -296,10 +297,12 @@ do { \
70505 * \param cmd command.
70506 * \param arg argument.
70507 */
70508-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
70509+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
70510+ struct drm_file *file_priv);
70511+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
70512 struct drm_file *file_priv);
70513
70514-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
70515+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
70516 unsigned long arg);
70517
70518 #define DRM_IOCTL_NR(n) _IOC_NR(n)
70519@@ -314,10 +317,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
70520 struct drm_ioctl_desc {
70521 unsigned int cmd;
70522 int flags;
70523- drm_ioctl_t *func;
70524+ drm_ioctl_t func;
70525 unsigned int cmd_drv;
70526 const char *name;
70527-};
70528+} __do_const;
70529
70530 /**
70531 * Creates a driver or general drm_ioctl_desc array entry for the given
70532@@ -1015,7 +1018,7 @@ struct drm_info_list {
70533 int (*show)(struct seq_file*, void*); /** show callback */
70534 u32 driver_features; /**< Required driver features for this entry */
70535 void *data;
70536-};
70537+} __do_const;
70538
70539 /**
70540 * debugfs node structure. This structure represents a debugfs file.
70541@@ -1088,7 +1091,7 @@ struct drm_device {
70542
70543 /** \name Usage Counters */
70544 /*@{ */
70545- int open_count; /**< Outstanding files open */
70546+ local_t open_count; /**< Outstanding files open */
70547 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
70548 atomic_t vma_count; /**< Outstanding vma areas open */
70549 int buf_use; /**< Buffers in use -- cannot alloc */
70550@@ -1099,7 +1102,7 @@ struct drm_device {
70551 /*@{ */
70552 unsigned long counters;
70553 enum drm_stat_type types[15];
70554- atomic_t counts[15];
70555+ atomic_unchecked_t counts[15];
70556 /*@} */
70557
70558 struct list_head filelist;
70559diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
70560index f43d556..94d9343 100644
70561--- a/include/drm/drm_crtc_helper.h
70562+++ b/include/drm/drm_crtc_helper.h
70563@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
70564 struct drm_connector *connector);
70565 /* disable encoder when not in use - more explicit than dpms off */
70566 void (*disable)(struct drm_encoder *encoder);
70567-};
70568+} __no_const;
70569
70570 /**
70571 * drm_connector_helper_funcs - helper operations for connectors
70572diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
70573index 72dcbe8..8db58d7 100644
70574--- a/include/drm/ttm/ttm_memory.h
70575+++ b/include/drm/ttm/ttm_memory.h
70576@@ -48,7 +48,7 @@
70577
70578 struct ttm_mem_shrink {
70579 int (*do_shrink) (struct ttm_mem_shrink *);
70580-};
70581+} __no_const;
70582
70583 /**
70584 * struct ttm_mem_global - Global memory accounting structure.
70585diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
70586index 4b840e8..155d235 100644
70587--- a/include/keys/asymmetric-subtype.h
70588+++ b/include/keys/asymmetric-subtype.h
70589@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
70590 /* Verify the signature on a key of this subtype (optional) */
70591 int (*verify_signature)(const struct key *key,
70592 const struct public_key_signature *sig);
70593-};
70594+} __do_const;
70595
70596 /**
70597 * asymmetric_key_subtype - Get the subtype from an asymmetric key
70598diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
70599index c1da539..1dcec55 100644
70600--- a/include/linux/atmdev.h
70601+++ b/include/linux/atmdev.h
70602@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
70603 #endif
70604
70605 struct k_atm_aal_stats {
70606-#define __HANDLE_ITEM(i) atomic_t i
70607+#define __HANDLE_ITEM(i) atomic_unchecked_t i
70608 __AAL_STAT_ITEMS
70609 #undef __HANDLE_ITEM
70610 };
70611@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
70612 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
70613 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
70614 struct module *owner;
70615-};
70616+} __do_const ;
70617
70618 struct atmphy_ops {
70619 int (*start)(struct atm_dev *dev);
70620diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
70621index 70cf138..0418ee2 100644
70622--- a/include/linux/binfmts.h
70623+++ b/include/linux/binfmts.h
70624@@ -73,8 +73,10 @@ struct linux_binfmt {
70625 int (*load_binary)(struct linux_binprm *);
70626 int (*load_shlib)(struct file *);
70627 int (*core_dump)(struct coredump_params *cprm);
70628+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
70629+ void (*handle_mmap)(struct file *);
70630 unsigned long min_coredump; /* minimal dump size */
70631-};
70632+} __do_const;
70633
70634 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
70635
70636diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
70637index 2fdb4a4..54aad7e 100644
70638--- a/include/linux/blkdev.h
70639+++ b/include/linux/blkdev.h
70640@@ -1526,7 +1526,7 @@ struct block_device_operations {
70641 /* this callback is with swap_lock and sometimes page table lock held */
70642 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
70643 struct module *owner;
70644-};
70645+} __do_const;
70646
70647 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
70648 unsigned long);
70649diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
70650index 7c2e030..b72475d 100644
70651--- a/include/linux/blktrace_api.h
70652+++ b/include/linux/blktrace_api.h
70653@@ -23,7 +23,7 @@ struct blk_trace {
70654 struct dentry *dir;
70655 struct dentry *dropped_file;
70656 struct dentry *msg_file;
70657- atomic_t dropped;
70658+ atomic_unchecked_t dropped;
70659 };
70660
70661 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
70662diff --git a/include/linux/cache.h b/include/linux/cache.h
70663index 4c57065..4307975 100644
70664--- a/include/linux/cache.h
70665+++ b/include/linux/cache.h
70666@@ -16,6 +16,10 @@
70667 #define __read_mostly
70668 #endif
70669
70670+#ifndef __read_only
70671+#define __read_only __read_mostly
70672+#endif
70673+
70674 #ifndef ____cacheline_aligned
70675 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
70676 #endif
70677diff --git a/include/linux/capability.h b/include/linux/capability.h
70678index d9a4f7f4..19f77d6 100644
70679--- a/include/linux/capability.h
70680+++ b/include/linux/capability.h
70681@@ -213,8 +213,13 @@ extern bool ns_capable(struct user_namespace *ns, int cap);
70682 extern bool nsown_capable(int cap);
70683 extern bool inode_capable(const struct inode *inode, int cap);
70684 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
70685+extern bool capable_nolog(int cap);
70686+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
70687+extern bool inode_capable_nolog(const struct inode *inode, int cap);
70688
70689 /* audit system wants to get cap info from files as well */
70690 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
70691
70692+extern int is_privileged_binary(const struct dentry *dentry);
70693+
70694 #endif /* !_LINUX_CAPABILITY_H */
70695diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
70696index 8609d57..86e4d79 100644
70697--- a/include/linux/cdrom.h
70698+++ b/include/linux/cdrom.h
70699@@ -87,7 +87,6 @@ struct cdrom_device_ops {
70700
70701 /* driver specifications */
70702 const int capability; /* capability flags */
70703- int n_minors; /* number of active minor devices */
70704 /* handle uniform packets for scsi type devices (scsi,atapi) */
70705 int (*generic_packet) (struct cdrom_device_info *,
70706 struct packet_command *);
70707diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
70708index 4ce9056..86caac6 100644
70709--- a/include/linux/cleancache.h
70710+++ b/include/linux/cleancache.h
70711@@ -31,7 +31,7 @@ struct cleancache_ops {
70712 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
70713 void (*invalidate_inode)(int, struct cleancache_filekey);
70714 void (*invalidate_fs)(int);
70715-};
70716+} __no_const;
70717
70718 extern struct cleancache_ops *
70719 cleancache_register_ops(struct cleancache_ops *ops);
70720diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
70721index 1186098..f87e53d 100644
70722--- a/include/linux/clk-provider.h
70723+++ b/include/linux/clk-provider.h
70724@@ -132,6 +132,7 @@ struct clk_ops {
70725 unsigned long);
70726 void (*init)(struct clk_hw *hw);
70727 };
70728+typedef struct clk_ops __no_const clk_ops_no_const;
70729
70730 /**
70731 * struct clk_init_data - holds init data that's common to all clocks and is
70732diff --git a/include/linux/compat.h b/include/linux/compat.h
70733index 7f0c1dd..206ac34 100644
70734--- a/include/linux/compat.h
70735+++ b/include/linux/compat.h
70736@@ -312,7 +312,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
70737 compat_size_t __user *len_ptr);
70738
70739 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
70740-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
70741+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
70742 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
70743 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
70744 compat_ssize_t msgsz, int msgflg);
70745@@ -419,7 +419,7 @@ extern int compat_ptrace_request(struct task_struct *child,
70746 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
70747 compat_ulong_t addr, compat_ulong_t data);
70748 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
70749- compat_long_t addr, compat_long_t data);
70750+ compat_ulong_t addr, compat_ulong_t data);
70751
70752 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, size_t);
70753 /*
70754@@ -669,6 +669,7 @@ asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr,
70755
70756 int compat_restore_altstack(const compat_stack_t __user *uss);
70757 int __compat_save_altstack(compat_stack_t __user *, unsigned long);
70758+void __compat_save_altstack_ex(compat_stack_t __user *, unsigned long);
70759
70760 asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,
70761 struct compat_timespec __user *interval);
70762diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
70763index 842de22..7f3a41f 100644
70764--- a/include/linux/compiler-gcc4.h
70765+++ b/include/linux/compiler-gcc4.h
70766@@ -39,9 +39,29 @@
70767 # define __compiletime_warning(message) __attribute__((warning(message)))
70768 # define __compiletime_error(message) __attribute__((error(message)))
70769 #endif /* __CHECKER__ */
70770+
70771+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
70772+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
70773+#define __bos0(ptr) __bos((ptr), 0)
70774+#define __bos1(ptr) __bos((ptr), 1)
70775 #endif /* GCC_VERSION >= 40300 */
70776
70777 #if GCC_VERSION >= 40500
70778+
70779+#ifdef CONSTIFY_PLUGIN
70780+#define __no_const __attribute__((no_const))
70781+#define __do_const __attribute__((do_const))
70782+#endif
70783+
70784+#ifdef SIZE_OVERFLOW_PLUGIN
70785+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
70786+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
70787+#endif
70788+
70789+#ifdef LATENT_ENTROPY_PLUGIN
70790+#define __latent_entropy __attribute__((latent_entropy))
70791+#endif
70792+
70793 /*
70794 * Mark a position in code as unreachable. This can be used to
70795 * suppress control flow warnings after asm blocks that transfer
70796diff --git a/include/linux/compiler.h b/include/linux/compiler.h
70797index 92669cd..1771a15 100644
70798--- a/include/linux/compiler.h
70799+++ b/include/linux/compiler.h
70800@@ -5,11 +5,14 @@
70801
70802 #ifdef __CHECKER__
70803 # define __user __attribute__((noderef, address_space(1)))
70804+# define __force_user __force __user
70805 # define __kernel __attribute__((address_space(0)))
70806+# define __force_kernel __force __kernel
70807 # define __safe __attribute__((safe))
70808 # define __force __attribute__((force))
70809 # define __nocast __attribute__((nocast))
70810 # define __iomem __attribute__((noderef, address_space(2)))
70811+# define __force_iomem __force __iomem
70812 # define __must_hold(x) __attribute__((context(x,1,1)))
70813 # define __acquires(x) __attribute__((context(x,0,1)))
70814 # define __releases(x) __attribute__((context(x,1,0)))
70815@@ -17,20 +20,37 @@
70816 # define __release(x) __context__(x,-1)
70817 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
70818 # define __percpu __attribute__((noderef, address_space(3)))
70819+# define __force_percpu __force __percpu
70820 #ifdef CONFIG_SPARSE_RCU_POINTER
70821 # define __rcu __attribute__((noderef, address_space(4)))
70822+# define __force_rcu __force __rcu
70823 #else
70824 # define __rcu
70825+# define __force_rcu
70826 #endif
70827 extern void __chk_user_ptr(const volatile void __user *);
70828 extern void __chk_io_ptr(const volatile void __iomem *);
70829 #else
70830-# define __user
70831-# define __kernel
70832+# ifdef CHECKER_PLUGIN
70833+//# define __user
70834+//# define __force_user
70835+//# define __kernel
70836+//# define __force_kernel
70837+# else
70838+# ifdef STRUCTLEAK_PLUGIN
70839+# define __user __attribute__((user))
70840+# else
70841+# define __user
70842+# endif
70843+# define __force_user
70844+# define __kernel
70845+# define __force_kernel
70846+# endif
70847 # define __safe
70848 # define __force
70849 # define __nocast
70850 # define __iomem
70851+# define __force_iomem
70852 # define __chk_user_ptr(x) (void)0
70853 # define __chk_io_ptr(x) (void)0
70854 # define __builtin_warning(x, y...) (1)
70855@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
70856 # define __release(x) (void)0
70857 # define __cond_lock(x,c) (c)
70858 # define __percpu
70859+# define __force_percpu
70860 # define __rcu
70861+# define __force_rcu
70862 #endif
70863
70864 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
70865@@ -275,6 +297,26 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
70866 # define __attribute_const__ /* unimplemented */
70867 #endif
70868
70869+#ifndef __no_const
70870+# define __no_const
70871+#endif
70872+
70873+#ifndef __do_const
70874+# define __do_const
70875+#endif
70876+
70877+#ifndef __size_overflow
70878+# define __size_overflow(...)
70879+#endif
70880+
70881+#ifndef __intentional_overflow
70882+# define __intentional_overflow(...)
70883+#endif
70884+
70885+#ifndef __latent_entropy
70886+# define __latent_entropy
70887+#endif
70888+
70889 /*
70890 * Tell gcc if a function is cold. The compiler will assume any path
70891 * directly leading to the call is unlikely.
70892@@ -284,6 +326,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
70893 #define __cold
70894 #endif
70895
70896+#ifndef __alloc_size
70897+#define __alloc_size(...)
70898+#endif
70899+
70900+#ifndef __bos
70901+#define __bos(ptr, arg)
70902+#endif
70903+
70904+#ifndef __bos0
70905+#define __bos0(ptr)
70906+#endif
70907+
70908+#ifndef __bos1
70909+#define __bos1(ptr)
70910+#endif
70911+
70912 /* Simple shorthand for a section definition */
70913 #ifndef __section
70914 # define __section(S) __attribute__ ((__section__(#S)))
70915@@ -349,7 +407,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
70916 * use is to mediate communication between process-level code and irq/NMI
70917 * handlers, all running on the same CPU.
70918 */
70919-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
70920+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
70921+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
70922
70923 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
70924 #ifdef CONFIG_KPROBES
70925diff --git a/include/linux/completion.h b/include/linux/completion.h
70926index 33f0280..35c6568 100644
70927--- a/include/linux/completion.h
70928+++ b/include/linux/completion.h
70929@@ -79,15 +79,15 @@ static inline void init_completion(struct completion *x)
70930 extern void wait_for_completion(struct completion *);
70931 extern void wait_for_completion_io(struct completion *);
70932 extern int wait_for_completion_interruptible(struct completion *x);
70933-extern int wait_for_completion_killable(struct completion *x);
70934+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
70935 extern unsigned long wait_for_completion_timeout(struct completion *x,
70936 unsigned long timeout);
70937 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
70938 unsigned long timeout);
70939 extern long wait_for_completion_interruptible_timeout(
70940- struct completion *x, unsigned long timeout);
70941+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
70942 extern long wait_for_completion_killable_timeout(
70943- struct completion *x, unsigned long timeout);
70944+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
70945 extern bool try_wait_for_completion(struct completion *x);
70946 extern bool completion_done(struct completion *x);
70947
70948diff --git a/include/linux/configfs.h b/include/linux/configfs.h
70949index 34025df..d94bbbc 100644
70950--- a/include/linux/configfs.h
70951+++ b/include/linux/configfs.h
70952@@ -125,7 +125,7 @@ struct configfs_attribute {
70953 const char *ca_name;
70954 struct module *ca_owner;
70955 umode_t ca_mode;
70956-};
70957+} __do_const;
70958
70959 /*
70960 * Users often need to create attribute structures for their configurable
70961diff --git a/include/linux/cpu.h b/include/linux/cpu.h
70962index 9f3c7e8..a18c7b6 100644
70963--- a/include/linux/cpu.h
70964+++ b/include/linux/cpu.h
70965@@ -115,7 +115,7 @@ enum {
70966 /* Need to know about CPUs going up/down? */
70967 #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
70968 #define cpu_notifier(fn, pri) { \
70969- static struct notifier_block fn##_nb __cpuinitdata = \
70970+ static struct notifier_block fn##_nb = \
70971 { .notifier_call = fn, .priority = pri }; \
70972 register_cpu_notifier(&fn##_nb); \
70973 }
70974diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
70975index 037d36a..ca5fe6e 100644
70976--- a/include/linux/cpufreq.h
70977+++ b/include/linux/cpufreq.h
70978@@ -262,7 +262,7 @@ struct cpufreq_driver {
70979 int (*suspend) (struct cpufreq_policy *policy);
70980 int (*resume) (struct cpufreq_policy *policy);
70981 struct freq_attr **attr;
70982-};
70983+} __do_const;
70984
70985 /* flags */
70986
70987@@ -321,6 +321,7 @@ struct global_attr {
70988 ssize_t (*store)(struct kobject *a, struct attribute *b,
70989 const char *c, size_t count);
70990 };
70991+typedef struct global_attr __no_const global_attr_no_const;
70992
70993 #define define_one_global_ro(_name) \
70994 static struct global_attr _name = \
70995diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
70996index 8f04062..900239a 100644
70997--- a/include/linux/cpuidle.h
70998+++ b/include/linux/cpuidle.h
70999@@ -52,7 +52,8 @@ struct cpuidle_state {
71000 int index);
71001
71002 int (*enter_dead) (struct cpuidle_device *dev, int index);
71003-};
71004+} __do_const;
71005+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
71006
71007 /* Idle State Flags */
71008 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
71009@@ -191,7 +192,7 @@ struct cpuidle_governor {
71010 void (*reflect) (struct cpuidle_device *dev, int index);
71011
71012 struct module *owner;
71013-};
71014+} __do_const;
71015
71016 #ifdef CONFIG_CPU_IDLE
71017
71018diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
71019index d08e4d2..95fad61 100644
71020--- a/include/linux/cpumask.h
71021+++ b/include/linux/cpumask.h
71022@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
71023 }
71024
71025 /* Valid inputs for n are -1 and 0. */
71026-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
71027+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
71028 {
71029 return n+1;
71030 }
71031
71032-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
71033+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
71034 {
71035 return n+1;
71036 }
71037
71038-static inline unsigned int cpumask_next_and(int n,
71039+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
71040 const struct cpumask *srcp,
71041 const struct cpumask *andp)
71042 {
71043@@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
71044 *
71045 * Returns >= nr_cpu_ids if no further cpus set.
71046 */
71047-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
71048+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
71049 {
71050 /* -1 is a legal arg here. */
71051 if (n != -1)
71052@@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
71053 *
71054 * Returns >= nr_cpu_ids if no further cpus unset.
71055 */
71056-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
71057+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
71058 {
71059 /* -1 is a legal arg here. */
71060 if (n != -1)
71061@@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
71062 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
71063 }
71064
71065-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
71066+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
71067 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
71068
71069 /**
71070diff --git a/include/linux/cred.h b/include/linux/cred.h
71071index 04421e8..6bce4ef 100644
71072--- a/include/linux/cred.h
71073+++ b/include/linux/cred.h
71074@@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
71075 static inline void validate_process_creds(void)
71076 {
71077 }
71078+static inline void validate_task_creds(struct task_struct *task)
71079+{
71080+}
71081 #endif
71082
71083 /**
71084diff --git a/include/linux/crypto.h b/include/linux/crypto.h
71085index b92eadf..b4ecdc1 100644
71086--- a/include/linux/crypto.h
71087+++ b/include/linux/crypto.h
71088@@ -373,7 +373,7 @@ struct cipher_tfm {
71089 const u8 *key, unsigned int keylen);
71090 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
71091 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
71092-};
71093+} __no_const;
71094
71095 struct hash_tfm {
71096 int (*init)(struct hash_desc *desc);
71097@@ -394,13 +394,13 @@ struct compress_tfm {
71098 int (*cot_decompress)(struct crypto_tfm *tfm,
71099 const u8 *src, unsigned int slen,
71100 u8 *dst, unsigned int *dlen);
71101-};
71102+} __no_const;
71103
71104 struct rng_tfm {
71105 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
71106 unsigned int dlen);
71107 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
71108-};
71109+} __no_const;
71110
71111 #define crt_ablkcipher crt_u.ablkcipher
71112 #define crt_aead crt_u.aead
71113diff --git a/include/linux/ctype.h b/include/linux/ctype.h
71114index 653589e..4ef254a 100644
71115--- a/include/linux/ctype.h
71116+++ b/include/linux/ctype.h
71117@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
71118 * Fast implementation of tolower() for internal usage. Do not use in your
71119 * code.
71120 */
71121-static inline char _tolower(const char c)
71122+static inline unsigned char _tolower(const unsigned char c)
71123 {
71124 return c | 0x20;
71125 }
71126diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
71127index 7925bf0..d5143d2 100644
71128--- a/include/linux/decompress/mm.h
71129+++ b/include/linux/decompress/mm.h
71130@@ -77,7 +77,7 @@ static void free(void *where)
71131 * warnings when not needed (indeed large_malloc / large_free are not
71132 * needed by inflate */
71133
71134-#define malloc(a) kmalloc(a, GFP_KERNEL)
71135+#define malloc(a) kmalloc((a), GFP_KERNEL)
71136 #define free(a) kfree(a)
71137
71138 #define large_malloc(a) vmalloc(a)
71139diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
71140index fe8c447..bdc1f33 100644
71141--- a/include/linux/devfreq.h
71142+++ b/include/linux/devfreq.h
71143@@ -114,7 +114,7 @@ struct devfreq_governor {
71144 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
71145 int (*event_handler)(struct devfreq *devfreq,
71146 unsigned int event, void *data);
71147-};
71148+} __do_const;
71149
71150 /**
71151 * struct devfreq - Device devfreq structure
71152diff --git a/include/linux/device.h b/include/linux/device.h
71153index c0a1261..dba7569 100644
71154--- a/include/linux/device.h
71155+++ b/include/linux/device.h
71156@@ -290,7 +290,7 @@ struct subsys_interface {
71157 struct list_head node;
71158 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
71159 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
71160-};
71161+} __do_const;
71162
71163 int subsys_interface_register(struct subsys_interface *sif);
71164 void subsys_interface_unregister(struct subsys_interface *sif);
71165@@ -473,7 +473,7 @@ struct device_type {
71166 void (*release)(struct device *dev);
71167
71168 const struct dev_pm_ops *pm;
71169-};
71170+} __do_const;
71171
71172 /* interface for exporting device attributes */
71173 struct device_attribute {
71174@@ -483,11 +483,12 @@ struct device_attribute {
71175 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
71176 const char *buf, size_t count);
71177 };
71178+typedef struct device_attribute __no_const device_attribute_no_const;
71179
71180 struct dev_ext_attribute {
71181 struct device_attribute attr;
71182 void *var;
71183-};
71184+} __do_const;
71185
71186 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
71187 char *buf);
71188diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
71189index 94af418..b1ca7a2 100644
71190--- a/include/linux/dma-mapping.h
71191+++ b/include/linux/dma-mapping.h
71192@@ -54,7 +54,7 @@ struct dma_map_ops {
71193 u64 (*get_required_mask)(struct device *dev);
71194 #endif
71195 int is_phys;
71196-};
71197+} __do_const;
71198
71199 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
71200
71201diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
71202index 96d3e4a..dc36433 100644
71203--- a/include/linux/dmaengine.h
71204+++ b/include/linux/dmaengine.h
71205@@ -1035,9 +1035,9 @@ struct dma_pinned_list {
71206 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
71207 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
71208
71209-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
71210+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
71211 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
71212-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
71213+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
71214 struct dma_pinned_list *pinned_list, struct page *page,
71215 unsigned int offset, size_t len);
71216
71217diff --git a/include/linux/efi.h b/include/linux/efi.h
71218index 2bc0ad7..3f7b006 100644
71219--- a/include/linux/efi.h
71220+++ b/include/linux/efi.h
71221@@ -745,6 +745,7 @@ struct efivar_operations {
71222 efi_set_variable_t *set_variable;
71223 efi_query_variable_store_t *query_variable_store;
71224 };
71225+typedef struct efivar_operations __no_const efivar_operations_no_const;
71226
71227 struct efivars {
71228 /*
71229diff --git a/include/linux/elf.h b/include/linux/elf.h
71230index 40a3c0e..4c45a38 100644
71231--- a/include/linux/elf.h
71232+++ b/include/linux/elf.h
71233@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
71234 #define elf_note elf32_note
71235 #define elf_addr_t Elf32_Off
71236 #define Elf_Half Elf32_Half
71237+#define elf_dyn Elf32_Dyn
71238
71239 #else
71240
71241@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
71242 #define elf_note elf64_note
71243 #define elf_addr_t Elf64_Off
71244 #define Elf_Half Elf64_Half
71245+#define elf_dyn Elf64_Dyn
71246
71247 #endif
71248
71249diff --git a/include/linux/err.h b/include/linux/err.h
71250index f2edce2..cc2082c 100644
71251--- a/include/linux/err.h
71252+++ b/include/linux/err.h
71253@@ -19,12 +19,12 @@
71254
71255 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
71256
71257-static inline void * __must_check ERR_PTR(long error)
71258+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
71259 {
71260 return (void *) error;
71261 }
71262
71263-static inline long __must_check PTR_ERR(const void *ptr)
71264+static inline long __must_check __intentional_overflow(-1) PTR_ERR(const void *ptr)
71265 {
71266 return (long) ptr;
71267 }
71268diff --git a/include/linux/extcon.h b/include/linux/extcon.h
71269index fcb51c8..bdafcf6 100644
71270--- a/include/linux/extcon.h
71271+++ b/include/linux/extcon.h
71272@@ -134,7 +134,7 @@ struct extcon_dev {
71273 /* /sys/class/extcon/.../mutually_exclusive/... */
71274 struct attribute_group attr_g_muex;
71275 struct attribute **attrs_muex;
71276- struct device_attribute *d_attrs_muex;
71277+ device_attribute_no_const *d_attrs_muex;
71278 };
71279
71280 /**
71281diff --git a/include/linux/fb.h b/include/linux/fb.h
71282index d49c60f..2834fbe 100644
71283--- a/include/linux/fb.h
71284+++ b/include/linux/fb.h
71285@@ -304,7 +304,7 @@ struct fb_ops {
71286 /* called at KDB enter and leave time to prepare the console */
71287 int (*fb_debug_enter)(struct fb_info *info);
71288 int (*fb_debug_leave)(struct fb_info *info);
71289-};
71290+} __do_const;
71291
71292 #ifdef CONFIG_FB_TILEBLITTING
71293 #define FB_TILE_CURSOR_NONE 0
71294diff --git a/include/linux/filter.h b/include/linux/filter.h
71295index f65f5a6..2f4f93a 100644
71296--- a/include/linux/filter.h
71297+++ b/include/linux/filter.h
71298@@ -20,6 +20,7 @@ struct compat_sock_fprog {
71299
71300 struct sk_buff;
71301 struct sock;
71302+struct bpf_jit_work;
71303
71304 struct sk_filter
71305 {
71306@@ -27,6 +28,9 @@ struct sk_filter
71307 unsigned int len; /* Number of filter blocks */
71308 unsigned int (*bpf_func)(const struct sk_buff *skb,
71309 const struct sock_filter *filter);
71310+#ifdef CONFIG_BPF_JIT
71311+ struct bpf_jit_work *work;
71312+#endif
71313 struct rcu_head rcu;
71314 struct sock_filter insns[0];
71315 };
71316diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
71317index 8293262..2b3b8bd 100644
71318--- a/include/linux/frontswap.h
71319+++ b/include/linux/frontswap.h
71320@@ -11,7 +11,7 @@ struct frontswap_ops {
71321 int (*load)(unsigned, pgoff_t, struct page *);
71322 void (*invalidate_page)(unsigned, pgoff_t);
71323 void (*invalidate_area)(unsigned);
71324-};
71325+} __no_const;
71326
71327 extern bool frontswap_enabled;
71328 extern struct frontswap_ops *
71329diff --git a/include/linux/fs.h b/include/linux/fs.h
71330index 65c2be2..4c53f6e 100644
71331--- a/include/linux/fs.h
71332+++ b/include/linux/fs.h
71333@@ -1543,7 +1543,8 @@ struct file_operations {
71334 long (*fallocate)(struct file *file, int mode, loff_t offset,
71335 loff_t len);
71336 int (*show_fdinfo)(struct seq_file *m, struct file *f);
71337-};
71338+} __do_const;
71339+typedef struct file_operations __no_const file_operations_no_const;
71340
71341 struct inode_operations {
71342 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
71343@@ -2688,4 +2689,14 @@ static inline void inode_has_no_xattr(struct inode *inode)
71344 inode->i_flags |= S_NOSEC;
71345 }
71346
71347+static inline bool is_sidechannel_device(const struct inode *inode)
71348+{
71349+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
71350+ umode_t mode = inode->i_mode;
71351+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
71352+#else
71353+ return false;
71354+#endif
71355+}
71356+
71357 #endif /* _LINUX_FS_H */
71358diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
71359index 2b93a9a..855d94a 100644
71360--- a/include/linux/fs_struct.h
71361+++ b/include/linux/fs_struct.h
71362@@ -6,7 +6,7 @@
71363 #include <linux/seqlock.h>
71364
71365 struct fs_struct {
71366- int users;
71367+ atomic_t users;
71368 spinlock_t lock;
71369 seqcount_t seq;
71370 int umask;
71371diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
71372index 5dfa0aa..6acf322 100644
71373--- a/include/linux/fscache-cache.h
71374+++ b/include/linux/fscache-cache.h
71375@@ -112,7 +112,7 @@ struct fscache_operation {
71376 fscache_operation_release_t release;
71377 };
71378
71379-extern atomic_t fscache_op_debug_id;
71380+extern atomic_unchecked_t fscache_op_debug_id;
71381 extern void fscache_op_work_func(struct work_struct *work);
71382
71383 extern void fscache_enqueue_operation(struct fscache_operation *);
71384@@ -134,7 +134,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
71385 INIT_WORK(&op->work, fscache_op_work_func);
71386 atomic_set(&op->usage, 1);
71387 op->state = FSCACHE_OP_ST_INITIALISED;
71388- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
71389+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
71390 op->processor = processor;
71391 op->release = release;
71392 INIT_LIST_HEAD(&op->pend_link);
71393diff --git a/include/linux/fscache.h b/include/linux/fscache.h
71394index 7a08623..4c07b0f 100644
71395--- a/include/linux/fscache.h
71396+++ b/include/linux/fscache.h
71397@@ -152,7 +152,7 @@ struct fscache_cookie_def {
71398 * - this is mandatory for any object that may have data
71399 */
71400 void (*now_uncached)(void *cookie_netfs_data);
71401-};
71402+} __do_const;
71403
71404 /*
71405 * fscache cached network filesystem type
71406diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
71407index a78680a..87bd73e 100644
71408--- a/include/linux/fsnotify.h
71409+++ b/include/linux/fsnotify.h
71410@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
71411 struct inode *inode = path->dentry->d_inode;
71412 __u32 mask = FS_ACCESS;
71413
71414+ if (is_sidechannel_device(inode))
71415+ return;
71416+
71417 if (S_ISDIR(inode->i_mode))
71418 mask |= FS_ISDIR;
71419
71420@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
71421 struct inode *inode = path->dentry->d_inode;
71422 __u32 mask = FS_MODIFY;
71423
71424+ if (is_sidechannel_device(inode))
71425+ return;
71426+
71427 if (S_ISDIR(inode->i_mode))
71428 mask |= FS_ISDIR;
71429
71430@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
71431 */
71432 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
71433 {
71434- return kstrdup(name, GFP_KERNEL);
71435+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
71436 }
71437
71438 /*
71439diff --git a/include/linux/genhd.h b/include/linux/genhd.h
71440index 9f3c275..911b591 100644
71441--- a/include/linux/genhd.h
71442+++ b/include/linux/genhd.h
71443@@ -194,7 +194,7 @@ struct gendisk {
71444 struct kobject *slave_dir;
71445
71446 struct timer_rand_state *random;
71447- atomic_t sync_io; /* RAID */
71448+ atomic_unchecked_t sync_io; /* RAID */
71449 struct disk_events *ev;
71450 #ifdef CONFIG_BLK_DEV_INTEGRITY
71451 struct blk_integrity *integrity;
71452diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
71453index 023bc34..b02b46a 100644
71454--- a/include/linux/genl_magic_func.h
71455+++ b/include/linux/genl_magic_func.h
71456@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
71457 },
71458
71459 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
71460-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
71461+static struct genl_ops ZZZ_genl_ops[] = {
71462 #include GENL_MAGIC_INCLUDE_FILE
71463 };
71464
71465diff --git a/include/linux/gfp.h b/include/linux/gfp.h
71466index 0f615eb..5c3832f 100644
71467--- a/include/linux/gfp.h
71468+++ b/include/linux/gfp.h
71469@@ -35,6 +35,13 @@ struct vm_area_struct;
71470 #define ___GFP_NO_KSWAPD 0x400000u
71471 #define ___GFP_OTHER_NODE 0x800000u
71472 #define ___GFP_WRITE 0x1000000u
71473+
71474+#ifdef CONFIG_PAX_USERCOPY_SLABS
71475+#define ___GFP_USERCOPY 0x2000000u
71476+#else
71477+#define ___GFP_USERCOPY 0
71478+#endif
71479+
71480 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
71481
71482 /*
71483@@ -92,6 +99,7 @@ struct vm_area_struct;
71484 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
71485 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
71486 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
71487+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
71488
71489 /*
71490 * This may seem redundant, but it's a way of annotating false positives vs.
71491@@ -99,7 +107,7 @@ struct vm_area_struct;
71492 */
71493 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
71494
71495-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
71496+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
71497 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
71498
71499 /* This equals 0, but use constants in case they ever change */
71500@@ -153,6 +161,8 @@ struct vm_area_struct;
71501 /* 4GB DMA on some platforms */
71502 #define GFP_DMA32 __GFP_DMA32
71503
71504+#define GFP_USERCOPY __GFP_USERCOPY
71505+
71506 /* Convert GFP flags to their corresponding migrate type */
71507 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
71508 {
71509diff --git a/include/linux/gracl.h b/include/linux/gracl.h
71510new file mode 100644
71511index 0000000..ebe6d72
71512--- /dev/null
71513+++ b/include/linux/gracl.h
71514@@ -0,0 +1,319 @@
71515+#ifndef GR_ACL_H
71516+#define GR_ACL_H
71517+
71518+#include <linux/grdefs.h>
71519+#include <linux/resource.h>
71520+#include <linux/capability.h>
71521+#include <linux/dcache.h>
71522+#include <asm/resource.h>
71523+
71524+/* Major status information */
71525+
71526+#define GR_VERSION "grsecurity 2.9.1"
71527+#define GRSECURITY_VERSION 0x2901
71528+
71529+enum {
71530+ GR_SHUTDOWN = 0,
71531+ GR_ENABLE = 1,
71532+ GR_SPROLE = 2,
71533+ GR_RELOAD = 3,
71534+ GR_SEGVMOD = 4,
71535+ GR_STATUS = 5,
71536+ GR_UNSPROLE = 6,
71537+ GR_PASSSET = 7,
71538+ GR_SPROLEPAM = 8,
71539+};
71540+
71541+/* Password setup definitions
71542+ * kernel/grhash.c */
71543+enum {
71544+ GR_PW_LEN = 128,
71545+ GR_SALT_LEN = 16,
71546+ GR_SHA_LEN = 32,
71547+};
71548+
71549+enum {
71550+ GR_SPROLE_LEN = 64,
71551+};
71552+
71553+enum {
71554+ GR_NO_GLOB = 0,
71555+ GR_REG_GLOB,
71556+ GR_CREATE_GLOB
71557+};
71558+
71559+#define GR_NLIMITS 32
71560+
71561+/* Begin Data Structures */
71562+
71563+struct sprole_pw {
71564+ unsigned char *rolename;
71565+ unsigned char salt[GR_SALT_LEN];
71566+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
71567+};
71568+
71569+struct name_entry {
71570+ __u32 key;
71571+ ino_t inode;
71572+ dev_t device;
71573+ char *name;
71574+ __u16 len;
71575+ __u8 deleted;
71576+ struct name_entry *prev;
71577+ struct name_entry *next;
71578+};
71579+
71580+struct inodev_entry {
71581+ struct name_entry *nentry;
71582+ struct inodev_entry *prev;
71583+ struct inodev_entry *next;
71584+};
71585+
71586+struct acl_role_db {
71587+ struct acl_role_label **r_hash;
71588+ __u32 r_size;
71589+};
71590+
71591+struct inodev_db {
71592+ struct inodev_entry **i_hash;
71593+ __u32 i_size;
71594+};
71595+
71596+struct name_db {
71597+ struct name_entry **n_hash;
71598+ __u32 n_size;
71599+};
71600+
71601+struct crash_uid {
71602+ uid_t uid;
71603+ unsigned long expires;
71604+};
71605+
71606+struct gr_hash_struct {
71607+ void **table;
71608+ void **nametable;
71609+ void *first;
71610+ __u32 table_size;
71611+ __u32 used_size;
71612+ int type;
71613+};
71614+
71615+/* Userspace Grsecurity ACL data structures */
71616+
71617+struct acl_subject_label {
71618+ char *filename;
71619+ ino_t inode;
71620+ dev_t device;
71621+ __u32 mode;
71622+ kernel_cap_t cap_mask;
71623+ kernel_cap_t cap_lower;
71624+ kernel_cap_t cap_invert_audit;
71625+
71626+ struct rlimit res[GR_NLIMITS];
71627+ __u32 resmask;
71628+
71629+ __u8 user_trans_type;
71630+ __u8 group_trans_type;
71631+ uid_t *user_transitions;
71632+ gid_t *group_transitions;
71633+ __u16 user_trans_num;
71634+ __u16 group_trans_num;
71635+
71636+ __u32 sock_families[2];
71637+ __u32 ip_proto[8];
71638+ __u32 ip_type;
71639+ struct acl_ip_label **ips;
71640+ __u32 ip_num;
71641+ __u32 inaddr_any_override;
71642+
71643+ __u32 crashes;
71644+ unsigned long expires;
71645+
71646+ struct acl_subject_label *parent_subject;
71647+ struct gr_hash_struct *hash;
71648+ struct acl_subject_label *prev;
71649+ struct acl_subject_label *next;
71650+
71651+ struct acl_object_label **obj_hash;
71652+ __u32 obj_hash_size;
71653+ __u16 pax_flags;
71654+};
71655+
71656+struct role_allowed_ip {
71657+ __u32 addr;
71658+ __u32 netmask;
71659+
71660+ struct role_allowed_ip *prev;
71661+ struct role_allowed_ip *next;
71662+};
71663+
71664+struct role_transition {
71665+ char *rolename;
71666+
71667+ struct role_transition *prev;
71668+ struct role_transition *next;
71669+};
71670+
71671+struct acl_role_label {
71672+ char *rolename;
71673+ uid_t uidgid;
71674+ __u16 roletype;
71675+
71676+ __u16 auth_attempts;
71677+ unsigned long expires;
71678+
71679+ struct acl_subject_label *root_label;
71680+ struct gr_hash_struct *hash;
71681+
71682+ struct acl_role_label *prev;
71683+ struct acl_role_label *next;
71684+
71685+ struct role_transition *transitions;
71686+ struct role_allowed_ip *allowed_ips;
71687+ uid_t *domain_children;
71688+ __u16 domain_child_num;
71689+
71690+ umode_t umask;
71691+
71692+ struct acl_subject_label **subj_hash;
71693+ __u32 subj_hash_size;
71694+};
71695+
71696+struct user_acl_role_db {
71697+ struct acl_role_label **r_table;
71698+ __u32 num_pointers; /* Number of allocations to track */
71699+ __u32 num_roles; /* Number of roles */
71700+ __u32 num_domain_children; /* Number of domain children */
71701+ __u32 num_subjects; /* Number of subjects */
71702+ __u32 num_objects; /* Number of objects */
71703+};
71704+
71705+struct acl_object_label {
71706+ char *filename;
71707+ ino_t inode;
71708+ dev_t device;
71709+ __u32 mode;
71710+
71711+ struct acl_subject_label *nested;
71712+ struct acl_object_label *globbed;
71713+
71714+ /* next two structures not used */
71715+
71716+ struct acl_object_label *prev;
71717+ struct acl_object_label *next;
71718+};
71719+
71720+struct acl_ip_label {
71721+ char *iface;
71722+ __u32 addr;
71723+ __u32 netmask;
71724+ __u16 low, high;
71725+ __u8 mode;
71726+ __u32 type;
71727+ __u32 proto[8];
71728+
71729+ /* next two structures not used */
71730+
71731+ struct acl_ip_label *prev;
71732+ struct acl_ip_label *next;
71733+};
71734+
71735+struct gr_arg {
71736+ struct user_acl_role_db role_db;
71737+ unsigned char pw[GR_PW_LEN];
71738+ unsigned char salt[GR_SALT_LEN];
71739+ unsigned char sum[GR_SHA_LEN];
71740+ unsigned char sp_role[GR_SPROLE_LEN];
71741+ struct sprole_pw *sprole_pws;
71742+ dev_t segv_device;
71743+ ino_t segv_inode;
71744+ uid_t segv_uid;
71745+ __u16 num_sprole_pws;
71746+ __u16 mode;
71747+};
71748+
71749+struct gr_arg_wrapper {
71750+ struct gr_arg *arg;
71751+ __u32 version;
71752+ __u32 size;
71753+};
71754+
71755+struct subject_map {
71756+ struct acl_subject_label *user;
71757+ struct acl_subject_label *kernel;
71758+ struct subject_map *prev;
71759+ struct subject_map *next;
71760+};
71761+
71762+struct acl_subj_map_db {
71763+ struct subject_map **s_hash;
71764+ __u32 s_size;
71765+};
71766+
71767+/* End Data Structures Section */
71768+
71769+/* Hash functions generated by empirical testing by Brad Spengler
71770+ Makes good use of the low bits of the inode. Generally 0-1 times
71771+ in loop for successful match. 0-3 for unsuccessful match.
71772+ Shift/add algorithm with modulus of table size and an XOR*/
71773+
71774+static __inline__ unsigned int
71775+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
71776+{
71777+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
71778+}
71779+
71780+ static __inline__ unsigned int
71781+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
71782+{
71783+ return ((const unsigned long)userp % sz);
71784+}
71785+
71786+static __inline__ unsigned int
71787+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
71788+{
71789+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
71790+}
71791+
71792+static __inline__ unsigned int
71793+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
71794+{
71795+ return full_name_hash((const unsigned char *)name, len) % sz;
71796+}
71797+
71798+#define FOR_EACH_ROLE_START(role) \
71799+ role = role_list; \
71800+ while (role) {
71801+
71802+#define FOR_EACH_ROLE_END(role) \
71803+ role = role->prev; \
71804+ }
71805+
71806+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
71807+ subj = NULL; \
71808+ iter = 0; \
71809+ while (iter < role->subj_hash_size) { \
71810+ if (subj == NULL) \
71811+ subj = role->subj_hash[iter]; \
71812+ if (subj == NULL) { \
71813+ iter++; \
71814+ continue; \
71815+ }
71816+
71817+#define FOR_EACH_SUBJECT_END(subj,iter) \
71818+ subj = subj->next; \
71819+ if (subj == NULL) \
71820+ iter++; \
71821+ }
71822+
71823+
71824+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
71825+ subj = role->hash->first; \
71826+ while (subj != NULL) {
71827+
71828+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
71829+ subj = subj->next; \
71830+ }
71831+
71832+#endif
71833+
71834diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
71835new file mode 100644
71836index 0000000..33ebd1f
71837--- /dev/null
71838+++ b/include/linux/gracl_compat.h
71839@@ -0,0 +1,156 @@
71840+#ifndef GR_ACL_COMPAT_H
71841+#define GR_ACL_COMPAT_H
71842+
71843+#include <linux/resource.h>
71844+#include <asm/resource.h>
71845+
71846+struct sprole_pw_compat {
71847+ compat_uptr_t rolename;
71848+ unsigned char salt[GR_SALT_LEN];
71849+ unsigned char sum[GR_SHA_LEN];
71850+};
71851+
71852+struct gr_hash_struct_compat {
71853+ compat_uptr_t table;
71854+ compat_uptr_t nametable;
71855+ compat_uptr_t first;
71856+ __u32 table_size;
71857+ __u32 used_size;
71858+ int type;
71859+};
71860+
71861+struct acl_subject_label_compat {
71862+ compat_uptr_t filename;
71863+ compat_ino_t inode;
71864+ __u32 device;
71865+ __u32 mode;
71866+ kernel_cap_t cap_mask;
71867+ kernel_cap_t cap_lower;
71868+ kernel_cap_t cap_invert_audit;
71869+
71870+ struct compat_rlimit res[GR_NLIMITS];
71871+ __u32 resmask;
71872+
71873+ __u8 user_trans_type;
71874+ __u8 group_trans_type;
71875+ compat_uptr_t user_transitions;
71876+ compat_uptr_t group_transitions;
71877+ __u16 user_trans_num;
71878+ __u16 group_trans_num;
71879+
71880+ __u32 sock_families[2];
71881+ __u32 ip_proto[8];
71882+ __u32 ip_type;
71883+ compat_uptr_t ips;
71884+ __u32 ip_num;
71885+ __u32 inaddr_any_override;
71886+
71887+ __u32 crashes;
71888+ compat_ulong_t expires;
71889+
71890+ compat_uptr_t parent_subject;
71891+ compat_uptr_t hash;
71892+ compat_uptr_t prev;
71893+ compat_uptr_t next;
71894+
71895+ compat_uptr_t obj_hash;
71896+ __u32 obj_hash_size;
71897+ __u16 pax_flags;
71898+};
71899+
71900+struct role_allowed_ip_compat {
71901+ __u32 addr;
71902+ __u32 netmask;
71903+
71904+ compat_uptr_t prev;
71905+ compat_uptr_t next;
71906+};
71907+
71908+struct role_transition_compat {
71909+ compat_uptr_t rolename;
71910+
71911+ compat_uptr_t prev;
71912+ compat_uptr_t next;
71913+};
71914+
71915+struct acl_role_label_compat {
71916+ compat_uptr_t rolename;
71917+ uid_t uidgid;
71918+ __u16 roletype;
71919+
71920+ __u16 auth_attempts;
71921+ compat_ulong_t expires;
71922+
71923+ compat_uptr_t root_label;
71924+ compat_uptr_t hash;
71925+
71926+ compat_uptr_t prev;
71927+ compat_uptr_t next;
71928+
71929+ compat_uptr_t transitions;
71930+ compat_uptr_t allowed_ips;
71931+ compat_uptr_t domain_children;
71932+ __u16 domain_child_num;
71933+
71934+ umode_t umask;
71935+
71936+ compat_uptr_t subj_hash;
71937+ __u32 subj_hash_size;
71938+};
71939+
71940+struct user_acl_role_db_compat {
71941+ compat_uptr_t r_table;
71942+ __u32 num_pointers;
71943+ __u32 num_roles;
71944+ __u32 num_domain_children;
71945+ __u32 num_subjects;
71946+ __u32 num_objects;
71947+};
71948+
71949+struct acl_object_label_compat {
71950+ compat_uptr_t filename;
71951+ compat_ino_t inode;
71952+ __u32 device;
71953+ __u32 mode;
71954+
71955+ compat_uptr_t nested;
71956+ compat_uptr_t globbed;
71957+
71958+ compat_uptr_t prev;
71959+ compat_uptr_t next;
71960+};
71961+
71962+struct acl_ip_label_compat {
71963+ compat_uptr_t iface;
71964+ __u32 addr;
71965+ __u32 netmask;
71966+ __u16 low, high;
71967+ __u8 mode;
71968+ __u32 type;
71969+ __u32 proto[8];
71970+
71971+ compat_uptr_t prev;
71972+ compat_uptr_t next;
71973+};
71974+
71975+struct gr_arg_compat {
71976+ struct user_acl_role_db_compat role_db;
71977+ unsigned char pw[GR_PW_LEN];
71978+ unsigned char salt[GR_SALT_LEN];
71979+ unsigned char sum[GR_SHA_LEN];
71980+ unsigned char sp_role[GR_SPROLE_LEN];
71981+ compat_uptr_t sprole_pws;
71982+ __u32 segv_device;
71983+ compat_ino_t segv_inode;
71984+ uid_t segv_uid;
71985+ __u16 num_sprole_pws;
71986+ __u16 mode;
71987+};
71988+
71989+struct gr_arg_wrapper_compat {
71990+ compat_uptr_t arg;
71991+ __u32 version;
71992+ __u32 size;
71993+};
71994+
71995+#endif
71996diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
71997new file mode 100644
71998index 0000000..323ecf2
71999--- /dev/null
72000+++ b/include/linux/gralloc.h
72001@@ -0,0 +1,9 @@
72002+#ifndef __GRALLOC_H
72003+#define __GRALLOC_H
72004+
72005+void acl_free_all(void);
72006+int acl_alloc_stack_init(unsigned long size);
72007+void *acl_alloc(unsigned long len);
72008+void *acl_alloc_num(unsigned long num, unsigned long len);
72009+
72010+#endif
72011diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
72012new file mode 100644
72013index 0000000..be66033
72014--- /dev/null
72015+++ b/include/linux/grdefs.h
72016@@ -0,0 +1,140 @@
72017+#ifndef GRDEFS_H
72018+#define GRDEFS_H
72019+
72020+/* Begin grsecurity status declarations */
72021+
72022+enum {
72023+ GR_READY = 0x01,
72024+ GR_STATUS_INIT = 0x00 // disabled state
72025+};
72026+
72027+/* Begin ACL declarations */
72028+
72029+/* Role flags */
72030+
72031+enum {
72032+ GR_ROLE_USER = 0x0001,
72033+ GR_ROLE_GROUP = 0x0002,
72034+ GR_ROLE_DEFAULT = 0x0004,
72035+ GR_ROLE_SPECIAL = 0x0008,
72036+ GR_ROLE_AUTH = 0x0010,
72037+ GR_ROLE_NOPW = 0x0020,
72038+ GR_ROLE_GOD = 0x0040,
72039+ GR_ROLE_LEARN = 0x0080,
72040+ GR_ROLE_TPE = 0x0100,
72041+ GR_ROLE_DOMAIN = 0x0200,
72042+ GR_ROLE_PAM = 0x0400,
72043+ GR_ROLE_PERSIST = 0x0800
72044+};
72045+
72046+/* ACL Subject and Object mode flags */
72047+enum {
72048+ GR_DELETED = 0x80000000
72049+};
72050+
72051+/* ACL Object-only mode flags */
72052+enum {
72053+ GR_READ = 0x00000001,
72054+ GR_APPEND = 0x00000002,
72055+ GR_WRITE = 0x00000004,
72056+ GR_EXEC = 0x00000008,
72057+ GR_FIND = 0x00000010,
72058+ GR_INHERIT = 0x00000020,
72059+ GR_SETID = 0x00000040,
72060+ GR_CREATE = 0x00000080,
72061+ GR_DELETE = 0x00000100,
72062+ GR_LINK = 0x00000200,
72063+ GR_AUDIT_READ = 0x00000400,
72064+ GR_AUDIT_APPEND = 0x00000800,
72065+ GR_AUDIT_WRITE = 0x00001000,
72066+ GR_AUDIT_EXEC = 0x00002000,
72067+ GR_AUDIT_FIND = 0x00004000,
72068+ GR_AUDIT_INHERIT= 0x00008000,
72069+ GR_AUDIT_SETID = 0x00010000,
72070+ GR_AUDIT_CREATE = 0x00020000,
72071+ GR_AUDIT_DELETE = 0x00040000,
72072+ GR_AUDIT_LINK = 0x00080000,
72073+ GR_PTRACERD = 0x00100000,
72074+ GR_NOPTRACE = 0x00200000,
72075+ GR_SUPPRESS = 0x00400000,
72076+ GR_NOLEARN = 0x00800000,
72077+ GR_INIT_TRANSFER= 0x01000000
72078+};
72079+
72080+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
72081+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
72082+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
72083+
72084+/* ACL subject-only mode flags */
72085+enum {
72086+ GR_KILL = 0x00000001,
72087+ GR_VIEW = 0x00000002,
72088+ GR_PROTECTED = 0x00000004,
72089+ GR_LEARN = 0x00000008,
72090+ GR_OVERRIDE = 0x00000010,
72091+ /* just a placeholder, this mode is only used in userspace */
72092+ GR_DUMMY = 0x00000020,
72093+ GR_PROTSHM = 0x00000040,
72094+ GR_KILLPROC = 0x00000080,
72095+ GR_KILLIPPROC = 0x00000100,
72096+ /* just a placeholder, this mode is only used in userspace */
72097+ GR_NOTROJAN = 0x00000200,
72098+ GR_PROTPROCFD = 0x00000400,
72099+ GR_PROCACCT = 0x00000800,
72100+ GR_RELAXPTRACE = 0x00001000,
72101+ //GR_NESTED = 0x00002000,
72102+ GR_INHERITLEARN = 0x00004000,
72103+ GR_PROCFIND = 0x00008000,
72104+ GR_POVERRIDE = 0x00010000,
72105+ GR_KERNELAUTH = 0x00020000,
72106+ GR_ATSECURE = 0x00040000,
72107+ GR_SHMEXEC = 0x00080000
72108+};
72109+
72110+enum {
72111+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
72112+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
72113+ GR_PAX_ENABLE_MPROTECT = 0x0004,
72114+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
72115+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
72116+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
72117+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
72118+ GR_PAX_DISABLE_MPROTECT = 0x0400,
72119+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
72120+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
72121+};
72122+
72123+enum {
72124+ GR_ID_USER = 0x01,
72125+ GR_ID_GROUP = 0x02,
72126+};
72127+
72128+enum {
72129+ GR_ID_ALLOW = 0x01,
72130+ GR_ID_DENY = 0x02,
72131+};
72132+
72133+#define GR_CRASH_RES 31
72134+#define GR_UIDTABLE_MAX 500
72135+
72136+/* begin resource learning section */
72137+enum {
72138+ GR_RLIM_CPU_BUMP = 60,
72139+ GR_RLIM_FSIZE_BUMP = 50000,
72140+ GR_RLIM_DATA_BUMP = 10000,
72141+ GR_RLIM_STACK_BUMP = 1000,
72142+ GR_RLIM_CORE_BUMP = 10000,
72143+ GR_RLIM_RSS_BUMP = 500000,
72144+ GR_RLIM_NPROC_BUMP = 1,
72145+ GR_RLIM_NOFILE_BUMP = 5,
72146+ GR_RLIM_MEMLOCK_BUMP = 50000,
72147+ GR_RLIM_AS_BUMP = 500000,
72148+ GR_RLIM_LOCKS_BUMP = 2,
72149+ GR_RLIM_SIGPENDING_BUMP = 5,
72150+ GR_RLIM_MSGQUEUE_BUMP = 10000,
72151+ GR_RLIM_NICE_BUMP = 1,
72152+ GR_RLIM_RTPRIO_BUMP = 1,
72153+ GR_RLIM_RTTIME_BUMP = 1000000
72154+};
72155+
72156+#endif
72157diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
72158new file mode 100644
72159index 0000000..fd8598b
72160--- /dev/null
72161+++ b/include/linux/grinternal.h
72162@@ -0,0 +1,228 @@
72163+#ifndef __GRINTERNAL_H
72164+#define __GRINTERNAL_H
72165+
72166+#ifdef CONFIG_GRKERNSEC
72167+
72168+#include <linux/fs.h>
72169+#include <linux/mnt_namespace.h>
72170+#include <linux/nsproxy.h>
72171+#include <linux/gracl.h>
72172+#include <linux/grdefs.h>
72173+#include <linux/grmsg.h>
72174+
72175+void gr_add_learn_entry(const char *fmt, ...)
72176+ __attribute__ ((format (printf, 1, 2)));
72177+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
72178+ const struct vfsmount *mnt);
72179+__u32 gr_check_create(const struct dentry *new_dentry,
72180+ const struct dentry *parent,
72181+ const struct vfsmount *mnt, const __u32 mode);
72182+int gr_check_protected_task(const struct task_struct *task);
72183+__u32 to_gr_audit(const __u32 reqmode);
72184+int gr_set_acls(const int type);
72185+int gr_apply_subject_to_task(struct task_struct *task);
72186+int gr_acl_is_enabled(void);
72187+char gr_roletype_to_char(void);
72188+
72189+void gr_handle_alertkill(struct task_struct *task);
72190+char *gr_to_filename(const struct dentry *dentry,
72191+ const struct vfsmount *mnt);
72192+char *gr_to_filename1(const struct dentry *dentry,
72193+ const struct vfsmount *mnt);
72194+char *gr_to_filename2(const struct dentry *dentry,
72195+ const struct vfsmount *mnt);
72196+char *gr_to_filename3(const struct dentry *dentry,
72197+ const struct vfsmount *mnt);
72198+
72199+extern int grsec_enable_ptrace_readexec;
72200+extern int grsec_enable_harden_ptrace;
72201+extern int grsec_enable_link;
72202+extern int grsec_enable_fifo;
72203+extern int grsec_enable_execve;
72204+extern int grsec_enable_shm;
72205+extern int grsec_enable_execlog;
72206+extern int grsec_enable_signal;
72207+extern int grsec_enable_audit_ptrace;
72208+extern int grsec_enable_forkfail;
72209+extern int grsec_enable_time;
72210+extern int grsec_enable_rofs;
72211+extern int grsec_enable_chroot_shmat;
72212+extern int grsec_enable_chroot_mount;
72213+extern int grsec_enable_chroot_double;
72214+extern int grsec_enable_chroot_pivot;
72215+extern int grsec_enable_chroot_chdir;
72216+extern int grsec_enable_chroot_chmod;
72217+extern int grsec_enable_chroot_mknod;
72218+extern int grsec_enable_chroot_fchdir;
72219+extern int grsec_enable_chroot_nice;
72220+extern int grsec_enable_chroot_execlog;
72221+extern int grsec_enable_chroot_caps;
72222+extern int grsec_enable_chroot_sysctl;
72223+extern int grsec_enable_chroot_unix;
72224+extern int grsec_enable_symlinkown;
72225+extern kgid_t grsec_symlinkown_gid;
72226+extern int grsec_enable_tpe;
72227+extern kgid_t grsec_tpe_gid;
72228+extern int grsec_enable_tpe_all;
72229+extern int grsec_enable_tpe_invert;
72230+extern int grsec_enable_socket_all;
72231+extern kgid_t grsec_socket_all_gid;
72232+extern int grsec_enable_socket_client;
72233+extern kgid_t grsec_socket_client_gid;
72234+extern int grsec_enable_socket_server;
72235+extern kgid_t grsec_socket_server_gid;
72236+extern kgid_t grsec_audit_gid;
72237+extern int grsec_enable_group;
72238+extern int grsec_enable_log_rwxmaps;
72239+extern int grsec_enable_mount;
72240+extern int grsec_enable_chdir;
72241+extern int grsec_resource_logging;
72242+extern int grsec_enable_blackhole;
72243+extern int grsec_lastack_retries;
72244+extern int grsec_enable_brute;
72245+extern int grsec_lock;
72246+
72247+extern spinlock_t grsec_alert_lock;
72248+extern unsigned long grsec_alert_wtime;
72249+extern unsigned long grsec_alert_fyet;
72250+
72251+extern spinlock_t grsec_audit_lock;
72252+
72253+extern rwlock_t grsec_exec_file_lock;
72254+
72255+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
72256+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
72257+ (tsk)->exec_file->f_path.mnt) : "/")
72258+
72259+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
72260+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
72261+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
72262+
72263+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
72264+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
72265+ (tsk)->exec_file->f_path.mnt) : "/")
72266+
72267+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
72268+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
72269+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
72270+
72271+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
72272+
72273+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
72274+
72275+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
72276+{
72277+ if (file1 && file2) {
72278+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
72279+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
72280+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
72281+ return true;
72282+ }
72283+
72284+ return false;
72285+}
72286+
72287+#define GR_CHROOT_CAPS {{ \
72288+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
72289+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
72290+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
72291+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
72292+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
72293+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
72294+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
72295+
72296+#define security_learn(normal_msg,args...) \
72297+({ \
72298+ read_lock(&grsec_exec_file_lock); \
72299+ gr_add_learn_entry(normal_msg "\n", ## args); \
72300+ read_unlock(&grsec_exec_file_lock); \
72301+})
72302+
72303+enum {
72304+ GR_DO_AUDIT,
72305+ GR_DONT_AUDIT,
72306+ /* used for non-audit messages that we shouldn't kill the task on */
72307+ GR_DONT_AUDIT_GOOD
72308+};
72309+
72310+enum {
72311+ GR_TTYSNIFF,
72312+ GR_RBAC,
72313+ GR_RBAC_STR,
72314+ GR_STR_RBAC,
72315+ GR_RBAC_MODE2,
72316+ GR_RBAC_MODE3,
72317+ GR_FILENAME,
72318+ GR_SYSCTL_HIDDEN,
72319+ GR_NOARGS,
72320+ GR_ONE_INT,
72321+ GR_ONE_INT_TWO_STR,
72322+ GR_ONE_STR,
72323+ GR_STR_INT,
72324+ GR_TWO_STR_INT,
72325+ GR_TWO_INT,
72326+ GR_TWO_U64,
72327+ GR_THREE_INT,
72328+ GR_FIVE_INT_TWO_STR,
72329+ GR_TWO_STR,
72330+ GR_THREE_STR,
72331+ GR_FOUR_STR,
72332+ GR_STR_FILENAME,
72333+ GR_FILENAME_STR,
72334+ GR_FILENAME_TWO_INT,
72335+ GR_FILENAME_TWO_INT_STR,
72336+ GR_TEXTREL,
72337+ GR_PTRACE,
72338+ GR_RESOURCE,
72339+ GR_CAP,
72340+ GR_SIG,
72341+ GR_SIG2,
72342+ GR_CRASH1,
72343+ GR_CRASH2,
72344+ GR_PSACCT,
72345+ GR_RWXMAP,
72346+ GR_RWXMAPVMA
72347+};
72348+
72349+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
72350+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
72351+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
72352+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
72353+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
72354+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
72355+#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)
72356+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
72357+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
72358+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
72359+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
72360+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
72361+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
72362+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
72363+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
72364+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
72365+#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)
72366+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
72367+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
72368+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
72369+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
72370+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
72371+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
72372+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
72373+#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)
72374+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
72375+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
72376+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
72377+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
72378+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
72379+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
72380+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
72381+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
72382+#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)
72383+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
72384+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
72385+
72386+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
72387+
72388+#endif
72389+
72390+#endif
72391diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
72392new file mode 100644
72393index 0000000..a4396b5
72394--- /dev/null
72395+++ b/include/linux/grmsg.h
72396@@ -0,0 +1,113 @@
72397+#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"
72398+#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"
72399+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
72400+#define GR_STOPMOD_MSG "denied modification of module state by "
72401+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
72402+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
72403+#define GR_IOPERM_MSG "denied use of ioperm() by "
72404+#define GR_IOPL_MSG "denied use of iopl() by "
72405+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
72406+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
72407+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
72408+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
72409+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
72410+#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"
72411+#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"
72412+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
72413+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
72414+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
72415+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
72416+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
72417+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
72418+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
72419+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
72420+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
72421+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
72422+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
72423+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
72424+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
72425+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
72426+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
72427+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
72428+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
72429+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
72430+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
72431+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
72432+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
72433+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
72434+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
72435+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
72436+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
72437+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
72438+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
72439+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
72440+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
72441+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
72442+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
72443+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
72444+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
72445+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
72446+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
72447+#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"
72448+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
72449+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
72450+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
72451+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
72452+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
72453+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
72454+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
72455+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
72456+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
72457+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
72458+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
72459+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
72460+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
72461+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
72462+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
72463+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
72464+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
72465+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
72466+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
72467+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
72468+#define GR_FAILFORK_MSG "failed fork with errno %s by "
72469+#define GR_NICE_CHROOT_MSG "denied priority change by "
72470+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
72471+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
72472+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
72473+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
72474+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
72475+#define GR_TIME_MSG "time set by "
72476+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
72477+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
72478+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
72479+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
72480+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
72481+#define GR_BIND_MSG "denied bind() by "
72482+#define GR_CONNECT_MSG "denied connect() by "
72483+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
72484+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
72485+#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"
72486+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
72487+#define GR_CAP_ACL_MSG "use of %s denied for "
72488+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
72489+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
72490+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
72491+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
72492+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
72493+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
72494+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
72495+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
72496+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
72497+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
72498+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
72499+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
72500+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
72501+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
72502+#define GR_VM86_MSG "denied use of vm86 by "
72503+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
72504+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
72505+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
72506+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
72507+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
72508+#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds. Please investigate the crash report for "
72509+#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes. Please investigate the crash report for "
72510diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
72511new file mode 100644
72512index 0000000..3676b0b
72513--- /dev/null
72514+++ b/include/linux/grsecurity.h
72515@@ -0,0 +1,242 @@
72516+#ifndef GR_SECURITY_H
72517+#define GR_SECURITY_H
72518+#include <linux/fs.h>
72519+#include <linux/fs_struct.h>
72520+#include <linux/binfmts.h>
72521+#include <linux/gracl.h>
72522+
72523+/* notify of brain-dead configs */
72524+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72525+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
72526+#endif
72527+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
72528+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
72529+#endif
72530+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
72531+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
72532+#endif
72533+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
72534+#error "CONFIG_PAX enabled, but no PaX options are enabled."
72535+#endif
72536+
72537+void gr_handle_brute_attach(unsigned long mm_flags);
72538+void gr_handle_brute_check(void);
72539+void gr_handle_kernel_exploit(void);
72540+
72541+char gr_roletype_to_char(void);
72542+
72543+int gr_acl_enable_at_secure(void);
72544+
72545+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
72546+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
72547+
72548+void gr_del_task_from_ip_table(struct task_struct *p);
72549+
72550+int gr_pid_is_chrooted(struct task_struct *p);
72551+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
72552+int gr_handle_chroot_nice(void);
72553+int gr_handle_chroot_sysctl(const int op);
72554+int gr_handle_chroot_setpriority(struct task_struct *p,
72555+ const int niceval);
72556+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
72557+int gr_handle_chroot_chroot(const struct dentry *dentry,
72558+ const struct vfsmount *mnt);
72559+void gr_handle_chroot_chdir(const struct path *path);
72560+int gr_handle_chroot_chmod(const struct dentry *dentry,
72561+ const struct vfsmount *mnt, const int mode);
72562+int gr_handle_chroot_mknod(const struct dentry *dentry,
72563+ const struct vfsmount *mnt, const int mode);
72564+int gr_handle_chroot_mount(const struct dentry *dentry,
72565+ const struct vfsmount *mnt,
72566+ const char *dev_name);
72567+int gr_handle_chroot_pivot(void);
72568+int gr_handle_chroot_unix(const pid_t pid);
72569+
72570+int gr_handle_rawio(const struct inode *inode);
72571+
72572+void gr_handle_ioperm(void);
72573+void gr_handle_iopl(void);
72574+
72575+umode_t gr_acl_umask(void);
72576+
72577+int gr_tpe_allow(const struct file *file);
72578+
72579+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
72580+void gr_clear_chroot_entries(struct task_struct *task);
72581+
72582+void gr_log_forkfail(const int retval);
72583+void gr_log_timechange(void);
72584+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
72585+void gr_log_chdir(const struct dentry *dentry,
72586+ const struct vfsmount *mnt);
72587+void gr_log_chroot_exec(const struct dentry *dentry,
72588+ const struct vfsmount *mnt);
72589+void gr_log_remount(const char *devname, const int retval);
72590+void gr_log_unmount(const char *devname, const int retval);
72591+void gr_log_mount(const char *from, const char *to, const int retval);
72592+void gr_log_textrel(struct vm_area_struct *vma);
72593+void gr_log_ptgnustack(struct file *file);
72594+void gr_log_rwxmmap(struct file *file);
72595+void gr_log_rwxmprotect(struct vm_area_struct *vma);
72596+
72597+int gr_handle_follow_link(const struct inode *parent,
72598+ const struct inode *inode,
72599+ const struct dentry *dentry,
72600+ const struct vfsmount *mnt);
72601+int gr_handle_fifo(const struct dentry *dentry,
72602+ const struct vfsmount *mnt,
72603+ const struct dentry *dir, const int flag,
72604+ const int acc_mode);
72605+int gr_handle_hardlink(const struct dentry *dentry,
72606+ const struct vfsmount *mnt,
72607+ struct inode *inode,
72608+ const int mode, const struct filename *to);
72609+
72610+int gr_is_capable(const int cap);
72611+int gr_is_capable_nolog(const int cap);
72612+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
72613+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
72614+
72615+void gr_copy_label(struct task_struct *tsk);
72616+void gr_handle_crash(struct task_struct *task, const int sig);
72617+int gr_handle_signal(const struct task_struct *p, const int sig);
72618+int gr_check_crash_uid(const kuid_t uid);
72619+int gr_check_protected_task(const struct task_struct *task);
72620+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
72621+int gr_acl_handle_mmap(const struct file *file,
72622+ const unsigned long prot);
72623+int gr_acl_handle_mprotect(const struct file *file,
72624+ const unsigned long prot);
72625+int gr_check_hidden_task(const struct task_struct *tsk);
72626+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
72627+ const struct vfsmount *mnt);
72628+__u32 gr_acl_handle_utime(const struct dentry *dentry,
72629+ const struct vfsmount *mnt);
72630+__u32 gr_acl_handle_access(const struct dentry *dentry,
72631+ const struct vfsmount *mnt, const int fmode);
72632+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
72633+ const struct vfsmount *mnt, umode_t *mode);
72634+__u32 gr_acl_handle_chown(const struct dentry *dentry,
72635+ const struct vfsmount *mnt);
72636+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
72637+ const struct vfsmount *mnt);
72638+int gr_handle_ptrace(struct task_struct *task, const long request);
72639+int gr_handle_proc_ptrace(struct task_struct *task);
72640+__u32 gr_acl_handle_execve(const struct dentry *dentry,
72641+ const struct vfsmount *mnt);
72642+int gr_check_crash_exec(const struct file *filp);
72643+int gr_acl_is_enabled(void);
72644+void gr_set_kernel_label(struct task_struct *task);
72645+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
72646+ const kgid_t gid);
72647+int gr_set_proc_label(const struct dentry *dentry,
72648+ const struct vfsmount *mnt,
72649+ const int unsafe_flags);
72650+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
72651+ const struct vfsmount *mnt);
72652+__u32 gr_acl_handle_open(const struct dentry *dentry,
72653+ const struct vfsmount *mnt, int acc_mode);
72654+__u32 gr_acl_handle_creat(const struct dentry *dentry,
72655+ const struct dentry *p_dentry,
72656+ const struct vfsmount *p_mnt,
72657+ int open_flags, int acc_mode, const int imode);
72658+void gr_handle_create(const struct dentry *dentry,
72659+ const struct vfsmount *mnt);
72660+void gr_handle_proc_create(const struct dentry *dentry,
72661+ const struct inode *inode);
72662+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
72663+ const struct dentry *parent_dentry,
72664+ const struct vfsmount *parent_mnt,
72665+ const int mode);
72666+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
72667+ const struct dentry *parent_dentry,
72668+ const struct vfsmount *parent_mnt);
72669+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
72670+ const struct vfsmount *mnt);
72671+void gr_handle_delete(const ino_t ino, const dev_t dev);
72672+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
72673+ const struct vfsmount *mnt);
72674+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
72675+ const struct dentry *parent_dentry,
72676+ const struct vfsmount *parent_mnt,
72677+ const struct filename *from);
72678+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
72679+ const struct dentry *parent_dentry,
72680+ const struct vfsmount *parent_mnt,
72681+ const struct dentry *old_dentry,
72682+ const struct vfsmount *old_mnt, const struct filename *to);
72683+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
72684+int gr_acl_handle_rename(struct dentry *new_dentry,
72685+ struct dentry *parent_dentry,
72686+ const struct vfsmount *parent_mnt,
72687+ struct dentry *old_dentry,
72688+ struct inode *old_parent_inode,
72689+ struct vfsmount *old_mnt, const struct filename *newname);
72690+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
72691+ struct dentry *old_dentry,
72692+ struct dentry *new_dentry,
72693+ struct vfsmount *mnt, const __u8 replace);
72694+__u32 gr_check_link(const struct dentry *new_dentry,
72695+ const struct dentry *parent_dentry,
72696+ const struct vfsmount *parent_mnt,
72697+ const struct dentry *old_dentry,
72698+ const struct vfsmount *old_mnt);
72699+int gr_acl_handle_filldir(const struct file *file, const char *name,
72700+ const unsigned int namelen, const ino_t ino);
72701+
72702+__u32 gr_acl_handle_unix(const struct dentry *dentry,
72703+ const struct vfsmount *mnt);
72704+void gr_acl_handle_exit(void);
72705+void gr_acl_handle_psacct(struct task_struct *task, const long code);
72706+int gr_acl_handle_procpidmem(const struct task_struct *task);
72707+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
72708+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
72709+void gr_audit_ptrace(struct task_struct *task);
72710+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
72711+void gr_put_exec_file(struct task_struct *task);
72712+
72713+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
72714+
72715+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
72716+extern void gr_learn_resource(const struct task_struct *task, const int res,
72717+ const unsigned long wanted, const int gt);
72718+#else
72719+static inline void gr_learn_resource(const struct task_struct *task, const int res,
72720+ const unsigned long wanted, const int gt)
72721+{
72722+}
72723+#endif
72724+
72725+#ifdef CONFIG_GRKERNSEC_RESLOG
72726+extern void gr_log_resource(const struct task_struct *task, const int res,
72727+ const unsigned long wanted, const int gt);
72728+#else
72729+static inline void gr_log_resource(const struct task_struct *task, const int res,
72730+ const unsigned long wanted, const int gt)
72731+{
72732+}
72733+#endif
72734+
72735+#ifdef CONFIG_GRKERNSEC
72736+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
72737+void gr_handle_vm86(void);
72738+void gr_handle_mem_readwrite(u64 from, u64 to);
72739+
72740+void gr_log_badprocpid(const char *entry);
72741+
72742+extern int grsec_enable_dmesg;
72743+extern int grsec_disable_privio;
72744+
72745+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
72746+extern kgid_t grsec_proc_gid;
72747+#endif
72748+
72749+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
72750+extern int grsec_enable_chroot_findtask;
72751+#endif
72752+#ifdef CONFIG_GRKERNSEC_SETXID
72753+extern int grsec_enable_setxid;
72754+#endif
72755+#endif
72756+
72757+#endif
72758diff --git a/include/linux/grsock.h b/include/linux/grsock.h
72759new file mode 100644
72760index 0000000..e7ffaaf
72761--- /dev/null
72762+++ b/include/linux/grsock.h
72763@@ -0,0 +1,19 @@
72764+#ifndef __GRSOCK_H
72765+#define __GRSOCK_H
72766+
72767+extern void gr_attach_curr_ip(const struct sock *sk);
72768+extern int gr_handle_sock_all(const int family, const int type,
72769+ const int protocol);
72770+extern int gr_handle_sock_server(const struct sockaddr *sck);
72771+extern int gr_handle_sock_server_other(const struct sock *sck);
72772+extern int gr_handle_sock_client(const struct sockaddr *sck);
72773+extern int gr_search_connect(struct socket * sock,
72774+ struct sockaddr_in * addr);
72775+extern int gr_search_bind(struct socket * sock,
72776+ struct sockaddr_in * addr);
72777+extern int gr_search_listen(struct socket * sock);
72778+extern int gr_search_accept(struct socket * sock);
72779+extern int gr_search_socket(const int domain, const int type,
72780+ const int protocol);
72781+
72782+#endif
72783diff --git a/include/linux/highmem.h b/include/linux/highmem.h
72784index 7fb31da..08b5114 100644
72785--- a/include/linux/highmem.h
72786+++ b/include/linux/highmem.h
72787@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
72788 kunmap_atomic(kaddr);
72789 }
72790
72791+static inline void sanitize_highpage(struct page *page)
72792+{
72793+ void *kaddr;
72794+ unsigned long flags;
72795+
72796+ local_irq_save(flags);
72797+ kaddr = kmap_atomic(page);
72798+ clear_page(kaddr);
72799+ kunmap_atomic(kaddr);
72800+ local_irq_restore(flags);
72801+}
72802+
72803 static inline void zero_user_segments(struct page *page,
72804 unsigned start1, unsigned end1,
72805 unsigned start2, unsigned end2)
72806diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
72807index 1c7b89a..7f52502 100644
72808--- a/include/linux/hwmon-sysfs.h
72809+++ b/include/linux/hwmon-sysfs.h
72810@@ -25,7 +25,8 @@
72811 struct sensor_device_attribute{
72812 struct device_attribute dev_attr;
72813 int index;
72814-};
72815+} __do_const;
72816+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
72817 #define to_sensor_dev_attr(_dev_attr) \
72818 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
72819
72820@@ -41,7 +42,7 @@ struct sensor_device_attribute_2 {
72821 struct device_attribute dev_attr;
72822 u8 index;
72823 u8 nr;
72824-};
72825+} __do_const;
72826 #define to_sensor_dev_attr_2(_dev_attr) \
72827 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
72828
72829diff --git a/include/linux/i2c.h b/include/linux/i2c.h
72830index e988fa9..ff9f17e 100644
72831--- a/include/linux/i2c.h
72832+++ b/include/linux/i2c.h
72833@@ -366,6 +366,7 @@ struct i2c_algorithm {
72834 /* To determine what the adapter supports */
72835 u32 (*functionality) (struct i2c_adapter *);
72836 };
72837+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
72838
72839 /**
72840 * struct i2c_bus_recovery_info - I2C bus recovery information
72841diff --git a/include/linux/i2o.h b/include/linux/i2o.h
72842index d23c3c2..eb63c81 100644
72843--- a/include/linux/i2o.h
72844+++ b/include/linux/i2o.h
72845@@ -565,7 +565,7 @@ struct i2o_controller {
72846 struct i2o_device *exec; /* Executive */
72847 #if BITS_PER_LONG == 64
72848 spinlock_t context_list_lock; /* lock for context_list */
72849- atomic_t context_list_counter; /* needed for unique contexts */
72850+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
72851 struct list_head context_list; /* list of context id's
72852 and pointers */
72853 #endif
72854diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
72855index aff7ad8..3942bbd 100644
72856--- a/include/linux/if_pppox.h
72857+++ b/include/linux/if_pppox.h
72858@@ -76,7 +76,7 @@ struct pppox_proto {
72859 int (*ioctl)(struct socket *sock, unsigned int cmd,
72860 unsigned long arg);
72861 struct module *owner;
72862-};
72863+} __do_const;
72864
72865 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
72866 extern void unregister_pppox_proto(int proto_num);
72867diff --git a/include/linux/init.h b/include/linux/init.h
72868index 8618147..0821126 100644
72869--- a/include/linux/init.h
72870+++ b/include/linux/init.h
72871@@ -39,9 +39,36 @@
72872 * Also note, that this data cannot be "const".
72873 */
72874
72875+#ifdef MODULE
72876+#define add_init_latent_entropy
72877+#define add_devinit_latent_entropy
72878+#define add_cpuinit_latent_entropy
72879+#define add_meminit_latent_entropy
72880+#else
72881+#define add_init_latent_entropy __latent_entropy
72882+
72883+#ifdef CONFIG_HOTPLUG
72884+#define add_devinit_latent_entropy
72885+#else
72886+#define add_devinit_latent_entropy __latent_entropy
72887+#endif
72888+
72889+#ifdef CONFIG_HOTPLUG_CPU
72890+#define add_cpuinit_latent_entropy
72891+#else
72892+#define add_cpuinit_latent_entropy __latent_entropy
72893+#endif
72894+
72895+#ifdef CONFIG_MEMORY_HOTPLUG
72896+#define add_meminit_latent_entropy
72897+#else
72898+#define add_meminit_latent_entropy __latent_entropy
72899+#endif
72900+#endif
72901+
72902 /* These are for everybody (although not all archs will actually
72903 discard it in modules) */
72904-#define __init __section(.init.text) __cold notrace
72905+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
72906 #define __initdata __section(.init.data)
72907 #define __initconst __constsection(.init.rodata)
72908 #define __exitdata __section(.exit.data)
72909@@ -94,7 +121,7 @@
72910 #define __exit __section(.exit.text) __exitused __cold notrace
72911
72912 /* Used for HOTPLUG_CPU */
72913-#define __cpuinit __section(.cpuinit.text) __cold notrace
72914+#define __cpuinit __section(.cpuinit.text) __cold notrace add_cpuinit_latent_entropy
72915 #define __cpuinitdata __section(.cpuinit.data)
72916 #define __cpuinitconst __constsection(.cpuinit.rodata)
72917 #define __cpuexit __section(.cpuexit.text) __exitused __cold notrace
72918@@ -102,7 +129,7 @@
72919 #define __cpuexitconst __constsection(.cpuexit.rodata)
72920
72921 /* Used for MEMORY_HOTPLUG */
72922-#define __meminit __section(.meminit.text) __cold notrace
72923+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
72924 #define __meminitdata __section(.meminit.data)
72925 #define __meminitconst __constsection(.meminit.rodata)
72926 #define __memexit __section(.memexit.text) __exitused __cold notrace
72927diff --git a/include/linux/init_task.h b/include/linux/init_task.h
72928index 5cd0f09..c9f67cc 100644
72929--- a/include/linux/init_task.h
72930+++ b/include/linux/init_task.h
72931@@ -154,6 +154,12 @@ extern struct task_group root_task_group;
72932
72933 #define INIT_TASK_COMM "swapper"
72934
72935+#ifdef CONFIG_X86
72936+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
72937+#else
72938+#define INIT_TASK_THREAD_INFO
72939+#endif
72940+
72941 /*
72942 * INIT_TASK is used to set up the first task table, touch at
72943 * your own risk!. Base=0, limit=0x1fffff (=2MB)
72944@@ -193,6 +199,7 @@ extern struct task_group root_task_group;
72945 RCU_POINTER_INITIALIZER(cred, &init_cred), \
72946 .comm = INIT_TASK_COMM, \
72947 .thread = INIT_THREAD, \
72948+ INIT_TASK_THREAD_INFO \
72949 .fs = &init_fs, \
72950 .files = &init_files, \
72951 .signal = &init_signals, \
72952diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
72953index 5fa5afe..ac55b25 100644
72954--- a/include/linux/interrupt.h
72955+++ b/include/linux/interrupt.h
72956@@ -430,7 +430,7 @@ enum
72957 /* map softirq index to softirq name. update 'softirq_to_name' in
72958 * kernel/softirq.c when adding a new softirq.
72959 */
72960-extern char *softirq_to_name[NR_SOFTIRQS];
72961+extern const char * const softirq_to_name[NR_SOFTIRQS];
72962
72963 /* softirq mask and active fields moved to irq_cpustat_t in
72964 * asm/hardirq.h to get better cache usage. KAO
72965@@ -438,12 +438,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
72966
72967 struct softirq_action
72968 {
72969- void (*action)(struct softirq_action *);
72970-};
72971+ void (*action)(void);
72972+} __no_const;
72973
72974 asmlinkage void do_softirq(void);
72975 asmlinkage void __do_softirq(void);
72976-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
72977+extern void open_softirq(int nr, void (*action)(void));
72978 extern void softirq_init(void);
72979 extern void __raise_softirq_irqoff(unsigned int nr);
72980
72981diff --git a/include/linux/iommu.h b/include/linux/iommu.h
72982index 3aeb730..2177f39 100644
72983--- a/include/linux/iommu.h
72984+++ b/include/linux/iommu.h
72985@@ -113,7 +113,7 @@ struct iommu_ops {
72986 u32 (*domain_get_windows)(struct iommu_domain *domain);
72987
72988 unsigned long pgsize_bitmap;
72989-};
72990+} __do_const;
72991
72992 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
72993 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
72994diff --git a/include/linux/ioport.h b/include/linux/ioport.h
72995index 89b7c24..382af74 100644
72996--- a/include/linux/ioport.h
72997+++ b/include/linux/ioport.h
72998@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
72999 int adjust_resource(struct resource *res, resource_size_t start,
73000 resource_size_t size);
73001 resource_size_t resource_alignment(struct resource *res);
73002-static inline resource_size_t resource_size(const struct resource *res)
73003+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
73004 {
73005 return res->end - res->start + 1;
73006 }
73007diff --git a/include/linux/irq.h b/include/linux/irq.h
73008index bc4e066..50468a9 100644
73009--- a/include/linux/irq.h
73010+++ b/include/linux/irq.h
73011@@ -328,7 +328,8 @@ struct irq_chip {
73012 void (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
73013
73014 unsigned long flags;
73015-};
73016+} __do_const;
73017+typedef struct irq_chip __no_const irq_chip_no_const;
73018
73019 /*
73020 * irq_chip specific flags
73021diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
73022index 3e203eb..3fe68d0 100644
73023--- a/include/linux/irqchip/arm-gic.h
73024+++ b/include/linux/irqchip/arm-gic.h
73025@@ -59,9 +59,11 @@
73026
73027 #ifndef __ASSEMBLY__
73028
73029+#include <linux/irq.h>
73030+
73031 struct device_node;
73032
73033-extern struct irq_chip gic_arch_extn;
73034+extern irq_chip_no_const gic_arch_extn;
73035
73036 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
73037 u32 offset, struct device_node *);
73038diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
73039index 6883e19..e854fcb 100644
73040--- a/include/linux/kallsyms.h
73041+++ b/include/linux/kallsyms.h
73042@@ -15,7 +15,8 @@
73043
73044 struct module;
73045
73046-#ifdef CONFIG_KALLSYMS
73047+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
73048+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73049 /* Lookup the address for a symbol. Returns 0 if not found. */
73050 unsigned long kallsyms_lookup_name(const char *name);
73051
73052@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
73053 /* Stupid that this does nothing, but I didn't create this mess. */
73054 #define __print_symbol(fmt, addr)
73055 #endif /*CONFIG_KALLSYMS*/
73056+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
73057+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
73058+extern unsigned long kallsyms_lookup_name(const char *name);
73059+extern void __print_symbol(const char *fmt, unsigned long address);
73060+extern int sprint_backtrace(char *buffer, unsigned long address);
73061+extern int sprint_symbol(char *buffer, unsigned long address);
73062+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
73063+const char *kallsyms_lookup(unsigned long addr,
73064+ unsigned long *symbolsize,
73065+ unsigned long *offset,
73066+ char **modname, char *namebuf);
73067+extern int kallsyms_lookup_size_offset(unsigned long addr,
73068+ unsigned long *symbolsize,
73069+ unsigned long *offset);
73070+#endif
73071
73072 /* This macro allows us to keep printk typechecking */
73073 static __printf(1, 2)
73074diff --git a/include/linux/key-type.h b/include/linux/key-type.h
73075index 518a53a..5e28358 100644
73076--- a/include/linux/key-type.h
73077+++ b/include/linux/key-type.h
73078@@ -125,7 +125,7 @@ struct key_type {
73079 /* internal fields */
73080 struct list_head link; /* link in types list */
73081 struct lock_class_key lock_class; /* key->sem lock class */
73082-};
73083+} __do_const;
73084
73085 extern struct key_type key_type_keyring;
73086
73087diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
73088index c6e091b..a940adf 100644
73089--- a/include/linux/kgdb.h
73090+++ b/include/linux/kgdb.h
73091@@ -52,7 +52,7 @@ extern int kgdb_connected;
73092 extern int kgdb_io_module_registered;
73093
73094 extern atomic_t kgdb_setting_breakpoint;
73095-extern atomic_t kgdb_cpu_doing_single_step;
73096+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
73097
73098 extern struct task_struct *kgdb_usethread;
73099 extern struct task_struct *kgdb_contthread;
73100@@ -254,7 +254,7 @@ struct kgdb_arch {
73101 void (*correct_hw_break)(void);
73102
73103 void (*enable_nmi)(bool on);
73104-};
73105+} __do_const;
73106
73107 /**
73108 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
73109@@ -279,7 +279,7 @@ struct kgdb_io {
73110 void (*pre_exception) (void);
73111 void (*post_exception) (void);
73112 int is_console;
73113-};
73114+} __do_const;
73115
73116 extern struct kgdb_arch arch_kgdb_ops;
73117
73118diff --git a/include/linux/kmod.h b/include/linux/kmod.h
73119index 0555cc6..b16a7a4 100644
73120--- a/include/linux/kmod.h
73121+++ b/include/linux/kmod.h
73122@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
73123 * usually useless though. */
73124 extern __printf(2, 3)
73125 int __request_module(bool wait, const char *name, ...);
73126+extern __printf(3, 4)
73127+int ___request_module(bool wait, char *param_name, const char *name, ...);
73128 #define request_module(mod...) __request_module(true, mod)
73129 #define request_module_nowait(mod...) __request_module(false, mod)
73130 #define try_then_request_module(x, mod...) \
73131diff --git a/include/linux/kobject.h b/include/linux/kobject.h
73132index 939b112..ed6ed51 100644
73133--- a/include/linux/kobject.h
73134+++ b/include/linux/kobject.h
73135@@ -111,7 +111,7 @@ struct kobj_type {
73136 struct attribute **default_attrs;
73137 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
73138 const void *(*namespace)(struct kobject *kobj);
73139-};
73140+} __do_const;
73141
73142 struct kobj_uevent_env {
73143 char *envp[UEVENT_NUM_ENVP];
73144@@ -134,6 +134,7 @@ struct kobj_attribute {
73145 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
73146 const char *buf, size_t count);
73147 };
73148+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
73149
73150 extern const struct sysfs_ops kobj_sysfs_ops;
73151
73152diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
73153index f66b065..c2c29b4 100644
73154--- a/include/linux/kobject_ns.h
73155+++ b/include/linux/kobject_ns.h
73156@@ -43,7 +43,7 @@ struct kobj_ns_type_operations {
73157 const void *(*netlink_ns)(struct sock *sk);
73158 const void *(*initial_ns)(void);
73159 void (*drop_ns)(void *);
73160-};
73161+} __do_const;
73162
73163 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
73164 int kobj_ns_type_registered(enum kobj_ns_type type);
73165diff --git a/include/linux/kref.h b/include/linux/kref.h
73166index 484604d..0f6c5b6 100644
73167--- a/include/linux/kref.h
73168+++ b/include/linux/kref.h
73169@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
73170 static inline int kref_sub(struct kref *kref, unsigned int count,
73171 void (*release)(struct kref *kref))
73172 {
73173- WARN_ON(release == NULL);
73174+ BUG_ON(release == NULL);
73175
73176 if (atomic_sub_and_test((int) count, &kref->refcount)) {
73177 release(kref);
73178diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
73179index 8db53cf..c21121d 100644
73180--- a/include/linux/kvm_host.h
73181+++ b/include/linux/kvm_host.h
73182@@ -444,7 +444,7 @@ static inline void kvm_irqfd_exit(void)
73183 {
73184 }
73185 #endif
73186-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
73187+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
73188 struct module *module);
73189 void kvm_exit(void);
73190
73191@@ -616,7 +616,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
73192 struct kvm_guest_debug *dbg);
73193 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
73194
73195-int kvm_arch_init(void *opaque);
73196+int kvm_arch_init(const void *opaque);
73197 void kvm_arch_exit(void);
73198
73199 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
73200diff --git a/include/linux/libata.h b/include/linux/libata.h
73201index eae7a05..2cdd875 100644
73202--- a/include/linux/libata.h
73203+++ b/include/linux/libata.h
73204@@ -919,7 +919,7 @@ struct ata_port_operations {
73205 * fields must be pointers.
73206 */
73207 const struct ata_port_operations *inherits;
73208-};
73209+} __do_const;
73210
73211 struct ata_port_info {
73212 unsigned long flags;
73213diff --git a/include/linux/list.h b/include/linux/list.h
73214index b83e565..baa6c1d 100644
73215--- a/include/linux/list.h
73216+++ b/include/linux/list.h
73217@@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
73218 extern void list_del(struct list_head *entry);
73219 #endif
73220
73221+extern void __pax_list_add(struct list_head *new,
73222+ struct list_head *prev,
73223+ struct list_head *next);
73224+static inline void pax_list_add(struct list_head *new, struct list_head *head)
73225+{
73226+ __pax_list_add(new, head, head->next);
73227+}
73228+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
73229+{
73230+ __pax_list_add(new, head->prev, head);
73231+}
73232+extern void pax_list_del(struct list_head *entry);
73233+
73234 /**
73235 * list_replace - replace old entry by new one
73236 * @old : the element to be replaced
73237@@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
73238 INIT_LIST_HEAD(entry);
73239 }
73240
73241+extern void pax_list_del_init(struct list_head *entry);
73242+
73243 /**
73244 * list_move - delete from one list and add as another's head
73245 * @list: the entry to move
73246diff --git a/include/linux/math64.h b/include/linux/math64.h
73247index 2913b86..8dcbb1e 100644
73248--- a/include/linux/math64.h
73249+++ b/include/linux/math64.h
73250@@ -15,7 +15,7 @@
73251 * This is commonly provided by 32bit archs to provide an optimized 64bit
73252 * divide.
73253 */
73254-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
73255+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
73256 {
73257 *remainder = dividend % divisor;
73258 return dividend / divisor;
73259@@ -33,7 +33,7 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
73260 /**
73261 * div64_u64 - unsigned 64bit divide with 64bit divisor
73262 */
73263-static inline u64 div64_u64(u64 dividend, u64 divisor)
73264+static inline u64 __intentional_overflow(0) div64_u64(u64 dividend, u64 divisor)
73265 {
73266 return dividend / divisor;
73267 }
73268@@ -52,7 +52,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
73269 #define div64_ul(x, y) div_u64((x), (y))
73270
73271 #ifndef div_u64_rem
73272-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
73273+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
73274 {
73275 *remainder = do_div(dividend, divisor);
73276 return dividend;
73277@@ -81,7 +81,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
73278 * divide.
73279 */
73280 #ifndef div_u64
73281-static inline u64 div_u64(u64 dividend, u32 divisor)
73282+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
73283 {
73284 u32 remainder;
73285 return div_u64_rem(dividend, divisor, &remainder);
73286diff --git a/include/linux/mm.h b/include/linux/mm.h
73287index e0c8528..bcf0c29 100644
73288--- a/include/linux/mm.h
73289+++ b/include/linux/mm.h
73290@@ -104,6 +104,11 @@ extern unsigned int kobjsize(const void *objp);
73291 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
73292 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
73293 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
73294+
73295+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
73296+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
73297+#endif
73298+
73299 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
73300
73301 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
73302@@ -205,8 +210,8 @@ struct vm_operations_struct {
73303 /* called by access_process_vm when get_user_pages() fails, typically
73304 * for use by special VMAs that can switch between memory and hardware
73305 */
73306- int (*access)(struct vm_area_struct *vma, unsigned long addr,
73307- void *buf, int len, int write);
73308+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
73309+ void *buf, size_t len, int write);
73310 #ifdef CONFIG_NUMA
73311 /*
73312 * set_policy() op must add a reference to any non-NULL @new mempolicy
73313@@ -236,6 +241,7 @@ struct vm_operations_struct {
73314 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
73315 unsigned long size, pgoff_t pgoff);
73316 };
73317+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
73318
73319 struct mmu_gather;
73320 struct inode;
73321@@ -980,8 +986,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
73322 unsigned long *pfn);
73323 int follow_phys(struct vm_area_struct *vma, unsigned long address,
73324 unsigned int flags, unsigned long *prot, resource_size_t *phys);
73325-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
73326- void *buf, int len, int write);
73327+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
73328+ void *buf, size_t len, int write);
73329
73330 static inline void unmap_shared_mapping_range(struct address_space *mapping,
73331 loff_t const holebegin, loff_t const holelen)
73332@@ -1020,9 +1026,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
73333 }
73334 #endif
73335
73336-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
73337-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
73338- void *buf, int len, int write);
73339+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
73340+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
73341+ void *buf, size_t len, int write);
73342
73343 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
73344 unsigned long start, unsigned long nr_pages,
73345@@ -1053,34 +1059,6 @@ int set_page_dirty(struct page *page);
73346 int set_page_dirty_lock(struct page *page);
73347 int clear_page_dirty_for_io(struct page *page);
73348
73349-/* Is the vma a continuation of the stack vma above it? */
73350-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
73351-{
73352- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
73353-}
73354-
73355-static inline int stack_guard_page_start(struct vm_area_struct *vma,
73356- unsigned long addr)
73357-{
73358- return (vma->vm_flags & VM_GROWSDOWN) &&
73359- (vma->vm_start == addr) &&
73360- !vma_growsdown(vma->vm_prev, addr);
73361-}
73362-
73363-/* Is the vma a continuation of the stack vma below it? */
73364-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
73365-{
73366- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
73367-}
73368-
73369-static inline int stack_guard_page_end(struct vm_area_struct *vma,
73370- unsigned long addr)
73371-{
73372- return (vma->vm_flags & VM_GROWSUP) &&
73373- (vma->vm_end == addr) &&
73374- !vma_growsup(vma->vm_next, addr);
73375-}
73376-
73377 extern pid_t
73378 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
73379
73380@@ -1180,6 +1158,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
73381 }
73382 #endif
73383
73384+#ifdef CONFIG_MMU
73385+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
73386+#else
73387+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
73388+{
73389+ return __pgprot(0);
73390+}
73391+#endif
73392+
73393 int vma_wants_writenotify(struct vm_area_struct *vma);
73394
73395 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
73396@@ -1198,8 +1185,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
73397 {
73398 return 0;
73399 }
73400+
73401+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
73402+ unsigned long address)
73403+{
73404+ return 0;
73405+}
73406 #else
73407 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
73408+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
73409 #endif
73410
73411 #ifdef __PAGETABLE_PMD_FOLDED
73412@@ -1208,8 +1202,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
73413 {
73414 return 0;
73415 }
73416+
73417+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
73418+ unsigned long address)
73419+{
73420+ return 0;
73421+}
73422 #else
73423 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
73424+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
73425 #endif
73426
73427 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
73428@@ -1227,11 +1228,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
73429 NULL: pud_offset(pgd, address);
73430 }
73431
73432+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
73433+{
73434+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
73435+ NULL: pud_offset(pgd, address);
73436+}
73437+
73438 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
73439 {
73440 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
73441 NULL: pmd_offset(pud, address);
73442 }
73443+
73444+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
73445+{
73446+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
73447+ NULL: pmd_offset(pud, address);
73448+}
73449 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
73450
73451 #if USE_SPLIT_PTLOCKS
73452@@ -1517,6 +1530,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
73453 unsigned long len, unsigned long prot, unsigned long flags,
73454 unsigned long pgoff, unsigned long *populate);
73455 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
73456+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
73457
73458 #ifdef CONFIG_MMU
73459 extern int __mm_populate(unsigned long addr, unsigned long len,
73460@@ -1545,10 +1559,11 @@ struct vm_unmapped_area_info {
73461 unsigned long high_limit;
73462 unsigned long align_mask;
73463 unsigned long align_offset;
73464+ unsigned long threadstack_offset;
73465 };
73466
73467-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
73468-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
73469+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
73470+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
73471
73472 /*
73473 * Search for an unmapped address range.
73474@@ -1560,7 +1575,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
73475 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
73476 */
73477 static inline unsigned long
73478-vm_unmapped_area(struct vm_unmapped_area_info *info)
73479+vm_unmapped_area(const struct vm_unmapped_area_info *info)
73480 {
73481 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
73482 return unmapped_area(info);
73483@@ -1623,6 +1638,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
73484 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
73485 struct vm_area_struct **pprev);
73486
73487+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
73488+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
73489+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
73490+
73491 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
73492 NULL if none. Assume start_addr < end_addr. */
73493 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
73494@@ -1651,15 +1670,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
73495 return vma;
73496 }
73497
73498-#ifdef CONFIG_MMU
73499-pgprot_t vm_get_page_prot(unsigned long vm_flags);
73500-#else
73501-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
73502-{
73503- return __pgprot(0);
73504-}
73505-#endif
73506-
73507 #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
73508 unsigned long change_prot_numa(struct vm_area_struct *vma,
73509 unsigned long start, unsigned long end);
73510@@ -1711,6 +1721,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
73511 static inline void vm_stat_account(struct mm_struct *mm,
73512 unsigned long flags, struct file *file, long pages)
73513 {
73514+
73515+#ifdef CONFIG_PAX_RANDMMAP
73516+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
73517+#endif
73518+
73519 mm->total_vm += pages;
73520 }
73521 #endif /* CONFIG_PROC_FS */
73522@@ -1791,7 +1806,7 @@ extern int unpoison_memory(unsigned long pfn);
73523 extern int sysctl_memory_failure_early_kill;
73524 extern int sysctl_memory_failure_recovery;
73525 extern void shake_page(struct page *p, int access);
73526-extern atomic_long_t num_poisoned_pages;
73527+extern atomic_long_unchecked_t num_poisoned_pages;
73528 extern int soft_offline_page(struct page *page, int flags);
73529
73530 extern void dump_page(struct page *page);
73531@@ -1828,5 +1843,11 @@ void __init setup_nr_node_ids(void);
73532 static inline void setup_nr_node_ids(void) {}
73533 #endif
73534
73535+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73536+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
73537+#else
73538+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
73539+#endif
73540+
73541 #endif /* __KERNEL__ */
73542 #endif /* _LINUX_MM_H */
73543diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
73544index ace9a5f..81bdb59 100644
73545--- a/include/linux/mm_types.h
73546+++ b/include/linux/mm_types.h
73547@@ -289,6 +289,8 @@ struct vm_area_struct {
73548 #ifdef CONFIG_NUMA
73549 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
73550 #endif
73551+
73552+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
73553 };
73554
73555 struct core_thread {
73556@@ -437,6 +439,24 @@ struct mm_struct {
73557 int first_nid;
73558 #endif
73559 struct uprobes_state uprobes_state;
73560+
73561+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73562+ unsigned long pax_flags;
73563+#endif
73564+
73565+#ifdef CONFIG_PAX_DLRESOLVE
73566+ unsigned long call_dl_resolve;
73567+#endif
73568+
73569+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
73570+ unsigned long call_syscall;
73571+#endif
73572+
73573+#ifdef CONFIG_PAX_ASLR
73574+ unsigned long delta_mmap; /* randomized offset */
73575+ unsigned long delta_stack; /* randomized offset */
73576+#endif
73577+
73578 };
73579
73580 /* first nid will either be a valid NID or one of these values */
73581diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
73582index c5d5278..f0b68c8 100644
73583--- a/include/linux/mmiotrace.h
73584+++ b/include/linux/mmiotrace.h
73585@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
73586 /* Called from ioremap.c */
73587 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
73588 void __iomem *addr);
73589-extern void mmiotrace_iounmap(volatile void __iomem *addr);
73590+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
73591
73592 /* For anyone to insert markers. Remember trailing newline. */
73593 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
73594@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
73595 {
73596 }
73597
73598-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
73599+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
73600 {
73601 }
73602
73603diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
73604index 5c76737..61f518e 100644
73605--- a/include/linux/mmzone.h
73606+++ b/include/linux/mmzone.h
73607@@ -396,7 +396,7 @@ struct zone {
73608 unsigned long flags; /* zone flags, see below */
73609
73610 /* Zone statistics */
73611- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
73612+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
73613
73614 /*
73615 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
73616diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
73617index b508016..237cfe5 100644
73618--- a/include/linux/mod_devicetable.h
73619+++ b/include/linux/mod_devicetable.h
73620@@ -13,7 +13,7 @@
73621 typedef unsigned long kernel_ulong_t;
73622 #endif
73623
73624-#define PCI_ANY_ID (~0)
73625+#define PCI_ANY_ID ((__u16)~0)
73626
73627 struct pci_device_id {
73628 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
73629@@ -139,7 +139,7 @@ struct usb_device_id {
73630 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
73631 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
73632
73633-#define HID_ANY_ID (~0)
73634+#define HID_ANY_ID (~0U)
73635 #define HID_BUS_ANY 0xffff
73636 #define HID_GROUP_ANY 0x0000
73637
73638@@ -465,7 +465,7 @@ struct dmi_system_id {
73639 const char *ident;
73640 struct dmi_strmatch matches[4];
73641 void *driver_data;
73642-};
73643+} __do_const;
73644 /*
73645 * struct dmi_device_id appears during expansion of
73646 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
73647diff --git a/include/linux/module.h b/include/linux/module.h
73648index 46f1ea0..a34ca37 100644
73649--- a/include/linux/module.h
73650+++ b/include/linux/module.h
73651@@ -17,9 +17,11 @@
73652 #include <linux/moduleparam.h>
73653 #include <linux/tracepoint.h>
73654 #include <linux/export.h>
73655+#include <linux/fs.h>
73656
73657 #include <linux/percpu.h>
73658 #include <asm/module.h>
73659+#include <asm/pgtable.h>
73660
73661 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
73662 #define MODULE_SIG_STRING "~Module signature appended~\n"
73663@@ -54,12 +56,13 @@ struct module_attribute {
73664 int (*test)(struct module *);
73665 void (*free)(struct module *);
73666 };
73667+typedef struct module_attribute __no_const module_attribute_no_const;
73668
73669 struct module_version_attribute {
73670 struct module_attribute mattr;
73671 const char *module_name;
73672 const char *version;
73673-} __attribute__ ((__aligned__(sizeof(void *))));
73674+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
73675
73676 extern ssize_t __modver_version_show(struct module_attribute *,
73677 struct module_kobject *, char *);
73678@@ -232,7 +235,7 @@ struct module
73679
73680 /* Sysfs stuff. */
73681 struct module_kobject mkobj;
73682- struct module_attribute *modinfo_attrs;
73683+ module_attribute_no_const *modinfo_attrs;
73684 const char *version;
73685 const char *srcversion;
73686 struct kobject *holders_dir;
73687@@ -281,19 +284,16 @@ struct module
73688 int (*init)(void);
73689
73690 /* If this is non-NULL, vfree after init() returns */
73691- void *module_init;
73692+ void *module_init_rx, *module_init_rw;
73693
73694 /* Here is the actual code + data, vfree'd on unload. */
73695- void *module_core;
73696+ void *module_core_rx, *module_core_rw;
73697
73698 /* Here are the sizes of the init and core sections */
73699- unsigned int init_size, core_size;
73700+ unsigned int init_size_rw, core_size_rw;
73701
73702 /* The size of the executable code in each section. */
73703- unsigned int init_text_size, core_text_size;
73704-
73705- /* Size of RO sections of the module (text+rodata) */
73706- unsigned int init_ro_size, core_ro_size;
73707+ unsigned int init_size_rx, core_size_rx;
73708
73709 /* Arch-specific module values */
73710 struct mod_arch_specific arch;
73711@@ -349,6 +349,10 @@ struct module
73712 #ifdef CONFIG_EVENT_TRACING
73713 struct ftrace_event_call **trace_events;
73714 unsigned int num_trace_events;
73715+ struct file_operations trace_id;
73716+ struct file_operations trace_enable;
73717+ struct file_operations trace_format;
73718+ struct file_operations trace_filter;
73719 #endif
73720 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
73721 unsigned int num_ftrace_callsites;
73722@@ -396,16 +400,46 @@ bool is_module_address(unsigned long addr);
73723 bool is_module_percpu_address(unsigned long addr);
73724 bool is_module_text_address(unsigned long addr);
73725
73726+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
73727+{
73728+
73729+#ifdef CONFIG_PAX_KERNEXEC
73730+ if (ktla_ktva(addr) >= (unsigned long)start &&
73731+ ktla_ktva(addr) < (unsigned long)start + size)
73732+ return 1;
73733+#endif
73734+
73735+ return ((void *)addr >= start && (void *)addr < start + size);
73736+}
73737+
73738+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
73739+{
73740+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
73741+}
73742+
73743+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
73744+{
73745+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
73746+}
73747+
73748+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
73749+{
73750+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
73751+}
73752+
73753+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
73754+{
73755+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
73756+}
73757+
73758 static inline int within_module_core(unsigned long addr, const struct module *mod)
73759 {
73760- return (unsigned long)mod->module_core <= addr &&
73761- addr < (unsigned long)mod->module_core + mod->core_size;
73762+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
73763 }
73764
73765 static inline int within_module_init(unsigned long addr, const struct module *mod)
73766 {
73767- return (unsigned long)mod->module_init <= addr &&
73768- addr < (unsigned long)mod->module_init + mod->init_size;
73769+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
73770 }
73771
73772 /* Search for module by name: must hold module_mutex. */
73773diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
73774index 560ca53..ef621ef 100644
73775--- a/include/linux/moduleloader.h
73776+++ b/include/linux/moduleloader.h
73777@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
73778 sections. Returns NULL on failure. */
73779 void *module_alloc(unsigned long size);
73780
73781+#ifdef CONFIG_PAX_KERNEXEC
73782+void *module_alloc_exec(unsigned long size);
73783+#else
73784+#define module_alloc_exec(x) module_alloc(x)
73785+#endif
73786+
73787 /* Free memory returned from module_alloc. */
73788 void module_free(struct module *mod, void *module_region);
73789
73790+#ifdef CONFIG_PAX_KERNEXEC
73791+void module_free_exec(struct module *mod, void *module_region);
73792+#else
73793+#define module_free_exec(x, y) module_free((x), (y))
73794+#endif
73795+
73796 /*
73797 * Apply the given relocation to the (simplified) ELF. Return -error
73798 * or 0.
73799@@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
73800 unsigned int relsec,
73801 struct module *me)
73802 {
73803+#ifdef CONFIG_MODULES
73804 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
73805+#endif
73806 return -ENOEXEC;
73807 }
73808 #endif
73809@@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
73810 unsigned int relsec,
73811 struct module *me)
73812 {
73813+#ifdef CONFIG_MODULES
73814 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
73815+#endif
73816 return -ENOEXEC;
73817 }
73818 #endif
73819diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
73820index 137b419..fe663ec 100644
73821--- a/include/linux/moduleparam.h
73822+++ b/include/linux/moduleparam.h
73823@@ -284,7 +284,7 @@ static inline void __kernel_param_unlock(void)
73824 * @len is usually just sizeof(string).
73825 */
73826 #define module_param_string(name, string, len, perm) \
73827- static const struct kparam_string __param_string_##name \
73828+ static const struct kparam_string __param_string_##name __used \
73829 = { len, string }; \
73830 __module_param_call(MODULE_PARAM_PREFIX, name, \
73831 &param_ops_string, \
73832@@ -423,7 +423,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
73833 */
73834 #define module_param_array_named(name, array, type, nump, perm) \
73835 param_check_##type(name, &(array)[0]); \
73836- static const struct kparam_array __param_arr_##name \
73837+ static const struct kparam_array __param_arr_##name __used \
73838 = { .max = ARRAY_SIZE(array), .num = nump, \
73839 .ops = &param_ops_##type, \
73840 .elemsize = sizeof(array[0]), .elem = array }; \
73841diff --git a/include/linux/namei.h b/include/linux/namei.h
73842index 5a5ff57..5ae5070 100644
73843--- a/include/linux/namei.h
73844+++ b/include/linux/namei.h
73845@@ -19,7 +19,7 @@ struct nameidata {
73846 unsigned seq;
73847 int last_type;
73848 unsigned depth;
73849- char *saved_names[MAX_NESTED_LINKS + 1];
73850+ const char *saved_names[MAX_NESTED_LINKS + 1];
73851 };
73852
73853 /*
73854@@ -84,12 +84,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
73855
73856 extern void nd_jump_link(struct nameidata *nd, struct path *path);
73857
73858-static inline void nd_set_link(struct nameidata *nd, char *path)
73859+static inline void nd_set_link(struct nameidata *nd, const char *path)
73860 {
73861 nd->saved_names[nd->depth] = path;
73862 }
73863
73864-static inline char *nd_get_link(struct nameidata *nd)
73865+static inline const char *nd_get_link(const struct nameidata *nd)
73866 {
73867 return nd->saved_names[nd->depth];
73868 }
73869diff --git a/include/linux/net.h b/include/linux/net.h
73870index 99c9f0c..e1cf296 100644
73871--- a/include/linux/net.h
73872+++ b/include/linux/net.h
73873@@ -183,7 +183,7 @@ struct net_proto_family {
73874 int (*create)(struct net *net, struct socket *sock,
73875 int protocol, int kern);
73876 struct module *owner;
73877-};
73878+} __do_const;
73879
73880 struct iovec;
73881 struct kvec;
73882diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
73883index 96e4c21..9cc8278 100644
73884--- a/include/linux/netdevice.h
73885+++ b/include/linux/netdevice.h
73886@@ -1026,6 +1026,7 @@ struct net_device_ops {
73887 int (*ndo_change_carrier)(struct net_device *dev,
73888 bool new_carrier);
73889 };
73890+typedef struct net_device_ops __no_const net_device_ops_no_const;
73891
73892 /*
73893 * The DEVICE structure.
73894@@ -1094,7 +1095,7 @@ struct net_device {
73895 int iflink;
73896
73897 struct net_device_stats stats;
73898- atomic_long_t rx_dropped; /* dropped packets by core network
73899+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
73900 * Do not use this in drivers.
73901 */
73902
73903diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
73904index 0060fde..481c6ae 100644
73905--- a/include/linux/netfilter.h
73906+++ b/include/linux/netfilter.h
73907@@ -82,7 +82,7 @@ struct nf_sockopt_ops {
73908 #endif
73909 /* Use the module struct to lock set/get code in place */
73910 struct module *owner;
73911-};
73912+} __do_const;
73913
73914 /* Function to register/unregister hook points. */
73915 int nf_register_hook(struct nf_hook_ops *reg);
73916diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
73917index d80e275..c3510b8 100644
73918--- a/include/linux/netfilter/ipset/ip_set.h
73919+++ b/include/linux/netfilter/ipset/ip_set.h
73920@@ -124,7 +124,7 @@ struct ip_set_type_variant {
73921 /* Return true if "b" set is the same as "a"
73922 * according to the create set parameters */
73923 bool (*same_set)(const struct ip_set *a, const struct ip_set *b);
73924-};
73925+} __do_const;
73926
73927 /* The core set type structure */
73928 struct ip_set_type {
73929diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
73930index cadb740..d7c37c0 100644
73931--- a/include/linux/netfilter/nfnetlink.h
73932+++ b/include/linux/netfilter/nfnetlink.h
73933@@ -16,7 +16,7 @@ struct nfnl_callback {
73934 const struct nlattr * const cda[]);
73935 const struct nla_policy *policy; /* netlink attribute policy */
73936 const u_int16_t attr_count; /* number of nlattr's */
73937-};
73938+} __do_const;
73939
73940 struct nfnetlink_subsystem {
73941 const char *name;
73942diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
73943new file mode 100644
73944index 0000000..33f4af8
73945--- /dev/null
73946+++ b/include/linux/netfilter/xt_gradm.h
73947@@ -0,0 +1,9 @@
73948+#ifndef _LINUX_NETFILTER_XT_GRADM_H
73949+#define _LINUX_NETFILTER_XT_GRADM_H 1
73950+
73951+struct xt_gradm_mtinfo {
73952+ __u16 flags;
73953+ __u16 invflags;
73954+};
73955+
73956+#endif
73957diff --git a/include/linux/nls.h b/include/linux/nls.h
73958index 5dc635f..35f5e11 100644
73959--- a/include/linux/nls.h
73960+++ b/include/linux/nls.h
73961@@ -31,7 +31,7 @@ struct nls_table {
73962 const unsigned char *charset2upper;
73963 struct module *owner;
73964 struct nls_table *next;
73965-};
73966+} __do_const;
73967
73968 /* this value hold the maximum octet of charset */
73969 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
73970diff --git a/include/linux/notifier.h b/include/linux/notifier.h
73971index d14a4c3..a078786 100644
73972--- a/include/linux/notifier.h
73973+++ b/include/linux/notifier.h
73974@@ -54,7 +54,8 @@ struct notifier_block {
73975 notifier_fn_t notifier_call;
73976 struct notifier_block __rcu *next;
73977 int priority;
73978-};
73979+} __do_const;
73980+typedef struct notifier_block __no_const notifier_block_no_const;
73981
73982 struct atomic_notifier_head {
73983 spinlock_t lock;
73984diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
73985index a4c5624..79d6d88 100644
73986--- a/include/linux/oprofile.h
73987+++ b/include/linux/oprofile.h
73988@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
73989 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
73990 char const * name, ulong * val);
73991
73992-/** Create a file for read-only access to an atomic_t. */
73993+/** Create a file for read-only access to an atomic_unchecked_t. */
73994 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
73995- char const * name, atomic_t * val);
73996+ char const * name, atomic_unchecked_t * val);
73997
73998 /** create a directory */
73999 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
74000diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
74001index 8db71dc..a76bf2c 100644
74002--- a/include/linux/pci_hotplug.h
74003+++ b/include/linux/pci_hotplug.h
74004@@ -80,7 +80,8 @@ struct hotplug_slot_ops {
74005 int (*get_attention_status) (struct hotplug_slot *slot, u8 *value);
74006 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
74007 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
74008-};
74009+} __do_const;
74010+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
74011
74012 /**
74013 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
74014diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
74015index c5b6dbf..b124155 100644
74016--- a/include/linux/perf_event.h
74017+++ b/include/linux/perf_event.h
74018@@ -318,8 +318,8 @@ struct perf_event {
74019
74020 enum perf_event_active_state state;
74021 unsigned int attach_state;
74022- local64_t count;
74023- atomic64_t child_count;
74024+ local64_t count; /* PaX: fix it one day */
74025+ atomic64_unchecked_t child_count;
74026
74027 /*
74028 * These are the total time in nanoseconds that the event
74029@@ -370,8 +370,8 @@ struct perf_event {
74030 * These accumulate total time (in nanoseconds) that children
74031 * events have been enabled and running, respectively.
74032 */
74033- atomic64_t child_total_time_enabled;
74034- atomic64_t child_total_time_running;
74035+ atomic64_unchecked_t child_total_time_enabled;
74036+ atomic64_unchecked_t child_total_time_running;
74037
74038 /*
74039 * Protect attach/detach and child_list:
74040@@ -692,7 +692,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
74041 entry->ip[entry->nr++] = ip;
74042 }
74043
74044-extern int sysctl_perf_event_paranoid;
74045+extern int sysctl_perf_event_legitimately_concerned;
74046 extern int sysctl_perf_event_mlock;
74047 extern int sysctl_perf_event_sample_rate;
74048
74049@@ -700,19 +700,24 @@ extern int perf_proc_update_handler(struct ctl_table *table, int write,
74050 void __user *buffer, size_t *lenp,
74051 loff_t *ppos);
74052
74053+static inline bool perf_paranoid_any(void)
74054+{
74055+ return sysctl_perf_event_legitimately_concerned > 2;
74056+}
74057+
74058 static inline bool perf_paranoid_tracepoint_raw(void)
74059 {
74060- return sysctl_perf_event_paranoid > -1;
74061+ return sysctl_perf_event_legitimately_concerned > -1;
74062 }
74063
74064 static inline bool perf_paranoid_cpu(void)
74065 {
74066- return sysctl_perf_event_paranoid > 0;
74067+ return sysctl_perf_event_legitimately_concerned > 0;
74068 }
74069
74070 static inline bool perf_paranoid_kernel(void)
74071 {
74072- return sysctl_perf_event_paranoid > 1;
74073+ return sysctl_perf_event_legitimately_concerned > 1;
74074 }
74075
74076 extern void perf_event_init(void);
74077@@ -806,7 +811,7 @@ static inline void perf_restore_debug_store(void) { }
74078 */
74079 #define perf_cpu_notifier(fn) \
74080 do { \
74081- static struct notifier_block fn##_nb __cpuinitdata = \
74082+ static struct notifier_block fn##_nb = \
74083 { .notifier_call = fn, .priority = CPU_PRI_PERF }; \
74084 unsigned long cpu = smp_processor_id(); \
74085 unsigned long flags; \
74086@@ -826,7 +831,7 @@ struct perf_pmu_events_attr {
74087 struct device_attribute attr;
74088 u64 id;
74089 const char *event_str;
74090-};
74091+} __do_const;
74092
74093 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
74094 static struct perf_pmu_events_attr _var = { \
74095diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
74096index b8809fe..ae4ccd0 100644
74097--- a/include/linux/pipe_fs_i.h
74098+++ b/include/linux/pipe_fs_i.h
74099@@ -47,10 +47,10 @@ struct pipe_inode_info {
74100 struct mutex mutex;
74101 wait_queue_head_t wait;
74102 unsigned int nrbufs, curbuf, buffers;
74103- unsigned int readers;
74104- unsigned int writers;
74105- unsigned int files;
74106- unsigned int waiting_writers;
74107+ atomic_t readers;
74108+ atomic_t writers;
74109+ atomic_t files;
74110+ atomic_t waiting_writers;
74111 unsigned int r_counter;
74112 unsigned int w_counter;
74113 struct page *tmp_page;
74114diff --git a/include/linux/platform_data/usb-ehci-s5p.h b/include/linux/platform_data/usb-ehci-s5p.h
74115index 5f28cae..3d23723 100644
74116--- a/include/linux/platform_data/usb-ehci-s5p.h
74117+++ b/include/linux/platform_data/usb-ehci-s5p.h
74118@@ -14,7 +14,7 @@
74119 struct s5p_ehci_platdata {
74120 int (*phy_init)(struct platform_device *pdev, int type);
74121 int (*phy_exit)(struct platform_device *pdev, int type);
74122-};
74123+} __no_const;
74124
74125 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
74126
74127diff --git a/include/linux/platform_data/usb-ohci-exynos.h b/include/linux/platform_data/usb-ohci-exynos.h
74128index c256c59..8ea94c7 100644
74129--- a/include/linux/platform_data/usb-ohci-exynos.h
74130+++ b/include/linux/platform_data/usb-ohci-exynos.h
74131@@ -14,7 +14,7 @@
74132 struct exynos4_ohci_platdata {
74133 int (*phy_init)(struct platform_device *pdev, int type);
74134 int (*phy_exit)(struct platform_device *pdev, int type);
74135-};
74136+} __no_const;
74137
74138 extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
74139
74140diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
74141index 7c1d252..c5c773e 100644
74142--- a/include/linux/pm_domain.h
74143+++ b/include/linux/pm_domain.h
74144@@ -48,7 +48,7 @@ struct gpd_dev_ops {
74145
74146 struct gpd_cpu_data {
74147 unsigned int saved_exit_latency;
74148- struct cpuidle_state *idle_state;
74149+ cpuidle_state_no_const *idle_state;
74150 };
74151
74152 struct generic_pm_domain {
74153diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
74154index 7d7e09e..8671ef8 100644
74155--- a/include/linux/pm_runtime.h
74156+++ b/include/linux/pm_runtime.h
74157@@ -104,7 +104,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
74158
74159 static inline void pm_runtime_mark_last_busy(struct device *dev)
74160 {
74161- ACCESS_ONCE(dev->power.last_busy) = jiffies;
74162+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
74163 }
74164
74165 #else /* !CONFIG_PM_RUNTIME */
74166diff --git a/include/linux/pnp.h b/include/linux/pnp.h
74167index 195aafc..49a7bc2 100644
74168--- a/include/linux/pnp.h
74169+++ b/include/linux/pnp.h
74170@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
74171 struct pnp_fixup {
74172 char id[7];
74173 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
74174-};
74175+} __do_const;
74176
74177 /* config parameters */
74178 #define PNP_CONFIG_NORMAL 0x0001
74179diff --git a/include/linux/poison.h b/include/linux/poison.h
74180index 2110a81..13a11bb 100644
74181--- a/include/linux/poison.h
74182+++ b/include/linux/poison.h
74183@@ -19,8 +19,8 @@
74184 * under normal circumstances, used to verify that nobody uses
74185 * non-initialized list entries.
74186 */
74187-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
74188-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
74189+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
74190+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
74191
74192 /********** include/linux/timer.h **********/
74193 /*
74194diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
74195index c0f44c2..1572583 100644
74196--- a/include/linux/power/smartreflex.h
74197+++ b/include/linux/power/smartreflex.h
74198@@ -238,7 +238,7 @@ struct omap_sr_class_data {
74199 int (*notify)(struct omap_sr *sr, u32 status);
74200 u8 notify_flags;
74201 u8 class_type;
74202-};
74203+} __do_const;
74204
74205 /**
74206 * struct omap_sr_nvalue_table - Smartreflex n-target value info
74207diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
74208index 4ea1d37..80f4b33 100644
74209--- a/include/linux/ppp-comp.h
74210+++ b/include/linux/ppp-comp.h
74211@@ -84,7 +84,7 @@ struct compressor {
74212 struct module *owner;
74213 /* Extra skb space needed by the compressor algorithm */
74214 unsigned int comp_extra;
74215-};
74216+} __do_const;
74217
74218 /*
74219 * The return value from decompress routine is the length of the
74220diff --git a/include/linux/preempt.h b/include/linux/preempt.h
74221index f5d4723..a6ea2fa 100644
74222--- a/include/linux/preempt.h
74223+++ b/include/linux/preempt.h
74224@@ -18,8 +18,13 @@
74225 # define sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
74226 #endif
74227
74228+#define raw_add_preempt_count(val) do { preempt_count() += (val); } while (0)
74229+#define raw_sub_preempt_count(val) do { preempt_count() -= (val); } while (0)
74230+
74231 #define inc_preempt_count() add_preempt_count(1)
74232+#define raw_inc_preempt_count() raw_add_preempt_count(1)
74233 #define dec_preempt_count() sub_preempt_count(1)
74234+#define raw_dec_preempt_count() raw_sub_preempt_count(1)
74235
74236 #define preempt_count() (current_thread_info()->preempt_count)
74237
74238@@ -64,6 +69,12 @@ do { \
74239 barrier(); \
74240 } while (0)
74241
74242+#define raw_preempt_disable() \
74243+do { \
74244+ raw_inc_preempt_count(); \
74245+ barrier(); \
74246+} while (0)
74247+
74248 #define sched_preempt_enable_no_resched() \
74249 do { \
74250 barrier(); \
74251@@ -72,6 +83,12 @@ do { \
74252
74253 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
74254
74255+#define raw_preempt_enable_no_resched() \
74256+do { \
74257+ barrier(); \
74258+ raw_dec_preempt_count(); \
74259+} while (0)
74260+
74261 #define preempt_enable() \
74262 do { \
74263 preempt_enable_no_resched(); \
74264@@ -116,8 +133,10 @@ do { \
74265 * region.
74266 */
74267 #define preempt_disable() barrier()
74268+#define raw_preempt_disable() barrier()
74269 #define sched_preempt_enable_no_resched() barrier()
74270 #define preempt_enable_no_resched() barrier()
74271+#define raw_preempt_enable_no_resched() barrier()
74272 #define preempt_enable() barrier()
74273
74274 #define preempt_disable_notrace() barrier()
74275diff --git a/include/linux/printk.h b/include/linux/printk.h
74276index 22c7052..ad3fa0a 100644
74277--- a/include/linux/printk.h
74278+++ b/include/linux/printk.h
74279@@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold
74280 void early_printk(const char *s, ...) { }
74281 #endif
74282
74283+extern int kptr_restrict;
74284+
74285 #ifdef CONFIG_PRINTK
74286 asmlinkage __printf(5, 0)
74287 int vprintk_emit(int facility, int level,
74288@@ -140,7 +142,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
74289
74290 extern int printk_delay_msec;
74291 extern int dmesg_restrict;
74292-extern int kptr_restrict;
74293
74294 extern void wake_up_klogd(void);
74295
74296diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
74297index 608e60a..c26f864 100644
74298--- a/include/linux/proc_fs.h
74299+++ b/include/linux/proc_fs.h
74300@@ -34,6 +34,19 @@ static inline struct proc_dir_entry *proc_create(
74301 return proc_create_data(name, mode, parent, proc_fops, NULL);
74302 }
74303
74304+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
74305+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
74306+{
74307+#ifdef CONFIG_GRKERNSEC_PROC_USER
74308+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
74309+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74310+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
74311+#else
74312+ return proc_create_data(name, mode, parent, proc_fops, NULL);
74313+#endif
74314+}
74315+
74316+
74317 extern void proc_set_size(struct proc_dir_entry *, loff_t);
74318 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
74319 extern void *PDE_DATA(const struct inode *);
74320diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
74321index 34a1e10..03a6d03 100644
74322--- a/include/linux/proc_ns.h
74323+++ b/include/linux/proc_ns.h
74324@@ -14,7 +14,7 @@ struct proc_ns_operations {
74325 void (*put)(void *ns);
74326 int (*install)(struct nsproxy *nsproxy, void *ns);
74327 unsigned int (*inum)(void *ns);
74328-};
74329+} __do_const;
74330
74331 struct proc_ns {
74332 void *ns;
74333diff --git a/include/linux/random.h b/include/linux/random.h
74334index 3b9377d..61b506a 100644
74335--- a/include/linux/random.h
74336+++ b/include/linux/random.h
74337@@ -32,6 +32,11 @@ void prandom_seed(u32 seed);
74338 u32 prandom_u32_state(struct rnd_state *);
74339 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
74340
74341+static inline unsigned long pax_get_random_long(void)
74342+{
74343+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
74344+}
74345+
74346 /*
74347 * Handle minimum values for seeds
74348 */
74349diff --git a/include/linux/rculist.h b/include/linux/rculist.h
74350index f4b1001..8ddb2b6 100644
74351--- a/include/linux/rculist.h
74352+++ b/include/linux/rculist.h
74353@@ -44,6 +44,9 @@ extern void __list_add_rcu(struct list_head *new,
74354 struct list_head *prev, struct list_head *next);
74355 #endif
74356
74357+extern void __pax_list_add_rcu(struct list_head *new,
74358+ struct list_head *prev, struct list_head *next);
74359+
74360 /**
74361 * list_add_rcu - add a new entry to rcu-protected list
74362 * @new: new entry to be added
74363@@ -65,6 +68,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
74364 __list_add_rcu(new, head, head->next);
74365 }
74366
74367+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
74368+{
74369+ __pax_list_add_rcu(new, head, head->next);
74370+}
74371+
74372 /**
74373 * list_add_tail_rcu - add a new entry to rcu-protected list
74374 * @new: new entry to be added
74375@@ -87,6 +95,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
74376 __list_add_rcu(new, head->prev, head);
74377 }
74378
74379+static inline void pax_list_add_tail_rcu(struct list_head *new,
74380+ struct list_head *head)
74381+{
74382+ __pax_list_add_rcu(new, head->prev, head);
74383+}
74384+
74385 /**
74386 * list_del_rcu - deletes entry from list without re-initialization
74387 * @entry: the element to delete from the list.
74388@@ -117,6 +131,8 @@ static inline void list_del_rcu(struct list_head *entry)
74389 entry->prev = LIST_POISON2;
74390 }
74391
74392+extern void pax_list_del_rcu(struct list_head *entry);
74393+
74394 /**
74395 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
74396 * @n: the element to delete from the hash list.
74397diff --git a/include/linux/reboot.h b/include/linux/reboot.h
74398index 23b3630..e1bc12b 100644
74399--- a/include/linux/reboot.h
74400+++ b/include/linux/reboot.h
74401@@ -18,9 +18,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
74402 * Architecture-specific implementations of sys_reboot commands.
74403 */
74404
74405-extern void machine_restart(char *cmd);
74406-extern void machine_halt(void);
74407-extern void machine_power_off(void);
74408+extern void machine_restart(char *cmd) __noreturn;
74409+extern void machine_halt(void) __noreturn;
74410+extern void machine_power_off(void) __noreturn;
74411
74412 extern void machine_shutdown(void);
74413 struct pt_regs;
74414@@ -31,9 +31,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
74415 */
74416
74417 extern void kernel_restart_prepare(char *cmd);
74418-extern void kernel_restart(char *cmd);
74419-extern void kernel_halt(void);
74420-extern void kernel_power_off(void);
74421+extern void kernel_restart(char *cmd) __noreturn;
74422+extern void kernel_halt(void) __noreturn;
74423+extern void kernel_power_off(void) __noreturn;
74424
74425 extern int C_A_D; /* for sysctl */
74426 void ctrl_alt_del(void);
74427@@ -47,7 +47,7 @@ extern int orderly_poweroff(bool force);
74428 * Emergency restart, callable from an interrupt handler.
74429 */
74430
74431-extern void emergency_restart(void);
74432+extern void emergency_restart(void) __noreturn;
74433 #include <asm/emergency-restart.h>
74434
74435 #endif /* _LINUX_REBOOT_H */
74436diff --git a/include/linux/regset.h b/include/linux/regset.h
74437index 8e0c9fe..ac4d221 100644
74438--- a/include/linux/regset.h
74439+++ b/include/linux/regset.h
74440@@ -161,7 +161,8 @@ struct user_regset {
74441 unsigned int align;
74442 unsigned int bias;
74443 unsigned int core_note_type;
74444-};
74445+} __do_const;
74446+typedef struct user_regset __no_const user_regset_no_const;
74447
74448 /**
74449 * struct user_regset_view - available regsets
74450diff --git a/include/linux/relay.h b/include/linux/relay.h
74451index d7c8359..818daf5 100644
74452--- a/include/linux/relay.h
74453+++ b/include/linux/relay.h
74454@@ -157,7 +157,7 @@ struct rchan_callbacks
74455 * The callback should return 0 if successful, negative if not.
74456 */
74457 int (*remove_buf_file)(struct dentry *dentry);
74458-};
74459+} __no_const;
74460
74461 /*
74462 * CONFIG_RELAY kernel API, kernel/relay.c
74463diff --git a/include/linux/rio.h b/include/linux/rio.h
74464index 18e0993..8ab5b21 100644
74465--- a/include/linux/rio.h
74466+++ b/include/linux/rio.h
74467@@ -345,7 +345,7 @@ struct rio_ops {
74468 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
74469 u64 rstart, u32 size, u32 flags);
74470 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
74471-};
74472+} __no_const;
74473
74474 #define RIO_RESOURCE_MEM 0x00000100
74475 #define RIO_RESOURCE_DOORBELL 0x00000200
74476diff --git a/include/linux/rmap.h b/include/linux/rmap.h
74477index 6dacb93..6174423 100644
74478--- a/include/linux/rmap.h
74479+++ b/include/linux/rmap.h
74480@@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
74481 void anon_vma_init(void); /* create anon_vma_cachep */
74482 int anon_vma_prepare(struct vm_area_struct *);
74483 void unlink_anon_vmas(struct vm_area_struct *);
74484-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
74485-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
74486+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
74487+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
74488
74489 static inline void anon_vma_merge(struct vm_area_struct *vma,
74490 struct vm_area_struct *next)
74491diff --git a/include/linux/sched.h b/include/linux/sched.h
74492index 3aeb14b..73816a6 100644
74493--- a/include/linux/sched.h
74494+++ b/include/linux/sched.h
74495@@ -62,6 +62,7 @@ struct bio_list;
74496 struct fs_struct;
74497 struct perf_event_context;
74498 struct blk_plug;
74499+struct linux_binprm;
74500
74501 /*
74502 * List of flags we want to share for kernel threads,
74503@@ -303,7 +304,7 @@ extern char __sched_text_start[], __sched_text_end[];
74504 extern int in_sched_functions(unsigned long addr);
74505
74506 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
74507-extern signed long schedule_timeout(signed long timeout);
74508+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
74509 extern signed long schedule_timeout_interruptible(signed long timeout);
74510 extern signed long schedule_timeout_killable(signed long timeout);
74511 extern signed long schedule_timeout_uninterruptible(signed long timeout);
74512@@ -314,7 +315,19 @@ struct nsproxy;
74513 struct user_namespace;
74514
74515 #ifdef CONFIG_MMU
74516-extern unsigned long mmap_legacy_base(void);
74517+
74518+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
74519+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
74520+#else
74521+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
74522+{
74523+ return 0;
74524+}
74525+#endif
74526+
74527+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
74528+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
74529+extern unsigned long mmap_legacy_base(struct mm_struct *mm);
74530 extern void arch_pick_mmap_layout(struct mm_struct *mm);
74531 extern unsigned long
74532 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
74533@@ -592,6 +605,17 @@ struct signal_struct {
74534 #ifdef CONFIG_TASKSTATS
74535 struct taskstats *stats;
74536 #endif
74537+
74538+#ifdef CONFIG_GRKERNSEC
74539+ u32 curr_ip;
74540+ u32 saved_ip;
74541+ u32 gr_saddr;
74542+ u32 gr_daddr;
74543+ u16 gr_sport;
74544+ u16 gr_dport;
74545+ u8 used_accept:1;
74546+#endif
74547+
74548 #ifdef CONFIG_AUDIT
74549 unsigned audit_tty;
74550 unsigned audit_tty_log_passwd;
74551@@ -672,6 +696,14 @@ struct user_struct {
74552 struct key *session_keyring; /* UID's default session keyring */
74553 #endif
74554
74555+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
74556+ unsigned char kernel_banned;
74557+#endif
74558+#ifdef CONFIG_GRKERNSEC_BRUTE
74559+ unsigned char suid_banned;
74560+ unsigned long suid_ban_expires;
74561+#endif
74562+
74563 /* Hash table maintenance information */
74564 struct hlist_node uidhash_node;
74565 kuid_t uid;
74566@@ -1159,8 +1191,8 @@ struct task_struct {
74567 struct list_head thread_group;
74568
74569 struct completion *vfork_done; /* for vfork() */
74570- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
74571- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
74572+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
74573+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
74574
74575 cputime_t utime, stime, utimescaled, stimescaled;
74576 cputime_t gtime;
74577@@ -1185,11 +1217,6 @@ struct task_struct {
74578 struct task_cputime cputime_expires;
74579 struct list_head cpu_timers[3];
74580
74581-/* process credentials */
74582- const struct cred __rcu *real_cred; /* objective and real subjective task
74583- * credentials (COW) */
74584- const struct cred __rcu *cred; /* effective (overridable) subjective task
74585- * credentials (COW) */
74586 char comm[TASK_COMM_LEN]; /* executable name excluding path
74587 - access with [gs]et_task_comm (which lock
74588 it with task_lock())
74589@@ -1206,6 +1233,10 @@ struct task_struct {
74590 #endif
74591 /* CPU-specific state of this task */
74592 struct thread_struct thread;
74593+/* thread_info moved to task_struct */
74594+#ifdef CONFIG_X86
74595+ struct thread_info tinfo;
74596+#endif
74597 /* filesystem information */
74598 struct fs_struct *fs;
74599 /* open file information */
74600@@ -1279,6 +1310,10 @@ struct task_struct {
74601 gfp_t lockdep_reclaim_gfp;
74602 #endif
74603
74604+/* process credentials */
74605+ const struct cred __rcu *real_cred; /* objective and real subjective task
74606+ * credentials (COW) */
74607+
74608 /* journalling filesystem info */
74609 void *journal_info;
74610
74611@@ -1317,6 +1352,10 @@ struct task_struct {
74612 /* cg_list protected by css_set_lock and tsk->alloc_lock */
74613 struct list_head cg_list;
74614 #endif
74615+
74616+ const struct cred __rcu *cred; /* effective (overridable) subjective task
74617+ * credentials (COW) */
74618+
74619 #ifdef CONFIG_FUTEX
74620 struct robust_list_head __user *robust_list;
74621 #ifdef CONFIG_COMPAT
74622@@ -1417,8 +1456,76 @@ struct task_struct {
74623 unsigned int sequential_io;
74624 unsigned int sequential_io_avg;
74625 #endif
74626+
74627+#ifdef CONFIG_GRKERNSEC
74628+ /* grsecurity */
74629+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74630+ u64 exec_id;
74631+#endif
74632+#ifdef CONFIG_GRKERNSEC_SETXID
74633+ const struct cred *delayed_cred;
74634+#endif
74635+ struct dentry *gr_chroot_dentry;
74636+ struct acl_subject_label *acl;
74637+ struct acl_role_label *role;
74638+ struct file *exec_file;
74639+ unsigned long brute_expires;
74640+ u16 acl_role_id;
74641+ /* is this the task that authenticated to the special role */
74642+ u8 acl_sp_role;
74643+ u8 is_writable;
74644+ u8 brute;
74645+ u8 gr_is_chrooted;
74646+#endif
74647+
74648 };
74649
74650+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
74651+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
74652+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
74653+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
74654+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
74655+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
74656+
74657+#ifdef CONFIG_PAX_SOFTMODE
74658+extern int pax_softmode;
74659+#endif
74660+
74661+extern int pax_check_flags(unsigned long *);
74662+
74663+/* if tsk != current then task_lock must be held on it */
74664+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
74665+static inline unsigned long pax_get_flags(struct task_struct *tsk)
74666+{
74667+ if (likely(tsk->mm))
74668+ return tsk->mm->pax_flags;
74669+ else
74670+ return 0UL;
74671+}
74672+
74673+/* if tsk != current then task_lock must be held on it */
74674+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
74675+{
74676+ if (likely(tsk->mm)) {
74677+ tsk->mm->pax_flags = flags;
74678+ return 0;
74679+ }
74680+ return -EINVAL;
74681+}
74682+#endif
74683+
74684+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
74685+extern void pax_set_initial_flags(struct linux_binprm *bprm);
74686+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
74687+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
74688+#endif
74689+
74690+struct path;
74691+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
74692+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
74693+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
74694+extern void pax_report_refcount_overflow(struct pt_regs *regs);
74695+
74696 /* Future-safe accessor for struct task_struct's cpus_allowed. */
74697 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
74698
74699@@ -1477,7 +1584,7 @@ struct pid_namespace;
74700 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
74701 struct pid_namespace *ns);
74702
74703-static inline pid_t task_pid_nr(struct task_struct *tsk)
74704+static inline pid_t task_pid_nr(const struct task_struct *tsk)
74705 {
74706 return tsk->pid;
74707 }
74708@@ -1920,7 +2027,9 @@ void yield(void);
74709 extern struct exec_domain default_exec_domain;
74710
74711 union thread_union {
74712+#ifndef CONFIG_X86
74713 struct thread_info thread_info;
74714+#endif
74715 unsigned long stack[THREAD_SIZE/sizeof(long)];
74716 };
74717
74718@@ -1953,6 +2062,7 @@ extern struct pid_namespace init_pid_ns;
74719 */
74720
74721 extern struct task_struct *find_task_by_vpid(pid_t nr);
74722+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
74723 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
74724 struct pid_namespace *ns);
74725
74726@@ -2119,7 +2229,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
74727 extern void exit_itimers(struct signal_struct *);
74728 extern void flush_itimer_signals(void);
74729
74730-extern void do_group_exit(int);
74731+extern __noreturn void do_group_exit(int);
74732
74733 extern int allow_signal(int);
74734 extern int disallow_signal(int);
74735@@ -2310,9 +2420,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
74736
74737 #endif
74738
74739-static inline int object_is_on_stack(void *obj)
74740+static inline int object_starts_on_stack(void *obj)
74741 {
74742- void *stack = task_stack_page(current);
74743+ const void *stack = task_stack_page(current);
74744
74745 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
74746 }
74747diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
74748index bf8086b..962b035 100644
74749--- a/include/linux/sched/sysctl.h
74750+++ b/include/linux/sched/sysctl.h
74751@@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
74752 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
74753
74754 extern int sysctl_max_map_count;
74755+extern unsigned long sysctl_heap_stack_gap;
74756
74757 extern unsigned int sysctl_sched_latency;
74758 extern unsigned int sysctl_sched_min_granularity;
74759diff --git a/include/linux/security.h b/include/linux/security.h
74760index 4686491..2bd210e 100644
74761--- a/include/linux/security.h
74762+++ b/include/linux/security.h
74763@@ -26,6 +26,7 @@
74764 #include <linux/capability.h>
74765 #include <linux/slab.h>
74766 #include <linux/err.h>
74767+#include <linux/grsecurity.h>
74768
74769 struct linux_binprm;
74770 struct cred;
74771diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
74772index 2da29ac..aac448ec 100644
74773--- a/include/linux/seq_file.h
74774+++ b/include/linux/seq_file.h
74775@@ -26,6 +26,9 @@ struct seq_file {
74776 struct mutex lock;
74777 const struct seq_operations *op;
74778 int poll_event;
74779+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74780+ u64 exec_id;
74781+#endif
74782 #ifdef CONFIG_USER_NS
74783 struct user_namespace *user_ns;
74784 #endif
74785@@ -38,6 +41,7 @@ struct seq_operations {
74786 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
74787 int (*show) (struct seq_file *m, void *v);
74788 };
74789+typedef struct seq_operations __no_const seq_operations_no_const;
74790
74791 #define SEQ_SKIP 1
74792
74793diff --git a/include/linux/shm.h b/include/linux/shm.h
74794index 429c199..4d42e38 100644
74795--- a/include/linux/shm.h
74796+++ b/include/linux/shm.h
74797@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
74798
74799 /* The task created the shm object. NULL if the task is dead. */
74800 struct task_struct *shm_creator;
74801+#ifdef CONFIG_GRKERNSEC
74802+ time_t shm_createtime;
74803+ pid_t shm_lapid;
74804+#endif
74805 };
74806
74807 /* shm_mode upper byte flags */
74808diff --git a/include/linux/signal.h b/include/linux/signal.h
74809index d897484..323ba98 100644
74810--- a/include/linux/signal.h
74811+++ b/include/linux/signal.h
74812@@ -433,6 +433,7 @@ void signals_init(void);
74813
74814 int restore_altstack(const stack_t __user *);
74815 int __save_altstack(stack_t __user *, unsigned long);
74816+void __save_altstack_ex(stack_t __user *, unsigned long);
74817
74818 #ifdef CONFIG_PROC_FS
74819 struct seq_file;
74820diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
74821index dec1748..112c1f9 100644
74822--- a/include/linux/skbuff.h
74823+++ b/include/linux/skbuff.h
74824@@ -640,7 +640,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
74825 extern struct sk_buff *__alloc_skb(unsigned int size,
74826 gfp_t priority, int flags, int node);
74827 extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
74828-static inline struct sk_buff *alloc_skb(unsigned int size,
74829+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
74830 gfp_t priority)
74831 {
74832 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
74833@@ -756,7 +756,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
74834 */
74835 static inline int skb_queue_empty(const struct sk_buff_head *list)
74836 {
74837- return list->next == (struct sk_buff *)list;
74838+ return list->next == (const struct sk_buff *)list;
74839 }
74840
74841 /**
74842@@ -769,7 +769,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
74843 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
74844 const struct sk_buff *skb)
74845 {
74846- return skb->next == (struct sk_buff *)list;
74847+ return skb->next == (const struct sk_buff *)list;
74848 }
74849
74850 /**
74851@@ -782,7 +782,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
74852 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
74853 const struct sk_buff *skb)
74854 {
74855- return skb->prev == (struct sk_buff *)list;
74856+ return skb->prev == (const struct sk_buff *)list;
74857 }
74858
74859 /**
74860@@ -1848,7 +1848,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
74861 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
74862 */
74863 #ifndef NET_SKB_PAD
74864-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
74865+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
74866 #endif
74867
74868 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
74869@@ -2443,7 +2443,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
74870 int noblock, int *err);
74871 extern unsigned int datagram_poll(struct file *file, struct socket *sock,
74872 struct poll_table_struct *wait);
74873-extern int skb_copy_datagram_iovec(const struct sk_buff *from,
74874+extern int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from,
74875 int offset, struct iovec *to,
74876 int size);
74877 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
74878@@ -2733,6 +2733,9 @@ static inline void nf_reset(struct sk_buff *skb)
74879 nf_bridge_put(skb->nf_bridge);
74880 skb->nf_bridge = NULL;
74881 #endif
74882+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
74883+ skb->nf_trace = 0;
74884+#endif
74885 }
74886
74887 static inline void nf_reset_trace(struct sk_buff *skb)
74888diff --git a/include/linux/slab.h b/include/linux/slab.h
74889index 0c62175..f016ac1 100644
74890--- a/include/linux/slab.h
74891+++ b/include/linux/slab.h
74892@@ -12,15 +12,29 @@
74893 #include <linux/gfp.h>
74894 #include <linux/types.h>
74895 #include <linux/workqueue.h>
74896-
74897+#include <linux/err.h>
74898
74899 /*
74900 * Flags to pass to kmem_cache_create().
74901 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
74902 */
74903 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
74904+
74905+#ifdef CONFIG_PAX_USERCOPY_SLABS
74906+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
74907+#else
74908+#define SLAB_USERCOPY 0x00000000UL
74909+#endif
74910+
74911 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
74912 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
74913+
74914+#ifdef CONFIG_PAX_MEMORY_SANITIZE
74915+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
74916+#else
74917+#define SLAB_NO_SANITIZE 0x00000000UL
74918+#endif
74919+
74920 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
74921 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
74922 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
74923@@ -89,10 +103,13 @@
74924 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
74925 * Both make kfree a no-op.
74926 */
74927-#define ZERO_SIZE_PTR ((void *)16)
74928+#define ZERO_SIZE_PTR \
74929+({ \
74930+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
74931+ (void *)(-MAX_ERRNO-1L); \
74932+})
74933
74934-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
74935- (unsigned long)ZERO_SIZE_PTR)
74936+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
74937
74938
74939 struct mem_cgroup;
74940@@ -132,6 +149,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
74941 void kfree(const void *);
74942 void kzfree(const void *);
74943 size_t ksize(const void *);
74944+const char *check_heap_object(const void *ptr, unsigned long n);
74945+bool is_usercopy_object(const void *ptr);
74946
74947 /*
74948 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
74949@@ -164,7 +183,7 @@ struct kmem_cache {
74950 unsigned int align; /* Alignment as calculated */
74951 unsigned long flags; /* Active flags on the slab */
74952 const char *name; /* Slab name for sysfs */
74953- int refcount; /* Use counter */
74954+ atomic_t refcount; /* Use counter */
74955 void (*ctor)(void *); /* Called on object slot creation */
74956 struct list_head list; /* List of all slab caches on the system */
74957 };
74958@@ -226,6 +245,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
74959 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
74960 #endif
74961
74962+#ifdef CONFIG_PAX_USERCOPY_SLABS
74963+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
74964+#endif
74965+
74966 /*
74967 * Figure out which kmalloc slab an allocation of a certain size
74968 * belongs to.
74969@@ -234,7 +257,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
74970 * 2 = 120 .. 192 bytes
74971 * n = 2^(n-1) .. 2^n -1
74972 */
74973-static __always_inline int kmalloc_index(size_t size)
74974+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
74975 {
74976 if (!size)
74977 return 0;
74978@@ -406,6 +429,7 @@ void print_slabinfo_header(struct seq_file *m);
74979 * for general use, and so are not documented here. For a full list of
74980 * potential flags, always refer to linux/gfp.h.
74981 */
74982+
74983 static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
74984 {
74985 if (size != 0 && n > SIZE_MAX / size)
74986@@ -465,7 +489,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
74987 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
74988 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
74989 (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
74990-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
74991+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
74992 #define kmalloc_track_caller(size, flags) \
74993 __kmalloc_track_caller(size, flags, _RET_IP_)
74994 #else
74995@@ -485,7 +509,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
74996 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
74997 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
74998 (defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
74999-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
75000+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
75001 #define kmalloc_node_track_caller(size, flags, node) \
75002 __kmalloc_node_track_caller(size, flags, node, \
75003 _RET_IP_)
75004diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
75005index cd40158..4e2f7af 100644
75006--- a/include/linux/slab_def.h
75007+++ b/include/linux/slab_def.h
75008@@ -50,7 +50,7 @@ struct kmem_cache {
75009 /* 4) cache creation/removal */
75010 const char *name;
75011 struct list_head list;
75012- int refcount;
75013+ atomic_t refcount;
75014 int object_size;
75015 int align;
75016
75017@@ -66,10 +66,14 @@ struct kmem_cache {
75018 unsigned long node_allocs;
75019 unsigned long node_frees;
75020 unsigned long node_overflow;
75021- atomic_t allochit;
75022- atomic_t allocmiss;
75023- atomic_t freehit;
75024- atomic_t freemiss;
75025+ atomic_unchecked_t allochit;
75026+ atomic_unchecked_t allocmiss;
75027+ atomic_unchecked_t freehit;
75028+ atomic_unchecked_t freemiss;
75029+#ifdef CONFIG_PAX_MEMORY_SANITIZE
75030+ atomic_unchecked_t sanitized;
75031+ atomic_unchecked_t not_sanitized;
75032+#endif
75033
75034 /*
75035 * If debugging is enabled, then the allocator can add additional
75036@@ -103,7 +107,7 @@ struct kmem_cache {
75037 };
75038
75039 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
75040-void *__kmalloc(size_t size, gfp_t flags);
75041+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
75042
75043 #ifdef CONFIG_TRACING
75044 extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
75045@@ -136,6 +140,13 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
75046 cachep = kmalloc_dma_caches[i];
75047 else
75048 #endif
75049+
75050+#ifdef CONFIG_PAX_USERCOPY_SLABS
75051+ if (flags & GFP_USERCOPY)
75052+ cachep = kmalloc_usercopy_caches[i];
75053+ else
75054+#endif
75055+
75056 cachep = kmalloc_caches[i];
75057
75058 ret = kmem_cache_alloc_trace(cachep, flags, size);
75059@@ -146,7 +157,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
75060 }
75061
75062 #ifdef CONFIG_NUMA
75063-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
75064+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
75065 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
75066
75067 #ifdef CONFIG_TRACING
75068@@ -185,6 +196,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
75069 cachep = kmalloc_dma_caches[i];
75070 else
75071 #endif
75072+
75073+#ifdef CONFIG_PAX_USERCOPY_SLABS
75074+ if (flags & GFP_USERCOPY)
75075+ cachep = kmalloc_usercopy_caches[i];
75076+ else
75077+#endif
75078+
75079 cachep = kmalloc_caches[i];
75080
75081 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
75082diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
75083index f28e14a..7831211 100644
75084--- a/include/linux/slob_def.h
75085+++ b/include/linux/slob_def.h
75086@@ -11,7 +11,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
75087 return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE);
75088 }
75089
75090-void *__kmalloc_node(size_t size, gfp_t flags, int node);
75091+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
75092
75093 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
75094 {
75095@@ -31,7 +31,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
75096 return __kmalloc_node(size, flags, NUMA_NO_NODE);
75097 }
75098
75099-static __always_inline void *__kmalloc(size_t size, gfp_t flags)
75100+static __always_inline __size_overflow(1) void *__kmalloc(size_t size, gfp_t flags)
75101 {
75102 return kmalloc(size, flags);
75103 }
75104diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
75105index 027276f..092bfe8 100644
75106--- a/include/linux/slub_def.h
75107+++ b/include/linux/slub_def.h
75108@@ -80,7 +80,7 @@ struct kmem_cache {
75109 struct kmem_cache_order_objects max;
75110 struct kmem_cache_order_objects min;
75111 gfp_t allocflags; /* gfp flags to use on each alloc */
75112- int refcount; /* Refcount for slab cache destroy */
75113+ atomic_t refcount; /* Refcount for slab cache destroy */
75114 void (*ctor)(void *);
75115 int inuse; /* Offset to metadata */
75116 int align; /* Alignment */
75117@@ -105,7 +105,7 @@ struct kmem_cache {
75118 };
75119
75120 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
75121-void *__kmalloc(size_t size, gfp_t flags);
75122+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
75123
75124 static __always_inline void *
75125 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
75126@@ -149,7 +149,7 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
75127 }
75128 #endif
75129
75130-static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
75131+static __always_inline __size_overflow(1) void *kmalloc_large(size_t size, gfp_t flags)
75132 {
75133 unsigned int order = get_order(size);
75134 return kmalloc_order_trace(size, flags, order);
75135@@ -175,7 +175,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
75136 }
75137
75138 #ifdef CONFIG_NUMA
75139-void *__kmalloc_node(size_t size, gfp_t flags, int node);
75140+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
75141 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
75142
75143 #ifdef CONFIG_TRACING
75144diff --git a/include/linux/smp.h b/include/linux/smp.h
75145index c848876..11e8a84 100644
75146--- a/include/linux/smp.h
75147+++ b/include/linux/smp.h
75148@@ -221,7 +221,9 @@ static inline void kick_all_cpus_sync(void) { }
75149 #endif
75150
75151 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
75152+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
75153 #define put_cpu() preempt_enable()
75154+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
75155
75156 /*
75157 * Callback to arch code if there's nosmp or maxcpus=0 on the
75158diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
75159index 54f91d3..be2c379 100644
75160--- a/include/linux/sock_diag.h
75161+++ b/include/linux/sock_diag.h
75162@@ -11,7 +11,7 @@ struct sock;
75163 struct sock_diag_handler {
75164 __u8 family;
75165 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
75166-};
75167+} __do_const;
75168
75169 int sock_diag_register(const struct sock_diag_handler *h);
75170 void sock_diag_unregister(const struct sock_diag_handler *h);
75171diff --git a/include/linux/sonet.h b/include/linux/sonet.h
75172index 680f9a3..f13aeb0 100644
75173--- a/include/linux/sonet.h
75174+++ b/include/linux/sonet.h
75175@@ -7,7 +7,7 @@
75176 #include <uapi/linux/sonet.h>
75177
75178 struct k_sonet_stats {
75179-#define __HANDLE_ITEM(i) atomic_t i
75180+#define __HANDLE_ITEM(i) atomic_unchecked_t i
75181 __SONET_ITEMS
75182 #undef __HANDLE_ITEM
75183 };
75184diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
75185index 07d8e53..dc934c9 100644
75186--- a/include/linux/sunrpc/addr.h
75187+++ b/include/linux/sunrpc/addr.h
75188@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
75189 {
75190 switch (sap->sa_family) {
75191 case AF_INET:
75192- return ntohs(((struct sockaddr_in *)sap)->sin_port);
75193+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
75194 case AF_INET6:
75195- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
75196+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
75197 }
75198 return 0;
75199 }
75200@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
75201 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
75202 const struct sockaddr *src)
75203 {
75204- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
75205+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
75206 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
75207
75208 dsin->sin_family = ssin->sin_family;
75209@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
75210 if (sa->sa_family != AF_INET6)
75211 return 0;
75212
75213- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
75214+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
75215 }
75216
75217 #endif /* _LINUX_SUNRPC_ADDR_H */
75218diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
75219index bfe11be..12bc8c4 100644
75220--- a/include/linux/sunrpc/clnt.h
75221+++ b/include/linux/sunrpc/clnt.h
75222@@ -96,7 +96,7 @@ struct rpc_procinfo {
75223 unsigned int p_timer; /* Which RTT timer to use */
75224 u32 p_statidx; /* Which procedure to account */
75225 const char * p_name; /* name of procedure */
75226-};
75227+} __do_const;
75228
75229 #ifdef __KERNEL__
75230
75231diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
75232index 1f0216b..6a4fa50 100644
75233--- a/include/linux/sunrpc/svc.h
75234+++ b/include/linux/sunrpc/svc.h
75235@@ -411,7 +411,7 @@ struct svc_procedure {
75236 unsigned int pc_count; /* call count */
75237 unsigned int pc_cachetype; /* cache info (NFS) */
75238 unsigned int pc_xdrressize; /* maximum size of XDR reply */
75239-};
75240+} __do_const;
75241
75242 /*
75243 * Function prototypes.
75244diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
75245index 0b8e3e6..33e0a01 100644
75246--- a/include/linux/sunrpc/svc_rdma.h
75247+++ b/include/linux/sunrpc/svc_rdma.h
75248@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
75249 extern unsigned int svcrdma_max_requests;
75250 extern unsigned int svcrdma_max_req_size;
75251
75252-extern atomic_t rdma_stat_recv;
75253-extern atomic_t rdma_stat_read;
75254-extern atomic_t rdma_stat_write;
75255-extern atomic_t rdma_stat_sq_starve;
75256-extern atomic_t rdma_stat_rq_starve;
75257-extern atomic_t rdma_stat_rq_poll;
75258-extern atomic_t rdma_stat_rq_prod;
75259-extern atomic_t rdma_stat_sq_poll;
75260-extern atomic_t rdma_stat_sq_prod;
75261+extern atomic_unchecked_t rdma_stat_recv;
75262+extern atomic_unchecked_t rdma_stat_read;
75263+extern atomic_unchecked_t rdma_stat_write;
75264+extern atomic_unchecked_t rdma_stat_sq_starve;
75265+extern atomic_unchecked_t rdma_stat_rq_starve;
75266+extern atomic_unchecked_t rdma_stat_rq_poll;
75267+extern atomic_unchecked_t rdma_stat_rq_prod;
75268+extern atomic_unchecked_t rdma_stat_sq_poll;
75269+extern atomic_unchecked_t rdma_stat_sq_prod;
75270
75271 #define RPCRDMA_VERSION 1
75272
75273diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
75274index ff374ab..7fd2ecb 100644
75275--- a/include/linux/sunrpc/svcauth.h
75276+++ b/include/linux/sunrpc/svcauth.h
75277@@ -109,7 +109,7 @@ struct auth_ops {
75278 int (*release)(struct svc_rqst *rq);
75279 void (*domain_release)(struct auth_domain *);
75280 int (*set_client)(struct svc_rqst *rq);
75281-};
75282+} __do_const;
75283
75284 #define SVC_GARBAGE 1
75285 #define SVC_SYSERR 2
75286diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
75287index a5ffd32..0935dea 100644
75288--- a/include/linux/swiotlb.h
75289+++ b/include/linux/swiotlb.h
75290@@ -60,7 +60,8 @@ extern void
75291
75292 extern void
75293 swiotlb_free_coherent(struct device *hwdev, size_t size,
75294- void *vaddr, dma_addr_t dma_handle);
75295+ void *vaddr, dma_addr_t dma_handle,
75296+ struct dma_attrs *attrs);
75297
75298 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
75299 unsigned long offset, size_t size,
75300diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
75301index 84662ec..d8f8adb 100644
75302--- a/include/linux/syscalls.h
75303+++ b/include/linux/syscalls.h
75304@@ -97,8 +97,12 @@ struct sigaltstack;
75305 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
75306
75307 #define __SC_DECL(t, a) t a
75308-#define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
75309-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
75310+#define __TYPE_IS_SL(t) (__same_type((t)0, 0L))
75311+#define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
75312+#define __TYPE_IS_SLL(t) (__same_type((t)0, 0LL))
75313+#define __TYPE_IS_ULL(t) (__same_type((t)0, 0ULL))
75314+#define __TYPE_IS_LL(t) (__TYPE_IS_SLL(t) || __TYPE_IS_ULL(t))
75315+#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), __builtin_choose_expr(__TYPE_IS_ULL(t), 0ULL, 0LL), __builtin_choose_expr(__TYPE_IS_UL(t), 0UL, 0L))) a
75316 #define __SC_CAST(t, a) (t) a
75317 #define __SC_ARGS(t, a) a
75318 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
75319@@ -362,11 +366,11 @@ asmlinkage long sys_sync(void);
75320 asmlinkage long sys_fsync(unsigned int fd);
75321 asmlinkage long sys_fdatasync(unsigned int fd);
75322 asmlinkage long sys_bdflush(int func, long data);
75323-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
75324- char __user *type, unsigned long flags,
75325+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
75326+ const char __user *type, unsigned long flags,
75327 void __user *data);
75328-asmlinkage long sys_umount(char __user *name, int flags);
75329-asmlinkage long sys_oldumount(char __user *name);
75330+asmlinkage long sys_umount(const char __user *name, int flags);
75331+asmlinkage long sys_oldumount(const char __user *name);
75332 asmlinkage long sys_truncate(const char __user *path, long length);
75333 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
75334 asmlinkage long sys_stat(const char __user *filename,
75335@@ -578,7 +582,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
75336 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
75337 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
75338 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
75339- struct sockaddr __user *, int);
75340+ struct sockaddr __user *, int) __intentional_overflow(0);
75341 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
75342 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
75343 unsigned int vlen, unsigned flags);
75344diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
75345index 27b3b0b..e093dd9 100644
75346--- a/include/linux/syscore_ops.h
75347+++ b/include/linux/syscore_ops.h
75348@@ -16,7 +16,7 @@ struct syscore_ops {
75349 int (*suspend)(void);
75350 void (*resume)(void);
75351 void (*shutdown)(void);
75352-};
75353+} __do_const;
75354
75355 extern void register_syscore_ops(struct syscore_ops *ops);
75356 extern void unregister_syscore_ops(struct syscore_ops *ops);
75357diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
75358index 14a8ff2..af52bad 100644
75359--- a/include/linux/sysctl.h
75360+++ b/include/linux/sysctl.h
75361@@ -34,13 +34,13 @@ struct ctl_table_root;
75362 struct ctl_table_header;
75363 struct ctl_dir;
75364
75365-typedef struct ctl_table ctl_table;
75366-
75367 typedef int proc_handler (struct ctl_table *ctl, int write,
75368 void __user *buffer, size_t *lenp, loff_t *ppos);
75369
75370 extern int proc_dostring(struct ctl_table *, int,
75371 void __user *, size_t *, loff_t *);
75372+extern int proc_dostring_modpriv(struct ctl_table *, int,
75373+ void __user *, size_t *, loff_t *);
75374 extern int proc_dointvec(struct ctl_table *, int,
75375 void __user *, size_t *, loff_t *);
75376 extern int proc_dointvec_minmax(struct ctl_table *, int,
75377@@ -115,7 +115,9 @@ struct ctl_table
75378 struct ctl_table_poll *poll;
75379 void *extra1;
75380 void *extra2;
75381-};
75382+} __do_const;
75383+typedef struct ctl_table __no_const ctl_table_no_const;
75384+typedef struct ctl_table ctl_table;
75385
75386 struct ctl_node {
75387 struct rb_node node;
75388diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
75389index e2cee22..3ddb921 100644
75390--- a/include/linux/sysfs.h
75391+++ b/include/linux/sysfs.h
75392@@ -31,7 +31,8 @@ struct attribute {
75393 struct lock_class_key *key;
75394 struct lock_class_key skey;
75395 #endif
75396-};
75397+} __do_const;
75398+typedef struct attribute __no_const attribute_no_const;
75399
75400 /**
75401 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
75402@@ -59,8 +60,8 @@ struct attribute_group {
75403 umode_t (*is_visible)(struct kobject *,
75404 struct attribute *, int);
75405 struct attribute **attrs;
75406-};
75407-
75408+} __do_const;
75409+typedef struct attribute_group __no_const attribute_group_no_const;
75410
75411
75412 /**
75413@@ -107,7 +108,8 @@ struct bin_attribute {
75414 char *, loff_t, size_t);
75415 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
75416 struct vm_area_struct *vma);
75417-};
75418+} __do_const;
75419+typedef struct bin_attribute __no_const bin_attribute_no_const;
75420
75421 /**
75422 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
75423diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
75424index 7faf933..9b85a0c 100644
75425--- a/include/linux/sysrq.h
75426+++ b/include/linux/sysrq.h
75427@@ -16,6 +16,7 @@
75428
75429 #include <linux/errno.h>
75430 #include <linux/types.h>
75431+#include <linux/compiler.h>
75432
75433 /* Enable/disable SYSRQ support by default (0==no, 1==yes). */
75434 #define SYSRQ_DEFAULT_ENABLE 1
75435@@ -36,7 +37,7 @@ struct sysrq_key_op {
75436 char *help_msg;
75437 char *action_msg;
75438 int enable_mask;
75439-};
75440+} __do_const;
75441
75442 #ifdef CONFIG_MAGIC_SYSRQ
75443
75444diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
75445index e7e0473..7989295 100644
75446--- a/include/linux/thread_info.h
75447+++ b/include/linux/thread_info.h
75448@@ -148,6 +148,15 @@ static inline bool test_and_clear_restore_sigmask(void)
75449 #error "no set_restore_sigmask() provided and default one won't work"
75450 #endif
75451
75452+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user);
75453+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
75454+{
75455+#ifndef CONFIG_PAX_USERCOPY_DEBUG
75456+ if (!__builtin_constant_p(n))
75457+#endif
75458+ __check_object_size(ptr, n, to_user);
75459+}
75460+
75461 #endif /* __KERNEL__ */
75462
75463 #endif /* _LINUX_THREAD_INFO_H */
75464diff --git a/include/linux/tty.h b/include/linux/tty.h
75465index 8780bd2..d1ae08b 100644
75466--- a/include/linux/tty.h
75467+++ b/include/linux/tty.h
75468@@ -194,7 +194,7 @@ struct tty_port {
75469 const struct tty_port_operations *ops; /* Port operations */
75470 spinlock_t lock; /* Lock protecting tty field */
75471 int blocked_open; /* Waiting to open */
75472- int count; /* Usage count */
75473+ atomic_t count; /* Usage count */
75474 wait_queue_head_t open_wait; /* Open waiters */
75475 wait_queue_head_t close_wait; /* Close waiters */
75476 wait_queue_head_t delta_msr_wait; /* Modem status change */
75477@@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port,
75478 struct tty_struct *tty, struct file *filp);
75479 static inline int tty_port_users(struct tty_port *port)
75480 {
75481- return port->count + port->blocked_open;
75482+ return atomic_read(&port->count) + port->blocked_open;
75483 }
75484
75485 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
75486diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
75487index 756a609..b302dd6 100644
75488--- a/include/linux/tty_driver.h
75489+++ b/include/linux/tty_driver.h
75490@@ -285,7 +285,7 @@ struct tty_operations {
75491 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
75492 #endif
75493 const struct file_operations *proc_fops;
75494-};
75495+} __do_const;
75496
75497 struct tty_driver {
75498 int magic; /* magic number for this structure */
75499diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
75500index 58390c7..95e214c 100644
75501--- a/include/linux/tty_ldisc.h
75502+++ b/include/linux/tty_ldisc.h
75503@@ -146,7 +146,7 @@ struct tty_ldisc_ops {
75504
75505 struct module *owner;
75506
75507- int refcount;
75508+ atomic_t refcount;
75509 };
75510
75511 struct tty_ldisc {
75512diff --git a/include/linux/types.h b/include/linux/types.h
75513index 4d118ba..c3ee9bf 100644
75514--- a/include/linux/types.h
75515+++ b/include/linux/types.h
75516@@ -176,10 +176,26 @@ typedef struct {
75517 int counter;
75518 } atomic_t;
75519
75520+#ifdef CONFIG_PAX_REFCOUNT
75521+typedef struct {
75522+ int counter;
75523+} atomic_unchecked_t;
75524+#else
75525+typedef atomic_t atomic_unchecked_t;
75526+#endif
75527+
75528 #ifdef CONFIG_64BIT
75529 typedef struct {
75530 long counter;
75531 } atomic64_t;
75532+
75533+#ifdef CONFIG_PAX_REFCOUNT
75534+typedef struct {
75535+ long counter;
75536+} atomic64_unchecked_t;
75537+#else
75538+typedef atomic64_t atomic64_unchecked_t;
75539+#endif
75540 #endif
75541
75542 struct list_head {
75543diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
75544index 5ca0951..ab496a5 100644
75545--- a/include/linux/uaccess.h
75546+++ b/include/linux/uaccess.h
75547@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
75548 long ret; \
75549 mm_segment_t old_fs = get_fs(); \
75550 \
75551- set_fs(KERNEL_DS); \
75552 pagefault_disable(); \
75553- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
75554- pagefault_enable(); \
75555+ set_fs(KERNEL_DS); \
75556+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
75557 set_fs(old_fs); \
75558+ pagefault_enable(); \
75559 ret; \
75560 })
75561
75562diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
75563index 8e522cbc..aa8572d 100644
75564--- a/include/linux/uidgid.h
75565+++ b/include/linux/uidgid.h
75566@@ -197,4 +197,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
75567
75568 #endif /* CONFIG_USER_NS */
75569
75570+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
75571+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
75572+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
75573+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
75574+
75575 #endif /* _LINUX_UIDGID_H */
75576diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
75577index 99c1b4d..562e6f3 100644
75578--- a/include/linux/unaligned/access_ok.h
75579+++ b/include/linux/unaligned/access_ok.h
75580@@ -4,34 +4,34 @@
75581 #include <linux/kernel.h>
75582 #include <asm/byteorder.h>
75583
75584-static inline u16 get_unaligned_le16(const void *p)
75585+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
75586 {
75587- return le16_to_cpup((__le16 *)p);
75588+ return le16_to_cpup((const __le16 *)p);
75589 }
75590
75591-static inline u32 get_unaligned_le32(const void *p)
75592+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
75593 {
75594- return le32_to_cpup((__le32 *)p);
75595+ return le32_to_cpup((const __le32 *)p);
75596 }
75597
75598-static inline u64 get_unaligned_le64(const void *p)
75599+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
75600 {
75601- return le64_to_cpup((__le64 *)p);
75602+ return le64_to_cpup((const __le64 *)p);
75603 }
75604
75605-static inline u16 get_unaligned_be16(const void *p)
75606+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
75607 {
75608- return be16_to_cpup((__be16 *)p);
75609+ return be16_to_cpup((const __be16 *)p);
75610 }
75611
75612-static inline u32 get_unaligned_be32(const void *p)
75613+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
75614 {
75615- return be32_to_cpup((__be32 *)p);
75616+ return be32_to_cpup((const __be32 *)p);
75617 }
75618
75619-static inline u64 get_unaligned_be64(const void *p)
75620+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
75621 {
75622- return be64_to_cpup((__be64 *)p);
75623+ return be64_to_cpup((const __be64 *)p);
75624 }
75625
75626 static inline void put_unaligned_le16(u16 val, void *p)
75627diff --git a/include/linux/usb.h b/include/linux/usb.h
75628index a0bee5a..5533a52 100644
75629--- a/include/linux/usb.h
75630+++ b/include/linux/usb.h
75631@@ -552,7 +552,7 @@ struct usb_device {
75632 int maxchild;
75633
75634 u32 quirks;
75635- atomic_t urbnum;
75636+ atomic_unchecked_t urbnum;
75637
75638 unsigned long active_duration;
75639
75640@@ -1607,7 +1607,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
75641
75642 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
75643 __u8 request, __u8 requesttype, __u16 value, __u16 index,
75644- void *data, __u16 size, int timeout);
75645+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
75646 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
75647 void *data, int len, int *actual_length, int timeout);
75648 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
75649diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
75650index e452ba6..78f8e80 100644
75651--- a/include/linux/usb/renesas_usbhs.h
75652+++ b/include/linux/usb/renesas_usbhs.h
75653@@ -39,7 +39,7 @@ enum {
75654 */
75655 struct renesas_usbhs_driver_callback {
75656 int (*notify_hotplug)(struct platform_device *pdev);
75657-};
75658+} __no_const;
75659
75660 /*
75661 * callback functions for platform
75662diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
75663index 6f8fbcf..8259001 100644
75664--- a/include/linux/vermagic.h
75665+++ b/include/linux/vermagic.h
75666@@ -25,9 +25,35 @@
75667 #define MODULE_ARCH_VERMAGIC ""
75668 #endif
75669
75670+#ifdef CONFIG_PAX_REFCOUNT
75671+#define MODULE_PAX_REFCOUNT "REFCOUNT "
75672+#else
75673+#define MODULE_PAX_REFCOUNT ""
75674+#endif
75675+
75676+#ifdef CONSTIFY_PLUGIN
75677+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
75678+#else
75679+#define MODULE_CONSTIFY_PLUGIN ""
75680+#endif
75681+
75682+#ifdef STACKLEAK_PLUGIN
75683+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
75684+#else
75685+#define MODULE_STACKLEAK_PLUGIN ""
75686+#endif
75687+
75688+#ifdef CONFIG_GRKERNSEC
75689+#define MODULE_GRSEC "GRSEC "
75690+#else
75691+#define MODULE_GRSEC ""
75692+#endif
75693+
75694 #define VERMAGIC_STRING \
75695 UTS_RELEASE " " \
75696 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
75697 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
75698- MODULE_ARCH_VERMAGIC
75699+ MODULE_ARCH_VERMAGIC \
75700+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
75701+ MODULE_GRSEC
75702
75703diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
75704index 7d5773a..541c01c 100644
75705--- a/include/linux/vmalloc.h
75706+++ b/include/linux/vmalloc.h
75707@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
75708 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
75709 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
75710 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
75711+
75712+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
75713+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
75714+#endif
75715+
75716 /* bits [20..32] reserved for arch specific ioremap internals */
75717
75718 /*
75719@@ -75,7 +80,7 @@ extern void *vmalloc_32_user(unsigned long size);
75720 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
75721 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
75722 unsigned long start, unsigned long end, gfp_t gfp_mask,
75723- pgprot_t prot, int node, const void *caller);
75724+ pgprot_t prot, int node, const void *caller) __size_overflow(1);
75725 extern void vfree(const void *addr);
75726
75727 extern void *vmap(struct page **pages, unsigned int count,
75728@@ -137,8 +142,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
75729 extern void free_vm_area(struct vm_struct *area);
75730
75731 /* for /dev/kmem */
75732-extern long vread(char *buf, char *addr, unsigned long count);
75733-extern long vwrite(char *buf, char *addr, unsigned long count);
75734+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
75735+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
75736
75737 /*
75738 * Internals. Dont't use..
75739diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
75740index c586679..f06b389 100644
75741--- a/include/linux/vmstat.h
75742+++ b/include/linux/vmstat.h
75743@@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu)
75744 /*
75745 * Zone based page accounting with per cpu differentials.
75746 */
75747-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
75748+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
75749
75750 static inline void zone_page_state_add(long x, struct zone *zone,
75751 enum zone_stat_item item)
75752 {
75753- atomic_long_add(x, &zone->vm_stat[item]);
75754- atomic_long_add(x, &vm_stat[item]);
75755+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
75756+ atomic_long_add_unchecked(x, &vm_stat[item]);
75757 }
75758
75759 static inline unsigned long global_page_state(enum zone_stat_item item)
75760 {
75761- long x = atomic_long_read(&vm_stat[item]);
75762+ long x = atomic_long_read_unchecked(&vm_stat[item]);
75763 #ifdef CONFIG_SMP
75764 if (x < 0)
75765 x = 0;
75766@@ -112,7 +112,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
75767 static inline unsigned long zone_page_state(struct zone *zone,
75768 enum zone_stat_item item)
75769 {
75770- long x = atomic_long_read(&zone->vm_stat[item]);
75771+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
75772 #ifdef CONFIG_SMP
75773 if (x < 0)
75774 x = 0;
75775@@ -129,7 +129,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
75776 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
75777 enum zone_stat_item item)
75778 {
75779- long x = atomic_long_read(&zone->vm_stat[item]);
75780+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
75781
75782 #ifdef CONFIG_SMP
75783 int cpu;
75784@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
75785
75786 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
75787 {
75788- atomic_long_inc(&zone->vm_stat[item]);
75789- atomic_long_inc(&vm_stat[item]);
75790+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
75791+ atomic_long_inc_unchecked(&vm_stat[item]);
75792 }
75793
75794 static inline void __inc_zone_page_state(struct page *page,
75795@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
75796
75797 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
75798 {
75799- atomic_long_dec(&zone->vm_stat[item]);
75800- atomic_long_dec(&vm_stat[item]);
75801+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
75802+ atomic_long_dec_unchecked(&vm_stat[item]);
75803 }
75804
75805 static inline void __dec_zone_page_state(struct page *page,
75806diff --git a/include/linux/xattr.h b/include/linux/xattr.h
75807index fdbafc6..49dfe4f 100644
75808--- a/include/linux/xattr.h
75809+++ b/include/linux/xattr.h
75810@@ -28,7 +28,7 @@ struct xattr_handler {
75811 size_t size, int handler_flags);
75812 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
75813 size_t size, int flags, int handler_flags);
75814-};
75815+} __do_const;
75816
75817 struct xattr {
75818 char *name;
75819@@ -37,6 +37,9 @@ struct xattr {
75820 };
75821
75822 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
75823+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
75824+ssize_t pax_getxattr(struct dentry *, void *, size_t);
75825+#endif
75826 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
75827 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
75828 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
75829diff --git a/include/linux/zlib.h b/include/linux/zlib.h
75830index 9c5a6b4..09c9438 100644
75831--- a/include/linux/zlib.h
75832+++ b/include/linux/zlib.h
75833@@ -31,6 +31,7 @@
75834 #define _ZLIB_H
75835
75836 #include <linux/zconf.h>
75837+#include <linux/compiler.h>
75838
75839 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
75840 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
75841@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
75842
75843 /* basic functions */
75844
75845-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
75846+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
75847 /*
75848 Returns the number of bytes that needs to be allocated for a per-
75849 stream workspace with the specified parameters. A pointer to this
75850diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
75851index 95d1c91..6798cca 100644
75852--- a/include/media/v4l2-dev.h
75853+++ b/include/media/v4l2-dev.h
75854@@ -76,7 +76,7 @@ struct v4l2_file_operations {
75855 int (*mmap) (struct file *, struct vm_area_struct *);
75856 int (*open) (struct file *);
75857 int (*release) (struct file *);
75858-};
75859+} __do_const;
75860
75861 /*
75862 * Newer version of video_device, handled by videodev2.c
75863diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
75864index adcbb20..62c2559 100644
75865--- a/include/net/9p/transport.h
75866+++ b/include/net/9p/transport.h
75867@@ -57,7 +57,7 @@ struct p9_trans_module {
75868 int (*cancel) (struct p9_client *, struct p9_req_t *req);
75869 int (*zc_request)(struct p9_client *, struct p9_req_t *,
75870 char *, char *, int , int, int, int);
75871-};
75872+} __do_const;
75873
75874 void v9fs_register_trans(struct p9_trans_module *m);
75875 void v9fs_unregister_trans(struct p9_trans_module *m);
75876diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
75877index fb94cf1..7c0c987 100644
75878--- a/include/net/bluetooth/l2cap.h
75879+++ b/include/net/bluetooth/l2cap.h
75880@@ -551,7 +551,7 @@ struct l2cap_ops {
75881 void (*defer) (struct l2cap_chan *chan);
75882 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
75883 unsigned long len, int nb);
75884-};
75885+} __do_const;
75886
75887 struct l2cap_conn {
75888 struct hci_conn *hcon;
75889diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
75890index f2ae33d..c457cf0 100644
75891--- a/include/net/caif/cfctrl.h
75892+++ b/include/net/caif/cfctrl.h
75893@@ -52,7 +52,7 @@ struct cfctrl_rsp {
75894 void (*radioset_rsp)(void);
75895 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
75896 struct cflayer *client_layer);
75897-};
75898+} __no_const;
75899
75900 /* Link Setup Parameters for CAIF-Links. */
75901 struct cfctrl_link_param {
75902@@ -101,8 +101,8 @@ struct cfctrl_request_info {
75903 struct cfctrl {
75904 struct cfsrvl serv;
75905 struct cfctrl_rsp res;
75906- atomic_t req_seq_no;
75907- atomic_t rsp_seq_no;
75908+ atomic_unchecked_t req_seq_no;
75909+ atomic_unchecked_t rsp_seq_no;
75910 struct list_head list;
75911 /* Protects from simultaneous access to first_req list */
75912 spinlock_t info_list_lock;
75913diff --git a/include/net/flow.h b/include/net/flow.h
75914index 628e11b..4c475df 100644
75915--- a/include/net/flow.h
75916+++ b/include/net/flow.h
75917@@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
75918
75919 extern void flow_cache_flush(void);
75920 extern void flow_cache_flush_deferred(void);
75921-extern atomic_t flow_cache_genid;
75922+extern atomic_unchecked_t flow_cache_genid;
75923
75924 #endif
75925diff --git a/include/net/genetlink.h b/include/net/genetlink.h
75926index 93024a4..eeb6b6e 100644
75927--- a/include/net/genetlink.h
75928+++ b/include/net/genetlink.h
75929@@ -119,7 +119,7 @@ struct genl_ops {
75930 struct netlink_callback *cb);
75931 int (*done)(struct netlink_callback *cb);
75932 struct list_head ops_list;
75933-};
75934+} __do_const;
75935
75936 extern int genl_register_family(struct genl_family *family);
75937 extern int genl_register_family_with_ops(struct genl_family *family,
75938diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
75939index 734d9b5..48a9a4b 100644
75940--- a/include/net/gro_cells.h
75941+++ b/include/net/gro_cells.h
75942@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
75943 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
75944
75945 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
75946- atomic_long_inc(&dev->rx_dropped);
75947+ atomic_long_inc_unchecked(&dev->rx_dropped);
75948 kfree_skb(skb);
75949 return;
75950 }
75951diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
75952index de2c785..0588a6b 100644
75953--- a/include/net/inet_connection_sock.h
75954+++ b/include/net/inet_connection_sock.h
75955@@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
75956 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
75957 int (*bind_conflict)(const struct sock *sk,
75958 const struct inet_bind_bucket *tb, bool relax);
75959-};
75960+} __do_const;
75961
75962 /** inet_connection_sock - INET connection oriented sock
75963 *
75964diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
75965index 53f464d..ba76aaa 100644
75966--- a/include/net/inetpeer.h
75967+++ b/include/net/inetpeer.h
75968@@ -47,8 +47,8 @@ struct inet_peer {
75969 */
75970 union {
75971 struct {
75972- atomic_t rid; /* Frag reception counter */
75973- atomic_t ip_id_count; /* IP ID for the next packet */
75974+ atomic_unchecked_t rid; /* Frag reception counter */
75975+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
75976 };
75977 struct rcu_head rcu;
75978 struct inet_peer *gc_next;
75979@@ -182,11 +182,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
75980 more++;
75981 inet_peer_refcheck(p);
75982 do {
75983- old = atomic_read(&p->ip_id_count);
75984+ old = atomic_read_unchecked(&p->ip_id_count);
75985 new = old + more;
75986 if (!new)
75987 new = 1;
75988- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
75989+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
75990 return new;
75991 }
75992
75993diff --git a/include/net/ip.h b/include/net/ip.h
75994index a68f838..74518ab 100644
75995--- a/include/net/ip.h
75996+++ b/include/net/ip.h
75997@@ -202,7 +202,7 @@ extern struct local_ports {
75998 } sysctl_local_ports;
75999 extern void inet_get_local_port_range(int *low, int *high);
76000
76001-extern unsigned long *sysctl_local_reserved_ports;
76002+extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
76003 static inline int inet_is_reserved_local_port(int port)
76004 {
76005 return test_bit(port, sysctl_local_reserved_ports);
76006diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
76007index e49db91..76a81de 100644
76008--- a/include/net/ip_fib.h
76009+++ b/include/net/ip_fib.h
76010@@ -167,7 +167,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
76011
76012 #define FIB_RES_SADDR(net, res) \
76013 ((FIB_RES_NH(res).nh_saddr_genid == \
76014- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
76015+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
76016 FIB_RES_NH(res).nh_saddr : \
76017 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
76018 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
76019diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
76020index 4c062cc..3562c31 100644
76021--- a/include/net/ip_vs.h
76022+++ b/include/net/ip_vs.h
76023@@ -612,7 +612,7 @@ struct ip_vs_conn {
76024 struct ip_vs_conn *control; /* Master control connection */
76025 atomic_t n_control; /* Number of controlled ones */
76026 struct ip_vs_dest *dest; /* real server */
76027- atomic_t in_pkts; /* incoming packet counter */
76028+ atomic_unchecked_t in_pkts; /* incoming packet counter */
76029
76030 /* packet transmitter for different forwarding methods. If it
76031 mangles the packet, it must return NF_DROP or better NF_STOLEN,
76032@@ -761,7 +761,7 @@ struct ip_vs_dest {
76033 __be16 port; /* port number of the server */
76034 union nf_inet_addr addr; /* IP address of the server */
76035 volatile unsigned int flags; /* dest status flags */
76036- atomic_t conn_flags; /* flags to copy to conn */
76037+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
76038 atomic_t weight; /* server weight */
76039
76040 atomic_t refcnt; /* reference counter */
76041@@ -1013,11 +1013,11 @@ struct netns_ipvs {
76042 /* ip_vs_lblc */
76043 int sysctl_lblc_expiration;
76044 struct ctl_table_header *lblc_ctl_header;
76045- struct ctl_table *lblc_ctl_table;
76046+ ctl_table_no_const *lblc_ctl_table;
76047 /* ip_vs_lblcr */
76048 int sysctl_lblcr_expiration;
76049 struct ctl_table_header *lblcr_ctl_header;
76050- struct ctl_table *lblcr_ctl_table;
76051+ ctl_table_no_const *lblcr_ctl_table;
76052 /* ip_vs_est */
76053 struct list_head est_list; /* estimator list */
76054 spinlock_t est_lock;
76055diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
76056index 80ffde3..968b0f4 100644
76057--- a/include/net/irda/ircomm_tty.h
76058+++ b/include/net/irda/ircomm_tty.h
76059@@ -35,6 +35,7 @@
76060 #include <linux/termios.h>
76061 #include <linux/timer.h>
76062 #include <linux/tty.h> /* struct tty_struct */
76063+#include <asm/local.h>
76064
76065 #include <net/irda/irias_object.h>
76066 #include <net/irda/ircomm_core.h>
76067diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
76068index 714cc9a..ea05f3e 100644
76069--- a/include/net/iucv/af_iucv.h
76070+++ b/include/net/iucv/af_iucv.h
76071@@ -149,7 +149,7 @@ struct iucv_skb_cb {
76072 struct iucv_sock_list {
76073 struct hlist_head head;
76074 rwlock_t lock;
76075- atomic_t autobind_name;
76076+ atomic_unchecked_t autobind_name;
76077 };
76078
76079 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
76080diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
76081index df83f69..9b640b8 100644
76082--- a/include/net/llc_c_ac.h
76083+++ b/include/net/llc_c_ac.h
76084@@ -87,7 +87,7 @@
76085 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
76086 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
76087
76088-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
76089+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
76090
76091 extern int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
76092 extern int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
76093diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
76094index 6ca3113..f8026dd 100644
76095--- a/include/net/llc_c_ev.h
76096+++ b/include/net/llc_c_ev.h
76097@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
76098 return (struct llc_conn_state_ev *)skb->cb;
76099 }
76100
76101-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
76102-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
76103+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
76104+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
76105
76106 extern int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
76107 extern int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
76108diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
76109index 0e79cfb..f46db31 100644
76110--- a/include/net/llc_c_st.h
76111+++ b/include/net/llc_c_st.h
76112@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
76113 u8 next_state;
76114 llc_conn_ev_qfyr_t *ev_qualifiers;
76115 llc_conn_action_t *ev_actions;
76116-};
76117+} __do_const;
76118
76119 struct llc_conn_state {
76120 u8 current_state;
76121diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
76122index 37a3bbd..55a4241 100644
76123--- a/include/net/llc_s_ac.h
76124+++ b/include/net/llc_s_ac.h
76125@@ -23,7 +23,7 @@
76126 #define SAP_ACT_TEST_IND 9
76127
76128 /* All action functions must look like this */
76129-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
76130+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
76131
76132 extern int llc_sap_action_unitdata_ind(struct llc_sap *sap,
76133 struct sk_buff *skb);
76134diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
76135index 567c681..cd73ac0 100644
76136--- a/include/net/llc_s_st.h
76137+++ b/include/net/llc_s_st.h
76138@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
76139 llc_sap_ev_t ev;
76140 u8 next_state;
76141 llc_sap_action_t *ev_actions;
76142-};
76143+} __do_const;
76144
76145 struct llc_sap_state {
76146 u8 curr_state;
76147diff --git a/include/net/mac80211.h b/include/net/mac80211.h
76148index 885898a..cdace34 100644
76149--- a/include/net/mac80211.h
76150+++ b/include/net/mac80211.h
76151@@ -4205,7 +4205,7 @@ struct rate_control_ops {
76152 void (*add_sta_debugfs)(void *priv, void *priv_sta,
76153 struct dentry *dir);
76154 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
76155-};
76156+} __do_const;
76157
76158 static inline int rate_supported(struct ieee80211_sta *sta,
76159 enum ieee80211_band band,
76160diff --git a/include/net/neighbour.h b/include/net/neighbour.h
76161index 7e748ad..5c6229b 100644
76162--- a/include/net/neighbour.h
76163+++ b/include/net/neighbour.h
76164@@ -123,7 +123,7 @@ struct neigh_ops {
76165 void (*error_report)(struct neighbour *, struct sk_buff *);
76166 int (*output)(struct neighbour *, struct sk_buff *);
76167 int (*connected_output)(struct neighbour *, struct sk_buff *);
76168-};
76169+} __do_const;
76170
76171 struct pneigh_entry {
76172 struct pneigh_entry *next;
76173diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
76174index b176978..ea169f4 100644
76175--- a/include/net/net_namespace.h
76176+++ b/include/net/net_namespace.h
76177@@ -117,7 +117,7 @@ struct net {
76178 #endif
76179 struct netns_ipvs *ipvs;
76180 struct sock *diag_nlsk;
76181- atomic_t rt_genid;
76182+ atomic_unchecked_t rt_genid;
76183 };
76184
76185 /*
76186@@ -274,7 +274,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
76187 #define __net_init __init
76188 #define __net_exit __exit_refok
76189 #define __net_initdata __initdata
76190+#ifdef CONSTIFY_PLUGIN
76191 #define __net_initconst __initconst
76192+#else
76193+#define __net_initconst __initdata
76194+#endif
76195 #endif
76196
76197 struct pernet_operations {
76198@@ -284,7 +288,7 @@ struct pernet_operations {
76199 void (*exit_batch)(struct list_head *net_exit_list);
76200 int *id;
76201 size_t size;
76202-};
76203+} __do_const;
76204
76205 /*
76206 * Use these carefully. If you implement a network device and it
76207@@ -332,12 +336,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
76208
76209 static inline int rt_genid(struct net *net)
76210 {
76211- return atomic_read(&net->rt_genid);
76212+ return atomic_read_unchecked(&net->rt_genid);
76213 }
76214
76215 static inline void rt_genid_bump(struct net *net)
76216 {
76217- atomic_inc(&net->rt_genid);
76218+ atomic_inc_unchecked(&net->rt_genid);
76219 }
76220
76221 #endif /* __NET_NET_NAMESPACE_H */
76222diff --git a/include/net/netdma.h b/include/net/netdma.h
76223index 8ba8ce2..99b7fff 100644
76224--- a/include/net/netdma.h
76225+++ b/include/net/netdma.h
76226@@ -24,7 +24,7 @@
76227 #include <linux/dmaengine.h>
76228 #include <linux/skbuff.h>
76229
76230-int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
76231+int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
76232 struct sk_buff *skb, int offset, struct iovec *to,
76233 size_t len, struct dma_pinned_list *pinned_list);
76234
76235diff --git a/include/net/netlink.h b/include/net/netlink.h
76236index 9690b0f..87aded7 100644
76237--- a/include/net/netlink.h
76238+++ b/include/net/netlink.h
76239@@ -534,7 +534,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
76240 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
76241 {
76242 if (mark)
76243- skb_trim(skb, (unsigned char *) mark - skb->data);
76244+ skb_trim(skb, (const unsigned char *) mark - skb->data);
76245 }
76246
76247 /**
76248diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
76249index c9c0c53..53f24c3 100644
76250--- a/include/net/netns/conntrack.h
76251+++ b/include/net/netns/conntrack.h
76252@@ -12,10 +12,10 @@ struct nf_conntrack_ecache;
76253 struct nf_proto_net {
76254 #ifdef CONFIG_SYSCTL
76255 struct ctl_table_header *ctl_table_header;
76256- struct ctl_table *ctl_table;
76257+ ctl_table_no_const *ctl_table;
76258 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
76259 struct ctl_table_header *ctl_compat_header;
76260- struct ctl_table *ctl_compat_table;
76261+ ctl_table_no_const *ctl_compat_table;
76262 #endif
76263 #endif
76264 unsigned int users;
76265@@ -58,7 +58,7 @@ struct nf_ip_net {
76266 struct nf_icmp_net icmpv6;
76267 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
76268 struct ctl_table_header *ctl_table_header;
76269- struct ctl_table *ctl_table;
76270+ ctl_table_no_const *ctl_table;
76271 #endif
76272 };
76273
76274diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
76275index 2ba9de8..47bd6c7 100644
76276--- a/include/net/netns/ipv4.h
76277+++ b/include/net/netns/ipv4.h
76278@@ -67,7 +67,7 @@ struct netns_ipv4 {
76279 kgid_t sysctl_ping_group_range[2];
76280 long sysctl_tcp_mem[3];
76281
76282- atomic_t dev_addr_genid;
76283+ atomic_unchecked_t dev_addr_genid;
76284
76285 #ifdef CONFIG_IP_MROUTE
76286 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
76287diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
76288index 005e2c2..023d340 100644
76289--- a/include/net/netns/ipv6.h
76290+++ b/include/net/netns/ipv6.h
76291@@ -71,7 +71,7 @@ struct netns_ipv6 {
76292 struct fib_rules_ops *mr6_rules_ops;
76293 #endif
76294 #endif
76295- atomic_t dev_addr_genid;
76296+ atomic_unchecked_t dev_addr_genid;
76297 };
76298
76299 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
76300diff --git a/include/net/protocol.h b/include/net/protocol.h
76301index 047c047..b9dad15 100644
76302--- a/include/net/protocol.h
76303+++ b/include/net/protocol.h
76304@@ -44,7 +44,7 @@ struct net_protocol {
76305 void (*err_handler)(struct sk_buff *skb, u32 info);
76306 unsigned int no_policy:1,
76307 netns_ok:1;
76308-};
76309+} __do_const;
76310
76311 #if IS_ENABLED(CONFIG_IPV6)
76312 struct inet6_protocol {
76313@@ -57,7 +57,7 @@ struct inet6_protocol {
76314 u8 type, u8 code, int offset,
76315 __be32 info);
76316 unsigned int flags; /* INET6_PROTO_xxx */
76317-};
76318+} __do_const;
76319
76320 #define INET6_PROTO_NOPOLICY 0x1
76321 #define INET6_PROTO_FINAL 0x2
76322diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
76323index 7026648..584cc8c 100644
76324--- a/include/net/rtnetlink.h
76325+++ b/include/net/rtnetlink.h
76326@@ -81,7 +81,7 @@ struct rtnl_link_ops {
76327 const struct net_device *dev);
76328 unsigned int (*get_num_tx_queues)(void);
76329 unsigned int (*get_num_rx_queues)(void);
76330-};
76331+} __do_const;
76332
76333 extern int __rtnl_link_register(struct rtnl_link_ops *ops);
76334 extern void __rtnl_link_unregister(struct rtnl_link_ops *ops);
76335diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
76336index cd89510..d67810f 100644
76337--- a/include/net/sctp/sctp.h
76338+++ b/include/net/sctp/sctp.h
76339@@ -330,9 +330,9 @@ do { \
76340
76341 #else /* SCTP_DEBUG */
76342
76343-#define SCTP_DEBUG_PRINTK(whatever...)
76344-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
76345-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
76346+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
76347+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
76348+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
76349 #define SCTP_ENABLE_DEBUG
76350 #define SCTP_DISABLE_DEBUG
76351 #define SCTP_ASSERT(expr, str, func)
76352diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
76353index 2a82d13..62a31c2 100644
76354--- a/include/net/sctp/sm.h
76355+++ b/include/net/sctp/sm.h
76356@@ -87,7 +87,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
76357 typedef struct {
76358 sctp_state_fn_t *fn;
76359 const char *name;
76360-} sctp_sm_table_entry_t;
76361+} __do_const sctp_sm_table_entry_t;
76362
76363 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
76364 * currently in use.
76365@@ -299,7 +299,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
76366 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
76367
76368 /* Extern declarations for major data structures. */
76369-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
76370+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
76371
76372
76373 /* Get the size of a DATA chunk payload. */
76374diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
76375index 1bd4c41..9250b5b 100644
76376--- a/include/net/sctp/structs.h
76377+++ b/include/net/sctp/structs.h
76378@@ -516,7 +516,7 @@ struct sctp_pf {
76379 struct sctp_association *asoc);
76380 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
76381 struct sctp_af *af;
76382-};
76383+} __do_const;
76384
76385
76386 /* Structure to track chunk fragments that have been acked, but peer
76387diff --git a/include/net/sock.h b/include/net/sock.h
76388index 66772cf..25bc45b 100644
76389--- a/include/net/sock.h
76390+++ b/include/net/sock.h
76391@@ -325,7 +325,7 @@ struct sock {
76392 #ifdef CONFIG_RPS
76393 __u32 sk_rxhash;
76394 #endif
76395- atomic_t sk_drops;
76396+ atomic_unchecked_t sk_drops;
76397 int sk_rcvbuf;
76398
76399 struct sk_filter __rcu *sk_filter;
76400@@ -1797,7 +1797,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
76401 }
76402
76403 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
76404- char __user *from, char *to,
76405+ char __user *from, unsigned char *to,
76406 int copy, int offset)
76407 {
76408 if (skb->ip_summed == CHECKSUM_NONE) {
76409@@ -2056,7 +2056,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
76410 }
76411 }
76412
76413-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
76414+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
76415
76416 /**
76417 * sk_page_frag - return an appropriate page_frag
76418diff --git a/include/net/tcp.h b/include/net/tcp.h
76419index 5bba80f..8520a82 100644
76420--- a/include/net/tcp.h
76421+++ b/include/net/tcp.h
76422@@ -524,7 +524,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
76423 extern void tcp_xmit_retransmit_queue(struct sock *);
76424 extern void tcp_simple_retransmit(struct sock *);
76425 extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
76426-extern int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
76427+extern int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
76428
76429 extern void tcp_send_probe0(struct sock *);
76430 extern void tcp_send_partial(struct sock *);
76431@@ -697,8 +697,8 @@ struct tcp_skb_cb {
76432 struct inet6_skb_parm h6;
76433 #endif
76434 } header; /* For incoming frames */
76435- __u32 seq; /* Starting sequence number */
76436- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
76437+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
76438+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
76439 __u32 when; /* used to compute rtt's */
76440 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
76441
76442@@ -712,7 +712,7 @@ struct tcp_skb_cb {
76443
76444 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
76445 /* 1 byte hole */
76446- __u32 ack_seq; /* Sequence number ACK'd */
76447+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
76448 };
76449
76450 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
76451diff --git a/include/net/xfrm.h b/include/net/xfrm.h
76452index 94ce082..62b278d 100644
76453--- a/include/net/xfrm.h
76454+++ b/include/net/xfrm.h
76455@@ -305,7 +305,7 @@ struct xfrm_policy_afinfo {
76456 struct net_device *dev,
76457 const struct flowi *fl);
76458 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
76459-};
76460+} __do_const;
76461
76462 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
76463 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
76464@@ -341,7 +341,7 @@ struct xfrm_state_afinfo {
76465 struct sk_buff *skb);
76466 int (*transport_finish)(struct sk_buff *skb,
76467 int async);
76468-};
76469+} __do_const;
76470
76471 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
76472 extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
76473@@ -424,7 +424,7 @@ struct xfrm_mode {
76474 struct module *owner;
76475 unsigned int encap;
76476 int flags;
76477-};
76478+} __do_const;
76479
76480 /* Flags for xfrm_mode. */
76481 enum {
76482@@ -521,7 +521,7 @@ struct xfrm_policy {
76483 struct timer_list timer;
76484
76485 struct flow_cache_object flo;
76486- atomic_t genid;
76487+ atomic_unchecked_t genid;
76488 u32 priority;
76489 u32 index;
76490 struct xfrm_mark mark;
76491diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
76492index 1a046b1..ee0bef0 100644
76493--- a/include/rdma/iw_cm.h
76494+++ b/include/rdma/iw_cm.h
76495@@ -122,7 +122,7 @@ struct iw_cm_verbs {
76496 int backlog);
76497
76498 int (*destroy_listen)(struct iw_cm_id *cm_id);
76499-};
76500+} __no_const;
76501
76502 /**
76503 * iw_create_cm_id - Create an IW CM identifier.
76504diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
76505index e1379b4..67eafbe 100644
76506--- a/include/scsi/libfc.h
76507+++ b/include/scsi/libfc.h
76508@@ -762,6 +762,7 @@ struct libfc_function_template {
76509 */
76510 void (*disc_stop_final) (struct fc_lport *);
76511 };
76512+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
76513
76514 /**
76515 * struct fc_disc - Discovery context
76516@@ -866,7 +867,7 @@ struct fc_lport {
76517 struct fc_vport *vport;
76518
76519 /* Operational Information */
76520- struct libfc_function_template tt;
76521+ libfc_function_template_no_const tt;
76522 u8 link_up;
76523 u8 qfull;
76524 enum fc_lport_state state;
76525diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
76526index cc64587..608f523 100644
76527--- a/include/scsi/scsi_device.h
76528+++ b/include/scsi/scsi_device.h
76529@@ -171,9 +171,9 @@ struct scsi_device {
76530 unsigned int max_device_blocked; /* what device_blocked counts down from */
76531 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
76532
76533- atomic_t iorequest_cnt;
76534- atomic_t iodone_cnt;
76535- atomic_t ioerr_cnt;
76536+ atomic_unchecked_t iorequest_cnt;
76537+ atomic_unchecked_t iodone_cnt;
76538+ atomic_unchecked_t ioerr_cnt;
76539
76540 struct device sdev_gendev,
76541 sdev_dev;
76542diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
76543index b797e8f..8e2c3aa 100644
76544--- a/include/scsi/scsi_transport_fc.h
76545+++ b/include/scsi/scsi_transport_fc.h
76546@@ -751,7 +751,8 @@ struct fc_function_template {
76547 unsigned long show_host_system_hostname:1;
76548
76549 unsigned long disable_target_scan:1;
76550-};
76551+} __do_const;
76552+typedef struct fc_function_template __no_const fc_function_template_no_const;
76553
76554
76555 /**
76556diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
76557index 9031a26..750d592 100644
76558--- a/include/sound/compress_driver.h
76559+++ b/include/sound/compress_driver.h
76560@@ -128,7 +128,7 @@ struct snd_compr_ops {
76561 struct snd_compr_caps *caps);
76562 int (*get_codec_caps) (struct snd_compr_stream *stream,
76563 struct snd_compr_codec_caps *codec);
76564-};
76565+} __no_const;
76566
76567 /**
76568 * struct snd_compr: Compressed device
76569diff --git a/include/sound/soc.h b/include/sound/soc.h
76570index 85c1522..f44bad1 100644
76571--- a/include/sound/soc.h
76572+++ b/include/sound/soc.h
76573@@ -781,7 +781,7 @@ struct snd_soc_codec_driver {
76574 /* probe ordering - for components with runtime dependencies */
76575 int probe_order;
76576 int remove_order;
76577-};
76578+} __do_const;
76579
76580 /* SoC platform interface */
76581 struct snd_soc_platform_driver {
76582@@ -827,7 +827,7 @@ struct snd_soc_platform_driver {
76583 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
76584 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
76585 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
76586-};
76587+} __do_const;
76588
76589 struct snd_soc_platform {
76590 const char *name;
76591diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
76592index 4ea4f98..a63629b 100644
76593--- a/include/target/target_core_base.h
76594+++ b/include/target/target_core_base.h
76595@@ -653,7 +653,7 @@ struct se_device {
76596 spinlock_t stats_lock;
76597 /* Active commands on this virtual SE device */
76598 atomic_t simple_cmds;
76599- atomic_t dev_ordered_id;
76600+ atomic_unchecked_t dev_ordered_id;
76601 atomic_t dev_ordered_sync;
76602 atomic_t dev_qf_count;
76603 int export_count;
76604diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
76605new file mode 100644
76606index 0000000..fb634b7
76607--- /dev/null
76608+++ b/include/trace/events/fs.h
76609@@ -0,0 +1,53 @@
76610+#undef TRACE_SYSTEM
76611+#define TRACE_SYSTEM fs
76612+
76613+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
76614+#define _TRACE_FS_H
76615+
76616+#include <linux/fs.h>
76617+#include <linux/tracepoint.h>
76618+
76619+TRACE_EVENT(do_sys_open,
76620+
76621+ TP_PROTO(const char *filename, int flags, int mode),
76622+
76623+ TP_ARGS(filename, flags, mode),
76624+
76625+ TP_STRUCT__entry(
76626+ __string( filename, filename )
76627+ __field( int, flags )
76628+ __field( int, mode )
76629+ ),
76630+
76631+ TP_fast_assign(
76632+ __assign_str(filename, filename);
76633+ __entry->flags = flags;
76634+ __entry->mode = mode;
76635+ ),
76636+
76637+ TP_printk("\"%s\" %x %o",
76638+ __get_str(filename), __entry->flags, __entry->mode)
76639+);
76640+
76641+TRACE_EVENT(open_exec,
76642+
76643+ TP_PROTO(const char *filename),
76644+
76645+ TP_ARGS(filename),
76646+
76647+ TP_STRUCT__entry(
76648+ __string( filename, filename )
76649+ ),
76650+
76651+ TP_fast_assign(
76652+ __assign_str(filename, filename);
76653+ ),
76654+
76655+ TP_printk("\"%s\"",
76656+ __get_str(filename))
76657+);
76658+
76659+#endif /* _TRACE_FS_H */
76660+
76661+/* This part must be outside protection */
76662+#include <trace/define_trace.h>
76663diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
76664index 1c09820..7f5ec79 100644
76665--- a/include/trace/events/irq.h
76666+++ b/include/trace/events/irq.h
76667@@ -36,7 +36,7 @@ struct softirq_action;
76668 */
76669 TRACE_EVENT(irq_handler_entry,
76670
76671- TP_PROTO(int irq, struct irqaction *action),
76672+ TP_PROTO(int irq, const struct irqaction *action),
76673
76674 TP_ARGS(irq, action),
76675
76676@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
76677 */
76678 TRACE_EVENT(irq_handler_exit,
76679
76680- TP_PROTO(int irq, struct irqaction *action, int ret),
76681+ TP_PROTO(int irq, const struct irqaction *action, int ret),
76682
76683 TP_ARGS(irq, action, ret),
76684
76685diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
76686index 7caf44c..23c6f27 100644
76687--- a/include/uapi/linux/a.out.h
76688+++ b/include/uapi/linux/a.out.h
76689@@ -39,6 +39,14 @@ enum machine_type {
76690 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
76691 };
76692
76693+/* Constants for the N_FLAGS field */
76694+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
76695+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
76696+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
76697+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
76698+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
76699+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
76700+
76701 #if !defined (N_MAGIC)
76702 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
76703 #endif
76704diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
76705index d876736..ccce5c0 100644
76706--- a/include/uapi/linux/byteorder/little_endian.h
76707+++ b/include/uapi/linux/byteorder/little_endian.h
76708@@ -42,51 +42,51 @@
76709
76710 static inline __le64 __cpu_to_le64p(const __u64 *p)
76711 {
76712- return (__force __le64)*p;
76713+ return (__force const __le64)*p;
76714 }
76715-static inline __u64 __le64_to_cpup(const __le64 *p)
76716+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
76717 {
76718- return (__force __u64)*p;
76719+ return (__force const __u64)*p;
76720 }
76721 static inline __le32 __cpu_to_le32p(const __u32 *p)
76722 {
76723- return (__force __le32)*p;
76724+ return (__force const __le32)*p;
76725 }
76726 static inline __u32 __le32_to_cpup(const __le32 *p)
76727 {
76728- return (__force __u32)*p;
76729+ return (__force const __u32)*p;
76730 }
76731 static inline __le16 __cpu_to_le16p(const __u16 *p)
76732 {
76733- return (__force __le16)*p;
76734+ return (__force const __le16)*p;
76735 }
76736 static inline __u16 __le16_to_cpup(const __le16 *p)
76737 {
76738- return (__force __u16)*p;
76739+ return (__force const __u16)*p;
76740 }
76741 static inline __be64 __cpu_to_be64p(const __u64 *p)
76742 {
76743- return (__force __be64)__swab64p(p);
76744+ return (__force const __be64)__swab64p(p);
76745 }
76746 static inline __u64 __be64_to_cpup(const __be64 *p)
76747 {
76748- return __swab64p((__u64 *)p);
76749+ return __swab64p((const __u64 *)p);
76750 }
76751 static inline __be32 __cpu_to_be32p(const __u32 *p)
76752 {
76753- return (__force __be32)__swab32p(p);
76754+ return (__force const __be32)__swab32p(p);
76755 }
76756-static inline __u32 __be32_to_cpup(const __be32 *p)
76757+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
76758 {
76759- return __swab32p((__u32 *)p);
76760+ return __swab32p((const __u32 *)p);
76761 }
76762 static inline __be16 __cpu_to_be16p(const __u16 *p)
76763 {
76764- return (__force __be16)__swab16p(p);
76765+ return (__force const __be16)__swab16p(p);
76766 }
76767 static inline __u16 __be16_to_cpup(const __be16 *p)
76768 {
76769- return __swab16p((__u16 *)p);
76770+ return __swab16p((const __u16 *)p);
76771 }
76772 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
76773 #define __le64_to_cpus(x) do { (void)(x); } while (0)
76774diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
76775index ef6103b..d4e65dd 100644
76776--- a/include/uapi/linux/elf.h
76777+++ b/include/uapi/linux/elf.h
76778@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
76779 #define PT_GNU_EH_FRAME 0x6474e550
76780
76781 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
76782+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
76783+
76784+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
76785+
76786+/* Constants for the e_flags field */
76787+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
76788+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
76789+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
76790+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
76791+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
76792+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
76793
76794 /*
76795 * Extended Numbering
76796@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
76797 #define DT_DEBUG 21
76798 #define DT_TEXTREL 22
76799 #define DT_JMPREL 23
76800+#define DT_FLAGS 30
76801+ #define DF_TEXTREL 0x00000004
76802 #define DT_ENCODING 32
76803 #define OLD_DT_LOOS 0x60000000
76804 #define DT_LOOS 0x6000000d
76805@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
76806 #define PF_W 0x2
76807 #define PF_X 0x1
76808
76809+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
76810+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
76811+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
76812+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
76813+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
76814+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
76815+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
76816+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
76817+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
76818+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
76819+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
76820+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
76821+
76822 typedef struct elf32_phdr{
76823 Elf32_Word p_type;
76824 Elf32_Off p_offset;
76825@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
76826 #define EI_OSABI 7
76827 #define EI_PAD 8
76828
76829+#define EI_PAX 14
76830+
76831 #define ELFMAG0 0x7f /* EI_MAG */
76832 #define ELFMAG1 'E'
76833 #define ELFMAG2 'L'
76834diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
76835index aa169c4..6a2771d 100644
76836--- a/include/uapi/linux/personality.h
76837+++ b/include/uapi/linux/personality.h
76838@@ -30,6 +30,7 @@ enum {
76839 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
76840 ADDR_NO_RANDOMIZE | \
76841 ADDR_COMPAT_LAYOUT | \
76842+ ADDR_LIMIT_3GB | \
76843 MMAP_PAGE_ZERO)
76844
76845 /*
76846diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
76847index 7530e74..e714828 100644
76848--- a/include/uapi/linux/screen_info.h
76849+++ b/include/uapi/linux/screen_info.h
76850@@ -43,7 +43,8 @@ struct screen_info {
76851 __u16 pages; /* 0x32 */
76852 __u16 vesa_attributes; /* 0x34 */
76853 __u32 capabilities; /* 0x36 */
76854- __u8 _reserved[6]; /* 0x3a */
76855+ __u16 vesapm_size; /* 0x3a */
76856+ __u8 _reserved[4]; /* 0x3c */
76857 } __attribute__((packed));
76858
76859 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
76860diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
76861index 0e011eb..82681b1 100644
76862--- a/include/uapi/linux/swab.h
76863+++ b/include/uapi/linux/swab.h
76864@@ -43,7 +43,7 @@
76865 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
76866 */
76867
76868-static inline __attribute_const__ __u16 __fswab16(__u16 val)
76869+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
76870 {
76871 #ifdef __HAVE_BUILTIN_BSWAP16__
76872 return __builtin_bswap16(val);
76873@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
76874 #endif
76875 }
76876
76877-static inline __attribute_const__ __u32 __fswab32(__u32 val)
76878+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
76879 {
76880 #ifdef __HAVE_BUILTIN_BSWAP32__
76881 return __builtin_bswap32(val);
76882@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
76883 #endif
76884 }
76885
76886-static inline __attribute_const__ __u64 __fswab64(__u64 val)
76887+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
76888 {
76889 #ifdef __HAVE_BUILTIN_BSWAP64__
76890 return __builtin_bswap64(val);
76891diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
76892index 6d67213..8dab561 100644
76893--- a/include/uapi/linux/sysctl.h
76894+++ b/include/uapi/linux/sysctl.h
76895@@ -155,7 +155,11 @@ enum
76896 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
76897 };
76898
76899-
76900+#ifdef CONFIG_PAX_SOFTMODE
76901+enum {
76902+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
76903+};
76904+#endif
76905
76906 /* CTL_VM names: */
76907 enum
76908diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
76909index e4629b9..6958086 100644
76910--- a/include/uapi/linux/xattr.h
76911+++ b/include/uapi/linux/xattr.h
76912@@ -63,5 +63,9 @@
76913 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
76914 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
76915
76916+/* User namespace */
76917+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
76918+#define XATTR_PAX_FLAGS_SUFFIX "flags"
76919+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
76920
76921 #endif /* _UAPI_LINUX_XATTR_H */
76922diff --git a/include/video/udlfb.h b/include/video/udlfb.h
76923index f9466fa..f4e2b81 100644
76924--- a/include/video/udlfb.h
76925+++ b/include/video/udlfb.h
76926@@ -53,10 +53,10 @@ struct dlfb_data {
76927 u32 pseudo_palette[256];
76928 int blank_mode; /*one of FB_BLANK_ */
76929 /* blit-only rendering path metrics, exposed through sysfs */
76930- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
76931- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
76932- atomic_t bytes_sent; /* to usb, after compression including overhead */
76933- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
76934+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
76935+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
76936+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
76937+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
76938 };
76939
76940 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
76941diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
76942index 1a91850..28573f8 100644
76943--- a/include/video/uvesafb.h
76944+++ b/include/video/uvesafb.h
76945@@ -122,6 +122,7 @@ struct uvesafb_par {
76946 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
76947 u8 pmi_setpal; /* PMI for palette changes */
76948 u16 *pmi_base; /* protected mode interface location */
76949+ u8 *pmi_code; /* protected mode code location */
76950 void *pmi_start;
76951 void *pmi_pal;
76952 u8 *vbe_state_orig; /*
76953diff --git a/init/Kconfig b/init/Kconfig
76954index 2d9b831..ae4c8ac 100644
76955--- a/init/Kconfig
76956+++ b/init/Kconfig
76957@@ -1029,6 +1029,7 @@ endif # CGROUPS
76958
76959 config CHECKPOINT_RESTORE
76960 bool "Checkpoint/restore support" if EXPERT
76961+ depends on !GRKERNSEC
76962 default n
76963 help
76964 Enables additional kernel features in a sake of checkpoint/restore.
76965@@ -1516,7 +1517,7 @@ config SLUB_DEBUG
76966
76967 config COMPAT_BRK
76968 bool "Disable heap randomization"
76969- default y
76970+ default n
76971 help
76972 Randomizing heap placement makes heap exploits harder, but it
76973 also breaks ancient binaries (including anything libc5 based).
76974@@ -1779,7 +1780,7 @@ config INIT_ALL_POSSIBLE
76975 config STOP_MACHINE
76976 bool
76977 default y
76978- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
76979+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
76980 help
76981 Need stop_machine() primitive.
76982
76983diff --git a/init/Makefile b/init/Makefile
76984index 7bc47ee..6da2dc7 100644
76985--- a/init/Makefile
76986+++ b/init/Makefile
76987@@ -2,6 +2,9 @@
76988 # Makefile for the linux kernel.
76989 #
76990
76991+ccflags-y := $(GCC_PLUGINS_CFLAGS)
76992+asflags-y := $(GCC_PLUGINS_AFLAGS)
76993+
76994 obj-y := main.o version.o mounts.o
76995 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
76996 obj-y += noinitramfs.o
76997diff --git a/init/do_mounts.c b/init/do_mounts.c
76998index a2b49f2..03a0e17c 100644
76999--- a/init/do_mounts.c
77000+++ b/init/do_mounts.c
77001@@ -355,11 +355,11 @@ static void __init get_fs_names(char *page)
77002 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
77003 {
77004 struct super_block *s;
77005- int err = sys_mount(name, "/root", fs, flags, data);
77006+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
77007 if (err)
77008 return err;
77009
77010- sys_chdir("/root");
77011+ sys_chdir((const char __force_user *)"/root");
77012 s = current->fs->pwd.dentry->d_sb;
77013 ROOT_DEV = s->s_dev;
77014 printk(KERN_INFO
77015@@ -480,18 +480,18 @@ void __init change_floppy(char *fmt, ...)
77016 va_start(args, fmt);
77017 vsprintf(buf, fmt, args);
77018 va_end(args);
77019- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
77020+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
77021 if (fd >= 0) {
77022 sys_ioctl(fd, FDEJECT, 0);
77023 sys_close(fd);
77024 }
77025 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
77026- fd = sys_open("/dev/console", O_RDWR, 0);
77027+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
77028 if (fd >= 0) {
77029 sys_ioctl(fd, TCGETS, (long)&termios);
77030 termios.c_lflag &= ~ICANON;
77031 sys_ioctl(fd, TCSETSF, (long)&termios);
77032- sys_read(fd, &c, 1);
77033+ sys_read(fd, (char __user *)&c, 1);
77034 termios.c_lflag |= ICANON;
77035 sys_ioctl(fd, TCSETSF, (long)&termios);
77036 sys_close(fd);
77037@@ -585,6 +585,6 @@ void __init prepare_namespace(void)
77038 mount_root();
77039 out:
77040 devtmpfs_mount("dev");
77041- sys_mount(".", "/", NULL, MS_MOVE, NULL);
77042- sys_chroot(".");
77043+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
77044+ sys_chroot((const char __force_user *)".");
77045 }
77046diff --git a/init/do_mounts.h b/init/do_mounts.h
77047index f5b978a..69dbfe8 100644
77048--- a/init/do_mounts.h
77049+++ b/init/do_mounts.h
77050@@ -15,15 +15,15 @@ extern int root_mountflags;
77051
77052 static inline int create_dev(char *name, dev_t dev)
77053 {
77054- sys_unlink(name);
77055- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
77056+ sys_unlink((char __force_user *)name);
77057+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
77058 }
77059
77060 #if BITS_PER_LONG == 32
77061 static inline u32 bstat(char *name)
77062 {
77063 struct stat64 stat;
77064- if (sys_stat64(name, &stat) != 0)
77065+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
77066 return 0;
77067 if (!S_ISBLK(stat.st_mode))
77068 return 0;
77069@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
77070 static inline u32 bstat(char *name)
77071 {
77072 struct stat stat;
77073- if (sys_newstat(name, &stat) != 0)
77074+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
77075 return 0;
77076 if (!S_ISBLK(stat.st_mode))
77077 return 0;
77078diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
77079index 3e0878e..8a9d7a0 100644
77080--- a/init/do_mounts_initrd.c
77081+++ b/init/do_mounts_initrd.c
77082@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
77083 {
77084 sys_unshare(CLONE_FS | CLONE_FILES);
77085 /* stdin/stdout/stderr for /linuxrc */
77086- sys_open("/dev/console", O_RDWR, 0);
77087+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
77088 sys_dup(0);
77089 sys_dup(0);
77090 /* move initrd over / and chdir/chroot in initrd root */
77091- sys_chdir("/root");
77092- sys_mount(".", "/", NULL, MS_MOVE, NULL);
77093- sys_chroot(".");
77094+ sys_chdir((const char __force_user *)"/root");
77095+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
77096+ sys_chroot((const char __force_user *)".");
77097 sys_setsid();
77098 return 0;
77099 }
77100@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
77101 create_dev("/dev/root.old", Root_RAM0);
77102 /* mount initrd on rootfs' /root */
77103 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
77104- sys_mkdir("/old", 0700);
77105- sys_chdir("/old");
77106+ sys_mkdir((const char __force_user *)"/old", 0700);
77107+ sys_chdir((const char __force_user *)"/old");
77108
77109 /* try loading default modules from initrd */
77110 load_default_modules();
77111@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
77112 current->flags &= ~PF_FREEZER_SKIP;
77113
77114 /* move initrd to rootfs' /old */
77115- sys_mount("..", ".", NULL, MS_MOVE, NULL);
77116+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
77117 /* switch root and cwd back to / of rootfs */
77118- sys_chroot("..");
77119+ sys_chroot((const char __force_user *)"..");
77120
77121 if (new_decode_dev(real_root_dev) == Root_RAM0) {
77122- sys_chdir("/old");
77123+ sys_chdir((const char __force_user *)"/old");
77124 return;
77125 }
77126
77127- sys_chdir("/");
77128+ sys_chdir((const char __force_user *)"/");
77129 ROOT_DEV = new_decode_dev(real_root_dev);
77130 mount_root();
77131
77132 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
77133- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
77134+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
77135 if (!error)
77136 printk("okay\n");
77137 else {
77138- int fd = sys_open("/dev/root.old", O_RDWR, 0);
77139+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
77140 if (error == -ENOENT)
77141 printk("/initrd does not exist. Ignored.\n");
77142 else
77143 printk("failed\n");
77144 printk(KERN_NOTICE "Unmounting old root\n");
77145- sys_umount("/old", MNT_DETACH);
77146+ sys_umount((char __force_user *)"/old", MNT_DETACH);
77147 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
77148 if (fd < 0) {
77149 error = fd;
77150@@ -127,11 +127,11 @@ int __init initrd_load(void)
77151 * mounted in the normal path.
77152 */
77153 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
77154- sys_unlink("/initrd.image");
77155+ sys_unlink((const char __force_user *)"/initrd.image");
77156 handle_initrd();
77157 return 1;
77158 }
77159 }
77160- sys_unlink("/initrd.image");
77161+ sys_unlink((const char __force_user *)"/initrd.image");
77162 return 0;
77163 }
77164diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
77165index 8cb6db5..d729f50 100644
77166--- a/init/do_mounts_md.c
77167+++ b/init/do_mounts_md.c
77168@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
77169 partitioned ? "_d" : "", minor,
77170 md_setup_args[ent].device_names);
77171
77172- fd = sys_open(name, 0, 0);
77173+ fd = sys_open((char __force_user *)name, 0, 0);
77174 if (fd < 0) {
77175 printk(KERN_ERR "md: open failed - cannot start "
77176 "array %s\n", name);
77177@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
77178 * array without it
77179 */
77180 sys_close(fd);
77181- fd = sys_open(name, 0, 0);
77182+ fd = sys_open((char __force_user *)name, 0, 0);
77183 sys_ioctl(fd, BLKRRPART, 0);
77184 }
77185 sys_close(fd);
77186@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
77187
77188 wait_for_device_probe();
77189
77190- fd = sys_open("/dev/md0", 0, 0);
77191+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
77192 if (fd >= 0) {
77193 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
77194 sys_close(fd);
77195diff --git a/init/init_task.c b/init/init_task.c
77196index ba0a7f36..2bcf1d5 100644
77197--- a/init/init_task.c
77198+++ b/init/init_task.c
77199@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
77200 * Initial thread structure. Alignment of this is handled by a special
77201 * linker map entry.
77202 */
77203+#ifdef CONFIG_X86
77204+union thread_union init_thread_union __init_task_data;
77205+#else
77206 union thread_union init_thread_union __init_task_data =
77207 { INIT_THREAD_INFO(init_task) };
77208+#endif
77209diff --git a/init/initramfs.c b/init/initramfs.c
77210index a67ef9d..2d17ed9 100644
77211--- a/init/initramfs.c
77212+++ b/init/initramfs.c
77213@@ -84,7 +84,7 @@ static void __init free_hash(void)
77214 }
77215 }
77216
77217-static long __init do_utime(char *filename, time_t mtime)
77218+static long __init do_utime(char __force_user *filename, time_t mtime)
77219 {
77220 struct timespec t[2];
77221
77222@@ -119,7 +119,7 @@ static void __init dir_utime(void)
77223 struct dir_entry *de, *tmp;
77224 list_for_each_entry_safe(de, tmp, &dir_list, list) {
77225 list_del(&de->list);
77226- do_utime(de->name, de->mtime);
77227+ do_utime((char __force_user *)de->name, de->mtime);
77228 kfree(de->name);
77229 kfree(de);
77230 }
77231@@ -281,7 +281,7 @@ static int __init maybe_link(void)
77232 if (nlink >= 2) {
77233 char *old = find_link(major, minor, ino, mode, collected);
77234 if (old)
77235- return (sys_link(old, collected) < 0) ? -1 : 1;
77236+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
77237 }
77238 return 0;
77239 }
77240@@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
77241 {
77242 struct stat st;
77243
77244- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
77245+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
77246 if (S_ISDIR(st.st_mode))
77247- sys_rmdir(path);
77248+ sys_rmdir((char __force_user *)path);
77249 else
77250- sys_unlink(path);
77251+ sys_unlink((char __force_user *)path);
77252 }
77253 }
77254
77255@@ -315,7 +315,7 @@ static int __init do_name(void)
77256 int openflags = O_WRONLY|O_CREAT;
77257 if (ml != 1)
77258 openflags |= O_TRUNC;
77259- wfd = sys_open(collected, openflags, mode);
77260+ wfd = sys_open((char __force_user *)collected, openflags, mode);
77261
77262 if (wfd >= 0) {
77263 sys_fchown(wfd, uid, gid);
77264@@ -327,17 +327,17 @@ static int __init do_name(void)
77265 }
77266 }
77267 } else if (S_ISDIR(mode)) {
77268- sys_mkdir(collected, mode);
77269- sys_chown(collected, uid, gid);
77270- sys_chmod(collected, mode);
77271+ sys_mkdir((char __force_user *)collected, mode);
77272+ sys_chown((char __force_user *)collected, uid, gid);
77273+ sys_chmod((char __force_user *)collected, mode);
77274 dir_add(collected, mtime);
77275 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
77276 S_ISFIFO(mode) || S_ISSOCK(mode)) {
77277 if (maybe_link() == 0) {
77278- sys_mknod(collected, mode, rdev);
77279- sys_chown(collected, uid, gid);
77280- sys_chmod(collected, mode);
77281- do_utime(collected, mtime);
77282+ sys_mknod((char __force_user *)collected, mode, rdev);
77283+ sys_chown((char __force_user *)collected, uid, gid);
77284+ sys_chmod((char __force_user *)collected, mode);
77285+ do_utime((char __force_user *)collected, mtime);
77286 }
77287 }
77288 return 0;
77289@@ -346,15 +346,15 @@ static int __init do_name(void)
77290 static int __init do_copy(void)
77291 {
77292 if (count >= body_len) {
77293- sys_write(wfd, victim, body_len);
77294+ sys_write(wfd, (char __force_user *)victim, body_len);
77295 sys_close(wfd);
77296- do_utime(vcollected, mtime);
77297+ do_utime((char __force_user *)vcollected, mtime);
77298 kfree(vcollected);
77299 eat(body_len);
77300 state = SkipIt;
77301 return 0;
77302 } else {
77303- sys_write(wfd, victim, count);
77304+ sys_write(wfd, (char __force_user *)victim, count);
77305 body_len -= count;
77306 eat(count);
77307 return 1;
77308@@ -365,9 +365,9 @@ static int __init do_symlink(void)
77309 {
77310 collected[N_ALIGN(name_len) + body_len] = '\0';
77311 clean_path(collected, 0);
77312- sys_symlink(collected + N_ALIGN(name_len), collected);
77313- sys_lchown(collected, uid, gid);
77314- do_utime(collected, mtime);
77315+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
77316+ sys_lchown((char __force_user *)collected, uid, gid);
77317+ do_utime((char __force_user *)collected, mtime);
77318 state = SkipIt;
77319 next_state = Reset;
77320 return 0;
77321@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
77322 {
77323 char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
77324 if (err)
77325- panic(err); /* Failed to decompress INTERNAL initramfs */
77326+ panic("%s", err); /* Failed to decompress INTERNAL initramfs */
77327 if (initrd_start) {
77328 #ifdef CONFIG_BLK_DEV_RAM
77329 int fd;
77330diff --git a/init/main.c b/init/main.c
77331index 9484f4b..0eac7c3 100644
77332--- a/init/main.c
77333+++ b/init/main.c
77334@@ -100,6 +100,8 @@ static inline void mark_rodata_ro(void) { }
77335 extern void tc_init(void);
77336 #endif
77337
77338+extern void grsecurity_init(void);
77339+
77340 /*
77341 * Debug helper: via this flag we know that we are in 'early bootup code'
77342 * where only the boot processor is running with IRQ disabled. This means
77343@@ -153,6 +155,74 @@ static int __init set_reset_devices(char *str)
77344
77345 __setup("reset_devices", set_reset_devices);
77346
77347+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
77348+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
77349+static int __init setup_grsec_proc_gid(char *str)
77350+{
77351+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
77352+ return 1;
77353+}
77354+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
77355+#endif
77356+
77357+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
77358+unsigned long pax_user_shadow_base __read_only;
77359+EXPORT_SYMBOL(pax_user_shadow_base);
77360+extern char pax_enter_kernel_user[];
77361+extern char pax_exit_kernel_user[];
77362+#endif
77363+
77364+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
77365+static int __init setup_pax_nouderef(char *str)
77366+{
77367+#ifdef CONFIG_X86_32
77368+ unsigned int cpu;
77369+ struct desc_struct *gdt;
77370+
77371+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
77372+ gdt = get_cpu_gdt_table(cpu);
77373+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
77374+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
77375+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
77376+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
77377+ }
77378+ loadsegment(ds, __KERNEL_DS);
77379+ loadsegment(es, __KERNEL_DS);
77380+ loadsegment(ss, __KERNEL_DS);
77381+#else
77382+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
77383+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
77384+ clone_pgd_mask = ~(pgdval_t)0UL;
77385+ pax_user_shadow_base = 0UL;
77386+ setup_clear_cpu_cap(X86_FEATURE_PCID);
77387+#endif
77388+
77389+ return 0;
77390+}
77391+early_param("pax_nouderef", setup_pax_nouderef);
77392+
77393+#ifdef CONFIG_X86_64
77394+static int __init setup_pax_weakuderef(char *str)
77395+{
77396+ if (clone_pgd_mask != ~(pgdval_t)0UL)
77397+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
77398+ return 1;
77399+}
77400+__setup("pax_weakuderef", setup_pax_weakuderef);
77401+#endif
77402+#endif
77403+
77404+#ifdef CONFIG_PAX_SOFTMODE
77405+int pax_softmode;
77406+
77407+static int __init setup_pax_softmode(char *str)
77408+{
77409+ get_option(&str, &pax_softmode);
77410+ return 1;
77411+}
77412+__setup("pax_softmode=", setup_pax_softmode);
77413+#endif
77414+
77415 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
77416 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
77417 static const char *panic_later, *panic_param;
77418@@ -655,8 +725,6 @@ static void __init do_ctors(void)
77419 bool initcall_debug;
77420 core_param(initcall_debug, initcall_debug, bool, 0644);
77421
77422-static char msgbuf[64];
77423-
77424 static int __init_or_module do_one_initcall_debug(initcall_t fn)
77425 {
77426 ktime_t calltime, delta, rettime;
77427@@ -679,23 +747,22 @@ int __init_or_module do_one_initcall(initcall_t fn)
77428 {
77429 int count = preempt_count();
77430 int ret;
77431+ const char *msg1 = "", *msg2 = "";
77432
77433 if (initcall_debug)
77434 ret = do_one_initcall_debug(fn);
77435 else
77436 ret = fn();
77437
77438- msgbuf[0] = 0;
77439-
77440 if (preempt_count() != count) {
77441- sprintf(msgbuf, "preemption imbalance ");
77442+ msg1 = " preemption imbalance";
77443 preempt_count() = count;
77444 }
77445 if (irqs_disabled()) {
77446- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
77447+ msg2 = " disabled interrupts";
77448 local_irq_enable();
77449 }
77450- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
77451+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
77452
77453 return ret;
77454 }
77455@@ -748,8 +815,14 @@ static void __init do_initcall_level(int level)
77456 level, level,
77457 &repair_env_string);
77458
77459- for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
77460+ for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) {
77461 do_one_initcall(*fn);
77462+
77463+#ifdef LATENT_ENTROPY_PLUGIN
77464+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
77465+#endif
77466+
77467+ }
77468 }
77469
77470 static void __init do_initcalls(void)
77471@@ -783,8 +856,14 @@ static void __init do_pre_smp_initcalls(void)
77472 {
77473 initcall_t *fn;
77474
77475- for (fn = __initcall_start; fn < __initcall0_start; fn++)
77476+ for (fn = __initcall_start; fn < __initcall0_start; fn++) {
77477 do_one_initcall(*fn);
77478+
77479+#ifdef LATENT_ENTROPY_PLUGIN
77480+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
77481+#endif
77482+
77483+ }
77484 }
77485
77486 /*
77487@@ -802,8 +881,8 @@ static int run_init_process(const char *init_filename)
77488 {
77489 argv_init[0] = init_filename;
77490 return do_execve(init_filename,
77491- (const char __user *const __user *)argv_init,
77492- (const char __user *const __user *)envp_init);
77493+ (const char __user *const __force_user *)argv_init,
77494+ (const char __user *const __force_user *)envp_init);
77495 }
77496
77497 static noinline void __init kernel_init_freeable(void);
77498@@ -880,7 +959,7 @@ static noinline void __init kernel_init_freeable(void)
77499 do_basic_setup();
77500
77501 /* Open the /dev/console on the rootfs, this should never fail */
77502- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
77503+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
77504 pr_err("Warning: unable to open an initial console.\n");
77505
77506 (void) sys_dup(0);
77507@@ -893,11 +972,13 @@ static noinline void __init kernel_init_freeable(void)
77508 if (!ramdisk_execute_command)
77509 ramdisk_execute_command = "/init";
77510
77511- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
77512+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
77513 ramdisk_execute_command = NULL;
77514 prepare_namespace();
77515 }
77516
77517+ grsecurity_init();
77518+
77519 /*
77520 * Ok, we have completed the initial bootup, and
77521 * we're essentially up and running. Get rid of the
77522diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
77523index 130dfec..cc88451 100644
77524--- a/ipc/ipc_sysctl.c
77525+++ b/ipc/ipc_sysctl.c
77526@@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
77527 static int proc_ipc_dointvec(ctl_table *table, int write,
77528 void __user *buffer, size_t *lenp, loff_t *ppos)
77529 {
77530- struct ctl_table ipc_table;
77531+ ctl_table_no_const ipc_table;
77532
77533 memcpy(&ipc_table, table, sizeof(ipc_table));
77534 ipc_table.data = get_ipc(table);
77535@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
77536 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
77537 void __user *buffer, size_t *lenp, loff_t *ppos)
77538 {
77539- struct ctl_table ipc_table;
77540+ ctl_table_no_const ipc_table;
77541
77542 memcpy(&ipc_table, table, sizeof(ipc_table));
77543 ipc_table.data = get_ipc(table);
77544@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
77545 static int proc_ipc_callback_dointvec(ctl_table *table, int write,
77546 void __user *buffer, size_t *lenp, loff_t *ppos)
77547 {
77548- struct ctl_table ipc_table;
77549+ ctl_table_no_const ipc_table;
77550 size_t lenp_bef = *lenp;
77551 int rc;
77552
77553@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec(ctl_table *table, int write,
77554 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
77555 void __user *buffer, size_t *lenp, loff_t *ppos)
77556 {
77557- struct ctl_table ipc_table;
77558+ ctl_table_no_const ipc_table;
77559 memcpy(&ipc_table, table, sizeof(ipc_table));
77560 ipc_table.data = get_ipc(table);
77561
77562@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
77563 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
77564 void __user *buffer, size_t *lenp, loff_t *ppos)
77565 {
77566- struct ctl_table ipc_table;
77567+ ctl_table_no_const ipc_table;
77568 size_t lenp_bef = *lenp;
77569 int oldval;
77570 int rc;
77571diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
77572index 383d638..943fdbb 100644
77573--- a/ipc/mq_sysctl.c
77574+++ b/ipc/mq_sysctl.c
77575@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
77576 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
77577 void __user *buffer, size_t *lenp, loff_t *ppos)
77578 {
77579- struct ctl_table mq_table;
77580+ ctl_table_no_const mq_table;
77581 memcpy(&mq_table, table, sizeof(mq_table));
77582 mq_table.data = get_mq(table);
77583
77584diff --git a/ipc/mqueue.c b/ipc/mqueue.c
77585index e4e47f6..a85e0ad 100644
77586--- a/ipc/mqueue.c
77587+++ b/ipc/mqueue.c
77588@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
77589 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
77590 info->attr.mq_msgsize);
77591
77592+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
77593 spin_lock(&mq_lock);
77594 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
77595 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
77596diff --git a/ipc/msg.c b/ipc/msg.c
77597index d0c6d96..69a893c 100644
77598--- a/ipc/msg.c
77599+++ b/ipc/msg.c
77600@@ -296,18 +296,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
77601 return security_msg_queue_associate(msq, msgflg);
77602 }
77603
77604+static struct ipc_ops msg_ops = {
77605+ .getnew = newque,
77606+ .associate = msg_security,
77607+ .more_checks = NULL
77608+};
77609+
77610 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
77611 {
77612 struct ipc_namespace *ns;
77613- struct ipc_ops msg_ops;
77614 struct ipc_params msg_params;
77615
77616 ns = current->nsproxy->ipc_ns;
77617
77618- msg_ops.getnew = newque;
77619- msg_ops.associate = msg_security;
77620- msg_ops.more_checks = NULL;
77621-
77622 msg_params.key = key;
77623 msg_params.flg = msgflg;
77624
77625diff --git a/ipc/sem.c b/ipc/sem.c
77626index 70480a3..f4e8262 100644
77627--- a/ipc/sem.c
77628+++ b/ipc/sem.c
77629@@ -460,10 +460,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
77630 return 0;
77631 }
77632
77633+static struct ipc_ops sem_ops = {
77634+ .getnew = newary,
77635+ .associate = sem_security,
77636+ .more_checks = sem_more_checks
77637+};
77638+
77639 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
77640 {
77641 struct ipc_namespace *ns;
77642- struct ipc_ops sem_ops;
77643 struct ipc_params sem_params;
77644
77645 ns = current->nsproxy->ipc_ns;
77646@@ -471,10 +476,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
77647 if (nsems < 0 || nsems > ns->sc_semmsl)
77648 return -EINVAL;
77649
77650- sem_ops.getnew = newary;
77651- sem_ops.associate = sem_security;
77652- sem_ops.more_checks = sem_more_checks;
77653-
77654 sem_params.key = key;
77655 sem_params.flg = semflg;
77656 sem_params.u.nsems = nsems;
77657diff --git a/ipc/shm.c b/ipc/shm.c
77658index 7e199fa..180a1ca 100644
77659--- a/ipc/shm.c
77660+++ b/ipc/shm.c
77661@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
77662 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
77663 #endif
77664
77665+#ifdef CONFIG_GRKERNSEC
77666+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
77667+ const time_t shm_createtime, const kuid_t cuid,
77668+ const int shmid);
77669+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
77670+ const time_t shm_createtime);
77671+#endif
77672+
77673 void shm_init_ns(struct ipc_namespace *ns)
77674 {
77675 ns->shm_ctlmax = SHMMAX;
77676@@ -531,6 +539,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
77677 shp->shm_lprid = 0;
77678 shp->shm_atim = shp->shm_dtim = 0;
77679 shp->shm_ctim = get_seconds();
77680+#ifdef CONFIG_GRKERNSEC
77681+ {
77682+ struct timespec timeval;
77683+ do_posix_clock_monotonic_gettime(&timeval);
77684+
77685+ shp->shm_createtime = timeval.tv_sec;
77686+ }
77687+#endif
77688 shp->shm_segsz = size;
77689 shp->shm_nattch = 0;
77690 shp->shm_file = file;
77691@@ -582,18 +598,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
77692 return 0;
77693 }
77694
77695+static struct ipc_ops shm_ops = {
77696+ .getnew = newseg,
77697+ .associate = shm_security,
77698+ .more_checks = shm_more_checks
77699+};
77700+
77701 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
77702 {
77703 struct ipc_namespace *ns;
77704- struct ipc_ops shm_ops;
77705 struct ipc_params shm_params;
77706
77707 ns = current->nsproxy->ipc_ns;
77708
77709- shm_ops.getnew = newseg;
77710- shm_ops.associate = shm_security;
77711- shm_ops.more_checks = shm_more_checks;
77712-
77713 shm_params.key = key;
77714 shm_params.flg = shmflg;
77715 shm_params.u.size = size;
77716@@ -1014,6 +1031,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
77717 f_mode = FMODE_READ | FMODE_WRITE;
77718 }
77719 if (shmflg & SHM_EXEC) {
77720+
77721+#ifdef CONFIG_PAX_MPROTECT
77722+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
77723+ goto out;
77724+#endif
77725+
77726 prot |= PROT_EXEC;
77727 acc_mode |= S_IXUGO;
77728 }
77729@@ -1037,9 +1060,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
77730 if (err)
77731 goto out_unlock;
77732
77733+#ifdef CONFIG_GRKERNSEC
77734+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
77735+ shp->shm_perm.cuid, shmid) ||
77736+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
77737+ err = -EACCES;
77738+ goto out_unlock;
77739+ }
77740+#endif
77741+
77742 path = shp->shm_file->f_path;
77743 path_get(&path);
77744 shp->shm_nattch++;
77745+#ifdef CONFIG_GRKERNSEC
77746+ shp->shm_lapid = current->pid;
77747+#endif
77748 size = i_size_read(path.dentry->d_inode);
77749 shm_unlock(shp);
77750
77751diff --git a/kernel/acct.c b/kernel/acct.c
77752index 8d6e145..33e0b1e 100644
77753--- a/kernel/acct.c
77754+++ b/kernel/acct.c
77755@@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
77756 */
77757 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
77758 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
77759- file->f_op->write(file, (char *)&ac,
77760+ file->f_op->write(file, (char __force_user *)&ac,
77761 sizeof(acct_t), &file->f_pos);
77762 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
77763 set_fs(fs);
77764diff --git a/kernel/audit.c b/kernel/audit.c
77765index 91e53d0..d9e3ec4 100644
77766--- a/kernel/audit.c
77767+++ b/kernel/audit.c
77768@@ -118,7 +118,7 @@ u32 audit_sig_sid = 0;
77769 3) suppressed due to audit_rate_limit
77770 4) suppressed due to audit_backlog_limit
77771 */
77772-static atomic_t audit_lost = ATOMIC_INIT(0);
77773+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
77774
77775 /* The netlink socket. */
77776 static struct sock *audit_sock;
77777@@ -240,7 +240,7 @@ void audit_log_lost(const char *message)
77778 unsigned long now;
77779 int print;
77780
77781- atomic_inc(&audit_lost);
77782+ atomic_inc_unchecked(&audit_lost);
77783
77784 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
77785
77786@@ -259,7 +259,7 @@ void audit_log_lost(const char *message)
77787 printk(KERN_WARNING
77788 "audit: audit_lost=%d audit_rate_limit=%d "
77789 "audit_backlog_limit=%d\n",
77790- atomic_read(&audit_lost),
77791+ atomic_read_unchecked(&audit_lost),
77792 audit_rate_limit,
77793 audit_backlog_limit);
77794 audit_panic(message);
77795@@ -664,7 +664,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
77796 status_set.pid = audit_pid;
77797 status_set.rate_limit = audit_rate_limit;
77798 status_set.backlog_limit = audit_backlog_limit;
77799- status_set.lost = atomic_read(&audit_lost);
77800+ status_set.lost = atomic_read_unchecked(&audit_lost);
77801 status_set.backlog = skb_queue_len(&audit_skb_queue);
77802 audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0,
77803 &status_set, sizeof(status_set));
77804diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
77805index 6bd4a90..0ee9eff 100644
77806--- a/kernel/auditfilter.c
77807+++ b/kernel/auditfilter.c
77808@@ -423,7 +423,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
77809 f->lsm_rule = NULL;
77810
77811 /* Support legacy tests for a valid loginuid */
77812- if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295)) {
77813+ if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295U)) {
77814 f->type = AUDIT_LOGINUID_SET;
77815 f->val = 0;
77816 }
77817diff --git a/kernel/auditsc.c b/kernel/auditsc.c
77818index 3c8a601..3a416f6 100644
77819--- a/kernel/auditsc.c
77820+++ b/kernel/auditsc.c
77821@@ -1956,7 +1956,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
77822 }
77823
77824 /* global counter which is incremented every time something logs in */
77825-static atomic_t session_id = ATOMIC_INIT(0);
77826+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
77827
77828 /**
77829 * audit_set_loginuid - set current task's audit_context loginuid
77830@@ -1980,7 +1980,7 @@ int audit_set_loginuid(kuid_t loginuid)
77831 return -EPERM;
77832 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
77833
77834- sessionid = atomic_inc_return(&session_id);
77835+ sessionid = atomic_inc_return_unchecked(&session_id);
77836 if (context && context->in_syscall) {
77837 struct audit_buffer *ab;
77838
77839diff --git a/kernel/capability.c b/kernel/capability.c
77840index f6c2ce5..982c0f9 100644
77841--- a/kernel/capability.c
77842+++ b/kernel/capability.c
77843@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
77844 * before modification is attempted and the application
77845 * fails.
77846 */
77847+ if (tocopy > ARRAY_SIZE(kdata))
77848+ return -EFAULT;
77849+
77850 if (copy_to_user(dataptr, kdata, tocopy
77851 * sizeof(struct __user_cap_data_struct))) {
77852 return -EFAULT;
77853@@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
77854 int ret;
77855
77856 rcu_read_lock();
77857- ret = security_capable(__task_cred(t), ns, cap);
77858+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
77859+ gr_task_is_capable(t, __task_cred(t), cap);
77860 rcu_read_unlock();
77861
77862- return (ret == 0);
77863+ return ret;
77864 }
77865
77866 /**
77867@@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
77868 int ret;
77869
77870 rcu_read_lock();
77871- ret = security_capable_noaudit(__task_cred(t), ns, cap);
77872+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
77873 rcu_read_unlock();
77874
77875- return (ret == 0);
77876+ return ret;
77877 }
77878
77879 /**
77880@@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
77881 BUG();
77882 }
77883
77884- if (security_capable(current_cred(), ns, cap) == 0) {
77885+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
77886 current->flags |= PF_SUPERPRIV;
77887 return true;
77888 }
77889@@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
77890 }
77891 EXPORT_SYMBOL(ns_capable);
77892
77893+bool ns_capable_nolog(struct user_namespace *ns, int cap)
77894+{
77895+ if (unlikely(!cap_valid(cap))) {
77896+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
77897+ BUG();
77898+ }
77899+
77900+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
77901+ current->flags |= PF_SUPERPRIV;
77902+ return true;
77903+ }
77904+ return false;
77905+}
77906+EXPORT_SYMBOL(ns_capable_nolog);
77907+
77908 /**
77909 * file_ns_capable - Determine if the file's opener had a capability in effect
77910 * @file: The file we want to check
77911@@ -432,6 +451,12 @@ bool capable(int cap)
77912 }
77913 EXPORT_SYMBOL(capable);
77914
77915+bool capable_nolog(int cap)
77916+{
77917+ return ns_capable_nolog(&init_user_ns, cap);
77918+}
77919+EXPORT_SYMBOL(capable_nolog);
77920+
77921 /**
77922 * nsown_capable - Check superior capability to one's own user_ns
77923 * @cap: The capability in question
77924@@ -464,3 +489,10 @@ bool inode_capable(const struct inode *inode, int cap)
77925
77926 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
77927 }
77928+
77929+bool inode_capable_nolog(const struct inode *inode, int cap)
77930+{
77931+ struct user_namespace *ns = current_user_ns();
77932+
77933+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
77934+}
77935diff --git a/kernel/cgroup.c b/kernel/cgroup.c
77936index 2e9b387..61817b1 100644
77937--- a/kernel/cgroup.c
77938+++ b/kernel/cgroup.c
77939@@ -5398,7 +5398,7 @@ static int cgroup_css_links_read(struct cgroup *cont,
77940 struct css_set *cg = link->cg;
77941 struct task_struct *task;
77942 int count = 0;
77943- seq_printf(seq, "css_set %p\n", cg);
77944+ seq_printf(seq, "css_set %pK\n", cg);
77945 list_for_each_entry(task, &cg->tasks, cg_list) {
77946 if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
77947 seq_puts(seq, " ...\n");
77948diff --git a/kernel/compat.c b/kernel/compat.c
77949index 0a09e48..f44f3f0 100644
77950--- a/kernel/compat.c
77951+++ b/kernel/compat.c
77952@@ -13,6 +13,7 @@
77953
77954 #include <linux/linkage.h>
77955 #include <linux/compat.h>
77956+#include <linux/module.h>
77957 #include <linux/errno.h>
77958 #include <linux/time.h>
77959 #include <linux/signal.h>
77960@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
77961 mm_segment_t oldfs;
77962 long ret;
77963
77964- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
77965+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
77966 oldfs = get_fs();
77967 set_fs(KERNEL_DS);
77968 ret = hrtimer_nanosleep_restart(restart);
77969@@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
77970 oldfs = get_fs();
77971 set_fs(KERNEL_DS);
77972 ret = hrtimer_nanosleep(&tu,
77973- rmtp ? (struct timespec __user *)&rmt : NULL,
77974+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
77975 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
77976 set_fs(oldfs);
77977
77978@@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
77979 mm_segment_t old_fs = get_fs();
77980
77981 set_fs(KERNEL_DS);
77982- ret = sys_sigpending((old_sigset_t __user *) &s);
77983+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
77984 set_fs(old_fs);
77985 if (ret == 0)
77986 ret = put_user(s, set);
77987@@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
77988 mm_segment_t old_fs = get_fs();
77989
77990 set_fs(KERNEL_DS);
77991- ret = sys_old_getrlimit(resource, &r);
77992+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
77993 set_fs(old_fs);
77994
77995 if (!ret) {
77996@@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
77997 set_fs (KERNEL_DS);
77998 ret = sys_wait4(pid,
77999 (stat_addr ?
78000- (unsigned int __user *) &status : NULL),
78001- options, (struct rusage __user *) &r);
78002+ (unsigned int __force_user *) &status : NULL),
78003+ options, (struct rusage __force_user *) &r);
78004 set_fs (old_fs);
78005
78006 if (ret > 0) {
78007@@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
78008 memset(&info, 0, sizeof(info));
78009
78010 set_fs(KERNEL_DS);
78011- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
78012- uru ? (struct rusage __user *)&ru : NULL);
78013+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
78014+ uru ? (struct rusage __force_user *)&ru : NULL);
78015 set_fs(old_fs);
78016
78017 if ((ret < 0) || (info.si_signo == 0))
78018@@ -695,8 +696,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
78019 oldfs = get_fs();
78020 set_fs(KERNEL_DS);
78021 err = sys_timer_settime(timer_id, flags,
78022- (struct itimerspec __user *) &newts,
78023- (struct itimerspec __user *) &oldts);
78024+ (struct itimerspec __force_user *) &newts,
78025+ (struct itimerspec __force_user *) &oldts);
78026 set_fs(oldfs);
78027 if (!err && old && put_compat_itimerspec(old, &oldts))
78028 return -EFAULT;
78029@@ -713,7 +714,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
78030 oldfs = get_fs();
78031 set_fs(KERNEL_DS);
78032 err = sys_timer_gettime(timer_id,
78033- (struct itimerspec __user *) &ts);
78034+ (struct itimerspec __force_user *) &ts);
78035 set_fs(oldfs);
78036 if (!err && put_compat_itimerspec(setting, &ts))
78037 return -EFAULT;
78038@@ -732,7 +733,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
78039 oldfs = get_fs();
78040 set_fs(KERNEL_DS);
78041 err = sys_clock_settime(which_clock,
78042- (struct timespec __user *) &ts);
78043+ (struct timespec __force_user *) &ts);
78044 set_fs(oldfs);
78045 return err;
78046 }
78047@@ -747,7 +748,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
78048 oldfs = get_fs();
78049 set_fs(KERNEL_DS);
78050 err = sys_clock_gettime(which_clock,
78051- (struct timespec __user *) &ts);
78052+ (struct timespec __force_user *) &ts);
78053 set_fs(oldfs);
78054 if (!err && put_compat_timespec(&ts, tp))
78055 return -EFAULT;
78056@@ -767,7 +768,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
78057
78058 oldfs = get_fs();
78059 set_fs(KERNEL_DS);
78060- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
78061+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
78062 set_fs(oldfs);
78063
78064 err = compat_put_timex(utp, &txc);
78065@@ -787,7 +788,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
78066 oldfs = get_fs();
78067 set_fs(KERNEL_DS);
78068 err = sys_clock_getres(which_clock,
78069- (struct timespec __user *) &ts);
78070+ (struct timespec __force_user *) &ts);
78071 set_fs(oldfs);
78072 if (!err && tp && put_compat_timespec(&ts, tp))
78073 return -EFAULT;
78074@@ -799,9 +800,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
78075 long err;
78076 mm_segment_t oldfs;
78077 struct timespec tu;
78078- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
78079+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
78080
78081- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
78082+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
78083 oldfs = get_fs();
78084 set_fs(KERNEL_DS);
78085 err = clock_nanosleep_restart(restart);
78086@@ -833,8 +834,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
78087 oldfs = get_fs();
78088 set_fs(KERNEL_DS);
78089 err = sys_clock_nanosleep(which_clock, flags,
78090- (struct timespec __user *) &in,
78091- (struct timespec __user *) &out);
78092+ (struct timespec __force_user *) &in,
78093+ (struct timespec __force_user *) &out);
78094 set_fs(oldfs);
78095
78096 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
78097diff --git a/kernel/configs.c b/kernel/configs.c
78098index c18b1f1..b9a0132 100644
78099--- a/kernel/configs.c
78100+++ b/kernel/configs.c
78101@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
78102 struct proc_dir_entry *entry;
78103
78104 /* create the current config file */
78105+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
78106+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
78107+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
78108+ &ikconfig_file_ops);
78109+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
78110+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
78111+ &ikconfig_file_ops);
78112+#endif
78113+#else
78114 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
78115 &ikconfig_file_ops);
78116+#endif
78117+
78118 if (!entry)
78119 return -ENOMEM;
78120
78121diff --git a/kernel/cred.c b/kernel/cred.c
78122index e0573a4..3874e41 100644
78123--- a/kernel/cred.c
78124+++ b/kernel/cred.c
78125@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
78126 validate_creds(cred);
78127 alter_cred_subscribers(cred, -1);
78128 put_cred(cred);
78129+
78130+#ifdef CONFIG_GRKERNSEC_SETXID
78131+ cred = (struct cred *) tsk->delayed_cred;
78132+ if (cred != NULL) {
78133+ tsk->delayed_cred = NULL;
78134+ validate_creds(cred);
78135+ alter_cred_subscribers(cred, -1);
78136+ put_cred(cred);
78137+ }
78138+#endif
78139 }
78140
78141 /**
78142@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
78143 * Always returns 0 thus allowing this function to be tail-called at the end
78144 * of, say, sys_setgid().
78145 */
78146-int commit_creds(struct cred *new)
78147+static int __commit_creds(struct cred *new)
78148 {
78149 struct task_struct *task = current;
78150 const struct cred *old = task->real_cred;
78151@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
78152
78153 get_cred(new); /* we will require a ref for the subj creds too */
78154
78155+ gr_set_role_label(task, new->uid, new->gid);
78156+
78157 /* dumpability changes */
78158 if (!uid_eq(old->euid, new->euid) ||
78159 !gid_eq(old->egid, new->egid) ||
78160@@ -479,6 +491,102 @@ int commit_creds(struct cred *new)
78161 put_cred(old);
78162 return 0;
78163 }
78164+#ifdef CONFIG_GRKERNSEC_SETXID
78165+extern int set_user(struct cred *new);
78166+
78167+void gr_delayed_cred_worker(void)
78168+{
78169+ const struct cred *new = current->delayed_cred;
78170+ struct cred *ncred;
78171+
78172+ current->delayed_cred = NULL;
78173+
78174+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
78175+ // from doing get_cred on it when queueing this
78176+ put_cred(new);
78177+ return;
78178+ } else if (new == NULL)
78179+ return;
78180+
78181+ ncred = prepare_creds();
78182+ if (!ncred)
78183+ goto die;
78184+ // uids
78185+ ncred->uid = new->uid;
78186+ ncred->euid = new->euid;
78187+ ncred->suid = new->suid;
78188+ ncred->fsuid = new->fsuid;
78189+ // gids
78190+ ncred->gid = new->gid;
78191+ ncred->egid = new->egid;
78192+ ncred->sgid = new->sgid;
78193+ ncred->fsgid = new->fsgid;
78194+ // groups
78195+ if (set_groups(ncred, new->group_info) < 0) {
78196+ abort_creds(ncred);
78197+ goto die;
78198+ }
78199+ // caps
78200+ ncred->securebits = new->securebits;
78201+ ncred->cap_inheritable = new->cap_inheritable;
78202+ ncred->cap_permitted = new->cap_permitted;
78203+ ncred->cap_effective = new->cap_effective;
78204+ ncred->cap_bset = new->cap_bset;
78205+
78206+ if (set_user(ncred)) {
78207+ abort_creds(ncred);
78208+ goto die;
78209+ }
78210+
78211+ // from doing get_cred on it when queueing this
78212+ put_cred(new);
78213+
78214+ __commit_creds(ncred);
78215+ return;
78216+die:
78217+ // from doing get_cred on it when queueing this
78218+ put_cred(new);
78219+ do_group_exit(SIGKILL);
78220+}
78221+#endif
78222+
78223+int commit_creds(struct cred *new)
78224+{
78225+#ifdef CONFIG_GRKERNSEC_SETXID
78226+ int ret;
78227+ int schedule_it = 0;
78228+ struct task_struct *t;
78229+
78230+ /* we won't get called with tasklist_lock held for writing
78231+ and interrupts disabled as the cred struct in that case is
78232+ init_cred
78233+ */
78234+ if (grsec_enable_setxid && !current_is_single_threaded() &&
78235+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
78236+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
78237+ schedule_it = 1;
78238+ }
78239+ ret = __commit_creds(new);
78240+ if (schedule_it) {
78241+ rcu_read_lock();
78242+ read_lock(&tasklist_lock);
78243+ for (t = next_thread(current); t != current;
78244+ t = next_thread(t)) {
78245+ if (t->delayed_cred == NULL) {
78246+ t->delayed_cred = get_cred(new);
78247+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
78248+ set_tsk_need_resched(t);
78249+ }
78250+ }
78251+ read_unlock(&tasklist_lock);
78252+ rcu_read_unlock();
78253+ }
78254+ return ret;
78255+#else
78256+ return __commit_creds(new);
78257+#endif
78258+}
78259+
78260 EXPORT_SYMBOL(commit_creds);
78261
78262 /**
78263diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
78264index 0506d44..2c20034 100644
78265--- a/kernel/debug/debug_core.c
78266+++ b/kernel/debug/debug_core.c
78267@@ -123,7 +123,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
78268 */
78269 static atomic_t masters_in_kgdb;
78270 static atomic_t slaves_in_kgdb;
78271-static atomic_t kgdb_break_tasklet_var;
78272+static atomic_unchecked_t kgdb_break_tasklet_var;
78273 atomic_t kgdb_setting_breakpoint;
78274
78275 struct task_struct *kgdb_usethread;
78276@@ -133,7 +133,7 @@ int kgdb_single_step;
78277 static pid_t kgdb_sstep_pid;
78278
78279 /* to keep track of the CPU which is doing the single stepping*/
78280-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
78281+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
78282
78283 /*
78284 * If you are debugging a problem where roundup (the collection of
78285@@ -541,7 +541,7 @@ return_normal:
78286 * kernel will only try for the value of sstep_tries before
78287 * giving up and continuing on.
78288 */
78289- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
78290+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
78291 (kgdb_info[cpu].task &&
78292 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
78293 atomic_set(&kgdb_active, -1);
78294@@ -635,8 +635,8 @@ cpu_master_loop:
78295 }
78296
78297 kgdb_restore:
78298- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
78299- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
78300+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
78301+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
78302 if (kgdb_info[sstep_cpu].task)
78303 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
78304 else
78305@@ -888,18 +888,18 @@ static void kgdb_unregister_callbacks(void)
78306 static void kgdb_tasklet_bpt(unsigned long ing)
78307 {
78308 kgdb_breakpoint();
78309- atomic_set(&kgdb_break_tasklet_var, 0);
78310+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
78311 }
78312
78313 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
78314
78315 void kgdb_schedule_breakpoint(void)
78316 {
78317- if (atomic_read(&kgdb_break_tasklet_var) ||
78318+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
78319 atomic_read(&kgdb_active) != -1 ||
78320 atomic_read(&kgdb_setting_breakpoint))
78321 return;
78322- atomic_inc(&kgdb_break_tasklet_var);
78323+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
78324 tasklet_schedule(&kgdb_tasklet_breakpoint);
78325 }
78326 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
78327diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
78328index 00eb8f7..d7e3244 100644
78329--- a/kernel/debug/kdb/kdb_main.c
78330+++ b/kernel/debug/kdb/kdb_main.c
78331@@ -1974,7 +1974,7 @@ static int kdb_lsmod(int argc, const char **argv)
78332 continue;
78333
78334 kdb_printf("%-20s%8u 0x%p ", mod->name,
78335- mod->core_size, (void *)mod);
78336+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
78337 #ifdef CONFIG_MODULE_UNLOAD
78338 kdb_printf("%4ld ", module_refcount(mod));
78339 #endif
78340@@ -1984,7 +1984,7 @@ static int kdb_lsmod(int argc, const char **argv)
78341 kdb_printf(" (Loading)");
78342 else
78343 kdb_printf(" (Live)");
78344- kdb_printf(" 0x%p", mod->module_core);
78345+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
78346
78347 #ifdef CONFIG_MODULE_UNLOAD
78348 {
78349diff --git a/kernel/events/core.c b/kernel/events/core.c
78350index e76e495..cbfe63a 100644
78351--- a/kernel/events/core.c
78352+++ b/kernel/events/core.c
78353@@ -156,8 +156,15 @@ static struct srcu_struct pmus_srcu;
78354 * 0 - disallow raw tracepoint access for unpriv
78355 * 1 - disallow cpu events for unpriv
78356 * 2 - disallow kernel profiling for unpriv
78357+ * 3 - disallow all unpriv perf event use
78358 */
78359-int sysctl_perf_event_paranoid __read_mostly = 1;
78360+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
78361+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
78362+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
78363+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
78364+#else
78365+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
78366+#endif
78367
78368 /* Minimum for 512 kiB + 1 user control page */
78369 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
78370@@ -184,7 +191,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
78371 return 0;
78372 }
78373
78374-static atomic64_t perf_event_id;
78375+static atomic64_unchecked_t perf_event_id;
78376
78377 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
78378 enum event_type_t event_type);
78379@@ -2747,7 +2754,7 @@ static void __perf_event_read(void *info)
78380
78381 static inline u64 perf_event_count(struct perf_event *event)
78382 {
78383- return local64_read(&event->count) + atomic64_read(&event->child_count);
78384+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
78385 }
78386
78387 static u64 perf_event_read(struct perf_event *event)
78388@@ -3093,9 +3100,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
78389 mutex_lock(&event->child_mutex);
78390 total += perf_event_read(event);
78391 *enabled += event->total_time_enabled +
78392- atomic64_read(&event->child_total_time_enabled);
78393+ atomic64_read_unchecked(&event->child_total_time_enabled);
78394 *running += event->total_time_running +
78395- atomic64_read(&event->child_total_time_running);
78396+ atomic64_read_unchecked(&event->child_total_time_running);
78397
78398 list_for_each_entry(child, &event->child_list, child_list) {
78399 total += perf_event_read(child);
78400@@ -3481,10 +3488,10 @@ void perf_event_update_userpage(struct perf_event *event)
78401 userpg->offset -= local64_read(&event->hw.prev_count);
78402
78403 userpg->time_enabled = enabled +
78404- atomic64_read(&event->child_total_time_enabled);
78405+ atomic64_read_unchecked(&event->child_total_time_enabled);
78406
78407 userpg->time_running = running +
78408- atomic64_read(&event->child_total_time_running);
78409+ atomic64_read_unchecked(&event->child_total_time_running);
78410
78411 arch_perf_update_userpage(userpg, now);
78412
78413@@ -4034,7 +4041,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
78414
78415 /* Data. */
78416 sp = perf_user_stack_pointer(regs);
78417- rem = __output_copy_user(handle, (void *) sp, dump_size);
78418+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
78419 dyn_size = dump_size - rem;
78420
78421 perf_output_skip(handle, rem);
78422@@ -4122,11 +4129,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
78423 values[n++] = perf_event_count(event);
78424 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
78425 values[n++] = enabled +
78426- atomic64_read(&event->child_total_time_enabled);
78427+ atomic64_read_unchecked(&event->child_total_time_enabled);
78428 }
78429 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
78430 values[n++] = running +
78431- atomic64_read(&event->child_total_time_running);
78432+ atomic64_read_unchecked(&event->child_total_time_running);
78433 }
78434 if (read_format & PERF_FORMAT_ID)
78435 values[n++] = primary_event_id(event);
78436@@ -4835,12 +4842,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
78437 * need to add enough zero bytes after the string to handle
78438 * the 64bit alignment we do later.
78439 */
78440- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
78441+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
78442 if (!buf) {
78443 name = strncpy(tmp, "//enomem", sizeof(tmp));
78444 goto got_name;
78445 }
78446- name = d_path(&file->f_path, buf, PATH_MAX);
78447+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
78448 if (IS_ERR(name)) {
78449 name = strncpy(tmp, "//toolong", sizeof(tmp));
78450 goto got_name;
78451@@ -6262,7 +6269,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
78452 event->parent = parent_event;
78453
78454 event->ns = get_pid_ns(task_active_pid_ns(current));
78455- event->id = atomic64_inc_return(&perf_event_id);
78456+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
78457
78458 event->state = PERF_EVENT_STATE_INACTIVE;
78459
78460@@ -6572,6 +6579,11 @@ SYSCALL_DEFINE5(perf_event_open,
78461 if (flags & ~PERF_FLAG_ALL)
78462 return -EINVAL;
78463
78464+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
78465+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
78466+ return -EACCES;
78467+#endif
78468+
78469 err = perf_copy_attr(attr_uptr, &attr);
78470 if (err)
78471 return err;
78472@@ -6904,10 +6916,10 @@ static void sync_child_event(struct perf_event *child_event,
78473 /*
78474 * Add back the child's count to the parent's count:
78475 */
78476- atomic64_add(child_val, &parent_event->child_count);
78477- atomic64_add(child_event->total_time_enabled,
78478+ atomic64_add_unchecked(child_val, &parent_event->child_count);
78479+ atomic64_add_unchecked(child_event->total_time_enabled,
78480 &parent_event->child_total_time_enabled);
78481- atomic64_add(child_event->total_time_running,
78482+ atomic64_add_unchecked(child_event->total_time_running,
78483 &parent_event->child_total_time_running);
78484
78485 /*
78486diff --git a/kernel/events/internal.h b/kernel/events/internal.h
78487index ca65997..cc8cee4 100644
78488--- a/kernel/events/internal.h
78489+++ b/kernel/events/internal.h
78490@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
78491 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
78492 }
78493
78494-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
78495+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
78496 static inline unsigned int \
78497 func_name(struct perf_output_handle *handle, \
78498- const void *buf, unsigned int len) \
78499+ const void user *buf, unsigned int len) \
78500 { \
78501 unsigned long size, written; \
78502 \
78503@@ -116,17 +116,17 @@ static inline int memcpy_common(void *dst, const void *src, size_t n)
78504 return n;
78505 }
78506
78507-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
78508+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
78509
78510 #define MEMCPY_SKIP(dst, src, n) (n)
78511
78512-DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP)
78513+DEFINE_OUTPUT_COPY(__output_skip, MEMCPY_SKIP, )
78514
78515 #ifndef arch_perf_out_copy_user
78516 #define arch_perf_out_copy_user __copy_from_user_inatomic
78517 #endif
78518
78519-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
78520+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
78521
78522 /* Callchain handling */
78523 extern struct perf_callchain_entry *
78524diff --git a/kernel/exit.c b/kernel/exit.c
78525index 7bb73f9..d7978ed 100644
78526--- a/kernel/exit.c
78527+++ b/kernel/exit.c
78528@@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
78529 struct task_struct *leader;
78530 int zap_leader;
78531 repeat:
78532+#ifdef CONFIG_NET
78533+ gr_del_task_from_ip_table(p);
78534+#endif
78535+
78536 /* don't need to get the RCU readlock here - the process is dead and
78537 * can't be modifying its own credentials. But shut RCU-lockdep up */
78538 rcu_read_lock();
78539@@ -340,7 +344,7 @@ int allow_signal(int sig)
78540 * know it'll be handled, so that they don't get converted to
78541 * SIGKILL or just silently dropped.
78542 */
78543- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
78544+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
78545 recalc_sigpending();
78546 spin_unlock_irq(&current->sighand->siglock);
78547 return 0;
78548@@ -709,6 +713,8 @@ void do_exit(long code)
78549 struct task_struct *tsk = current;
78550 int group_dead;
78551
78552+ set_fs(USER_DS);
78553+
78554 profile_task_exit(tsk);
78555
78556 WARN_ON(blk_needs_flush_plug(tsk));
78557@@ -725,7 +731,6 @@ void do_exit(long code)
78558 * mm_release()->clear_child_tid() from writing to a user-controlled
78559 * kernel address.
78560 */
78561- set_fs(USER_DS);
78562
78563 ptrace_event(PTRACE_EVENT_EXIT, code);
78564
78565@@ -784,6 +789,9 @@ void do_exit(long code)
78566 tsk->exit_code = code;
78567 taskstats_exit(tsk, group_dead);
78568
78569+ gr_acl_handle_psacct(tsk, code);
78570+ gr_acl_handle_exit();
78571+
78572 exit_mm(tsk);
78573
78574 if (group_dead)
78575@@ -905,7 +913,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
78576 * Take down every thread in the group. This is called by fatal signals
78577 * as well as by sys_exit_group (below).
78578 */
78579-void
78580+__noreturn void
78581 do_group_exit(int exit_code)
78582 {
78583 struct signal_struct *sig = current->signal;
78584diff --git a/kernel/fork.c b/kernel/fork.c
78585index ffbc090..08ceeee 100644
78586--- a/kernel/fork.c
78587+++ b/kernel/fork.c
78588@@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
78589 *stackend = STACK_END_MAGIC; /* for overflow detection */
78590
78591 #ifdef CONFIG_CC_STACKPROTECTOR
78592- tsk->stack_canary = get_random_int();
78593+ tsk->stack_canary = pax_get_random_long();
78594 #endif
78595
78596 /*
78597@@ -345,13 +345,81 @@ free_tsk:
78598 }
78599
78600 #ifdef CONFIG_MMU
78601+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
78602+{
78603+ struct vm_area_struct *tmp;
78604+ unsigned long charge;
78605+ struct mempolicy *pol;
78606+ struct file *file;
78607+
78608+ charge = 0;
78609+ if (mpnt->vm_flags & VM_ACCOUNT) {
78610+ unsigned long len = vma_pages(mpnt);
78611+
78612+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
78613+ goto fail_nomem;
78614+ charge = len;
78615+ }
78616+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
78617+ if (!tmp)
78618+ goto fail_nomem;
78619+ *tmp = *mpnt;
78620+ tmp->vm_mm = mm;
78621+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
78622+ pol = mpol_dup(vma_policy(mpnt));
78623+ if (IS_ERR(pol))
78624+ goto fail_nomem_policy;
78625+ vma_set_policy(tmp, pol);
78626+ if (anon_vma_fork(tmp, mpnt))
78627+ goto fail_nomem_anon_vma_fork;
78628+ tmp->vm_flags &= ~VM_LOCKED;
78629+ tmp->vm_next = tmp->vm_prev = NULL;
78630+ tmp->vm_mirror = NULL;
78631+ file = tmp->vm_file;
78632+ if (file) {
78633+ struct inode *inode = file_inode(file);
78634+ struct address_space *mapping = file->f_mapping;
78635+
78636+ get_file(file);
78637+ if (tmp->vm_flags & VM_DENYWRITE)
78638+ atomic_dec(&inode->i_writecount);
78639+ mutex_lock(&mapping->i_mmap_mutex);
78640+ if (tmp->vm_flags & VM_SHARED)
78641+ mapping->i_mmap_writable++;
78642+ flush_dcache_mmap_lock(mapping);
78643+ /* insert tmp into the share list, just after mpnt */
78644+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
78645+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
78646+ else
78647+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
78648+ flush_dcache_mmap_unlock(mapping);
78649+ mutex_unlock(&mapping->i_mmap_mutex);
78650+ }
78651+
78652+ /*
78653+ * Clear hugetlb-related page reserves for children. This only
78654+ * affects MAP_PRIVATE mappings. Faults generated by the child
78655+ * are not guaranteed to succeed, even if read-only
78656+ */
78657+ if (is_vm_hugetlb_page(tmp))
78658+ reset_vma_resv_huge_pages(tmp);
78659+
78660+ return tmp;
78661+
78662+fail_nomem_anon_vma_fork:
78663+ mpol_put(pol);
78664+fail_nomem_policy:
78665+ kmem_cache_free(vm_area_cachep, tmp);
78666+fail_nomem:
78667+ vm_unacct_memory(charge);
78668+ return NULL;
78669+}
78670+
78671 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
78672 {
78673 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
78674 struct rb_node **rb_link, *rb_parent;
78675 int retval;
78676- unsigned long charge;
78677- struct mempolicy *pol;
78678
78679 uprobe_start_dup_mmap();
78680 down_write(&oldmm->mmap_sem);
78681@@ -365,8 +433,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
78682 mm->locked_vm = 0;
78683 mm->mmap = NULL;
78684 mm->mmap_cache = NULL;
78685- mm->free_area_cache = oldmm->mmap_base;
78686- mm->cached_hole_size = ~0UL;
78687+ mm->free_area_cache = oldmm->free_area_cache;
78688+ mm->cached_hole_size = oldmm->cached_hole_size;
78689 mm->map_count = 0;
78690 cpumask_clear(mm_cpumask(mm));
78691 mm->mm_rb = RB_ROOT;
78692@@ -382,57 +450,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
78693
78694 prev = NULL;
78695 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
78696- struct file *file;
78697-
78698 if (mpnt->vm_flags & VM_DONTCOPY) {
78699 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
78700 -vma_pages(mpnt));
78701 continue;
78702 }
78703- charge = 0;
78704- if (mpnt->vm_flags & VM_ACCOUNT) {
78705- unsigned long len = vma_pages(mpnt);
78706-
78707- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
78708- goto fail_nomem;
78709- charge = len;
78710- }
78711- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
78712- if (!tmp)
78713- goto fail_nomem;
78714- *tmp = *mpnt;
78715- INIT_LIST_HEAD(&tmp->anon_vma_chain);
78716- pol = mpol_dup(vma_policy(mpnt));
78717- retval = PTR_ERR(pol);
78718- if (IS_ERR(pol))
78719- goto fail_nomem_policy;
78720- vma_set_policy(tmp, pol);
78721- tmp->vm_mm = mm;
78722- if (anon_vma_fork(tmp, mpnt))
78723- goto fail_nomem_anon_vma_fork;
78724- tmp->vm_flags &= ~VM_LOCKED;
78725- tmp->vm_next = tmp->vm_prev = NULL;
78726- file = tmp->vm_file;
78727- if (file) {
78728- struct inode *inode = file_inode(file);
78729- struct address_space *mapping = file->f_mapping;
78730-
78731- get_file(file);
78732- if (tmp->vm_flags & VM_DENYWRITE)
78733- atomic_dec(&inode->i_writecount);
78734- mutex_lock(&mapping->i_mmap_mutex);
78735- if (tmp->vm_flags & VM_SHARED)
78736- mapping->i_mmap_writable++;
78737- flush_dcache_mmap_lock(mapping);
78738- /* insert tmp into the share list, just after mpnt */
78739- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
78740- vma_nonlinear_insert(tmp,
78741- &mapping->i_mmap_nonlinear);
78742- else
78743- vma_interval_tree_insert_after(tmp, mpnt,
78744- &mapping->i_mmap);
78745- flush_dcache_mmap_unlock(mapping);
78746- mutex_unlock(&mapping->i_mmap_mutex);
78747+ tmp = dup_vma(mm, oldmm, mpnt);
78748+ if (!tmp) {
78749+ retval = -ENOMEM;
78750+ goto out;
78751 }
78752
78753 /*
78754@@ -464,6 +490,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
78755 if (retval)
78756 goto out;
78757 }
78758+
78759+#ifdef CONFIG_PAX_SEGMEXEC
78760+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
78761+ struct vm_area_struct *mpnt_m;
78762+
78763+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
78764+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
78765+
78766+ if (!mpnt->vm_mirror)
78767+ continue;
78768+
78769+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
78770+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
78771+ mpnt->vm_mirror = mpnt_m;
78772+ } else {
78773+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
78774+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
78775+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
78776+ mpnt->vm_mirror->vm_mirror = mpnt;
78777+ }
78778+ }
78779+ BUG_ON(mpnt_m);
78780+ }
78781+#endif
78782+
78783 /* a new mm has just been created */
78784 arch_dup_mmap(oldmm, mm);
78785 retval = 0;
78786@@ -473,14 +524,6 @@ out:
78787 up_write(&oldmm->mmap_sem);
78788 uprobe_end_dup_mmap();
78789 return retval;
78790-fail_nomem_anon_vma_fork:
78791- mpol_put(pol);
78792-fail_nomem_policy:
78793- kmem_cache_free(vm_area_cachep, tmp);
78794-fail_nomem:
78795- retval = -ENOMEM;
78796- vm_unacct_memory(charge);
78797- goto out;
78798 }
78799
78800 static inline int mm_alloc_pgd(struct mm_struct *mm)
78801@@ -695,8 +738,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
78802 return ERR_PTR(err);
78803
78804 mm = get_task_mm(task);
78805- if (mm && mm != current->mm &&
78806- !ptrace_may_access(task, mode)) {
78807+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
78808+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
78809 mmput(mm);
78810 mm = ERR_PTR(-EACCES);
78811 }
78812@@ -918,13 +961,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
78813 spin_unlock(&fs->lock);
78814 return -EAGAIN;
78815 }
78816- fs->users++;
78817+ atomic_inc(&fs->users);
78818 spin_unlock(&fs->lock);
78819 return 0;
78820 }
78821 tsk->fs = copy_fs_struct(fs);
78822 if (!tsk->fs)
78823 return -ENOMEM;
78824+ /* Carry through gr_chroot_dentry and is_chrooted instead
78825+ of recomputing it here. Already copied when the task struct
78826+ is duplicated. This allows pivot_root to not be treated as
78827+ a chroot
78828+ */
78829+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
78830+
78831 return 0;
78832 }
78833
78834@@ -1197,10 +1247,13 @@ static struct task_struct *copy_process(unsigned long clone_flags,
78835 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
78836 #endif
78837 retval = -EAGAIN;
78838+
78839+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
78840+
78841 if (atomic_read(&p->real_cred->user->processes) >=
78842 task_rlimit(p, RLIMIT_NPROC)) {
78843- if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
78844- p->real_cred->user != INIT_USER)
78845+ if (p->real_cred->user != INIT_USER &&
78846+ !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
78847 goto bad_fork_free;
78848 }
78849 current->flags &= ~PF_NPROC_EXCEEDED;
78850@@ -1446,6 +1499,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
78851 goto bad_fork_free_pid;
78852 }
78853
78854+ /* synchronizes with gr_set_acls()
78855+ we need to call this past the point of no return for fork()
78856+ */
78857+ gr_copy_label(p);
78858+
78859 if (clone_flags & CLONE_THREAD) {
78860 current->signal->nr_threads++;
78861 atomic_inc(&current->signal->live);
78862@@ -1529,6 +1587,8 @@ bad_fork_cleanup_count:
78863 bad_fork_free:
78864 free_task(p);
78865 fork_out:
78866+ gr_log_forkfail(retval);
78867+
78868 return ERR_PTR(retval);
78869 }
78870
78871@@ -1613,6 +1673,8 @@ long do_fork(unsigned long clone_flags,
78872 if (clone_flags & CLONE_PARENT_SETTID)
78873 put_user(nr, parent_tidptr);
78874
78875+ gr_handle_brute_check();
78876+
78877 if (clone_flags & CLONE_VFORK) {
78878 p->vfork_done = &vfork;
78879 init_completion(&vfork);
78880@@ -1729,7 +1791,7 @@ void __init proc_caches_init(void)
78881 mm_cachep = kmem_cache_create("mm_struct",
78882 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
78883 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
78884- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
78885+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
78886 mmap_init();
78887 nsproxy_cache_init();
78888 }
78889@@ -1769,7 +1831,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
78890 return 0;
78891
78892 /* don't need lock here; in the worst case we'll do useless copy */
78893- if (fs->users == 1)
78894+ if (atomic_read(&fs->users) == 1)
78895 return 0;
78896
78897 *new_fsp = copy_fs_struct(fs);
78898@@ -1881,7 +1943,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
78899 fs = current->fs;
78900 spin_lock(&fs->lock);
78901 current->fs = new_fs;
78902- if (--fs->users)
78903+ gr_set_chroot_entries(current, &current->fs->root);
78904+ if (atomic_dec_return(&fs->users))
78905 new_fs = NULL;
78906 else
78907 new_fs = fs;
78908diff --git a/kernel/futex.c b/kernel/futex.c
78909index 49dacfb..5c6b450 100644
78910--- a/kernel/futex.c
78911+++ b/kernel/futex.c
78912@@ -54,6 +54,7 @@
78913 #include <linux/mount.h>
78914 #include <linux/pagemap.h>
78915 #include <linux/syscalls.h>
78916+#include <linux/ptrace.h>
78917 #include <linux/signal.h>
78918 #include <linux/export.h>
78919 #include <linux/magic.h>
78920@@ -242,6 +243,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
78921 struct page *page, *page_head;
78922 int err, ro = 0;
78923
78924+#ifdef CONFIG_PAX_SEGMEXEC
78925+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
78926+ return -EFAULT;
78927+#endif
78928+
78929 /*
78930 * The futex address must be "naturally" aligned.
78931 */
78932@@ -2733,6 +2739,7 @@ static int __init futex_init(void)
78933 {
78934 u32 curval;
78935 int i;
78936+ mm_segment_t oldfs;
78937
78938 /*
78939 * This will fail and we want it. Some arch implementations do
78940@@ -2744,8 +2751,11 @@ static int __init futex_init(void)
78941 * implementation, the non-functional ones will return
78942 * -ENOSYS.
78943 */
78944+ oldfs = get_fs();
78945+ set_fs(USER_DS);
78946 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
78947 futex_cmpxchg_enabled = 1;
78948+ set_fs(oldfs);
78949
78950 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
78951 plist_head_init(&futex_queues[i].chain);
78952diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
78953index f9f44fd..29885e4 100644
78954--- a/kernel/futex_compat.c
78955+++ b/kernel/futex_compat.c
78956@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
78957 return 0;
78958 }
78959
78960-static void __user *futex_uaddr(struct robust_list __user *entry,
78961+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
78962 compat_long_t futex_offset)
78963 {
78964 compat_uptr_t base = ptr_to_compat(entry);
78965diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
78966index 9b22d03..6295b62 100644
78967--- a/kernel/gcov/base.c
78968+++ b/kernel/gcov/base.c
78969@@ -102,11 +102,6 @@ void gcov_enable_events(void)
78970 }
78971
78972 #ifdef CONFIG_MODULES
78973-static inline int within(void *addr, void *start, unsigned long size)
78974-{
78975- return ((addr >= start) && (addr < start + size));
78976-}
78977-
78978 /* Update list and generate events when modules are unloaded. */
78979 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
78980 void *data)
78981@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
78982 prev = NULL;
78983 /* Remove entries located in module from linked list. */
78984 for (info = gcov_info_head; info; info = info->next) {
78985- if (within(info, mod->module_core, mod->core_size)) {
78986+ if (within_module_core_rw((unsigned long)info, mod)) {
78987 if (prev)
78988 prev->next = info->next;
78989 else
78990diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
78991index 2288fbd..0f3941f 100644
78992--- a/kernel/hrtimer.c
78993+++ b/kernel/hrtimer.c
78994@@ -1435,7 +1435,7 @@ void hrtimer_peek_ahead_timers(void)
78995 local_irq_restore(flags);
78996 }
78997
78998-static void run_hrtimer_softirq(struct softirq_action *h)
78999+static void run_hrtimer_softirq(void)
79000 {
79001 hrtimer_peek_ahead_timers();
79002 }
79003@@ -1770,7 +1770,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
79004 return NOTIFY_OK;
79005 }
79006
79007-static struct notifier_block __cpuinitdata hrtimers_nb = {
79008+static struct notifier_block hrtimers_nb = {
79009 .notifier_call = hrtimer_cpu_notify,
79010 };
79011
79012diff --git a/kernel/irq_work.c b/kernel/irq_work.c
79013index 55fcce6..0e4cf34 100644
79014--- a/kernel/irq_work.c
79015+++ b/kernel/irq_work.c
79016@@ -189,12 +189,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
79017 return NOTIFY_OK;
79018 }
79019
79020-static struct notifier_block cpu_notify;
79021+static struct notifier_block cpu_notify = {
79022+ .notifier_call = irq_work_cpu_notify,
79023+ .priority = 0,
79024+};
79025
79026 static __init int irq_work_init_cpu_notifier(void)
79027 {
79028- cpu_notify.notifier_call = irq_work_cpu_notify;
79029- cpu_notify.priority = 0;
79030 register_cpu_notifier(&cpu_notify);
79031 return 0;
79032 }
79033diff --git a/kernel/jump_label.c b/kernel/jump_label.c
79034index 60f48fa..7f3a770 100644
79035--- a/kernel/jump_label.c
79036+++ b/kernel/jump_label.c
79037@@ -13,6 +13,7 @@
79038 #include <linux/sort.h>
79039 #include <linux/err.h>
79040 #include <linux/static_key.h>
79041+#include <linux/mm.h>
79042
79043 #ifdef HAVE_JUMP_LABEL
79044
79045@@ -50,7 +51,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
79046
79047 size = (((unsigned long)stop - (unsigned long)start)
79048 / sizeof(struct jump_entry));
79049+ pax_open_kernel();
79050 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
79051+ pax_close_kernel();
79052 }
79053
79054 static void jump_label_update(struct static_key *key, int enable);
79055@@ -357,10 +360,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
79056 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
79057 struct jump_entry *iter;
79058
79059+ pax_open_kernel();
79060 for (iter = iter_start; iter < iter_stop; iter++) {
79061 if (within_module_init(iter->code, mod))
79062 iter->code = 0;
79063 }
79064+ pax_close_kernel();
79065 }
79066
79067 static int
79068diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
79069index 3127ad5..159d880 100644
79070--- a/kernel/kallsyms.c
79071+++ b/kernel/kallsyms.c
79072@@ -11,6 +11,9 @@
79073 * Changed the compression method from stem compression to "table lookup"
79074 * compression (see scripts/kallsyms.c for a more complete description)
79075 */
79076+#ifdef CONFIG_GRKERNSEC_HIDESYM
79077+#define __INCLUDED_BY_HIDESYM 1
79078+#endif
79079 #include <linux/kallsyms.h>
79080 #include <linux/module.h>
79081 #include <linux/init.h>
79082@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
79083
79084 static inline int is_kernel_inittext(unsigned long addr)
79085 {
79086+ if (system_state != SYSTEM_BOOTING)
79087+ return 0;
79088+
79089 if (addr >= (unsigned long)_sinittext
79090 && addr <= (unsigned long)_einittext)
79091 return 1;
79092 return 0;
79093 }
79094
79095+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
79096+#ifdef CONFIG_MODULES
79097+static inline int is_module_text(unsigned long addr)
79098+{
79099+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
79100+ return 1;
79101+
79102+ addr = ktla_ktva(addr);
79103+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
79104+}
79105+#else
79106+static inline int is_module_text(unsigned long addr)
79107+{
79108+ return 0;
79109+}
79110+#endif
79111+#endif
79112+
79113 static inline int is_kernel_text(unsigned long addr)
79114 {
79115 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
79116@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
79117
79118 static inline int is_kernel(unsigned long addr)
79119 {
79120+
79121+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
79122+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
79123+ return 1;
79124+
79125+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
79126+#else
79127 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
79128+#endif
79129+
79130 return 1;
79131 return in_gate_area_no_mm(addr);
79132 }
79133
79134 static int is_ksym_addr(unsigned long addr)
79135 {
79136+
79137+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
79138+ if (is_module_text(addr))
79139+ return 0;
79140+#endif
79141+
79142 if (all_var)
79143 return is_kernel(addr);
79144
79145@@ -480,7 +519,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
79146
79147 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
79148 {
79149- iter->name[0] = '\0';
79150 iter->nameoff = get_symbol_offset(new_pos);
79151 iter->pos = new_pos;
79152 }
79153@@ -528,6 +566,11 @@ static int s_show(struct seq_file *m, void *p)
79154 {
79155 struct kallsym_iter *iter = m->private;
79156
79157+#ifdef CONFIG_GRKERNSEC_HIDESYM
79158+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
79159+ return 0;
79160+#endif
79161+
79162 /* Some debugging symbols have no name. Ignore them. */
79163 if (!iter->name[0])
79164 return 0;
79165@@ -541,6 +584,7 @@ static int s_show(struct seq_file *m, void *p)
79166 */
79167 type = iter->exported ? toupper(iter->type) :
79168 tolower(iter->type);
79169+
79170 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
79171 type, iter->name, iter->module_name);
79172 } else
79173@@ -566,7 +610,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
79174 struct kallsym_iter *iter;
79175 int ret;
79176
79177- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
79178+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
79179 if (!iter)
79180 return -ENOMEM;
79181 reset_iter(iter, 0);
79182diff --git a/kernel/kcmp.c b/kernel/kcmp.c
79183index e30ac0f..3528cac 100644
79184--- a/kernel/kcmp.c
79185+++ b/kernel/kcmp.c
79186@@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
79187 struct task_struct *task1, *task2;
79188 int ret;
79189
79190+#ifdef CONFIG_GRKERNSEC
79191+ return -ENOSYS;
79192+#endif
79193+
79194 rcu_read_lock();
79195
79196 /*
79197diff --git a/kernel/kexec.c b/kernel/kexec.c
79198index 59f7b55..4022f65 100644
79199--- a/kernel/kexec.c
79200+++ b/kernel/kexec.c
79201@@ -1041,7 +1041,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
79202 unsigned long flags)
79203 {
79204 struct compat_kexec_segment in;
79205- struct kexec_segment out, __user *ksegments;
79206+ struct kexec_segment out;
79207+ struct kexec_segment __user *ksegments;
79208 unsigned long i, result;
79209
79210 /* Don't allow clients that don't understand the native
79211diff --git a/kernel/kmod.c b/kernel/kmod.c
79212index 8241906..d625f2c 100644
79213--- a/kernel/kmod.c
79214+++ b/kernel/kmod.c
79215@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
79216 kfree(info->argv);
79217 }
79218
79219-static int call_modprobe(char *module_name, int wait)
79220+static int call_modprobe(char *module_name, char *module_param, int wait)
79221 {
79222 struct subprocess_info *info;
79223 static char *envp[] = {
79224@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
79225 NULL
79226 };
79227
79228- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
79229+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
79230 if (!argv)
79231 goto out;
79232
79233@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
79234 argv[1] = "-q";
79235 argv[2] = "--";
79236 argv[3] = module_name; /* check free_modprobe_argv() */
79237- argv[4] = NULL;
79238+ argv[4] = module_param;
79239+ argv[5] = NULL;
79240
79241 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
79242 NULL, free_modprobe_argv, NULL);
79243@@ -129,9 +130,8 @@ out:
79244 * If module auto-loading support is disabled then this function
79245 * becomes a no-operation.
79246 */
79247-int __request_module(bool wait, const char *fmt, ...)
79248+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
79249 {
79250- va_list args;
79251 char module_name[MODULE_NAME_LEN];
79252 unsigned int max_modprobes;
79253 int ret;
79254@@ -147,9 +147,7 @@ int __request_module(bool wait, const char *fmt, ...)
79255 */
79256 WARN_ON_ONCE(wait && current_is_async());
79257
79258- va_start(args, fmt);
79259- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
79260- va_end(args);
79261+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
79262 if (ret >= MODULE_NAME_LEN)
79263 return -ENAMETOOLONG;
79264
79265@@ -157,6 +155,20 @@ int __request_module(bool wait, const char *fmt, ...)
79266 if (ret)
79267 return ret;
79268
79269+#ifdef CONFIG_GRKERNSEC_MODHARDEN
79270+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
79271+ /* hack to workaround consolekit/udisks stupidity */
79272+ read_lock(&tasklist_lock);
79273+ if (!strcmp(current->comm, "mount") &&
79274+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
79275+ read_unlock(&tasklist_lock);
79276+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
79277+ return -EPERM;
79278+ }
79279+ read_unlock(&tasklist_lock);
79280+ }
79281+#endif
79282+
79283 /* If modprobe needs a service that is in a module, we get a recursive
79284 * loop. Limit the number of running kmod threads to max_threads/2 or
79285 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
79286@@ -185,11 +197,52 @@ int __request_module(bool wait, const char *fmt, ...)
79287
79288 trace_module_request(module_name, wait, _RET_IP_);
79289
79290- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
79291+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
79292
79293 atomic_dec(&kmod_concurrent);
79294 return ret;
79295 }
79296+
79297+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
79298+{
79299+ va_list args;
79300+ int ret;
79301+
79302+ va_start(args, fmt);
79303+ ret = ____request_module(wait, module_param, fmt, args);
79304+ va_end(args);
79305+
79306+ return ret;
79307+}
79308+
79309+int __request_module(bool wait, const char *fmt, ...)
79310+{
79311+ va_list args;
79312+ int ret;
79313+
79314+#ifdef CONFIG_GRKERNSEC_MODHARDEN
79315+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
79316+ char module_param[MODULE_NAME_LEN];
79317+
79318+ memset(module_param, 0, sizeof(module_param));
79319+
79320+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
79321+
79322+ va_start(args, fmt);
79323+ ret = ____request_module(wait, module_param, fmt, args);
79324+ va_end(args);
79325+
79326+ return ret;
79327+ }
79328+#endif
79329+
79330+ va_start(args, fmt);
79331+ ret = ____request_module(wait, NULL, fmt, args);
79332+ va_end(args);
79333+
79334+ return ret;
79335+}
79336+
79337 EXPORT_SYMBOL(__request_module);
79338 #endif /* CONFIG_MODULES */
79339
79340@@ -300,7 +353,7 @@ static int wait_for_helper(void *data)
79341 *
79342 * Thus the __user pointer cast is valid here.
79343 */
79344- sys_wait4(pid, (int __user *)&ret, 0, NULL);
79345+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
79346
79347 /*
79348 * If ret is 0, either ____call_usermodehelper failed and the
79349@@ -651,7 +704,7 @@ EXPORT_SYMBOL(call_usermodehelper);
79350 static int proc_cap_handler(struct ctl_table *table, int write,
79351 void __user *buffer, size_t *lenp, loff_t *ppos)
79352 {
79353- struct ctl_table t;
79354+ ctl_table_no_const t;
79355 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
79356 kernel_cap_t new_cap;
79357 int err, i;
79358diff --git a/kernel/kprobes.c b/kernel/kprobes.c
79359index bddf3b2..233bf40 100644
79360--- a/kernel/kprobes.c
79361+++ b/kernel/kprobes.c
79362@@ -31,6 +31,9 @@
79363 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
79364 * <prasanna@in.ibm.com> added function-return probes.
79365 */
79366+#ifdef CONFIG_GRKERNSEC_HIDESYM
79367+#define __INCLUDED_BY_HIDESYM 1
79368+#endif
79369 #include <linux/kprobes.h>
79370 #include <linux/hash.h>
79371 #include <linux/init.h>
79372@@ -185,7 +188,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
79373 * kernel image and loaded module images reside. This is required
79374 * so x86_64 can correctly handle the %rip-relative fixups.
79375 */
79376- kip->insns = module_alloc(PAGE_SIZE);
79377+ kip->insns = module_alloc_exec(PAGE_SIZE);
79378 if (!kip->insns) {
79379 kfree(kip);
79380 return NULL;
79381@@ -225,7 +228,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
79382 */
79383 if (!list_is_singular(&kip->list)) {
79384 list_del(&kip->list);
79385- module_free(NULL, kip->insns);
79386+ module_free_exec(NULL, kip->insns);
79387 kfree(kip);
79388 }
79389 return 1;
79390@@ -2083,7 +2086,7 @@ static int __init init_kprobes(void)
79391 {
79392 int i, err = 0;
79393 unsigned long offset = 0, size = 0;
79394- char *modname, namebuf[128];
79395+ char *modname, namebuf[KSYM_NAME_LEN];
79396 const char *symbol_name;
79397 void *addr;
79398 struct kprobe_blackpoint *kb;
79399@@ -2168,11 +2171,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
79400 kprobe_type = "k";
79401
79402 if (sym)
79403- seq_printf(pi, "%p %s %s+0x%x %s ",
79404+ seq_printf(pi, "%pK %s %s+0x%x %s ",
79405 p->addr, kprobe_type, sym, offset,
79406 (modname ? modname : " "));
79407 else
79408- seq_printf(pi, "%p %s %p ",
79409+ seq_printf(pi, "%pK %s %pK ",
79410 p->addr, kprobe_type, p->addr);
79411
79412 if (!pp)
79413@@ -2209,7 +2212,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
79414 const char *sym = NULL;
79415 unsigned int i = *(loff_t *) v;
79416 unsigned long offset = 0;
79417- char *modname, namebuf[128];
79418+ char *modname, namebuf[KSYM_NAME_LEN];
79419
79420 head = &kprobe_table[i];
79421 preempt_disable();
79422diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
79423index 6ada93c..dce7d5d 100644
79424--- a/kernel/ksysfs.c
79425+++ b/kernel/ksysfs.c
79426@@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
79427 {
79428 if (count+1 > UEVENT_HELPER_PATH_LEN)
79429 return -ENOENT;
79430+ if (!capable(CAP_SYS_ADMIN))
79431+ return -EPERM;
79432 memcpy(uevent_helper, buf, count);
79433 uevent_helper[count] = '\0';
79434 if (count && uevent_helper[count-1] == '\n')
79435@@ -172,7 +174,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
79436 return count;
79437 }
79438
79439-static struct bin_attribute notes_attr = {
79440+static bin_attribute_no_const notes_attr __read_only = {
79441 .attr = {
79442 .name = "notes",
79443 .mode = S_IRUGO,
79444diff --git a/kernel/lockdep.c b/kernel/lockdep.c
79445index 1f3186b..bb7dbc6 100644
79446--- a/kernel/lockdep.c
79447+++ b/kernel/lockdep.c
79448@@ -596,6 +596,10 @@ static int static_obj(void *obj)
79449 end = (unsigned long) &_end,
79450 addr = (unsigned long) obj;
79451
79452+#ifdef CONFIG_PAX_KERNEXEC
79453+ start = ktla_ktva(start);
79454+#endif
79455+
79456 /*
79457 * static variable?
79458 */
79459@@ -736,6 +740,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
79460 if (!static_obj(lock->key)) {
79461 debug_locks_off();
79462 printk("INFO: trying to register non-static key.\n");
79463+ printk("lock:%pS key:%pS.\n", lock, lock->key);
79464 printk("the code is fine but needs lockdep annotation.\n");
79465 printk("turning off the locking correctness validator.\n");
79466 dump_stack();
79467@@ -3080,7 +3085,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
79468 if (!class)
79469 return 0;
79470 }
79471- atomic_inc((atomic_t *)&class->ops);
79472+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
79473 if (very_verbose(class)) {
79474 printk("\nacquire class [%p] %s", class->key, class->name);
79475 if (class->name_version > 1)
79476diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
79477index b2c71c5..7b88d63 100644
79478--- a/kernel/lockdep_proc.c
79479+++ b/kernel/lockdep_proc.c
79480@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
79481 return 0;
79482 }
79483
79484- seq_printf(m, "%p", class->key);
79485+ seq_printf(m, "%pK", class->key);
79486 #ifdef CONFIG_DEBUG_LOCKDEP
79487 seq_printf(m, " OPS:%8ld", class->ops);
79488 #endif
79489@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
79490
79491 list_for_each_entry(entry, &class->locks_after, entry) {
79492 if (entry->distance == 1) {
79493- seq_printf(m, " -> [%p] ", entry->class->key);
79494+ seq_printf(m, " -> [%pK] ", entry->class->key);
79495 print_name(m, entry->class);
79496 seq_puts(m, "\n");
79497 }
79498@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
79499 if (!class->key)
79500 continue;
79501
79502- seq_printf(m, "[%p] ", class->key);
79503+ seq_printf(m, "[%pK] ", class->key);
79504 print_name(m, class);
79505 seq_puts(m, "\n");
79506 }
79507@@ -495,7 +495,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
79508 if (!i)
79509 seq_line(m, '-', 40-namelen, namelen);
79510
79511- snprintf(ip, sizeof(ip), "[<%p>]",
79512+ snprintf(ip, sizeof(ip), "[<%pK>]",
79513 (void *)class->contention_point[i]);
79514 seq_printf(m, "%40s %14lu %29s %pS\n",
79515 name, stats->contention_point[i],
79516@@ -510,7 +510,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
79517 if (!i)
79518 seq_line(m, '-', 40-namelen, namelen);
79519
79520- snprintf(ip, sizeof(ip), "[<%p>]",
79521+ snprintf(ip, sizeof(ip), "[<%pK>]",
79522 (void *)class->contending_point[i]);
79523 seq_printf(m, "%40s %14lu %29s %pS\n",
79524 name, stats->contending_point[i],
79525diff --git a/kernel/module.c b/kernel/module.c
79526index fa53db8..6f17200 100644
79527--- a/kernel/module.c
79528+++ b/kernel/module.c
79529@@ -61,6 +61,7 @@
79530 #include <linux/pfn.h>
79531 #include <linux/bsearch.h>
79532 #include <linux/fips.h>
79533+#include <linux/grsecurity.h>
79534 #include <uapi/linux/module.h>
79535 #include "module-internal.h"
79536
79537@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
79538
79539 /* Bounds of module allocation, for speeding __module_address.
79540 * Protected by module_mutex. */
79541-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
79542+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
79543+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
79544
79545 int register_module_notifier(struct notifier_block * nb)
79546 {
79547@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
79548 return true;
79549
79550 list_for_each_entry_rcu(mod, &modules, list) {
79551- struct symsearch arr[] = {
79552+ struct symsearch modarr[] = {
79553 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
79554 NOT_GPL_ONLY, false },
79555 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
79556@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
79557 if (mod->state == MODULE_STATE_UNFORMED)
79558 continue;
79559
79560- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
79561+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
79562 return true;
79563 }
79564 return false;
79565@@ -485,7 +487,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
79566 static int percpu_modalloc(struct module *mod,
79567 unsigned long size, unsigned long align)
79568 {
79569- if (align > PAGE_SIZE) {
79570+ if (align-1 >= PAGE_SIZE) {
79571 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
79572 mod->name, align, PAGE_SIZE);
79573 align = PAGE_SIZE;
79574@@ -1089,7 +1091,7 @@ struct module_attribute module_uevent =
79575 static ssize_t show_coresize(struct module_attribute *mattr,
79576 struct module_kobject *mk, char *buffer)
79577 {
79578- return sprintf(buffer, "%u\n", mk->mod->core_size);
79579+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
79580 }
79581
79582 static struct module_attribute modinfo_coresize =
79583@@ -1098,7 +1100,7 @@ static struct module_attribute modinfo_coresize =
79584 static ssize_t show_initsize(struct module_attribute *mattr,
79585 struct module_kobject *mk, char *buffer)
79586 {
79587- return sprintf(buffer, "%u\n", mk->mod->init_size);
79588+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
79589 }
79590
79591 static struct module_attribute modinfo_initsize =
79592@@ -1313,7 +1315,7 @@ resolve_symbol_wait(struct module *mod,
79593 */
79594 #ifdef CONFIG_SYSFS
79595
79596-#ifdef CONFIG_KALLSYMS
79597+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
79598 static inline bool sect_empty(const Elf_Shdr *sect)
79599 {
79600 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
79601@@ -1453,7 +1455,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
79602 {
79603 unsigned int notes, loaded, i;
79604 struct module_notes_attrs *notes_attrs;
79605- struct bin_attribute *nattr;
79606+ bin_attribute_no_const *nattr;
79607
79608 /* failed to create section attributes, so can't create notes */
79609 if (!mod->sect_attrs)
79610@@ -1565,7 +1567,7 @@ static void del_usage_links(struct module *mod)
79611 static int module_add_modinfo_attrs(struct module *mod)
79612 {
79613 struct module_attribute *attr;
79614- struct module_attribute *temp_attr;
79615+ module_attribute_no_const *temp_attr;
79616 int error = 0;
79617 int i;
79618
79619@@ -1779,21 +1781,21 @@ static void set_section_ro_nx(void *base,
79620
79621 static void unset_module_core_ro_nx(struct module *mod)
79622 {
79623- set_page_attributes(mod->module_core + mod->core_text_size,
79624- mod->module_core + mod->core_size,
79625+ set_page_attributes(mod->module_core_rw,
79626+ mod->module_core_rw + mod->core_size_rw,
79627 set_memory_x);
79628- set_page_attributes(mod->module_core,
79629- mod->module_core + mod->core_ro_size,
79630+ set_page_attributes(mod->module_core_rx,
79631+ mod->module_core_rx + mod->core_size_rx,
79632 set_memory_rw);
79633 }
79634
79635 static void unset_module_init_ro_nx(struct module *mod)
79636 {
79637- set_page_attributes(mod->module_init + mod->init_text_size,
79638- mod->module_init + mod->init_size,
79639+ set_page_attributes(mod->module_init_rw,
79640+ mod->module_init_rw + mod->init_size_rw,
79641 set_memory_x);
79642- set_page_attributes(mod->module_init,
79643- mod->module_init + mod->init_ro_size,
79644+ set_page_attributes(mod->module_init_rx,
79645+ mod->module_init_rx + mod->init_size_rx,
79646 set_memory_rw);
79647 }
79648
79649@@ -1806,14 +1808,14 @@ void set_all_modules_text_rw(void)
79650 list_for_each_entry_rcu(mod, &modules, list) {
79651 if (mod->state == MODULE_STATE_UNFORMED)
79652 continue;
79653- if ((mod->module_core) && (mod->core_text_size)) {
79654- set_page_attributes(mod->module_core,
79655- mod->module_core + mod->core_text_size,
79656+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
79657+ set_page_attributes(mod->module_core_rx,
79658+ mod->module_core_rx + mod->core_size_rx,
79659 set_memory_rw);
79660 }
79661- if ((mod->module_init) && (mod->init_text_size)) {
79662- set_page_attributes(mod->module_init,
79663- mod->module_init + mod->init_text_size,
79664+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
79665+ set_page_attributes(mod->module_init_rx,
79666+ mod->module_init_rx + mod->init_size_rx,
79667 set_memory_rw);
79668 }
79669 }
79670@@ -1829,14 +1831,14 @@ void set_all_modules_text_ro(void)
79671 list_for_each_entry_rcu(mod, &modules, list) {
79672 if (mod->state == MODULE_STATE_UNFORMED)
79673 continue;
79674- if ((mod->module_core) && (mod->core_text_size)) {
79675- set_page_attributes(mod->module_core,
79676- mod->module_core + mod->core_text_size,
79677+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
79678+ set_page_attributes(mod->module_core_rx,
79679+ mod->module_core_rx + mod->core_size_rx,
79680 set_memory_ro);
79681 }
79682- if ((mod->module_init) && (mod->init_text_size)) {
79683- set_page_attributes(mod->module_init,
79684- mod->module_init + mod->init_text_size,
79685+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
79686+ set_page_attributes(mod->module_init_rx,
79687+ mod->module_init_rx + mod->init_size_rx,
79688 set_memory_ro);
79689 }
79690 }
79691@@ -1887,16 +1889,19 @@ static void free_module(struct module *mod)
79692
79693 /* This may be NULL, but that's OK */
79694 unset_module_init_ro_nx(mod);
79695- module_free(mod, mod->module_init);
79696+ module_free(mod, mod->module_init_rw);
79697+ module_free_exec(mod, mod->module_init_rx);
79698 kfree(mod->args);
79699 percpu_modfree(mod);
79700
79701 /* Free lock-classes: */
79702- lockdep_free_key_range(mod->module_core, mod->core_size);
79703+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
79704+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
79705
79706 /* Finally, free the core (containing the module structure) */
79707 unset_module_core_ro_nx(mod);
79708- module_free(mod, mod->module_core);
79709+ module_free_exec(mod, mod->module_core_rx);
79710+ module_free(mod, mod->module_core_rw);
79711
79712 #ifdef CONFIG_MPU
79713 update_protections(current->mm);
79714@@ -1966,9 +1971,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
79715 int ret = 0;
79716 const struct kernel_symbol *ksym;
79717
79718+#ifdef CONFIG_GRKERNSEC_MODHARDEN
79719+ int is_fs_load = 0;
79720+ int register_filesystem_found = 0;
79721+ char *p;
79722+
79723+ p = strstr(mod->args, "grsec_modharden_fs");
79724+ if (p) {
79725+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
79726+ /* copy \0 as well */
79727+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
79728+ is_fs_load = 1;
79729+ }
79730+#endif
79731+
79732 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
79733 const char *name = info->strtab + sym[i].st_name;
79734
79735+#ifdef CONFIG_GRKERNSEC_MODHARDEN
79736+ /* it's a real shame this will never get ripped and copied
79737+ upstream! ;(
79738+ */
79739+ if (is_fs_load && !strcmp(name, "register_filesystem"))
79740+ register_filesystem_found = 1;
79741+#endif
79742+
79743 switch (sym[i].st_shndx) {
79744 case SHN_COMMON:
79745 /* We compiled with -fno-common. These are not
79746@@ -1989,7 +2016,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
79747 ksym = resolve_symbol_wait(mod, info, name);
79748 /* Ok if resolved. */
79749 if (ksym && !IS_ERR(ksym)) {
79750+ pax_open_kernel();
79751 sym[i].st_value = ksym->value;
79752+ pax_close_kernel();
79753 break;
79754 }
79755
79756@@ -2008,11 +2037,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
79757 secbase = (unsigned long)mod_percpu(mod);
79758 else
79759 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
79760+ pax_open_kernel();
79761 sym[i].st_value += secbase;
79762+ pax_close_kernel();
79763 break;
79764 }
79765 }
79766
79767+#ifdef CONFIG_GRKERNSEC_MODHARDEN
79768+ if (is_fs_load && !register_filesystem_found) {
79769+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
79770+ ret = -EPERM;
79771+ }
79772+#endif
79773+
79774 return ret;
79775 }
79776
79777@@ -2096,22 +2134,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
79778 || s->sh_entsize != ~0UL
79779 || strstarts(sname, ".init"))
79780 continue;
79781- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
79782+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
79783+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
79784+ else
79785+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
79786 pr_debug("\t%s\n", sname);
79787 }
79788- switch (m) {
79789- case 0: /* executable */
79790- mod->core_size = debug_align(mod->core_size);
79791- mod->core_text_size = mod->core_size;
79792- break;
79793- case 1: /* RO: text and ro-data */
79794- mod->core_size = debug_align(mod->core_size);
79795- mod->core_ro_size = mod->core_size;
79796- break;
79797- case 3: /* whole core */
79798- mod->core_size = debug_align(mod->core_size);
79799- break;
79800- }
79801 }
79802
79803 pr_debug("Init section allocation order:\n");
79804@@ -2125,23 +2153,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
79805 || s->sh_entsize != ~0UL
79806 || !strstarts(sname, ".init"))
79807 continue;
79808- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
79809- | INIT_OFFSET_MASK);
79810+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
79811+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
79812+ else
79813+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
79814+ s->sh_entsize |= INIT_OFFSET_MASK;
79815 pr_debug("\t%s\n", sname);
79816 }
79817- switch (m) {
79818- case 0: /* executable */
79819- mod->init_size = debug_align(mod->init_size);
79820- mod->init_text_size = mod->init_size;
79821- break;
79822- case 1: /* RO: text and ro-data */
79823- mod->init_size = debug_align(mod->init_size);
79824- mod->init_ro_size = mod->init_size;
79825- break;
79826- case 3: /* whole init */
79827- mod->init_size = debug_align(mod->init_size);
79828- break;
79829- }
79830 }
79831 }
79832
79833@@ -2314,7 +2332,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
79834
79835 /* Put symbol section at end of init part of module. */
79836 symsect->sh_flags |= SHF_ALLOC;
79837- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
79838+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
79839 info->index.sym) | INIT_OFFSET_MASK;
79840 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
79841
79842@@ -2331,13 +2349,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
79843 }
79844
79845 /* Append room for core symbols at end of core part. */
79846- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
79847- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
79848- mod->core_size += strtab_size;
79849+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
79850+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
79851+ mod->core_size_rx += strtab_size;
79852
79853 /* Put string table section at end of init part of module. */
79854 strsect->sh_flags |= SHF_ALLOC;
79855- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
79856+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
79857 info->index.str) | INIT_OFFSET_MASK;
79858 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
79859 }
79860@@ -2355,12 +2373,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
79861 /* Make sure we get permanent strtab: don't use info->strtab. */
79862 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
79863
79864+ pax_open_kernel();
79865+
79866 /* Set types up while we still have access to sections. */
79867 for (i = 0; i < mod->num_symtab; i++)
79868 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
79869
79870- mod->core_symtab = dst = mod->module_core + info->symoffs;
79871- mod->core_strtab = s = mod->module_core + info->stroffs;
79872+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
79873+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
79874 src = mod->symtab;
79875 for (ndst = i = 0; i < mod->num_symtab; i++) {
79876 if (i == 0 ||
79877@@ -2372,6 +2392,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
79878 }
79879 }
79880 mod->core_num_syms = ndst;
79881+
79882+ pax_close_kernel();
79883 }
79884 #else
79885 static inline void layout_symtab(struct module *mod, struct load_info *info)
79886@@ -2405,17 +2427,33 @@ void * __weak module_alloc(unsigned long size)
79887 return vmalloc_exec(size);
79888 }
79889
79890-static void *module_alloc_update_bounds(unsigned long size)
79891+static void *module_alloc_update_bounds_rw(unsigned long size)
79892 {
79893 void *ret = module_alloc(size);
79894
79895 if (ret) {
79896 mutex_lock(&module_mutex);
79897 /* Update module bounds. */
79898- if ((unsigned long)ret < module_addr_min)
79899- module_addr_min = (unsigned long)ret;
79900- if ((unsigned long)ret + size > module_addr_max)
79901- module_addr_max = (unsigned long)ret + size;
79902+ if ((unsigned long)ret < module_addr_min_rw)
79903+ module_addr_min_rw = (unsigned long)ret;
79904+ if ((unsigned long)ret + size > module_addr_max_rw)
79905+ module_addr_max_rw = (unsigned long)ret + size;
79906+ mutex_unlock(&module_mutex);
79907+ }
79908+ return ret;
79909+}
79910+
79911+static void *module_alloc_update_bounds_rx(unsigned long size)
79912+{
79913+ void *ret = module_alloc_exec(size);
79914+
79915+ if (ret) {
79916+ mutex_lock(&module_mutex);
79917+ /* Update module bounds. */
79918+ if ((unsigned long)ret < module_addr_min_rx)
79919+ module_addr_min_rx = (unsigned long)ret;
79920+ if ((unsigned long)ret + size > module_addr_max_rx)
79921+ module_addr_max_rx = (unsigned long)ret + size;
79922 mutex_unlock(&module_mutex);
79923 }
79924 return ret;
79925@@ -2691,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
79926 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
79927 {
79928 const char *modmagic = get_modinfo(info, "vermagic");
79929+ const char *license = get_modinfo(info, "license");
79930 int err;
79931
79932+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
79933+ if (!license || !license_is_gpl_compatible(license))
79934+ return -ENOEXEC;
79935+#endif
79936+
79937 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
79938 modmagic = NULL;
79939
79940@@ -2718,7 +2762,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
79941 }
79942
79943 /* Set up license info based on the info section */
79944- set_license(mod, get_modinfo(info, "license"));
79945+ set_license(mod, license);
79946
79947 return 0;
79948 }
79949@@ -2799,7 +2843,7 @@ static int move_module(struct module *mod, struct load_info *info)
79950 void *ptr;
79951
79952 /* Do the allocs. */
79953- ptr = module_alloc_update_bounds(mod->core_size);
79954+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
79955 /*
79956 * The pointer to this block is stored in the module structure
79957 * which is inside the block. Just mark it as not being a
79958@@ -2809,11 +2853,11 @@ static int move_module(struct module *mod, struct load_info *info)
79959 if (!ptr)
79960 return -ENOMEM;
79961
79962- memset(ptr, 0, mod->core_size);
79963- mod->module_core = ptr;
79964+ memset(ptr, 0, mod->core_size_rw);
79965+ mod->module_core_rw = ptr;
79966
79967- if (mod->init_size) {
79968- ptr = module_alloc_update_bounds(mod->init_size);
79969+ if (mod->init_size_rw) {
79970+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
79971 /*
79972 * The pointer to this block is stored in the module structure
79973 * which is inside the block. This block doesn't need to be
79974@@ -2822,13 +2866,45 @@ static int move_module(struct module *mod, struct load_info *info)
79975 */
79976 kmemleak_ignore(ptr);
79977 if (!ptr) {
79978- module_free(mod, mod->module_core);
79979+ module_free(mod, mod->module_core_rw);
79980 return -ENOMEM;
79981 }
79982- memset(ptr, 0, mod->init_size);
79983- mod->module_init = ptr;
79984+ memset(ptr, 0, mod->init_size_rw);
79985+ mod->module_init_rw = ptr;
79986 } else
79987- mod->module_init = NULL;
79988+ mod->module_init_rw = NULL;
79989+
79990+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
79991+ kmemleak_not_leak(ptr);
79992+ if (!ptr) {
79993+ if (mod->module_init_rw)
79994+ module_free(mod, mod->module_init_rw);
79995+ module_free(mod, mod->module_core_rw);
79996+ return -ENOMEM;
79997+ }
79998+
79999+ pax_open_kernel();
80000+ memset(ptr, 0, mod->core_size_rx);
80001+ pax_close_kernel();
80002+ mod->module_core_rx = ptr;
80003+
80004+ if (mod->init_size_rx) {
80005+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
80006+ kmemleak_ignore(ptr);
80007+ if (!ptr && mod->init_size_rx) {
80008+ module_free_exec(mod, mod->module_core_rx);
80009+ if (mod->module_init_rw)
80010+ module_free(mod, mod->module_init_rw);
80011+ module_free(mod, mod->module_core_rw);
80012+ return -ENOMEM;
80013+ }
80014+
80015+ pax_open_kernel();
80016+ memset(ptr, 0, mod->init_size_rx);
80017+ pax_close_kernel();
80018+ mod->module_init_rx = ptr;
80019+ } else
80020+ mod->module_init_rx = NULL;
80021
80022 /* Transfer each section which specifies SHF_ALLOC */
80023 pr_debug("final section addresses:\n");
80024@@ -2839,16 +2915,45 @@ static int move_module(struct module *mod, struct load_info *info)
80025 if (!(shdr->sh_flags & SHF_ALLOC))
80026 continue;
80027
80028- if (shdr->sh_entsize & INIT_OFFSET_MASK)
80029- dest = mod->module_init
80030- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
80031- else
80032- dest = mod->module_core + shdr->sh_entsize;
80033+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
80034+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
80035+ dest = mod->module_init_rw
80036+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
80037+ else
80038+ dest = mod->module_init_rx
80039+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
80040+ } else {
80041+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
80042+ dest = mod->module_core_rw + shdr->sh_entsize;
80043+ else
80044+ dest = mod->module_core_rx + shdr->sh_entsize;
80045+ }
80046+
80047+ if (shdr->sh_type != SHT_NOBITS) {
80048+
80049+#ifdef CONFIG_PAX_KERNEXEC
80050+#ifdef CONFIG_X86_64
80051+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
80052+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
80053+#endif
80054+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
80055+ pax_open_kernel();
80056+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
80057+ pax_close_kernel();
80058+ } else
80059+#endif
80060
80061- if (shdr->sh_type != SHT_NOBITS)
80062 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
80063+ }
80064 /* Update sh_addr to point to copy in image. */
80065- shdr->sh_addr = (unsigned long)dest;
80066+
80067+#ifdef CONFIG_PAX_KERNEXEC
80068+ if (shdr->sh_flags & SHF_EXECINSTR)
80069+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
80070+ else
80071+#endif
80072+
80073+ shdr->sh_addr = (unsigned long)dest;
80074 pr_debug("\t0x%lx %s\n",
80075 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
80076 }
80077@@ -2905,12 +3010,12 @@ static void flush_module_icache(const struct module *mod)
80078 * Do it before processing of module parameters, so the module
80079 * can provide parameter accessor functions of its own.
80080 */
80081- if (mod->module_init)
80082- flush_icache_range((unsigned long)mod->module_init,
80083- (unsigned long)mod->module_init
80084- + mod->init_size);
80085- flush_icache_range((unsigned long)mod->module_core,
80086- (unsigned long)mod->module_core + mod->core_size);
80087+ if (mod->module_init_rx)
80088+ flush_icache_range((unsigned long)mod->module_init_rx,
80089+ (unsigned long)mod->module_init_rx
80090+ + mod->init_size_rx);
80091+ flush_icache_range((unsigned long)mod->module_core_rx,
80092+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
80093
80094 set_fs(old_fs);
80095 }
80096@@ -2977,8 +3082,10 @@ static int alloc_module_percpu(struct module *mod, struct load_info *info)
80097 static void module_deallocate(struct module *mod, struct load_info *info)
80098 {
80099 percpu_modfree(mod);
80100- module_free(mod, mod->module_init);
80101- module_free(mod, mod->module_core);
80102+ module_free_exec(mod, mod->module_init_rx);
80103+ module_free_exec(mod, mod->module_core_rx);
80104+ module_free(mod, mod->module_init_rw);
80105+ module_free(mod, mod->module_core_rw);
80106 }
80107
80108 int __weak module_finalize(const Elf_Ehdr *hdr,
80109@@ -2991,7 +3098,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
80110 static int post_relocation(struct module *mod, const struct load_info *info)
80111 {
80112 /* Sort exception table now relocations are done. */
80113+ pax_open_kernel();
80114 sort_extable(mod->extable, mod->extable + mod->num_exentries);
80115+ pax_close_kernel();
80116
80117 /* Copy relocated percpu area over. */
80118 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
80119@@ -3045,16 +3154,16 @@ static int do_init_module(struct module *mod)
80120 MODULE_STATE_COMING, mod);
80121
80122 /* Set RO and NX regions for core */
80123- set_section_ro_nx(mod->module_core,
80124- mod->core_text_size,
80125- mod->core_ro_size,
80126- mod->core_size);
80127+ set_section_ro_nx(mod->module_core_rx,
80128+ mod->core_size_rx,
80129+ mod->core_size_rx,
80130+ mod->core_size_rx);
80131
80132 /* Set RO and NX regions for init */
80133- set_section_ro_nx(mod->module_init,
80134- mod->init_text_size,
80135- mod->init_ro_size,
80136- mod->init_size);
80137+ set_section_ro_nx(mod->module_init_rx,
80138+ mod->init_size_rx,
80139+ mod->init_size_rx,
80140+ mod->init_size_rx);
80141
80142 do_mod_ctors(mod);
80143 /* Start the module */
80144@@ -3116,11 +3225,12 @@ static int do_init_module(struct module *mod)
80145 mod->strtab = mod->core_strtab;
80146 #endif
80147 unset_module_init_ro_nx(mod);
80148- module_free(mod, mod->module_init);
80149- mod->module_init = NULL;
80150- mod->init_size = 0;
80151- mod->init_ro_size = 0;
80152- mod->init_text_size = 0;
80153+ module_free(mod, mod->module_init_rw);
80154+ module_free_exec(mod, mod->module_init_rx);
80155+ mod->module_init_rw = NULL;
80156+ mod->module_init_rx = NULL;
80157+ mod->init_size_rw = 0;
80158+ mod->init_size_rx = 0;
80159 mutex_unlock(&module_mutex);
80160 wake_up_all(&module_wq);
80161
80162@@ -3252,9 +3362,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
80163 if (err)
80164 goto free_unload;
80165
80166+ /* Now copy in args */
80167+ mod->args = strndup_user(uargs, ~0UL >> 1);
80168+ if (IS_ERR(mod->args)) {
80169+ err = PTR_ERR(mod->args);
80170+ goto free_unload;
80171+ }
80172+
80173 /* Set up MODINFO_ATTR fields */
80174 setup_modinfo(mod, info);
80175
80176+#ifdef CONFIG_GRKERNSEC_MODHARDEN
80177+ {
80178+ char *p, *p2;
80179+
80180+ if (strstr(mod->args, "grsec_modharden_netdev")) {
80181+ 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);
80182+ err = -EPERM;
80183+ goto free_modinfo;
80184+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
80185+ p += sizeof("grsec_modharden_normal") - 1;
80186+ p2 = strstr(p, "_");
80187+ if (p2) {
80188+ *p2 = '\0';
80189+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
80190+ *p2 = '_';
80191+ }
80192+ err = -EPERM;
80193+ goto free_modinfo;
80194+ }
80195+ }
80196+#endif
80197+
80198 /* Fix up syms, so that st_value is a pointer to location. */
80199 err = simplify_symbols(mod, info);
80200 if (err < 0)
80201@@ -3270,13 +3409,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
80202
80203 flush_module_icache(mod);
80204
80205- /* Now copy in args */
80206- mod->args = strndup_user(uargs, ~0UL >> 1);
80207- if (IS_ERR(mod->args)) {
80208- err = PTR_ERR(mod->args);
80209- goto free_arch_cleanup;
80210- }
80211-
80212 dynamic_debug_setup(info->debug, info->num_debug);
80213
80214 /* Finally it's fully formed, ready to start executing. */
80215@@ -3311,11 +3443,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
80216 ddebug_cleanup:
80217 dynamic_debug_remove(info->debug);
80218 synchronize_sched();
80219- kfree(mod->args);
80220- free_arch_cleanup:
80221 module_arch_cleanup(mod);
80222 free_modinfo:
80223 free_modinfo(mod);
80224+ kfree(mod->args);
80225 free_unload:
80226 module_unload_free(mod);
80227 unlink_mod:
80228@@ -3398,10 +3529,16 @@ static const char *get_ksymbol(struct module *mod,
80229 unsigned long nextval;
80230
80231 /* At worse, next value is at end of module */
80232- if (within_module_init(addr, mod))
80233- nextval = (unsigned long)mod->module_init+mod->init_text_size;
80234+ if (within_module_init_rx(addr, mod))
80235+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
80236+ else if (within_module_init_rw(addr, mod))
80237+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
80238+ else if (within_module_core_rx(addr, mod))
80239+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
80240+ else if (within_module_core_rw(addr, mod))
80241+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
80242 else
80243- nextval = (unsigned long)mod->module_core+mod->core_text_size;
80244+ return NULL;
80245
80246 /* Scan for closest preceding symbol, and next symbol. (ELF
80247 starts real symbols at 1). */
80248@@ -3654,7 +3791,7 @@ static int m_show(struct seq_file *m, void *p)
80249 return 0;
80250
80251 seq_printf(m, "%s %u",
80252- mod->name, mod->init_size + mod->core_size);
80253+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
80254 print_unload_info(m, mod);
80255
80256 /* Informative for users. */
80257@@ -3663,7 +3800,7 @@ static int m_show(struct seq_file *m, void *p)
80258 mod->state == MODULE_STATE_COMING ? "Loading":
80259 "Live");
80260 /* Used by oprofile and other similar tools. */
80261- seq_printf(m, " 0x%pK", mod->module_core);
80262+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
80263
80264 /* Taints info */
80265 if (mod->taints)
80266@@ -3699,7 +3836,17 @@ static const struct file_operations proc_modules_operations = {
80267
80268 static int __init proc_modules_init(void)
80269 {
80270+#ifndef CONFIG_GRKERNSEC_HIDESYM
80271+#ifdef CONFIG_GRKERNSEC_PROC_USER
80272+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
80273+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80274+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
80275+#else
80276 proc_create("modules", 0, NULL, &proc_modules_operations);
80277+#endif
80278+#else
80279+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
80280+#endif
80281 return 0;
80282 }
80283 module_init(proc_modules_init);
80284@@ -3760,14 +3907,14 @@ struct module *__module_address(unsigned long addr)
80285 {
80286 struct module *mod;
80287
80288- if (addr < module_addr_min || addr > module_addr_max)
80289+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
80290+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
80291 return NULL;
80292
80293 list_for_each_entry_rcu(mod, &modules, list) {
80294 if (mod->state == MODULE_STATE_UNFORMED)
80295 continue;
80296- if (within_module_core(addr, mod)
80297- || within_module_init(addr, mod))
80298+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
80299 return mod;
80300 }
80301 return NULL;
80302@@ -3802,11 +3949,20 @@ bool is_module_text_address(unsigned long addr)
80303 */
80304 struct module *__module_text_address(unsigned long addr)
80305 {
80306- struct module *mod = __module_address(addr);
80307+ struct module *mod;
80308+
80309+#ifdef CONFIG_X86_32
80310+ addr = ktla_ktva(addr);
80311+#endif
80312+
80313+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
80314+ return NULL;
80315+
80316+ mod = __module_address(addr);
80317+
80318 if (mod) {
80319 /* Make sure it's within the text section. */
80320- if (!within(addr, mod->module_init, mod->init_text_size)
80321- && !within(addr, mod->module_core, mod->core_text_size))
80322+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
80323 mod = NULL;
80324 }
80325 return mod;
80326diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
80327index 7e3443f..b2a1e6b 100644
80328--- a/kernel/mutex-debug.c
80329+++ b/kernel/mutex-debug.c
80330@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
80331 }
80332
80333 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
80334- struct thread_info *ti)
80335+ struct task_struct *task)
80336 {
80337 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
80338
80339 /* Mark the current thread as blocked on the lock: */
80340- ti->task->blocked_on = waiter;
80341+ task->blocked_on = waiter;
80342 }
80343
80344 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
80345- struct thread_info *ti)
80346+ struct task_struct *task)
80347 {
80348 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
80349- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
80350- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
80351- ti->task->blocked_on = NULL;
80352+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
80353+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
80354+ task->blocked_on = NULL;
80355
80356 list_del_init(&waiter->list);
80357 waiter->task = NULL;
80358diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
80359index 0799fd3..d06ae3b 100644
80360--- a/kernel/mutex-debug.h
80361+++ b/kernel/mutex-debug.h
80362@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
80363 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
80364 extern void debug_mutex_add_waiter(struct mutex *lock,
80365 struct mutex_waiter *waiter,
80366- struct thread_info *ti);
80367+ struct task_struct *task);
80368 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
80369- struct thread_info *ti);
80370+ struct task_struct *task);
80371 extern void debug_mutex_unlock(struct mutex *lock);
80372 extern void debug_mutex_init(struct mutex *lock, const char *name,
80373 struct lock_class_key *key);
80374diff --git a/kernel/mutex.c b/kernel/mutex.c
80375index ad53a66..f1bf8bc 100644
80376--- a/kernel/mutex.c
80377+++ b/kernel/mutex.c
80378@@ -134,7 +134,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
80379 node->locked = 1;
80380 return;
80381 }
80382- ACCESS_ONCE(prev->next) = node;
80383+ ACCESS_ONCE_RW(prev->next) = node;
80384 smp_wmb();
80385 /* Wait until the lock holder passes the lock down */
80386 while (!ACCESS_ONCE(node->locked))
80387@@ -155,7 +155,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
80388 while (!(next = ACCESS_ONCE(node->next)))
80389 arch_mutex_cpu_relax();
80390 }
80391- ACCESS_ONCE(next->locked) = 1;
80392+ ACCESS_ONCE_RW(next->locked) = 1;
80393 smp_wmb();
80394 }
80395
80396@@ -341,7 +341,7 @@ slowpath:
80397 spin_lock_mutex(&lock->wait_lock, flags);
80398
80399 debug_mutex_lock_common(lock, &waiter);
80400- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
80401+ debug_mutex_add_waiter(lock, &waiter, task);
80402
80403 /* add waiting tasks to the end of the waitqueue (FIFO): */
80404 list_add_tail(&waiter.list, &lock->wait_list);
80405@@ -371,8 +371,7 @@ slowpath:
80406 * TASK_UNINTERRUPTIBLE case.)
80407 */
80408 if (unlikely(signal_pending_state(state, task))) {
80409- mutex_remove_waiter(lock, &waiter,
80410- task_thread_info(task));
80411+ mutex_remove_waiter(lock, &waiter, task);
80412 mutex_release(&lock->dep_map, 1, ip);
80413 spin_unlock_mutex(&lock->wait_lock, flags);
80414
80415@@ -391,7 +390,7 @@ slowpath:
80416 done:
80417 lock_acquired(&lock->dep_map, ip);
80418 /* got the lock - rejoice! */
80419- mutex_remove_waiter(lock, &waiter, current_thread_info());
80420+ mutex_remove_waiter(lock, &waiter, task);
80421 mutex_set_owner(lock);
80422
80423 /* set it to 0 if there are no waiters left: */
80424diff --git a/kernel/notifier.c b/kernel/notifier.c
80425index 2d5cc4c..d9ea600 100644
80426--- a/kernel/notifier.c
80427+++ b/kernel/notifier.c
80428@@ -5,6 +5,7 @@
80429 #include <linux/rcupdate.h>
80430 #include <linux/vmalloc.h>
80431 #include <linux/reboot.h>
80432+#include <linux/mm.h>
80433
80434 /*
80435 * Notifier list for kernel code which wants to be called
80436@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
80437 while ((*nl) != NULL) {
80438 if (n->priority > (*nl)->priority)
80439 break;
80440- nl = &((*nl)->next);
80441+ nl = (struct notifier_block **)&((*nl)->next);
80442 }
80443- n->next = *nl;
80444+ pax_open_kernel();
80445+ *(const void **)&n->next = *nl;
80446 rcu_assign_pointer(*nl, n);
80447+ pax_close_kernel();
80448 return 0;
80449 }
80450
80451@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
80452 return 0;
80453 if (n->priority > (*nl)->priority)
80454 break;
80455- nl = &((*nl)->next);
80456+ nl = (struct notifier_block **)&((*nl)->next);
80457 }
80458- n->next = *nl;
80459+ pax_open_kernel();
80460+ *(const void **)&n->next = *nl;
80461 rcu_assign_pointer(*nl, n);
80462+ pax_close_kernel();
80463 return 0;
80464 }
80465
80466@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
80467 {
80468 while ((*nl) != NULL) {
80469 if ((*nl) == n) {
80470+ pax_open_kernel();
80471 rcu_assign_pointer(*nl, n->next);
80472+ pax_close_kernel();
80473 return 0;
80474 }
80475- nl = &((*nl)->next);
80476+ nl = (struct notifier_block **)&((*nl)->next);
80477 }
80478 return -ENOENT;
80479 }
80480diff --git a/kernel/panic.c b/kernel/panic.c
80481index 167ec09..0dda5f9 100644
80482--- a/kernel/panic.c
80483+++ b/kernel/panic.c
80484@@ -400,7 +400,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
80485 unsigned taint, struct slowpath_args *args)
80486 {
80487 printk(KERN_WARNING "------------[ cut here ]------------\n");
80488- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
80489+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
80490
80491 if (args)
80492 vprintk(args->fmt, args->args);
80493@@ -453,7 +453,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
80494 */
80495 void __stack_chk_fail(void)
80496 {
80497- panic("stack-protector: Kernel stack is corrupted in: %p\n",
80498+ dump_stack();
80499+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
80500 __builtin_return_address(0));
80501 }
80502 EXPORT_SYMBOL(__stack_chk_fail);
80503diff --git a/kernel/pid.c b/kernel/pid.c
80504index 0db3e79..95b9dc2 100644
80505--- a/kernel/pid.c
80506+++ b/kernel/pid.c
80507@@ -33,6 +33,7 @@
80508 #include <linux/rculist.h>
80509 #include <linux/bootmem.h>
80510 #include <linux/hash.h>
80511+#include <linux/security.h>
80512 #include <linux/pid_namespace.h>
80513 #include <linux/init_task.h>
80514 #include <linux/syscalls.h>
80515@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
80516
80517 int pid_max = PID_MAX_DEFAULT;
80518
80519-#define RESERVED_PIDS 300
80520+#define RESERVED_PIDS 500
80521
80522 int pid_max_min = RESERVED_PIDS + 1;
80523 int pid_max_max = PID_MAX_LIMIT;
80524@@ -442,10 +443,18 @@ EXPORT_SYMBOL(pid_task);
80525 */
80526 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
80527 {
80528+ struct task_struct *task;
80529+
80530 rcu_lockdep_assert(rcu_read_lock_held(),
80531 "find_task_by_pid_ns() needs rcu_read_lock()"
80532 " protection");
80533- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
80534+
80535+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
80536+
80537+ if (gr_pid_is_chrooted(task))
80538+ return NULL;
80539+
80540+ return task;
80541 }
80542
80543 struct task_struct *find_task_by_vpid(pid_t vnr)
80544@@ -453,6 +462,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
80545 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
80546 }
80547
80548+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
80549+{
80550+ rcu_lockdep_assert(rcu_read_lock_held(),
80551+ "find_task_by_pid_ns() needs rcu_read_lock()"
80552+ " protection");
80553+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
80554+}
80555+
80556 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
80557 {
80558 struct pid *pid;
80559diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
80560index 6917e8e..9909aeb 100644
80561--- a/kernel/pid_namespace.c
80562+++ b/kernel/pid_namespace.c
80563@@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
80564 void __user *buffer, size_t *lenp, loff_t *ppos)
80565 {
80566 struct pid_namespace *pid_ns = task_active_pid_ns(current);
80567- struct ctl_table tmp = *table;
80568+ ctl_table_no_const tmp = *table;
80569
80570 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
80571 return -EPERM;
80572diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
80573index 42670e9..8719c2f 100644
80574--- a/kernel/posix-cpu-timers.c
80575+++ b/kernel/posix-cpu-timers.c
80576@@ -1636,14 +1636,14 @@ struct k_clock clock_posix_cpu = {
80577
80578 static __init int init_posix_cpu_timers(void)
80579 {
80580- struct k_clock process = {
80581+ static struct k_clock process = {
80582 .clock_getres = process_cpu_clock_getres,
80583 .clock_get = process_cpu_clock_get,
80584 .timer_create = process_cpu_timer_create,
80585 .nsleep = process_cpu_nsleep,
80586 .nsleep_restart = process_cpu_nsleep_restart,
80587 };
80588- struct k_clock thread = {
80589+ static struct k_clock thread = {
80590 .clock_getres = thread_cpu_clock_getres,
80591 .clock_get = thread_cpu_clock_get,
80592 .timer_create = thread_cpu_timer_create,
80593diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
80594index 424c2d4..679242f 100644
80595--- a/kernel/posix-timers.c
80596+++ b/kernel/posix-timers.c
80597@@ -43,6 +43,7 @@
80598 #include <linux/hash.h>
80599 #include <linux/posix-clock.h>
80600 #include <linux/posix-timers.h>
80601+#include <linux/grsecurity.h>
80602 #include <linux/syscalls.h>
80603 #include <linux/wait.h>
80604 #include <linux/workqueue.h>
80605@@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
80606 * which we beg off on and pass to do_sys_settimeofday().
80607 */
80608
80609-static struct k_clock posix_clocks[MAX_CLOCKS];
80610+static struct k_clock *posix_clocks[MAX_CLOCKS];
80611
80612 /*
80613 * These ones are defined below.
80614@@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
80615 */
80616 static __init int init_posix_timers(void)
80617 {
80618- struct k_clock clock_realtime = {
80619+ static struct k_clock clock_realtime = {
80620 .clock_getres = hrtimer_get_res,
80621 .clock_get = posix_clock_realtime_get,
80622 .clock_set = posix_clock_realtime_set,
80623@@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
80624 .timer_get = common_timer_get,
80625 .timer_del = common_timer_del,
80626 };
80627- struct k_clock clock_monotonic = {
80628+ static struct k_clock clock_monotonic = {
80629 .clock_getres = hrtimer_get_res,
80630 .clock_get = posix_ktime_get_ts,
80631 .nsleep = common_nsleep,
80632@@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
80633 .timer_get = common_timer_get,
80634 .timer_del = common_timer_del,
80635 };
80636- struct k_clock clock_monotonic_raw = {
80637+ static struct k_clock clock_monotonic_raw = {
80638 .clock_getres = hrtimer_get_res,
80639 .clock_get = posix_get_monotonic_raw,
80640 };
80641- struct k_clock clock_realtime_coarse = {
80642+ static struct k_clock clock_realtime_coarse = {
80643 .clock_getres = posix_get_coarse_res,
80644 .clock_get = posix_get_realtime_coarse,
80645 };
80646- struct k_clock clock_monotonic_coarse = {
80647+ static struct k_clock clock_monotonic_coarse = {
80648 .clock_getres = posix_get_coarse_res,
80649 .clock_get = posix_get_monotonic_coarse,
80650 };
80651- struct k_clock clock_tai = {
80652+ static struct k_clock clock_tai = {
80653 .clock_getres = hrtimer_get_res,
80654 .clock_get = posix_get_tai,
80655 .nsleep = common_nsleep,
80656@@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
80657 .timer_get = common_timer_get,
80658 .timer_del = common_timer_del,
80659 };
80660- struct k_clock clock_boottime = {
80661+ static struct k_clock clock_boottime = {
80662 .clock_getres = hrtimer_get_res,
80663 .clock_get = posix_get_boottime,
80664 .nsleep = common_nsleep,
80665@@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
80666 return;
80667 }
80668
80669- posix_clocks[clock_id] = *new_clock;
80670+ posix_clocks[clock_id] = new_clock;
80671 }
80672 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
80673
80674@@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
80675 return (id & CLOCKFD_MASK) == CLOCKFD ?
80676 &clock_posix_dynamic : &clock_posix_cpu;
80677
80678- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
80679+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
80680 return NULL;
80681- return &posix_clocks[id];
80682+ return posix_clocks[id];
80683 }
80684
80685 static int common_timer_create(struct k_itimer *new_timer)
80686@@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
80687 struct k_clock *kc = clockid_to_kclock(which_clock);
80688 struct k_itimer *new_timer;
80689 int error, new_timer_id;
80690- sigevent_t event;
80691+ sigevent_t event = { };
80692 int it_id_set = IT_ID_NOT_SET;
80693
80694 if (!kc)
80695@@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
80696 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
80697 return -EFAULT;
80698
80699+ /* only the CLOCK_REALTIME clock can be set, all other clocks
80700+ have their clock_set fptr set to a nosettime dummy function
80701+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
80702+ call common_clock_set, which calls do_sys_settimeofday, which
80703+ we hook
80704+ */
80705+
80706 return kc->clock_set(which_clock, &new_tp);
80707 }
80708
80709diff --git a/kernel/power/process.c b/kernel/power/process.c
80710index 98088e0..aaf95c0 100644
80711--- a/kernel/power/process.c
80712+++ b/kernel/power/process.c
80713@@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
80714 u64 elapsed_csecs64;
80715 unsigned int elapsed_csecs;
80716 bool wakeup = false;
80717+ bool timedout = false;
80718
80719 do_gettimeofday(&start);
80720
80721@@ -43,13 +44,20 @@ static int try_to_freeze_tasks(bool user_only)
80722
80723 while (true) {
80724 todo = 0;
80725+ if (time_after(jiffies, end_time))
80726+ timedout = true;
80727 read_lock(&tasklist_lock);
80728 do_each_thread(g, p) {
80729 if (p == current || !freeze_task(p))
80730 continue;
80731
80732- if (!freezer_should_skip(p))
80733+ if (!freezer_should_skip(p)) {
80734 todo++;
80735+ if (timedout) {
80736+ printk(KERN_ERR "Task refusing to freeze:\n");
80737+ sched_show_task(p);
80738+ }
80739+ }
80740 } while_each_thread(g, p);
80741 read_unlock(&tasklist_lock);
80742
80743@@ -58,7 +66,7 @@ static int try_to_freeze_tasks(bool user_only)
80744 todo += wq_busy;
80745 }
80746
80747- if (!todo || time_after(jiffies, end_time))
80748+ if (!todo || timedout)
80749 break;
80750
80751 if (pm_wakeup_pending()) {
80752diff --git a/kernel/printk.c b/kernel/printk.c
80753index d37d45c..ab918b3 100644
80754--- a/kernel/printk.c
80755+++ b/kernel/printk.c
80756@@ -390,6 +390,11 @@ static int check_syslog_permissions(int type, bool from_file)
80757 if (from_file && type != SYSLOG_ACTION_OPEN)
80758 return 0;
80759
80760+#ifdef CONFIG_GRKERNSEC_DMESG
80761+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
80762+ return -EPERM;
80763+#endif
80764+
80765 if (syslog_action_restricted(type)) {
80766 if (capable(CAP_SYSLOG))
80767 return 0;
80768diff --git a/kernel/profile.c b/kernel/profile.c
80769index 0bf4007..6234708 100644
80770--- a/kernel/profile.c
80771+++ b/kernel/profile.c
80772@@ -37,7 +37,7 @@ struct profile_hit {
80773 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
80774 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
80775
80776-static atomic_t *prof_buffer;
80777+static atomic_unchecked_t *prof_buffer;
80778 static unsigned long prof_len, prof_shift;
80779
80780 int prof_on __read_mostly;
80781@@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
80782 hits[i].pc = 0;
80783 continue;
80784 }
80785- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
80786+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
80787 hits[i].hits = hits[i].pc = 0;
80788 }
80789 }
80790@@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
80791 * Add the current hit(s) and flush the write-queue out
80792 * to the global buffer:
80793 */
80794- atomic_add(nr_hits, &prof_buffer[pc]);
80795+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
80796 for (i = 0; i < NR_PROFILE_HIT; ++i) {
80797- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
80798+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
80799 hits[i].pc = hits[i].hits = 0;
80800 }
80801 out:
80802@@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
80803 {
80804 unsigned long pc;
80805 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
80806- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
80807+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
80808 }
80809 #endif /* !CONFIG_SMP */
80810
80811@@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
80812 return -EFAULT;
80813 buf++; p++; count--; read++;
80814 }
80815- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
80816+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
80817 if (copy_to_user(buf, (void *)pnt, count))
80818 return -EFAULT;
80819 read += count;
80820@@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
80821 }
80822 #endif
80823 profile_discard_flip_buffers();
80824- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
80825+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
80826 return count;
80827 }
80828
80829diff --git a/kernel/ptrace.c b/kernel/ptrace.c
80830index 335a7ae..3bbbceb 100644
80831--- a/kernel/ptrace.c
80832+++ b/kernel/ptrace.c
80833@@ -326,7 +326,7 @@ static int ptrace_attach(struct task_struct *task, long request,
80834 if (seize)
80835 flags |= PT_SEIZED;
80836 rcu_read_lock();
80837- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
80838+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
80839 flags |= PT_PTRACE_CAP;
80840 rcu_read_unlock();
80841 task->ptrace = flags;
80842@@ -537,7 +537,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
80843 break;
80844 return -EIO;
80845 }
80846- if (copy_to_user(dst, buf, retval))
80847+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
80848 return -EFAULT;
80849 copied += retval;
80850 src += retval;
80851@@ -805,7 +805,7 @@ int ptrace_request(struct task_struct *child, long request,
80852 bool seized = child->ptrace & PT_SEIZED;
80853 int ret = -EIO;
80854 siginfo_t siginfo, *si;
80855- void __user *datavp = (void __user *) data;
80856+ void __user *datavp = (__force void __user *) data;
80857 unsigned long __user *datalp = datavp;
80858 unsigned long flags;
80859
80860@@ -1011,14 +1011,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
80861 goto out;
80862 }
80863
80864+ if (gr_handle_ptrace(child, request)) {
80865+ ret = -EPERM;
80866+ goto out_put_task_struct;
80867+ }
80868+
80869 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
80870 ret = ptrace_attach(child, request, addr, data);
80871 /*
80872 * Some architectures need to do book-keeping after
80873 * a ptrace attach.
80874 */
80875- if (!ret)
80876+ if (!ret) {
80877 arch_ptrace_attach(child);
80878+ gr_audit_ptrace(child);
80879+ }
80880 goto out_put_task_struct;
80881 }
80882
80883@@ -1046,7 +1053,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
80884 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
80885 if (copied != sizeof(tmp))
80886 return -EIO;
80887- return put_user(tmp, (unsigned long __user *)data);
80888+ return put_user(tmp, (__force unsigned long __user *)data);
80889 }
80890
80891 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
80892@@ -1140,7 +1147,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
80893 }
80894
80895 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80896- compat_long_t addr, compat_long_t data)
80897+ compat_ulong_t addr, compat_ulong_t data)
80898 {
80899 struct task_struct *child;
80900 long ret;
80901@@ -1156,14 +1163,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80902 goto out;
80903 }
80904
80905+ if (gr_handle_ptrace(child, request)) {
80906+ ret = -EPERM;
80907+ goto out_put_task_struct;
80908+ }
80909+
80910 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
80911 ret = ptrace_attach(child, request, addr, data);
80912 /*
80913 * Some architectures need to do book-keeping after
80914 * a ptrace attach.
80915 */
80916- if (!ret)
80917+ if (!ret) {
80918 arch_ptrace_attach(child);
80919+ gr_audit_ptrace(child);
80920+ }
80921 goto out_put_task_struct;
80922 }
80923
80924diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
80925index 48ab703..07561d4 100644
80926--- a/kernel/rcupdate.c
80927+++ b/kernel/rcupdate.c
80928@@ -439,10 +439,10 @@ int rcu_jiffies_till_stall_check(void)
80929 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
80930 */
80931 if (till_stall_check < 3) {
80932- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
80933+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
80934 till_stall_check = 3;
80935 } else if (till_stall_check > 300) {
80936- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
80937+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
80938 till_stall_check = 300;
80939 }
80940 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
80941diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
80942index a0714a5..2ab5e34 100644
80943--- a/kernel/rcutiny.c
80944+++ b/kernel/rcutiny.c
80945@@ -46,7 +46,7 @@
80946 struct rcu_ctrlblk;
80947 static void invoke_rcu_callbacks(void);
80948 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
80949-static void rcu_process_callbacks(struct softirq_action *unused);
80950+static void rcu_process_callbacks(void);
80951 static void __call_rcu(struct rcu_head *head,
80952 void (*func)(struct rcu_head *rcu),
80953 struct rcu_ctrlblk *rcp);
80954@@ -312,7 +312,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
80955 rcu_is_callbacks_kthread()));
80956 }
80957
80958-static void rcu_process_callbacks(struct softirq_action *unused)
80959+static void rcu_process_callbacks(void)
80960 {
80961 __rcu_process_callbacks(&rcu_sched_ctrlblk);
80962 __rcu_process_callbacks(&rcu_bh_ctrlblk);
80963diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
80964index 8a23300..4255818 100644
80965--- a/kernel/rcutiny_plugin.h
80966+++ b/kernel/rcutiny_plugin.h
80967@@ -945,7 +945,7 @@ static int rcu_kthread(void *arg)
80968 have_rcu_kthread_work = morework;
80969 local_irq_restore(flags);
80970 if (work)
80971- rcu_process_callbacks(NULL);
80972+ rcu_process_callbacks();
80973 schedule_timeout_interruptible(1); /* Leave CPU for others. */
80974 }
80975
80976diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
80977index e1f3a8c..42c94a2 100644
80978--- a/kernel/rcutorture.c
80979+++ b/kernel/rcutorture.c
80980@@ -164,12 +164,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
80981 { 0 };
80982 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
80983 { 0 };
80984-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
80985-static atomic_t n_rcu_torture_alloc;
80986-static atomic_t n_rcu_torture_alloc_fail;
80987-static atomic_t n_rcu_torture_free;
80988-static atomic_t n_rcu_torture_mberror;
80989-static atomic_t n_rcu_torture_error;
80990+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
80991+static atomic_unchecked_t n_rcu_torture_alloc;
80992+static atomic_unchecked_t n_rcu_torture_alloc_fail;
80993+static atomic_unchecked_t n_rcu_torture_free;
80994+static atomic_unchecked_t n_rcu_torture_mberror;
80995+static atomic_unchecked_t n_rcu_torture_error;
80996 static long n_rcu_torture_barrier_error;
80997 static long n_rcu_torture_boost_ktrerror;
80998 static long n_rcu_torture_boost_rterror;
80999@@ -287,11 +287,11 @@ rcu_torture_alloc(void)
81000
81001 spin_lock_bh(&rcu_torture_lock);
81002 if (list_empty(&rcu_torture_freelist)) {
81003- atomic_inc(&n_rcu_torture_alloc_fail);
81004+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
81005 spin_unlock_bh(&rcu_torture_lock);
81006 return NULL;
81007 }
81008- atomic_inc(&n_rcu_torture_alloc);
81009+ atomic_inc_unchecked(&n_rcu_torture_alloc);
81010 p = rcu_torture_freelist.next;
81011 list_del_init(p);
81012 spin_unlock_bh(&rcu_torture_lock);
81013@@ -304,7 +304,7 @@ rcu_torture_alloc(void)
81014 static void
81015 rcu_torture_free(struct rcu_torture *p)
81016 {
81017- atomic_inc(&n_rcu_torture_free);
81018+ atomic_inc_unchecked(&n_rcu_torture_free);
81019 spin_lock_bh(&rcu_torture_lock);
81020 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
81021 spin_unlock_bh(&rcu_torture_lock);
81022@@ -424,7 +424,7 @@ rcu_torture_cb(struct rcu_head *p)
81023 i = rp->rtort_pipe_count;
81024 if (i > RCU_TORTURE_PIPE_LEN)
81025 i = RCU_TORTURE_PIPE_LEN;
81026- atomic_inc(&rcu_torture_wcount[i]);
81027+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
81028 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
81029 rp->rtort_mbtest = 0;
81030 rcu_torture_free(rp);
81031@@ -472,7 +472,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
81032 i = rp->rtort_pipe_count;
81033 if (i > RCU_TORTURE_PIPE_LEN)
81034 i = RCU_TORTURE_PIPE_LEN;
81035- atomic_inc(&rcu_torture_wcount[i]);
81036+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
81037 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
81038 rp->rtort_mbtest = 0;
81039 list_del(&rp->rtort_free);
81040@@ -990,7 +990,7 @@ rcu_torture_writer(void *arg)
81041 i = old_rp->rtort_pipe_count;
81042 if (i > RCU_TORTURE_PIPE_LEN)
81043 i = RCU_TORTURE_PIPE_LEN;
81044- atomic_inc(&rcu_torture_wcount[i]);
81045+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
81046 old_rp->rtort_pipe_count++;
81047 cur_ops->deferred_free(old_rp);
81048 }
81049@@ -1076,7 +1076,7 @@ static void rcu_torture_timer(unsigned long unused)
81050 return;
81051 }
81052 if (p->rtort_mbtest == 0)
81053- atomic_inc(&n_rcu_torture_mberror);
81054+ atomic_inc_unchecked(&n_rcu_torture_mberror);
81055 spin_lock(&rand_lock);
81056 cur_ops->read_delay(&rand);
81057 n_rcu_torture_timers++;
81058@@ -1146,7 +1146,7 @@ rcu_torture_reader(void *arg)
81059 continue;
81060 }
81061 if (p->rtort_mbtest == 0)
81062- atomic_inc(&n_rcu_torture_mberror);
81063+ atomic_inc_unchecked(&n_rcu_torture_mberror);
81064 cur_ops->read_delay(&rand);
81065 preempt_disable();
81066 pipe_count = p->rtort_pipe_count;
81067@@ -1209,11 +1209,11 @@ rcu_torture_printk(char *page)
81068 rcu_torture_current,
81069 rcu_torture_current_version,
81070 list_empty(&rcu_torture_freelist),
81071- atomic_read(&n_rcu_torture_alloc),
81072- atomic_read(&n_rcu_torture_alloc_fail),
81073- atomic_read(&n_rcu_torture_free));
81074+ atomic_read_unchecked(&n_rcu_torture_alloc),
81075+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
81076+ atomic_read_unchecked(&n_rcu_torture_free));
81077 cnt += sprintf(&page[cnt], "rtmbe: %d rtbke: %ld rtbre: %ld ",
81078- atomic_read(&n_rcu_torture_mberror),
81079+ atomic_read_unchecked(&n_rcu_torture_mberror),
81080 n_rcu_torture_boost_ktrerror,
81081 n_rcu_torture_boost_rterror);
81082 cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
81083@@ -1232,14 +1232,14 @@ rcu_torture_printk(char *page)
81084 n_barrier_attempts,
81085 n_rcu_torture_barrier_error);
81086 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
81087- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
81088+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
81089 n_rcu_torture_barrier_error != 0 ||
81090 n_rcu_torture_boost_ktrerror != 0 ||
81091 n_rcu_torture_boost_rterror != 0 ||
81092 n_rcu_torture_boost_failure != 0 ||
81093 i > 1) {
81094 cnt += sprintf(&page[cnt], "!!! ");
81095- atomic_inc(&n_rcu_torture_error);
81096+ atomic_inc_unchecked(&n_rcu_torture_error);
81097 WARN_ON_ONCE(1);
81098 }
81099 cnt += sprintf(&page[cnt], "Reader Pipe: ");
81100@@ -1253,7 +1253,7 @@ rcu_torture_printk(char *page)
81101 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
81102 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
81103 cnt += sprintf(&page[cnt], " %d",
81104- atomic_read(&rcu_torture_wcount[i]));
81105+ atomic_read_unchecked(&rcu_torture_wcount[i]));
81106 }
81107 cnt += sprintf(&page[cnt], "\n");
81108 if (cur_ops->stats)
81109@@ -1962,7 +1962,7 @@ rcu_torture_cleanup(void)
81110
81111 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
81112
81113- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
81114+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
81115 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
81116 else if (n_online_successes != n_online_attempts ||
81117 n_offline_successes != n_offline_attempts)
81118@@ -2031,18 +2031,18 @@ rcu_torture_init(void)
81119
81120 rcu_torture_current = NULL;
81121 rcu_torture_current_version = 0;
81122- atomic_set(&n_rcu_torture_alloc, 0);
81123- atomic_set(&n_rcu_torture_alloc_fail, 0);
81124- atomic_set(&n_rcu_torture_free, 0);
81125- atomic_set(&n_rcu_torture_mberror, 0);
81126- atomic_set(&n_rcu_torture_error, 0);
81127+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
81128+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
81129+ atomic_set_unchecked(&n_rcu_torture_free, 0);
81130+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
81131+ atomic_set_unchecked(&n_rcu_torture_error, 0);
81132 n_rcu_torture_barrier_error = 0;
81133 n_rcu_torture_boost_ktrerror = 0;
81134 n_rcu_torture_boost_rterror = 0;
81135 n_rcu_torture_boost_failure = 0;
81136 n_rcu_torture_boosts = 0;
81137 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
81138- atomic_set(&rcu_torture_wcount[i], 0);
81139+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
81140 for_each_possible_cpu(cpu) {
81141 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
81142 per_cpu(rcu_torture_count, cpu)[i] = 0;
81143diff --git a/kernel/rcutree.c b/kernel/rcutree.c
81144index 3538001..e379e0b 100644
81145--- a/kernel/rcutree.c
81146+++ b/kernel/rcutree.c
81147@@ -358,9 +358,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
81148 rcu_prepare_for_idle(smp_processor_id());
81149 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
81150 smp_mb__before_atomic_inc(); /* See above. */
81151- atomic_inc(&rdtp->dynticks);
81152+ atomic_inc_unchecked(&rdtp->dynticks);
81153 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
81154- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
81155+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
81156
81157 /*
81158 * It is illegal to enter an extended quiescent state while
81159@@ -496,10 +496,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
81160 int user)
81161 {
81162 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
81163- atomic_inc(&rdtp->dynticks);
81164+ atomic_inc_unchecked(&rdtp->dynticks);
81165 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
81166 smp_mb__after_atomic_inc(); /* See above. */
81167- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
81168+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
81169 rcu_cleanup_after_idle(smp_processor_id());
81170 trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
81171 if (!user && !is_idle_task(current)) {
81172@@ -638,14 +638,14 @@ void rcu_nmi_enter(void)
81173 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
81174
81175 if (rdtp->dynticks_nmi_nesting == 0 &&
81176- (atomic_read(&rdtp->dynticks) & 0x1))
81177+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
81178 return;
81179 rdtp->dynticks_nmi_nesting++;
81180 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
81181- atomic_inc(&rdtp->dynticks);
81182+ atomic_inc_unchecked(&rdtp->dynticks);
81183 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
81184 smp_mb__after_atomic_inc(); /* See above. */
81185- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
81186+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
81187 }
81188
81189 /**
81190@@ -664,9 +664,9 @@ void rcu_nmi_exit(void)
81191 return;
81192 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
81193 smp_mb__before_atomic_inc(); /* See above. */
81194- atomic_inc(&rdtp->dynticks);
81195+ atomic_inc_unchecked(&rdtp->dynticks);
81196 smp_mb__after_atomic_inc(); /* Force delay to next write. */
81197- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
81198+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
81199 }
81200
81201 /**
81202@@ -680,7 +680,7 @@ int rcu_is_cpu_idle(void)
81203 int ret;
81204
81205 preempt_disable();
81206- ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
81207+ ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
81208 preempt_enable();
81209 return ret;
81210 }
81211@@ -748,7 +748,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
81212 */
81213 static int dyntick_save_progress_counter(struct rcu_data *rdp)
81214 {
81215- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
81216+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
81217 return (rdp->dynticks_snap & 0x1) == 0;
81218 }
81219
81220@@ -763,7 +763,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
81221 unsigned int curr;
81222 unsigned int snap;
81223
81224- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
81225+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
81226 snap = (unsigned int)rdp->dynticks_snap;
81227
81228 /*
81229@@ -1440,9 +1440,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
81230 rdp = this_cpu_ptr(rsp->rda);
81231 rcu_preempt_check_blocked_tasks(rnp);
81232 rnp->qsmask = rnp->qsmaskinit;
81233- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
81234+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
81235 WARN_ON_ONCE(rnp->completed != rsp->completed);
81236- ACCESS_ONCE(rnp->completed) = rsp->completed;
81237+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
81238 if (rnp == rdp->mynode)
81239 rcu_start_gp_per_cpu(rsp, rnp, rdp);
81240 rcu_preempt_boost_start_gp(rnp);
81241@@ -1524,7 +1524,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
81242 */
81243 rcu_for_each_node_breadth_first(rsp, rnp) {
81244 raw_spin_lock_irq(&rnp->lock);
81245- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
81246+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
81247 rdp = this_cpu_ptr(rsp->rda);
81248 if (rnp == rdp->mynode)
81249 __rcu_process_gp_end(rsp, rnp, rdp);
81250@@ -1855,7 +1855,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
81251 rsp->qlen += rdp->qlen;
81252 rdp->n_cbs_orphaned += rdp->qlen;
81253 rdp->qlen_lazy = 0;
81254- ACCESS_ONCE(rdp->qlen) = 0;
81255+ ACCESS_ONCE_RW(rdp->qlen) = 0;
81256 }
81257
81258 /*
81259@@ -2101,7 +2101,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
81260 }
81261 smp_mb(); /* List handling before counting for rcu_barrier(). */
81262 rdp->qlen_lazy -= count_lazy;
81263- ACCESS_ONCE(rdp->qlen) -= count;
81264+ ACCESS_ONCE_RW(rdp->qlen) -= count;
81265 rdp->n_cbs_invoked += count;
81266
81267 /* Reinstate batch limit if we have worked down the excess. */
81268@@ -2295,7 +2295,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
81269 /*
81270 * Do RCU core processing for the current CPU.
81271 */
81272-static void rcu_process_callbacks(struct softirq_action *unused)
81273+static void rcu_process_callbacks(void)
81274 {
81275 struct rcu_state *rsp;
81276
81277@@ -2419,7 +2419,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
81278 local_irq_restore(flags);
81279 return;
81280 }
81281- ACCESS_ONCE(rdp->qlen)++;
81282+ ACCESS_ONCE_RW(rdp->qlen)++;
81283 if (lazy)
81284 rdp->qlen_lazy++;
81285 else
81286@@ -2628,11 +2628,11 @@ void synchronize_sched_expedited(void)
81287 * counter wrap on a 32-bit system. Quite a few more CPUs would of
81288 * course be required on a 64-bit system.
81289 */
81290- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
81291+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
81292 (ulong)atomic_long_read(&rsp->expedited_done) +
81293 ULONG_MAX / 8)) {
81294 synchronize_sched();
81295- atomic_long_inc(&rsp->expedited_wrap);
81296+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
81297 return;
81298 }
81299
81300@@ -2640,7 +2640,7 @@ void synchronize_sched_expedited(void)
81301 * Take a ticket. Note that atomic_inc_return() implies a
81302 * full memory barrier.
81303 */
81304- snap = atomic_long_inc_return(&rsp->expedited_start);
81305+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
81306 firstsnap = snap;
81307 get_online_cpus();
81308 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
81309@@ -2653,14 +2653,14 @@ void synchronize_sched_expedited(void)
81310 synchronize_sched_expedited_cpu_stop,
81311 NULL) == -EAGAIN) {
81312 put_online_cpus();
81313- atomic_long_inc(&rsp->expedited_tryfail);
81314+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
81315
81316 /* Check to see if someone else did our work for us. */
81317 s = atomic_long_read(&rsp->expedited_done);
81318 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
81319 /* ensure test happens before caller kfree */
81320 smp_mb__before_atomic_inc(); /* ^^^ */
81321- atomic_long_inc(&rsp->expedited_workdone1);
81322+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
81323 return;
81324 }
81325
81326@@ -2669,7 +2669,7 @@ void synchronize_sched_expedited(void)
81327 udelay(trycount * num_online_cpus());
81328 } else {
81329 wait_rcu_gp(call_rcu_sched);
81330- atomic_long_inc(&rsp->expedited_normal);
81331+ atomic_long_inc_unchecked(&rsp->expedited_normal);
81332 return;
81333 }
81334
81335@@ -2678,7 +2678,7 @@ void synchronize_sched_expedited(void)
81336 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
81337 /* ensure test happens before caller kfree */
81338 smp_mb__before_atomic_inc(); /* ^^^ */
81339- atomic_long_inc(&rsp->expedited_workdone2);
81340+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
81341 return;
81342 }
81343
81344@@ -2690,10 +2690,10 @@ void synchronize_sched_expedited(void)
81345 * period works for us.
81346 */
81347 get_online_cpus();
81348- snap = atomic_long_read(&rsp->expedited_start);
81349+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
81350 smp_mb(); /* ensure read is before try_stop_cpus(). */
81351 }
81352- atomic_long_inc(&rsp->expedited_stoppedcpus);
81353+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
81354
81355 /*
81356 * Everyone up to our most recent fetch is covered by our grace
81357@@ -2702,16 +2702,16 @@ void synchronize_sched_expedited(void)
81358 * than we did already did their update.
81359 */
81360 do {
81361- atomic_long_inc(&rsp->expedited_done_tries);
81362+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
81363 s = atomic_long_read(&rsp->expedited_done);
81364 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
81365 /* ensure test happens before caller kfree */
81366 smp_mb__before_atomic_inc(); /* ^^^ */
81367- atomic_long_inc(&rsp->expedited_done_lost);
81368+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
81369 break;
81370 }
81371 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
81372- atomic_long_inc(&rsp->expedited_done_exit);
81373+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
81374
81375 put_online_cpus();
81376 }
81377@@ -2893,7 +2893,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
81378 * ACCESS_ONCE() to prevent the compiler from speculating
81379 * the increment to precede the early-exit check.
81380 */
81381- ACCESS_ONCE(rsp->n_barrier_done)++;
81382+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
81383 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
81384 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
81385 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
81386@@ -2943,7 +2943,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
81387
81388 /* Increment ->n_barrier_done to prevent duplicate work. */
81389 smp_mb(); /* Keep increment after above mechanism. */
81390- ACCESS_ONCE(rsp->n_barrier_done)++;
81391+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
81392 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
81393 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
81394 smp_mb(); /* Keep increment before caller's subsequent code. */
81395@@ -2988,10 +2988,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
81396 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
81397 init_callback_list(rdp);
81398 rdp->qlen_lazy = 0;
81399- ACCESS_ONCE(rdp->qlen) = 0;
81400+ ACCESS_ONCE_RW(rdp->qlen) = 0;
81401 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
81402 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
81403- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
81404+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
81405 rdp->cpu = cpu;
81406 rdp->rsp = rsp;
81407 rcu_boot_init_nocb_percpu_data(rdp);
81408@@ -3024,8 +3024,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
81409 rdp->blimit = blimit;
81410 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
81411 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
81412- atomic_set(&rdp->dynticks->dynticks,
81413- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
81414+ atomic_set_unchecked(&rdp->dynticks->dynticks,
81415+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
81416 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
81417
81418 /* Add CPU to rcu_node bitmasks. */
81419@@ -3120,7 +3120,7 @@ static int __init rcu_spawn_gp_kthread(void)
81420 struct task_struct *t;
81421
81422 for_each_rcu_flavor(rsp) {
81423- t = kthread_run(rcu_gp_kthread, rsp, rsp->name);
81424+ t = kthread_run(rcu_gp_kthread, rsp, "%s", rsp->name);
81425 BUG_ON(IS_ERR(t));
81426 rnp = rcu_get_root(rsp);
81427 raw_spin_lock_irqsave(&rnp->lock, flags);
81428diff --git a/kernel/rcutree.h b/kernel/rcutree.h
81429index 4df5034..5ee93f2 100644
81430--- a/kernel/rcutree.h
81431+++ b/kernel/rcutree.h
81432@@ -87,7 +87,7 @@ struct rcu_dynticks {
81433 long long dynticks_nesting; /* Track irq/process nesting level. */
81434 /* Process level is worth LLONG_MAX/2. */
81435 int dynticks_nmi_nesting; /* Track NMI nesting level. */
81436- atomic_t dynticks; /* Even value for idle, else odd. */
81437+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
81438 #ifdef CONFIG_RCU_FAST_NO_HZ
81439 bool all_lazy; /* Are all CPU's CBs lazy? */
81440 unsigned long nonlazy_posted;
81441@@ -414,17 +414,17 @@ struct rcu_state {
81442 /* _rcu_barrier(). */
81443 /* End of fields guarded by barrier_mutex. */
81444
81445- atomic_long_t expedited_start; /* Starting ticket. */
81446- atomic_long_t expedited_done; /* Done ticket. */
81447- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
81448- atomic_long_t expedited_tryfail; /* # acquisition failures. */
81449- atomic_long_t expedited_workdone1; /* # done by others #1. */
81450- atomic_long_t expedited_workdone2; /* # done by others #2. */
81451- atomic_long_t expedited_normal; /* # fallbacks to normal. */
81452- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
81453- atomic_long_t expedited_done_tries; /* # tries to update _done. */
81454- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
81455- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
81456+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
81457+ atomic_long_t expedited_done; /* Done ticket. */
81458+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
81459+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
81460+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
81461+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
81462+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
81463+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
81464+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
81465+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
81466+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
81467
81468 unsigned long jiffies_force_qs; /* Time at which to invoke */
81469 /* force_quiescent_state(). */
81470diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
81471index 3db5a37..b395fb35 100644
81472--- a/kernel/rcutree_plugin.h
81473+++ b/kernel/rcutree_plugin.h
81474@@ -903,7 +903,7 @@ void synchronize_rcu_expedited(void)
81475
81476 /* Clean up and exit. */
81477 smp_mb(); /* ensure expedited GP seen before counter increment. */
81478- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
81479+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
81480 unlock_mb_ret:
81481 mutex_unlock(&sync_rcu_preempt_exp_mutex);
81482 mb_ret:
81483@@ -1451,7 +1451,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
81484 free_cpumask_var(cm);
81485 }
81486
81487-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
81488+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
81489 .store = &rcu_cpu_kthread_task,
81490 .thread_should_run = rcu_cpu_kthread_should_run,
81491 .thread_fn = rcu_cpu_kthread,
81492@@ -1916,7 +1916,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
81493 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
81494 printk(KERN_ERR "\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
81495 cpu, ticks_value, ticks_title,
81496- atomic_read(&rdtp->dynticks) & 0xfff,
81497+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
81498 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
81499 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
81500 fast_no_hz);
81501@@ -2079,7 +2079,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
81502
81503 /* Enqueue the callback on the nocb list and update counts. */
81504 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
81505- ACCESS_ONCE(*old_rhpp) = rhp;
81506+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
81507 atomic_long_add(rhcount, &rdp->nocb_q_count);
81508 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
81509
81510@@ -2219,12 +2219,12 @@ static int rcu_nocb_kthread(void *arg)
81511 * Extract queued callbacks, update counts, and wait
81512 * for a grace period to elapse.
81513 */
81514- ACCESS_ONCE(rdp->nocb_head) = NULL;
81515+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
81516 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
81517 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
81518 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
81519- ACCESS_ONCE(rdp->nocb_p_count) += c;
81520- ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
81521+ ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
81522+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
81523 rcu_nocb_wait_gp(rdp);
81524
81525 /* Each pass through the following loop invokes a callback. */
81526@@ -2246,8 +2246,8 @@ static int rcu_nocb_kthread(void *arg)
81527 list = next;
81528 }
81529 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
81530- ACCESS_ONCE(rdp->nocb_p_count) -= c;
81531- ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
81532+ ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
81533+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
81534 rdp->n_nocbs_invoked += c;
81535 }
81536 return 0;
81537@@ -2274,7 +2274,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
81538 t = kthread_run(rcu_nocb_kthread, rdp,
81539 "rcuo%c/%d", rsp->abbr, cpu);
81540 BUG_ON(IS_ERR(t));
81541- ACCESS_ONCE(rdp->nocb_kthread) = t;
81542+ ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
81543 }
81544 }
81545
81546diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
81547index cf6c174..a8f4b50 100644
81548--- a/kernel/rcutree_trace.c
81549+++ b/kernel/rcutree_trace.c
81550@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
81551 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
81552 rdp->passed_quiesce, rdp->qs_pending);
81553 seq_printf(m, " dt=%d/%llx/%d df=%lu",
81554- atomic_read(&rdp->dynticks->dynticks),
81555+ atomic_read_unchecked(&rdp->dynticks->dynticks),
81556 rdp->dynticks->dynticks_nesting,
81557 rdp->dynticks->dynticks_nmi_nesting,
81558 rdp->dynticks_fqs);
81559@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
81560 struct rcu_state *rsp = (struct rcu_state *)m->private;
81561
81562 seq_printf(m, "s=%lu d=%lu w=%lu tf=%lu wd1=%lu wd2=%lu n=%lu sc=%lu dt=%lu dl=%lu dx=%lu\n",
81563- atomic_long_read(&rsp->expedited_start),
81564+ atomic_long_read_unchecked(&rsp->expedited_start),
81565 atomic_long_read(&rsp->expedited_done),
81566- atomic_long_read(&rsp->expedited_wrap),
81567- atomic_long_read(&rsp->expedited_tryfail),
81568- atomic_long_read(&rsp->expedited_workdone1),
81569- atomic_long_read(&rsp->expedited_workdone2),
81570- atomic_long_read(&rsp->expedited_normal),
81571- atomic_long_read(&rsp->expedited_stoppedcpus),
81572- atomic_long_read(&rsp->expedited_done_tries),
81573- atomic_long_read(&rsp->expedited_done_lost),
81574- atomic_long_read(&rsp->expedited_done_exit));
81575+ atomic_long_read_unchecked(&rsp->expedited_wrap),
81576+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
81577+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
81578+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
81579+ atomic_long_read_unchecked(&rsp->expedited_normal),
81580+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
81581+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
81582+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
81583+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
81584 return 0;
81585 }
81586
81587diff --git a/kernel/resource.c b/kernel/resource.c
81588index d738698..5f8e60a 100644
81589--- a/kernel/resource.c
81590+++ b/kernel/resource.c
81591@@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
81592
81593 static int __init ioresources_init(void)
81594 {
81595+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81596+#ifdef CONFIG_GRKERNSEC_PROC_USER
81597+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
81598+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
81599+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81600+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
81601+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
81602+#endif
81603+#else
81604 proc_create("ioports", 0, NULL, &proc_ioports_operations);
81605 proc_create("iomem", 0, NULL, &proc_iomem_operations);
81606+#endif
81607 return 0;
81608 }
81609 __initcall(ioresources_init);
81610diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
81611index 1d96dd0..994ff19 100644
81612--- a/kernel/rtmutex-tester.c
81613+++ b/kernel/rtmutex-tester.c
81614@@ -22,7 +22,7 @@
81615 #define MAX_RT_TEST_MUTEXES 8
81616
81617 static spinlock_t rttest_lock;
81618-static atomic_t rttest_event;
81619+static atomic_unchecked_t rttest_event;
81620
81621 struct test_thread_data {
81622 int opcode;
81623@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
81624
81625 case RTTEST_LOCKCONT:
81626 td->mutexes[td->opdata] = 1;
81627- td->event = atomic_add_return(1, &rttest_event);
81628+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81629 return 0;
81630
81631 case RTTEST_RESET:
81632@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
81633 return 0;
81634
81635 case RTTEST_RESETEVENT:
81636- atomic_set(&rttest_event, 0);
81637+ atomic_set_unchecked(&rttest_event, 0);
81638 return 0;
81639
81640 default:
81641@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
81642 return ret;
81643
81644 td->mutexes[id] = 1;
81645- td->event = atomic_add_return(1, &rttest_event);
81646+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81647 rt_mutex_lock(&mutexes[id]);
81648- td->event = atomic_add_return(1, &rttest_event);
81649+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81650 td->mutexes[id] = 4;
81651 return 0;
81652
81653@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
81654 return ret;
81655
81656 td->mutexes[id] = 1;
81657- td->event = atomic_add_return(1, &rttest_event);
81658+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81659 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
81660- td->event = atomic_add_return(1, &rttest_event);
81661+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81662 td->mutexes[id] = ret ? 0 : 4;
81663 return ret ? -EINTR : 0;
81664
81665@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
81666 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
81667 return ret;
81668
81669- td->event = atomic_add_return(1, &rttest_event);
81670+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81671 rt_mutex_unlock(&mutexes[id]);
81672- td->event = atomic_add_return(1, &rttest_event);
81673+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81674 td->mutexes[id] = 0;
81675 return 0;
81676
81677@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
81678 break;
81679
81680 td->mutexes[dat] = 2;
81681- td->event = atomic_add_return(1, &rttest_event);
81682+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81683 break;
81684
81685 default:
81686@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
81687 return;
81688
81689 td->mutexes[dat] = 3;
81690- td->event = atomic_add_return(1, &rttest_event);
81691+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81692 break;
81693
81694 case RTTEST_LOCKNOWAIT:
81695@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
81696 return;
81697
81698 td->mutexes[dat] = 1;
81699- td->event = atomic_add_return(1, &rttest_event);
81700+ td->event = atomic_add_return_unchecked(1, &rttest_event);
81701 return;
81702
81703 default:
81704diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
81705index 64de5f8..7735e12 100644
81706--- a/kernel/sched/auto_group.c
81707+++ b/kernel/sched/auto_group.c
81708@@ -11,7 +11,7 @@
81709
81710 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
81711 static struct autogroup autogroup_default;
81712-static atomic_t autogroup_seq_nr;
81713+static atomic_unchecked_t autogroup_seq_nr;
81714
81715 void __init autogroup_init(struct task_struct *init_task)
81716 {
81717@@ -81,7 +81,7 @@ static inline struct autogroup *autogroup_create(void)
81718
81719 kref_init(&ag->kref);
81720 init_rwsem(&ag->lock);
81721- ag->id = atomic_inc_return(&autogroup_seq_nr);
81722+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
81723 ag->tg = tg;
81724 #ifdef CONFIG_RT_GROUP_SCHED
81725 /*
81726diff --git a/kernel/sched/core.c b/kernel/sched/core.c
81727index e8b3350..d83d44e 100644
81728--- a/kernel/sched/core.c
81729+++ b/kernel/sched/core.c
81730@@ -3440,7 +3440,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
81731 * The return value is -ERESTARTSYS if interrupted, 0 if timed out,
81732 * positive (at least 1, or number of jiffies left till timeout) if completed.
81733 */
81734-long __sched
81735+long __sched __intentional_overflow(-1)
81736 wait_for_completion_interruptible_timeout(struct completion *x,
81737 unsigned long timeout)
81738 {
81739@@ -3457,7 +3457,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
81740 *
81741 * The return value is -ERESTARTSYS if interrupted, 0 if completed.
81742 */
81743-int __sched wait_for_completion_killable(struct completion *x)
81744+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
81745 {
81746 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
81747 if (t == -ERESTARTSYS)
81748@@ -3478,7 +3478,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
81749 * The return value is -ERESTARTSYS if interrupted, 0 if timed out,
81750 * positive (at least 1, or number of jiffies left till timeout) if completed.
81751 */
81752-long __sched
81753+long __sched __intentional_overflow(-1)
81754 wait_for_completion_killable_timeout(struct completion *x,
81755 unsigned long timeout)
81756 {
81757@@ -3704,6 +3704,8 @@ int can_nice(const struct task_struct *p, const int nice)
81758 /* convert nice value [19,-20] to rlimit style value [1,40] */
81759 int nice_rlim = 20 - nice;
81760
81761+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
81762+
81763 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
81764 capable(CAP_SYS_NICE));
81765 }
81766@@ -3737,7 +3739,8 @@ SYSCALL_DEFINE1(nice, int, increment)
81767 if (nice > 19)
81768 nice = 19;
81769
81770- if (increment < 0 && !can_nice(current, nice))
81771+ if (increment < 0 && (!can_nice(current, nice) ||
81772+ gr_handle_chroot_nice()))
81773 return -EPERM;
81774
81775 retval = security_task_setnice(current, nice);
81776@@ -3891,6 +3894,7 @@ recheck:
81777 unsigned long rlim_rtprio =
81778 task_rlimit(p, RLIMIT_RTPRIO);
81779
81780+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
81781 /* can't set/change the rt policy */
81782 if (policy != p->policy && !rlim_rtprio)
81783 return -EPERM;
81784@@ -4988,7 +4992,7 @@ static void migrate_tasks(unsigned int dead_cpu)
81785
81786 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
81787
81788-static struct ctl_table sd_ctl_dir[] = {
81789+static ctl_table_no_const sd_ctl_dir[] __read_only = {
81790 {
81791 .procname = "sched_domain",
81792 .mode = 0555,
81793@@ -5005,17 +5009,17 @@ static struct ctl_table sd_ctl_root[] = {
81794 {}
81795 };
81796
81797-static struct ctl_table *sd_alloc_ctl_entry(int n)
81798+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
81799 {
81800- struct ctl_table *entry =
81801+ ctl_table_no_const *entry =
81802 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
81803
81804 return entry;
81805 }
81806
81807-static void sd_free_ctl_entry(struct ctl_table **tablep)
81808+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
81809 {
81810- struct ctl_table *entry;
81811+ ctl_table_no_const *entry;
81812
81813 /*
81814 * In the intermediate directories, both the child directory and
81815@@ -5023,22 +5027,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
81816 * will always be set. In the lowest directory the names are
81817 * static strings and all have proc handlers.
81818 */
81819- for (entry = *tablep; entry->mode; entry++) {
81820- if (entry->child)
81821- sd_free_ctl_entry(&entry->child);
81822+ for (entry = tablep; entry->mode; entry++) {
81823+ if (entry->child) {
81824+ sd_free_ctl_entry(entry->child);
81825+ pax_open_kernel();
81826+ entry->child = NULL;
81827+ pax_close_kernel();
81828+ }
81829 if (entry->proc_handler == NULL)
81830 kfree(entry->procname);
81831 }
81832
81833- kfree(*tablep);
81834- *tablep = NULL;
81835+ kfree(tablep);
81836 }
81837
81838 static int min_load_idx = 0;
81839 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
81840
81841 static void
81842-set_table_entry(struct ctl_table *entry,
81843+set_table_entry(ctl_table_no_const *entry,
81844 const char *procname, void *data, int maxlen,
81845 umode_t mode, proc_handler *proc_handler,
81846 bool load_idx)
81847@@ -5058,7 +5065,7 @@ set_table_entry(struct ctl_table *entry,
81848 static struct ctl_table *
81849 sd_alloc_ctl_domain_table(struct sched_domain *sd)
81850 {
81851- struct ctl_table *table = sd_alloc_ctl_entry(13);
81852+ ctl_table_no_const *table = sd_alloc_ctl_entry(13);
81853
81854 if (table == NULL)
81855 return NULL;
81856@@ -5093,9 +5100,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
81857 return table;
81858 }
81859
81860-static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
81861+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
81862 {
81863- struct ctl_table *entry, *table;
81864+ ctl_table_no_const *entry, *table;
81865 struct sched_domain *sd;
81866 int domain_num = 0, i;
81867 char buf[32];
81868@@ -5122,11 +5129,13 @@ static struct ctl_table_header *sd_sysctl_header;
81869 static void register_sched_domain_sysctl(void)
81870 {
81871 int i, cpu_num = num_possible_cpus();
81872- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
81873+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
81874 char buf[32];
81875
81876 WARN_ON(sd_ctl_dir[0].child);
81877+ pax_open_kernel();
81878 sd_ctl_dir[0].child = entry;
81879+ pax_close_kernel();
81880
81881 if (entry == NULL)
81882 return;
81883@@ -5149,8 +5158,12 @@ static void unregister_sched_domain_sysctl(void)
81884 if (sd_sysctl_header)
81885 unregister_sysctl_table(sd_sysctl_header);
81886 sd_sysctl_header = NULL;
81887- if (sd_ctl_dir[0].child)
81888- sd_free_ctl_entry(&sd_ctl_dir[0].child);
81889+ if (sd_ctl_dir[0].child) {
81890+ sd_free_ctl_entry(sd_ctl_dir[0].child);
81891+ pax_open_kernel();
81892+ sd_ctl_dir[0].child = NULL;
81893+ pax_close_kernel();
81894+ }
81895 }
81896 #else
81897 static void register_sched_domain_sysctl(void)
81898@@ -5249,7 +5262,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
81899 * happens before everything else. This has to be lower priority than
81900 * the notifier in the perf_event subsystem, though.
81901 */
81902-static struct notifier_block __cpuinitdata migration_notifier = {
81903+static struct notifier_block migration_notifier = {
81904 .notifier_call = migration_call,
81905 .priority = CPU_PRI_MIGRATION,
81906 };
81907diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
81908index 03b73be..9422b9f 100644
81909--- a/kernel/sched/fair.c
81910+++ b/kernel/sched/fair.c
81911@@ -831,7 +831,7 @@ void task_numa_fault(int node, int pages, bool migrated)
81912
81913 static void reset_ptenuma_scan(struct task_struct *p)
81914 {
81915- ACCESS_ONCE(p->mm->numa_scan_seq)++;
81916+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
81917 p->mm->numa_scan_offset = 0;
81918 }
81919
81920@@ -5687,7 +5687,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
81921 * run_rebalance_domains is triggered when needed from the scheduler tick.
81922 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
81923 */
81924-static void run_rebalance_domains(struct softirq_action *h)
81925+static void run_rebalance_domains(void)
81926 {
81927 int this_cpu = smp_processor_id();
81928 struct rq *this_rq = cpu_rq(this_cpu);
81929diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
81930index ce39224d..0e09343 100644
81931--- a/kernel/sched/sched.h
81932+++ b/kernel/sched/sched.h
81933@@ -1009,7 +1009,7 @@ struct sched_class {
81934 #ifdef CONFIG_FAIR_GROUP_SCHED
81935 void (*task_move_group) (struct task_struct *p, int on_rq);
81936 #endif
81937-};
81938+} __do_const;
81939
81940 #define sched_class_highest (&stop_sched_class)
81941 #define for_each_class(class) \
81942diff --git a/kernel/signal.c b/kernel/signal.c
81943index 113411b..20d0a99 100644
81944--- a/kernel/signal.c
81945+++ b/kernel/signal.c
81946@@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
81947
81948 int print_fatal_signals __read_mostly;
81949
81950-static void __user *sig_handler(struct task_struct *t, int sig)
81951+static __sighandler_t sig_handler(struct task_struct *t, int sig)
81952 {
81953 return t->sighand->action[sig - 1].sa.sa_handler;
81954 }
81955
81956-static int sig_handler_ignored(void __user *handler, int sig)
81957+static int sig_handler_ignored(__sighandler_t handler, int sig)
81958 {
81959 /* Is it explicitly or implicitly ignored? */
81960 return handler == SIG_IGN ||
81961@@ -65,7 +65,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
81962
81963 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
81964 {
81965- void __user *handler;
81966+ __sighandler_t handler;
81967
81968 handler = sig_handler(t, sig);
81969
81970@@ -369,6 +369,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
81971 atomic_inc(&user->sigpending);
81972 rcu_read_unlock();
81973
81974+ if (!override_rlimit)
81975+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
81976+
81977 if (override_rlimit ||
81978 atomic_read(&user->sigpending) <=
81979 task_rlimit(t, RLIMIT_SIGPENDING)) {
81980@@ -496,7 +499,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
81981
81982 int unhandled_signal(struct task_struct *tsk, int sig)
81983 {
81984- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
81985+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
81986 if (is_global_init(tsk))
81987 return 1;
81988 if (handler != SIG_IGN && handler != SIG_DFL)
81989@@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
81990 }
81991 }
81992
81993+ /* allow glibc communication via tgkill to other threads in our
81994+ thread group */
81995+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
81996+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
81997+ && gr_handle_signal(t, sig))
81998+ return -EPERM;
81999+
82000 return security_task_kill(t, info, sig, 0);
82001 }
82002
82003@@ -1199,7 +1209,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
82004 return send_signal(sig, info, p, 1);
82005 }
82006
82007-static int
82008+int
82009 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
82010 {
82011 return send_signal(sig, info, t, 0);
82012@@ -1236,6 +1246,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
82013 unsigned long int flags;
82014 int ret, blocked, ignored;
82015 struct k_sigaction *action;
82016+ int is_unhandled = 0;
82017
82018 spin_lock_irqsave(&t->sighand->siglock, flags);
82019 action = &t->sighand->action[sig-1];
82020@@ -1250,9 +1261,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
82021 }
82022 if (action->sa.sa_handler == SIG_DFL)
82023 t->signal->flags &= ~SIGNAL_UNKILLABLE;
82024+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
82025+ is_unhandled = 1;
82026 ret = specific_send_sig_info(sig, info, t);
82027 spin_unlock_irqrestore(&t->sighand->siglock, flags);
82028
82029+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
82030+ normal operation */
82031+ if (is_unhandled) {
82032+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
82033+ gr_handle_crash(t, sig);
82034+ }
82035+
82036 return ret;
82037 }
82038
82039@@ -1319,8 +1339,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
82040 ret = check_kill_permission(sig, info, p);
82041 rcu_read_unlock();
82042
82043- if (!ret && sig)
82044+ if (!ret && sig) {
82045 ret = do_send_sig_info(sig, info, p, true);
82046+ if (!ret)
82047+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
82048+ }
82049
82050 return ret;
82051 }
82052@@ -2926,7 +2949,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
82053 int error = -ESRCH;
82054
82055 rcu_read_lock();
82056- p = find_task_by_vpid(pid);
82057+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82058+ /* allow glibc communication via tgkill to other threads in our
82059+ thread group */
82060+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
82061+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
82062+ p = find_task_by_vpid_unrestricted(pid);
82063+ else
82064+#endif
82065+ p = find_task_by_vpid(pid);
82066 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
82067 error = check_kill_permission(sig, info, p);
82068 /*
82069@@ -3219,6 +3250,16 @@ int __save_altstack(stack_t __user *uss, unsigned long sp)
82070 __put_user(t->sas_ss_size, &uss->ss_size);
82071 }
82072
82073+#ifdef CONFIG_X86
82074+void __save_altstack_ex(stack_t __user *uss, unsigned long sp)
82075+{
82076+ struct task_struct *t = current;
82077+ put_user_ex((void __user *)t->sas_ss_sp, &uss->ss_sp);
82078+ put_user_ex(sas_ss_flags(sp), &uss->ss_flags);
82079+ put_user_ex(t->sas_ss_size, &uss->ss_size);
82080+}
82081+#endif
82082+
82083 #ifdef CONFIG_COMPAT
82084 COMPAT_SYSCALL_DEFINE2(sigaltstack,
82085 const compat_stack_t __user *, uss_ptr,
82086@@ -3240,8 +3281,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
82087 }
82088 seg = get_fs();
82089 set_fs(KERNEL_DS);
82090- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
82091- (stack_t __force __user *) &uoss,
82092+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
82093+ (stack_t __force_user *) &uoss,
82094 compat_user_stack_pointer());
82095 set_fs(seg);
82096 if (ret >= 0 && uoss_ptr) {
82097@@ -3268,6 +3309,16 @@ int __compat_save_altstack(compat_stack_t __user *uss, unsigned long sp)
82098 __put_user(sas_ss_flags(sp), &uss->ss_flags) |
82099 __put_user(t->sas_ss_size, &uss->ss_size);
82100 }
82101+
82102+#ifdef CONFIG_X86
82103+void __compat_save_altstack_ex(compat_stack_t __user *uss, unsigned long sp)
82104+{
82105+ struct task_struct *t = current;
82106+ put_user_ex(ptr_to_compat((void __user *)t->sas_ss_sp), &uss->ss_sp);
82107+ put_user_ex(sas_ss_flags(sp), &uss->ss_flags);
82108+ put_user_ex(t->sas_ss_size, &uss->ss_size);
82109+}
82110+#endif
82111 #endif
82112
82113 #ifdef __ARCH_WANT_SYS_SIGPENDING
82114diff --git a/kernel/smp.c b/kernel/smp.c
82115index 4dba0f7..fe9f773 100644
82116--- a/kernel/smp.c
82117+++ b/kernel/smp.c
82118@@ -73,7 +73,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
82119 return NOTIFY_OK;
82120 }
82121
82122-static struct notifier_block __cpuinitdata hotplug_cfd_notifier = {
82123+static struct notifier_block hotplug_cfd_notifier = {
82124 .notifier_call = hotplug_cfd,
82125 };
82126
82127diff --git a/kernel/smpboot.c b/kernel/smpboot.c
82128index 02fc5c9..e54c335 100644
82129--- a/kernel/smpboot.c
82130+++ b/kernel/smpboot.c
82131@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
82132 }
82133 smpboot_unpark_thread(plug_thread, cpu);
82134 }
82135- list_add(&plug_thread->list, &hotplug_threads);
82136+ pax_list_add(&plug_thread->list, &hotplug_threads);
82137 out:
82138 mutex_unlock(&smpboot_threads_lock);
82139 return ret;
82140@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
82141 {
82142 get_online_cpus();
82143 mutex_lock(&smpboot_threads_lock);
82144- list_del(&plug_thread->list);
82145+ pax_list_del(&plug_thread->list);
82146 smpboot_destroy_threads(plug_thread);
82147 mutex_unlock(&smpboot_threads_lock);
82148 put_online_cpus();
82149diff --git a/kernel/softirq.c b/kernel/softirq.c
82150index 3d6833f..da6d93d 100644
82151--- a/kernel/softirq.c
82152+++ b/kernel/softirq.c
82153@@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
82154 EXPORT_SYMBOL(irq_stat);
82155 #endif
82156
82157-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
82158+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
82159
82160 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
82161
82162-char *softirq_to_name[NR_SOFTIRQS] = {
82163+const char * const softirq_to_name[NR_SOFTIRQS] = {
82164 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
82165 "TASKLET", "SCHED", "HRTIMER", "RCU"
82166 };
82167@@ -250,7 +250,7 @@ restart:
82168 kstat_incr_softirqs_this_cpu(vec_nr);
82169
82170 trace_softirq_entry(vec_nr);
82171- h->action(h);
82172+ h->action();
82173 trace_softirq_exit(vec_nr);
82174 if (unlikely(prev_count != preempt_count())) {
82175 printk(KERN_ERR "huh, entered softirq %u %s %p"
82176@@ -405,7 +405,7 @@ void __raise_softirq_irqoff(unsigned int nr)
82177 or_softirq_pending(1UL << nr);
82178 }
82179
82180-void open_softirq(int nr, void (*action)(struct softirq_action *))
82181+void __init open_softirq(int nr, void (*action)(void))
82182 {
82183 softirq_vec[nr].action = action;
82184 }
82185@@ -461,7 +461,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
82186
82187 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
82188
82189-static void tasklet_action(struct softirq_action *a)
82190+static void tasklet_action(void)
82191 {
82192 struct tasklet_struct *list;
82193
82194@@ -496,7 +496,7 @@ static void tasklet_action(struct softirq_action *a)
82195 }
82196 }
82197
82198-static void tasklet_hi_action(struct softirq_action *a)
82199+static void tasklet_hi_action(void)
82200 {
82201 struct tasklet_struct *list;
82202
82203@@ -730,7 +730,7 @@ static int __cpuinit remote_softirq_cpu_notify(struct notifier_block *self,
82204 return NOTIFY_OK;
82205 }
82206
82207-static struct notifier_block __cpuinitdata remote_softirq_cpu_notifier = {
82208+static struct notifier_block remote_softirq_cpu_notifier = {
82209 .notifier_call = remote_softirq_cpu_notify,
82210 };
82211
82212@@ -847,11 +847,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
82213 return NOTIFY_OK;
82214 }
82215
82216-static struct notifier_block __cpuinitdata cpu_nfb = {
82217+static struct notifier_block cpu_nfb = {
82218 .notifier_call = cpu_callback
82219 };
82220
82221-static struct smp_hotplug_thread softirq_threads = {
82222+static struct smp_hotplug_thread softirq_threads __read_only = {
82223 .store = &ksoftirqd,
82224 .thread_should_run = ksoftirqd_should_run,
82225 .thread_fn = run_ksoftirqd,
82226diff --git a/kernel/srcu.c b/kernel/srcu.c
82227index 01d5ccb..cdcbee6 100644
82228--- a/kernel/srcu.c
82229+++ b/kernel/srcu.c
82230@@ -300,9 +300,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
82231
82232 idx = ACCESS_ONCE(sp->completed) & 0x1;
82233 preempt_disable();
82234- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
82235+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
82236 smp_mb(); /* B */ /* Avoid leaking the critical section. */
82237- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
82238+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
82239 preempt_enable();
82240 return idx;
82241 }
82242diff --git a/kernel/sys.c b/kernel/sys.c
82243index 2bbd9a7..0875671 100644
82244--- a/kernel/sys.c
82245+++ b/kernel/sys.c
82246@@ -163,6 +163,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
82247 error = -EACCES;
82248 goto out;
82249 }
82250+
82251+ if (gr_handle_chroot_setpriority(p, niceval)) {
82252+ error = -EACCES;
82253+ goto out;
82254+ }
82255+
82256 no_nice = security_task_setnice(p, niceval);
82257 if (no_nice) {
82258 error = no_nice;
82259@@ -626,6 +632,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
82260 goto error;
82261 }
82262
82263+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
82264+ goto error;
82265+
82266 if (rgid != (gid_t) -1 ||
82267 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
82268 new->sgid = new->egid;
82269@@ -661,6 +670,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
82270 old = current_cred();
82271
82272 retval = -EPERM;
82273+
82274+ if (gr_check_group_change(kgid, kgid, kgid))
82275+ goto error;
82276+
82277 if (nsown_capable(CAP_SETGID))
82278 new->gid = new->egid = new->sgid = new->fsgid = kgid;
82279 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
82280@@ -678,7 +691,7 @@ error:
82281 /*
82282 * change the user struct in a credentials set to match the new UID
82283 */
82284-static int set_user(struct cred *new)
82285+int set_user(struct cred *new)
82286 {
82287 struct user_struct *new_user;
82288
82289@@ -758,6 +771,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
82290 goto error;
82291 }
82292
82293+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
82294+ goto error;
82295+
82296 if (!uid_eq(new->uid, old->uid)) {
82297 retval = set_user(new);
82298 if (retval < 0)
82299@@ -808,6 +824,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
82300 old = current_cred();
82301
82302 retval = -EPERM;
82303+
82304+ if (gr_check_crash_uid(kuid))
82305+ goto error;
82306+ if (gr_check_user_change(kuid, kuid, kuid))
82307+ goto error;
82308+
82309 if (nsown_capable(CAP_SETUID)) {
82310 new->suid = new->uid = kuid;
82311 if (!uid_eq(kuid, old->uid)) {
82312@@ -877,6 +899,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
82313 goto error;
82314 }
82315
82316+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
82317+ goto error;
82318+
82319 if (ruid != (uid_t) -1) {
82320 new->uid = kruid;
82321 if (!uid_eq(kruid, old->uid)) {
82322@@ -959,6 +984,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
82323 goto error;
82324 }
82325
82326+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
82327+ goto error;
82328+
82329 if (rgid != (gid_t) -1)
82330 new->gid = krgid;
82331 if (egid != (gid_t) -1)
82332@@ -1020,12 +1048,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
82333 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
82334 nsown_capable(CAP_SETUID)) {
82335 if (!uid_eq(kuid, old->fsuid)) {
82336+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
82337+ goto error;
82338+
82339 new->fsuid = kuid;
82340 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
82341 goto change_okay;
82342 }
82343 }
82344
82345+error:
82346 abort_creds(new);
82347 return old_fsuid;
82348
82349@@ -1058,12 +1090,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
82350 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
82351 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
82352 nsown_capable(CAP_SETGID)) {
82353+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
82354+ goto error;
82355+
82356 if (!gid_eq(kgid, old->fsgid)) {
82357 new->fsgid = kgid;
82358 goto change_okay;
82359 }
82360 }
82361
82362+error:
82363 abort_creds(new);
82364 return old_fsgid;
82365
82366@@ -1432,19 +1468,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
82367 return -EFAULT;
82368
82369 down_read(&uts_sem);
82370- error = __copy_to_user(&name->sysname, &utsname()->sysname,
82371+ error = __copy_to_user(name->sysname, &utsname()->sysname,
82372 __OLD_UTS_LEN);
82373 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
82374- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
82375+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
82376 __OLD_UTS_LEN);
82377 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
82378- error |= __copy_to_user(&name->release, &utsname()->release,
82379+ error |= __copy_to_user(name->release, &utsname()->release,
82380 __OLD_UTS_LEN);
82381 error |= __put_user(0, name->release + __OLD_UTS_LEN);
82382- error |= __copy_to_user(&name->version, &utsname()->version,
82383+ error |= __copy_to_user(name->version, &utsname()->version,
82384 __OLD_UTS_LEN);
82385 error |= __put_user(0, name->version + __OLD_UTS_LEN);
82386- error |= __copy_to_user(&name->machine, &utsname()->machine,
82387+ error |= __copy_to_user(name->machine, &utsname()->machine,
82388 __OLD_UTS_LEN);
82389 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
82390 up_read(&uts_sem);
82391@@ -1646,6 +1682,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
82392 */
82393 new_rlim->rlim_cur = 1;
82394 }
82395+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
82396+ is changed to a lower value. Since tasks can be created by the same
82397+ user in between this limit change and an execve by this task, force
82398+ a recheck only for this task by setting PF_NPROC_EXCEEDED
82399+ */
82400+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
82401+ tsk->flags |= PF_NPROC_EXCEEDED;
82402 }
82403 if (!retval) {
82404 if (old_rlim)
82405diff --git a/kernel/sysctl.c b/kernel/sysctl.c
82406index 9edcf45..713c960 100644
82407--- a/kernel/sysctl.c
82408+++ b/kernel/sysctl.c
82409@@ -93,7 +93,6 @@
82410
82411
82412 #if defined(CONFIG_SYSCTL)
82413-
82414 /* External variables not in a header file. */
82415 extern int sysctl_overcommit_memory;
82416 extern int sysctl_overcommit_ratio;
82417@@ -119,18 +118,18 @@ extern int blk_iopoll_enabled;
82418
82419 /* Constants used for minimum and maximum */
82420 #ifdef CONFIG_LOCKUP_DETECTOR
82421-static int sixty = 60;
82422-static int neg_one = -1;
82423+static int sixty __read_only = 60;
82424 #endif
82425
82426-static int zero;
82427-static int __maybe_unused one = 1;
82428-static int __maybe_unused two = 2;
82429-static int __maybe_unused three = 3;
82430-static unsigned long one_ul = 1;
82431-static int one_hundred = 100;
82432+static int neg_one __read_only = -1;
82433+static int zero __read_only = 0;
82434+static int __maybe_unused one __read_only = 1;
82435+static int __maybe_unused two __read_only = 2;
82436+static int __maybe_unused three __read_only = 3;
82437+static unsigned long one_ul __read_only = 1;
82438+static int one_hundred __read_only = 100;
82439 #ifdef CONFIG_PRINTK
82440-static int ten_thousand = 10000;
82441+static int ten_thousand __read_only = 10000;
82442 #endif
82443
82444 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
82445@@ -177,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
82446 void __user *buffer, size_t *lenp, loff_t *ppos);
82447 #endif
82448
82449-#ifdef CONFIG_PRINTK
82450 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
82451 void __user *buffer, size_t *lenp, loff_t *ppos);
82452-#endif
82453
82454 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
82455 void __user *buffer, size_t *lenp, loff_t *ppos);
82456@@ -211,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
82457
82458 #endif
82459
82460+extern struct ctl_table grsecurity_table[];
82461+
82462 static struct ctl_table kern_table[];
82463 static struct ctl_table vm_table[];
82464 static struct ctl_table fs_table[];
82465@@ -225,6 +224,20 @@ extern struct ctl_table epoll_table[];
82466 int sysctl_legacy_va_layout;
82467 #endif
82468
82469+#ifdef CONFIG_PAX_SOFTMODE
82470+static ctl_table pax_table[] = {
82471+ {
82472+ .procname = "softmode",
82473+ .data = &pax_softmode,
82474+ .maxlen = sizeof(unsigned int),
82475+ .mode = 0600,
82476+ .proc_handler = &proc_dointvec,
82477+ },
82478+
82479+ { }
82480+};
82481+#endif
82482+
82483 /* The default sysctl tables: */
82484
82485 static struct ctl_table sysctl_base_table[] = {
82486@@ -273,6 +286,22 @@ static int max_extfrag_threshold = 1000;
82487 #endif
82488
82489 static struct ctl_table kern_table[] = {
82490+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
82491+ {
82492+ .procname = "grsecurity",
82493+ .mode = 0500,
82494+ .child = grsecurity_table,
82495+ },
82496+#endif
82497+
82498+#ifdef CONFIG_PAX_SOFTMODE
82499+ {
82500+ .procname = "pax",
82501+ .mode = 0500,
82502+ .child = pax_table,
82503+ },
82504+#endif
82505+
82506 {
82507 .procname = "sched_child_runs_first",
82508 .data = &sysctl_sched_child_runs_first,
82509@@ -607,7 +636,7 @@ static struct ctl_table kern_table[] = {
82510 .data = &modprobe_path,
82511 .maxlen = KMOD_PATH_LEN,
82512 .mode = 0644,
82513- .proc_handler = proc_dostring,
82514+ .proc_handler = proc_dostring_modpriv,
82515 },
82516 {
82517 .procname = "modules_disabled",
82518@@ -774,16 +803,20 @@ static struct ctl_table kern_table[] = {
82519 .extra1 = &zero,
82520 .extra2 = &one,
82521 },
82522+#endif
82523 {
82524 .procname = "kptr_restrict",
82525 .data = &kptr_restrict,
82526 .maxlen = sizeof(int),
82527 .mode = 0644,
82528 .proc_handler = proc_dointvec_minmax_sysadmin,
82529+#ifdef CONFIG_GRKERNSEC_HIDESYM
82530+ .extra1 = &two,
82531+#else
82532 .extra1 = &zero,
82533+#endif
82534 .extra2 = &two,
82535 },
82536-#endif
82537 {
82538 .procname = "ngroups_max",
82539 .data = &ngroups_max,
82540@@ -1025,10 +1058,17 @@ static struct ctl_table kern_table[] = {
82541 */
82542 {
82543 .procname = "perf_event_paranoid",
82544- .data = &sysctl_perf_event_paranoid,
82545- .maxlen = sizeof(sysctl_perf_event_paranoid),
82546+ .data = &sysctl_perf_event_legitimately_concerned,
82547+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
82548 .mode = 0644,
82549- .proc_handler = proc_dointvec,
82550+ /* go ahead, be a hero */
82551+ .proc_handler = proc_dointvec_minmax_sysadmin,
82552+ .extra1 = &neg_one,
82553+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
82554+ .extra2 = &three,
82555+#else
82556+ .extra2 = &two,
82557+#endif
82558 },
82559 {
82560 .procname = "perf_event_mlock_kb",
82561@@ -1282,6 +1322,13 @@ static struct ctl_table vm_table[] = {
82562 .proc_handler = proc_dointvec_minmax,
82563 .extra1 = &zero,
82564 },
82565+ {
82566+ .procname = "heap_stack_gap",
82567+ .data = &sysctl_heap_stack_gap,
82568+ .maxlen = sizeof(sysctl_heap_stack_gap),
82569+ .mode = 0644,
82570+ .proc_handler = proc_doulongvec_minmax,
82571+ },
82572 #else
82573 {
82574 .procname = "nr_trim_pages",
82575@@ -1746,6 +1793,16 @@ int proc_dostring(struct ctl_table *table, int write,
82576 buffer, lenp, ppos);
82577 }
82578
82579+int proc_dostring_modpriv(struct ctl_table *table, int write,
82580+ void __user *buffer, size_t *lenp, loff_t *ppos)
82581+{
82582+ if (write && !capable(CAP_SYS_MODULE))
82583+ return -EPERM;
82584+
82585+ return _proc_do_string(table->data, table->maxlen, write,
82586+ buffer, lenp, ppos);
82587+}
82588+
82589 static size_t proc_skip_spaces(char **buf)
82590 {
82591 size_t ret;
82592@@ -1851,6 +1908,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
82593 len = strlen(tmp);
82594 if (len > *size)
82595 len = *size;
82596+ if (len > sizeof(tmp))
82597+ len = sizeof(tmp);
82598 if (copy_to_user(*buf, tmp, len))
82599 return -EFAULT;
82600 *size -= len;
82601@@ -2015,7 +2074,7 @@ int proc_dointvec(struct ctl_table *table, int write,
82602 static int proc_taint(struct ctl_table *table, int write,
82603 void __user *buffer, size_t *lenp, loff_t *ppos)
82604 {
82605- struct ctl_table t;
82606+ ctl_table_no_const t;
82607 unsigned long tmptaint = get_taint();
82608 int err;
82609
82610@@ -2043,7 +2102,6 @@ static int proc_taint(struct ctl_table *table, int write,
82611 return err;
82612 }
82613
82614-#ifdef CONFIG_PRINTK
82615 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
82616 void __user *buffer, size_t *lenp, loff_t *ppos)
82617 {
82618@@ -2052,7 +2110,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
82619
82620 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
82621 }
82622-#endif
82623
82624 struct do_proc_dointvec_minmax_conv_param {
82625 int *min;
82626@@ -2199,8 +2256,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
82627 *i = val;
82628 } else {
82629 val = convdiv * (*i) / convmul;
82630- if (!first)
82631+ if (!first) {
82632 err = proc_put_char(&buffer, &left, '\t');
82633+ if (err)
82634+ break;
82635+ }
82636 err = proc_put_long(&buffer, &left, val, false);
82637 if (err)
82638 break;
82639@@ -2592,6 +2652,12 @@ int proc_dostring(struct ctl_table *table, int write,
82640 return -ENOSYS;
82641 }
82642
82643+int proc_dostring_modpriv(struct ctl_table *table, int write,
82644+ void __user *buffer, size_t *lenp, loff_t *ppos)
82645+{
82646+ return -ENOSYS;
82647+}
82648+
82649 int proc_dointvec(struct ctl_table *table, int write,
82650 void __user *buffer, size_t *lenp, loff_t *ppos)
82651 {
82652@@ -2648,5 +2714,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
82653 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
82654 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
82655 EXPORT_SYMBOL(proc_dostring);
82656+EXPORT_SYMBOL(proc_dostring_modpriv);
82657 EXPORT_SYMBOL(proc_doulongvec_minmax);
82658 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
82659diff --git a/kernel/taskstats.c b/kernel/taskstats.c
82660index 145bb4d..b2aa969 100644
82661--- a/kernel/taskstats.c
82662+++ b/kernel/taskstats.c
82663@@ -28,9 +28,12 @@
82664 #include <linux/fs.h>
82665 #include <linux/file.h>
82666 #include <linux/pid_namespace.h>
82667+#include <linux/grsecurity.h>
82668 #include <net/genetlink.h>
82669 #include <linux/atomic.h>
82670
82671+extern int gr_is_taskstats_denied(int pid);
82672+
82673 /*
82674 * Maximum length of a cpumask that can be specified in
82675 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
82676@@ -570,6 +573,9 @@ err:
82677
82678 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
82679 {
82680+ if (gr_is_taskstats_denied(current->pid))
82681+ return -EACCES;
82682+
82683 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
82684 return cmd_attr_register_cpumask(info);
82685 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
82686diff --git a/kernel/time.c b/kernel/time.c
82687index d3617db..c98bbe9 100644
82688--- a/kernel/time.c
82689+++ b/kernel/time.c
82690@@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
82691 return error;
82692
82693 if (tz) {
82694+ /* we log in do_settimeofday called below, so don't log twice
82695+ */
82696+ if (!tv)
82697+ gr_log_timechange();
82698+
82699 sys_tz = *tz;
82700 update_vsyscall_tz();
82701 if (firsttime) {
82702@@ -502,7 +507,7 @@ EXPORT_SYMBOL(usecs_to_jiffies);
82703 * The >> (NSEC_JIFFIE_SC - SEC_JIFFIE_SC) converts the scaled nsec
82704 * value to a scaled second value.
82705 */
82706-unsigned long
82707+unsigned long __intentional_overflow(-1)
82708 timespec_to_jiffies(const struct timespec *value)
82709 {
82710 unsigned long sec = value->tv_sec;
82711diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
82712index f11d83b..d016d91 100644
82713--- a/kernel/time/alarmtimer.c
82714+++ b/kernel/time/alarmtimer.c
82715@@ -750,7 +750,7 @@ static int __init alarmtimer_init(void)
82716 struct platform_device *pdev;
82717 int error = 0;
82718 int i;
82719- struct k_clock alarm_clock = {
82720+ static struct k_clock alarm_clock = {
82721 .clock_getres = alarm_clock_getres,
82722 .clock_get = alarm_clock_get,
82723 .timer_create = alarm_timer_create,
82724diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
82725index baeeb5c..c22704a 100644
82726--- a/kernel/time/timekeeping.c
82727+++ b/kernel/time/timekeeping.c
82728@@ -15,6 +15,7 @@
82729 #include <linux/init.h>
82730 #include <linux/mm.h>
82731 #include <linux/sched.h>
82732+#include <linux/grsecurity.h>
82733 #include <linux/syscore_ops.h>
82734 #include <linux/clocksource.h>
82735 #include <linux/jiffies.h>
82736@@ -495,6 +496,8 @@ int do_settimeofday(const struct timespec *tv)
82737 if (!timespec_valid_strict(tv))
82738 return -EINVAL;
82739
82740+ gr_log_timechange();
82741+
82742 raw_spin_lock_irqsave(&timekeeper_lock, flags);
82743 write_seqcount_begin(&timekeeper_seq);
82744
82745diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
82746index 3bdf283..cc68d83 100644
82747--- a/kernel/time/timer_list.c
82748+++ b/kernel/time/timer_list.c
82749@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
82750
82751 static void print_name_offset(struct seq_file *m, void *sym)
82752 {
82753+#ifdef CONFIG_GRKERNSEC_HIDESYM
82754+ SEQ_printf(m, "<%p>", NULL);
82755+#else
82756 char symname[KSYM_NAME_LEN];
82757
82758 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
82759 SEQ_printf(m, "<%pK>", sym);
82760 else
82761 SEQ_printf(m, "%s", symname);
82762+#endif
82763 }
82764
82765 static void
82766@@ -119,7 +123,11 @@ next_one:
82767 static void
82768 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
82769 {
82770+#ifdef CONFIG_GRKERNSEC_HIDESYM
82771+ SEQ_printf(m, " .base: %p\n", NULL);
82772+#else
82773 SEQ_printf(m, " .base: %pK\n", base);
82774+#endif
82775 SEQ_printf(m, " .index: %d\n",
82776 base->index);
82777 SEQ_printf(m, " .resolution: %Lu nsecs\n",
82778@@ -355,7 +363,11 @@ static int __init init_timer_list_procfs(void)
82779 {
82780 struct proc_dir_entry *pe;
82781
82782+#ifdef CONFIG_GRKERNSEC_PROC_ADD
82783+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
82784+#else
82785 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
82786+#endif
82787 if (!pe)
82788 return -ENOMEM;
82789 return 0;
82790diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
82791index 0b537f2..40d6c20 100644
82792--- a/kernel/time/timer_stats.c
82793+++ b/kernel/time/timer_stats.c
82794@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
82795 static unsigned long nr_entries;
82796 static struct entry entries[MAX_ENTRIES];
82797
82798-static atomic_t overflow_count;
82799+static atomic_unchecked_t overflow_count;
82800
82801 /*
82802 * The entries are in a hash-table, for fast lookup:
82803@@ -140,7 +140,7 @@ static void reset_entries(void)
82804 nr_entries = 0;
82805 memset(entries, 0, sizeof(entries));
82806 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
82807- atomic_set(&overflow_count, 0);
82808+ atomic_set_unchecked(&overflow_count, 0);
82809 }
82810
82811 static struct entry *alloc_entry(void)
82812@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
82813 if (likely(entry))
82814 entry->count++;
82815 else
82816- atomic_inc(&overflow_count);
82817+ atomic_inc_unchecked(&overflow_count);
82818
82819 out_unlock:
82820 raw_spin_unlock_irqrestore(lock, flags);
82821@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
82822
82823 static void print_name_offset(struct seq_file *m, unsigned long addr)
82824 {
82825+#ifdef CONFIG_GRKERNSEC_HIDESYM
82826+ seq_printf(m, "<%p>", NULL);
82827+#else
82828 char symname[KSYM_NAME_LEN];
82829
82830 if (lookup_symbol_name(addr, symname) < 0)
82831- seq_printf(m, "<%p>", (void *)addr);
82832+ seq_printf(m, "<%pK>", (void *)addr);
82833 else
82834 seq_printf(m, "%s", symname);
82835+#endif
82836 }
82837
82838 static int tstats_show(struct seq_file *m, void *v)
82839@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
82840
82841 seq_puts(m, "Timer Stats Version: v0.2\n");
82842 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
82843- if (atomic_read(&overflow_count))
82844+ if (atomic_read_unchecked(&overflow_count))
82845 seq_printf(m, "Overflow: %d entries\n",
82846- atomic_read(&overflow_count));
82847+ atomic_read_unchecked(&overflow_count));
82848
82849 for (i = 0; i < nr_entries; i++) {
82850 entry = entries + i;
82851@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
82852 {
82853 struct proc_dir_entry *pe;
82854
82855+#ifdef CONFIG_GRKERNSEC_PROC_ADD
82856+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
82857+#else
82858 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
82859+#endif
82860 if (!pe)
82861 return -ENOMEM;
82862 return 0;
82863diff --git a/kernel/timer.c b/kernel/timer.c
82864index 15bc1b4..32da49c 100644
82865--- a/kernel/timer.c
82866+++ b/kernel/timer.c
82867@@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
82868 /*
82869 * This function runs timers and the timer-tq in bottom half context.
82870 */
82871-static void run_timer_softirq(struct softirq_action *h)
82872+static void run_timer_softirq(void)
82873 {
82874 struct tvec_base *base = __this_cpu_read(tvec_bases);
82875
82876@@ -1429,7 +1429,7 @@ static void process_timeout(unsigned long __data)
82877 *
82878 * In all cases the return value is guaranteed to be non-negative.
82879 */
82880-signed long __sched schedule_timeout(signed long timeout)
82881+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
82882 {
82883 struct timer_list timer;
82884 unsigned long expire;
82885@@ -1635,7 +1635,7 @@ static int __cpuinit timer_cpu_notify(struct notifier_block *self,
82886 return NOTIFY_OK;
82887 }
82888
82889-static struct notifier_block __cpuinitdata timers_nb = {
82890+static struct notifier_block timers_nb = {
82891 .notifier_call = timer_cpu_notify,
82892 };
82893
82894diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
82895index b8b8560..75b1a09 100644
82896--- a/kernel/trace/blktrace.c
82897+++ b/kernel/trace/blktrace.c
82898@@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
82899 struct blk_trace *bt = filp->private_data;
82900 char buf[16];
82901
82902- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
82903+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
82904
82905 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
82906 }
82907@@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
82908 return 1;
82909
82910 bt = buf->chan->private_data;
82911- atomic_inc(&bt->dropped);
82912+ atomic_inc_unchecked(&bt->dropped);
82913 return 0;
82914 }
82915
82916@@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
82917
82918 bt->dir = dir;
82919 bt->dev = dev;
82920- atomic_set(&bt->dropped, 0);
82921+ atomic_set_unchecked(&bt->dropped, 0);
82922
82923 ret = -EIO;
82924 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
82925diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
82926index 6c508ff..ee55a13 100644
82927--- a/kernel/trace/ftrace.c
82928+++ b/kernel/trace/ftrace.c
82929@@ -1915,12 +1915,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
82930 if (unlikely(ftrace_disabled))
82931 return 0;
82932
82933+ ret = ftrace_arch_code_modify_prepare();
82934+ FTRACE_WARN_ON(ret);
82935+ if (ret)
82936+ return 0;
82937+
82938 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
82939+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
82940 if (ret) {
82941 ftrace_bug(ret, ip);
82942- return 0;
82943 }
82944- return 1;
82945+ return ret ? 0 : 1;
82946 }
82947
82948 /*
82949@@ -3931,8 +3936,10 @@ static int ftrace_process_locs(struct module *mod,
82950 if (!count)
82951 return 0;
82952
82953+ pax_open_kernel();
82954 sort(start, count, sizeof(*start),
82955 ftrace_cmp_ips, ftrace_swap_ips);
82956+ pax_close_kernel();
82957
82958 start_pg = ftrace_allocate_pages(count);
82959 if (!start_pg)
82960@@ -4655,8 +4662,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
82961 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
82962
82963 static int ftrace_graph_active;
82964-static struct notifier_block ftrace_suspend_notifier;
82965-
82966 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
82967 {
82968 return 0;
82969@@ -4800,6 +4805,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
82970 return NOTIFY_DONE;
82971 }
82972
82973+static struct notifier_block ftrace_suspend_notifier = {
82974+ .notifier_call = ftrace_suspend_notifier_call
82975+};
82976+
82977 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
82978 trace_func_graph_ent_t entryfunc)
82979 {
82980@@ -4813,7 +4822,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
82981 goto out;
82982 }
82983
82984- ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
82985 register_pm_notifier(&ftrace_suspend_notifier);
82986
82987 ftrace_graph_active++;
82988diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
82989index e444ff8..438b8f4 100644
82990--- a/kernel/trace/ring_buffer.c
82991+++ b/kernel/trace/ring_buffer.c
82992@@ -352,9 +352,9 @@ struct buffer_data_page {
82993 */
82994 struct buffer_page {
82995 struct list_head list; /* list of buffer pages */
82996- local_t write; /* index for next write */
82997+ local_unchecked_t write; /* index for next write */
82998 unsigned read; /* index for next read */
82999- local_t entries; /* entries on this page */
83000+ local_unchecked_t entries; /* entries on this page */
83001 unsigned long real_end; /* real end of data */
83002 struct buffer_data_page *page; /* Actual data page */
83003 };
83004@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
83005 unsigned long last_overrun;
83006 local_t entries_bytes;
83007 local_t entries;
83008- local_t overrun;
83009- local_t commit_overrun;
83010+ local_unchecked_t overrun;
83011+ local_unchecked_t commit_overrun;
83012 local_t dropped_events;
83013 local_t committing;
83014 local_t commits;
83015@@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
83016 *
83017 * We add a counter to the write field to denote this.
83018 */
83019- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
83020- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
83021+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
83022+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
83023
83024 /*
83025 * Just make sure we have seen our old_write and synchronize
83026@@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
83027 * cmpxchg to only update if an interrupt did not already
83028 * do it for us. If the cmpxchg fails, we don't care.
83029 */
83030- (void)local_cmpxchg(&next_page->write, old_write, val);
83031- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
83032+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
83033+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
83034
83035 /*
83036 * No need to worry about races with clearing out the commit.
83037@@ -1386,12 +1386,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
83038
83039 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
83040 {
83041- return local_read(&bpage->entries) & RB_WRITE_MASK;
83042+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
83043 }
83044
83045 static inline unsigned long rb_page_write(struct buffer_page *bpage)
83046 {
83047- return local_read(&bpage->write) & RB_WRITE_MASK;
83048+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
83049 }
83050
83051 static int
83052@@ -1486,7 +1486,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
83053 * bytes consumed in ring buffer from here.
83054 * Increment overrun to account for the lost events.
83055 */
83056- local_add(page_entries, &cpu_buffer->overrun);
83057+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
83058 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
83059 }
83060
83061@@ -2063,7 +2063,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
83062 * it is our responsibility to update
83063 * the counters.
83064 */
83065- local_add(entries, &cpu_buffer->overrun);
83066+ local_add_unchecked(entries, &cpu_buffer->overrun);
83067 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
83068
83069 /*
83070@@ -2213,7 +2213,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
83071 if (tail == BUF_PAGE_SIZE)
83072 tail_page->real_end = 0;
83073
83074- local_sub(length, &tail_page->write);
83075+ local_sub_unchecked(length, &tail_page->write);
83076 return;
83077 }
83078
83079@@ -2248,7 +2248,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
83080 rb_event_set_padding(event);
83081
83082 /* Set the write back to the previous setting */
83083- local_sub(length, &tail_page->write);
83084+ local_sub_unchecked(length, &tail_page->write);
83085 return;
83086 }
83087
83088@@ -2260,7 +2260,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
83089
83090 /* Set write to end of buffer */
83091 length = (tail + length) - BUF_PAGE_SIZE;
83092- local_sub(length, &tail_page->write);
83093+ local_sub_unchecked(length, &tail_page->write);
83094 }
83095
83096 /*
83097@@ -2286,7 +2286,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
83098 * about it.
83099 */
83100 if (unlikely(next_page == commit_page)) {
83101- local_inc(&cpu_buffer->commit_overrun);
83102+ local_inc_unchecked(&cpu_buffer->commit_overrun);
83103 goto out_reset;
83104 }
83105
83106@@ -2342,7 +2342,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
83107 cpu_buffer->tail_page) &&
83108 (cpu_buffer->commit_page ==
83109 cpu_buffer->reader_page))) {
83110- local_inc(&cpu_buffer->commit_overrun);
83111+ local_inc_unchecked(&cpu_buffer->commit_overrun);
83112 goto out_reset;
83113 }
83114 }
83115@@ -2390,7 +2390,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
83116 length += RB_LEN_TIME_EXTEND;
83117
83118 tail_page = cpu_buffer->tail_page;
83119- write = local_add_return(length, &tail_page->write);
83120+ write = local_add_return_unchecked(length, &tail_page->write);
83121
83122 /* set write to only the index of the write */
83123 write &= RB_WRITE_MASK;
83124@@ -2407,7 +2407,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
83125 kmemcheck_annotate_bitfield(event, bitfield);
83126 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
83127
83128- local_inc(&tail_page->entries);
83129+ local_inc_unchecked(&tail_page->entries);
83130
83131 /*
83132 * If this is the first commit on the page, then update
83133@@ -2440,7 +2440,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
83134
83135 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
83136 unsigned long write_mask =
83137- local_read(&bpage->write) & ~RB_WRITE_MASK;
83138+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
83139 unsigned long event_length = rb_event_length(event);
83140 /*
83141 * This is on the tail page. It is possible that
83142@@ -2450,7 +2450,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
83143 */
83144 old_index += write_mask;
83145 new_index += write_mask;
83146- index = local_cmpxchg(&bpage->write, old_index, new_index);
83147+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
83148 if (index == old_index) {
83149 /* update counters */
83150 local_sub(event_length, &cpu_buffer->entries_bytes);
83151@@ -2842,7 +2842,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
83152
83153 /* Do the likely case first */
83154 if (likely(bpage->page == (void *)addr)) {
83155- local_dec(&bpage->entries);
83156+ local_dec_unchecked(&bpage->entries);
83157 return;
83158 }
83159
83160@@ -2854,7 +2854,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
83161 start = bpage;
83162 do {
83163 if (bpage->page == (void *)addr) {
83164- local_dec(&bpage->entries);
83165+ local_dec_unchecked(&bpage->entries);
83166 return;
83167 }
83168 rb_inc_page(cpu_buffer, &bpage);
83169@@ -3138,7 +3138,7 @@ static inline unsigned long
83170 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
83171 {
83172 return local_read(&cpu_buffer->entries) -
83173- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
83174+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
83175 }
83176
83177 /**
83178@@ -3227,7 +3227,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
83179 return 0;
83180
83181 cpu_buffer = buffer->buffers[cpu];
83182- ret = local_read(&cpu_buffer->overrun);
83183+ ret = local_read_unchecked(&cpu_buffer->overrun);
83184
83185 return ret;
83186 }
83187@@ -3250,7 +3250,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
83188 return 0;
83189
83190 cpu_buffer = buffer->buffers[cpu];
83191- ret = local_read(&cpu_buffer->commit_overrun);
83192+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
83193
83194 return ret;
83195 }
83196@@ -3335,7 +3335,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
83197 /* if you care about this being correct, lock the buffer */
83198 for_each_buffer_cpu(buffer, cpu) {
83199 cpu_buffer = buffer->buffers[cpu];
83200- overruns += local_read(&cpu_buffer->overrun);
83201+ overruns += local_read_unchecked(&cpu_buffer->overrun);
83202 }
83203
83204 return overruns;
83205@@ -3511,8 +3511,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
83206 /*
83207 * Reset the reader page to size zero.
83208 */
83209- local_set(&cpu_buffer->reader_page->write, 0);
83210- local_set(&cpu_buffer->reader_page->entries, 0);
83211+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
83212+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
83213 local_set(&cpu_buffer->reader_page->page->commit, 0);
83214 cpu_buffer->reader_page->real_end = 0;
83215
83216@@ -3546,7 +3546,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
83217 * want to compare with the last_overrun.
83218 */
83219 smp_mb();
83220- overwrite = local_read(&(cpu_buffer->overrun));
83221+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
83222
83223 /*
83224 * Here's the tricky part.
83225@@ -4116,8 +4116,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
83226
83227 cpu_buffer->head_page
83228 = list_entry(cpu_buffer->pages, struct buffer_page, list);
83229- local_set(&cpu_buffer->head_page->write, 0);
83230- local_set(&cpu_buffer->head_page->entries, 0);
83231+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
83232+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
83233 local_set(&cpu_buffer->head_page->page->commit, 0);
83234
83235 cpu_buffer->head_page->read = 0;
83236@@ -4127,14 +4127,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
83237
83238 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
83239 INIT_LIST_HEAD(&cpu_buffer->new_pages);
83240- local_set(&cpu_buffer->reader_page->write, 0);
83241- local_set(&cpu_buffer->reader_page->entries, 0);
83242+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
83243+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
83244 local_set(&cpu_buffer->reader_page->page->commit, 0);
83245 cpu_buffer->reader_page->read = 0;
83246
83247 local_set(&cpu_buffer->entries_bytes, 0);
83248- local_set(&cpu_buffer->overrun, 0);
83249- local_set(&cpu_buffer->commit_overrun, 0);
83250+ local_set_unchecked(&cpu_buffer->overrun, 0);
83251+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
83252 local_set(&cpu_buffer->dropped_events, 0);
83253 local_set(&cpu_buffer->entries, 0);
83254 local_set(&cpu_buffer->committing, 0);
83255@@ -4538,8 +4538,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
83256 rb_init_page(bpage);
83257 bpage = reader->page;
83258 reader->page = *data_page;
83259- local_set(&reader->write, 0);
83260- local_set(&reader->entries, 0);
83261+ local_set_unchecked(&reader->write, 0);
83262+ local_set_unchecked(&reader->entries, 0);
83263 reader->read = 0;
83264 *data_page = bpage;
83265
83266diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
83267index 06a5bce..53ad6e7 100644
83268--- a/kernel/trace/trace.c
83269+++ b/kernel/trace/trace.c
83270@@ -3347,7 +3347,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
83271 return 0;
83272 }
83273
83274-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
83275+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
83276 {
83277 /* do nothing if flag is already set */
83278 if (!!(trace_flags & mask) == !!enabled)
83279diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
83280index 51b4448..7be601f 100644
83281--- a/kernel/trace/trace.h
83282+++ b/kernel/trace/trace.h
83283@@ -1035,7 +1035,7 @@ extern const char *__stop___trace_bprintk_fmt[];
83284 void trace_printk_init_buffers(void);
83285 void trace_printk_start_comm(void);
83286 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
83287-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
83288+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
83289
83290 /*
83291 * Normal trace_printk() and friends allocates special buffers
83292diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
83293index 6953263..2004e16 100644
83294--- a/kernel/trace/trace_events.c
83295+++ b/kernel/trace/trace_events.c
83296@@ -1748,10 +1748,6 @@ static LIST_HEAD(ftrace_module_file_list);
83297 struct ftrace_module_file_ops {
83298 struct list_head list;
83299 struct module *mod;
83300- struct file_operations id;
83301- struct file_operations enable;
83302- struct file_operations format;
83303- struct file_operations filter;
83304 };
83305
83306 static struct ftrace_module_file_ops *
83307@@ -1792,17 +1788,12 @@ trace_create_file_ops(struct module *mod)
83308
83309 file_ops->mod = mod;
83310
83311- file_ops->id = ftrace_event_id_fops;
83312- file_ops->id.owner = mod;
83313-
83314- file_ops->enable = ftrace_enable_fops;
83315- file_ops->enable.owner = mod;
83316-
83317- file_ops->filter = ftrace_event_filter_fops;
83318- file_ops->filter.owner = mod;
83319-
83320- file_ops->format = ftrace_event_format_fops;
83321- file_ops->format.owner = mod;
83322+ pax_open_kernel();
83323+ mod->trace_id.owner = mod;
83324+ mod->trace_enable.owner = mod;
83325+ mod->trace_filter.owner = mod;
83326+ mod->trace_format.owner = mod;
83327+ pax_close_kernel();
83328
83329 list_add(&file_ops->list, &ftrace_module_file_list);
83330
83331@@ -1895,8 +1886,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call,
83332 struct ftrace_module_file_ops *file_ops)
83333 {
83334 return __trace_add_new_event(call, tr,
83335- &file_ops->id, &file_ops->enable,
83336- &file_ops->filter, &file_ops->format);
83337+ &file_ops->mod->trace_id, &file_ops->mod->trace_enable,
83338+ &file_ops->mod->trace_filter, &file_ops->mod->trace_format);
83339 }
83340
83341 #else
83342diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
83343index a5e8f48..a9690d2 100644
83344--- a/kernel/trace/trace_mmiotrace.c
83345+++ b/kernel/trace/trace_mmiotrace.c
83346@@ -24,7 +24,7 @@ struct header_iter {
83347 static struct trace_array *mmio_trace_array;
83348 static bool overrun_detected;
83349 static unsigned long prev_overruns;
83350-static atomic_t dropped_count;
83351+static atomic_unchecked_t dropped_count;
83352
83353 static void mmio_reset_data(struct trace_array *tr)
83354 {
83355@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
83356
83357 static unsigned long count_overruns(struct trace_iterator *iter)
83358 {
83359- unsigned long cnt = atomic_xchg(&dropped_count, 0);
83360+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
83361 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
83362
83363 if (over > prev_overruns)
83364@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
83365 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
83366 sizeof(*entry), 0, pc);
83367 if (!event) {
83368- atomic_inc(&dropped_count);
83369+ atomic_inc_unchecked(&dropped_count);
83370 return;
83371 }
83372 entry = ring_buffer_event_data(event);
83373@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
83374 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
83375 sizeof(*entry), 0, pc);
83376 if (!event) {
83377- atomic_inc(&dropped_count);
83378+ atomic_inc_unchecked(&dropped_count);
83379 return;
83380 }
83381 entry = ring_buffer_event_data(event);
83382diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
83383index bb922d9..2a54a257 100644
83384--- a/kernel/trace/trace_output.c
83385+++ b/kernel/trace/trace_output.c
83386@@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
83387
83388 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
83389 if (!IS_ERR(p)) {
83390- p = mangle_path(s->buffer + s->len, p, "\n");
83391+ p = mangle_path(s->buffer + s->len, p, "\n\\");
83392 if (p) {
83393 s->len = p - s->buffer;
83394 return 1;
83395@@ -893,14 +893,16 @@ int register_ftrace_event(struct trace_event *event)
83396 goto out;
83397 }
83398
83399+ pax_open_kernel();
83400 if (event->funcs->trace == NULL)
83401- event->funcs->trace = trace_nop_print;
83402+ *(void **)&event->funcs->trace = trace_nop_print;
83403 if (event->funcs->raw == NULL)
83404- event->funcs->raw = trace_nop_print;
83405+ *(void **)&event->funcs->raw = trace_nop_print;
83406 if (event->funcs->hex == NULL)
83407- event->funcs->hex = trace_nop_print;
83408+ *(void **)&event->funcs->hex = trace_nop_print;
83409 if (event->funcs->binary == NULL)
83410- event->funcs->binary = trace_nop_print;
83411+ *(void **)&event->funcs->binary = trace_nop_print;
83412+ pax_close_kernel();
83413
83414 key = event->type & (EVENT_HASHSIZE - 1);
83415
83416diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
83417index b20428c..4845a10 100644
83418--- a/kernel/trace/trace_stack.c
83419+++ b/kernel/trace/trace_stack.c
83420@@ -68,7 +68,7 @@ check_stack(unsigned long ip, unsigned long *stack)
83421 return;
83422
83423 /* we do not handle interrupt stacks yet */
83424- if (!object_is_on_stack(stack))
83425+ if (!object_starts_on_stack(stack))
83426 return;
83427
83428 local_irq_save(flags);
83429diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
83430index 9064b91..1f5d2f8 100644
83431--- a/kernel/user_namespace.c
83432+++ b/kernel/user_namespace.c
83433@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
83434 !kgid_has_mapping(parent_ns, group))
83435 return -EPERM;
83436
83437+#ifdef CONFIG_GRKERNSEC
83438+ /*
83439+ * This doesn't really inspire confidence:
83440+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
83441+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
83442+ * Increases kernel attack surface in areas developers
83443+ * previously cared little about ("low importance due
83444+ * to requiring "root" capability")
83445+ * To be removed when this code receives *proper* review
83446+ */
83447+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
83448+ !capable(CAP_SETGID))
83449+ return -EPERM;
83450+#endif
83451+
83452 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
83453 if (!ns)
83454 return -ENOMEM;
83455@@ -862,7 +877,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
83456 if (atomic_read(&current->mm->mm_users) > 1)
83457 return -EINVAL;
83458
83459- if (current->fs->users != 1)
83460+ if (atomic_read(&current->fs->users) != 1)
83461 return -EINVAL;
83462
83463 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
83464diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
83465index 4f69f9a..7c6f8f8 100644
83466--- a/kernel/utsname_sysctl.c
83467+++ b/kernel/utsname_sysctl.c
83468@@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
83469 static int proc_do_uts_string(ctl_table *table, int write,
83470 void __user *buffer, size_t *lenp, loff_t *ppos)
83471 {
83472- struct ctl_table uts_table;
83473+ ctl_table_no_const uts_table;
83474 int r;
83475 memcpy(&uts_table, table, sizeof(uts_table));
83476 uts_table.data = get_uts(table, write);
83477diff --git a/kernel/watchdog.c b/kernel/watchdog.c
83478index 05039e3..17490c7 100644
83479--- a/kernel/watchdog.c
83480+++ b/kernel/watchdog.c
83481@@ -531,7 +531,7 @@ int proc_dowatchdog(struct ctl_table *table, int write,
83482 }
83483 #endif /* CONFIG_SYSCTL */
83484
83485-static struct smp_hotplug_thread watchdog_threads = {
83486+static struct smp_hotplug_thread watchdog_threads __read_only = {
83487 .store = &softlockup_watchdog,
83488 .thread_should_run = watchdog_should_run,
83489 .thread_fn = watchdog,
83490diff --git a/kernel/workqueue.c b/kernel/workqueue.c
83491index 6f01921..139869b 100644
83492--- a/kernel/workqueue.c
83493+++ b/kernel/workqueue.c
83494@@ -4596,7 +4596,7 @@ static void rebind_workers(struct worker_pool *pool)
83495 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
83496 worker_flags |= WORKER_REBOUND;
83497 worker_flags &= ~WORKER_UNBOUND;
83498- ACCESS_ONCE(worker->flags) = worker_flags;
83499+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
83500 }
83501
83502 spin_unlock_irq(&pool->lock);
83503diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
83504index 74fdc5c..3310593 100644
83505--- a/lib/Kconfig.debug
83506+++ b/lib/Kconfig.debug
83507@@ -549,7 +549,7 @@ config DEBUG_MUTEXES
83508
83509 config DEBUG_LOCK_ALLOC
83510 bool "Lock debugging: detect incorrect freeing of live locks"
83511- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
83512+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
83513 select DEBUG_SPINLOCK
83514 select DEBUG_MUTEXES
83515 select LOCKDEP
83516@@ -563,7 +563,7 @@ config DEBUG_LOCK_ALLOC
83517
83518 config PROVE_LOCKING
83519 bool "Lock debugging: prove locking correctness"
83520- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
83521+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
83522 select LOCKDEP
83523 select DEBUG_SPINLOCK
83524 select DEBUG_MUTEXES
83525@@ -614,7 +614,7 @@ config LOCKDEP
83526
83527 config LOCK_STAT
83528 bool "Lock usage statistics"
83529- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
83530+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
83531 select LOCKDEP
83532 select DEBUG_SPINLOCK
83533 select DEBUG_MUTEXES
83534@@ -1282,6 +1282,7 @@ config LATENCYTOP
83535 depends on DEBUG_KERNEL
83536 depends on STACKTRACE_SUPPORT
83537 depends on PROC_FS
83538+ depends on !GRKERNSEC_HIDESYM
83539 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
83540 select KALLSYMS
83541 select KALLSYMS_ALL
83542@@ -1298,7 +1299,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
83543 config DEBUG_STRICT_USER_COPY_CHECKS
83544 bool "Strict user copy size checks"
83545 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
83546- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
83547+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
83548 help
83549 Enabling this option turns a certain set of sanity checks for user
83550 copy operations into compile time failures.
83551@@ -1328,7 +1329,7 @@ config INTERVAL_TREE_TEST
83552
83553 config PROVIDE_OHCI1394_DMA_INIT
83554 bool "Remote debugging over FireWire early on boot"
83555- depends on PCI && X86
83556+ depends on PCI && X86 && !GRKERNSEC
83557 help
83558 If you want to debug problems which hang or crash the kernel early
83559 on boot and the crashing machine has a FireWire port, you can use
83560@@ -1357,7 +1358,7 @@ config PROVIDE_OHCI1394_DMA_INIT
83561
83562 config FIREWIRE_OHCI_REMOTE_DMA
83563 bool "Remote debugging over FireWire with firewire-ohci"
83564- depends on FIREWIRE_OHCI
83565+ depends on FIREWIRE_OHCI && !GRKERNSEC
83566 help
83567 This option lets you use the FireWire bus for remote debugging
83568 with help of the firewire-ohci driver. It enables unfiltered
83569diff --git a/lib/Makefile b/lib/Makefile
83570index c55a037..fb46e3b 100644
83571--- a/lib/Makefile
83572+++ b/lib/Makefile
83573@@ -50,7 +50,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
83574
83575 obj-$(CONFIG_BTREE) += btree.o
83576 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
83577-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
83578+obj-y += list_debug.o
83579 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
83580
83581 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
83582diff --git a/lib/bitmap.c b/lib/bitmap.c
83583index 06f7e4f..f3cf2b0 100644
83584--- a/lib/bitmap.c
83585+++ b/lib/bitmap.c
83586@@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
83587 {
83588 int c, old_c, totaldigits, ndigits, nchunks, nbits;
83589 u32 chunk;
83590- const char __user __force *ubuf = (const char __user __force *)buf;
83591+ const char __user *ubuf = (const char __force_user *)buf;
83592
83593 bitmap_zero(maskp, nmaskbits);
83594
83595@@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
83596 {
83597 if (!access_ok(VERIFY_READ, ubuf, ulen))
83598 return -EFAULT;
83599- return __bitmap_parse((const char __force *)ubuf,
83600+ return __bitmap_parse((const char __force_kernel *)ubuf,
83601 ulen, 1, maskp, nmaskbits);
83602
83603 }
83604@@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
83605 {
83606 unsigned a, b;
83607 int c, old_c, totaldigits;
83608- const char __user __force *ubuf = (const char __user __force *)buf;
83609+ const char __user *ubuf = (const char __force_user *)buf;
83610 int exp_digit, in_range;
83611
83612 totaldigits = c = 0;
83613@@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
83614 {
83615 if (!access_ok(VERIFY_READ, ubuf, ulen))
83616 return -EFAULT;
83617- return __bitmap_parselist((const char __force *)ubuf,
83618+ return __bitmap_parselist((const char __force_kernel *)ubuf,
83619 ulen, 1, maskp, nmaskbits);
83620 }
83621 EXPORT_SYMBOL(bitmap_parselist_user);
83622diff --git a/lib/bug.c b/lib/bug.c
83623index 1686034..a9c00c8 100644
83624--- a/lib/bug.c
83625+++ b/lib/bug.c
83626@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
83627 return BUG_TRAP_TYPE_NONE;
83628
83629 bug = find_bug(bugaddr);
83630+ if (!bug)
83631+ return BUG_TRAP_TYPE_NONE;
83632
83633 file = NULL;
83634 line = 0;
83635diff --git a/lib/debugobjects.c b/lib/debugobjects.c
83636index 37061ed..da83f48 100644
83637--- a/lib/debugobjects.c
83638+++ b/lib/debugobjects.c
83639@@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
83640 if (limit > 4)
83641 return;
83642
83643- is_on_stack = object_is_on_stack(addr);
83644+ is_on_stack = object_starts_on_stack(addr);
83645 if (is_on_stack == onstack)
83646 return;
83647
83648diff --git a/lib/devres.c b/lib/devres.c
83649index 8235331..5881053 100644
83650--- a/lib/devres.c
83651+++ b/lib/devres.c
83652@@ -81,7 +81,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
83653 void devm_iounmap(struct device *dev, void __iomem *addr)
83654 {
83655 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
83656- (void *)addr));
83657+ (void __force *)addr));
83658 iounmap(addr);
83659 }
83660 EXPORT_SYMBOL(devm_iounmap);
83661@@ -224,7 +224,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
83662 {
83663 ioport_unmap(addr);
83664 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
83665- devm_ioport_map_match, (void *)addr));
83666+ devm_ioport_map_match, (void __force *)addr));
83667 }
83668 EXPORT_SYMBOL(devm_ioport_unmap);
83669 #endif /* CONFIG_HAS_IOPORT */
83670diff --git a/lib/div64.c b/lib/div64.c
83671index a163b6c..9618fa5 100644
83672--- a/lib/div64.c
83673+++ b/lib/div64.c
83674@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
83675 EXPORT_SYMBOL(__div64_32);
83676
83677 #ifndef div_s64_rem
83678-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
83679+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
83680 {
83681 u64 quotient;
83682
83683@@ -90,7 +90,7 @@ EXPORT_SYMBOL(div_s64_rem);
83684 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
83685 */
83686 #ifndef div64_u64
83687-u64 div64_u64(u64 dividend, u64 divisor)
83688+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
83689 {
83690 u32 high = divisor >> 32;
83691 u64 quot;
83692diff --git a/lib/dma-debug.c b/lib/dma-debug.c
83693index d87a17a..ac0d79a 100644
83694--- a/lib/dma-debug.c
83695+++ b/lib/dma-debug.c
83696@@ -768,7 +768,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
83697
83698 void dma_debug_add_bus(struct bus_type *bus)
83699 {
83700- struct notifier_block *nb;
83701+ notifier_block_no_const *nb;
83702
83703 if (global_disable)
83704 return;
83705@@ -945,7 +945,7 @@ static void check_unmap(struct dma_debug_entry *ref)
83706
83707 static void check_for_stack(struct device *dev, void *addr)
83708 {
83709- if (object_is_on_stack(addr))
83710+ if (object_starts_on_stack(addr))
83711 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
83712 "stack [addr=%p]\n", addr);
83713 }
83714diff --git a/lib/inflate.c b/lib/inflate.c
83715index 013a761..c28f3fc 100644
83716--- a/lib/inflate.c
83717+++ b/lib/inflate.c
83718@@ -269,7 +269,7 @@ static void free(void *where)
83719 malloc_ptr = free_mem_ptr;
83720 }
83721 #else
83722-#define malloc(a) kmalloc(a, GFP_KERNEL)
83723+#define malloc(a) kmalloc((a), GFP_KERNEL)
83724 #define free(a) kfree(a)
83725 #endif
83726
83727diff --git a/lib/ioremap.c b/lib/ioremap.c
83728index 0c9216c..863bd89 100644
83729--- a/lib/ioremap.c
83730+++ b/lib/ioremap.c
83731@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
83732 unsigned long next;
83733
83734 phys_addr -= addr;
83735- pmd = pmd_alloc(&init_mm, pud, addr);
83736+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
83737 if (!pmd)
83738 return -ENOMEM;
83739 do {
83740@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
83741 unsigned long next;
83742
83743 phys_addr -= addr;
83744- pud = pud_alloc(&init_mm, pgd, addr);
83745+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
83746 if (!pud)
83747 return -ENOMEM;
83748 do {
83749diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
83750index bd2bea9..6b3c95e 100644
83751--- a/lib/is_single_threaded.c
83752+++ b/lib/is_single_threaded.c
83753@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
83754 struct task_struct *p, *t;
83755 bool ret;
83756
83757+ if (!mm)
83758+ return true;
83759+
83760 if (atomic_read(&task->signal->live) != 1)
83761 return false;
83762
83763diff --git a/lib/kobject.c b/lib/kobject.c
83764index b7e29a6..2f3ca75 100644
83765--- a/lib/kobject.c
83766+++ b/lib/kobject.c
83767@@ -805,7 +805,7 @@ static struct kset *kset_create(const char *name,
83768 kset = kzalloc(sizeof(*kset), GFP_KERNEL);
83769 if (!kset)
83770 return NULL;
83771- retval = kobject_set_name(&kset->kobj, name);
83772+ retval = kobject_set_name(&kset->kobj, "%s", name);
83773 if (retval) {
83774 kfree(kset);
83775 return NULL;
83776@@ -859,9 +859,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
83777
83778
83779 static DEFINE_SPINLOCK(kobj_ns_type_lock);
83780-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
83781+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
83782
83783-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
83784+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
83785 {
83786 enum kobj_ns_type type = ops->type;
83787 int error;
83788diff --git a/lib/list_debug.c b/lib/list_debug.c
83789index c24c2f7..06e070b 100644
83790--- a/lib/list_debug.c
83791+++ b/lib/list_debug.c
83792@@ -11,7 +11,9 @@
83793 #include <linux/bug.h>
83794 #include <linux/kernel.h>
83795 #include <linux/rculist.h>
83796+#include <linux/mm.h>
83797
83798+#ifdef CONFIG_DEBUG_LIST
83799 /*
83800 * Insert a new entry between two known consecutive entries.
83801 *
83802@@ -19,21 +21,32 @@
83803 * the prev/next entries already!
83804 */
83805
83806-void __list_add(struct list_head *new,
83807- struct list_head *prev,
83808- struct list_head *next)
83809+static bool __list_add_debug(struct list_head *new,
83810+ struct list_head *prev,
83811+ struct list_head *next)
83812 {
83813- WARN(next->prev != prev,
83814+ if (WARN(next->prev != prev,
83815 "list_add corruption. next->prev should be "
83816 "prev (%p), but was %p. (next=%p).\n",
83817- prev, next->prev, next);
83818- WARN(prev->next != next,
83819+ prev, next->prev, next) ||
83820+ WARN(prev->next != next,
83821 "list_add corruption. prev->next should be "
83822 "next (%p), but was %p. (prev=%p).\n",
83823- next, prev->next, prev);
83824- WARN(new == prev || new == next,
83825- "list_add double add: new=%p, prev=%p, next=%p.\n",
83826- new, prev, next);
83827+ next, prev->next, prev) ||
83828+ WARN(new == prev || new == next,
83829+ "list_add double add: new=%p, prev=%p, next=%p.\n",
83830+ new, prev, next))
83831+ return false;
83832+ return true;
83833+}
83834+
83835+void __list_add(struct list_head *new,
83836+ struct list_head *prev,
83837+ struct list_head *next)
83838+{
83839+ if (!__list_add_debug(new, prev, next))
83840+ return;
83841+
83842 next->prev = new;
83843 new->next = next;
83844 new->prev = prev;
83845@@ -41,7 +54,7 @@ void __list_add(struct list_head *new,
83846 }
83847 EXPORT_SYMBOL(__list_add);
83848
83849-void __list_del_entry(struct list_head *entry)
83850+static bool __list_del_entry_debug(struct list_head *entry)
83851 {
83852 struct list_head *prev, *next;
83853
83854@@ -60,9 +73,16 @@ void __list_del_entry(struct list_head *entry)
83855 WARN(next->prev != entry,
83856 "list_del corruption. next->prev should be %p, "
83857 "but was %p\n", entry, next->prev))
83858+ return false;
83859+ return true;
83860+}
83861+
83862+void __list_del_entry(struct list_head *entry)
83863+{
83864+ if (!__list_del_entry_debug(entry))
83865 return;
83866
83867- __list_del(prev, next);
83868+ __list_del(entry->prev, entry->next);
83869 }
83870 EXPORT_SYMBOL(__list_del_entry);
83871
83872@@ -86,15 +106,85 @@ EXPORT_SYMBOL(list_del);
83873 void __list_add_rcu(struct list_head *new,
83874 struct list_head *prev, struct list_head *next)
83875 {
83876- WARN(next->prev != prev,
83877- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
83878- prev, next->prev, next);
83879- WARN(prev->next != next,
83880- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
83881- next, prev->next, prev);
83882+ if (!__list_add_debug(new, prev, next))
83883+ return;
83884+
83885 new->next = next;
83886 new->prev = prev;
83887 rcu_assign_pointer(list_next_rcu(prev), new);
83888 next->prev = new;
83889 }
83890 EXPORT_SYMBOL(__list_add_rcu);
83891+#endif
83892+
83893+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
83894+{
83895+#ifdef CONFIG_DEBUG_LIST
83896+ if (!__list_add_debug(new, prev, next))
83897+ return;
83898+#endif
83899+
83900+ pax_open_kernel();
83901+ next->prev = new;
83902+ new->next = next;
83903+ new->prev = prev;
83904+ prev->next = new;
83905+ pax_close_kernel();
83906+}
83907+EXPORT_SYMBOL(__pax_list_add);
83908+
83909+void pax_list_del(struct list_head *entry)
83910+{
83911+#ifdef CONFIG_DEBUG_LIST
83912+ if (!__list_del_entry_debug(entry))
83913+ return;
83914+#endif
83915+
83916+ pax_open_kernel();
83917+ __list_del(entry->prev, entry->next);
83918+ entry->next = LIST_POISON1;
83919+ entry->prev = LIST_POISON2;
83920+ pax_close_kernel();
83921+}
83922+EXPORT_SYMBOL(pax_list_del);
83923+
83924+void pax_list_del_init(struct list_head *entry)
83925+{
83926+ pax_open_kernel();
83927+ __list_del(entry->prev, entry->next);
83928+ INIT_LIST_HEAD(entry);
83929+ pax_close_kernel();
83930+}
83931+EXPORT_SYMBOL(pax_list_del_init);
83932+
83933+void __pax_list_add_rcu(struct list_head *new,
83934+ struct list_head *prev, struct list_head *next)
83935+{
83936+#ifdef CONFIG_DEBUG_LIST
83937+ if (!__list_add_debug(new, prev, next))
83938+ return;
83939+#endif
83940+
83941+ pax_open_kernel();
83942+ new->next = next;
83943+ new->prev = prev;
83944+ rcu_assign_pointer(list_next_rcu(prev), new);
83945+ next->prev = new;
83946+ pax_close_kernel();
83947+}
83948+EXPORT_SYMBOL(__pax_list_add_rcu);
83949+
83950+void pax_list_del_rcu(struct list_head *entry)
83951+{
83952+#ifdef CONFIG_DEBUG_LIST
83953+ if (!__list_del_entry_debug(entry))
83954+ return;
83955+#endif
83956+
83957+ pax_open_kernel();
83958+ __list_del(entry->prev, entry->next);
83959+ entry->next = LIST_POISON1;
83960+ entry->prev = LIST_POISON2;
83961+ pax_close_kernel();
83962+}
83963+EXPORT_SYMBOL(pax_list_del_rcu);
83964diff --git a/lib/radix-tree.c b/lib/radix-tree.c
83965index e796429..6e38f9f 100644
83966--- a/lib/radix-tree.c
83967+++ b/lib/radix-tree.c
83968@@ -92,7 +92,7 @@ struct radix_tree_preload {
83969 int nr;
83970 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
83971 };
83972-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
83973+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
83974
83975 static inline void *ptr_to_indirect(void *ptr)
83976 {
83977diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
83978index bb2b201..46abaf9 100644
83979--- a/lib/strncpy_from_user.c
83980+++ b/lib/strncpy_from_user.c
83981@@ -21,7 +21,7 @@
83982 */
83983 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
83984 {
83985- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
83986+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
83987 long res = 0;
83988
83989 /*
83990diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
83991index a28df52..3d55877 100644
83992--- a/lib/strnlen_user.c
83993+++ b/lib/strnlen_user.c
83994@@ -26,7 +26,7 @@
83995 */
83996 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
83997 {
83998- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
83999+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
84000 long align, res = 0;
84001 unsigned long c;
84002
84003diff --git a/lib/swiotlb.c b/lib/swiotlb.c
84004index d23762e..e21eab2 100644
84005--- a/lib/swiotlb.c
84006+++ b/lib/swiotlb.c
84007@@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
84008
84009 void
84010 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
84011- dma_addr_t dev_addr)
84012+ dma_addr_t dev_addr, struct dma_attrs *attrs)
84013 {
84014 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
84015
84016diff --git a/lib/usercopy.c b/lib/usercopy.c
84017index 4f5b1dd..7cab418 100644
84018--- a/lib/usercopy.c
84019+++ b/lib/usercopy.c
84020@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
84021 WARN(1, "Buffer overflow detected!\n");
84022 }
84023 EXPORT_SYMBOL(copy_from_user_overflow);
84024+
84025+void copy_to_user_overflow(void)
84026+{
84027+ WARN(1, "Buffer overflow detected!\n");
84028+}
84029+EXPORT_SYMBOL(copy_to_user_overflow);
84030diff --git a/lib/vsprintf.c b/lib/vsprintf.c
84031index e149c64..24aa71a 100644
84032--- a/lib/vsprintf.c
84033+++ b/lib/vsprintf.c
84034@@ -16,6 +16,9 @@
84035 * - scnprintf and vscnprintf
84036 */
84037
84038+#ifdef CONFIG_GRKERNSEC_HIDESYM
84039+#define __INCLUDED_BY_HIDESYM 1
84040+#endif
84041 #include <stdarg.h>
84042 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
84043 #include <linux/types.h>
84044@@ -981,7 +984,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
84045 return number(buf, end, *(const netdev_features_t *)addr, spec);
84046 }
84047
84048+#ifdef CONFIG_GRKERNSEC_HIDESYM
84049+int kptr_restrict __read_mostly = 2;
84050+#else
84051 int kptr_restrict __read_mostly;
84052+#endif
84053
84054 /*
84055 * Show a '%p' thing. A kernel extension is that the '%p' is followed
84056@@ -994,6 +1001,7 @@ int kptr_restrict __read_mostly;
84057 * - 'f' For simple symbolic function names without offset
84058 * - 'S' For symbolic direct pointers with offset
84059 * - 's' For symbolic direct pointers without offset
84060+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
84061 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
84062 * - 'B' For backtraced symbolic direct pointers with offset
84063 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
84064@@ -1052,12 +1060,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
84065
84066 if (!ptr && *fmt != 'K') {
84067 /*
84068- * Print (null) with the same width as a pointer so it makes
84069+ * Print (nil) with the same width as a pointer so it makes
84070 * tabular output look nice.
84071 */
84072 if (spec.field_width == -1)
84073 spec.field_width = default_width;
84074- return string(buf, end, "(null)", spec);
84075+ return string(buf, end, "(nil)", spec);
84076 }
84077
84078 switch (*fmt) {
84079@@ -1067,6 +1075,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
84080 /* Fallthrough */
84081 case 'S':
84082 case 's':
84083+#ifdef CONFIG_GRKERNSEC_HIDESYM
84084+ break;
84085+#else
84086+ return symbol_string(buf, end, ptr, spec, fmt);
84087+#endif
84088+ case 'A':
84089 case 'B':
84090 return symbol_string(buf, end, ptr, spec, fmt);
84091 case 'R':
84092@@ -1107,6 +1121,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
84093 va_end(va);
84094 return buf;
84095 }
84096+ case 'P':
84097+ break;
84098 case 'K':
84099 /*
84100 * %pK cannot be used in IRQ context because its test
84101@@ -1136,6 +1152,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
84102 return number(buf, end,
84103 (unsigned long long) *((phys_addr_t *)ptr), spec);
84104 }
84105+
84106+#ifdef CONFIG_GRKERNSEC_HIDESYM
84107+ /* 'P' = approved pointers to copy to userland,
84108+ as in the /proc/kallsyms case, as we make it display nothing
84109+ for non-root users, and the real contents for root users
84110+ Also ignore 'K' pointers, since we force their NULLing for non-root users
84111+ above
84112+ */
84113+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
84114+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
84115+ dump_stack();
84116+ ptr = NULL;
84117+ }
84118+#endif
84119+
84120 spec.flags |= SMALL;
84121 if (spec.field_width == -1) {
84122 spec.field_width = default_width;
84123@@ -1857,11 +1888,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
84124 typeof(type) value; \
84125 if (sizeof(type) == 8) { \
84126 args = PTR_ALIGN(args, sizeof(u32)); \
84127- *(u32 *)&value = *(u32 *)args; \
84128- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
84129+ *(u32 *)&value = *(const u32 *)args; \
84130+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
84131 } else { \
84132 args = PTR_ALIGN(args, sizeof(type)); \
84133- value = *(typeof(type) *)args; \
84134+ value = *(const typeof(type) *)args; \
84135 } \
84136 args += sizeof(type); \
84137 value; \
84138@@ -1924,7 +1955,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
84139 case FORMAT_TYPE_STR: {
84140 const char *str_arg = args;
84141 args += strlen(str_arg) + 1;
84142- str = string(str, end, (char *)str_arg, spec);
84143+ str = string(str, end, str_arg, spec);
84144 break;
84145 }
84146
84147diff --git a/localversion-grsec b/localversion-grsec
84148new file mode 100644
84149index 0000000..7cd6065
84150--- /dev/null
84151+++ b/localversion-grsec
84152@@ -0,0 +1 @@
84153+-grsec
84154diff --git a/mm/Kconfig b/mm/Kconfig
84155index e742d06..c56fdd8 100644
84156--- a/mm/Kconfig
84157+++ b/mm/Kconfig
84158@@ -317,10 +317,10 @@ config KSM
84159 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
84160
84161 config DEFAULT_MMAP_MIN_ADDR
84162- int "Low address space to protect from user allocation"
84163+ int "Low address space to protect from user allocation"
84164 depends on MMU
84165- default 4096
84166- help
84167+ default 65536
84168+ help
84169 This is the portion of low virtual memory which should be protected
84170 from userspace allocation. Keeping a user from writing to low pages
84171 can help reduce the impact of kernel NULL pointer bugs.
84172@@ -351,7 +351,7 @@ config MEMORY_FAILURE
84173
84174 config HWPOISON_INJECT
84175 tristate "HWPoison pages injector"
84176- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
84177+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
84178 select PROC_PAGE_MONITOR
84179
84180 config NOMMU_INITIAL_TRIM_EXCESS
84181diff --git a/mm/backing-dev.c b/mm/backing-dev.c
84182index 5025174..9d67dcd 100644
84183--- a/mm/backing-dev.c
84184+++ b/mm/backing-dev.c
84185@@ -12,7 +12,7 @@
84186 #include <linux/device.h>
84187 #include <trace/events/writeback.h>
84188
84189-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
84190+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
84191
84192 struct backing_dev_info default_backing_dev_info = {
84193 .name = "default",
84194@@ -515,7 +515,6 @@ EXPORT_SYMBOL(bdi_destroy);
84195 int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
84196 unsigned int cap)
84197 {
84198- char tmp[32];
84199 int err;
84200
84201 bdi->name = name;
84202@@ -524,8 +523,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
84203 if (err)
84204 return err;
84205
84206- sprintf(tmp, "%.28s%s", name, "-%d");
84207- err = bdi_register(bdi, NULL, tmp, atomic_long_inc_return(&bdi_seq));
84208+ err = bdi_register(bdi, NULL, "%.28s-%ld", name, atomic_long_inc_return_unchecked(&bdi_seq));
84209 if (err) {
84210 bdi_destroy(bdi);
84211 return err;
84212diff --git a/mm/filemap.c b/mm/filemap.c
84213index 7905fe7..e60faa8 100644
84214--- a/mm/filemap.c
84215+++ b/mm/filemap.c
84216@@ -1766,7 +1766,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
84217 struct address_space *mapping = file->f_mapping;
84218
84219 if (!mapping->a_ops->readpage)
84220- return -ENOEXEC;
84221+ return -ENODEV;
84222 file_accessed(file);
84223 vma->vm_ops = &generic_file_vm_ops;
84224 return 0;
84225@@ -2106,6 +2106,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
84226 *pos = i_size_read(inode);
84227
84228 if (limit != RLIM_INFINITY) {
84229+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
84230 if (*pos >= limit) {
84231 send_sig(SIGXFSZ, current, 0);
84232 return -EFBIG;
84233diff --git a/mm/fremap.c b/mm/fremap.c
84234index 87da359..3f41cb1 100644
84235--- a/mm/fremap.c
84236+++ b/mm/fremap.c
84237@@ -158,6 +158,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
84238 retry:
84239 vma = find_vma(mm, start);
84240
84241+#ifdef CONFIG_PAX_SEGMEXEC
84242+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
84243+ goto out;
84244+#endif
84245+
84246 /*
84247 * Make sure the vma is shared, that it supports prefaulting,
84248 * and that the remapped range is valid and fully within
84249diff --git a/mm/highmem.c b/mm/highmem.c
84250index b32b70c..e512eb0 100644
84251--- a/mm/highmem.c
84252+++ b/mm/highmem.c
84253@@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
84254 * So no dangers, even with speculative execution.
84255 */
84256 page = pte_page(pkmap_page_table[i]);
84257+ pax_open_kernel();
84258 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
84259-
84260+ pax_close_kernel();
84261 set_page_address(page, NULL);
84262 need_flush = 1;
84263 }
84264@@ -198,9 +199,11 @@ start:
84265 }
84266 }
84267 vaddr = PKMAP_ADDR(last_pkmap_nr);
84268+
84269+ pax_open_kernel();
84270 set_pte_at(&init_mm, vaddr,
84271 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
84272-
84273+ pax_close_kernel();
84274 pkmap_count[last_pkmap_nr] = 1;
84275 set_page_address(page, (void *)vaddr);
84276
84277diff --git a/mm/hugetlb.c b/mm/hugetlb.c
84278index 7c5eb85..5c01c2f 100644
84279--- a/mm/hugetlb.c
84280+++ b/mm/hugetlb.c
84281@@ -2022,15 +2022,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
84282 struct hstate *h = &default_hstate;
84283 unsigned long tmp;
84284 int ret;
84285+ ctl_table_no_const hugetlb_table;
84286
84287 tmp = h->max_huge_pages;
84288
84289 if (write && h->order >= MAX_ORDER)
84290 return -EINVAL;
84291
84292- table->data = &tmp;
84293- table->maxlen = sizeof(unsigned long);
84294- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
84295+ hugetlb_table = *table;
84296+ hugetlb_table.data = &tmp;
84297+ hugetlb_table.maxlen = sizeof(unsigned long);
84298+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
84299 if (ret)
84300 goto out;
84301
84302@@ -2087,15 +2089,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
84303 struct hstate *h = &default_hstate;
84304 unsigned long tmp;
84305 int ret;
84306+ ctl_table_no_const hugetlb_table;
84307
84308 tmp = h->nr_overcommit_huge_pages;
84309
84310 if (write && h->order >= MAX_ORDER)
84311 return -EINVAL;
84312
84313- table->data = &tmp;
84314- table->maxlen = sizeof(unsigned long);
84315- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
84316+ hugetlb_table = *table;
84317+ hugetlb_table.data = &tmp;
84318+ hugetlb_table.maxlen = sizeof(unsigned long);
84319+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
84320 if (ret)
84321 goto out;
84322
84323@@ -2545,6 +2549,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
84324 return 1;
84325 }
84326
84327+#ifdef CONFIG_PAX_SEGMEXEC
84328+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
84329+{
84330+ struct mm_struct *mm = vma->vm_mm;
84331+ struct vm_area_struct *vma_m;
84332+ unsigned long address_m;
84333+ pte_t *ptep_m;
84334+
84335+ vma_m = pax_find_mirror_vma(vma);
84336+ if (!vma_m)
84337+ return;
84338+
84339+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
84340+ address_m = address + SEGMEXEC_TASK_SIZE;
84341+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
84342+ get_page(page_m);
84343+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
84344+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
84345+}
84346+#endif
84347+
84348 /*
84349 * Hugetlb_cow() should be called with page lock of the original hugepage held.
84350 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
84351@@ -2663,6 +2688,11 @@ retry_avoidcopy:
84352 make_huge_pte(vma, new_page, 1));
84353 page_remove_rmap(old_page);
84354 hugepage_add_new_anon_rmap(new_page, vma, address);
84355+
84356+#ifdef CONFIG_PAX_SEGMEXEC
84357+ pax_mirror_huge_pte(vma, address, new_page);
84358+#endif
84359+
84360 /* Make the old page be freed below */
84361 new_page = old_page;
84362 }
84363@@ -2821,6 +2851,10 @@ retry:
84364 && (vma->vm_flags & VM_SHARED)));
84365 set_huge_pte_at(mm, address, ptep, new_pte);
84366
84367+#ifdef CONFIG_PAX_SEGMEXEC
84368+ pax_mirror_huge_pte(vma, address, page);
84369+#endif
84370+
84371 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
84372 /* Optimization, do the COW without a second fault */
84373 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
84374@@ -2850,6 +2884,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
84375 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
84376 struct hstate *h = hstate_vma(vma);
84377
84378+#ifdef CONFIG_PAX_SEGMEXEC
84379+ struct vm_area_struct *vma_m;
84380+#endif
84381+
84382 address &= huge_page_mask(h);
84383
84384 ptep = huge_pte_offset(mm, address);
84385@@ -2863,6 +2901,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
84386 VM_FAULT_SET_HINDEX(hstate_index(h));
84387 }
84388
84389+#ifdef CONFIG_PAX_SEGMEXEC
84390+ vma_m = pax_find_mirror_vma(vma);
84391+ if (vma_m) {
84392+ unsigned long address_m;
84393+
84394+ if (vma->vm_start > vma_m->vm_start) {
84395+ address_m = address;
84396+ address -= SEGMEXEC_TASK_SIZE;
84397+ vma = vma_m;
84398+ h = hstate_vma(vma);
84399+ } else
84400+ address_m = address + SEGMEXEC_TASK_SIZE;
84401+
84402+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
84403+ return VM_FAULT_OOM;
84404+ address_m &= HPAGE_MASK;
84405+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
84406+ }
84407+#endif
84408+
84409 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
84410 if (!ptep)
84411 return VM_FAULT_OOM;
84412diff --git a/mm/internal.h b/mm/internal.h
84413index 8562de0..92b2073 100644
84414--- a/mm/internal.h
84415+++ b/mm/internal.h
84416@@ -100,6 +100,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
84417 * in mm/page_alloc.c
84418 */
84419 extern void __free_pages_bootmem(struct page *page, unsigned int order);
84420+extern void free_compound_page(struct page *page);
84421 extern void prep_compound_page(struct page *page, unsigned long order);
84422 #ifdef CONFIG_MEMORY_FAILURE
84423 extern bool is_free_buddy_page(struct page *page);
84424@@ -355,7 +356,7 @@ extern u32 hwpoison_filter_enable;
84425
84426 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
84427 unsigned long, unsigned long,
84428- unsigned long, unsigned long);
84429+ unsigned long, unsigned long) __intentional_overflow(-1);
84430
84431 extern void set_pageblock_order(void);
84432 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
84433diff --git a/mm/kmemleak.c b/mm/kmemleak.c
84434index c8d7f31..2dbeffd 100644
84435--- a/mm/kmemleak.c
84436+++ b/mm/kmemleak.c
84437@@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
84438
84439 for (i = 0; i < object->trace_len; i++) {
84440 void *ptr = (void *)object->trace[i];
84441- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
84442+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
84443 }
84444 }
84445
84446@@ -1851,7 +1851,7 @@ static int __init kmemleak_late_init(void)
84447 return -ENOMEM;
84448 }
84449
84450- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
84451+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
84452 &kmemleak_fops);
84453 if (!dentry)
84454 pr_warning("Failed to create the debugfs kmemleak file\n");
84455diff --git a/mm/maccess.c b/mm/maccess.c
84456index d53adf9..03a24bf 100644
84457--- a/mm/maccess.c
84458+++ b/mm/maccess.c
84459@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
84460 set_fs(KERNEL_DS);
84461 pagefault_disable();
84462 ret = __copy_from_user_inatomic(dst,
84463- (__force const void __user *)src, size);
84464+ (const void __force_user *)src, size);
84465 pagefault_enable();
84466 set_fs(old_fs);
84467
84468@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
84469
84470 set_fs(KERNEL_DS);
84471 pagefault_disable();
84472- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
84473+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
84474 pagefault_enable();
84475 set_fs(old_fs);
84476
84477diff --git a/mm/madvise.c b/mm/madvise.c
84478index 7055883..aafb1ed 100644
84479--- a/mm/madvise.c
84480+++ b/mm/madvise.c
84481@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
84482 pgoff_t pgoff;
84483 unsigned long new_flags = vma->vm_flags;
84484
84485+#ifdef CONFIG_PAX_SEGMEXEC
84486+ struct vm_area_struct *vma_m;
84487+#endif
84488+
84489 switch (behavior) {
84490 case MADV_NORMAL:
84491 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
84492@@ -126,6 +130,13 @@ success:
84493 /*
84494 * vm_flags is protected by the mmap_sem held in write mode.
84495 */
84496+
84497+#ifdef CONFIG_PAX_SEGMEXEC
84498+ vma_m = pax_find_mirror_vma(vma);
84499+ if (vma_m)
84500+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
84501+#endif
84502+
84503 vma->vm_flags = new_flags;
84504
84505 out:
84506@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
84507 struct vm_area_struct ** prev,
84508 unsigned long start, unsigned long end)
84509 {
84510+
84511+#ifdef CONFIG_PAX_SEGMEXEC
84512+ struct vm_area_struct *vma_m;
84513+#endif
84514+
84515 *prev = vma;
84516 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
84517 return -EINVAL;
84518@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
84519 zap_page_range(vma, start, end - start, &details);
84520 } else
84521 zap_page_range(vma, start, end - start, NULL);
84522+
84523+#ifdef CONFIG_PAX_SEGMEXEC
84524+ vma_m = pax_find_mirror_vma(vma);
84525+ if (vma_m) {
84526+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
84527+ struct zap_details details = {
84528+ .nonlinear_vma = vma_m,
84529+ .last_index = ULONG_MAX,
84530+ };
84531+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
84532+ } else
84533+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
84534+ }
84535+#endif
84536+
84537 return 0;
84538 }
84539
84540@@ -485,6 +516,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
84541 if (end < start)
84542 return error;
84543
84544+#ifdef CONFIG_PAX_SEGMEXEC
84545+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
84546+ if (end > SEGMEXEC_TASK_SIZE)
84547+ return error;
84548+ } else
84549+#endif
84550+
84551+ if (end > TASK_SIZE)
84552+ return error;
84553+
84554 error = 0;
84555 if (end == start)
84556 return error;
84557diff --git a/mm/memory-failure.c b/mm/memory-failure.c
84558index ceb0c7f..b2b8e94 100644
84559--- a/mm/memory-failure.c
84560+++ b/mm/memory-failure.c
84561@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
84562
84563 int sysctl_memory_failure_recovery __read_mostly = 1;
84564
84565-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
84566+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
84567
84568 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
84569
84570@@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
84571 pfn, t->comm, t->pid);
84572 si.si_signo = SIGBUS;
84573 si.si_errno = 0;
84574- si.si_addr = (void *)addr;
84575+ si.si_addr = (void __user *)addr;
84576 #ifdef __ARCH_SI_TRAPNO
84577 si.si_trapno = trapno;
84578 #endif
84579@@ -760,7 +760,7 @@ static struct page_state {
84580 unsigned long res;
84581 char *msg;
84582 int (*action)(struct page *p, unsigned long pfn);
84583-} error_states[] = {
84584+} __do_const error_states[] = {
84585 { reserved, reserved, "reserved kernel", me_kernel },
84586 /*
84587 * free pages are specially detected outside this table:
84588@@ -1051,7 +1051,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
84589 nr_pages = 1 << compound_order(hpage);
84590 else /* normal page or thp */
84591 nr_pages = 1;
84592- atomic_long_add(nr_pages, &num_poisoned_pages);
84593+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
84594
84595 /*
84596 * We need/can do nothing about count=0 pages.
84597@@ -1081,7 +1081,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
84598 if (!PageHWPoison(hpage)
84599 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
84600 || (p != hpage && TestSetPageHWPoison(hpage))) {
84601- atomic_long_sub(nr_pages, &num_poisoned_pages);
84602+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
84603 return 0;
84604 }
84605 set_page_hwpoison_huge_page(hpage);
84606@@ -1148,7 +1148,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
84607 }
84608 if (hwpoison_filter(p)) {
84609 if (TestClearPageHWPoison(p))
84610- atomic_long_sub(nr_pages, &num_poisoned_pages);
84611+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
84612 unlock_page(hpage);
84613 put_page(hpage);
84614 return 0;
84615@@ -1350,7 +1350,7 @@ int unpoison_memory(unsigned long pfn)
84616 return 0;
84617 }
84618 if (TestClearPageHWPoison(p))
84619- atomic_long_sub(nr_pages, &num_poisoned_pages);
84620+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
84621 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
84622 return 0;
84623 }
84624@@ -1364,7 +1364,7 @@ int unpoison_memory(unsigned long pfn)
84625 */
84626 if (TestClearPageHWPoison(page)) {
84627 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
84628- atomic_long_sub(nr_pages, &num_poisoned_pages);
84629+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
84630 freeit = 1;
84631 if (PageHuge(page))
84632 clear_page_hwpoison_huge_page(page);
84633@@ -1491,7 +1491,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
84634 } else {
84635 set_page_hwpoison_huge_page(hpage);
84636 dequeue_hwpoisoned_huge_page(hpage);
84637- atomic_long_add(1 << compound_trans_order(hpage),
84638+ atomic_long_add_unchecked(1 << compound_trans_order(hpage),
84639 &num_poisoned_pages);
84640 }
84641 /* keep elevated page count for bad page */
84642@@ -1552,11 +1552,11 @@ int soft_offline_page(struct page *page, int flags)
84643 if (PageHuge(page)) {
84644 set_page_hwpoison_huge_page(hpage);
84645 dequeue_hwpoisoned_huge_page(hpage);
84646- atomic_long_add(1 << compound_trans_order(hpage),
84647+ atomic_long_add_unchecked(1 << compound_trans_order(hpage),
84648 &num_poisoned_pages);
84649 } else {
84650 SetPageHWPoison(page);
84651- atomic_long_inc(&num_poisoned_pages);
84652+ atomic_long_inc_unchecked(&num_poisoned_pages);
84653 }
84654 }
84655 /* keep elevated page count for bad page */
84656@@ -1596,7 +1596,7 @@ static int __soft_offline_page(struct page *page, int flags)
84657 put_page(page);
84658 pr_info("soft_offline: %#lx: invalidated\n", pfn);
84659 SetPageHWPoison(page);
84660- atomic_long_inc(&num_poisoned_pages);
84661+ atomic_long_inc_unchecked(&num_poisoned_pages);
84662 return 0;
84663 }
84664
84665@@ -1626,7 +1626,7 @@ static int __soft_offline_page(struct page *page, int flags)
84666 ret = -EIO;
84667 } else {
84668 SetPageHWPoison(page);
84669- atomic_long_inc(&num_poisoned_pages);
84670+ atomic_long_inc_unchecked(&num_poisoned_pages);
84671 }
84672 } else {
84673 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
84674diff --git a/mm/memory.c b/mm/memory.c
84675index 5a35443..7c0340f 100644
84676--- a/mm/memory.c
84677+++ b/mm/memory.c
84678@@ -428,6 +428,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
84679 free_pte_range(tlb, pmd, addr);
84680 } while (pmd++, addr = next, addr != end);
84681
84682+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
84683 start &= PUD_MASK;
84684 if (start < floor)
84685 return;
84686@@ -442,6 +443,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
84687 pmd = pmd_offset(pud, start);
84688 pud_clear(pud);
84689 pmd_free_tlb(tlb, pmd, start);
84690+#endif
84691+
84692 }
84693
84694 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
84695@@ -461,6 +464,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
84696 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
84697 } while (pud++, addr = next, addr != end);
84698
84699+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
84700 start &= PGDIR_MASK;
84701 if (start < floor)
84702 return;
84703@@ -475,6 +479,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
84704 pud = pud_offset(pgd, start);
84705 pgd_clear(pgd);
84706 pud_free_tlb(tlb, pud, start);
84707+#endif
84708+
84709 }
84710
84711 /*
84712@@ -1644,12 +1650,6 @@ no_page_table:
84713 return page;
84714 }
84715
84716-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
84717-{
84718- return stack_guard_page_start(vma, addr) ||
84719- stack_guard_page_end(vma, addr+PAGE_SIZE);
84720-}
84721-
84722 /**
84723 * __get_user_pages() - pin user pages in memory
84724 * @tsk: task_struct of target task
84725@@ -1736,10 +1736,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
84726
84727 i = 0;
84728
84729- do {
84730+ while (nr_pages) {
84731 struct vm_area_struct *vma;
84732
84733- vma = find_extend_vma(mm, start);
84734+ vma = find_vma(mm, start);
84735 if (!vma && in_gate_area(mm, start)) {
84736 unsigned long pg = start & PAGE_MASK;
84737 pgd_t *pgd;
84738@@ -1788,7 +1788,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
84739 goto next_page;
84740 }
84741
84742- if (!vma ||
84743+ if (!vma || start < vma->vm_start ||
84744 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
84745 !(vm_flags & vma->vm_flags))
84746 return i ? : -EFAULT;
84747@@ -1817,11 +1817,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
84748 int ret;
84749 unsigned int fault_flags = 0;
84750
84751- /* For mlock, just skip the stack guard page. */
84752- if (foll_flags & FOLL_MLOCK) {
84753- if (stack_guard_page(vma, start))
84754- goto next_page;
84755- }
84756 if (foll_flags & FOLL_WRITE)
84757 fault_flags |= FAULT_FLAG_WRITE;
84758 if (nonblocking)
84759@@ -1901,7 +1896,7 @@ next_page:
84760 start += page_increm * PAGE_SIZE;
84761 nr_pages -= page_increm;
84762 } while (nr_pages && start < vma->vm_end);
84763- } while (nr_pages);
84764+ }
84765 return i;
84766 }
84767 EXPORT_SYMBOL(__get_user_pages);
84768@@ -2108,6 +2103,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
84769 page_add_file_rmap(page);
84770 set_pte_at(mm, addr, pte, mk_pte(page, prot));
84771
84772+#ifdef CONFIG_PAX_SEGMEXEC
84773+ pax_mirror_file_pte(vma, addr, page, ptl);
84774+#endif
84775+
84776 retval = 0;
84777 pte_unmap_unlock(pte, ptl);
84778 return retval;
84779@@ -2152,9 +2151,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
84780 if (!page_count(page))
84781 return -EINVAL;
84782 if (!(vma->vm_flags & VM_MIXEDMAP)) {
84783+
84784+#ifdef CONFIG_PAX_SEGMEXEC
84785+ struct vm_area_struct *vma_m;
84786+#endif
84787+
84788 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
84789 BUG_ON(vma->vm_flags & VM_PFNMAP);
84790 vma->vm_flags |= VM_MIXEDMAP;
84791+
84792+#ifdef CONFIG_PAX_SEGMEXEC
84793+ vma_m = pax_find_mirror_vma(vma);
84794+ if (vma_m)
84795+ vma_m->vm_flags |= VM_MIXEDMAP;
84796+#endif
84797+
84798 }
84799 return insert_page(vma, addr, page, vma->vm_page_prot);
84800 }
84801@@ -2237,6 +2248,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
84802 unsigned long pfn)
84803 {
84804 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
84805+ BUG_ON(vma->vm_mirror);
84806
84807 if (addr < vma->vm_start || addr >= vma->vm_end)
84808 return -EFAULT;
84809@@ -2484,7 +2496,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
84810
84811 BUG_ON(pud_huge(*pud));
84812
84813- pmd = pmd_alloc(mm, pud, addr);
84814+ pmd = (mm == &init_mm) ?
84815+ pmd_alloc_kernel(mm, pud, addr) :
84816+ pmd_alloc(mm, pud, addr);
84817 if (!pmd)
84818 return -ENOMEM;
84819 do {
84820@@ -2504,7 +2518,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
84821 unsigned long next;
84822 int err;
84823
84824- pud = pud_alloc(mm, pgd, addr);
84825+ pud = (mm == &init_mm) ?
84826+ pud_alloc_kernel(mm, pgd, addr) :
84827+ pud_alloc(mm, pgd, addr);
84828 if (!pud)
84829 return -ENOMEM;
84830 do {
84831@@ -2592,6 +2608,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
84832 copy_user_highpage(dst, src, va, vma);
84833 }
84834
84835+#ifdef CONFIG_PAX_SEGMEXEC
84836+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
84837+{
84838+ struct mm_struct *mm = vma->vm_mm;
84839+ spinlock_t *ptl;
84840+ pte_t *pte, entry;
84841+
84842+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
84843+ entry = *pte;
84844+ if (!pte_present(entry)) {
84845+ if (!pte_none(entry)) {
84846+ BUG_ON(pte_file(entry));
84847+ free_swap_and_cache(pte_to_swp_entry(entry));
84848+ pte_clear_not_present_full(mm, address, pte, 0);
84849+ }
84850+ } else {
84851+ struct page *page;
84852+
84853+ flush_cache_page(vma, address, pte_pfn(entry));
84854+ entry = ptep_clear_flush(vma, address, pte);
84855+ BUG_ON(pte_dirty(entry));
84856+ page = vm_normal_page(vma, address, entry);
84857+ if (page) {
84858+ update_hiwater_rss(mm);
84859+ if (PageAnon(page))
84860+ dec_mm_counter_fast(mm, MM_ANONPAGES);
84861+ else
84862+ dec_mm_counter_fast(mm, MM_FILEPAGES);
84863+ page_remove_rmap(page);
84864+ page_cache_release(page);
84865+ }
84866+ }
84867+ pte_unmap_unlock(pte, ptl);
84868+}
84869+
84870+/* PaX: if vma is mirrored, synchronize the mirror's PTE
84871+ *
84872+ * the ptl of the lower mapped page is held on entry and is not released on exit
84873+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
84874+ */
84875+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
84876+{
84877+ struct mm_struct *mm = vma->vm_mm;
84878+ unsigned long address_m;
84879+ spinlock_t *ptl_m;
84880+ struct vm_area_struct *vma_m;
84881+ pmd_t *pmd_m;
84882+ pte_t *pte_m, entry_m;
84883+
84884+ BUG_ON(!page_m || !PageAnon(page_m));
84885+
84886+ vma_m = pax_find_mirror_vma(vma);
84887+ if (!vma_m)
84888+ return;
84889+
84890+ BUG_ON(!PageLocked(page_m));
84891+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
84892+ address_m = address + SEGMEXEC_TASK_SIZE;
84893+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
84894+ pte_m = pte_offset_map(pmd_m, address_m);
84895+ ptl_m = pte_lockptr(mm, pmd_m);
84896+ if (ptl != ptl_m) {
84897+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
84898+ if (!pte_none(*pte_m))
84899+ goto out;
84900+ }
84901+
84902+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
84903+ page_cache_get(page_m);
84904+ page_add_anon_rmap(page_m, vma_m, address_m);
84905+ inc_mm_counter_fast(mm, MM_ANONPAGES);
84906+ set_pte_at(mm, address_m, pte_m, entry_m);
84907+ update_mmu_cache(vma_m, address_m, pte_m);
84908+out:
84909+ if (ptl != ptl_m)
84910+ spin_unlock(ptl_m);
84911+ pte_unmap(pte_m);
84912+ unlock_page(page_m);
84913+}
84914+
84915+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
84916+{
84917+ struct mm_struct *mm = vma->vm_mm;
84918+ unsigned long address_m;
84919+ spinlock_t *ptl_m;
84920+ struct vm_area_struct *vma_m;
84921+ pmd_t *pmd_m;
84922+ pte_t *pte_m, entry_m;
84923+
84924+ BUG_ON(!page_m || PageAnon(page_m));
84925+
84926+ vma_m = pax_find_mirror_vma(vma);
84927+ if (!vma_m)
84928+ return;
84929+
84930+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
84931+ address_m = address + SEGMEXEC_TASK_SIZE;
84932+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
84933+ pte_m = pte_offset_map(pmd_m, address_m);
84934+ ptl_m = pte_lockptr(mm, pmd_m);
84935+ if (ptl != ptl_m) {
84936+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
84937+ if (!pte_none(*pte_m))
84938+ goto out;
84939+ }
84940+
84941+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
84942+ page_cache_get(page_m);
84943+ page_add_file_rmap(page_m);
84944+ inc_mm_counter_fast(mm, MM_FILEPAGES);
84945+ set_pte_at(mm, address_m, pte_m, entry_m);
84946+ update_mmu_cache(vma_m, address_m, pte_m);
84947+out:
84948+ if (ptl != ptl_m)
84949+ spin_unlock(ptl_m);
84950+ pte_unmap(pte_m);
84951+}
84952+
84953+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
84954+{
84955+ struct mm_struct *mm = vma->vm_mm;
84956+ unsigned long address_m;
84957+ spinlock_t *ptl_m;
84958+ struct vm_area_struct *vma_m;
84959+ pmd_t *pmd_m;
84960+ pte_t *pte_m, entry_m;
84961+
84962+ vma_m = pax_find_mirror_vma(vma);
84963+ if (!vma_m)
84964+ return;
84965+
84966+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
84967+ address_m = address + SEGMEXEC_TASK_SIZE;
84968+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
84969+ pte_m = pte_offset_map(pmd_m, address_m);
84970+ ptl_m = pte_lockptr(mm, pmd_m);
84971+ if (ptl != ptl_m) {
84972+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
84973+ if (!pte_none(*pte_m))
84974+ goto out;
84975+ }
84976+
84977+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
84978+ set_pte_at(mm, address_m, pte_m, entry_m);
84979+out:
84980+ if (ptl != ptl_m)
84981+ spin_unlock(ptl_m);
84982+ pte_unmap(pte_m);
84983+}
84984+
84985+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
84986+{
84987+ struct page *page_m;
84988+ pte_t entry;
84989+
84990+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
84991+ goto out;
84992+
84993+ entry = *pte;
84994+ page_m = vm_normal_page(vma, address, entry);
84995+ if (!page_m)
84996+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
84997+ else if (PageAnon(page_m)) {
84998+ if (pax_find_mirror_vma(vma)) {
84999+ pte_unmap_unlock(pte, ptl);
85000+ lock_page(page_m);
85001+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
85002+ if (pte_same(entry, *pte))
85003+ pax_mirror_anon_pte(vma, address, page_m, ptl);
85004+ else
85005+ unlock_page(page_m);
85006+ }
85007+ } else
85008+ pax_mirror_file_pte(vma, address, page_m, ptl);
85009+
85010+out:
85011+ pte_unmap_unlock(pte, ptl);
85012+}
85013+#endif
85014+
85015 /*
85016 * This routine handles present pages, when users try to write
85017 * to a shared page. It is done by copying the page to a new address
85018@@ -2808,6 +3004,12 @@ gotten:
85019 */
85020 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
85021 if (likely(pte_same(*page_table, orig_pte))) {
85022+
85023+#ifdef CONFIG_PAX_SEGMEXEC
85024+ if (pax_find_mirror_vma(vma))
85025+ BUG_ON(!trylock_page(new_page));
85026+#endif
85027+
85028 if (old_page) {
85029 if (!PageAnon(old_page)) {
85030 dec_mm_counter_fast(mm, MM_FILEPAGES);
85031@@ -2859,6 +3061,10 @@ gotten:
85032 page_remove_rmap(old_page);
85033 }
85034
85035+#ifdef CONFIG_PAX_SEGMEXEC
85036+ pax_mirror_anon_pte(vma, address, new_page, ptl);
85037+#endif
85038+
85039 /* Free the old page.. */
85040 new_page = old_page;
85041 ret |= VM_FAULT_WRITE;
85042@@ -3134,6 +3340,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
85043 swap_free(entry);
85044 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
85045 try_to_free_swap(page);
85046+
85047+#ifdef CONFIG_PAX_SEGMEXEC
85048+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
85049+#endif
85050+
85051 unlock_page(page);
85052 if (page != swapcache) {
85053 /*
85054@@ -3157,6 +3368,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
85055
85056 /* No need to invalidate - it was non-present before */
85057 update_mmu_cache(vma, address, page_table);
85058+
85059+#ifdef CONFIG_PAX_SEGMEXEC
85060+ pax_mirror_anon_pte(vma, address, page, ptl);
85061+#endif
85062+
85063 unlock:
85064 pte_unmap_unlock(page_table, ptl);
85065 out:
85066@@ -3176,40 +3392,6 @@ out_release:
85067 }
85068
85069 /*
85070- * This is like a special single-page "expand_{down|up}wards()",
85071- * except we must first make sure that 'address{-|+}PAGE_SIZE'
85072- * doesn't hit another vma.
85073- */
85074-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
85075-{
85076- address &= PAGE_MASK;
85077- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
85078- struct vm_area_struct *prev = vma->vm_prev;
85079-
85080- /*
85081- * Is there a mapping abutting this one below?
85082- *
85083- * That's only ok if it's the same stack mapping
85084- * that has gotten split..
85085- */
85086- if (prev && prev->vm_end == address)
85087- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
85088-
85089- expand_downwards(vma, address - PAGE_SIZE);
85090- }
85091- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
85092- struct vm_area_struct *next = vma->vm_next;
85093-
85094- /* As VM_GROWSDOWN but s/below/above/ */
85095- if (next && next->vm_start == address + PAGE_SIZE)
85096- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
85097-
85098- expand_upwards(vma, address + PAGE_SIZE);
85099- }
85100- return 0;
85101-}
85102-
85103-/*
85104 * We enter with non-exclusive mmap_sem (to exclude vma changes,
85105 * but allow concurrent faults), and pte mapped but not yet locked.
85106 * We return with mmap_sem still held, but pte unmapped and unlocked.
85107@@ -3218,27 +3400,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
85108 unsigned long address, pte_t *page_table, pmd_t *pmd,
85109 unsigned int flags)
85110 {
85111- struct page *page;
85112+ struct page *page = NULL;
85113 spinlock_t *ptl;
85114 pte_t entry;
85115
85116- pte_unmap(page_table);
85117-
85118- /* Check if we need to add a guard page to the stack */
85119- if (check_stack_guard_page(vma, address) < 0)
85120- return VM_FAULT_SIGBUS;
85121-
85122- /* Use the zero-page for reads */
85123 if (!(flags & FAULT_FLAG_WRITE)) {
85124 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
85125 vma->vm_page_prot));
85126- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
85127+ ptl = pte_lockptr(mm, pmd);
85128+ spin_lock(ptl);
85129 if (!pte_none(*page_table))
85130 goto unlock;
85131 goto setpte;
85132 }
85133
85134 /* Allocate our own private page. */
85135+ pte_unmap(page_table);
85136+
85137 if (unlikely(anon_vma_prepare(vma)))
85138 goto oom;
85139 page = alloc_zeroed_user_highpage_movable(vma, address);
85140@@ -3262,6 +3440,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
85141 if (!pte_none(*page_table))
85142 goto release;
85143
85144+#ifdef CONFIG_PAX_SEGMEXEC
85145+ if (pax_find_mirror_vma(vma))
85146+ BUG_ON(!trylock_page(page));
85147+#endif
85148+
85149 inc_mm_counter_fast(mm, MM_ANONPAGES);
85150 page_add_new_anon_rmap(page, vma, address);
85151 setpte:
85152@@ -3269,6 +3452,12 @@ setpte:
85153
85154 /* No need to invalidate - it was non-present before */
85155 update_mmu_cache(vma, address, page_table);
85156+
85157+#ifdef CONFIG_PAX_SEGMEXEC
85158+ if (page)
85159+ pax_mirror_anon_pte(vma, address, page, ptl);
85160+#endif
85161+
85162 unlock:
85163 pte_unmap_unlock(page_table, ptl);
85164 return 0;
85165@@ -3412,6 +3601,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
85166 */
85167 /* Only go through if we didn't race with anybody else... */
85168 if (likely(pte_same(*page_table, orig_pte))) {
85169+
85170+#ifdef CONFIG_PAX_SEGMEXEC
85171+ if (anon && pax_find_mirror_vma(vma))
85172+ BUG_ON(!trylock_page(page));
85173+#endif
85174+
85175 flush_icache_page(vma, page);
85176 entry = mk_pte(page, vma->vm_page_prot);
85177 if (flags & FAULT_FLAG_WRITE)
85178@@ -3431,6 +3626,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
85179
85180 /* no need to invalidate: a not-present page won't be cached */
85181 update_mmu_cache(vma, address, page_table);
85182+
85183+#ifdef CONFIG_PAX_SEGMEXEC
85184+ if (anon)
85185+ pax_mirror_anon_pte(vma, address, page, ptl);
85186+ else
85187+ pax_mirror_file_pte(vma, address, page, ptl);
85188+#endif
85189+
85190 } else {
85191 if (cow_page)
85192 mem_cgroup_uncharge_page(cow_page);
85193@@ -3752,6 +3955,12 @@ int handle_pte_fault(struct mm_struct *mm,
85194 if (flags & FAULT_FLAG_WRITE)
85195 flush_tlb_fix_spurious_fault(vma, address);
85196 }
85197+
85198+#ifdef CONFIG_PAX_SEGMEXEC
85199+ pax_mirror_pte(vma, address, pte, pmd, ptl);
85200+ return 0;
85201+#endif
85202+
85203 unlock:
85204 pte_unmap_unlock(pte, ptl);
85205 return 0;
85206@@ -3768,6 +3977,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
85207 pmd_t *pmd;
85208 pte_t *pte;
85209
85210+#ifdef CONFIG_PAX_SEGMEXEC
85211+ struct vm_area_struct *vma_m;
85212+#endif
85213+
85214 __set_current_state(TASK_RUNNING);
85215
85216 count_vm_event(PGFAULT);
85217@@ -3779,6 +3992,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
85218 if (unlikely(is_vm_hugetlb_page(vma)))
85219 return hugetlb_fault(mm, vma, address, flags);
85220
85221+#ifdef CONFIG_PAX_SEGMEXEC
85222+ vma_m = pax_find_mirror_vma(vma);
85223+ if (vma_m) {
85224+ unsigned long address_m;
85225+ pgd_t *pgd_m;
85226+ pud_t *pud_m;
85227+ pmd_t *pmd_m;
85228+
85229+ if (vma->vm_start > vma_m->vm_start) {
85230+ address_m = address;
85231+ address -= SEGMEXEC_TASK_SIZE;
85232+ vma = vma_m;
85233+ } else
85234+ address_m = address + SEGMEXEC_TASK_SIZE;
85235+
85236+ pgd_m = pgd_offset(mm, address_m);
85237+ pud_m = pud_alloc(mm, pgd_m, address_m);
85238+ if (!pud_m)
85239+ return VM_FAULT_OOM;
85240+ pmd_m = pmd_alloc(mm, pud_m, address_m);
85241+ if (!pmd_m)
85242+ return VM_FAULT_OOM;
85243+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
85244+ return VM_FAULT_OOM;
85245+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
85246+ }
85247+#endif
85248+
85249 retry:
85250 pgd = pgd_offset(mm, address);
85251 pud = pud_alloc(mm, pgd, address);
85252@@ -3877,6 +4118,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
85253 spin_unlock(&mm->page_table_lock);
85254 return 0;
85255 }
85256+
85257+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
85258+{
85259+ pud_t *new = pud_alloc_one(mm, address);
85260+ if (!new)
85261+ return -ENOMEM;
85262+
85263+ smp_wmb(); /* See comment in __pte_alloc */
85264+
85265+ spin_lock(&mm->page_table_lock);
85266+ if (pgd_present(*pgd)) /* Another has populated it */
85267+ pud_free(mm, new);
85268+ else
85269+ pgd_populate_kernel(mm, pgd, new);
85270+ spin_unlock(&mm->page_table_lock);
85271+ return 0;
85272+}
85273 #endif /* __PAGETABLE_PUD_FOLDED */
85274
85275 #ifndef __PAGETABLE_PMD_FOLDED
85276@@ -3907,6 +4165,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
85277 spin_unlock(&mm->page_table_lock);
85278 return 0;
85279 }
85280+
85281+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
85282+{
85283+ pmd_t *new = pmd_alloc_one(mm, address);
85284+ if (!new)
85285+ return -ENOMEM;
85286+
85287+ smp_wmb(); /* See comment in __pte_alloc */
85288+
85289+ spin_lock(&mm->page_table_lock);
85290+#ifndef __ARCH_HAS_4LEVEL_HACK
85291+ if (pud_present(*pud)) /* Another has populated it */
85292+ pmd_free(mm, new);
85293+ else
85294+ pud_populate_kernel(mm, pud, new);
85295+#else
85296+ if (pgd_present(*pud)) /* Another has populated it */
85297+ pmd_free(mm, new);
85298+ else
85299+ pgd_populate_kernel(mm, pud, new);
85300+#endif /* __ARCH_HAS_4LEVEL_HACK */
85301+ spin_unlock(&mm->page_table_lock);
85302+ return 0;
85303+}
85304 #endif /* __PAGETABLE_PMD_FOLDED */
85305
85306 #if !defined(__HAVE_ARCH_GATE_AREA)
85307@@ -3920,7 +4202,7 @@ static int __init gate_vma_init(void)
85308 gate_vma.vm_start = FIXADDR_USER_START;
85309 gate_vma.vm_end = FIXADDR_USER_END;
85310 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
85311- gate_vma.vm_page_prot = __P101;
85312+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
85313
85314 return 0;
85315 }
85316@@ -4054,8 +4336,8 @@ out:
85317 return ret;
85318 }
85319
85320-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
85321- void *buf, int len, int write)
85322+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
85323+ void *buf, size_t len, int write)
85324 {
85325 resource_size_t phys_addr;
85326 unsigned long prot = 0;
85327@@ -4080,8 +4362,8 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
85328 * Access another process' address space as given in mm. If non-NULL, use the
85329 * given task for page fault accounting.
85330 */
85331-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
85332- unsigned long addr, void *buf, int len, int write)
85333+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
85334+ unsigned long addr, void *buf, size_t len, int write)
85335 {
85336 struct vm_area_struct *vma;
85337 void *old_buf = buf;
85338@@ -4089,7 +4371,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
85339 down_read(&mm->mmap_sem);
85340 /* ignore errors, just check how much was successfully transferred */
85341 while (len) {
85342- int bytes, ret, offset;
85343+ ssize_t bytes, ret, offset;
85344 void *maddr;
85345 struct page *page = NULL;
85346
85347@@ -4148,8 +4430,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
85348 *
85349 * The caller must hold a reference on @mm.
85350 */
85351-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
85352- void *buf, int len, int write)
85353+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
85354+ void *buf, size_t len, int write)
85355 {
85356 return __access_remote_vm(NULL, mm, addr, buf, len, write);
85357 }
85358@@ -4159,11 +4441,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
85359 * Source/target buffer must be kernel space,
85360 * Do not walk the page table directly, use get_user_pages
85361 */
85362-int access_process_vm(struct task_struct *tsk, unsigned long addr,
85363- void *buf, int len, int write)
85364+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
85365+ void *buf, size_t len, int write)
85366 {
85367 struct mm_struct *mm;
85368- int ret;
85369+ ssize_t ret;
85370
85371 mm = get_task_mm(tsk);
85372 if (!mm)
85373diff --git a/mm/mempolicy.c b/mm/mempolicy.c
85374index 4baf12e..5497066 100644
85375--- a/mm/mempolicy.c
85376+++ b/mm/mempolicy.c
85377@@ -708,6 +708,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
85378 unsigned long vmstart;
85379 unsigned long vmend;
85380
85381+#ifdef CONFIG_PAX_SEGMEXEC
85382+ struct vm_area_struct *vma_m;
85383+#endif
85384+
85385 vma = find_vma(mm, start);
85386 if (!vma || vma->vm_start > start)
85387 return -EFAULT;
85388@@ -751,6 +755,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
85389 err = vma_replace_policy(vma, new_pol);
85390 if (err)
85391 goto out;
85392+
85393+#ifdef CONFIG_PAX_SEGMEXEC
85394+ vma_m = pax_find_mirror_vma(vma);
85395+ if (vma_m) {
85396+ err = vma_replace_policy(vma_m, new_pol);
85397+ if (err)
85398+ goto out;
85399+ }
85400+#endif
85401+
85402 }
85403
85404 out:
85405@@ -1206,6 +1220,17 @@ static long do_mbind(unsigned long start, unsigned long len,
85406
85407 if (end < start)
85408 return -EINVAL;
85409+
85410+#ifdef CONFIG_PAX_SEGMEXEC
85411+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
85412+ if (end > SEGMEXEC_TASK_SIZE)
85413+ return -EINVAL;
85414+ } else
85415+#endif
85416+
85417+ if (end > TASK_SIZE)
85418+ return -EINVAL;
85419+
85420 if (end == start)
85421 return 0;
85422
85423@@ -1434,8 +1459,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
85424 */
85425 tcred = __task_cred(task);
85426 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
85427- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
85428- !capable(CAP_SYS_NICE)) {
85429+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
85430 rcu_read_unlock();
85431 err = -EPERM;
85432 goto out_put;
85433@@ -1466,6 +1490,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
85434 goto out;
85435 }
85436
85437+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
85438+ if (mm != current->mm &&
85439+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
85440+ mmput(mm);
85441+ err = -EPERM;
85442+ goto out;
85443+ }
85444+#endif
85445+
85446 err = do_migrate_pages(mm, old, new,
85447 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
85448
85449diff --git a/mm/migrate.c b/mm/migrate.c
85450index 6f0c244..6d1ae32 100644
85451--- a/mm/migrate.c
85452+++ b/mm/migrate.c
85453@@ -1399,8 +1399,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
85454 */
85455 tcred = __task_cred(task);
85456 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
85457- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
85458- !capable(CAP_SYS_NICE)) {
85459+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
85460 rcu_read_unlock();
85461 err = -EPERM;
85462 goto out;
85463diff --git a/mm/mlock.c b/mm/mlock.c
85464index 79b7cf7..9944291 100644
85465--- a/mm/mlock.c
85466+++ b/mm/mlock.c
85467@@ -13,6 +13,7 @@
85468 #include <linux/pagemap.h>
85469 #include <linux/mempolicy.h>
85470 #include <linux/syscalls.h>
85471+#include <linux/security.h>
85472 #include <linux/sched.h>
85473 #include <linux/export.h>
85474 #include <linux/rmap.h>
85475@@ -334,7 +335,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
85476 {
85477 unsigned long nstart, end, tmp;
85478 struct vm_area_struct * vma, * prev;
85479- int error;
85480+ int error = 0;
85481
85482 VM_BUG_ON(start & ~PAGE_MASK);
85483 VM_BUG_ON(len != PAGE_ALIGN(len));
85484@@ -343,6 +344,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
85485 return -EINVAL;
85486 if (end == start)
85487 return 0;
85488+ if (end > TASK_SIZE)
85489+ return -EINVAL;
85490+
85491 vma = find_vma(current->mm, start);
85492 if (!vma || vma->vm_start > start)
85493 return -ENOMEM;
85494@@ -354,6 +358,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
85495 for (nstart = start ; ; ) {
85496 vm_flags_t newflags;
85497
85498+#ifdef CONFIG_PAX_SEGMEXEC
85499+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
85500+ break;
85501+#endif
85502+
85503 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
85504
85505 newflags = vma->vm_flags & ~VM_LOCKED;
85506@@ -466,6 +475,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
85507 lock_limit >>= PAGE_SHIFT;
85508
85509 /* check against resource limits */
85510+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
85511 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
85512 error = do_mlock(start, len, 1);
85513 up_write(&current->mm->mmap_sem);
85514@@ -500,6 +510,11 @@ static int do_mlockall(int flags)
85515 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
85516 vm_flags_t newflags;
85517
85518+#ifdef CONFIG_PAX_SEGMEXEC
85519+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
85520+ break;
85521+#endif
85522+
85523 newflags = vma->vm_flags & ~VM_LOCKED;
85524 if (flags & MCL_CURRENT)
85525 newflags |= VM_LOCKED;
85526@@ -532,6 +547,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
85527 lock_limit >>= PAGE_SHIFT;
85528
85529 ret = -ENOMEM;
85530+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
85531 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
85532 capable(CAP_IPC_LOCK))
85533 ret = do_mlockall(flags);
85534diff --git a/mm/mmap.c b/mm/mmap.c
85535index 8d25fdc..bfb7626 100644
85536--- a/mm/mmap.c
85537+++ b/mm/mmap.c
85538@@ -36,6 +36,7 @@
85539 #include <linux/sched/sysctl.h>
85540 #include <linux/notifier.h>
85541 #include <linux/memory.h>
85542+#include <linux/random.h>
85543
85544 #include <asm/uaccess.h>
85545 #include <asm/cacheflush.h>
85546@@ -52,6 +53,16 @@
85547 #define arch_rebalance_pgtables(addr, len) (addr)
85548 #endif
85549
85550+static inline void verify_mm_writelocked(struct mm_struct *mm)
85551+{
85552+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
85553+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
85554+ up_read(&mm->mmap_sem);
85555+ BUG();
85556+ }
85557+#endif
85558+}
85559+
85560 static void unmap_region(struct mm_struct *mm,
85561 struct vm_area_struct *vma, struct vm_area_struct *prev,
85562 unsigned long start, unsigned long end);
85563@@ -71,16 +82,25 @@ static void unmap_region(struct mm_struct *mm,
85564 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
85565 *
85566 */
85567-pgprot_t protection_map[16] = {
85568+pgprot_t protection_map[16] __read_only = {
85569 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
85570 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
85571 };
85572
85573-pgprot_t vm_get_page_prot(unsigned long vm_flags)
85574+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
85575 {
85576- return __pgprot(pgprot_val(protection_map[vm_flags &
85577+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
85578 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
85579 pgprot_val(arch_vm_get_page_prot(vm_flags)));
85580+
85581+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
85582+ if (!(__supported_pte_mask & _PAGE_NX) &&
85583+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
85584+ (vm_flags & (VM_READ | VM_WRITE)))
85585+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
85586+#endif
85587+
85588+ return prot;
85589 }
85590 EXPORT_SYMBOL(vm_get_page_prot);
85591
85592@@ -89,6 +109,7 @@ int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
85593 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
85594 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
85595 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
85596+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
85597 /*
85598 * Make sure vm_committed_as in one cacheline and not cacheline shared with
85599 * other variables. It can be updated by several CPUs frequently.
85600@@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
85601 struct vm_area_struct *next = vma->vm_next;
85602
85603 might_sleep();
85604+ BUG_ON(vma->vm_mirror);
85605 if (vma->vm_ops && vma->vm_ops->close)
85606 vma->vm_ops->close(vma);
85607 if (vma->vm_file)
85608@@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
85609 * not page aligned -Ram Gupta
85610 */
85611 rlim = rlimit(RLIMIT_DATA);
85612+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
85613 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
85614 (mm->end_data - mm->start_data) > rlim)
85615 goto out;
85616@@ -933,6 +956,12 @@ static int
85617 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
85618 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
85619 {
85620+
85621+#ifdef CONFIG_PAX_SEGMEXEC
85622+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
85623+ return 0;
85624+#endif
85625+
85626 if (is_mergeable_vma(vma, file, vm_flags) &&
85627 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
85628 if (vma->vm_pgoff == vm_pgoff)
85629@@ -952,6 +981,12 @@ static int
85630 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
85631 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
85632 {
85633+
85634+#ifdef CONFIG_PAX_SEGMEXEC
85635+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
85636+ return 0;
85637+#endif
85638+
85639 if (is_mergeable_vma(vma, file, vm_flags) &&
85640 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
85641 pgoff_t vm_pglen;
85642@@ -994,13 +1029,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
85643 struct vm_area_struct *vma_merge(struct mm_struct *mm,
85644 struct vm_area_struct *prev, unsigned long addr,
85645 unsigned long end, unsigned long vm_flags,
85646- struct anon_vma *anon_vma, struct file *file,
85647+ struct anon_vma *anon_vma, struct file *file,
85648 pgoff_t pgoff, struct mempolicy *policy)
85649 {
85650 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
85651 struct vm_area_struct *area, *next;
85652 int err;
85653
85654+#ifdef CONFIG_PAX_SEGMEXEC
85655+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
85656+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
85657+
85658+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
85659+#endif
85660+
85661 /*
85662 * We later require that vma->vm_flags == vm_flags,
85663 * so this tests vma->vm_flags & VM_SPECIAL, too.
85664@@ -1016,6 +1058,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
85665 if (next && next->vm_end == end) /* cases 6, 7, 8 */
85666 next = next->vm_next;
85667
85668+#ifdef CONFIG_PAX_SEGMEXEC
85669+ if (prev)
85670+ prev_m = pax_find_mirror_vma(prev);
85671+ if (area)
85672+ area_m = pax_find_mirror_vma(area);
85673+ if (next)
85674+ next_m = pax_find_mirror_vma(next);
85675+#endif
85676+
85677 /*
85678 * Can it merge with the predecessor?
85679 */
85680@@ -1035,9 +1086,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
85681 /* cases 1, 6 */
85682 err = vma_adjust(prev, prev->vm_start,
85683 next->vm_end, prev->vm_pgoff, NULL);
85684- } else /* cases 2, 5, 7 */
85685+
85686+#ifdef CONFIG_PAX_SEGMEXEC
85687+ if (!err && prev_m)
85688+ err = vma_adjust(prev_m, prev_m->vm_start,
85689+ next_m->vm_end, prev_m->vm_pgoff, NULL);
85690+#endif
85691+
85692+ } else { /* cases 2, 5, 7 */
85693 err = vma_adjust(prev, prev->vm_start,
85694 end, prev->vm_pgoff, NULL);
85695+
85696+#ifdef CONFIG_PAX_SEGMEXEC
85697+ if (!err && prev_m)
85698+ err = vma_adjust(prev_m, prev_m->vm_start,
85699+ end_m, prev_m->vm_pgoff, NULL);
85700+#endif
85701+
85702+ }
85703 if (err)
85704 return NULL;
85705 khugepaged_enter_vma_merge(prev);
85706@@ -1051,12 +1117,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
85707 mpol_equal(policy, vma_policy(next)) &&
85708 can_vma_merge_before(next, vm_flags,
85709 anon_vma, file, pgoff+pglen)) {
85710- if (prev && addr < prev->vm_end) /* case 4 */
85711+ if (prev && addr < prev->vm_end) { /* case 4 */
85712 err = vma_adjust(prev, prev->vm_start,
85713 addr, prev->vm_pgoff, NULL);
85714- else /* cases 3, 8 */
85715+
85716+#ifdef CONFIG_PAX_SEGMEXEC
85717+ if (!err && prev_m)
85718+ err = vma_adjust(prev_m, prev_m->vm_start,
85719+ addr_m, prev_m->vm_pgoff, NULL);
85720+#endif
85721+
85722+ } else { /* cases 3, 8 */
85723 err = vma_adjust(area, addr, next->vm_end,
85724 next->vm_pgoff - pglen, NULL);
85725+
85726+#ifdef CONFIG_PAX_SEGMEXEC
85727+ if (!err && area_m)
85728+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
85729+ next_m->vm_pgoff - pglen, NULL);
85730+#endif
85731+
85732+ }
85733 if (err)
85734 return NULL;
85735 khugepaged_enter_vma_merge(area);
85736@@ -1165,8 +1246,10 @@ none:
85737 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
85738 struct file *file, long pages)
85739 {
85740- const unsigned long stack_flags
85741- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
85742+
85743+#ifdef CONFIG_PAX_RANDMMAP
85744+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
85745+#endif
85746
85747 mm->total_vm += pages;
85748
85749@@ -1174,7 +1257,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
85750 mm->shared_vm += pages;
85751 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
85752 mm->exec_vm += pages;
85753- } else if (flags & stack_flags)
85754+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
85755 mm->stack_vm += pages;
85756 }
85757 #endif /* CONFIG_PROC_FS */
85758@@ -1213,7 +1296,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
85759 * (the exception is when the underlying filesystem is noexec
85760 * mounted, in which case we dont add PROT_EXEC.)
85761 */
85762- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
85763+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
85764 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
85765 prot |= PROT_EXEC;
85766
85767@@ -1239,7 +1322,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
85768 /* Obtain the address to map to. we verify (or select) it and ensure
85769 * that it represents a valid section of the address space.
85770 */
85771- addr = get_unmapped_area(file, addr, len, pgoff, flags);
85772+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
85773 if (addr & ~PAGE_MASK)
85774 return addr;
85775
85776@@ -1250,6 +1333,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
85777 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
85778 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
85779
85780+#ifdef CONFIG_PAX_MPROTECT
85781+ if (mm->pax_flags & MF_PAX_MPROTECT) {
85782+
85783+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
85784+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
85785+ mm->binfmt->handle_mmap)
85786+ mm->binfmt->handle_mmap(file);
85787+#endif
85788+
85789+#ifndef CONFIG_PAX_MPROTECT_COMPAT
85790+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
85791+ gr_log_rwxmmap(file);
85792+
85793+#ifdef CONFIG_PAX_EMUPLT
85794+ vm_flags &= ~VM_EXEC;
85795+#else
85796+ return -EPERM;
85797+#endif
85798+
85799+ }
85800+
85801+ if (!(vm_flags & VM_EXEC))
85802+ vm_flags &= ~VM_MAYEXEC;
85803+#else
85804+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
85805+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
85806+#endif
85807+ else
85808+ vm_flags &= ~VM_MAYWRITE;
85809+ }
85810+#endif
85811+
85812+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
85813+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
85814+ vm_flags &= ~VM_PAGEEXEC;
85815+#endif
85816+
85817 if (flags & MAP_LOCKED)
85818 if (!can_do_mlock())
85819 return -EPERM;
85820@@ -1261,6 +1381,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
85821 locked += mm->locked_vm;
85822 lock_limit = rlimit(RLIMIT_MEMLOCK);
85823 lock_limit >>= PAGE_SHIFT;
85824+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
85825 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
85826 return -EAGAIN;
85827 }
85828@@ -1341,6 +1462,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
85829 vm_flags |= VM_NORESERVE;
85830 }
85831
85832+ if (!gr_acl_handle_mmap(file, prot))
85833+ return -EACCES;
85834+
85835 addr = mmap_region(file, addr, len, vm_flags, pgoff);
85836 if (!IS_ERR_VALUE(addr) &&
85837 ((vm_flags & VM_LOCKED) ||
85838@@ -1432,7 +1556,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
85839 vm_flags_t vm_flags = vma->vm_flags;
85840
85841 /* If it was private or non-writable, the write bit is already clear */
85842- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
85843+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
85844 return 0;
85845
85846 /* The backer wishes to know when pages are first written to? */
85847@@ -1480,7 +1604,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
85848 unsigned long charged = 0;
85849 struct inode *inode = file ? file_inode(file) : NULL;
85850
85851+#ifdef CONFIG_PAX_SEGMEXEC
85852+ struct vm_area_struct *vma_m = NULL;
85853+#endif
85854+
85855+ /*
85856+ * mm->mmap_sem is required to protect against another thread
85857+ * changing the mappings in case we sleep.
85858+ */
85859+ verify_mm_writelocked(mm);
85860+
85861 /* Check against address space limit. */
85862+
85863+#ifdef CONFIG_PAX_RANDMMAP
85864+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
85865+#endif
85866+
85867 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
85868 unsigned long nr_pages;
85869
85870@@ -1499,11 +1638,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
85871
85872 /* Clear old maps */
85873 error = -ENOMEM;
85874-munmap_back:
85875 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
85876 if (do_munmap(mm, addr, len))
85877 return -ENOMEM;
85878- goto munmap_back;
85879+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
85880 }
85881
85882 /*
85883@@ -1534,6 +1672,16 @@ munmap_back:
85884 goto unacct_error;
85885 }
85886
85887+#ifdef CONFIG_PAX_SEGMEXEC
85888+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
85889+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
85890+ if (!vma_m) {
85891+ error = -ENOMEM;
85892+ goto free_vma;
85893+ }
85894+ }
85895+#endif
85896+
85897 vma->vm_mm = mm;
85898 vma->vm_start = addr;
85899 vma->vm_end = addr + len;
85900@@ -1558,6 +1706,13 @@ munmap_back:
85901 if (error)
85902 goto unmap_and_free_vma;
85903
85904+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
85905+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
85906+ vma->vm_flags |= VM_PAGEEXEC;
85907+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
85908+ }
85909+#endif
85910+
85911 /* Can addr have changed??
85912 *
85913 * Answer: Yes, several device drivers can do it in their
85914@@ -1596,6 +1751,11 @@ munmap_back:
85915 vma_link(mm, vma, prev, rb_link, rb_parent);
85916 file = vma->vm_file;
85917
85918+#ifdef CONFIG_PAX_SEGMEXEC
85919+ if (vma_m)
85920+ BUG_ON(pax_mirror_vma(vma_m, vma));
85921+#endif
85922+
85923 /* Once vma denies write, undo our temporary denial count */
85924 if (correct_wcount)
85925 atomic_inc(&inode->i_writecount);
85926@@ -1603,6 +1763,7 @@ out:
85927 perf_event_mmap(vma);
85928
85929 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
85930+ track_exec_limit(mm, addr, addr + len, vm_flags);
85931 if (vm_flags & VM_LOCKED) {
85932 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
85933 vma == get_gate_vma(current->mm)))
85934@@ -1626,6 +1787,12 @@ unmap_and_free_vma:
85935 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
85936 charged = 0;
85937 free_vma:
85938+
85939+#ifdef CONFIG_PAX_SEGMEXEC
85940+ if (vma_m)
85941+ kmem_cache_free(vm_area_cachep, vma_m);
85942+#endif
85943+
85944 kmem_cache_free(vm_area_cachep, vma);
85945 unacct_error:
85946 if (charged)
85947@@ -1633,7 +1800,63 @@ unacct_error:
85948 return error;
85949 }
85950
85951-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
85952+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
85953+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
85954+{
85955+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
85956+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
85957+
85958+ return 0;
85959+}
85960+#endif
85961+
85962+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
85963+{
85964+ if (!vma) {
85965+#ifdef CONFIG_STACK_GROWSUP
85966+ if (addr > sysctl_heap_stack_gap)
85967+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
85968+ else
85969+ vma = find_vma(current->mm, 0);
85970+ if (vma && (vma->vm_flags & VM_GROWSUP))
85971+ return false;
85972+#endif
85973+ return true;
85974+ }
85975+
85976+ if (addr + len > vma->vm_start)
85977+ return false;
85978+
85979+ if (vma->vm_flags & VM_GROWSDOWN)
85980+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
85981+#ifdef CONFIG_STACK_GROWSUP
85982+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
85983+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
85984+#endif
85985+ else if (offset)
85986+ return offset <= vma->vm_start - addr - len;
85987+
85988+ return true;
85989+}
85990+
85991+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
85992+{
85993+ if (vma->vm_start < len)
85994+ return -ENOMEM;
85995+
85996+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
85997+ if (offset <= vma->vm_start - len)
85998+ return vma->vm_start - len - offset;
85999+ else
86000+ return -ENOMEM;
86001+ }
86002+
86003+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
86004+ return vma->vm_start - len - sysctl_heap_stack_gap;
86005+ return -ENOMEM;
86006+}
86007+
86008+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
86009 {
86010 /*
86011 * We implement the search by looking for an rbtree node that
86012@@ -1681,11 +1904,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
86013 }
86014 }
86015
86016- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
86017+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
86018 check_current:
86019 /* Check if current node has a suitable gap */
86020 if (gap_start > high_limit)
86021 return -ENOMEM;
86022+
86023+ if (gap_end - gap_start > info->threadstack_offset)
86024+ gap_start += info->threadstack_offset;
86025+ else
86026+ gap_start = gap_end;
86027+
86028+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
86029+ if (gap_end - gap_start > sysctl_heap_stack_gap)
86030+ gap_start += sysctl_heap_stack_gap;
86031+ else
86032+ gap_start = gap_end;
86033+ }
86034+ if (vma->vm_flags & VM_GROWSDOWN) {
86035+ if (gap_end - gap_start > sysctl_heap_stack_gap)
86036+ gap_end -= sysctl_heap_stack_gap;
86037+ else
86038+ gap_end = gap_start;
86039+ }
86040 if (gap_end >= low_limit && gap_end - gap_start >= length)
86041 goto found;
86042
86043@@ -1735,7 +1976,7 @@ found:
86044 return gap_start;
86045 }
86046
86047-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
86048+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
86049 {
86050 struct mm_struct *mm = current->mm;
86051 struct vm_area_struct *vma;
86052@@ -1789,6 +2030,24 @@ check_current:
86053 gap_end = vma->vm_start;
86054 if (gap_end < low_limit)
86055 return -ENOMEM;
86056+
86057+ if (gap_end - gap_start > info->threadstack_offset)
86058+ gap_end -= info->threadstack_offset;
86059+ else
86060+ gap_end = gap_start;
86061+
86062+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
86063+ if (gap_end - gap_start > sysctl_heap_stack_gap)
86064+ gap_start += sysctl_heap_stack_gap;
86065+ else
86066+ gap_start = gap_end;
86067+ }
86068+ if (vma->vm_flags & VM_GROWSDOWN) {
86069+ if (gap_end - gap_start > sysctl_heap_stack_gap)
86070+ gap_end -= sysctl_heap_stack_gap;
86071+ else
86072+ gap_end = gap_start;
86073+ }
86074 if (gap_start <= high_limit && gap_end - gap_start >= length)
86075 goto found;
86076
86077@@ -1852,6 +2111,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
86078 struct mm_struct *mm = current->mm;
86079 struct vm_area_struct *vma;
86080 struct vm_unmapped_area_info info;
86081+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
86082
86083 if (len > TASK_SIZE)
86084 return -ENOMEM;
86085@@ -1859,29 +2119,45 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
86086 if (flags & MAP_FIXED)
86087 return addr;
86088
86089+#ifdef CONFIG_PAX_RANDMMAP
86090+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
86091+#endif
86092+
86093 if (addr) {
86094 addr = PAGE_ALIGN(addr);
86095 vma = find_vma(mm, addr);
86096- if (TASK_SIZE - len >= addr &&
86097- (!vma || addr + len <= vma->vm_start))
86098+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
86099 return addr;
86100 }
86101
86102 info.flags = 0;
86103 info.length = len;
86104 info.low_limit = TASK_UNMAPPED_BASE;
86105+
86106+#ifdef CONFIG_PAX_RANDMMAP
86107+ if (mm->pax_flags & MF_PAX_RANDMMAP)
86108+ info.low_limit += mm->delta_mmap;
86109+#endif
86110+
86111 info.high_limit = TASK_SIZE;
86112 info.align_mask = 0;
86113+ info.threadstack_offset = offset;
86114 return vm_unmapped_area(&info);
86115 }
86116 #endif
86117
86118 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
86119 {
86120+
86121+#ifdef CONFIG_PAX_SEGMEXEC
86122+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
86123+ return;
86124+#endif
86125+
86126 /*
86127 * Is this a new hole at the lowest possible address?
86128 */
86129- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache)
86130+ if (addr >= mm->mmap_base && addr < mm->free_area_cache)
86131 mm->free_area_cache = addr;
86132 }
86133
86134@@ -1899,6 +2175,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
86135 struct mm_struct *mm = current->mm;
86136 unsigned long addr = addr0;
86137 struct vm_unmapped_area_info info;
86138+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
86139
86140 /* requested length too big for entire address space */
86141 if (len > TASK_SIZE)
86142@@ -1907,12 +2184,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
86143 if (flags & MAP_FIXED)
86144 return addr;
86145
86146+#ifdef CONFIG_PAX_RANDMMAP
86147+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
86148+#endif
86149+
86150 /* requesting a specific address */
86151 if (addr) {
86152 addr = PAGE_ALIGN(addr);
86153 vma = find_vma(mm, addr);
86154- if (TASK_SIZE - len >= addr &&
86155- (!vma || addr + len <= vma->vm_start))
86156+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
86157 return addr;
86158 }
86159
86160@@ -1921,6 +2201,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
86161 info.low_limit = PAGE_SIZE;
86162 info.high_limit = mm->mmap_base;
86163 info.align_mask = 0;
86164+ info.threadstack_offset = offset;
86165 addr = vm_unmapped_area(&info);
86166
86167 /*
86168@@ -1933,6 +2214,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
86169 VM_BUG_ON(addr != -ENOMEM);
86170 info.flags = 0;
86171 info.low_limit = TASK_UNMAPPED_BASE;
86172+
86173+#ifdef CONFIG_PAX_RANDMMAP
86174+ if (mm->pax_flags & MF_PAX_RANDMMAP)
86175+ info.low_limit += mm->delta_mmap;
86176+#endif
86177+
86178 info.high_limit = TASK_SIZE;
86179 addr = vm_unmapped_area(&info);
86180 }
86181@@ -1943,6 +2230,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
86182
86183 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
86184 {
86185+
86186+#ifdef CONFIG_PAX_SEGMEXEC
86187+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
86188+ return;
86189+#endif
86190+
86191 /*
86192 * Is this a new hole at the highest possible address?
86193 */
86194@@ -1950,8 +2243,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
86195 mm->free_area_cache = addr;
86196
86197 /* dont allow allocations above current base */
86198- if (mm->free_area_cache > mm->mmap_base)
86199+ if (mm->free_area_cache > mm->mmap_base) {
86200 mm->free_area_cache = mm->mmap_base;
86201+ mm->cached_hole_size = ~0UL;
86202+ }
86203 }
86204
86205 unsigned long
86206@@ -2047,6 +2342,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
86207 return vma;
86208 }
86209
86210+#ifdef CONFIG_PAX_SEGMEXEC
86211+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
86212+{
86213+ struct vm_area_struct *vma_m;
86214+
86215+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
86216+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
86217+ BUG_ON(vma->vm_mirror);
86218+ return NULL;
86219+ }
86220+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
86221+ vma_m = vma->vm_mirror;
86222+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
86223+ BUG_ON(vma->vm_file != vma_m->vm_file);
86224+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
86225+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
86226+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
86227+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
86228+ return vma_m;
86229+}
86230+#endif
86231+
86232 /*
86233 * Verify that the stack growth is acceptable and
86234 * update accounting. This is shared with both the
86235@@ -2063,6 +2380,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
86236 return -ENOMEM;
86237
86238 /* Stack limit test */
86239+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
86240 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
86241 return -ENOMEM;
86242
86243@@ -2073,6 +2391,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
86244 locked = mm->locked_vm + grow;
86245 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
86246 limit >>= PAGE_SHIFT;
86247+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
86248 if (locked > limit && !capable(CAP_IPC_LOCK))
86249 return -ENOMEM;
86250 }
86251@@ -2102,37 +2421,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
86252 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
86253 * vma is the last one with address > vma->vm_end. Have to extend vma.
86254 */
86255+#ifndef CONFIG_IA64
86256+static
86257+#endif
86258 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
86259 {
86260 int error;
86261+ bool locknext;
86262
86263 if (!(vma->vm_flags & VM_GROWSUP))
86264 return -EFAULT;
86265
86266+ /* Also guard against wrapping around to address 0. */
86267+ if (address < PAGE_ALIGN(address+1))
86268+ address = PAGE_ALIGN(address+1);
86269+ else
86270+ return -ENOMEM;
86271+
86272 /*
86273 * We must make sure the anon_vma is allocated
86274 * so that the anon_vma locking is not a noop.
86275 */
86276 if (unlikely(anon_vma_prepare(vma)))
86277 return -ENOMEM;
86278+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
86279+ if (locknext && anon_vma_prepare(vma->vm_next))
86280+ return -ENOMEM;
86281 vma_lock_anon_vma(vma);
86282+ if (locknext)
86283+ vma_lock_anon_vma(vma->vm_next);
86284
86285 /*
86286 * vma->vm_start/vm_end cannot change under us because the caller
86287 * is required to hold the mmap_sem in read mode. We need the
86288- * anon_vma lock to serialize against concurrent expand_stacks.
86289- * Also guard against wrapping around to address 0.
86290+ * anon_vma locks to serialize against concurrent expand_stacks
86291+ * and expand_upwards.
86292 */
86293- if (address < PAGE_ALIGN(address+4))
86294- address = PAGE_ALIGN(address+4);
86295- else {
86296- vma_unlock_anon_vma(vma);
86297- return -ENOMEM;
86298- }
86299 error = 0;
86300
86301 /* Somebody else might have raced and expanded it already */
86302- if (address > vma->vm_end) {
86303+ 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)
86304+ error = -ENOMEM;
86305+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
86306 unsigned long size, grow;
86307
86308 size = address - vma->vm_start;
86309@@ -2167,6 +2497,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
86310 }
86311 }
86312 }
86313+ if (locknext)
86314+ vma_unlock_anon_vma(vma->vm_next);
86315 vma_unlock_anon_vma(vma);
86316 khugepaged_enter_vma_merge(vma);
86317 validate_mm(vma->vm_mm);
86318@@ -2181,6 +2513,8 @@ int expand_downwards(struct vm_area_struct *vma,
86319 unsigned long address)
86320 {
86321 int error;
86322+ bool lockprev = false;
86323+ struct vm_area_struct *prev;
86324
86325 /*
86326 * We must make sure the anon_vma is allocated
86327@@ -2194,6 +2528,15 @@ int expand_downwards(struct vm_area_struct *vma,
86328 if (error)
86329 return error;
86330
86331+ prev = vma->vm_prev;
86332+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
86333+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
86334+#endif
86335+ if (lockprev && anon_vma_prepare(prev))
86336+ return -ENOMEM;
86337+ if (lockprev)
86338+ vma_lock_anon_vma(prev);
86339+
86340 vma_lock_anon_vma(vma);
86341
86342 /*
86343@@ -2203,9 +2546,17 @@ int expand_downwards(struct vm_area_struct *vma,
86344 */
86345
86346 /* Somebody else might have raced and expanded it already */
86347- if (address < vma->vm_start) {
86348+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
86349+ error = -ENOMEM;
86350+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
86351 unsigned long size, grow;
86352
86353+#ifdef CONFIG_PAX_SEGMEXEC
86354+ struct vm_area_struct *vma_m;
86355+
86356+ vma_m = pax_find_mirror_vma(vma);
86357+#endif
86358+
86359 size = vma->vm_end - address;
86360 grow = (vma->vm_start - address) >> PAGE_SHIFT;
86361
86362@@ -2230,13 +2581,27 @@ int expand_downwards(struct vm_area_struct *vma,
86363 vma->vm_pgoff -= grow;
86364 anon_vma_interval_tree_post_update_vma(vma);
86365 vma_gap_update(vma);
86366+
86367+#ifdef CONFIG_PAX_SEGMEXEC
86368+ if (vma_m) {
86369+ anon_vma_interval_tree_pre_update_vma(vma_m);
86370+ vma_m->vm_start -= grow << PAGE_SHIFT;
86371+ vma_m->vm_pgoff -= grow;
86372+ anon_vma_interval_tree_post_update_vma(vma_m);
86373+ vma_gap_update(vma_m);
86374+ }
86375+#endif
86376+
86377 spin_unlock(&vma->vm_mm->page_table_lock);
86378
86379+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
86380 perf_event_mmap(vma);
86381 }
86382 }
86383 }
86384 vma_unlock_anon_vma(vma);
86385+ if (lockprev)
86386+ vma_unlock_anon_vma(prev);
86387 khugepaged_enter_vma_merge(vma);
86388 validate_mm(vma->vm_mm);
86389 return error;
86390@@ -2334,6 +2699,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
86391 do {
86392 long nrpages = vma_pages(vma);
86393
86394+#ifdef CONFIG_PAX_SEGMEXEC
86395+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
86396+ vma = remove_vma(vma);
86397+ continue;
86398+ }
86399+#endif
86400+
86401 if (vma->vm_flags & VM_ACCOUNT)
86402 nr_accounted += nrpages;
86403 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
86404@@ -2379,6 +2751,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
86405 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
86406 vma->vm_prev = NULL;
86407 do {
86408+
86409+#ifdef CONFIG_PAX_SEGMEXEC
86410+ if (vma->vm_mirror) {
86411+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
86412+ vma->vm_mirror->vm_mirror = NULL;
86413+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
86414+ vma->vm_mirror = NULL;
86415+ }
86416+#endif
86417+
86418 vma_rb_erase(vma, &mm->mm_rb);
86419 mm->map_count--;
86420 tail_vma = vma;
86421@@ -2410,14 +2792,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
86422 struct vm_area_struct *new;
86423 int err = -ENOMEM;
86424
86425+#ifdef CONFIG_PAX_SEGMEXEC
86426+ struct vm_area_struct *vma_m, *new_m = NULL;
86427+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
86428+#endif
86429+
86430 if (is_vm_hugetlb_page(vma) && (addr &
86431 ~(huge_page_mask(hstate_vma(vma)))))
86432 return -EINVAL;
86433
86434+#ifdef CONFIG_PAX_SEGMEXEC
86435+ vma_m = pax_find_mirror_vma(vma);
86436+#endif
86437+
86438 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
86439 if (!new)
86440 goto out_err;
86441
86442+#ifdef CONFIG_PAX_SEGMEXEC
86443+ if (vma_m) {
86444+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
86445+ if (!new_m) {
86446+ kmem_cache_free(vm_area_cachep, new);
86447+ goto out_err;
86448+ }
86449+ }
86450+#endif
86451+
86452 /* most fields are the same, copy all, and then fixup */
86453 *new = *vma;
86454
86455@@ -2430,6 +2831,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
86456 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
86457 }
86458
86459+#ifdef CONFIG_PAX_SEGMEXEC
86460+ if (vma_m) {
86461+ *new_m = *vma_m;
86462+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
86463+ new_m->vm_mirror = new;
86464+ new->vm_mirror = new_m;
86465+
86466+ if (new_below)
86467+ new_m->vm_end = addr_m;
86468+ else {
86469+ new_m->vm_start = addr_m;
86470+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
86471+ }
86472+ }
86473+#endif
86474+
86475 pol = mpol_dup(vma_policy(vma));
86476 if (IS_ERR(pol)) {
86477 err = PTR_ERR(pol);
86478@@ -2452,6 +2869,36 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
86479 else
86480 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
86481
86482+#ifdef CONFIG_PAX_SEGMEXEC
86483+ if (!err && vma_m) {
86484+ if (anon_vma_clone(new_m, vma_m))
86485+ goto out_free_mpol;
86486+
86487+ mpol_get(pol);
86488+ vma_set_policy(new_m, pol);
86489+
86490+ if (new_m->vm_file)
86491+ get_file(new_m->vm_file);
86492+
86493+ if (new_m->vm_ops && new_m->vm_ops->open)
86494+ new_m->vm_ops->open(new_m);
86495+
86496+ if (new_below)
86497+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
86498+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
86499+ else
86500+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
86501+
86502+ if (err) {
86503+ if (new_m->vm_ops && new_m->vm_ops->close)
86504+ new_m->vm_ops->close(new_m);
86505+ if (new_m->vm_file)
86506+ fput(new_m->vm_file);
86507+ mpol_put(pol);
86508+ }
86509+ }
86510+#endif
86511+
86512 /* Success. */
86513 if (!err)
86514 return 0;
86515@@ -2461,10 +2908,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
86516 new->vm_ops->close(new);
86517 if (new->vm_file)
86518 fput(new->vm_file);
86519- unlink_anon_vmas(new);
86520 out_free_mpol:
86521 mpol_put(pol);
86522 out_free_vma:
86523+
86524+#ifdef CONFIG_PAX_SEGMEXEC
86525+ if (new_m) {
86526+ unlink_anon_vmas(new_m);
86527+ kmem_cache_free(vm_area_cachep, new_m);
86528+ }
86529+#endif
86530+
86531+ unlink_anon_vmas(new);
86532 kmem_cache_free(vm_area_cachep, new);
86533 out_err:
86534 return err;
86535@@ -2477,6 +2932,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
86536 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
86537 unsigned long addr, int new_below)
86538 {
86539+
86540+#ifdef CONFIG_PAX_SEGMEXEC
86541+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
86542+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
86543+ if (mm->map_count >= sysctl_max_map_count-1)
86544+ return -ENOMEM;
86545+ } else
86546+#endif
86547+
86548 if (mm->map_count >= sysctl_max_map_count)
86549 return -ENOMEM;
86550
86551@@ -2488,11 +2952,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
86552 * work. This now handles partial unmappings.
86553 * Jeremy Fitzhardinge <jeremy@goop.org>
86554 */
86555+#ifdef CONFIG_PAX_SEGMEXEC
86556 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
86557 {
86558+ int ret = __do_munmap(mm, start, len);
86559+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
86560+ return ret;
86561+
86562+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
86563+}
86564+
86565+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
86566+#else
86567+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
86568+#endif
86569+{
86570 unsigned long end;
86571 struct vm_area_struct *vma, *prev, *last;
86572
86573+ /*
86574+ * mm->mmap_sem is required to protect against another thread
86575+ * changing the mappings in case we sleep.
86576+ */
86577+ verify_mm_writelocked(mm);
86578+
86579 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
86580 return -EINVAL;
86581
86582@@ -2567,6 +3050,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
86583 /* Fix up all other VM information */
86584 remove_vma_list(mm, vma);
86585
86586+ track_exec_limit(mm, start, end, 0UL);
86587+
86588 return 0;
86589 }
86590
86591@@ -2575,6 +3060,13 @@ int vm_munmap(unsigned long start, size_t len)
86592 int ret;
86593 struct mm_struct *mm = current->mm;
86594
86595+
86596+#ifdef CONFIG_PAX_SEGMEXEC
86597+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
86598+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
86599+ return -EINVAL;
86600+#endif
86601+
86602 down_write(&mm->mmap_sem);
86603 ret = do_munmap(mm, start, len);
86604 up_write(&mm->mmap_sem);
86605@@ -2588,16 +3080,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
86606 return vm_munmap(addr, len);
86607 }
86608
86609-static inline void verify_mm_writelocked(struct mm_struct *mm)
86610-{
86611-#ifdef CONFIG_DEBUG_VM
86612- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
86613- WARN_ON(1);
86614- up_read(&mm->mmap_sem);
86615- }
86616-#endif
86617-}
86618-
86619 /*
86620 * this is really a simplified "do_mmap". it only handles
86621 * anonymous maps. eventually we may be able to do some
86622@@ -2611,6 +3093,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
86623 struct rb_node ** rb_link, * rb_parent;
86624 pgoff_t pgoff = addr >> PAGE_SHIFT;
86625 int error;
86626+ unsigned long charged;
86627
86628 len = PAGE_ALIGN(len);
86629 if (!len)
86630@@ -2618,16 +3101,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
86631
86632 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
86633
86634+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
86635+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
86636+ flags &= ~VM_EXEC;
86637+
86638+#ifdef CONFIG_PAX_MPROTECT
86639+ if (mm->pax_flags & MF_PAX_MPROTECT)
86640+ flags &= ~VM_MAYEXEC;
86641+#endif
86642+
86643+ }
86644+#endif
86645+
86646 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
86647 if (error & ~PAGE_MASK)
86648 return error;
86649
86650+ charged = len >> PAGE_SHIFT;
86651+
86652 /*
86653 * mlock MCL_FUTURE?
86654 */
86655 if (mm->def_flags & VM_LOCKED) {
86656 unsigned long locked, lock_limit;
86657- locked = len >> PAGE_SHIFT;
86658+ locked = charged;
86659 locked += mm->locked_vm;
86660 lock_limit = rlimit(RLIMIT_MEMLOCK);
86661 lock_limit >>= PAGE_SHIFT;
86662@@ -2644,21 +3141,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
86663 /*
86664 * Clear old maps. this also does some error checking for us
86665 */
86666- munmap_back:
86667 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
86668 if (do_munmap(mm, addr, len))
86669 return -ENOMEM;
86670- goto munmap_back;
86671+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
86672 }
86673
86674 /* Check against address space limits *after* clearing old maps... */
86675- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
86676+ if (!may_expand_vm(mm, charged))
86677 return -ENOMEM;
86678
86679 if (mm->map_count > sysctl_max_map_count)
86680 return -ENOMEM;
86681
86682- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
86683+ if (security_vm_enough_memory_mm(mm, charged))
86684 return -ENOMEM;
86685
86686 /* Can we just expand an old private anonymous mapping? */
86687@@ -2672,7 +3168,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
86688 */
86689 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
86690 if (!vma) {
86691- vm_unacct_memory(len >> PAGE_SHIFT);
86692+ vm_unacct_memory(charged);
86693 return -ENOMEM;
86694 }
86695
86696@@ -2686,9 +3182,10 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
86697 vma_link(mm, vma, prev, rb_link, rb_parent);
86698 out:
86699 perf_event_mmap(vma);
86700- mm->total_vm += len >> PAGE_SHIFT;
86701+ mm->total_vm += charged;
86702 if (flags & VM_LOCKED)
86703- mm->locked_vm += (len >> PAGE_SHIFT);
86704+ mm->locked_vm += charged;
86705+ track_exec_limit(mm, addr, addr + len, flags);
86706 return addr;
86707 }
86708
86709@@ -2750,6 +3247,7 @@ void exit_mmap(struct mm_struct *mm)
86710 while (vma) {
86711 if (vma->vm_flags & VM_ACCOUNT)
86712 nr_accounted += vma_pages(vma);
86713+ vma->vm_mirror = NULL;
86714 vma = remove_vma(vma);
86715 }
86716 vm_unacct_memory(nr_accounted);
86717@@ -2766,6 +3264,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
86718 struct vm_area_struct *prev;
86719 struct rb_node **rb_link, *rb_parent;
86720
86721+#ifdef CONFIG_PAX_SEGMEXEC
86722+ struct vm_area_struct *vma_m = NULL;
86723+#endif
86724+
86725+ if (security_mmap_addr(vma->vm_start))
86726+ return -EPERM;
86727+
86728 /*
86729 * The vm_pgoff of a purely anonymous vma should be irrelevant
86730 * until its first write fault, when page's anon_vma and index
86731@@ -2789,7 +3294,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
86732 security_vm_enough_memory_mm(mm, vma_pages(vma)))
86733 return -ENOMEM;
86734
86735+#ifdef CONFIG_PAX_SEGMEXEC
86736+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
86737+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
86738+ if (!vma_m)
86739+ return -ENOMEM;
86740+ }
86741+#endif
86742+
86743 vma_link(mm, vma, prev, rb_link, rb_parent);
86744+
86745+#ifdef CONFIG_PAX_SEGMEXEC
86746+ if (vma_m)
86747+ BUG_ON(pax_mirror_vma(vma_m, vma));
86748+#endif
86749+
86750 return 0;
86751 }
86752
86753@@ -2809,6 +3328,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
86754 struct mempolicy *pol;
86755 bool faulted_in_anon_vma = true;
86756
86757+ BUG_ON(vma->vm_mirror);
86758+
86759 /*
86760 * If anonymous vma has not yet been faulted, update new pgoff
86761 * to match new location, to increase its chance of merging.
86762@@ -2875,6 +3396,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
86763 return NULL;
86764 }
86765
86766+#ifdef CONFIG_PAX_SEGMEXEC
86767+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
86768+{
86769+ struct vm_area_struct *prev_m;
86770+ struct rb_node **rb_link_m, *rb_parent_m;
86771+ struct mempolicy *pol_m;
86772+
86773+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
86774+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
86775+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
86776+ *vma_m = *vma;
86777+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
86778+ if (anon_vma_clone(vma_m, vma))
86779+ return -ENOMEM;
86780+ pol_m = vma_policy(vma_m);
86781+ mpol_get(pol_m);
86782+ vma_set_policy(vma_m, pol_m);
86783+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
86784+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
86785+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
86786+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
86787+ if (vma_m->vm_file)
86788+ get_file(vma_m->vm_file);
86789+ if (vma_m->vm_ops && vma_m->vm_ops->open)
86790+ vma_m->vm_ops->open(vma_m);
86791+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
86792+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
86793+ vma_m->vm_mirror = vma;
86794+ vma->vm_mirror = vma_m;
86795+ return 0;
86796+}
86797+#endif
86798+
86799 /*
86800 * Return true if the calling process may expand its vm space by the passed
86801 * number of pages
86802@@ -2886,6 +3440,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
86803
86804 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
86805
86806+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
86807 if (cur + npages > lim)
86808 return 0;
86809 return 1;
86810@@ -2956,6 +3511,22 @@ int install_special_mapping(struct mm_struct *mm,
86811 vma->vm_start = addr;
86812 vma->vm_end = addr + len;
86813
86814+#ifdef CONFIG_PAX_MPROTECT
86815+ if (mm->pax_flags & MF_PAX_MPROTECT) {
86816+#ifndef CONFIG_PAX_MPROTECT_COMPAT
86817+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
86818+ return -EPERM;
86819+ if (!(vm_flags & VM_EXEC))
86820+ vm_flags &= ~VM_MAYEXEC;
86821+#else
86822+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
86823+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
86824+#endif
86825+ else
86826+ vm_flags &= ~VM_MAYWRITE;
86827+ }
86828+#endif
86829+
86830 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
86831 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
86832
86833diff --git a/mm/mprotect.c b/mm/mprotect.c
86834index 94722a4..e661e29 100644
86835--- a/mm/mprotect.c
86836+++ b/mm/mprotect.c
86837@@ -23,10 +23,18 @@
86838 #include <linux/mmu_notifier.h>
86839 #include <linux/migrate.h>
86840 #include <linux/perf_event.h>
86841+#include <linux/sched/sysctl.h>
86842+
86843+#ifdef CONFIG_PAX_MPROTECT
86844+#include <linux/elf.h>
86845+#include <linux/binfmts.h>
86846+#endif
86847+
86848 #include <asm/uaccess.h>
86849 #include <asm/pgtable.h>
86850 #include <asm/cacheflush.h>
86851 #include <asm/tlbflush.h>
86852+#include <asm/mmu_context.h>
86853
86854 #ifndef pgprot_modify
86855 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
86856@@ -233,6 +241,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
86857 return pages;
86858 }
86859
86860+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
86861+/* called while holding the mmap semaphor for writing except stack expansion */
86862+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
86863+{
86864+ unsigned long oldlimit, newlimit = 0UL;
86865+
86866+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
86867+ return;
86868+
86869+ spin_lock(&mm->page_table_lock);
86870+ oldlimit = mm->context.user_cs_limit;
86871+ if ((prot & VM_EXEC) && oldlimit < end)
86872+ /* USER_CS limit moved up */
86873+ newlimit = end;
86874+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
86875+ /* USER_CS limit moved down */
86876+ newlimit = start;
86877+
86878+ if (newlimit) {
86879+ mm->context.user_cs_limit = newlimit;
86880+
86881+#ifdef CONFIG_SMP
86882+ wmb();
86883+ cpus_clear(mm->context.cpu_user_cs_mask);
86884+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
86885+#endif
86886+
86887+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
86888+ }
86889+ spin_unlock(&mm->page_table_lock);
86890+ if (newlimit == end) {
86891+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
86892+
86893+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
86894+ if (is_vm_hugetlb_page(vma))
86895+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
86896+ else
86897+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
86898+ }
86899+}
86900+#endif
86901+
86902 int
86903 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
86904 unsigned long start, unsigned long end, unsigned long newflags)
86905@@ -245,11 +295,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
86906 int error;
86907 int dirty_accountable = 0;
86908
86909+#ifdef CONFIG_PAX_SEGMEXEC
86910+ struct vm_area_struct *vma_m = NULL;
86911+ unsigned long start_m, end_m;
86912+
86913+ start_m = start + SEGMEXEC_TASK_SIZE;
86914+ end_m = end + SEGMEXEC_TASK_SIZE;
86915+#endif
86916+
86917 if (newflags == oldflags) {
86918 *pprev = vma;
86919 return 0;
86920 }
86921
86922+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
86923+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
86924+
86925+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
86926+ return -ENOMEM;
86927+
86928+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
86929+ return -ENOMEM;
86930+ }
86931+
86932 /*
86933 * If we make a private mapping writable we increase our commit;
86934 * but (without finer accounting) cannot reduce our commit if we
86935@@ -266,6 +334,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
86936 }
86937 }
86938
86939+#ifdef CONFIG_PAX_SEGMEXEC
86940+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
86941+ if (start != vma->vm_start) {
86942+ error = split_vma(mm, vma, start, 1);
86943+ if (error)
86944+ goto fail;
86945+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
86946+ *pprev = (*pprev)->vm_next;
86947+ }
86948+
86949+ if (end != vma->vm_end) {
86950+ error = split_vma(mm, vma, end, 0);
86951+ if (error)
86952+ goto fail;
86953+ }
86954+
86955+ if (pax_find_mirror_vma(vma)) {
86956+ error = __do_munmap(mm, start_m, end_m - start_m);
86957+ if (error)
86958+ goto fail;
86959+ } else {
86960+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
86961+ if (!vma_m) {
86962+ error = -ENOMEM;
86963+ goto fail;
86964+ }
86965+ vma->vm_flags = newflags;
86966+ error = pax_mirror_vma(vma_m, vma);
86967+ if (error) {
86968+ vma->vm_flags = oldflags;
86969+ goto fail;
86970+ }
86971+ }
86972+ }
86973+#endif
86974+
86975 /*
86976 * First try to merge with previous and/or next vma.
86977 */
86978@@ -296,9 +400,21 @@ success:
86979 * vm_flags and vm_page_prot are protected by the mmap_sem
86980 * held in write mode.
86981 */
86982+
86983+#ifdef CONFIG_PAX_SEGMEXEC
86984+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
86985+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
86986+#endif
86987+
86988 vma->vm_flags = newflags;
86989+
86990+#ifdef CONFIG_PAX_MPROTECT
86991+ if (mm->binfmt && mm->binfmt->handle_mprotect)
86992+ mm->binfmt->handle_mprotect(vma, newflags);
86993+#endif
86994+
86995 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
86996- vm_get_page_prot(newflags));
86997+ vm_get_page_prot(vma->vm_flags));
86998
86999 if (vma_wants_writenotify(vma)) {
87000 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
87001@@ -337,6 +453,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
87002 end = start + len;
87003 if (end <= start)
87004 return -ENOMEM;
87005+
87006+#ifdef CONFIG_PAX_SEGMEXEC
87007+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
87008+ if (end > SEGMEXEC_TASK_SIZE)
87009+ return -EINVAL;
87010+ } else
87011+#endif
87012+
87013+ if (end > TASK_SIZE)
87014+ return -EINVAL;
87015+
87016 if (!arch_validate_prot(prot))
87017 return -EINVAL;
87018
87019@@ -344,7 +471,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
87020 /*
87021 * Does the application expect PROT_READ to imply PROT_EXEC:
87022 */
87023- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
87024+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
87025 prot |= PROT_EXEC;
87026
87027 vm_flags = calc_vm_prot_bits(prot);
87028@@ -376,6 +503,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
87029 if (start > vma->vm_start)
87030 prev = vma;
87031
87032+#ifdef CONFIG_PAX_MPROTECT
87033+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
87034+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
87035+#endif
87036+
87037 for (nstart = start ; ; ) {
87038 unsigned long newflags;
87039
87040@@ -386,6 +518,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
87041
87042 /* newflags >> 4 shift VM_MAY% in place of VM_% */
87043 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
87044+ if (prot & (PROT_WRITE | PROT_EXEC))
87045+ gr_log_rwxmprotect(vma);
87046+
87047+ error = -EACCES;
87048+ goto out;
87049+ }
87050+
87051+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
87052 error = -EACCES;
87053 goto out;
87054 }
87055@@ -400,6 +540,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
87056 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
87057 if (error)
87058 goto out;
87059+
87060+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
87061+
87062 nstart = tmp;
87063
87064 if (nstart < prev->vm_end)
87065diff --git a/mm/mremap.c b/mm/mremap.c
87066index 463a257..c0c7a92 100644
87067--- a/mm/mremap.c
87068+++ b/mm/mremap.c
87069@@ -126,6 +126,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
87070 continue;
87071 pte = ptep_get_and_clear(mm, old_addr, old_pte);
87072 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
87073+
87074+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
87075+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
87076+ pte = pte_exprotect(pte);
87077+#endif
87078+
87079 set_pte_at(mm, new_addr, new_pte, pte);
87080 }
87081
87082@@ -318,6 +324,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
87083 if (is_vm_hugetlb_page(vma))
87084 goto Einval;
87085
87086+#ifdef CONFIG_PAX_SEGMEXEC
87087+ if (pax_find_mirror_vma(vma))
87088+ goto Einval;
87089+#endif
87090+
87091 /* We can't remap across vm area boundaries */
87092 if (old_len > vma->vm_end - addr)
87093 goto Efault;
87094@@ -373,20 +384,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
87095 unsigned long ret = -EINVAL;
87096 unsigned long charged = 0;
87097 unsigned long map_flags;
87098+ unsigned long pax_task_size = TASK_SIZE;
87099
87100 if (new_addr & ~PAGE_MASK)
87101 goto out;
87102
87103- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
87104+#ifdef CONFIG_PAX_SEGMEXEC
87105+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
87106+ pax_task_size = SEGMEXEC_TASK_SIZE;
87107+#endif
87108+
87109+ pax_task_size -= PAGE_SIZE;
87110+
87111+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
87112 goto out;
87113
87114 /* Check if the location we're moving into overlaps the
87115 * old location at all, and fail if it does.
87116 */
87117- if ((new_addr <= addr) && (new_addr+new_len) > addr)
87118- goto out;
87119-
87120- if ((addr <= new_addr) && (addr+old_len) > new_addr)
87121+ if (addr + old_len > new_addr && new_addr + new_len > addr)
87122 goto out;
87123
87124 ret = do_munmap(mm, new_addr, new_len);
87125@@ -455,6 +471,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
87126 unsigned long ret = -EINVAL;
87127 unsigned long charged = 0;
87128 bool locked = false;
87129+ unsigned long pax_task_size = TASK_SIZE;
87130
87131 down_write(&current->mm->mmap_sem);
87132
87133@@ -475,6 +492,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
87134 if (!new_len)
87135 goto out;
87136
87137+#ifdef CONFIG_PAX_SEGMEXEC
87138+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
87139+ pax_task_size = SEGMEXEC_TASK_SIZE;
87140+#endif
87141+
87142+ pax_task_size -= PAGE_SIZE;
87143+
87144+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
87145+ old_len > pax_task_size || addr > pax_task_size-old_len)
87146+ goto out;
87147+
87148 if (flags & MREMAP_FIXED) {
87149 if (flags & MREMAP_MAYMOVE)
87150 ret = mremap_to(addr, old_len, new_addr, new_len,
87151@@ -524,6 +552,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
87152 new_addr = addr;
87153 }
87154 ret = addr;
87155+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
87156 goto out;
87157 }
87158 }
87159@@ -547,7 +576,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
87160 goto out;
87161 }
87162
87163+ map_flags = vma->vm_flags;
87164 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
87165+ if (!(ret & ~PAGE_MASK)) {
87166+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
87167+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
87168+ }
87169 }
87170 out:
87171 if (ret & ~PAGE_MASK)
87172diff --git a/mm/nommu.c b/mm/nommu.c
87173index 298884d..5f74980 100644
87174--- a/mm/nommu.c
87175+++ b/mm/nommu.c
87176@@ -65,7 +65,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
87177 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
87178 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
87179 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
87180-int heap_stack_gap = 0;
87181
87182 atomic_long_t mmap_pages_allocated;
87183
87184@@ -842,15 +841,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
87185 EXPORT_SYMBOL(find_vma);
87186
87187 /*
87188- * find a VMA
87189- * - we don't extend stack VMAs under NOMMU conditions
87190- */
87191-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
87192-{
87193- return find_vma(mm, addr);
87194-}
87195-
87196-/*
87197 * expand a stack to a given address
87198 * - not supported under NOMMU conditions
87199 */
87200@@ -1561,6 +1551,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
87201
87202 /* most fields are the same, copy all, and then fixup */
87203 *new = *vma;
87204+ INIT_LIST_HEAD(&new->anon_vma_chain);
87205 *region = *vma->vm_region;
87206 new->vm_region = region;
87207
87208@@ -1995,8 +1986,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
87209 }
87210 EXPORT_SYMBOL(generic_file_remap_pages);
87211
87212-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
87213- unsigned long addr, void *buf, int len, int write)
87214+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
87215+ unsigned long addr, void *buf, size_t len, int write)
87216 {
87217 struct vm_area_struct *vma;
87218
87219@@ -2037,8 +2028,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
87220 *
87221 * The caller must hold a reference on @mm.
87222 */
87223-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
87224- void *buf, int len, int write)
87225+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
87226+ void *buf, size_t len, int write)
87227 {
87228 return __access_remote_vm(NULL, mm, addr, buf, len, write);
87229 }
87230@@ -2047,7 +2038,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
87231 * Access another process' address space.
87232 * - source/target buffer must be kernel space
87233 */
87234-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
87235+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
87236 {
87237 struct mm_struct *mm;
87238
87239diff --git a/mm/page-writeback.c b/mm/page-writeback.c
87240index 4514ad7..92eaa1c 100644
87241--- a/mm/page-writeback.c
87242+++ b/mm/page-writeback.c
87243@@ -659,7 +659,7 @@ unsigned long bdi_dirty_limit(struct backing_dev_info *bdi, unsigned long dirty)
87244 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
87245 * - the bdi dirty thresh drops quickly due to change of JBOD workload
87246 */
87247-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
87248+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
87249 unsigned long thresh,
87250 unsigned long bg_thresh,
87251 unsigned long dirty,
87252@@ -1634,7 +1634,7 @@ ratelimit_handler(struct notifier_block *self, unsigned long action,
87253 }
87254 }
87255
87256-static struct notifier_block __cpuinitdata ratelimit_nb = {
87257+static struct notifier_block ratelimit_nb = {
87258 .notifier_call = ratelimit_handler,
87259 .next = NULL,
87260 };
87261diff --git a/mm/page_alloc.c b/mm/page_alloc.c
87262index 2ee0fd3..6e2edfb 100644
87263--- a/mm/page_alloc.c
87264+++ b/mm/page_alloc.c
87265@@ -60,6 +60,7 @@
87266 #include <linux/page-debug-flags.h>
87267 #include <linux/hugetlb.h>
87268 #include <linux/sched/rt.h>
87269+#include <linux/random.h>
87270
87271 #include <asm/tlbflush.h>
87272 #include <asm/div64.h>
87273@@ -345,7 +346,7 @@ out:
87274 * This usage means that zero-order pages may not be compound.
87275 */
87276
87277-static void free_compound_page(struct page *page)
87278+void free_compound_page(struct page *page)
87279 {
87280 __free_pages_ok(page, compound_order(page));
87281 }
87282@@ -702,6 +703,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
87283 int i;
87284 int bad = 0;
87285
87286+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87287+ unsigned long index = 1UL << order;
87288+#endif
87289+
87290 trace_mm_page_free(page, order);
87291 kmemcheck_free_shadow(page, order);
87292
87293@@ -717,6 +722,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
87294 debug_check_no_obj_freed(page_address(page),
87295 PAGE_SIZE << order);
87296 }
87297+
87298+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87299+ for (; index; --index)
87300+ sanitize_highpage(page + index - 1);
87301+#endif
87302+
87303 arch_free_page(page, order);
87304 kernel_map_pages(page, 1 << order, 0);
87305
87306@@ -739,6 +750,19 @@ static void __free_pages_ok(struct page *page, unsigned int order)
87307 local_irq_restore(flags);
87308 }
87309
87310+#ifdef CONFIG_PAX_LATENT_ENTROPY
87311+bool __meminitdata extra_latent_entropy;
87312+
87313+static int __init setup_pax_extra_latent_entropy(char *str)
87314+{
87315+ extra_latent_entropy = true;
87316+ return 0;
87317+}
87318+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
87319+
87320+volatile u64 latent_entropy;
87321+#endif
87322+
87323 /*
87324 * Read access to zone->managed_pages is safe because it's unsigned long,
87325 * but we still need to serialize writers. Currently all callers of
87326@@ -761,6 +785,19 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
87327 set_page_count(p, 0);
87328 }
87329
87330+#ifdef CONFIG_PAX_LATENT_ENTROPY
87331+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
87332+ u64 hash = 0;
87333+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
87334+ const u64 *data = lowmem_page_address(page);
87335+
87336+ for (index = 0; index < end; index++)
87337+ hash ^= hash + data[index];
87338+ latent_entropy ^= hash;
87339+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
87340+ }
87341+#endif
87342+
87343 page_zone(page)->managed_pages += 1 << order;
87344 set_page_refcounted(page);
87345 __free_pages(page, order);
87346@@ -870,8 +907,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
87347 arch_alloc_page(page, order);
87348 kernel_map_pages(page, 1 << order, 1);
87349
87350+#ifndef CONFIG_PAX_MEMORY_SANITIZE
87351 if (gfp_flags & __GFP_ZERO)
87352 prep_zero_page(page, order, gfp_flags);
87353+#endif
87354
87355 if (order && (gfp_flags & __GFP_COMP))
87356 prep_compound_page(page, order);
87357diff --git a/mm/page_io.c b/mm/page_io.c
87358index a8a3ef4..7260a60 100644
87359--- a/mm/page_io.c
87360+++ b/mm/page_io.c
87361@@ -214,7 +214,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
87362 struct file *swap_file = sis->swap_file;
87363 struct address_space *mapping = swap_file->f_mapping;
87364 struct iovec iov = {
87365- .iov_base = kmap(page),
87366+ .iov_base = (void __force_user *)kmap(page),
87367 .iov_len = PAGE_SIZE,
87368 };
87369
87370diff --git a/mm/percpu.c b/mm/percpu.c
87371index 8c8e08f..73a5cda 100644
87372--- a/mm/percpu.c
87373+++ b/mm/percpu.c
87374@@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
87375 static unsigned int pcpu_high_unit_cpu __read_mostly;
87376
87377 /* the address of the first chunk which starts with the kernel static area */
87378-void *pcpu_base_addr __read_mostly;
87379+void *pcpu_base_addr __read_only;
87380 EXPORT_SYMBOL_GPL(pcpu_base_addr);
87381
87382 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
87383diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
87384index fd26d04..0cea1b0 100644
87385--- a/mm/process_vm_access.c
87386+++ b/mm/process_vm_access.c
87387@@ -13,6 +13,7 @@
87388 #include <linux/uio.h>
87389 #include <linux/sched.h>
87390 #include <linux/highmem.h>
87391+#include <linux/security.h>
87392 #include <linux/ptrace.h>
87393 #include <linux/slab.h>
87394 #include <linux/syscalls.h>
87395@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
87396 size_t iov_l_curr_offset = 0;
87397 ssize_t iov_len;
87398
87399+ return -ENOSYS; // PaX: until properly audited
87400+
87401 /*
87402 * Work out how many pages of struct pages we're going to need
87403 * when eventually calling get_user_pages
87404 */
87405 for (i = 0; i < riovcnt; i++) {
87406 iov_len = rvec[i].iov_len;
87407- if (iov_len > 0) {
87408- nr_pages_iov = ((unsigned long)rvec[i].iov_base
87409- + iov_len)
87410- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
87411- / PAGE_SIZE + 1;
87412- nr_pages = max(nr_pages, nr_pages_iov);
87413- }
87414+ if (iov_len <= 0)
87415+ continue;
87416+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
87417+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
87418+ nr_pages = max(nr_pages, nr_pages_iov);
87419 }
87420
87421 if (nr_pages == 0)
87422@@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
87423 goto free_proc_pages;
87424 }
87425
87426+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
87427+ rc = -EPERM;
87428+ goto put_task_struct;
87429+ }
87430+
87431 mm = mm_access(task, PTRACE_MODE_ATTACH);
87432 if (!mm || IS_ERR(mm)) {
87433 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
87434diff --git a/mm/rmap.c b/mm/rmap.c
87435index 6280da8..b5c090e 100644
87436--- a/mm/rmap.c
87437+++ b/mm/rmap.c
87438@@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
87439 struct anon_vma *anon_vma = vma->anon_vma;
87440 struct anon_vma_chain *avc;
87441
87442+#ifdef CONFIG_PAX_SEGMEXEC
87443+ struct anon_vma_chain *avc_m = NULL;
87444+#endif
87445+
87446 might_sleep();
87447 if (unlikely(!anon_vma)) {
87448 struct mm_struct *mm = vma->vm_mm;
87449@@ -172,6 +176,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
87450 if (!avc)
87451 goto out_enomem;
87452
87453+#ifdef CONFIG_PAX_SEGMEXEC
87454+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
87455+ if (!avc_m)
87456+ goto out_enomem_free_avc;
87457+#endif
87458+
87459 anon_vma = find_mergeable_anon_vma(vma);
87460 allocated = NULL;
87461 if (!anon_vma) {
87462@@ -185,6 +195,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
87463 /* page_table_lock to protect against threads */
87464 spin_lock(&mm->page_table_lock);
87465 if (likely(!vma->anon_vma)) {
87466+
87467+#ifdef CONFIG_PAX_SEGMEXEC
87468+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
87469+
87470+ if (vma_m) {
87471+ BUG_ON(vma_m->anon_vma);
87472+ vma_m->anon_vma = anon_vma;
87473+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
87474+ avc_m = NULL;
87475+ }
87476+#endif
87477+
87478 vma->anon_vma = anon_vma;
87479 anon_vma_chain_link(vma, avc, anon_vma);
87480 allocated = NULL;
87481@@ -195,12 +217,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
87482
87483 if (unlikely(allocated))
87484 put_anon_vma(allocated);
87485+
87486+#ifdef CONFIG_PAX_SEGMEXEC
87487+ if (unlikely(avc_m))
87488+ anon_vma_chain_free(avc_m);
87489+#endif
87490+
87491 if (unlikely(avc))
87492 anon_vma_chain_free(avc);
87493 }
87494 return 0;
87495
87496 out_enomem_free_avc:
87497+
87498+#ifdef CONFIG_PAX_SEGMEXEC
87499+ if (avc_m)
87500+ anon_vma_chain_free(avc_m);
87501+#endif
87502+
87503 anon_vma_chain_free(avc);
87504 out_enomem:
87505 return -ENOMEM;
87506@@ -236,7 +270,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
87507 * Attach the anon_vmas from src to dst.
87508 * Returns 0 on success, -ENOMEM on failure.
87509 */
87510-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
87511+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
87512 {
87513 struct anon_vma_chain *avc, *pavc;
87514 struct anon_vma *root = NULL;
87515@@ -269,7 +303,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
87516 * the corresponding VMA in the parent process is attached to.
87517 * Returns 0 on success, non-zero on failure.
87518 */
87519-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
87520+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
87521 {
87522 struct anon_vma_chain *avc;
87523 struct anon_vma *anon_vma;
87524@@ -373,8 +407,10 @@ static void anon_vma_ctor(void *data)
87525 void __init anon_vma_init(void)
87526 {
87527 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
87528- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
87529- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
87530+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
87531+ anon_vma_ctor);
87532+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
87533+ SLAB_PANIC|SLAB_NO_SANITIZE);
87534 }
87535
87536 /*
87537diff --git a/mm/shmem.c b/mm/shmem.c
87538index 5e6a842..b41916e 100644
87539--- a/mm/shmem.c
87540+++ b/mm/shmem.c
87541@@ -33,7 +33,7 @@
87542 #include <linux/swap.h>
87543 #include <linux/aio.h>
87544
87545-static struct vfsmount *shm_mnt;
87546+struct vfsmount *shm_mnt;
87547
87548 #ifdef CONFIG_SHMEM
87549 /*
87550@@ -77,7 +77,7 @@ static struct vfsmount *shm_mnt;
87551 #define BOGO_DIRENT_SIZE 20
87552
87553 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
87554-#define SHORT_SYMLINK_LEN 128
87555+#define SHORT_SYMLINK_LEN 64
87556
87557 /*
87558 * shmem_fallocate and shmem_writepage communicate via inode->i_private
87559@@ -2203,6 +2203,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
87560 static int shmem_xattr_validate(const char *name)
87561 {
87562 struct { const char *prefix; size_t len; } arr[] = {
87563+
87564+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
87565+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
87566+#endif
87567+
87568 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
87569 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
87570 };
87571@@ -2258,6 +2263,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
87572 if (err)
87573 return err;
87574
87575+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
87576+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
87577+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
87578+ return -EOPNOTSUPP;
87579+ if (size > 8)
87580+ return -EINVAL;
87581+ }
87582+#endif
87583+
87584 return simple_xattr_set(&info->xattrs, name, value, size, flags);
87585 }
87586
87587@@ -2570,8 +2584,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
87588 int err = -ENOMEM;
87589
87590 /* Round up to L1_CACHE_BYTES to resist false sharing */
87591- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
87592- L1_CACHE_BYTES), GFP_KERNEL);
87593+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
87594 if (!sbinfo)
87595 return -ENOMEM;
87596
87597diff --git a/mm/slab.c b/mm/slab.c
87598index bd88411..2d46fd6 100644
87599--- a/mm/slab.c
87600+++ b/mm/slab.c
87601@@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
87602 if ((x)->max_freeable < i) \
87603 (x)->max_freeable = i; \
87604 } while (0)
87605-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
87606-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
87607-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
87608-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
87609+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
87610+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
87611+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
87612+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
87613+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
87614+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
87615 #else
87616 #define STATS_INC_ACTIVE(x) do { } while (0)
87617 #define STATS_DEC_ACTIVE(x) do { } while (0)
87618@@ -386,6 +388,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
87619 #define STATS_INC_ALLOCMISS(x) do { } while (0)
87620 #define STATS_INC_FREEHIT(x) do { } while (0)
87621 #define STATS_INC_FREEMISS(x) do { } while (0)
87622+#define STATS_INC_SANITIZED(x) do { } while (0)
87623+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
87624 #endif
87625
87626 #if DEBUG
87627@@ -477,7 +481,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
87628 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
87629 */
87630 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
87631- const struct slab *slab, void *obj)
87632+ const struct slab *slab, const void *obj)
87633 {
87634 u32 offset = (obj - slab->s_mem);
87635 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
87636@@ -1384,7 +1388,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
87637 return notifier_from_errno(err);
87638 }
87639
87640-static struct notifier_block __cpuinitdata cpucache_notifier = {
87641+static struct notifier_block cpucache_notifier = {
87642 &cpuup_callback, NULL, 0
87643 };
87644
87645@@ -1565,12 +1569,12 @@ void __init kmem_cache_init(void)
87646 */
87647
87648 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
87649- kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
87650+ kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
87651
87652 if (INDEX_AC != INDEX_NODE)
87653 kmalloc_caches[INDEX_NODE] =
87654 create_kmalloc_cache("kmalloc-node",
87655- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
87656+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
87657
87658 slab_early_init = 0;
87659
87660@@ -3583,6 +3587,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
87661 struct array_cache *ac = cpu_cache_get(cachep);
87662
87663 check_irq_off();
87664+
87665+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87666+ if (pax_sanitize_slab) {
87667+ if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
87668+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
87669+
87670+ if (cachep->ctor)
87671+ cachep->ctor(objp);
87672+
87673+ STATS_INC_SANITIZED(cachep);
87674+ } else
87675+ STATS_INC_NOT_SANITIZED(cachep);
87676+ }
87677+#endif
87678+
87679 kmemleak_free_recursive(objp, cachep->flags);
87680 objp = cache_free_debugcheck(cachep, objp, caller);
87681
87682@@ -3800,6 +3819,7 @@ void kfree(const void *objp)
87683
87684 if (unlikely(ZERO_OR_NULL_PTR(objp)))
87685 return;
87686+ VM_BUG_ON(!virt_addr_valid(objp));
87687 local_irq_save(flags);
87688 kfree_debugcheck(objp);
87689 c = virt_to_cache(objp);
87690@@ -4241,14 +4261,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
87691 }
87692 /* cpu stats */
87693 {
87694- unsigned long allochit = atomic_read(&cachep->allochit);
87695- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
87696- unsigned long freehit = atomic_read(&cachep->freehit);
87697- unsigned long freemiss = atomic_read(&cachep->freemiss);
87698+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
87699+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
87700+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
87701+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
87702
87703 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
87704 allochit, allocmiss, freehit, freemiss);
87705 }
87706+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87707+ {
87708+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
87709+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
87710+
87711+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
87712+ }
87713+#endif
87714 #endif
87715 }
87716
87717@@ -4476,13 +4504,71 @@ static const struct file_operations proc_slabstats_operations = {
87718 static int __init slab_proc_init(void)
87719 {
87720 #ifdef CONFIG_DEBUG_SLAB_LEAK
87721- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
87722+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
87723 #endif
87724 return 0;
87725 }
87726 module_init(slab_proc_init);
87727 #endif
87728
87729+bool is_usercopy_object(const void *ptr)
87730+{
87731+ struct page *page;
87732+ struct kmem_cache *cachep;
87733+
87734+ if (ZERO_OR_NULL_PTR(ptr))
87735+ return false;
87736+
87737+ if (!slab_is_available())
87738+ return false;
87739+
87740+ if (!virt_addr_valid(ptr))
87741+ return false;
87742+
87743+ page = virt_to_head_page(ptr);
87744+
87745+ if (!PageSlab(page))
87746+ return false;
87747+
87748+ cachep = page->slab_cache;
87749+ return cachep->flags & SLAB_USERCOPY;
87750+}
87751+
87752+#ifdef CONFIG_PAX_USERCOPY
87753+const char *check_heap_object(const void *ptr, unsigned long n)
87754+{
87755+ struct page *page;
87756+ struct kmem_cache *cachep;
87757+ struct slab *slabp;
87758+ unsigned int objnr;
87759+ unsigned long offset;
87760+
87761+ if (ZERO_OR_NULL_PTR(ptr))
87762+ return "<null>";
87763+
87764+ if (!virt_addr_valid(ptr))
87765+ return NULL;
87766+
87767+ page = virt_to_head_page(ptr);
87768+
87769+ if (!PageSlab(page))
87770+ return NULL;
87771+
87772+ cachep = page->slab_cache;
87773+ if (!(cachep->flags & SLAB_USERCOPY))
87774+ return cachep->name;
87775+
87776+ slabp = page->slab_page;
87777+ objnr = obj_to_index(cachep, slabp, ptr);
87778+ BUG_ON(objnr >= cachep->num);
87779+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
87780+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
87781+ return NULL;
87782+
87783+ return cachep->name;
87784+}
87785+#endif
87786+
87787 /**
87788 * ksize - get the actual amount of memory allocated for a given object
87789 * @objp: Pointer to the object
87790diff --git a/mm/slab.h b/mm/slab.h
87791index f96b49e..db1d204 100644
87792--- a/mm/slab.h
87793+++ b/mm/slab.h
87794@@ -32,6 +32,15 @@ extern struct list_head slab_caches;
87795 /* The slab cache that manages slab cache information */
87796 extern struct kmem_cache *kmem_cache;
87797
87798+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87799+#ifdef CONFIG_X86_64
87800+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
87801+#else
87802+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
87803+#endif
87804+extern bool pax_sanitize_slab;
87805+#endif
87806+
87807 unsigned long calculate_alignment(unsigned long flags,
87808 unsigned long align, unsigned long size);
87809
87810@@ -67,7 +76,8 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
87811
87812 /* Legal flag mask for kmem_cache_create(), for various configurations */
87813 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
87814- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
87815+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
87816+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
87817
87818 #if defined(CONFIG_DEBUG_SLAB)
87819 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
87820@@ -229,6 +239,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
87821 return s;
87822
87823 page = virt_to_head_page(x);
87824+
87825+ BUG_ON(!PageSlab(page));
87826+
87827 cachep = page->slab_cache;
87828 if (slab_equal_or_root(cachep, s))
87829 return cachep;
87830diff --git a/mm/slab_common.c b/mm/slab_common.c
87831index 2d41450..4efe6ee 100644
87832--- a/mm/slab_common.c
87833+++ b/mm/slab_common.c
87834@@ -22,11 +22,22 @@
87835
87836 #include "slab.h"
87837
87838-enum slab_state slab_state;
87839+enum slab_state slab_state __read_only;
87840 LIST_HEAD(slab_caches);
87841 DEFINE_MUTEX(slab_mutex);
87842 struct kmem_cache *kmem_cache;
87843
87844+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87845+bool pax_sanitize_slab __read_only = true;
87846+static int __init pax_sanitize_slab_setup(char *str)
87847+{
87848+ pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
87849+ printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
87850+ return 1;
87851+}
87852+__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
87853+#endif
87854+
87855 #ifdef CONFIG_DEBUG_VM
87856 static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
87857 size_t size)
87858@@ -209,7 +220,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
87859
87860 err = __kmem_cache_create(s, flags);
87861 if (!err) {
87862- s->refcount = 1;
87863+ atomic_set(&s->refcount, 1);
87864 list_add(&s->list, &slab_caches);
87865 memcg_cache_list_add(memcg, s);
87866 } else {
87867@@ -255,8 +266,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
87868
87869 get_online_cpus();
87870 mutex_lock(&slab_mutex);
87871- s->refcount--;
87872- if (!s->refcount) {
87873+ if (atomic_dec_and_test(&s->refcount)) {
87874 list_del(&s->list);
87875
87876 if (!__kmem_cache_shutdown(s)) {
87877@@ -302,7 +312,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
87878 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
87879 name, size, err);
87880
87881- s->refcount = -1; /* Exempt from merging for now */
87882+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
87883 }
87884
87885 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
87886@@ -315,7 +325,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
87887
87888 create_boot_cache(s, name, size, flags);
87889 list_add(&s->list, &slab_caches);
87890- s->refcount = 1;
87891+ atomic_set(&s->refcount, 1);
87892 return s;
87893 }
87894
87895@@ -327,6 +337,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
87896 EXPORT_SYMBOL(kmalloc_dma_caches);
87897 #endif
87898
87899+#ifdef CONFIG_PAX_USERCOPY_SLABS
87900+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
87901+EXPORT_SYMBOL(kmalloc_usercopy_caches);
87902+#endif
87903+
87904 /*
87905 * Conversion table for small slabs sizes / 8 to the index in the
87906 * kmalloc array. This is necessary for slabs < 192 since we have non power
87907@@ -391,6 +406,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
87908 return kmalloc_dma_caches[index];
87909
87910 #endif
87911+
87912+#ifdef CONFIG_PAX_USERCOPY_SLABS
87913+ if (unlikely((flags & GFP_USERCOPY)))
87914+ return kmalloc_usercopy_caches[index];
87915+
87916+#endif
87917+
87918 return kmalloc_caches[index];
87919 }
87920
87921@@ -447,7 +469,7 @@ void __init create_kmalloc_caches(unsigned long flags)
87922 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
87923 if (!kmalloc_caches[i]) {
87924 kmalloc_caches[i] = create_kmalloc_cache(NULL,
87925- 1 << i, flags);
87926+ 1 << i, SLAB_USERCOPY | flags);
87927 }
87928
87929 /*
87930@@ -456,10 +478,10 @@ void __init create_kmalloc_caches(unsigned long flags)
87931 * earlier power of two caches
87932 */
87933 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
87934- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
87935+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
87936
87937 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
87938- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
87939+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
87940 }
87941
87942 /* Kmalloc array is now usable */
87943@@ -492,6 +514,23 @@ void __init create_kmalloc_caches(unsigned long flags)
87944 }
87945 }
87946 #endif
87947+
87948+#ifdef CONFIG_PAX_USERCOPY_SLABS
87949+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
87950+ struct kmem_cache *s = kmalloc_caches[i];
87951+
87952+ if (s) {
87953+ int size = kmalloc_size(i);
87954+ char *n = kasprintf(GFP_NOWAIT,
87955+ "usercopy-kmalloc-%d", size);
87956+
87957+ BUG_ON(!n);
87958+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
87959+ size, SLAB_USERCOPY | flags);
87960+ }
87961+ }
87962+#endif
87963+
87964 }
87965 #endif /* !CONFIG_SLOB */
87966
87967@@ -516,6 +555,9 @@ void print_slabinfo_header(struct seq_file *m)
87968 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
87969 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
87970 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
87971+#ifdef CONFIG_PAX_MEMORY_SANITIZE
87972+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
87973+#endif
87974 #endif
87975 seq_putc(m, '\n');
87976 }
87977diff --git a/mm/slob.c b/mm/slob.c
87978index eeed4a0..bb0e9ab 100644
87979--- a/mm/slob.c
87980+++ b/mm/slob.c
87981@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
87982 /*
87983 * Return the size of a slob block.
87984 */
87985-static slobidx_t slob_units(slob_t *s)
87986+static slobidx_t slob_units(const slob_t *s)
87987 {
87988 if (s->units > 0)
87989 return s->units;
87990@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
87991 /*
87992 * Return the next free slob block pointer after this one.
87993 */
87994-static slob_t *slob_next(slob_t *s)
87995+static slob_t *slob_next(const slob_t *s)
87996 {
87997 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
87998 slobidx_t next;
87999@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
88000 /*
88001 * Returns true if s is the last free block in its page.
88002 */
88003-static int slob_last(slob_t *s)
88004+static int slob_last(const slob_t *s)
88005 {
88006 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
88007 }
88008
88009-static void *slob_new_pages(gfp_t gfp, int order, int node)
88010+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
88011 {
88012- void *page;
88013+ struct page *page;
88014
88015 #ifdef CONFIG_NUMA
88016 if (node != NUMA_NO_NODE)
88017@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
88018 if (!page)
88019 return NULL;
88020
88021- return page_address(page);
88022+ __SetPageSlab(page);
88023+ return page;
88024 }
88025
88026-static void slob_free_pages(void *b, int order)
88027+static void slob_free_pages(struct page *sp, int order)
88028 {
88029 if (current->reclaim_state)
88030 current->reclaim_state->reclaimed_slab += 1 << order;
88031- free_pages((unsigned long)b, order);
88032+ __ClearPageSlab(sp);
88033+ page_mapcount_reset(sp);
88034+ sp->private = 0;
88035+ __free_pages(sp, order);
88036 }
88037
88038 /*
88039@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
88040
88041 /* Not enough space: must allocate a new page */
88042 if (!b) {
88043- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
88044- if (!b)
88045+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
88046+ if (!sp)
88047 return NULL;
88048- sp = virt_to_page(b);
88049- __SetPageSlab(sp);
88050+ b = page_address(sp);
88051
88052 spin_lock_irqsave(&slob_lock, flags);
88053 sp->units = SLOB_UNITS(PAGE_SIZE);
88054 sp->freelist = b;
88055+ sp->private = 0;
88056 INIT_LIST_HEAD(&sp->list);
88057 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
88058 set_slob_page_free(sp, slob_list);
88059@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
88060 if (slob_page_free(sp))
88061 clear_slob_page_free(sp);
88062 spin_unlock_irqrestore(&slob_lock, flags);
88063- __ClearPageSlab(sp);
88064- page_mapcount_reset(sp);
88065- slob_free_pages(b, 0);
88066+ slob_free_pages(sp, 0);
88067 return;
88068 }
88069
88070+#ifdef CONFIG_PAX_MEMORY_SANITIZE
88071+ if (pax_sanitize_slab)
88072+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
88073+#endif
88074+
88075 if (!slob_page_free(sp)) {
88076 /* This slob page is about to become partially free. Easy! */
88077 sp->units = units;
88078@@ -424,11 +431,10 @@ out:
88079 */
88080
88081 static __always_inline void *
88082-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
88083+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
88084 {
88085- unsigned int *m;
88086- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
88087- void *ret;
88088+ slob_t *m;
88089+ void *ret = NULL;
88090
88091 gfp &= gfp_allowed_mask;
88092
88093@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
88094
88095 if (!m)
88096 return NULL;
88097- *m = size;
88098+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
88099+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
88100+ m[0].units = size;
88101+ m[1].units = align;
88102 ret = (void *)m + align;
88103
88104 trace_kmalloc_node(caller, ret,
88105 size, size + align, gfp, node);
88106 } else {
88107 unsigned int order = get_order(size);
88108+ struct page *page;
88109
88110 if (likely(order))
88111 gfp |= __GFP_COMP;
88112- ret = slob_new_pages(gfp, order, node);
88113+ page = slob_new_pages(gfp, order, node);
88114+ if (page) {
88115+ ret = page_address(page);
88116+ page->private = size;
88117+ }
88118
88119 trace_kmalloc_node(caller, ret,
88120 size, PAGE_SIZE << order, gfp, node);
88121 }
88122
88123- kmemleak_alloc(ret, size, 1, gfp);
88124+ return ret;
88125+}
88126+
88127+static __always_inline void *
88128+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
88129+{
88130+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
88131+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
88132+
88133+ if (!ZERO_OR_NULL_PTR(ret))
88134+ kmemleak_alloc(ret, size, 1, gfp);
88135 return ret;
88136 }
88137
88138@@ -493,34 +517,112 @@ void kfree(const void *block)
88139 return;
88140 kmemleak_free(block);
88141
88142+ VM_BUG_ON(!virt_addr_valid(block));
88143 sp = virt_to_page(block);
88144- if (PageSlab(sp)) {
88145+ VM_BUG_ON(!PageSlab(sp));
88146+ if (!sp->private) {
88147 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
88148- unsigned int *m = (unsigned int *)(block - align);
88149- slob_free(m, *m + align);
88150- } else
88151+ slob_t *m = (slob_t *)(block - align);
88152+ slob_free(m, m[0].units + align);
88153+ } else {
88154+ __ClearPageSlab(sp);
88155+ page_mapcount_reset(sp);
88156+ sp->private = 0;
88157 __free_pages(sp, compound_order(sp));
88158+ }
88159 }
88160 EXPORT_SYMBOL(kfree);
88161
88162+bool is_usercopy_object(const void *ptr)
88163+{
88164+ if (!slab_is_available())
88165+ return false;
88166+
88167+ // PAX: TODO
88168+
88169+ return false;
88170+}
88171+
88172+#ifdef CONFIG_PAX_USERCOPY
88173+const char *check_heap_object(const void *ptr, unsigned long n)
88174+{
88175+ struct page *page;
88176+ const slob_t *free;
88177+ const void *base;
88178+ unsigned long flags;
88179+
88180+ if (ZERO_OR_NULL_PTR(ptr))
88181+ return "<null>";
88182+
88183+ if (!virt_addr_valid(ptr))
88184+ return NULL;
88185+
88186+ page = virt_to_head_page(ptr);
88187+ if (!PageSlab(page))
88188+ return NULL;
88189+
88190+ if (page->private) {
88191+ base = page;
88192+ if (base <= ptr && n <= page->private - (ptr - base))
88193+ return NULL;
88194+ return "<slob>";
88195+ }
88196+
88197+ /* some tricky double walking to find the chunk */
88198+ spin_lock_irqsave(&slob_lock, flags);
88199+ base = (void *)((unsigned long)ptr & PAGE_MASK);
88200+ free = page->freelist;
88201+
88202+ while (!slob_last(free) && (void *)free <= ptr) {
88203+ base = free + slob_units(free);
88204+ free = slob_next(free);
88205+ }
88206+
88207+ while (base < (void *)free) {
88208+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
88209+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
88210+ int offset;
88211+
88212+ if (ptr < base + align)
88213+ break;
88214+
88215+ offset = ptr - base - align;
88216+ if (offset >= m) {
88217+ base += size;
88218+ continue;
88219+ }
88220+
88221+ if (n > m - offset)
88222+ break;
88223+
88224+ spin_unlock_irqrestore(&slob_lock, flags);
88225+ return NULL;
88226+ }
88227+
88228+ spin_unlock_irqrestore(&slob_lock, flags);
88229+ return "<slob>";
88230+}
88231+#endif
88232+
88233 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
88234 size_t ksize(const void *block)
88235 {
88236 struct page *sp;
88237 int align;
88238- unsigned int *m;
88239+ slob_t *m;
88240
88241 BUG_ON(!block);
88242 if (unlikely(block == ZERO_SIZE_PTR))
88243 return 0;
88244
88245 sp = virt_to_page(block);
88246- if (unlikely(!PageSlab(sp)))
88247- return PAGE_SIZE << compound_order(sp);
88248+ VM_BUG_ON(!PageSlab(sp));
88249+ if (sp->private)
88250+ return sp->private;
88251
88252 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
88253- m = (unsigned int *)(block - align);
88254- return SLOB_UNITS(*m) * SLOB_UNIT;
88255+ m = (slob_t *)(block - align);
88256+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
88257 }
88258 EXPORT_SYMBOL(ksize);
88259
88260@@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
88261
88262 void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
88263 {
88264- void *b;
88265+ void *b = NULL;
88266
88267 flags &= gfp_allowed_mask;
88268
88269 lockdep_trace_alloc(flags);
88270
88271+#ifdef CONFIG_PAX_USERCOPY_SLABS
88272+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
88273+#else
88274 if (c->size < PAGE_SIZE) {
88275 b = slob_alloc(c->size, flags, c->align, node);
88276 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
88277 SLOB_UNITS(c->size) * SLOB_UNIT,
88278 flags, node);
88279 } else {
88280- b = slob_new_pages(flags, get_order(c->size), node);
88281+ struct page *sp;
88282+
88283+ sp = slob_new_pages(flags, get_order(c->size), node);
88284+ if (sp) {
88285+ b = page_address(sp);
88286+ sp->private = c->size;
88287+ }
88288 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
88289 PAGE_SIZE << get_order(c->size),
88290 flags, node);
88291 }
88292+#endif
88293
88294 if (c->ctor)
88295 c->ctor(b);
88296@@ -564,10 +676,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
88297
88298 static void __kmem_cache_free(void *b, int size)
88299 {
88300- if (size < PAGE_SIZE)
88301+ struct page *sp;
88302+
88303+ sp = virt_to_page(b);
88304+ BUG_ON(!PageSlab(sp));
88305+ if (!sp->private)
88306 slob_free(b, size);
88307 else
88308- slob_free_pages(b, get_order(size));
88309+ slob_free_pages(sp, get_order(size));
88310 }
88311
88312 static void kmem_rcu_free(struct rcu_head *head)
88313@@ -580,17 +696,31 @@ static void kmem_rcu_free(struct rcu_head *head)
88314
88315 void kmem_cache_free(struct kmem_cache *c, void *b)
88316 {
88317+ int size = c->size;
88318+
88319+#ifdef CONFIG_PAX_USERCOPY_SLABS
88320+ if (size + c->align < PAGE_SIZE) {
88321+ size += c->align;
88322+ b -= c->align;
88323+ }
88324+#endif
88325+
88326 kmemleak_free_recursive(b, c->flags);
88327 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
88328 struct slob_rcu *slob_rcu;
88329- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
88330- slob_rcu->size = c->size;
88331+ slob_rcu = b + (size - sizeof(struct slob_rcu));
88332+ slob_rcu->size = size;
88333 call_rcu(&slob_rcu->head, kmem_rcu_free);
88334 } else {
88335- __kmem_cache_free(b, c->size);
88336+ __kmem_cache_free(b, size);
88337 }
88338
88339+#ifdef CONFIG_PAX_USERCOPY_SLABS
88340+ trace_kfree(_RET_IP_, b);
88341+#else
88342 trace_kmem_cache_free(_RET_IP_, b);
88343+#endif
88344+
88345 }
88346 EXPORT_SYMBOL(kmem_cache_free);
88347
88348diff --git a/mm/slub.c b/mm/slub.c
88349index 57707f0..7857bd3 100644
88350--- a/mm/slub.c
88351+++ b/mm/slub.c
88352@@ -198,7 +198,7 @@ struct track {
88353
88354 enum track_item { TRACK_ALLOC, TRACK_FREE };
88355
88356-#ifdef CONFIG_SYSFS
88357+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
88358 static int sysfs_slab_add(struct kmem_cache *);
88359 static int sysfs_slab_alias(struct kmem_cache *, const char *);
88360 static void sysfs_slab_remove(struct kmem_cache *);
88361@@ -519,7 +519,7 @@ static void print_track(const char *s, struct track *t)
88362 if (!t->addr)
88363 return;
88364
88365- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
88366+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
88367 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
88368 #ifdef CONFIG_STACKTRACE
88369 {
88370@@ -2594,6 +2594,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
88371
88372 slab_free_hook(s, x);
88373
88374+#ifdef CONFIG_PAX_MEMORY_SANITIZE
88375+ if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
88376+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
88377+ if (s->ctor)
88378+ s->ctor(x);
88379+ }
88380+#endif
88381+
88382 redo:
88383 /*
88384 * Determine the currently cpus per cpu slab.
88385@@ -2661,7 +2669,7 @@ static int slub_min_objects;
88386 * Merge control. If this is set then no merging of slab caches will occur.
88387 * (Could be removed. This was introduced to pacify the merge skeptics.)
88388 */
88389-static int slub_nomerge;
88390+static int slub_nomerge = 1;
88391
88392 /*
88393 * Calculate the order of allocation given an slab object size.
88394@@ -2938,6 +2946,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
88395 s->inuse = size;
88396
88397 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
88398+#ifdef CONFIG_PAX_MEMORY_SANITIZE
88399+ (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
88400+#endif
88401 s->ctor)) {
88402 /*
88403 * Relocate free pointer after the object if it is not
88404@@ -3283,6 +3294,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
88405 EXPORT_SYMBOL(__kmalloc_node);
88406 #endif
88407
88408+bool is_usercopy_object(const void *ptr)
88409+{
88410+ struct page *page;
88411+ struct kmem_cache *s;
88412+
88413+ if (ZERO_OR_NULL_PTR(ptr))
88414+ return false;
88415+
88416+ if (!slab_is_available())
88417+ return false;
88418+
88419+ if (!virt_addr_valid(ptr))
88420+ return false;
88421+
88422+ page = virt_to_head_page(ptr);
88423+
88424+ if (!PageSlab(page))
88425+ return false;
88426+
88427+ s = page->slab_cache;
88428+ return s->flags & SLAB_USERCOPY;
88429+}
88430+
88431+#ifdef CONFIG_PAX_USERCOPY
88432+const char *check_heap_object(const void *ptr, unsigned long n)
88433+{
88434+ struct page *page;
88435+ struct kmem_cache *s;
88436+ unsigned long offset;
88437+
88438+ if (ZERO_OR_NULL_PTR(ptr))
88439+ return "<null>";
88440+
88441+ if (!virt_addr_valid(ptr))
88442+ return NULL;
88443+
88444+ page = virt_to_head_page(ptr);
88445+
88446+ if (!PageSlab(page))
88447+ return NULL;
88448+
88449+ s = page->slab_cache;
88450+ if (!(s->flags & SLAB_USERCOPY))
88451+ return s->name;
88452+
88453+ offset = (ptr - page_address(page)) % s->size;
88454+ if (offset <= s->object_size && n <= s->object_size - offset)
88455+ return NULL;
88456+
88457+ return s->name;
88458+}
88459+#endif
88460+
88461 size_t ksize(const void *object)
88462 {
88463 struct page *page;
88464@@ -3347,6 +3411,7 @@ void kfree(const void *x)
88465 if (unlikely(ZERO_OR_NULL_PTR(x)))
88466 return;
88467
88468+ VM_BUG_ON(!virt_addr_valid(x));
88469 page = virt_to_head_page(x);
88470 if (unlikely(!PageSlab(page))) {
88471 BUG_ON(!PageCompound(page));
88472@@ -3652,7 +3717,7 @@ static int slab_unmergeable(struct kmem_cache *s)
88473 /*
88474 * We may have set a slab to be unmergeable during bootstrap.
88475 */
88476- if (s->refcount < 0)
88477+ if (atomic_read(&s->refcount) < 0)
88478 return 1;
88479
88480 return 0;
88481@@ -3710,7 +3775,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
88482
88483 s = find_mergeable(memcg, size, align, flags, name, ctor);
88484 if (s) {
88485- s->refcount++;
88486+ atomic_inc(&s->refcount);
88487 /*
88488 * Adjust the object sizes so that we clear
88489 * the complete object on kzalloc.
88490@@ -3719,7 +3784,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
88491 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
88492
88493 if (sysfs_slab_alias(s, name)) {
88494- s->refcount--;
88495+ atomic_dec(&s->refcount);
88496 s = NULL;
88497 }
88498 }
88499@@ -3781,7 +3846,7 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb,
88500 return NOTIFY_OK;
88501 }
88502
88503-static struct notifier_block __cpuinitdata slab_notifier = {
88504+static struct notifier_block slab_notifier = {
88505 .notifier_call = slab_cpuup_callback
88506 };
88507
88508@@ -3839,7 +3904,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
88509 }
88510 #endif
88511
88512-#ifdef CONFIG_SYSFS
88513+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
88514 static int count_inuse(struct page *page)
88515 {
88516 return page->inuse;
88517@@ -4226,12 +4291,12 @@ static void resiliency_test(void)
88518 validate_slab_cache(kmalloc_caches[9]);
88519 }
88520 #else
88521-#ifdef CONFIG_SYSFS
88522+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
88523 static void resiliency_test(void) {};
88524 #endif
88525 #endif
88526
88527-#ifdef CONFIG_SYSFS
88528+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
88529 enum slab_stat_type {
88530 SL_ALL, /* All slabs */
88531 SL_PARTIAL, /* Only partially allocated slabs */
88532@@ -4475,7 +4540,7 @@ SLAB_ATTR_RO(ctor);
88533
88534 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
88535 {
88536- return sprintf(buf, "%d\n", s->refcount - 1);
88537+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
88538 }
88539 SLAB_ATTR_RO(aliases);
88540
88541@@ -4563,6 +4628,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
88542 SLAB_ATTR_RO(cache_dma);
88543 #endif
88544
88545+#ifdef CONFIG_PAX_USERCOPY_SLABS
88546+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
88547+{
88548+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
88549+}
88550+SLAB_ATTR_RO(usercopy);
88551+#endif
88552+
88553 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
88554 {
88555 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
88556@@ -4897,6 +4970,9 @@ static struct attribute *slab_attrs[] = {
88557 #ifdef CONFIG_ZONE_DMA
88558 &cache_dma_attr.attr,
88559 #endif
88560+#ifdef CONFIG_PAX_USERCOPY_SLABS
88561+ &usercopy_attr.attr,
88562+#endif
88563 #ifdef CONFIG_NUMA
88564 &remote_node_defrag_ratio_attr.attr,
88565 #endif
88566@@ -5128,6 +5204,7 @@ static char *create_unique_id(struct kmem_cache *s)
88567 return name;
88568 }
88569
88570+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
88571 static int sysfs_slab_add(struct kmem_cache *s)
88572 {
88573 int err;
88574@@ -5151,7 +5228,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
88575 }
88576
88577 s->kobj.kset = slab_kset;
88578- err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
88579+ err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, "%s", name);
88580 if (err) {
88581 kobject_put(&s->kobj);
88582 return err;
88583@@ -5185,6 +5262,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
88584 kobject_del(&s->kobj);
88585 kobject_put(&s->kobj);
88586 }
88587+#endif
88588
88589 /*
88590 * Need to buffer aliases during bootup until sysfs becomes
88591@@ -5198,6 +5276,7 @@ struct saved_alias {
88592
88593 static struct saved_alias *alias_list;
88594
88595+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
88596 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
88597 {
88598 struct saved_alias *al;
88599@@ -5220,6 +5299,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
88600 alias_list = al;
88601 return 0;
88602 }
88603+#endif
88604
88605 static int __init slab_sysfs_init(void)
88606 {
88607diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
88608index 27eeab3..7c3f7f2 100644
88609--- a/mm/sparse-vmemmap.c
88610+++ b/mm/sparse-vmemmap.c
88611@@ -130,7 +130,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
88612 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
88613 if (!p)
88614 return NULL;
88615- pud_populate(&init_mm, pud, p);
88616+ pud_populate_kernel(&init_mm, pud, p);
88617 }
88618 return pud;
88619 }
88620@@ -142,7 +142,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
88621 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
88622 if (!p)
88623 return NULL;
88624- pgd_populate(&init_mm, pgd, p);
88625+ pgd_populate_kernel(&init_mm, pgd, p);
88626 }
88627 return pgd;
88628 }
88629diff --git a/mm/sparse.c b/mm/sparse.c
88630index 1c91f0d3..485470a 100644
88631--- a/mm/sparse.c
88632+++ b/mm/sparse.c
88633@@ -761,7 +761,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
88634
88635 for (i = 0; i < PAGES_PER_SECTION; i++) {
88636 if (PageHWPoison(&memmap[i])) {
88637- atomic_long_sub(1, &num_poisoned_pages);
88638+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
88639 ClearPageHWPoison(&memmap[i]);
88640 }
88641 }
88642diff --git a/mm/swap.c b/mm/swap.c
88643index dfd7d71..ccdf688 100644
88644--- a/mm/swap.c
88645+++ b/mm/swap.c
88646@@ -31,6 +31,7 @@
88647 #include <linux/memcontrol.h>
88648 #include <linux/gfp.h>
88649 #include <linux/uio.h>
88650+#include <linux/hugetlb.h>
88651
88652 #include "internal.h"
88653
88654@@ -73,6 +74,8 @@ static void __put_compound_page(struct page *page)
88655
88656 __page_cache_release(page);
88657 dtor = get_compound_page_dtor(page);
88658+ if (!PageHuge(page))
88659+ BUG_ON(dtor != free_compound_page);
88660 (*dtor)(page);
88661 }
88662
88663diff --git a/mm/swapfile.c b/mm/swapfile.c
88664index 746af55b..7ac94ae 100644
88665--- a/mm/swapfile.c
88666+++ b/mm/swapfile.c
88667@@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
88668
88669 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
88670 /* Activity counter to indicate that a swapon or swapoff has occurred */
88671-static atomic_t proc_poll_event = ATOMIC_INIT(0);
88672+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
88673
88674 static inline unsigned char swap_count(unsigned char ent)
88675 {
88676@@ -1684,7 +1684,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
88677 }
88678 filp_close(swap_file, NULL);
88679 err = 0;
88680- atomic_inc(&proc_poll_event);
88681+ atomic_inc_unchecked(&proc_poll_event);
88682 wake_up_interruptible(&proc_poll_wait);
88683
88684 out_dput:
88685@@ -1701,8 +1701,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
88686
88687 poll_wait(file, &proc_poll_wait, wait);
88688
88689- if (seq->poll_event != atomic_read(&proc_poll_event)) {
88690- seq->poll_event = atomic_read(&proc_poll_event);
88691+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
88692+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
88693 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
88694 }
88695
88696@@ -1800,7 +1800,7 @@ static int swaps_open(struct inode *inode, struct file *file)
88697 return ret;
88698
88699 seq = file->private_data;
88700- seq->poll_event = atomic_read(&proc_poll_event);
88701+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
88702 return 0;
88703 }
88704
88705@@ -2143,7 +2143,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
88706 (frontswap_map) ? "FS" : "");
88707
88708 mutex_unlock(&swapon_mutex);
88709- atomic_inc(&proc_poll_event);
88710+ atomic_inc_unchecked(&proc_poll_event);
88711 wake_up_interruptible(&proc_poll_wait);
88712
88713 if (S_ISREG(inode->i_mode))
88714diff --git a/mm/util.c b/mm/util.c
88715index ab1424d..7c5bd5a 100644
88716--- a/mm/util.c
88717+++ b/mm/util.c
88718@@ -294,6 +294,12 @@ done:
88719 void arch_pick_mmap_layout(struct mm_struct *mm)
88720 {
88721 mm->mmap_base = TASK_UNMAPPED_BASE;
88722+
88723+#ifdef CONFIG_PAX_RANDMMAP
88724+ if (mm->pax_flags & MF_PAX_RANDMMAP)
88725+ mm->mmap_base += mm->delta_mmap;
88726+#endif
88727+
88728 mm->get_unmapped_area = arch_get_unmapped_area;
88729 mm->unmap_area = arch_unmap_area;
88730 }
88731diff --git a/mm/vmalloc.c b/mm/vmalloc.c
88732index d365724..6cae7c2 100644
88733--- a/mm/vmalloc.c
88734+++ b/mm/vmalloc.c
88735@@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
88736
88737 pte = pte_offset_kernel(pmd, addr);
88738 do {
88739- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
88740- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
88741+
88742+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
88743+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
88744+ BUG_ON(!pte_exec(*pte));
88745+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
88746+ continue;
88747+ }
88748+#endif
88749+
88750+ {
88751+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
88752+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
88753+ }
88754 } while (pte++, addr += PAGE_SIZE, addr != end);
88755 }
88756
88757@@ -120,16 +131,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
88758 pte = pte_alloc_kernel(pmd, addr);
88759 if (!pte)
88760 return -ENOMEM;
88761+
88762+ pax_open_kernel();
88763 do {
88764 struct page *page = pages[*nr];
88765
88766- if (WARN_ON(!pte_none(*pte)))
88767+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
88768+ if (pgprot_val(prot) & _PAGE_NX)
88769+#endif
88770+
88771+ if (!pte_none(*pte)) {
88772+ pax_close_kernel();
88773+ WARN_ON(1);
88774 return -EBUSY;
88775- if (WARN_ON(!page))
88776+ }
88777+ if (!page) {
88778+ pax_close_kernel();
88779+ WARN_ON(1);
88780 return -ENOMEM;
88781+ }
88782 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
88783 (*nr)++;
88784 } while (pte++, addr += PAGE_SIZE, addr != end);
88785+ pax_close_kernel();
88786 return 0;
88787 }
88788
88789@@ -139,7 +163,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
88790 pmd_t *pmd;
88791 unsigned long next;
88792
88793- pmd = pmd_alloc(&init_mm, pud, addr);
88794+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
88795 if (!pmd)
88796 return -ENOMEM;
88797 do {
88798@@ -156,7 +180,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
88799 pud_t *pud;
88800 unsigned long next;
88801
88802- pud = pud_alloc(&init_mm, pgd, addr);
88803+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
88804 if (!pud)
88805 return -ENOMEM;
88806 do {
88807@@ -216,6 +240,12 @@ int is_vmalloc_or_module_addr(const void *x)
88808 if (addr >= MODULES_VADDR && addr < MODULES_END)
88809 return 1;
88810 #endif
88811+
88812+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
88813+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
88814+ return 1;
88815+#endif
88816+
88817 return is_vmalloc_addr(x);
88818 }
88819
88820@@ -236,8 +266,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
88821
88822 if (!pgd_none(*pgd)) {
88823 pud_t *pud = pud_offset(pgd, addr);
88824+#ifdef CONFIG_X86
88825+ if (!pud_large(*pud))
88826+#endif
88827 if (!pud_none(*pud)) {
88828 pmd_t *pmd = pmd_offset(pud, addr);
88829+#ifdef CONFIG_X86
88830+ if (!pmd_large(*pmd))
88831+#endif
88832 if (!pmd_none(*pmd)) {
88833 pte_t *ptep, pte;
88834
88835@@ -339,7 +375,7 @@ static void purge_vmap_area_lazy(void);
88836 * Allocate a region of KVA of the specified size and alignment, within the
88837 * vstart and vend.
88838 */
88839-static struct vmap_area *alloc_vmap_area(unsigned long size,
88840+static __size_overflow(1) struct vmap_area *alloc_vmap_area(unsigned long size,
88841 unsigned long align,
88842 unsigned long vstart, unsigned long vend,
88843 int node, gfp_t gfp_mask)
88844@@ -1337,6 +1373,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
88845 struct vm_struct *area;
88846
88847 BUG_ON(in_interrupt());
88848+
88849+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
88850+ if (flags & VM_KERNEXEC) {
88851+ if (start != VMALLOC_START || end != VMALLOC_END)
88852+ return NULL;
88853+ start = (unsigned long)MODULES_EXEC_VADDR;
88854+ end = (unsigned long)MODULES_EXEC_END;
88855+ }
88856+#endif
88857+
88858 if (flags & VM_IOREMAP) {
88859 int bit = fls(size);
88860
88861@@ -1581,6 +1627,11 @@ void *vmap(struct page **pages, unsigned int count,
88862 if (count > totalram_pages)
88863 return NULL;
88864
88865+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
88866+ if (!(pgprot_val(prot) & _PAGE_NX))
88867+ flags |= VM_KERNEXEC;
88868+#endif
88869+
88870 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
88871 __builtin_return_address(0));
88872 if (!area)
88873@@ -1682,6 +1733,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
88874 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
88875 goto fail;
88876
88877+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
88878+ if (!(pgprot_val(prot) & _PAGE_NX))
88879+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
88880+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
88881+ else
88882+#endif
88883+
88884 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
88885 start, end, node, gfp_mask, caller);
88886 if (!area)
88887@@ -1858,10 +1916,9 @@ EXPORT_SYMBOL(vzalloc_node);
88888 * For tight control over page level allocator and protection flags
88889 * use __vmalloc() instead.
88890 */
88891-
88892 void *vmalloc_exec(unsigned long size)
88893 {
88894- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
88895+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
88896 NUMA_NO_NODE, __builtin_return_address(0));
88897 }
88898
88899@@ -2168,6 +2225,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
88900 unsigned long uaddr = vma->vm_start;
88901 unsigned long usize = vma->vm_end - vma->vm_start;
88902
88903+ BUG_ON(vma->vm_mirror);
88904+
88905 if ((PAGE_SIZE-1) & (unsigned long)addr)
88906 return -EINVAL;
88907
88908@@ -2629,7 +2688,11 @@ static int s_show(struct seq_file *m, void *p)
88909 v->addr, v->addr + v->size, v->size);
88910
88911 if (v->caller)
88912+#ifdef CONFIG_GRKERNSEC_HIDESYM
88913+ seq_printf(m, " %pK", v->caller);
88914+#else
88915 seq_printf(m, " %pS", v->caller);
88916+#endif
88917
88918 if (v->nr_pages)
88919 seq_printf(m, " pages=%d", v->nr_pages);
88920diff --git a/mm/vmstat.c b/mm/vmstat.c
88921index f42745e..62f8346 100644
88922--- a/mm/vmstat.c
88923+++ b/mm/vmstat.c
88924@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu)
88925 *
88926 * vm_stat contains the global counters
88927 */
88928-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
88929+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
88930 EXPORT_SYMBOL(vm_stat);
88931
88932 #ifdef CONFIG_SMP
88933@@ -452,7 +452,7 @@ void refresh_cpu_vm_stats(int cpu)
88934 v = p->vm_stat_diff[i];
88935 p->vm_stat_diff[i] = 0;
88936 local_irq_restore(flags);
88937- atomic_long_add(v, &zone->vm_stat[i]);
88938+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
88939 global_diff[i] += v;
88940 #ifdef CONFIG_NUMA
88941 /* 3 seconds idle till flush */
88942@@ -490,7 +490,7 @@ void refresh_cpu_vm_stats(int cpu)
88943
88944 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
88945 if (global_diff[i])
88946- atomic_long_add(global_diff[i], &vm_stat[i]);
88947+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
88948 }
88949
88950 /*
88951@@ -505,8 +505,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
88952 if (pset->vm_stat_diff[i]) {
88953 int v = pset->vm_stat_diff[i];
88954 pset->vm_stat_diff[i] = 0;
88955- atomic_long_add(v, &zone->vm_stat[i]);
88956- atomic_long_add(v, &vm_stat[i]);
88957+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
88958+ atomic_long_add_unchecked(v, &vm_stat[i]);
88959 }
88960 }
88961 #endif
88962@@ -1226,7 +1226,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
88963 return NOTIFY_OK;
88964 }
88965
88966-static struct notifier_block __cpuinitdata vmstat_notifier =
88967+static struct notifier_block vmstat_notifier =
88968 { &vmstat_cpuup_callback, NULL, 0 };
88969 #endif
88970
88971@@ -1241,10 +1241,20 @@ static int __init setup_vmstat(void)
88972 start_cpu_timer(cpu);
88973 #endif
88974 #ifdef CONFIG_PROC_FS
88975- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
88976- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
88977- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
88978- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
88979+ {
88980+ mode_t gr_mode = S_IRUGO;
88981+#ifdef CONFIG_GRKERNSEC_PROC_ADD
88982+ gr_mode = S_IRUSR;
88983+#endif
88984+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
88985+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
88986+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
88987+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
88988+#else
88989+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
88990+#endif
88991+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
88992+ }
88993 #endif
88994 return 0;
88995 }
88996diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
88997index 9424f37..6aabf19 100644
88998--- a/net/8021q/vlan.c
88999+++ b/net/8021q/vlan.c
89000@@ -469,7 +469,7 @@ out:
89001 return NOTIFY_DONE;
89002 }
89003
89004-static struct notifier_block vlan_notifier_block __read_mostly = {
89005+static struct notifier_block vlan_notifier_block = {
89006 .notifier_call = vlan_device_event,
89007 };
89008
89009@@ -544,8 +544,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
89010 err = -EPERM;
89011 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
89012 break;
89013- if ((args.u.name_type >= 0) &&
89014- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
89015+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
89016 struct vlan_net *vn;
89017
89018 vn = net_generic(net, vlan_net_id);
89019diff --git a/net/9p/mod.c b/net/9p/mod.c
89020index 6ab36ae..6f1841b 100644
89021--- a/net/9p/mod.c
89022+++ b/net/9p/mod.c
89023@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
89024 void v9fs_register_trans(struct p9_trans_module *m)
89025 {
89026 spin_lock(&v9fs_trans_lock);
89027- list_add_tail(&m->list, &v9fs_trans_list);
89028+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
89029 spin_unlock(&v9fs_trans_lock);
89030 }
89031 EXPORT_SYMBOL(v9fs_register_trans);
89032@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
89033 void v9fs_unregister_trans(struct p9_trans_module *m)
89034 {
89035 spin_lock(&v9fs_trans_lock);
89036- list_del_init(&m->list);
89037+ pax_list_del_init((struct list_head *)&m->list);
89038 spin_unlock(&v9fs_trans_lock);
89039 }
89040 EXPORT_SYMBOL(v9fs_unregister_trans);
89041diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
89042index 02efb25..41541a9 100644
89043--- a/net/9p/trans_fd.c
89044+++ b/net/9p/trans_fd.c
89045@@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
89046 oldfs = get_fs();
89047 set_fs(get_ds());
89048 /* The cast to a user pointer is valid due to the set_fs() */
89049- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
89050+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
89051 set_fs(oldfs);
89052
89053 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
89054diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
89055index 876fbe8..8bbea9f 100644
89056--- a/net/atm/atm_misc.c
89057+++ b/net/atm/atm_misc.c
89058@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
89059 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
89060 return 1;
89061 atm_return(vcc, truesize);
89062- atomic_inc(&vcc->stats->rx_drop);
89063+ atomic_inc_unchecked(&vcc->stats->rx_drop);
89064 return 0;
89065 }
89066 EXPORT_SYMBOL(atm_charge);
89067@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
89068 }
89069 }
89070 atm_return(vcc, guess);
89071- atomic_inc(&vcc->stats->rx_drop);
89072+ atomic_inc_unchecked(&vcc->stats->rx_drop);
89073 return NULL;
89074 }
89075 EXPORT_SYMBOL(atm_alloc_charge);
89076@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
89077
89078 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
89079 {
89080-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
89081+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
89082 __SONET_ITEMS
89083 #undef __HANDLE_ITEM
89084 }
89085@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
89086
89087 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
89088 {
89089-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
89090+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
89091 __SONET_ITEMS
89092 #undef __HANDLE_ITEM
89093 }
89094diff --git a/net/atm/lec.h b/net/atm/lec.h
89095index 4149db1..f2ab682 100644
89096--- a/net/atm/lec.h
89097+++ b/net/atm/lec.h
89098@@ -48,7 +48,7 @@ struct lane2_ops {
89099 const u8 *tlvs, u32 sizeoftlvs);
89100 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
89101 const u8 *tlvs, u32 sizeoftlvs);
89102-};
89103+} __no_const;
89104
89105 /*
89106 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
89107diff --git a/net/atm/proc.c b/net/atm/proc.c
89108index bbb6461..cf04016 100644
89109--- a/net/atm/proc.c
89110+++ b/net/atm/proc.c
89111@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
89112 const struct k_atm_aal_stats *stats)
89113 {
89114 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
89115- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
89116- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
89117- atomic_read(&stats->rx_drop));
89118+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
89119+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
89120+ atomic_read_unchecked(&stats->rx_drop));
89121 }
89122
89123 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
89124diff --git a/net/atm/resources.c b/net/atm/resources.c
89125index 0447d5d..3cf4728 100644
89126--- a/net/atm/resources.c
89127+++ b/net/atm/resources.c
89128@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
89129 static void copy_aal_stats(struct k_atm_aal_stats *from,
89130 struct atm_aal_stats *to)
89131 {
89132-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
89133+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
89134 __AAL_STAT_ITEMS
89135 #undef __HANDLE_ITEM
89136 }
89137@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
89138 static void subtract_aal_stats(struct k_atm_aal_stats *from,
89139 struct atm_aal_stats *to)
89140 {
89141-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
89142+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
89143 __AAL_STAT_ITEMS
89144 #undef __HANDLE_ITEM
89145 }
89146diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
89147index d5744b7..506bae3 100644
89148--- a/net/ax25/sysctl_net_ax25.c
89149+++ b/net/ax25/sysctl_net_ax25.c
89150@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
89151 {
89152 char path[sizeof("net/ax25/") + IFNAMSIZ];
89153 int k;
89154- struct ctl_table *table;
89155+ ctl_table_no_const *table;
89156
89157 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
89158 if (!table)
89159diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
89160index f680ee1..97e3542 100644
89161--- a/net/batman-adv/bat_iv_ogm.c
89162+++ b/net/batman-adv/bat_iv_ogm.c
89163@@ -79,7 +79,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
89164
89165 /* randomize initial seqno to avoid collision */
89166 get_random_bytes(&random_seqno, sizeof(random_seqno));
89167- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
89168+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
89169
89170 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
89171 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
89172@@ -627,9 +627,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
89173 batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff);
89174
89175 /* change sequence number to network order */
89176- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
89177+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
89178 batadv_ogm_packet->seqno = htonl(seqno);
89179- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
89180+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
89181
89182 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
89183 batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
89184@@ -1037,7 +1037,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
89185 return;
89186
89187 /* could be changed by schedule_own_packet() */
89188- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
89189+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
89190
89191 if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
89192 has_directlink_flag = 1;
89193diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
89194index de27b31..7058bfe 100644
89195--- a/net/batman-adv/bridge_loop_avoidance.c
89196+++ b/net/batman-adv/bridge_loop_avoidance.c
89197@@ -1522,6 +1522,8 @@ out:
89198 * in these cases, the skb is further handled by this function and
89199 * returns 1, otherwise it returns 0 and the caller shall further
89200 * process the skb.
89201+ *
89202+ * This call might reallocate skb data.
89203 */
89204 int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
89205 {
89206diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
89207index f105219..7614af3 100644
89208--- a/net/batman-adv/gateway_client.c
89209+++ b/net/batman-adv/gateway_client.c
89210@@ -508,6 +508,7 @@ out:
89211 return 0;
89212 }
89213
89214+/* this call might reallocate skb data */
89215 static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len)
89216 {
89217 int ret = false;
89218@@ -568,6 +569,7 @@ out:
89219 return ret;
89220 }
89221
89222+/* this call might reallocate skb data */
89223 bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
89224 {
89225 struct ethhdr *ethhdr;
89226@@ -619,6 +621,12 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
89227
89228 if (!pskb_may_pull(skb, *header_len + sizeof(*udphdr)))
89229 return false;
89230+
89231+ /* skb->data might have been reallocated by pskb_may_pull() */
89232+ ethhdr = (struct ethhdr *)skb->data;
89233+ if (ntohs(ethhdr->h_proto) == ETH_P_8021Q)
89234+ ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN);
89235+
89236 udphdr = (struct udphdr *)(skb->data + *header_len);
89237 *header_len += sizeof(*udphdr);
89238
89239@@ -634,12 +642,14 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
89240 return true;
89241 }
89242
89243+/* this call might reallocate skb data */
89244 bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
89245- struct sk_buff *skb, struct ethhdr *ethhdr)
89246+ struct sk_buff *skb)
89247 {
89248 struct batadv_neigh_node *neigh_curr = NULL, *neigh_old = NULL;
89249 struct batadv_orig_node *orig_dst_node = NULL;
89250 struct batadv_gw_node *curr_gw = NULL;
89251+ struct ethhdr *ethhdr;
89252 bool ret, out_of_range = false;
89253 unsigned int header_len = 0;
89254 uint8_t curr_tq_avg;
89255@@ -648,6 +658,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
89256 if (!ret)
89257 goto out;
89258
89259+ ethhdr = (struct ethhdr *)skb->data;
89260 orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source,
89261 ethhdr->h_dest);
89262 if (!orig_dst_node)
89263diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
89264index 039902d..1037d75 100644
89265--- a/net/batman-adv/gateway_client.h
89266+++ b/net/batman-adv/gateway_client.h
89267@@ -34,7 +34,6 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv,
89268 void batadv_gw_node_purge(struct batadv_priv *bat_priv);
89269 int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset);
89270 bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len);
89271-bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
89272- struct sk_buff *skb, struct ethhdr *ethhdr);
89273+bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb);
89274
89275 #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
89276diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
89277index 522243a..b48c0ef 100644
89278--- a/net/batman-adv/hard-interface.c
89279+++ b/net/batman-adv/hard-interface.c
89280@@ -401,7 +401,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
89281 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
89282 dev_add_pack(&hard_iface->batman_adv_ptype);
89283
89284- atomic_set(&hard_iface->frag_seqno, 1);
89285+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
89286 batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
89287 hard_iface->net_dev->name);
89288
89289@@ -550,7 +550,7 @@ batadv_hardif_add_interface(struct net_device *net_dev)
89290 /* This can't be called via a bat_priv callback because
89291 * we have no bat_priv yet.
89292 */
89293- atomic_set(&hard_iface->bat_iv.ogm_seqno, 1);
89294+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, 1);
89295 hard_iface->bat_iv.ogm_buff = NULL;
89296
89297 return hard_iface;
89298diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
89299index 819dfb0..226bacd 100644
89300--- a/net/batman-adv/soft-interface.c
89301+++ b/net/batman-adv/soft-interface.c
89302@@ -180,6 +180,9 @@ static int batadv_interface_tx(struct sk_buff *skb,
89303 if (batadv_bla_tx(bat_priv, skb, vid))
89304 goto dropped;
89305
89306+ /* skb->data might have been reallocated by batadv_bla_tx() */
89307+ ethhdr = (struct ethhdr *)skb->data;
89308+
89309 /* Register the client MAC in the transtable */
89310 if (!is_multicast_ether_addr(ethhdr->h_source))
89311 batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
89312@@ -220,6 +223,10 @@ static int batadv_interface_tx(struct sk_buff *skb,
89313 default:
89314 break;
89315 }
89316+
89317+ /* reminder: ethhdr might have become unusable from here on
89318+ * (batadv_gw_is_dhcp_target() might have reallocated skb data)
89319+ */
89320 }
89321
89322 /* ethernet packet should be broadcasted */
89323@@ -253,7 +260,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
89324 primary_if->net_dev->dev_addr, ETH_ALEN);
89325
89326 /* set broadcast sequence number */
89327- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
89328+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
89329 bcast_packet->seqno = htonl(seqno);
89330
89331 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
89332@@ -266,7 +273,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
89333 /* unicast packet */
89334 } else {
89335 if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_OFF) {
89336- ret = batadv_gw_out_of_range(bat_priv, skb, ethhdr);
89337+ ret = batadv_gw_out_of_range(bat_priv, skb);
89338 if (ret)
89339 goto dropped;
89340 }
89341@@ -472,7 +479,7 @@ static int batadv_softif_init_late(struct net_device *dev)
89342 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
89343
89344 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
89345- atomic_set(&bat_priv->bcast_seqno, 1);
89346+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
89347 atomic_set(&bat_priv->tt.vn, 0);
89348 atomic_set(&bat_priv->tt.local_changes, 0);
89349 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
89350diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
89351index aba8364..50fcbb8 100644
89352--- a/net/batman-adv/types.h
89353+++ b/net/batman-adv/types.h
89354@@ -51,7 +51,7 @@
89355 struct batadv_hard_iface_bat_iv {
89356 unsigned char *ogm_buff;
89357 int ogm_buff_len;
89358- atomic_t ogm_seqno;
89359+ atomic_unchecked_t ogm_seqno;
89360 };
89361
89362 /**
89363@@ -75,7 +75,7 @@ struct batadv_hard_iface {
89364 int16_t if_num;
89365 char if_status;
89366 struct net_device *net_dev;
89367- atomic_t frag_seqno;
89368+ atomic_unchecked_t frag_seqno;
89369 struct kobject *hardif_obj;
89370 atomic_t refcount;
89371 struct packet_type batman_adv_ptype;
89372@@ -558,7 +558,7 @@ struct batadv_priv {
89373 #ifdef CONFIG_BATMAN_ADV_DEBUG
89374 atomic_t log_level;
89375 #endif
89376- atomic_t bcast_seqno;
89377+ atomic_unchecked_t bcast_seqno;
89378 atomic_t bcast_queue_left;
89379 atomic_t batman_queue_left;
89380 char num_ifaces;
89381diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
89382index 0bb3b59..0e3052e 100644
89383--- a/net/batman-adv/unicast.c
89384+++ b/net/batman-adv/unicast.c
89385@@ -270,7 +270,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
89386 frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
89387 frag2->flags = large_tail;
89388
89389- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
89390+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
89391 frag1->seqno = htons(seqno - 1);
89392 frag2->seqno = htons(seqno);
89393
89394@@ -326,7 +326,9 @@ static bool batadv_unicast_push_and_fill_skb(struct sk_buff *skb, int hdr_size,
89395 * @skb: the skb containing the payload to encapsulate
89396 * @orig_node: the destination node
89397 *
89398- * Returns false if the payload could not be encapsulated or true otherwise
89399+ * Returns false if the payload could not be encapsulated or true otherwise.
89400+ *
89401+ * This call might reallocate skb data.
89402 */
89403 static bool batadv_unicast_prepare_skb(struct sk_buff *skb,
89404 struct batadv_orig_node *orig_node)
89405@@ -343,7 +345,9 @@ static bool batadv_unicast_prepare_skb(struct sk_buff *skb,
89406 * @orig_node: the destination node
89407 * @packet_subtype: the batman 4addr packet subtype to use
89408 *
89409- * Returns false if the payload could not be encapsulated or true otherwise
89410+ * Returns false if the payload could not be encapsulated or true otherwise.
89411+ *
89412+ * This call might reallocate skb data.
89413 */
89414 bool batadv_unicast_4addr_prepare_skb(struct batadv_priv *bat_priv,
89415 struct sk_buff *skb,
89416@@ -401,7 +405,7 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv,
89417 struct batadv_neigh_node *neigh_node;
89418 int data_len = skb->len;
89419 int ret = NET_RX_DROP;
89420- unsigned int dev_mtu;
89421+ unsigned int dev_mtu, header_len;
89422
89423 /* get routing information */
89424 if (is_multicast_ether_addr(ethhdr->h_dest)) {
89425@@ -429,10 +433,12 @@ find_router:
89426 switch (packet_type) {
89427 case BATADV_UNICAST:
89428 batadv_unicast_prepare_skb(skb, orig_node);
89429+ header_len = sizeof(struct batadv_unicast_packet);
89430 break;
89431 case BATADV_UNICAST_4ADDR:
89432 batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node,
89433 packet_subtype);
89434+ header_len = sizeof(struct batadv_unicast_4addr_packet);
89435 break;
89436 default:
89437 /* this function supports UNICAST and UNICAST_4ADDR only. It
89438@@ -441,6 +447,7 @@ find_router:
89439 goto out;
89440 }
89441
89442+ ethhdr = (struct ethhdr *)(skb->data + header_len);
89443 unicast_packet = (struct batadv_unicast_packet *)skb->data;
89444
89445 /* inform the destination node that we are still missing a correct route
89446diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
89447index ace5e55..a65a1c0 100644
89448--- a/net/bluetooth/hci_core.c
89449+++ b/net/bluetooth/hci_core.c
89450@@ -2211,16 +2211,16 @@ int hci_register_dev(struct hci_dev *hdev)
89451 list_add(&hdev->list, &hci_dev_list);
89452 write_unlock(&hci_dev_list_lock);
89453
89454- hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
89455- WQ_MEM_RECLAIM, 1);
89456+ hdev->workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND |
89457+ WQ_MEM_RECLAIM, 1, hdev->name);
89458 if (!hdev->workqueue) {
89459 error = -ENOMEM;
89460 goto err;
89461 }
89462
89463- hdev->req_workqueue = alloc_workqueue(hdev->name,
89464+ hdev->req_workqueue = alloc_workqueue("%s",
89465 WQ_HIGHPRI | WQ_UNBOUND |
89466- WQ_MEM_RECLAIM, 1);
89467+ WQ_MEM_RECLAIM, 1, hdev->name);
89468 if (!hdev->req_workqueue) {
89469 destroy_workqueue(hdev->workqueue);
89470 error = -ENOMEM;
89471diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
89472index 9bd7d95..6c4884f 100644
89473--- a/net/bluetooth/hci_sock.c
89474+++ b/net/bluetooth/hci_sock.c
89475@@ -934,7 +934,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
89476 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
89477 }
89478
89479- len = min_t(unsigned int, len, sizeof(uf));
89480+ len = min((size_t)len, sizeof(uf));
89481 if (copy_from_user(&uf, optval, len)) {
89482 err = -EFAULT;
89483 break;
89484diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
89485index 68843a2..30e9342 100644
89486--- a/net/bluetooth/l2cap_core.c
89487+++ b/net/bluetooth/l2cap_core.c
89488@@ -3507,8 +3507,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
89489 break;
89490
89491 case L2CAP_CONF_RFC:
89492- if (olen == sizeof(rfc))
89493- memcpy(&rfc, (void *)val, olen);
89494+ if (olen != sizeof(rfc))
89495+ break;
89496+
89497+ memcpy(&rfc, (void *)val, olen);
89498
89499 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
89500 rfc.mode != chan->mode)
89501diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
89502index 36fed40..be2eeb2 100644
89503--- a/net/bluetooth/l2cap_sock.c
89504+++ b/net/bluetooth/l2cap_sock.c
89505@@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
89506 struct sock *sk = sock->sk;
89507 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
89508 struct l2cap_options opts;
89509- int len, err = 0;
89510+ int err = 0;
89511+ size_t len = optlen;
89512 u32 opt;
89513
89514 BT_DBG("sk %p", sk);
89515@@ -507,7 +508,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
89516 opts.max_tx = chan->max_tx;
89517 opts.txwin_size = chan->tx_win;
89518
89519- len = min_t(unsigned int, sizeof(opts), optlen);
89520+ len = min(sizeof(opts), len);
89521 if (copy_from_user((char *) &opts, optval, len)) {
89522 err = -EFAULT;
89523 break;
89524@@ -587,7 +588,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
89525 struct bt_security sec;
89526 struct bt_power pwr;
89527 struct l2cap_conn *conn;
89528- int len, err = 0;
89529+ int err = 0;
89530+ size_t len = optlen;
89531 u32 opt;
89532
89533 BT_DBG("sk %p", sk);
89534@@ -610,7 +612,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
89535
89536 sec.level = BT_SECURITY_LOW;
89537
89538- len = min_t(unsigned int, sizeof(sec), optlen);
89539+ len = min(sizeof(sec), len);
89540 if (copy_from_user((char *) &sec, optval, len)) {
89541 err = -EFAULT;
89542 break;
89543@@ -707,7 +709,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
89544
89545 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
89546
89547- len = min_t(unsigned int, sizeof(pwr), optlen);
89548+ len = min(sizeof(pwr), len);
89549 if (copy_from_user((char *) &pwr, optval, len)) {
89550 err = -EFAULT;
89551 break;
89552diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
89553index 30b3721..c1bd0a0 100644
89554--- a/net/bluetooth/rfcomm/sock.c
89555+++ b/net/bluetooth/rfcomm/sock.c
89556@@ -666,7 +666,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
89557 struct sock *sk = sock->sk;
89558 struct bt_security sec;
89559 int err = 0;
89560- size_t len;
89561+ size_t len = optlen;
89562 u32 opt;
89563
89564 BT_DBG("sk %p", sk);
89565@@ -688,7 +688,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
89566
89567 sec.level = BT_SECURITY_LOW;
89568
89569- len = min_t(unsigned int, sizeof(sec), optlen);
89570+ len = min(sizeof(sec), len);
89571 if (copy_from_user((char *) &sec, optval, len)) {
89572 err = -EFAULT;
89573 break;
89574diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
89575index b6e44ad..5b0d514 100644
89576--- a/net/bluetooth/rfcomm/tty.c
89577+++ b/net/bluetooth/rfcomm/tty.c
89578@@ -309,7 +309,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev)
89579 BUG_ON(test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags));
89580
89581 spin_lock_irqsave(&dev->port.lock, flags);
89582- if (dev->port.count > 0) {
89583+ if (atomic_read(&dev->port.count) > 0) {
89584 spin_unlock_irqrestore(&dev->port.lock, flags);
89585 return;
89586 }
89587@@ -659,10 +659,10 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
89588 return -ENODEV;
89589
89590 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
89591- dev->channel, dev->port.count);
89592+ dev->channel, atomic_read(&dev->port.count));
89593
89594 spin_lock_irqsave(&dev->port.lock, flags);
89595- if (++dev->port.count > 1) {
89596+ if (atomic_inc_return(&dev->port.count) > 1) {
89597 spin_unlock_irqrestore(&dev->port.lock, flags);
89598 return 0;
89599 }
89600@@ -727,10 +727,10 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
89601 return;
89602
89603 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
89604- dev->port.count);
89605+ atomic_read(&dev->port.count));
89606
89607 spin_lock_irqsave(&dev->port.lock, flags);
89608- if (!--dev->port.count) {
89609+ if (!atomic_dec_return(&dev->port.count)) {
89610 spin_unlock_irqrestore(&dev->port.lock, flags);
89611 if (dev->tty_dev->parent)
89612 device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST);
89613diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
89614index 3d110c4..4e1b2eb 100644
89615--- a/net/bridge/netfilter/ebtables.c
89616+++ b/net/bridge/netfilter/ebtables.c
89617@@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
89618 tmp.valid_hooks = t->table->valid_hooks;
89619 }
89620 mutex_unlock(&ebt_mutex);
89621- if (copy_to_user(user, &tmp, *len) != 0){
89622+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
89623 BUGPRINT("c2u Didn't work\n");
89624 ret = -EFAULT;
89625 break;
89626@@ -2331,7 +2331,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
89627 goto out;
89628 tmp.valid_hooks = t->valid_hooks;
89629
89630- if (copy_to_user(user, &tmp, *len) != 0) {
89631+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
89632 ret = -EFAULT;
89633 break;
89634 }
89635@@ -2342,7 +2342,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
89636 tmp.entries_size = t->table->entries_size;
89637 tmp.valid_hooks = t->table->valid_hooks;
89638
89639- if (copy_to_user(user, &tmp, *len) != 0) {
89640+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
89641 ret = -EFAULT;
89642 break;
89643 }
89644diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
89645index 2bd4b58..0dc30a1 100644
89646--- a/net/caif/cfctrl.c
89647+++ b/net/caif/cfctrl.c
89648@@ -10,6 +10,7 @@
89649 #include <linux/spinlock.h>
89650 #include <linux/slab.h>
89651 #include <linux/pkt_sched.h>
89652+#include <linux/sched.h>
89653 #include <net/caif/caif_layer.h>
89654 #include <net/caif/cfpkt.h>
89655 #include <net/caif/cfctrl.h>
89656@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
89657 memset(&dev_info, 0, sizeof(dev_info));
89658 dev_info.id = 0xff;
89659 cfsrvl_init(&this->serv, 0, &dev_info, false);
89660- atomic_set(&this->req_seq_no, 1);
89661- atomic_set(&this->rsp_seq_no, 1);
89662+ atomic_set_unchecked(&this->req_seq_no, 1);
89663+ atomic_set_unchecked(&this->rsp_seq_no, 1);
89664 this->serv.layer.receive = cfctrl_recv;
89665 sprintf(this->serv.layer.name, "ctrl");
89666 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
89667@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
89668 struct cfctrl_request_info *req)
89669 {
89670 spin_lock_bh(&ctrl->info_list_lock);
89671- atomic_inc(&ctrl->req_seq_no);
89672- req->sequence_no = atomic_read(&ctrl->req_seq_no);
89673+ atomic_inc_unchecked(&ctrl->req_seq_no);
89674+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
89675 list_add_tail(&req->list, &ctrl->list);
89676 spin_unlock_bh(&ctrl->info_list_lock);
89677 }
89678@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
89679 if (p != first)
89680 pr_warn("Requests are not received in order\n");
89681
89682- atomic_set(&ctrl->rsp_seq_no,
89683+ atomic_set_unchecked(&ctrl->rsp_seq_no,
89684 p->sequence_no);
89685 list_del(&p->list);
89686 goto out;
89687diff --git a/net/can/af_can.c b/net/can/af_can.c
89688index c4e5085..aa9efdf 100644
89689--- a/net/can/af_can.c
89690+++ b/net/can/af_can.c
89691@@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
89692 };
89693
89694 /* notifier block for netdevice event */
89695-static struct notifier_block can_netdev_notifier __read_mostly = {
89696+static struct notifier_block can_netdev_notifier = {
89697 .notifier_call = can_notifier,
89698 };
89699
89700diff --git a/net/can/gw.c b/net/can/gw.c
89701index 3ee690e..00d581b 100644
89702--- a/net/can/gw.c
89703+++ b/net/can/gw.c
89704@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
89705 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
89706
89707 static HLIST_HEAD(cgw_list);
89708-static struct notifier_block notifier;
89709
89710 static struct kmem_cache *cgw_cache __read_mostly;
89711
89712@@ -927,6 +926,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
89713 return err;
89714 }
89715
89716+static struct notifier_block notifier = {
89717+ .notifier_call = cgw_notifier
89718+};
89719+
89720 static __init int cgw_module_init(void)
89721 {
89722 /* sanitize given module parameter */
89723@@ -942,7 +945,6 @@ static __init int cgw_module_init(void)
89724 return -ENOMEM;
89725
89726 /* set notifier */
89727- notifier.notifier_call = cgw_notifier;
89728 register_netdevice_notifier(&notifier);
89729
89730 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
89731diff --git a/net/compat.c b/net/compat.c
89732index f0a1ba6..0541331 100644
89733--- a/net/compat.c
89734+++ b/net/compat.c
89735@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
89736 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
89737 __get_user(kmsg->msg_flags, &umsg->msg_flags))
89738 return -EFAULT;
89739- kmsg->msg_name = compat_ptr(tmp1);
89740- kmsg->msg_iov = compat_ptr(tmp2);
89741- kmsg->msg_control = compat_ptr(tmp3);
89742+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
89743+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
89744+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
89745 return 0;
89746 }
89747
89748@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
89749
89750 if (kern_msg->msg_namelen) {
89751 if (mode == VERIFY_READ) {
89752- int err = move_addr_to_kernel(kern_msg->msg_name,
89753+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
89754 kern_msg->msg_namelen,
89755 kern_address);
89756 if (err < 0)
89757@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
89758 kern_msg->msg_name = NULL;
89759
89760 tot_len = iov_from_user_compat_to_kern(kern_iov,
89761- (struct compat_iovec __user *)kern_msg->msg_iov,
89762+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
89763 kern_msg->msg_iovlen);
89764 if (tot_len >= 0)
89765 kern_msg->msg_iov = kern_iov;
89766@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
89767
89768 #define CMSG_COMPAT_FIRSTHDR(msg) \
89769 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
89770- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
89771+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
89772 (struct compat_cmsghdr __user *)NULL)
89773
89774 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
89775 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
89776 (ucmlen) <= (unsigned long) \
89777 ((mhdr)->msg_controllen - \
89778- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
89779+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
89780
89781 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
89782 struct compat_cmsghdr __user *cmsg, int cmsg_len)
89783 {
89784 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
89785- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
89786+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
89787 msg->msg_controllen)
89788 return NULL;
89789 return (struct compat_cmsghdr __user *)ptr;
89790@@ -219,7 +219,7 @@ Efault:
89791
89792 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
89793 {
89794- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
89795+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
89796 struct compat_cmsghdr cmhdr;
89797 struct compat_timeval ctv;
89798 struct compat_timespec cts[3];
89799@@ -275,7 +275,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
89800
89801 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
89802 {
89803- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
89804+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
89805 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
89806 int fdnum = scm->fp->count;
89807 struct file **fp = scm->fp->fp;
89808@@ -363,7 +363,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
89809 return -EFAULT;
89810 old_fs = get_fs();
89811 set_fs(KERNEL_DS);
89812- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
89813+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
89814 set_fs(old_fs);
89815
89816 return err;
89817@@ -424,7 +424,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
89818 len = sizeof(ktime);
89819 old_fs = get_fs();
89820 set_fs(KERNEL_DS);
89821- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
89822+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
89823 set_fs(old_fs);
89824
89825 if (!err) {
89826@@ -567,7 +567,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
89827 case MCAST_JOIN_GROUP:
89828 case MCAST_LEAVE_GROUP:
89829 {
89830- struct compat_group_req __user *gr32 = (void *)optval;
89831+ struct compat_group_req __user *gr32 = (void __user *)optval;
89832 struct group_req __user *kgr =
89833 compat_alloc_user_space(sizeof(struct group_req));
89834 u32 interface;
89835@@ -588,7 +588,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
89836 case MCAST_BLOCK_SOURCE:
89837 case MCAST_UNBLOCK_SOURCE:
89838 {
89839- struct compat_group_source_req __user *gsr32 = (void *)optval;
89840+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
89841 struct group_source_req __user *kgsr = compat_alloc_user_space(
89842 sizeof(struct group_source_req));
89843 u32 interface;
89844@@ -609,7 +609,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
89845 }
89846 case MCAST_MSFILTER:
89847 {
89848- struct compat_group_filter __user *gf32 = (void *)optval;
89849+ struct compat_group_filter __user *gf32 = (void __user *)optval;
89850 struct group_filter __user *kgf;
89851 u32 interface, fmode, numsrc;
89852
89853@@ -647,7 +647,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
89854 char __user *optval, int __user *optlen,
89855 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
89856 {
89857- struct compat_group_filter __user *gf32 = (void *)optval;
89858+ struct compat_group_filter __user *gf32 = (void __user *)optval;
89859 struct group_filter __user *kgf;
89860 int __user *koptlen;
89861 u32 interface, fmode, numsrc;
89862@@ -805,7 +805,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
89863
89864 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
89865 return -EINVAL;
89866- if (copy_from_user(a, args, nas[call]))
89867+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
89868 return -EFAULT;
89869 a0 = a[0];
89870 a1 = a[1];
89871diff --git a/net/core/datagram.c b/net/core/datagram.c
89872index b71423d..0360434 100644
89873--- a/net/core/datagram.c
89874+++ b/net/core/datagram.c
89875@@ -295,7 +295,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
89876 }
89877
89878 kfree_skb(skb);
89879- atomic_inc(&sk->sk_drops);
89880+ atomic_inc_unchecked(&sk->sk_drops);
89881 sk_mem_reclaim_partial(sk);
89882
89883 return err;
89884diff --git a/net/core/dev.c b/net/core/dev.c
89885index 7ddbb31..3902452 100644
89886--- a/net/core/dev.c
89887+++ b/net/core/dev.c
89888@@ -1649,7 +1649,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
89889 {
89890 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
89891 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
89892- atomic_long_inc(&dev->rx_dropped);
89893+ atomic_long_inc_unchecked(&dev->rx_dropped);
89894 kfree_skb(skb);
89895 return NET_RX_DROP;
89896 }
89897@@ -1658,7 +1658,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
89898 skb_orphan(skb);
89899
89900 if (unlikely(!is_skb_forwardable(dev, skb))) {
89901- atomic_long_inc(&dev->rx_dropped);
89902+ atomic_long_inc_unchecked(&dev->rx_dropped);
89903 kfree_skb(skb);
89904 return NET_RX_DROP;
89905 }
89906@@ -2404,7 +2404,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
89907
89908 struct dev_gso_cb {
89909 void (*destructor)(struct sk_buff *skb);
89910-};
89911+} __no_const;
89912
89913 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
89914
89915@@ -3139,7 +3139,7 @@ enqueue:
89916
89917 local_irq_restore(flags);
89918
89919- atomic_long_inc(&skb->dev->rx_dropped);
89920+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
89921 kfree_skb(skb);
89922 return NET_RX_DROP;
89923 }
89924@@ -3211,7 +3211,7 @@ int netif_rx_ni(struct sk_buff *skb)
89925 }
89926 EXPORT_SYMBOL(netif_rx_ni);
89927
89928-static void net_tx_action(struct softirq_action *h)
89929+static void net_tx_action(void)
89930 {
89931 struct softnet_data *sd = &__get_cpu_var(softnet_data);
89932
89933@@ -3545,7 +3545,7 @@ ncls:
89934 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
89935 } else {
89936 drop:
89937- atomic_long_inc(&skb->dev->rx_dropped);
89938+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
89939 kfree_skb(skb);
89940 /* Jamal, now you will not able to escape explaining
89941 * me how you were going to use this. :-)
89942@@ -4153,7 +4153,7 @@ void netif_napi_del(struct napi_struct *napi)
89943 }
89944 EXPORT_SYMBOL(netif_napi_del);
89945
89946-static void net_rx_action(struct softirq_action *h)
89947+static void net_rx_action(void)
89948 {
89949 struct softnet_data *sd = &__get_cpu_var(softnet_data);
89950 unsigned long time_limit = jiffies + 2;
89951@@ -5590,7 +5590,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
89952 } else {
89953 netdev_stats_to_stats64(storage, &dev->stats);
89954 }
89955- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
89956+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
89957 return storage;
89958 }
89959 EXPORT_SYMBOL(dev_get_stats);
89960diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
89961index 5b7d0e1..cb960fc 100644
89962--- a/net/core/dev_ioctl.c
89963+++ b/net/core/dev_ioctl.c
89964@@ -365,9 +365,13 @@ void dev_load(struct net *net, const char *name)
89965 if (no_module && capable(CAP_NET_ADMIN))
89966 no_module = request_module("netdev-%s", name);
89967 if (no_module && capable(CAP_SYS_MODULE)) {
89968+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89969+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
89970+#else
89971 if (!request_module("%s", name))
89972 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
89973 name);
89974+#endif
89975 }
89976 }
89977 EXPORT_SYMBOL(dev_load);
89978diff --git a/net/core/ethtool.c b/net/core/ethtool.c
89979index ce91766..3b71cdb 100644
89980--- a/net/core/ethtool.c
89981+++ b/net/core/ethtool.c
89982@@ -1319,10 +1319,19 @@ static int ethtool_get_dump_data(struct net_device *dev,
89983 if (ret)
89984 return ret;
89985
89986- len = (tmp.len > dump.len) ? dump.len : tmp.len;
89987+ len = min(tmp.len, dump.len);
89988 if (!len)
89989 return -EFAULT;
89990
89991+ /* Don't ever let the driver think there's more space available
89992+ * than it requested with .get_dump_flag().
89993+ */
89994+ dump.len = len;
89995+
89996+ /* Always allocate enough space to hold the whole thing so that the
89997+ * driver does not need to check the length and bother with partial
89998+ * dumping.
89999+ */
90000 data = vzalloc(tmp.len);
90001 if (!data)
90002 return -ENOMEM;
90003@@ -1330,6 +1339,16 @@ static int ethtool_get_dump_data(struct net_device *dev,
90004 if (ret)
90005 goto out;
90006
90007+ /* There are two sane possibilities:
90008+ * 1. The driver's .get_dump_data() does not touch dump.len.
90009+ * 2. Or it may set dump.len to how much it really writes, which
90010+ * should be tmp.len (or len if it can do a partial dump).
90011+ * In any case respond to userspace with the actual length of data
90012+ * it's receiving.
90013+ */
90014+ WARN_ON(dump.len != len && dump.len != tmp.len);
90015+ dump.len = len;
90016+
90017 if (copy_to_user(useraddr, &dump, sizeof(dump))) {
90018 ret = -EFAULT;
90019 goto out;
90020diff --git a/net/core/flow.c b/net/core/flow.c
90021index 7102f16..146b4bd 100644
90022--- a/net/core/flow.c
90023+++ b/net/core/flow.c
90024@@ -61,7 +61,7 @@ struct flow_cache {
90025 struct timer_list rnd_timer;
90026 };
90027
90028-atomic_t flow_cache_genid = ATOMIC_INIT(0);
90029+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
90030 EXPORT_SYMBOL(flow_cache_genid);
90031 static struct flow_cache flow_cache_global;
90032 static struct kmem_cache *flow_cachep __read_mostly;
90033@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
90034
90035 static int flow_entry_valid(struct flow_cache_entry *fle)
90036 {
90037- if (atomic_read(&flow_cache_genid) != fle->genid)
90038+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
90039 return 0;
90040 if (fle->object && !fle->object->ops->check(fle->object))
90041 return 0;
90042@@ -258,7 +258,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
90043 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
90044 fcp->hash_count++;
90045 }
90046- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
90047+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
90048 flo = fle->object;
90049 if (!flo)
90050 goto ret_object;
90051@@ -279,7 +279,7 @@ nocache:
90052 }
90053 flo = resolver(net, key, family, dir, flo, ctx);
90054 if (fle) {
90055- fle->genid = atomic_read(&flow_cache_genid);
90056+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
90057 if (!IS_ERR(flo))
90058 fle->object = flo;
90059 else
90060diff --git a/net/core/iovec.c b/net/core/iovec.c
90061index de178e4..1dabd8b 100644
90062--- a/net/core/iovec.c
90063+++ b/net/core/iovec.c
90064@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
90065 if (m->msg_namelen) {
90066 if (mode == VERIFY_READ) {
90067 void __user *namep;
90068- namep = (void __user __force *) m->msg_name;
90069+ namep = (void __force_user *) m->msg_name;
90070 err = move_addr_to_kernel(namep, m->msg_namelen,
90071 address);
90072 if (err < 0)
90073@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
90074 }
90075
90076 size = m->msg_iovlen * sizeof(struct iovec);
90077- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
90078+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
90079 return -EFAULT;
90080
90081 m->msg_iov = iov;
90082diff --git a/net/core/neighbour.c b/net/core/neighbour.c
90083index ce90b02..8752627 100644
90084--- a/net/core/neighbour.c
90085+++ b/net/core/neighbour.c
90086@@ -2771,7 +2771,7 @@ static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer,
90087 size_t *lenp, loff_t *ppos)
90088 {
90089 int size, ret;
90090- ctl_table tmp = *ctl;
90091+ ctl_table_no_const tmp = *ctl;
90092
90093 tmp.extra1 = &zero;
90094 tmp.extra2 = &unres_qlen_max;
90095diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
90096index 569d355..79cf2d0 100644
90097--- a/net/core/net-procfs.c
90098+++ b/net/core/net-procfs.c
90099@@ -271,8 +271,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
90100 else
90101 seq_printf(seq, "%04x", ntohs(pt->type));
90102
90103+#ifdef CONFIG_GRKERNSEC_HIDESYM
90104+ seq_printf(seq, " %-8s %pf\n",
90105+ pt->dev ? pt->dev->name : "", NULL);
90106+#else
90107 seq_printf(seq, " %-8s %pf\n",
90108 pt->dev ? pt->dev->name : "", pt->func);
90109+#endif
90110 }
90111
90112 return 0;
90113diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
90114index 981fed3..536af34 100644
90115--- a/net/core/net-sysfs.c
90116+++ b/net/core/net-sysfs.c
90117@@ -1311,7 +1311,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
90118 }
90119 EXPORT_SYMBOL(netdev_class_remove_file);
90120
90121-int netdev_kobject_init(void)
90122+int __init netdev_kobject_init(void)
90123 {
90124 kobj_ns_type_register(&net_ns_type_operations);
90125 return class_register(&net_class);
90126diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
90127index f9765203..9feaef8 100644
90128--- a/net/core/net_namespace.c
90129+++ b/net/core/net_namespace.c
90130@@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
90131 int error;
90132 LIST_HEAD(net_exit_list);
90133
90134- list_add_tail(&ops->list, list);
90135+ pax_list_add_tail((struct list_head *)&ops->list, list);
90136 if (ops->init || (ops->id && ops->size)) {
90137 for_each_net(net) {
90138 error = ops_init(ops, net);
90139@@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
90140
90141 out_undo:
90142 /* If I have an error cleanup all namespaces I initialized */
90143- list_del(&ops->list);
90144+ pax_list_del((struct list_head *)&ops->list);
90145 ops_exit_list(ops, &net_exit_list);
90146 ops_free_list(ops, &net_exit_list);
90147 return error;
90148@@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
90149 struct net *net;
90150 LIST_HEAD(net_exit_list);
90151
90152- list_del(&ops->list);
90153+ pax_list_del((struct list_head *)&ops->list);
90154 for_each_net(net)
90155 list_add_tail(&net->exit_list, &net_exit_list);
90156 ops_exit_list(ops, &net_exit_list);
90157@@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
90158 mutex_lock(&net_mutex);
90159 error = register_pernet_operations(&pernet_list, ops);
90160 if (!error && (first_device == &pernet_list))
90161- first_device = &ops->list;
90162+ first_device = (struct list_head *)&ops->list;
90163 mutex_unlock(&net_mutex);
90164 return error;
90165 }
90166diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
90167index a08bd2b..c59bd7c 100644
90168--- a/net/core/rtnetlink.c
90169+++ b/net/core/rtnetlink.c
90170@@ -58,7 +58,7 @@ struct rtnl_link {
90171 rtnl_doit_func doit;
90172 rtnl_dumpit_func dumpit;
90173 rtnl_calcit_func calcit;
90174-};
90175+} __no_const;
90176
90177 static DEFINE_MUTEX(rtnl_mutex);
90178
90179@@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
90180 if (rtnl_link_ops_get(ops->kind))
90181 return -EEXIST;
90182
90183- if (!ops->dellink)
90184- ops->dellink = unregister_netdevice_queue;
90185+ if (!ops->dellink) {
90186+ pax_open_kernel();
90187+ *(void **)&ops->dellink = unregister_netdevice_queue;
90188+ pax_close_kernel();
90189+ }
90190
90191- list_add_tail(&ops->list, &link_ops);
90192+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
90193 return 0;
90194 }
90195 EXPORT_SYMBOL_GPL(__rtnl_link_register);
90196@@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
90197 for_each_net(net) {
90198 __rtnl_kill_links(net, ops);
90199 }
90200- list_del(&ops->list);
90201+ pax_list_del((struct list_head *)&ops->list);
90202 }
90203 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
90204
90205@@ -2374,7 +2377,7 @@ static int rtnl_bridge_getlink(struct sk_buff *skb, struct netlink_callback *cb)
90206 struct nlattr *extfilt;
90207 u32 filter_mask = 0;
90208
90209- extfilt = nlmsg_find_attr(cb->nlh, sizeof(struct rtgenmsg),
90210+ extfilt = nlmsg_find_attr(cb->nlh, sizeof(struct ifinfomsg),
90211 IFLA_EXT_MASK);
90212 if (extfilt)
90213 filter_mask = nla_get_u32(extfilt);
90214diff --git a/net/core/scm.c b/net/core/scm.c
90215index 03795d0..eaf7368 100644
90216--- a/net/core/scm.c
90217+++ b/net/core/scm.c
90218@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
90219 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
90220 {
90221 struct cmsghdr __user *cm
90222- = (__force struct cmsghdr __user *)msg->msg_control;
90223+ = (struct cmsghdr __force_user *)msg->msg_control;
90224 struct cmsghdr cmhdr;
90225 int cmlen = CMSG_LEN(len);
90226 int err;
90227@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
90228 err = -EFAULT;
90229 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
90230 goto out;
90231- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
90232+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
90233 goto out;
90234 cmlen = CMSG_SPACE(len);
90235 if (msg->msg_controllen < cmlen)
90236@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
90237 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
90238 {
90239 struct cmsghdr __user *cm
90240- = (__force struct cmsghdr __user*)msg->msg_control;
90241+ = (struct cmsghdr __force_user *)msg->msg_control;
90242
90243 int fdmax = 0;
90244 int fdnum = scm->fp->count;
90245@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
90246 if (fdnum < fdmax)
90247 fdmax = fdnum;
90248
90249- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
90250+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
90251 i++, cmfptr++)
90252 {
90253 struct socket *sock;
90254diff --git a/net/core/skbuff.c b/net/core/skbuff.c
90255index 1c1738c..4cab7f0 100644
90256--- a/net/core/skbuff.c
90257+++ b/net/core/skbuff.c
90258@@ -3087,13 +3087,15 @@ void __init skb_init(void)
90259 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
90260 sizeof(struct sk_buff),
90261 0,
90262- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
90263+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
90264+ SLAB_NO_SANITIZE,
90265 NULL);
90266 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
90267 (2*sizeof(struct sk_buff)) +
90268 sizeof(atomic_t),
90269 0,
90270- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
90271+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
90272+ SLAB_NO_SANITIZE,
90273 NULL);
90274 }
90275
90276diff --git a/net/core/sock.c b/net/core/sock.c
90277index d6d024c..6ea7ab4 100644
90278--- a/net/core/sock.c
90279+++ b/net/core/sock.c
90280@@ -390,7 +390,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
90281 struct sk_buff_head *list = &sk->sk_receive_queue;
90282
90283 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
90284- atomic_inc(&sk->sk_drops);
90285+ atomic_inc_unchecked(&sk->sk_drops);
90286 trace_sock_rcvqueue_full(sk, skb);
90287 return -ENOMEM;
90288 }
90289@@ -400,7 +400,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
90290 return err;
90291
90292 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
90293- atomic_inc(&sk->sk_drops);
90294+ atomic_inc_unchecked(&sk->sk_drops);
90295 return -ENOBUFS;
90296 }
90297
90298@@ -420,7 +420,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
90299 skb_dst_force(skb);
90300
90301 spin_lock_irqsave(&list->lock, flags);
90302- skb->dropcount = atomic_read(&sk->sk_drops);
90303+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
90304 __skb_queue_tail(list, skb);
90305 spin_unlock_irqrestore(&list->lock, flags);
90306
90307@@ -440,7 +440,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
90308 skb->dev = NULL;
90309
90310 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
90311- atomic_inc(&sk->sk_drops);
90312+ atomic_inc_unchecked(&sk->sk_drops);
90313 goto discard_and_relse;
90314 }
90315 if (nested)
90316@@ -458,7 +458,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
90317 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
90318 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
90319 bh_unlock_sock(sk);
90320- atomic_inc(&sk->sk_drops);
90321+ atomic_inc_unchecked(&sk->sk_drops);
90322 goto discard_and_relse;
90323 }
90324
90325@@ -933,12 +933,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
90326 struct timeval tm;
90327 } v;
90328
90329- int lv = sizeof(int);
90330- int len;
90331+ unsigned int lv = sizeof(int);
90332+ unsigned int len;
90333
90334 if (get_user(len, optlen))
90335 return -EFAULT;
90336- if (len < 0)
90337+ if (len > INT_MAX)
90338 return -EINVAL;
90339
90340 memset(&v, 0, sizeof(v));
90341@@ -1090,11 +1090,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
90342
90343 case SO_PEERNAME:
90344 {
90345- char address[128];
90346+ char address[_K_SS_MAXSIZE];
90347
90348 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
90349 return -ENOTCONN;
90350- if (lv < len)
90351+ if (lv < len || sizeof address < len)
90352 return -EINVAL;
90353 if (copy_to_user(optval, address, len))
90354 return -EFAULT;
90355@@ -1161,7 +1161,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
90356
90357 if (len > lv)
90358 len = lv;
90359- if (copy_to_user(optval, &v, len))
90360+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
90361 return -EFAULT;
90362 lenout:
90363 if (put_user(len, optlen))
90364@@ -2277,7 +2277,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
90365 */
90366 smp_wmb();
90367 atomic_set(&sk->sk_refcnt, 1);
90368- atomic_set(&sk->sk_drops, 0);
90369+ atomic_set_unchecked(&sk->sk_drops, 0);
90370 }
90371 EXPORT_SYMBOL(sock_init_data);
90372
90373diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
90374index a0e9cf6..ef7f9ed 100644
90375--- a/net/core/sock_diag.c
90376+++ b/net/core/sock_diag.c
90377@@ -9,26 +9,33 @@
90378 #include <linux/inet_diag.h>
90379 #include <linux/sock_diag.h>
90380
90381-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
90382+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
90383 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
90384 static DEFINE_MUTEX(sock_diag_table_mutex);
90385
90386 int sock_diag_check_cookie(void *sk, __u32 *cookie)
90387 {
90388+#ifndef CONFIG_GRKERNSEC_HIDESYM
90389 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
90390 cookie[1] != INET_DIAG_NOCOOKIE) &&
90391 ((u32)(unsigned long)sk != cookie[0] ||
90392 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
90393 return -ESTALE;
90394 else
90395+#endif
90396 return 0;
90397 }
90398 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
90399
90400 void sock_diag_save_cookie(void *sk, __u32 *cookie)
90401 {
90402+#ifdef CONFIG_GRKERNSEC_HIDESYM
90403+ cookie[0] = 0;
90404+ cookie[1] = 0;
90405+#else
90406 cookie[0] = (u32)(unsigned long)sk;
90407 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
90408+#endif
90409 }
90410 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
90411
90412@@ -113,8 +120,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
90413 mutex_lock(&sock_diag_table_mutex);
90414 if (sock_diag_handlers[hndl->family])
90415 err = -EBUSY;
90416- else
90417+ else {
90418+ pax_open_kernel();
90419 sock_diag_handlers[hndl->family] = hndl;
90420+ pax_close_kernel();
90421+ }
90422 mutex_unlock(&sock_diag_table_mutex);
90423
90424 return err;
90425@@ -130,7 +140,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
90426
90427 mutex_lock(&sock_diag_table_mutex);
90428 BUG_ON(sock_diag_handlers[family] != hnld);
90429+ pax_open_kernel();
90430 sock_diag_handlers[family] = NULL;
90431+ pax_close_kernel();
90432 mutex_unlock(&sock_diag_table_mutex);
90433 }
90434 EXPORT_SYMBOL_GPL(sock_diag_unregister);
90435diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
90436index cfdb46a..cef55e1 100644
90437--- a/net/core/sysctl_net_core.c
90438+++ b/net/core/sysctl_net_core.c
90439@@ -28,7 +28,7 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write,
90440 {
90441 unsigned int orig_size, size;
90442 int ret, i;
90443- ctl_table tmp = {
90444+ ctl_table_no_const tmp = {
90445 .data = &size,
90446 .maxlen = sizeof(size),
90447 .mode = table->mode
90448@@ -211,13 +211,12 @@ static struct ctl_table netns_core_table[] = {
90449
90450 static __net_init int sysctl_core_net_init(struct net *net)
90451 {
90452- struct ctl_table *tbl;
90453+ ctl_table_no_const *tbl = NULL;
90454
90455 net->core.sysctl_somaxconn = SOMAXCONN;
90456
90457- tbl = netns_core_table;
90458 if (!net_eq(net, &init_net)) {
90459- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
90460+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
90461 if (tbl == NULL)
90462 goto err_dup;
90463
90464@@ -227,17 +226,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
90465 if (net->user_ns != &init_user_ns) {
90466 tbl[0].procname = NULL;
90467 }
90468- }
90469-
90470- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
90471+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
90472+ } else
90473+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
90474 if (net->core.sysctl_hdr == NULL)
90475 goto err_reg;
90476
90477 return 0;
90478
90479 err_reg:
90480- if (tbl != netns_core_table)
90481- kfree(tbl);
90482+ kfree(tbl);
90483 err_dup:
90484 return -ENOMEM;
90485 }
90486@@ -252,7 +250,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
90487 kfree(tbl);
90488 }
90489
90490-static __net_initdata struct pernet_operations sysctl_core_ops = {
90491+static __net_initconst struct pernet_operations sysctl_core_ops = {
90492 .init = sysctl_core_net_init,
90493 .exit = sysctl_core_net_exit,
90494 };
90495diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
90496index c21f200..bc4565b 100644
90497--- a/net/decnet/af_decnet.c
90498+++ b/net/decnet/af_decnet.c
90499@@ -465,6 +465,7 @@ static struct proto dn_proto = {
90500 .sysctl_rmem = sysctl_decnet_rmem,
90501 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
90502 .obj_size = sizeof(struct dn_sock),
90503+ .slab_flags = SLAB_USERCOPY,
90504 };
90505
90506 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
90507diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
90508index a55eecc..dd8428c 100644
90509--- a/net/decnet/sysctl_net_decnet.c
90510+++ b/net/decnet/sysctl_net_decnet.c
90511@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
90512
90513 if (len > *lenp) len = *lenp;
90514
90515- if (copy_to_user(buffer, addr, len))
90516+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
90517 return -EFAULT;
90518
90519 *lenp = len;
90520@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
90521
90522 if (len > *lenp) len = *lenp;
90523
90524- if (copy_to_user(buffer, devname, len))
90525+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
90526 return -EFAULT;
90527
90528 *lenp = len;
90529diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
90530index d01be2a..8976537 100644
90531--- a/net/ipv4/af_inet.c
90532+++ b/net/ipv4/af_inet.c
90533@@ -1703,13 +1703,9 @@ static int __init inet_init(void)
90534
90535 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
90536
90537- sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
90538- if (!sysctl_local_reserved_ports)
90539- goto out;
90540-
90541 rc = proto_register(&tcp_prot, 1);
90542 if (rc)
90543- goto out_free_reserved_ports;
90544+ goto out;
90545
90546 rc = proto_register(&udp_prot, 1);
90547 if (rc)
90548@@ -1818,8 +1814,6 @@ out_unregister_udp_proto:
90549 proto_unregister(&udp_prot);
90550 out_unregister_tcp_proto:
90551 proto_unregister(&tcp_prot);
90552-out_free_reserved_ports:
90553- kfree(sysctl_local_reserved_ports);
90554 goto out;
90555 }
90556
90557diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
90558index 2e7f194..0fa4d6d 100644
90559--- a/net/ipv4/ah4.c
90560+++ b/net/ipv4/ah4.c
90561@@ -420,7 +420,7 @@ static void ah4_err(struct sk_buff *skb, u32 info)
90562 return;
90563
90564 if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
90565- atomic_inc(&flow_cache_genid);
90566+ atomic_inc_unchecked(&flow_cache_genid);
90567 rt_genid_bump(net);
90568
90569 ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);
90570diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
90571index dfc39d4..0d4fa52 100644
90572--- a/net/ipv4/devinet.c
90573+++ b/net/ipv4/devinet.c
90574@@ -771,7 +771,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
90575 ci = nla_data(tb[IFA_CACHEINFO]);
90576 if (!ci->ifa_valid || ci->ifa_prefered > ci->ifa_valid) {
90577 err = -EINVAL;
90578- goto errout;
90579+ goto errout_free;
90580 }
90581 *pvalid_lft = ci->ifa_valid;
90582 *pprefered_lft = ci->ifa_prefered;
90583@@ -779,6 +779,8 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh,
90584
90585 return ifa;
90586
90587+errout_free:
90588+ inet_free_ifa(ifa);
90589 errout:
90590 return ERR_PTR(err);
90591 }
90592@@ -1529,7 +1531,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
90593 idx = 0;
90594 head = &net->dev_index_head[h];
90595 rcu_read_lock();
90596- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
90597+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
90598 net->dev_base_seq;
90599 hlist_for_each_entry_rcu(dev, head, index_hlist) {
90600 if (idx < s_idx)
90601@@ -1840,7 +1842,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
90602 idx = 0;
90603 head = &net->dev_index_head[h];
90604 rcu_read_lock();
90605- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
90606+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
90607 net->dev_base_seq;
90608 hlist_for_each_entry_rcu(dev, head, index_hlist) {
90609 if (idx < s_idx)
90610@@ -2065,7 +2067,7 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write,
90611 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
90612 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
90613
90614-static struct devinet_sysctl_table {
90615+static const struct devinet_sysctl_table {
90616 struct ctl_table_header *sysctl_header;
90617 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
90618 } devinet_sysctl = {
90619@@ -2183,7 +2185,7 @@ static __net_init int devinet_init_net(struct net *net)
90620 int err;
90621 struct ipv4_devconf *all, *dflt;
90622 #ifdef CONFIG_SYSCTL
90623- struct ctl_table *tbl = ctl_forward_entry;
90624+ ctl_table_no_const *tbl = NULL;
90625 struct ctl_table_header *forw_hdr;
90626 #endif
90627
90628@@ -2201,7 +2203,7 @@ static __net_init int devinet_init_net(struct net *net)
90629 goto err_alloc_dflt;
90630
90631 #ifdef CONFIG_SYSCTL
90632- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
90633+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
90634 if (tbl == NULL)
90635 goto err_alloc_ctl;
90636
90637@@ -2221,7 +2223,10 @@ static __net_init int devinet_init_net(struct net *net)
90638 goto err_reg_dflt;
90639
90640 err = -ENOMEM;
90641- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
90642+ if (!net_eq(net, &init_net))
90643+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
90644+ else
90645+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
90646 if (forw_hdr == NULL)
90647 goto err_reg_ctl;
90648 net->ipv4.forw_hdr = forw_hdr;
90649@@ -2237,8 +2242,7 @@ err_reg_ctl:
90650 err_reg_dflt:
90651 __devinet_sysctl_unregister(all);
90652 err_reg_all:
90653- if (tbl != ctl_forward_entry)
90654- kfree(tbl);
90655+ kfree(tbl);
90656 err_alloc_ctl:
90657 #endif
90658 if (dflt != &ipv4_devconf_dflt)
90659diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
90660index 4cfe34d..d2fac8a 100644
90661--- a/net/ipv4/esp4.c
90662+++ b/net/ipv4/esp4.c
90663@@ -477,7 +477,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
90664 }
90665
90666 return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
90667- net_adj) & ~(align - 1)) + (net_adj - 2);
90668+ net_adj) & ~(align - 1)) + net_adj - 2;
90669 }
90670
90671 static void esp4_err(struct sk_buff *skb, u32 info)
90672@@ -503,7 +503,7 @@ static void esp4_err(struct sk_buff *skb, u32 info)
90673 return;
90674
90675 if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
90676- atomic_inc(&flow_cache_genid);
90677+ atomic_inc_unchecked(&flow_cache_genid);
90678 rt_genid_bump(net);
90679
90680 ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0);
90681diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
90682index c7629a2..b62d139 100644
90683--- a/net/ipv4/fib_frontend.c
90684+++ b/net/ipv4/fib_frontend.c
90685@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
90686 #ifdef CONFIG_IP_ROUTE_MULTIPATH
90687 fib_sync_up(dev);
90688 #endif
90689- atomic_inc(&net->ipv4.dev_addr_genid);
90690+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
90691 rt_cache_flush(dev_net(dev));
90692 break;
90693 case NETDEV_DOWN:
90694 fib_del_ifaddr(ifa, NULL);
90695- atomic_inc(&net->ipv4.dev_addr_genid);
90696+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
90697 if (ifa->ifa_dev->ifa_list == NULL) {
90698 /* Last address was deleted from this interface.
90699 * Disable IP.
90700@@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
90701 #ifdef CONFIG_IP_ROUTE_MULTIPATH
90702 fib_sync_up(dev);
90703 #endif
90704- atomic_inc(&net->ipv4.dev_addr_genid);
90705+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
90706 rt_cache_flush(net);
90707 break;
90708 case NETDEV_DOWN:
90709diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
90710index 8f6cb7a..34507f9 100644
90711--- a/net/ipv4/fib_semantics.c
90712+++ b/net/ipv4/fib_semantics.c
90713@@ -765,7 +765,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
90714 nh->nh_saddr = inet_select_addr(nh->nh_dev,
90715 nh->nh_gw,
90716 nh->nh_parent->fib_scope);
90717- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
90718+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
90719
90720 return nh->nh_saddr;
90721 }
90722diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
90723index 49616fe..6e8a13d 100644
90724--- a/net/ipv4/fib_trie.c
90725+++ b/net/ipv4/fib_trie.c
90726@@ -71,7 +71,6 @@
90727 #include <linux/init.h>
90728 #include <linux/list.h>
90729 #include <linux/slab.h>
90730-#include <linux/prefetch.h>
90731 #include <linux/export.h>
90732 #include <net/net_namespace.h>
90733 #include <net/ip.h>
90734@@ -1761,10 +1760,8 @@ static struct leaf *leaf_walk_rcu(struct tnode *p, struct rt_trie_node *c)
90735 if (!c)
90736 continue;
90737
90738- if (IS_LEAF(c)) {
90739- prefetch(rcu_dereference_rtnl(p->child[idx]));
90740+ if (IS_LEAF(c))
90741 return (struct leaf *) c;
90742- }
90743
90744 /* Rescan start scanning in new node */
90745 p = (struct tnode *) c;
90746diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
90747index 6acb541..9ea617d 100644
90748--- a/net/ipv4/inet_connection_sock.c
90749+++ b/net/ipv4/inet_connection_sock.c
90750@@ -37,7 +37,7 @@ struct local_ports sysctl_local_ports __read_mostly = {
90751 .range = { 32768, 61000 },
90752 };
90753
90754-unsigned long *sysctl_local_reserved_ports;
90755+unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
90756 EXPORT_SYMBOL(sysctl_local_reserved_ports);
90757
90758 void inet_get_local_port_range(int *low, int *high)
90759diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
90760index 6af375a..c493c74 100644
90761--- a/net/ipv4/inet_hashtables.c
90762+++ b/net/ipv4/inet_hashtables.c
90763@@ -18,12 +18,15 @@
90764 #include <linux/sched.h>
90765 #include <linux/slab.h>
90766 #include <linux/wait.h>
90767+#include <linux/security.h>
90768
90769 #include <net/inet_connection_sock.h>
90770 #include <net/inet_hashtables.h>
90771 #include <net/secure_seq.h>
90772 #include <net/ip.h>
90773
90774+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
90775+
90776 /*
90777 * Allocate and initialize a new local port bind bucket.
90778 * The bindhash mutex for snum's hash chain must be held here.
90779@@ -554,6 +557,8 @@ ok:
90780 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
90781 spin_unlock(&head->lock);
90782
90783+ gr_update_task_in_ip_table(current, inet_sk(sk));
90784+
90785 if (tw) {
90786 inet_twsk_deschedule(tw, death_row);
90787 while (twrefcnt) {
90788diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
90789index 000e3d2..5472da3 100644
90790--- a/net/ipv4/inetpeer.c
90791+++ b/net/ipv4/inetpeer.c
90792@@ -503,8 +503,8 @@ relookup:
90793 if (p) {
90794 p->daddr = *daddr;
90795 atomic_set(&p->refcnt, 1);
90796- atomic_set(&p->rid, 0);
90797- atomic_set(&p->ip_id_count,
90798+ atomic_set_unchecked(&p->rid, 0);
90799+ atomic_set_unchecked(&p->ip_id_count,
90800 (daddr->family == AF_INET) ?
90801 secure_ip_id(daddr->addr.a4) :
90802 secure_ipv6_id(daddr->addr.a6));
90803diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
90804index b66910a..cfe416e 100644
90805--- a/net/ipv4/ip_fragment.c
90806+++ b/net/ipv4/ip_fragment.c
90807@@ -282,7 +282,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
90808 return 0;
90809
90810 start = qp->rid;
90811- end = atomic_inc_return(&peer->rid);
90812+ end = atomic_inc_return_unchecked(&peer->rid);
90813 qp->rid = end;
90814
90815 rc = qp->q.fragments && (end - start) > max;
90816@@ -759,12 +759,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
90817
90818 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
90819 {
90820- struct ctl_table *table;
90821+ ctl_table_no_const *table = NULL;
90822 struct ctl_table_header *hdr;
90823
90824- table = ip4_frags_ns_ctl_table;
90825 if (!net_eq(net, &init_net)) {
90826- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
90827+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
90828 if (table == NULL)
90829 goto err_alloc;
90830
90831@@ -775,9 +774,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
90832 /* Don't export sysctls to unprivileged users */
90833 if (net->user_ns != &init_user_ns)
90834 table[0].procname = NULL;
90835- }
90836+ hdr = register_net_sysctl(net, "net/ipv4", table);
90837+ } else
90838+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
90839
90840- hdr = register_net_sysctl(net, "net/ipv4", table);
90841 if (hdr == NULL)
90842 goto err_reg;
90843
90844@@ -785,8 +785,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
90845 return 0;
90846
90847 err_reg:
90848- if (!net_eq(net, &init_net))
90849- kfree(table);
90850+ kfree(table);
90851 err_alloc:
90852 return -ENOMEM;
90853 }
90854diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
90855index 855004f..9644112 100644
90856--- a/net/ipv4/ip_gre.c
90857+++ b/net/ipv4/ip_gre.c
90858@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
90859 module_param(log_ecn_error, bool, 0644);
90860 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
90861
90862-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
90863+static struct rtnl_link_ops ipgre_link_ops;
90864 static int ipgre_tunnel_init(struct net_device *dev);
90865
90866 static int ipgre_net_id __read_mostly;
90867@@ -572,7 +572,7 @@ static int ipgre_header(struct sk_buff *skb, struct net_device *dev,
90868 if (daddr)
90869 memcpy(&iph->daddr, daddr, 4);
90870 if (iph->daddr)
90871- return t->hlen;
90872+ return t->hlen + sizeof(*iph);
90873
90874 return -(t->hlen + sizeof(*iph));
90875 }
90876@@ -919,7 +919,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
90877 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
90878 };
90879
90880-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
90881+static struct rtnl_link_ops ipgre_link_ops = {
90882 .kind = "gre",
90883 .maxtype = IFLA_GRE_MAX,
90884 .policy = ipgre_policy,
90885@@ -933,7 +933,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
90886 .fill_info = ipgre_fill_info,
90887 };
90888
90889-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
90890+static struct rtnl_link_ops ipgre_tap_ops = {
90891 .kind = "gretap",
90892 .maxtype = IFLA_GRE_MAX,
90893 .policy = ipgre_policy,
90894diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
90895index d9c4f11..02b82dbc 100644
90896--- a/net/ipv4/ip_sockglue.c
90897+++ b/net/ipv4/ip_sockglue.c
90898@@ -1152,7 +1152,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
90899 len = min_t(unsigned int, len, opt->optlen);
90900 if (put_user(len, optlen))
90901 return -EFAULT;
90902- if (copy_to_user(optval, opt->__data, len))
90903+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
90904+ copy_to_user(optval, opt->__data, len))
90905 return -EFAULT;
90906 return 0;
90907 }
90908@@ -1283,7 +1284,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
90909 if (sk->sk_type != SOCK_STREAM)
90910 return -ENOPROTOOPT;
90911
90912- msg.msg_control = optval;
90913+ msg.msg_control = (void __force_kernel *)optval;
90914 msg.msg_controllen = len;
90915 msg.msg_flags = flags;
90916
90917diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
90918index 17cc0ff..63856c4 100644
90919--- a/net/ipv4/ip_vti.c
90920+++ b/net/ipv4/ip_vti.c
90921@@ -47,7 +47,7 @@
90922 #define HASH_SIZE 16
90923 #define HASH(addr) (((__force u32)addr^((__force u32)addr>>4))&(HASH_SIZE-1))
90924
90925-static struct rtnl_link_ops vti_link_ops __read_mostly;
90926+static struct rtnl_link_ops vti_link_ops;
90927
90928 static int vti_net_id __read_mostly;
90929 struct vti_net {
90930@@ -840,7 +840,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
90931 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
90932 };
90933
90934-static struct rtnl_link_ops vti_link_ops __read_mostly = {
90935+static struct rtnl_link_ops vti_link_ops = {
90936 .kind = "vti",
90937 .maxtype = IFLA_VTI_MAX,
90938 .policy = vti_policy,
90939diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
90940index 59cb8c7..a72160c 100644
90941--- a/net/ipv4/ipcomp.c
90942+++ b/net/ipv4/ipcomp.c
90943@@ -48,7 +48,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
90944 return;
90945
90946 if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
90947- atomic_inc(&flow_cache_genid);
90948+ atomic_inc_unchecked(&flow_cache_genid);
90949 rt_genid_bump(net);
90950
90951 ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);
90952diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
90953index efa1138..20dbba0 100644
90954--- a/net/ipv4/ipconfig.c
90955+++ b/net/ipv4/ipconfig.c
90956@@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
90957
90958 mm_segment_t oldfs = get_fs();
90959 set_fs(get_ds());
90960- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
90961+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
90962 set_fs(oldfs);
90963 return res;
90964 }
90965@@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
90966
90967 mm_segment_t oldfs = get_fs();
90968 set_fs(get_ds());
90969- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
90970+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
90971 set_fs(oldfs);
90972 return res;
90973 }
90974@@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
90975
90976 mm_segment_t oldfs = get_fs();
90977 set_fs(get_ds());
90978- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
90979+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
90980 set_fs(oldfs);
90981 return res;
90982 }
90983diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
90984index 7cfc456..e726868 100644
90985--- a/net/ipv4/ipip.c
90986+++ b/net/ipv4/ipip.c
90987@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
90988 static int ipip_net_id __read_mostly;
90989
90990 static int ipip_tunnel_init(struct net_device *dev);
90991-static struct rtnl_link_ops ipip_link_ops __read_mostly;
90992+static struct rtnl_link_ops ipip_link_ops;
90993
90994 static int ipip_err(struct sk_buff *skb, u32 info)
90995 {
90996@@ -406,7 +406,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
90997 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
90998 };
90999
91000-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
91001+static struct rtnl_link_ops ipip_link_ops = {
91002 .kind = "ipip",
91003 .maxtype = IFLA_IPTUN_MAX,
91004 .policy = ipip_policy,
91005diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
91006index 85a4f21..1beb1f5 100644
91007--- a/net/ipv4/netfilter/arp_tables.c
91008+++ b/net/ipv4/netfilter/arp_tables.c
91009@@ -880,14 +880,14 @@ static int compat_table_info(const struct xt_table_info *info,
91010 #endif
91011
91012 static int get_info(struct net *net, void __user *user,
91013- const int *len, int compat)
91014+ int len, int compat)
91015 {
91016 char name[XT_TABLE_MAXNAMELEN];
91017 struct xt_table *t;
91018 int ret;
91019
91020- if (*len != sizeof(struct arpt_getinfo)) {
91021- duprintf("length %u != %Zu\n", *len,
91022+ if (len != sizeof(struct arpt_getinfo)) {
91023+ duprintf("length %u != %Zu\n", len,
91024 sizeof(struct arpt_getinfo));
91025 return -EINVAL;
91026 }
91027@@ -924,7 +924,7 @@ static int get_info(struct net *net, void __user *user,
91028 info.size = private->size;
91029 strcpy(info.name, name);
91030
91031- if (copy_to_user(user, &info, *len) != 0)
91032+ if (copy_to_user(user, &info, len) != 0)
91033 ret = -EFAULT;
91034 else
91035 ret = 0;
91036@@ -1683,7 +1683,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
91037
91038 switch (cmd) {
91039 case ARPT_SO_GET_INFO:
91040- ret = get_info(sock_net(sk), user, len, 1);
91041+ ret = get_info(sock_net(sk), user, *len, 1);
91042 break;
91043 case ARPT_SO_GET_ENTRIES:
91044 ret = compat_get_entries(sock_net(sk), user, len);
91045@@ -1728,7 +1728,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
91046
91047 switch (cmd) {
91048 case ARPT_SO_GET_INFO:
91049- ret = get_info(sock_net(sk), user, len, 0);
91050+ ret = get_info(sock_net(sk), user, *len, 0);
91051 break;
91052
91053 case ARPT_SO_GET_ENTRIES:
91054diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
91055index d23118d..6ad7277 100644
91056--- a/net/ipv4/netfilter/ip_tables.c
91057+++ b/net/ipv4/netfilter/ip_tables.c
91058@@ -1068,14 +1068,14 @@ static int compat_table_info(const struct xt_table_info *info,
91059 #endif
91060
91061 static int get_info(struct net *net, void __user *user,
91062- const int *len, int compat)
91063+ int len, int compat)
91064 {
91065 char name[XT_TABLE_MAXNAMELEN];
91066 struct xt_table *t;
91067 int ret;
91068
91069- if (*len != sizeof(struct ipt_getinfo)) {
91070- duprintf("length %u != %zu\n", *len,
91071+ if (len != sizeof(struct ipt_getinfo)) {
91072+ duprintf("length %u != %zu\n", len,
91073 sizeof(struct ipt_getinfo));
91074 return -EINVAL;
91075 }
91076@@ -1112,7 +1112,7 @@ static int get_info(struct net *net, void __user *user,
91077 info.size = private->size;
91078 strcpy(info.name, name);
91079
91080- if (copy_to_user(user, &info, *len) != 0)
91081+ if (copy_to_user(user, &info, len) != 0)
91082 ret = -EFAULT;
91083 else
91084 ret = 0;
91085@@ -1966,7 +1966,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
91086
91087 switch (cmd) {
91088 case IPT_SO_GET_INFO:
91089- ret = get_info(sock_net(sk), user, len, 1);
91090+ ret = get_info(sock_net(sk), user, *len, 1);
91091 break;
91092 case IPT_SO_GET_ENTRIES:
91093 ret = compat_get_entries(sock_net(sk), user, len);
91094@@ -2013,7 +2013,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
91095
91096 switch (cmd) {
91097 case IPT_SO_GET_INFO:
91098- ret = get_info(sock_net(sk), user, len, 0);
91099+ ret = get_info(sock_net(sk), user, *len, 0);
91100 break;
91101
91102 case IPT_SO_GET_ENTRIES:
91103diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
91104index 7d93d62..cbbf2a3 100644
91105--- a/net/ipv4/ping.c
91106+++ b/net/ipv4/ping.c
91107@@ -843,7 +843,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
91108 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
91109 0, sock_i_ino(sp),
91110 atomic_read(&sp->sk_refcnt), sp,
91111- atomic_read(&sp->sk_drops), len);
91112+ atomic_read_unchecked(&sp->sk_drops), len);
91113 }
91114
91115 static int ping_seq_show(struct seq_file *seq, void *v)
91116diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
91117index dd44e0a..06dcca4 100644
91118--- a/net/ipv4/raw.c
91119+++ b/net/ipv4/raw.c
91120@@ -309,7 +309,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
91121 int raw_rcv(struct sock *sk, struct sk_buff *skb)
91122 {
91123 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
91124- atomic_inc(&sk->sk_drops);
91125+ atomic_inc_unchecked(&sk->sk_drops);
91126 kfree_skb(skb);
91127 return NET_RX_DROP;
91128 }
91129@@ -745,16 +745,20 @@ static int raw_init(struct sock *sk)
91130
91131 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
91132 {
91133+ struct icmp_filter filter;
91134+
91135 if (optlen > sizeof(struct icmp_filter))
91136 optlen = sizeof(struct icmp_filter);
91137- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
91138+ if (copy_from_user(&filter, optval, optlen))
91139 return -EFAULT;
91140+ raw_sk(sk)->filter = filter;
91141 return 0;
91142 }
91143
91144 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
91145 {
91146 int len, ret = -EFAULT;
91147+ struct icmp_filter filter;
91148
91149 if (get_user(len, optlen))
91150 goto out;
91151@@ -764,8 +768,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
91152 if (len > sizeof(struct icmp_filter))
91153 len = sizeof(struct icmp_filter);
91154 ret = -EFAULT;
91155- if (put_user(len, optlen) ||
91156- copy_to_user(optval, &raw_sk(sk)->filter, len))
91157+ filter = raw_sk(sk)->filter;
91158+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
91159 goto out;
91160 ret = 0;
91161 out: return ret;
91162@@ -994,7 +998,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
91163 0, 0L, 0,
91164 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
91165 0, sock_i_ino(sp),
91166- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
91167+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
91168 }
91169
91170 static int raw_seq_show(struct seq_file *seq, void *v)
91171diff --git a/net/ipv4/route.c b/net/ipv4/route.c
91172index d35bbf0..faa3ab8 100644
91173--- a/net/ipv4/route.c
91174+++ b/net/ipv4/route.c
91175@@ -2558,34 +2558,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
91176 .maxlen = sizeof(int),
91177 .mode = 0200,
91178 .proc_handler = ipv4_sysctl_rtcache_flush,
91179+ .extra1 = &init_net,
91180 },
91181 { },
91182 };
91183
91184 static __net_init int sysctl_route_net_init(struct net *net)
91185 {
91186- struct ctl_table *tbl;
91187+ ctl_table_no_const *tbl = NULL;
91188
91189- tbl = ipv4_route_flush_table;
91190 if (!net_eq(net, &init_net)) {
91191- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
91192+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
91193 if (tbl == NULL)
91194 goto err_dup;
91195
91196 /* Don't export sysctls to unprivileged users */
91197 if (net->user_ns != &init_user_ns)
91198 tbl[0].procname = NULL;
91199- }
91200- tbl[0].extra1 = net;
91201+ tbl[0].extra1 = net;
91202+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
91203+ } else
91204+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
91205
91206- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
91207 if (net->ipv4.route_hdr == NULL)
91208 goto err_reg;
91209 return 0;
91210
91211 err_reg:
91212- if (tbl != ipv4_route_flush_table)
91213- kfree(tbl);
91214+ kfree(tbl);
91215 err_dup:
91216 return -ENOMEM;
91217 }
91218@@ -2608,7 +2608,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
91219
91220 static __net_init int rt_genid_init(struct net *net)
91221 {
91222- atomic_set(&net->rt_genid, 0);
91223+ atomic_set_unchecked(&net->rt_genid, 0);
91224 get_random_bytes(&net->ipv4.dev_addr_genid,
91225 sizeof(net->ipv4.dev_addr_genid));
91226 return 0;
91227diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
91228index 3f25e75..3ae0f4d 100644
91229--- a/net/ipv4/sysctl_net_ipv4.c
91230+++ b/net/ipv4/sysctl_net_ipv4.c
91231@@ -57,7 +57,7 @@ static int ipv4_local_port_range(ctl_table *table, int write,
91232 {
91233 int ret;
91234 int range[2];
91235- ctl_table tmp = {
91236+ ctl_table_no_const tmp = {
91237 .data = &range,
91238 .maxlen = sizeof(range),
91239 .mode = table->mode,
91240@@ -110,7 +110,7 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
91241 int ret;
91242 gid_t urange[2];
91243 kgid_t low, high;
91244- ctl_table tmp = {
91245+ ctl_table_no_const tmp = {
91246 .data = &urange,
91247 .maxlen = sizeof(urange),
91248 .mode = table->mode,
91249@@ -141,7 +141,7 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write,
91250 void __user *buffer, size_t *lenp, loff_t *ppos)
91251 {
91252 char val[TCP_CA_NAME_MAX];
91253- ctl_table tbl = {
91254+ ctl_table_no_const tbl = {
91255 .data = val,
91256 .maxlen = TCP_CA_NAME_MAX,
91257 };
91258@@ -160,7 +160,7 @@ static int proc_tcp_available_congestion_control(ctl_table *ctl,
91259 void __user *buffer, size_t *lenp,
91260 loff_t *ppos)
91261 {
91262- ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
91263+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
91264 int ret;
91265
91266 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
91267@@ -177,7 +177,7 @@ static int proc_allowed_congestion_control(ctl_table *ctl,
91268 void __user *buffer, size_t *lenp,
91269 loff_t *ppos)
91270 {
91271- ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
91272+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
91273 int ret;
91274
91275 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
91276@@ -203,15 +203,17 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
91277 struct mem_cgroup *memcg;
91278 #endif
91279
91280- ctl_table tmp = {
91281+ ctl_table_no_const tmp = {
91282 .data = &vec,
91283 .maxlen = sizeof(vec),
91284 .mode = ctl->mode,
91285 };
91286
91287 if (!write) {
91288- ctl->data = &net->ipv4.sysctl_tcp_mem;
91289- return proc_doulongvec_minmax(ctl, write, buffer, lenp, ppos);
91290+ ctl_table_no_const tcp_mem = *ctl;
91291+
91292+ tcp_mem.data = &net->ipv4.sysctl_tcp_mem;
91293+ return proc_doulongvec_minmax(&tcp_mem, write, buffer, lenp, ppos);
91294 }
91295
91296 ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
91297@@ -238,7 +240,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
91298 static int proc_tcp_fastopen_key(ctl_table *ctl, int write, void __user *buffer,
91299 size_t *lenp, loff_t *ppos)
91300 {
91301- ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
91302+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
91303 struct tcp_fastopen_context *ctxt;
91304 int ret;
91305 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
91306@@ -481,7 +483,7 @@ static struct ctl_table ipv4_table[] = {
91307 },
91308 {
91309 .procname = "ip_local_reserved_ports",
91310- .data = NULL, /* initialized in sysctl_ipv4_init */
91311+ .data = sysctl_local_reserved_ports,
91312 .maxlen = 65536,
91313 .mode = 0644,
91314 .proc_handler = proc_do_large_bitmap,
91315@@ -846,11 +848,10 @@ static struct ctl_table ipv4_net_table[] = {
91316
91317 static __net_init int ipv4_sysctl_init_net(struct net *net)
91318 {
91319- struct ctl_table *table;
91320+ ctl_table_no_const *table = NULL;
91321
91322- table = ipv4_net_table;
91323 if (!net_eq(net, &init_net)) {
91324- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
91325+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
91326 if (table == NULL)
91327 goto err_alloc;
91328
91329@@ -885,15 +886,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
91330
91331 tcp_init_mem(net);
91332
91333- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
91334+ if (!net_eq(net, &init_net))
91335+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
91336+ else
91337+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
91338 if (net->ipv4.ipv4_hdr == NULL)
91339 goto err_reg;
91340
91341 return 0;
91342
91343 err_reg:
91344- if (!net_eq(net, &init_net))
91345- kfree(table);
91346+ kfree(table);
91347 err_alloc:
91348 return -ENOMEM;
91349 }
91350@@ -915,16 +918,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
91351 static __init int sysctl_ipv4_init(void)
91352 {
91353 struct ctl_table_header *hdr;
91354- struct ctl_table *i;
91355-
91356- for (i = ipv4_table; i->procname; i++) {
91357- if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
91358- i->data = sysctl_local_reserved_ports;
91359- break;
91360- }
91361- }
91362- if (!i->procname)
91363- return -EINVAL;
91364
91365 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
91366 if (hdr == NULL)
91367diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
91368index 9c62257..651cc27 100644
91369--- a/net/ipv4/tcp_input.c
91370+++ b/net/ipv4/tcp_input.c
91371@@ -4436,7 +4436,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
91372 * simplifies code)
91373 */
91374 static void
91375-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
91376+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
91377 struct sk_buff *head, struct sk_buff *tail,
91378 u32 start, u32 end)
91379 {
91380@@ -5522,6 +5522,7 @@ discard:
91381 tcp_paws_reject(&tp->rx_opt, 0))
91382 goto discard_and_undo;
91383
91384+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
91385 if (th->syn) {
91386 /* We see SYN without ACK. It is attempt of
91387 * simultaneous connect with crossed SYNs.
91388@@ -5572,6 +5573,7 @@ discard:
91389 goto discard;
91390 #endif
91391 }
91392+#endif
91393 /* "fifth, if neither of the SYN or RST bits is set then
91394 * drop the segment and return."
91395 */
91396@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
91397 goto discard;
91398
91399 if (th->syn) {
91400- if (th->fin)
91401+ if (th->fin || th->urg || th->psh)
91402 goto discard;
91403 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
91404 return 1;
91405diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
91406index 7999fc5..c812f42 100644
91407--- a/net/ipv4/tcp_ipv4.c
91408+++ b/net/ipv4/tcp_ipv4.c
91409@@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly;
91410 EXPORT_SYMBOL(sysctl_tcp_low_latency);
91411
91412
91413+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91414+extern int grsec_enable_blackhole;
91415+#endif
91416+
91417 #ifdef CONFIG_TCP_MD5SIG
91418 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
91419 __be32 daddr, __be32 saddr, const struct tcphdr *th);
91420@@ -1855,6 +1859,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
91421 return 0;
91422
91423 reset:
91424+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91425+ if (!grsec_enable_blackhole)
91426+#endif
91427 tcp_v4_send_reset(rsk, skb);
91428 discard:
91429 kfree_skb(skb);
91430@@ -2000,12 +2007,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
91431 TCP_SKB_CB(skb)->sacked = 0;
91432
91433 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
91434- if (!sk)
91435+ if (!sk) {
91436+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91437+ ret = 1;
91438+#endif
91439 goto no_tcp_socket;
91440-
91441+ }
91442 process:
91443- if (sk->sk_state == TCP_TIME_WAIT)
91444+ if (sk->sk_state == TCP_TIME_WAIT) {
91445+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91446+ ret = 2;
91447+#endif
91448 goto do_time_wait;
91449+ }
91450
91451 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
91452 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
91453@@ -2058,6 +2072,10 @@ csum_error:
91454 bad_packet:
91455 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
91456 } else {
91457+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91458+ if (!grsec_enable_blackhole || (ret == 1 &&
91459+ (skb->dev->flags & IFF_LOOPBACK)))
91460+#endif
91461 tcp_v4_send_reset(NULL, skb);
91462 }
91463
91464diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
91465index 0f01788..d52a859 100644
91466--- a/net/ipv4/tcp_minisocks.c
91467+++ b/net/ipv4/tcp_minisocks.c
91468@@ -27,6 +27,10 @@
91469 #include <net/inet_common.h>
91470 #include <net/xfrm.h>
91471
91472+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91473+extern int grsec_enable_blackhole;
91474+#endif
91475+
91476 int sysctl_tcp_syncookies __read_mostly = 1;
91477 EXPORT_SYMBOL(sysctl_tcp_syncookies);
91478
91479@@ -717,7 +721,10 @@ embryonic_reset:
91480 * avoid becoming vulnerable to outside attack aiming at
91481 * resetting legit local connections.
91482 */
91483- req->rsk_ops->send_reset(sk, skb);
91484+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91485+ if (!grsec_enable_blackhole)
91486+#endif
91487+ req->rsk_ops->send_reset(sk, skb);
91488 } else if (fastopen) { /* received a valid RST pkt */
91489 reqsk_fastopen_remove(sk, req, true);
91490 tcp_reset(sk);
91491diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
91492index d4943f6..e7a74a5 100644
91493--- a/net/ipv4/tcp_probe.c
91494+++ b/net/ipv4/tcp_probe.c
91495@@ -204,7 +204,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
91496 if (cnt + width >= len)
91497 break;
91498
91499- if (copy_to_user(buf + cnt, tbuf, width))
91500+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
91501 return -EFAULT;
91502 cnt += width;
91503 }
91504diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
91505index 4b85e6f..22f9ac9 100644
91506--- a/net/ipv4/tcp_timer.c
91507+++ b/net/ipv4/tcp_timer.c
91508@@ -22,6 +22,10 @@
91509 #include <linux/gfp.h>
91510 #include <net/tcp.h>
91511
91512+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91513+extern int grsec_lastack_retries;
91514+#endif
91515+
91516 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
91517 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
91518 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
91519@@ -185,6 +189,13 @@ static int tcp_write_timeout(struct sock *sk)
91520 }
91521 }
91522
91523+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91524+ if ((sk->sk_state == TCP_LAST_ACK) &&
91525+ (grsec_lastack_retries > 0) &&
91526+ (grsec_lastack_retries < retry_until))
91527+ retry_until = grsec_lastack_retries;
91528+#endif
91529+
91530 if (retransmits_timed_out(sk, retry_until,
91531 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
91532 /* Has it gone just too far? */
91533diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
91534index 93b731d..5a2dd92 100644
91535--- a/net/ipv4/udp.c
91536+++ b/net/ipv4/udp.c
91537@@ -87,6 +87,7 @@
91538 #include <linux/types.h>
91539 #include <linux/fcntl.h>
91540 #include <linux/module.h>
91541+#include <linux/security.h>
91542 #include <linux/socket.h>
91543 #include <linux/sockios.h>
91544 #include <linux/igmp.h>
91545@@ -111,6 +112,10 @@
91546 #include <trace/events/skb.h>
91547 #include "udp_impl.h"
91548
91549+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91550+extern int grsec_enable_blackhole;
91551+#endif
91552+
91553 struct udp_table udp_table __read_mostly;
91554 EXPORT_SYMBOL(udp_table);
91555
91556@@ -594,6 +599,9 @@ found:
91557 return s;
91558 }
91559
91560+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
91561+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
91562+
91563 /*
91564 * This routine is called by the ICMP module when it gets some
91565 * sort of error condition. If err < 0 then the socket should
91566@@ -890,9 +898,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
91567 dport = usin->sin_port;
91568 if (dport == 0)
91569 return -EINVAL;
91570+
91571+ err = gr_search_udp_sendmsg(sk, usin);
91572+ if (err)
91573+ return err;
91574 } else {
91575 if (sk->sk_state != TCP_ESTABLISHED)
91576 return -EDESTADDRREQ;
91577+
91578+ err = gr_search_udp_sendmsg(sk, NULL);
91579+ if (err)
91580+ return err;
91581+
91582 daddr = inet->inet_daddr;
91583 dport = inet->inet_dport;
91584 /* Open fast path for connected socket.
91585@@ -1136,7 +1153,7 @@ static unsigned int first_packet_length(struct sock *sk)
91586 IS_UDPLITE(sk));
91587 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
91588 IS_UDPLITE(sk));
91589- atomic_inc(&sk->sk_drops);
91590+ atomic_inc_unchecked(&sk->sk_drops);
91591 __skb_unlink(skb, rcvq);
91592 __skb_queue_tail(&list_kill, skb);
91593 }
91594@@ -1222,6 +1239,10 @@ try_again:
91595 if (!skb)
91596 goto out;
91597
91598+ err = gr_search_udp_recvmsg(sk, skb);
91599+ if (err)
91600+ goto out_free;
91601+
91602 ulen = skb->len - sizeof(struct udphdr);
91603 copied = len;
91604 if (copied > ulen)
91605@@ -1255,7 +1276,7 @@ try_again:
91606 if (unlikely(err)) {
91607 trace_kfree_skb(skb, udp_recvmsg);
91608 if (!peeked) {
91609- atomic_inc(&sk->sk_drops);
91610+ atomic_inc_unchecked(&sk->sk_drops);
91611 UDP_INC_STATS_USER(sock_net(sk),
91612 UDP_MIB_INERRORS, is_udplite);
91613 }
91614@@ -1542,7 +1563,7 @@ csum_error:
91615 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
91616 drop:
91617 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
91618- atomic_inc(&sk->sk_drops);
91619+ atomic_inc_unchecked(&sk->sk_drops);
91620 kfree_skb(skb);
91621 return -1;
91622 }
91623@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
91624 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
91625
91626 if (!skb1) {
91627- atomic_inc(&sk->sk_drops);
91628+ atomic_inc_unchecked(&sk->sk_drops);
91629 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
91630 IS_UDPLITE(sk));
91631 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
91632@@ -1730,6 +1751,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
91633 goto csum_error;
91634
91635 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
91636+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91637+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
91638+#endif
91639 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
91640
91641 /*
91642@@ -2160,7 +2184,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
91643 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
91644 0, sock_i_ino(sp),
91645 atomic_read(&sp->sk_refcnt), sp,
91646- atomic_read(&sp->sk_drops), len);
91647+ atomic_read_unchecked(&sp->sk_drops), len);
91648 }
91649
91650 int udp4_seq_show(struct seq_file *seq, void *v)
91651diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
91652index 9a459be..086b866 100644
91653--- a/net/ipv4/xfrm4_policy.c
91654+++ b/net/ipv4/xfrm4_policy.c
91655@@ -264,19 +264,18 @@ static struct ctl_table xfrm4_policy_table[] = {
91656
91657 static int __net_init xfrm4_net_init(struct net *net)
91658 {
91659- struct ctl_table *table;
91660+ ctl_table_no_const *table = NULL;
91661 struct ctl_table_header *hdr;
91662
91663- table = xfrm4_policy_table;
91664 if (!net_eq(net, &init_net)) {
91665- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
91666+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
91667 if (!table)
91668 goto err_alloc;
91669
91670 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
91671- }
91672-
91673- hdr = register_net_sysctl(net, "net/ipv4", table);
91674+ hdr = register_net_sysctl(net, "net/ipv4", table);
91675+ } else
91676+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
91677 if (!hdr)
91678 goto err_reg;
91679
91680@@ -284,8 +283,7 @@ static int __net_init xfrm4_net_init(struct net *net)
91681 return 0;
91682
91683 err_reg:
91684- if (!net_eq(net, &init_net))
91685- kfree(table);
91686+ kfree(table);
91687 err_alloc:
91688 return -ENOMEM;
91689 }
91690diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
91691index fb8c94c..fb18024 100644
91692--- a/net/ipv6/addrconf.c
91693+++ b/net/ipv6/addrconf.c
91694@@ -621,7 +621,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
91695 idx = 0;
91696 head = &net->dev_index_head[h];
91697 rcu_read_lock();
91698- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
91699+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
91700 net->dev_base_seq;
91701 hlist_for_each_entry_rcu(dev, head, index_hlist) {
91702 if (idx < s_idx)
91703@@ -2380,7 +2380,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
91704 p.iph.ihl = 5;
91705 p.iph.protocol = IPPROTO_IPV6;
91706 p.iph.ttl = 64;
91707- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
91708+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
91709
91710 if (ops->ndo_do_ioctl) {
91711 mm_segment_t oldfs = get_fs();
91712@@ -4002,7 +4002,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
91713 s_ip_idx = ip_idx = cb->args[2];
91714
91715 rcu_read_lock();
91716- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
91717+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
91718 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
91719 idx = 0;
91720 head = &net->dev_index_head[h];
91721@@ -4587,7 +4587,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
91722 dst_free(&ifp->rt->dst);
91723 break;
91724 }
91725- atomic_inc(&net->ipv6.dev_addr_genid);
91726+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
91727 }
91728
91729 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
91730@@ -4607,7 +4607,7 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
91731 int *valp = ctl->data;
91732 int val = *valp;
91733 loff_t pos = *ppos;
91734- ctl_table lctl;
91735+ ctl_table_no_const lctl;
91736 int ret;
91737
91738 /*
91739@@ -4689,7 +4689,7 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write,
91740 int *valp = ctl->data;
91741 int val = *valp;
91742 loff_t pos = *ppos;
91743- ctl_table lctl;
91744+ ctl_table_no_const lctl;
91745 int ret;
91746
91747 /*
91748diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
91749index 40ffd72..aeac0dc 100644
91750--- a/net/ipv6/esp6.c
91751+++ b/net/ipv6/esp6.c
91752@@ -425,7 +425,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
91753 net_adj = 0;
91754
91755 return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
91756- net_adj) & ~(align - 1)) + (net_adj - 2);
91757+ net_adj) & ~(align - 1)) + net_adj - 2;
91758 }
91759
91760 static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
91761diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
91762index b4ff0a4..db9b764 100644
91763--- a/net/ipv6/icmp.c
91764+++ b/net/ipv6/icmp.c
91765@@ -980,7 +980,7 @@ ctl_table ipv6_icmp_table_template[] = {
91766
91767 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
91768 {
91769- struct ctl_table *table;
91770+ ctl_table_no_const *table;
91771
91772 table = kmemdup(ipv6_icmp_table_template,
91773 sizeof(ipv6_icmp_table_template),
91774diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
91775index ecd6073..58162ae 100644
91776--- a/net/ipv6/ip6_gre.c
91777+++ b/net/ipv6/ip6_gre.c
91778@@ -74,7 +74,7 @@ struct ip6gre_net {
91779 struct net_device *fb_tunnel_dev;
91780 };
91781
91782-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
91783+static struct rtnl_link_ops ip6gre_link_ops;
91784 static int ip6gre_tunnel_init(struct net_device *dev);
91785 static void ip6gre_tunnel_setup(struct net_device *dev);
91786 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
91787@@ -1283,7 +1283,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
91788 }
91789
91790
91791-static struct inet6_protocol ip6gre_protocol __read_mostly = {
91792+static struct inet6_protocol ip6gre_protocol = {
91793 .handler = ip6gre_rcv,
91794 .err_handler = ip6gre_err,
91795 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
91796@@ -1617,7 +1617,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
91797 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
91798 };
91799
91800-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
91801+static struct rtnl_link_ops ip6gre_link_ops = {
91802 .kind = "ip6gre",
91803 .maxtype = IFLA_GRE_MAX,
91804 .policy = ip6gre_policy,
91805@@ -1630,7 +1630,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
91806 .fill_info = ip6gre_fill_info,
91807 };
91808
91809-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
91810+static struct rtnl_link_ops ip6gre_tap_ops = {
91811 .kind = "ip6gretap",
91812 .maxtype = IFLA_GRE_MAX,
91813 .policy = ip6gre_policy,
91814diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
91815index 1e55866..b398dab 100644
91816--- a/net/ipv6/ip6_tunnel.c
91817+++ b/net/ipv6/ip6_tunnel.c
91818@@ -88,7 +88,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
91819
91820 static int ip6_tnl_dev_init(struct net_device *dev);
91821 static void ip6_tnl_dev_setup(struct net_device *dev);
91822-static struct rtnl_link_ops ip6_link_ops __read_mostly;
91823+static struct rtnl_link_ops ip6_link_ops;
91824
91825 static int ip6_tnl_net_id __read_mostly;
91826 struct ip6_tnl_net {
91827@@ -1672,7 +1672,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
91828 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
91829 };
91830
91831-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
91832+static struct rtnl_link_ops ip6_link_ops = {
91833 .kind = "ip6tnl",
91834 .maxtype = IFLA_IPTUN_MAX,
91835 .policy = ip6_tnl_policy,
91836diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
91837index d1e2e8e..51c19ae 100644
91838--- a/net/ipv6/ipv6_sockglue.c
91839+++ b/net/ipv6/ipv6_sockglue.c
91840@@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
91841 if (sk->sk_type != SOCK_STREAM)
91842 return -ENOPROTOOPT;
91843
91844- msg.msg_control = optval;
91845+ msg.msg_control = (void __force_kernel *)optval;
91846 msg.msg_controllen = len;
91847 msg.msg_flags = flags;
91848
91849diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
91850index 44400c2..8e11f52 100644
91851--- a/net/ipv6/netfilter/ip6_tables.c
91852+++ b/net/ipv6/netfilter/ip6_tables.c
91853@@ -1078,14 +1078,14 @@ static int compat_table_info(const struct xt_table_info *info,
91854 #endif
91855
91856 static int get_info(struct net *net, void __user *user,
91857- const int *len, int compat)
91858+ int len, int compat)
91859 {
91860 char name[XT_TABLE_MAXNAMELEN];
91861 struct xt_table *t;
91862 int ret;
91863
91864- if (*len != sizeof(struct ip6t_getinfo)) {
91865- duprintf("length %u != %zu\n", *len,
91866+ if (len != sizeof(struct ip6t_getinfo)) {
91867+ duprintf("length %u != %zu\n", len,
91868 sizeof(struct ip6t_getinfo));
91869 return -EINVAL;
91870 }
91871@@ -1122,7 +1122,7 @@ static int get_info(struct net *net, void __user *user,
91872 info.size = private->size;
91873 strcpy(info.name, name);
91874
91875- if (copy_to_user(user, &info, *len) != 0)
91876+ if (copy_to_user(user, &info, len) != 0)
91877 ret = -EFAULT;
91878 else
91879 ret = 0;
91880@@ -1976,7 +1976,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
91881
91882 switch (cmd) {
91883 case IP6T_SO_GET_INFO:
91884- ret = get_info(sock_net(sk), user, len, 1);
91885+ ret = get_info(sock_net(sk), user, *len, 1);
91886 break;
91887 case IP6T_SO_GET_ENTRIES:
91888 ret = compat_get_entries(sock_net(sk), user, len);
91889@@ -2023,7 +2023,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
91890
91891 switch (cmd) {
91892 case IP6T_SO_GET_INFO:
91893- ret = get_info(sock_net(sk), user, len, 0);
91894+ ret = get_info(sock_net(sk), user, *len, 0);
91895 break;
91896
91897 case IP6T_SO_GET_ENTRIES:
91898diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
91899index dffdc1a..ccc6678 100644
91900--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
91901+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
91902@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
91903
91904 static int nf_ct_frag6_sysctl_register(struct net *net)
91905 {
91906- struct ctl_table *table;
91907+ ctl_table_no_const *table = NULL;
91908 struct ctl_table_header *hdr;
91909
91910- table = nf_ct_frag6_sysctl_table;
91911 if (!net_eq(net, &init_net)) {
91912- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
91913+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
91914 GFP_KERNEL);
91915 if (table == NULL)
91916 goto err_alloc;
91917@@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
91918 table[0].data = &net->nf_frag.frags.timeout;
91919 table[1].data = &net->nf_frag.frags.low_thresh;
91920 table[2].data = &net->nf_frag.frags.high_thresh;
91921- }
91922-
91923- hdr = register_net_sysctl(net, "net/netfilter", table);
91924+ hdr = register_net_sysctl(net, "net/netfilter", table);
91925+ } else
91926+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
91927 if (hdr == NULL)
91928 goto err_reg;
91929
91930@@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
91931 return 0;
91932
91933 err_reg:
91934- if (!net_eq(net, &init_net))
91935- kfree(table);
91936+ kfree(table);
91937 err_alloc:
91938 return -ENOMEM;
91939 }
91940diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
91941index eedff8c..6e13a47 100644
91942--- a/net/ipv6/raw.c
91943+++ b/net/ipv6/raw.c
91944@@ -378,7 +378,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
91945 {
91946 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
91947 skb_checksum_complete(skb)) {
91948- atomic_inc(&sk->sk_drops);
91949+ atomic_inc_unchecked(&sk->sk_drops);
91950 kfree_skb(skb);
91951 return NET_RX_DROP;
91952 }
91953@@ -406,7 +406,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
91954 struct raw6_sock *rp = raw6_sk(sk);
91955
91956 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
91957- atomic_inc(&sk->sk_drops);
91958+ atomic_inc_unchecked(&sk->sk_drops);
91959 kfree_skb(skb);
91960 return NET_RX_DROP;
91961 }
91962@@ -430,7 +430,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
91963
91964 if (inet->hdrincl) {
91965 if (skb_checksum_complete(skb)) {
91966- atomic_inc(&sk->sk_drops);
91967+ atomic_inc_unchecked(&sk->sk_drops);
91968 kfree_skb(skb);
91969 return NET_RX_DROP;
91970 }
91971@@ -602,7 +602,7 @@ out:
91972 return err;
91973 }
91974
91975-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
91976+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
91977 struct flowi6 *fl6, struct dst_entry **dstp,
91978 unsigned int flags)
91979 {
91980@@ -914,12 +914,15 @@ do_confirm:
91981 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
91982 char __user *optval, int optlen)
91983 {
91984+ struct icmp6_filter filter;
91985+
91986 switch (optname) {
91987 case ICMPV6_FILTER:
91988 if (optlen > sizeof(struct icmp6_filter))
91989 optlen = sizeof(struct icmp6_filter);
91990- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
91991+ if (copy_from_user(&filter, optval, optlen))
91992 return -EFAULT;
91993+ raw6_sk(sk)->filter = filter;
91994 return 0;
91995 default:
91996 return -ENOPROTOOPT;
91997@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
91998 char __user *optval, int __user *optlen)
91999 {
92000 int len;
92001+ struct icmp6_filter filter;
92002
92003 switch (optname) {
92004 case ICMPV6_FILTER:
92005@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
92006 len = sizeof(struct icmp6_filter);
92007 if (put_user(len, optlen))
92008 return -EFAULT;
92009- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
92010+ filter = raw6_sk(sk)->filter;
92011+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
92012 return -EFAULT;
92013 return 0;
92014 default:
92015@@ -1251,7 +1256,7 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
92016 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
92017 0,
92018 sock_i_ino(sp),
92019- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
92020+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
92021 }
92022
92023 static int raw6_seq_show(struct seq_file *seq, void *v)
92024diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
92025index 790d9f4..68ae078 100644
92026--- a/net/ipv6/reassembly.c
92027+++ b/net/ipv6/reassembly.c
92028@@ -621,12 +621,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
92029
92030 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
92031 {
92032- struct ctl_table *table;
92033+ ctl_table_no_const *table = NULL;
92034 struct ctl_table_header *hdr;
92035
92036- table = ip6_frags_ns_ctl_table;
92037 if (!net_eq(net, &init_net)) {
92038- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
92039+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
92040 if (table == NULL)
92041 goto err_alloc;
92042
92043@@ -637,9 +636,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
92044 /* Don't export sysctls to unprivileged users */
92045 if (net->user_ns != &init_user_ns)
92046 table[0].procname = NULL;
92047- }
92048+ hdr = register_net_sysctl(net, "net/ipv6", table);
92049+ } else
92050+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
92051
92052- hdr = register_net_sysctl(net, "net/ipv6", table);
92053 if (hdr == NULL)
92054 goto err_reg;
92055
92056@@ -647,8 +647,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
92057 return 0;
92058
92059 err_reg:
92060- if (!net_eq(net, &init_net))
92061- kfree(table);
92062+ kfree(table);
92063 err_alloc:
92064 return -ENOMEM;
92065 }
92066diff --git a/net/ipv6/route.c b/net/ipv6/route.c
92067index bacce6c..9d1741a 100644
92068--- a/net/ipv6/route.c
92069+++ b/net/ipv6/route.c
92070@@ -2903,7 +2903,7 @@ ctl_table ipv6_route_table_template[] = {
92071
92072 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
92073 {
92074- struct ctl_table *table;
92075+ ctl_table_no_const *table;
92076
92077 table = kmemdup(ipv6_route_table_template,
92078 sizeof(ipv6_route_table_template),
92079diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
92080index 60df36d..f3ab7c8 100644
92081--- a/net/ipv6/sit.c
92082+++ b/net/ipv6/sit.c
92083@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
92084 static void ipip6_dev_free(struct net_device *dev);
92085 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
92086 __be32 *v4dst);
92087-static struct rtnl_link_ops sit_link_ops __read_mostly;
92088+static struct rtnl_link_ops sit_link_ops;
92089
92090 static int sit_net_id __read_mostly;
92091 struct sit_net {
92092@@ -1453,7 +1453,7 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = {
92093 #endif
92094 };
92095
92096-static struct rtnl_link_ops sit_link_ops __read_mostly = {
92097+static struct rtnl_link_ops sit_link_ops = {
92098 .kind = "sit",
92099 .maxtype = IFLA_IPTUN_MAX,
92100 .policy = ipip6_policy,
92101diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
92102index e85c48b..b8268d3 100644
92103--- a/net/ipv6/sysctl_net_ipv6.c
92104+++ b/net/ipv6/sysctl_net_ipv6.c
92105@@ -40,7 +40,7 @@ static ctl_table ipv6_rotable[] = {
92106
92107 static int __net_init ipv6_sysctl_net_init(struct net *net)
92108 {
92109- struct ctl_table *ipv6_table;
92110+ ctl_table_no_const *ipv6_table;
92111 struct ctl_table *ipv6_route_table;
92112 struct ctl_table *ipv6_icmp_table;
92113 int err;
92114diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
92115index 0a17ed9..2526cc3 100644
92116--- a/net/ipv6/tcp_ipv6.c
92117+++ b/net/ipv6/tcp_ipv6.c
92118@@ -103,6 +103,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
92119 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
92120 }
92121
92122+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92123+extern int grsec_enable_blackhole;
92124+#endif
92125+
92126 static void tcp_v6_hash(struct sock *sk)
92127 {
92128 if (sk->sk_state != TCP_CLOSE) {
92129@@ -1398,6 +1402,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
92130 return 0;
92131
92132 reset:
92133+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92134+ if (!grsec_enable_blackhole)
92135+#endif
92136 tcp_v6_send_reset(sk, skb);
92137 discard:
92138 if (opt_skb)
92139@@ -1480,12 +1487,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
92140 TCP_SKB_CB(skb)->sacked = 0;
92141
92142 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
92143- if (!sk)
92144+ if (!sk) {
92145+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92146+ ret = 1;
92147+#endif
92148 goto no_tcp_socket;
92149+ }
92150
92151 process:
92152- if (sk->sk_state == TCP_TIME_WAIT)
92153+ if (sk->sk_state == TCP_TIME_WAIT) {
92154+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92155+ ret = 2;
92156+#endif
92157 goto do_time_wait;
92158+ }
92159
92160 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
92161 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
92162@@ -1536,6 +1551,10 @@ csum_error:
92163 bad_packet:
92164 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
92165 } else {
92166+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92167+ if (!grsec_enable_blackhole || (ret == 1 &&
92168+ (skb->dev->flags & IFF_LOOPBACK)))
92169+#endif
92170 tcp_v6_send_reset(NULL, skb);
92171 }
92172
92173diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
92174index e7b28f9..d09c290 100644
92175--- a/net/ipv6/udp.c
92176+++ b/net/ipv6/udp.c
92177@@ -52,6 +52,10 @@
92178 #include <trace/events/skb.h>
92179 #include "udp_impl.h"
92180
92181+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92182+extern int grsec_enable_blackhole;
92183+#endif
92184+
92185 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
92186 {
92187 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
92188@@ -419,7 +423,7 @@ try_again:
92189 if (unlikely(err)) {
92190 trace_kfree_skb(skb, udpv6_recvmsg);
92191 if (!peeked) {
92192- atomic_inc(&sk->sk_drops);
92193+ atomic_inc_unchecked(&sk->sk_drops);
92194 if (is_udp4)
92195 UDP_INC_STATS_USER(sock_net(sk),
92196 UDP_MIB_INERRORS,
92197@@ -665,7 +669,7 @@ csum_error:
92198 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
92199 drop:
92200 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
92201- atomic_inc(&sk->sk_drops);
92202+ atomic_inc_unchecked(&sk->sk_drops);
92203 kfree_skb(skb);
92204 return -1;
92205 }
92206@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
92207 if (likely(skb1 == NULL))
92208 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
92209 if (!skb1) {
92210- atomic_inc(&sk->sk_drops);
92211+ atomic_inc_unchecked(&sk->sk_drops);
92212 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
92213 IS_UDPLITE(sk));
92214 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
92215@@ -860,6 +864,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
92216 goto csum_error;
92217
92218 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
92219+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
92220+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
92221+#endif
92222 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
92223
92224 kfree_skb(skb);
92225@@ -1392,7 +1399,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
92226 0,
92227 sock_i_ino(sp),
92228 atomic_read(&sp->sk_refcnt), sp,
92229- atomic_read(&sp->sk_drops));
92230+ atomic_read_unchecked(&sp->sk_drops));
92231 }
92232
92233 int udp6_seq_show(struct seq_file *seq, void *v)
92234diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
92235index 23ed03d..465a71d 100644
92236--- a/net/ipv6/xfrm6_policy.c
92237+++ b/net/ipv6/xfrm6_policy.c
92238@@ -324,19 +324,19 @@ static struct ctl_table xfrm6_policy_table[] = {
92239
92240 static int __net_init xfrm6_net_init(struct net *net)
92241 {
92242- struct ctl_table *table;
92243+ ctl_table_no_const *table = NULL;
92244 struct ctl_table_header *hdr;
92245
92246- table = xfrm6_policy_table;
92247 if (!net_eq(net, &init_net)) {
92248- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
92249+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
92250 if (!table)
92251 goto err_alloc;
92252
92253 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
92254- }
92255+ hdr = register_net_sysctl(net, "net/ipv6", table);
92256+ } else
92257+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
92258
92259- hdr = register_net_sysctl(net, "net/ipv6", table);
92260 if (!hdr)
92261 goto err_reg;
92262
92263@@ -344,8 +344,7 @@ static int __net_init xfrm6_net_init(struct net *net)
92264 return 0;
92265
92266 err_reg:
92267- if (!net_eq(net, &init_net))
92268- kfree(table);
92269+ kfree(table);
92270 err_alloc:
92271 return -ENOMEM;
92272 }
92273diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
92274index 41ac7938..75e3bb1 100644
92275--- a/net/irda/ircomm/ircomm_tty.c
92276+++ b/net/irda/ircomm/ircomm_tty.c
92277@@ -319,11 +319,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
92278 add_wait_queue(&port->open_wait, &wait);
92279
92280 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
92281- __FILE__, __LINE__, tty->driver->name, port->count);
92282+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
92283
92284 spin_lock_irqsave(&port->lock, flags);
92285 if (!tty_hung_up_p(filp))
92286- port->count--;
92287+ atomic_dec(&port->count);
92288 port->blocked_open++;
92289 spin_unlock_irqrestore(&port->lock, flags);
92290
92291@@ -358,7 +358,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
92292 }
92293
92294 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
92295- __FILE__, __LINE__, tty->driver->name, port->count);
92296+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
92297
92298 schedule();
92299 }
92300@@ -368,12 +368,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
92301
92302 spin_lock_irqsave(&port->lock, flags);
92303 if (!tty_hung_up_p(filp))
92304- port->count++;
92305+ atomic_inc(&port->count);
92306 port->blocked_open--;
92307 spin_unlock_irqrestore(&port->lock, flags);
92308
92309 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
92310- __FILE__, __LINE__, tty->driver->name, port->count);
92311+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
92312
92313 if (!retval)
92314 port->flags |= ASYNC_NORMAL_ACTIVE;
92315@@ -447,12 +447,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
92316
92317 /* ++ is not atomic, so this should be protected - Jean II */
92318 spin_lock_irqsave(&self->port.lock, flags);
92319- self->port.count++;
92320+ atomic_inc(&self->port.count);
92321 spin_unlock_irqrestore(&self->port.lock, flags);
92322 tty_port_tty_set(&self->port, tty);
92323
92324 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
92325- self->line, self->port.count);
92326+ self->line, atomic_read(&self->port.count));
92327
92328 /* Not really used by us, but lets do it anyway */
92329 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
92330@@ -989,7 +989,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
92331 tty_kref_put(port->tty);
92332 }
92333 port->tty = NULL;
92334- port->count = 0;
92335+ atomic_set(&port->count, 0);
92336 spin_unlock_irqrestore(&port->lock, flags);
92337
92338 wake_up_interruptible(&port->open_wait);
92339@@ -1346,7 +1346,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
92340 seq_putc(m, '\n');
92341
92342 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
92343- seq_printf(m, "Open count: %d\n", self->port.count);
92344+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
92345 seq_printf(m, "Max data size: %d\n", self->max_data_size);
92346 seq_printf(m, "Max header size: %d\n", self->max_header_size);
92347
92348diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
92349index ae69165..c8b82d8 100644
92350--- a/net/iucv/af_iucv.c
92351+++ b/net/iucv/af_iucv.c
92352@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
92353
92354 write_lock_bh(&iucv_sk_list.lock);
92355
92356- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
92357+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
92358 while (__iucv_get_sock_by_name(name)) {
92359 sprintf(name, "%08x",
92360- atomic_inc_return(&iucv_sk_list.autobind_name));
92361+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
92362 }
92363
92364 write_unlock_bh(&iucv_sk_list.lock);
92365diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
92366index 4fe76ff..426a904 100644
92367--- a/net/iucv/iucv.c
92368+++ b/net/iucv/iucv.c
92369@@ -690,7 +690,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
92370 return NOTIFY_OK;
92371 }
92372
92373-static struct notifier_block __refdata iucv_cpu_notifier = {
92374+static struct notifier_block iucv_cpu_notifier = {
92375 .notifier_call = iucv_cpu_notify,
92376 };
92377
92378diff --git a/net/key/af_key.c b/net/key/af_key.c
92379index ab8bd2c..cd2d641 100644
92380--- a/net/key/af_key.c
92381+++ b/net/key/af_key.c
92382@@ -3048,10 +3048,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
92383 static u32 get_acqseq(void)
92384 {
92385 u32 res;
92386- static atomic_t acqseq;
92387+ static atomic_unchecked_t acqseq;
92388
92389 do {
92390- res = atomic_inc_return(&acqseq);
92391+ res = atomic_inc_return_unchecked(&acqseq);
92392 } while (!res);
92393 return res;
92394 }
92395diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
92396index ae36f8e..09d42ac 100644
92397--- a/net/mac80211/cfg.c
92398+++ b/net/mac80211/cfg.c
92399@@ -806,7 +806,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
92400 ret = ieee80211_vif_use_channel(sdata, chandef,
92401 IEEE80211_CHANCTX_EXCLUSIVE);
92402 }
92403- } else if (local->open_count == local->monitors) {
92404+ } else if (local_read(&local->open_count) == local->monitors) {
92405 local->_oper_chandef = *chandef;
92406 ieee80211_hw_config(local, 0);
92407 }
92408@@ -2922,7 +2922,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
92409 else
92410 local->probe_req_reg--;
92411
92412- if (!local->open_count)
92413+ if (!local_read(&local->open_count))
92414 break;
92415
92416 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
92417@@ -3385,8 +3385,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
92418 if (chanctx_conf) {
92419 *chandef = chanctx_conf->def;
92420 ret = 0;
92421- } else if (local->open_count > 0 &&
92422- local->open_count == local->monitors &&
92423+ } else if (local_read(&local->open_count) > 0 &&
92424+ local_read(&local->open_count) == local->monitors &&
92425 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
92426 if (local->use_chanctx)
92427 *chandef = local->monitor_chandef;
92428diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
92429index 9ca8e32..48e4a9b 100644
92430--- a/net/mac80211/ieee80211_i.h
92431+++ b/net/mac80211/ieee80211_i.h
92432@@ -28,6 +28,7 @@
92433 #include <net/ieee80211_radiotap.h>
92434 #include <net/cfg80211.h>
92435 #include <net/mac80211.h>
92436+#include <asm/local.h>
92437 #include "key.h"
92438 #include "sta_info.h"
92439 #include "debug.h"
92440@@ -891,7 +892,7 @@ struct ieee80211_local {
92441 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
92442 spinlock_t queue_stop_reason_lock;
92443
92444- int open_count;
92445+ local_t open_count;
92446 int monitors, cooked_mntrs;
92447 /* number of interfaces with corresponding FIF_ flags */
92448 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
92449diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
92450index 514e90f..56f22bf 100644
92451--- a/net/mac80211/iface.c
92452+++ b/net/mac80211/iface.c
92453@@ -502,7 +502,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
92454 break;
92455 }
92456
92457- if (local->open_count == 0) {
92458+ if (local_read(&local->open_count) == 0) {
92459 res = drv_start(local);
92460 if (res)
92461 goto err_del_bss;
92462@@ -545,7 +545,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
92463 break;
92464 }
92465
92466- if (local->monitors == 0 && local->open_count == 0) {
92467+ if (local->monitors == 0 && local_read(&local->open_count) == 0) {
92468 res = ieee80211_add_virtual_monitor(local);
92469 if (res)
92470 goto err_stop;
92471@@ -653,7 +653,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
92472 atomic_inc(&local->iff_promiscs);
92473
92474 if (coming_up)
92475- local->open_count++;
92476+ local_inc(&local->open_count);
92477
92478 if (hw_reconf_flags)
92479 ieee80211_hw_config(local, hw_reconf_flags);
92480@@ -691,7 +691,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
92481 err_del_interface:
92482 drv_remove_interface(local, sdata);
92483 err_stop:
92484- if (!local->open_count)
92485+ if (!local_read(&local->open_count))
92486 drv_stop(local);
92487 err_del_bss:
92488 sdata->bss = NULL;
92489@@ -828,7 +828,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
92490 }
92491
92492 if (going_down)
92493- local->open_count--;
92494+ local_dec(&local->open_count);
92495
92496 switch (sdata->vif.type) {
92497 case NL80211_IFTYPE_AP_VLAN:
92498@@ -895,7 +895,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
92499 }
92500 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
92501
92502- if (local->open_count == 0)
92503+ if (local_read(&local->open_count) == 0)
92504 ieee80211_clear_tx_pending(local);
92505
92506 /*
92507@@ -931,7 +931,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
92508
92509 ieee80211_recalc_ps(local, -1);
92510
92511- if (local->open_count == 0) {
92512+ if (local_read(&local->open_count) == 0) {
92513 ieee80211_stop_device(local);
92514
92515 /* no reconfiguring after stop! */
92516@@ -942,7 +942,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
92517 ieee80211_configure_filter(local);
92518 ieee80211_hw_config(local, hw_reconf_flags);
92519
92520- if (local->monitors == local->open_count)
92521+ if (local->monitors == local_read(&local->open_count))
92522 ieee80211_add_virtual_monitor(local);
92523 }
92524
92525diff --git a/net/mac80211/main.c b/net/mac80211/main.c
92526index 8a7bfc4..4407cd0 100644
92527--- a/net/mac80211/main.c
92528+++ b/net/mac80211/main.c
92529@@ -181,7 +181,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
92530 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
92531 IEEE80211_CONF_CHANGE_POWER);
92532
92533- if (changed && local->open_count) {
92534+ if (changed && local_read(&local->open_count)) {
92535 ret = drv_config(local, changed);
92536 /*
92537 * Goal:
92538diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
92539index 3401262..d5cd68d 100644
92540--- a/net/mac80211/pm.c
92541+++ b/net/mac80211/pm.c
92542@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
92543 struct ieee80211_sub_if_data *sdata;
92544 struct sta_info *sta;
92545
92546- if (!local->open_count)
92547+ if (!local_read(&local->open_count))
92548 goto suspend;
92549
92550 ieee80211_scan_cancel(local);
92551@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
92552 cancel_work_sync(&local->dynamic_ps_enable_work);
92553 del_timer_sync(&local->dynamic_ps_timer);
92554
92555- local->wowlan = wowlan && local->open_count;
92556+ local->wowlan = wowlan && local_read(&local->open_count);
92557 if (local->wowlan) {
92558 int err = drv_suspend(local, wowlan);
92559 if (err < 0) {
92560@@ -116,7 +116,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
92561 WARN_ON(!list_empty(&local->chanctx_list));
92562
92563 /* stop hardware - this must stop RX */
92564- if (local->open_count)
92565+ if (local_read(&local->open_count))
92566 ieee80211_stop_device(local);
92567
92568 suspend:
92569diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
92570index a02bef3..f2f38dd 100644
92571--- a/net/mac80211/rate.c
92572+++ b/net/mac80211/rate.c
92573@@ -712,7 +712,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
92574
92575 ASSERT_RTNL();
92576
92577- if (local->open_count)
92578+ if (local_read(&local->open_count))
92579 return -EBUSY;
92580
92581 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
92582diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
92583index c97a065..ff61928 100644
92584--- a/net/mac80211/rc80211_pid_debugfs.c
92585+++ b/net/mac80211/rc80211_pid_debugfs.c
92586@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
92587
92588 spin_unlock_irqrestore(&events->lock, status);
92589
92590- if (copy_to_user(buf, pb, p))
92591+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
92592 return -EFAULT;
92593
92594 return p;
92595diff --git a/net/mac80211/util.c b/net/mac80211/util.c
92596index 72e6292..e6319eb 100644
92597--- a/net/mac80211/util.c
92598+++ b/net/mac80211/util.c
92599@@ -1472,7 +1472,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
92600 }
92601 #endif
92602 /* everything else happens only if HW was up & running */
92603- if (!local->open_count)
92604+ if (!local_read(&local->open_count))
92605 goto wake_up;
92606
92607 /*
92608@@ -1696,7 +1696,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
92609 local->in_reconfig = false;
92610 barrier();
92611
92612- if (local->monitors == local->open_count && local->monitors > 0)
92613+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
92614 ieee80211_add_virtual_monitor(local);
92615
92616 /*
92617diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
92618index 56d22ca..87c778f 100644
92619--- a/net/netfilter/Kconfig
92620+++ b/net/netfilter/Kconfig
92621@@ -958,6 +958,16 @@ config NETFILTER_XT_MATCH_ESP
92622
92623 To compile it as a module, choose M here. If unsure, say N.
92624
92625+config NETFILTER_XT_MATCH_GRADM
92626+ tristate '"gradm" match support'
92627+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
92628+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
92629+ ---help---
92630+ The gradm match allows to match on grsecurity RBAC being enabled.
92631+ It is useful when iptables rules are applied early on bootup to
92632+ prevent connections to the machine (except from a trusted host)
92633+ while the RBAC system is disabled.
92634+
92635 config NETFILTER_XT_MATCH_HASHLIMIT
92636 tristate '"hashlimit" match support'
92637 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
92638diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
92639index a1abf87..dbcb7ee 100644
92640--- a/net/netfilter/Makefile
92641+++ b/net/netfilter/Makefile
92642@@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
92643 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
92644 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
92645 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
92646+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
92647 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
92648 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
92649 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
92650diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
92651index f771390..145b765 100644
92652--- a/net/netfilter/ipset/ip_set_core.c
92653+++ b/net/netfilter/ipset/ip_set_core.c
92654@@ -1820,7 +1820,7 @@ done:
92655 return ret;
92656 }
92657
92658-static struct nf_sockopt_ops so_set __read_mostly = {
92659+static struct nf_sockopt_ops so_set = {
92660 .pf = PF_INET,
92661 .get_optmin = SO_IP_SET,
92662 .get_optmax = SO_IP_SET + 1,
92663diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
92664index a083bda..da661c3 100644
92665--- a/net/netfilter/ipvs/ip_vs_conn.c
92666+++ b/net/netfilter/ipvs/ip_vs_conn.c
92667@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
92668 /* Increase the refcnt counter of the dest */
92669 ip_vs_dest_hold(dest);
92670
92671- conn_flags = atomic_read(&dest->conn_flags);
92672+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
92673 if (cp->protocol != IPPROTO_UDP)
92674 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
92675 flags = cp->flags;
92676@@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
92677
92678 cp->control = NULL;
92679 atomic_set(&cp->n_control, 0);
92680- atomic_set(&cp->in_pkts, 0);
92681+ atomic_set_unchecked(&cp->in_pkts, 0);
92682
92683 cp->packet_xmit = NULL;
92684 cp->app = NULL;
92685@@ -1190,7 +1190,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
92686
92687 /* Don't drop the entry if its number of incoming packets is not
92688 located in [0, 8] */
92689- i = atomic_read(&cp->in_pkts);
92690+ i = atomic_read_unchecked(&cp->in_pkts);
92691 if (i > 8 || i < 0) return 0;
92692
92693 if (!todrop_rate[i]) return 0;
92694diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
92695index 23b8eb5..48a8959 100644
92696--- a/net/netfilter/ipvs/ip_vs_core.c
92697+++ b/net/netfilter/ipvs/ip_vs_core.c
92698@@ -559,7 +559,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
92699 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
92700 /* do not touch skb anymore */
92701
92702- atomic_inc(&cp->in_pkts);
92703+ atomic_inc_unchecked(&cp->in_pkts);
92704 ip_vs_conn_put(cp);
92705 return ret;
92706 }
92707@@ -1711,7 +1711,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
92708 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
92709 pkts = sysctl_sync_threshold(ipvs);
92710 else
92711- pkts = atomic_add_return(1, &cp->in_pkts);
92712+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
92713
92714 if (ipvs->sync_state & IP_VS_STATE_MASTER)
92715 ip_vs_sync_conn(net, cp, pkts);
92716diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
92717index 9e6c2a0..28552e2 100644
92718--- a/net/netfilter/ipvs/ip_vs_ctl.c
92719+++ b/net/netfilter/ipvs/ip_vs_ctl.c
92720@@ -789,7 +789,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
92721 */
92722 ip_vs_rs_hash(ipvs, dest);
92723 }
92724- atomic_set(&dest->conn_flags, conn_flags);
92725+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
92726
92727 /* bind the service */
92728 if (!dest->svc) {
92729@@ -1657,7 +1657,7 @@ proc_do_sync_ports(ctl_table *table, int write,
92730 * align with netns init in ip_vs_control_net_init()
92731 */
92732
92733-static struct ctl_table vs_vars[] = {
92734+static ctl_table_no_const vs_vars[] __read_only = {
92735 {
92736 .procname = "amemthresh",
92737 .maxlen = sizeof(int),
92738@@ -2060,7 +2060,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
92739 " %-7s %-6d %-10d %-10d\n",
92740 &dest->addr.in6,
92741 ntohs(dest->port),
92742- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
92743+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
92744 atomic_read(&dest->weight),
92745 atomic_read(&dest->activeconns),
92746 atomic_read(&dest->inactconns));
92747@@ -2071,7 +2071,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
92748 "%-7s %-6d %-10d %-10d\n",
92749 ntohl(dest->addr.ip),
92750 ntohs(dest->port),
92751- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
92752+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
92753 atomic_read(&dest->weight),
92754 atomic_read(&dest->activeconns),
92755 atomic_read(&dest->inactconns));
92756@@ -2549,7 +2549,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
92757
92758 entry.addr = dest->addr.ip;
92759 entry.port = dest->port;
92760- entry.conn_flags = atomic_read(&dest->conn_flags);
92761+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
92762 entry.weight = atomic_read(&dest->weight);
92763 entry.u_threshold = dest->u_threshold;
92764 entry.l_threshold = dest->l_threshold;
92765@@ -3092,7 +3092,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
92766 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
92767 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
92768 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
92769- (atomic_read(&dest->conn_flags) &
92770+ (atomic_read_unchecked(&dest->conn_flags) &
92771 IP_VS_CONN_F_FWD_MASK)) ||
92772 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
92773 atomic_read(&dest->weight)) ||
92774@@ -3682,7 +3682,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
92775 {
92776 int idx;
92777 struct netns_ipvs *ipvs = net_ipvs(net);
92778- struct ctl_table *tbl;
92779+ ctl_table_no_const *tbl;
92780
92781 atomic_set(&ipvs->dropentry, 0);
92782 spin_lock_init(&ipvs->dropentry_lock);
92783diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
92784index 5ea26bd..c9bc65f 100644
92785--- a/net/netfilter/ipvs/ip_vs_lblc.c
92786+++ b/net/netfilter/ipvs/ip_vs_lblc.c
92787@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
92788 * IPVS LBLC sysctl table
92789 */
92790 #ifdef CONFIG_SYSCTL
92791-static ctl_table vs_vars_table[] = {
92792+static ctl_table_no_const vs_vars_table[] __read_only = {
92793 {
92794 .procname = "lblc_expiration",
92795 .data = NULL,
92796diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
92797index 50123c2..067c773 100644
92798--- a/net/netfilter/ipvs/ip_vs_lblcr.c
92799+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
92800@@ -299,7 +299,7 @@ struct ip_vs_lblcr_table {
92801 * IPVS LBLCR sysctl table
92802 */
92803
92804-static ctl_table vs_vars_table[] = {
92805+static ctl_table_no_const vs_vars_table[] __read_only = {
92806 {
92807 .procname = "lblcr_expiration",
92808 .data = NULL,
92809diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
92810index f6046d9..4f10cfd 100644
92811--- a/net/netfilter/ipvs/ip_vs_sync.c
92812+++ b/net/netfilter/ipvs/ip_vs_sync.c
92813@@ -596,7 +596,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
92814 cp = cp->control;
92815 if (cp) {
92816 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
92817- pkts = atomic_add_return(1, &cp->in_pkts);
92818+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
92819 else
92820 pkts = sysctl_sync_threshold(ipvs);
92821 ip_vs_sync_conn(net, cp->control, pkts);
92822@@ -758,7 +758,7 @@ control:
92823 if (!cp)
92824 return;
92825 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
92826- pkts = atomic_add_return(1, &cp->in_pkts);
92827+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
92828 else
92829 pkts = sysctl_sync_threshold(ipvs);
92830 goto sloop;
92831@@ -882,7 +882,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
92832
92833 if (opt)
92834 memcpy(&cp->in_seq, opt, sizeof(*opt));
92835- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
92836+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
92837 cp->state = state;
92838 cp->old_state = cp->state;
92839 /*
92840diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
92841index b75ff64..0c51bbe 100644
92842--- a/net/netfilter/ipvs/ip_vs_xmit.c
92843+++ b/net/netfilter/ipvs/ip_vs_xmit.c
92844@@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
92845 else
92846 rc = NF_ACCEPT;
92847 /* do not touch skb anymore */
92848- atomic_inc(&cp->in_pkts);
92849+ atomic_inc_unchecked(&cp->in_pkts);
92850 goto out;
92851 }
92852
92853@@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
92854 else
92855 rc = NF_ACCEPT;
92856 /* do not touch skb anymore */
92857- atomic_inc(&cp->in_pkts);
92858+ atomic_inc_unchecked(&cp->in_pkts);
92859 goto out;
92860 }
92861
92862diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
92863index 2d3030a..7ba1c0a 100644
92864--- a/net/netfilter/nf_conntrack_acct.c
92865+++ b/net/netfilter/nf_conntrack_acct.c
92866@@ -60,7 +60,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
92867 #ifdef CONFIG_SYSCTL
92868 static int nf_conntrack_acct_init_sysctl(struct net *net)
92869 {
92870- struct ctl_table *table;
92871+ ctl_table_no_const *table;
92872
92873 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
92874 GFP_KERNEL);
92875diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
92876index 0283bae..5febcb0 100644
92877--- a/net/netfilter/nf_conntrack_core.c
92878+++ b/net/netfilter/nf_conntrack_core.c
92879@@ -1614,6 +1614,10 @@ void nf_conntrack_init_end(void)
92880 #define DYING_NULLS_VAL ((1<<30)+1)
92881 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
92882
92883+#ifdef CONFIG_GRKERNSEC_HIDESYM
92884+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
92885+#endif
92886+
92887 int nf_conntrack_init_net(struct net *net)
92888 {
92889 int ret;
92890@@ -1628,7 +1632,11 @@ int nf_conntrack_init_net(struct net *net)
92891 goto err_stat;
92892 }
92893
92894+#ifdef CONFIG_GRKERNSEC_HIDESYM
92895+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
92896+#else
92897 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
92898+#endif
92899 if (!net->ct.slabname) {
92900 ret = -ENOMEM;
92901 goto err_slabname;
92902diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
92903index 1df1761..ce8b88a 100644
92904--- a/net/netfilter/nf_conntrack_ecache.c
92905+++ b/net/netfilter/nf_conntrack_ecache.c
92906@@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
92907 #ifdef CONFIG_SYSCTL
92908 static int nf_conntrack_event_init_sysctl(struct net *net)
92909 {
92910- struct ctl_table *table;
92911+ ctl_table_no_const *table;
92912
92913 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
92914 GFP_KERNEL);
92915diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
92916index 974a2a4..52cc6ff 100644
92917--- a/net/netfilter/nf_conntrack_helper.c
92918+++ b/net/netfilter/nf_conntrack_helper.c
92919@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
92920
92921 static int nf_conntrack_helper_init_sysctl(struct net *net)
92922 {
92923- struct ctl_table *table;
92924+ ctl_table_no_const *table;
92925
92926 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
92927 GFP_KERNEL);
92928diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
92929index 0ab9636..cea3c6a 100644
92930--- a/net/netfilter/nf_conntrack_proto.c
92931+++ b/net/netfilter/nf_conntrack_proto.c
92932@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
92933
92934 static void
92935 nf_ct_unregister_sysctl(struct ctl_table_header **header,
92936- struct ctl_table **table,
92937+ ctl_table_no_const **table,
92938 unsigned int users)
92939 {
92940 if (users > 0)
92941diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
92942index a99b6c3..3841268 100644
92943--- a/net/netfilter/nf_conntrack_proto_dccp.c
92944+++ b/net/netfilter/nf_conntrack_proto_dccp.c
92945@@ -457,7 +457,7 @@ static bool dccp_new(struct nf_conn *ct, const struct sk_buff *skb,
92946 out_invalid:
92947 if (LOG_INVALID(net, IPPROTO_DCCP))
92948 nf_log_packet(net, nf_ct_l3num(ct), 0, skb, NULL, NULL,
92949- NULL, msg);
92950+ NULL, "%s", msg);
92951 return false;
92952 }
92953
92954@@ -614,7 +614,7 @@ static int dccp_error(struct net *net, struct nf_conn *tmpl,
92955
92956 out_invalid:
92957 if (LOG_INVALID(net, IPPROTO_DCCP))
92958- nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, msg);
92959+ nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL, "%s", msg);
92960 return -NF_ACCEPT;
92961 }
92962
92963diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
92964index 4d4d8f1..e0f9a32 100644
92965--- a/net/netfilter/nf_conntrack_proto_tcp.c
92966+++ b/net/netfilter/nf_conntrack_proto_tcp.c
92967@@ -526,7 +526,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
92968 const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;
92969 __u32 seq, ack, sack, end, win, swin;
92970 s16 receiver_offset;
92971- bool res;
92972+ bool res, in_recv_win;
92973
92974 /*
92975 * Get the required data from the packet.
92976@@ -649,14 +649,18 @@ static bool tcp_in_window(const struct nf_conn *ct,
92977 receiver->td_end, receiver->td_maxend, receiver->td_maxwin,
92978 receiver->td_scale);
92979
92980+ /* Is the ending sequence in the receive window (if available)? */
92981+ in_recv_win = !receiver->td_maxwin ||
92982+ after(end, sender->td_end - receiver->td_maxwin - 1);
92983+
92984 pr_debug("tcp_in_window: I=%i II=%i III=%i IV=%i\n",
92985 before(seq, sender->td_maxend + 1),
92986- after(end, sender->td_end - receiver->td_maxwin - 1),
92987+ (in_recv_win ? 1 : 0),
92988 before(sack, receiver->td_end + 1),
92989 after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1));
92990
92991 if (before(seq, sender->td_maxend + 1) &&
92992- after(end, sender->td_end - receiver->td_maxwin - 1) &&
92993+ in_recv_win &&
92994 before(sack, receiver->td_end + 1) &&
92995 after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)) {
92996 /*
92997@@ -725,7 +729,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
92998 nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
92999 "nf_ct_tcp: %s ",
93000 before(seq, sender->td_maxend + 1) ?
93001- after(end, sender->td_end - receiver->td_maxwin - 1) ?
93002+ in_recv_win ?
93003 before(sack, receiver->td_end + 1) ?
93004 after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1) ? "BUG"
93005 : "ACK is under the lower bound (possible overly delayed ACK)"
93006diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
93007index bd700b4..4a3dc61 100644
93008--- a/net/netfilter/nf_conntrack_standalone.c
93009+++ b/net/netfilter/nf_conntrack_standalone.c
93010@@ -471,7 +471,7 @@ static ctl_table nf_ct_netfilter_table[] = {
93011
93012 static int nf_conntrack_standalone_init_sysctl(struct net *net)
93013 {
93014- struct ctl_table *table;
93015+ ctl_table_no_const *table;
93016
93017 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
93018 GFP_KERNEL);
93019diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
93020index 902fb0a..87f7fdb 100644
93021--- a/net/netfilter/nf_conntrack_timestamp.c
93022+++ b/net/netfilter/nf_conntrack_timestamp.c
93023@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
93024 #ifdef CONFIG_SYSCTL
93025 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
93026 {
93027- struct ctl_table *table;
93028+ ctl_table_no_const *table;
93029
93030 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
93031 GFP_KERNEL);
93032diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
93033index 3b18dd1..f79e0ca 100644
93034--- a/net/netfilter/nf_log.c
93035+++ b/net/netfilter/nf_log.c
93036@@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
93037
93038 #ifdef CONFIG_SYSCTL
93039 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
93040-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
93041+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
93042
93043 static int nf_log_proc_dostring(ctl_table *table, int write,
93044 void __user *buffer, size_t *lenp, loff_t *ppos)
93045@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(ctl_table *table, int write,
93046 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
93047 mutex_unlock(&nf_log_mutex);
93048 } else {
93049+ ctl_table_no_const nf_log_table = *table;
93050+
93051 mutex_lock(&nf_log_mutex);
93052 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
93053 lockdep_is_held(&nf_log_mutex));
93054 if (!logger)
93055- table->data = "NONE";
93056+ nf_log_table.data = "NONE";
93057 else
93058- table->data = logger->name;
93059- r = proc_dostring(table, write, buffer, lenp, ppos);
93060+ nf_log_table.data = logger->name;
93061+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
93062 mutex_unlock(&nf_log_mutex);
93063 }
93064
93065diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
93066index f042ae5..30ea486 100644
93067--- a/net/netfilter/nf_sockopt.c
93068+++ b/net/netfilter/nf_sockopt.c
93069@@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
93070 }
93071 }
93072
93073- list_add(&reg->list, &nf_sockopts);
93074+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
93075 out:
93076 mutex_unlock(&nf_sockopt_mutex);
93077 return ret;
93078@@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
93079 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
93080 {
93081 mutex_lock(&nf_sockopt_mutex);
93082- list_del(&reg->list);
93083+ pax_list_del((struct list_head *)&reg->list);
93084 mutex_unlock(&nf_sockopt_mutex);
93085 }
93086 EXPORT_SYMBOL(nf_unregister_sockopt);
93087diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
93088index 962e979..e46f350 100644
93089--- a/net/netfilter/nfnetlink_log.c
93090+++ b/net/netfilter/nfnetlink_log.c
93091@@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
93092 struct nfnl_log_net {
93093 spinlock_t instances_lock;
93094 struct hlist_head instance_table[INSTANCE_BUCKETS];
93095- atomic_t global_seq;
93096+ atomic_unchecked_t global_seq;
93097 };
93098
93099 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
93100@@ -419,6 +419,7 @@ __build_packet_message(struct nfnl_log_net *log,
93101 nfmsg->version = NFNETLINK_V0;
93102 nfmsg->res_id = htons(inst->group_num);
93103
93104+ memset(&pmsg, 0, sizeof(pmsg));
93105 pmsg.hw_protocol = skb->protocol;
93106 pmsg.hook = hooknum;
93107
93108@@ -498,7 +499,10 @@ __build_packet_message(struct nfnl_log_net *log,
93109 if (indev && skb->dev &&
93110 skb->mac_header != skb->network_header) {
93111 struct nfulnl_msg_packet_hw phw;
93112- int len = dev_parse_header(skb, phw.hw_addr);
93113+ int len;
93114+
93115+ memset(&phw, 0, sizeof(phw));
93116+ len = dev_parse_header(skb, phw.hw_addr);
93117 if (len > 0) {
93118 phw.hw_addrlen = htons(len);
93119 if (nla_put(inst->skb, NFULA_HWADDR, sizeof(phw), &phw))
93120@@ -559,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
93121 /* global sequence number */
93122 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
93123 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
93124- htonl(atomic_inc_return(&log->global_seq))))
93125+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
93126 goto nla_put_failure;
93127
93128 if (data_len) {
93129diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
93130index 5352b2d..e0083ce 100644
93131--- a/net/netfilter/nfnetlink_queue_core.c
93132+++ b/net/netfilter/nfnetlink_queue_core.c
93133@@ -444,7 +444,10 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
93134 if (indev && entskb->dev &&
93135 entskb->mac_header != entskb->network_header) {
93136 struct nfqnl_msg_packet_hw phw;
93137- int len = dev_parse_header(entskb, phw.hw_addr);
93138+ int len;
93139+
93140+ memset(&phw, 0, sizeof(phw));
93141+ len = dev_parse_header(entskb, phw.hw_addr);
93142 if (len) {
93143 phw.hw_addrlen = htons(len);
93144 if (nla_put(skb, NFQA_HWADDR, sizeof(phw), &phw))
93145diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
93146index 7011c71..6113cc7 100644
93147--- a/net/netfilter/xt_TCPMSS.c
93148+++ b/net/netfilter/xt_TCPMSS.c
93149@@ -52,7 +52,8 @@ tcpmss_mangle_packet(struct sk_buff *skb,
93150 {
93151 const struct xt_tcpmss_info *info = par->targinfo;
93152 struct tcphdr *tcph;
93153- unsigned int tcplen, i;
93154+ int len, tcp_hdrlen;
93155+ unsigned int i;
93156 __be16 oldval;
93157 u16 newmss;
93158 u8 *opt;
93159@@ -64,11 +65,14 @@ tcpmss_mangle_packet(struct sk_buff *skb,
93160 if (!skb_make_writable(skb, skb->len))
93161 return -1;
93162
93163- tcplen = skb->len - tcphoff;
93164+ len = skb->len - tcphoff;
93165+ if (len < (int)sizeof(struct tcphdr))
93166+ return -1;
93167+
93168 tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff);
93169+ tcp_hdrlen = tcph->doff * 4;
93170
93171- /* Header cannot be larger than the packet */
93172- if (tcplen < tcph->doff*4)
93173+ if (len < tcp_hdrlen)
93174 return -1;
93175
93176 if (info->mss == XT_TCPMSS_CLAMP_PMTU) {
93177@@ -87,9 +91,8 @@ tcpmss_mangle_packet(struct sk_buff *skb,
93178 newmss = info->mss;
93179
93180 opt = (u_int8_t *)tcph;
93181- for (i = sizeof(struct tcphdr); i < tcph->doff*4; i += optlen(opt, i)) {
93182- if (opt[i] == TCPOPT_MSS && tcph->doff*4 - i >= TCPOLEN_MSS &&
93183- opt[i+1] == TCPOLEN_MSS) {
93184+ for (i = sizeof(struct tcphdr); i <= tcp_hdrlen - TCPOLEN_MSS; i += optlen(opt, i)) {
93185+ if (opt[i] == TCPOPT_MSS && opt[i+1] == TCPOLEN_MSS) {
93186 u_int16_t oldmss;
93187
93188 oldmss = (opt[i+2] << 8) | opt[i+3];
93189@@ -112,9 +115,10 @@ tcpmss_mangle_packet(struct sk_buff *skb,
93190 }
93191
93192 /* There is data after the header so the option can't be added
93193- without moving it, and doing so may make the SYN packet
93194- itself too large. Accept the packet unmodified instead. */
93195- if (tcplen > tcph->doff*4)
93196+ * without moving it, and doing so may make the SYN packet
93197+ * itself too large. Accept the packet unmodified instead.
93198+ */
93199+ if (len > tcp_hdrlen)
93200 return 0;
93201
93202 /*
93203@@ -143,10 +147,10 @@ tcpmss_mangle_packet(struct sk_buff *skb,
93204 newmss = min(newmss, (u16)1220);
93205
93206 opt = (u_int8_t *)tcph + sizeof(struct tcphdr);
93207- memmove(opt + TCPOLEN_MSS, opt, tcplen - sizeof(struct tcphdr));
93208+ memmove(opt + TCPOLEN_MSS, opt, len - sizeof(struct tcphdr));
93209
93210 inet_proto_csum_replace2(&tcph->check, skb,
93211- htons(tcplen), htons(tcplen + TCPOLEN_MSS), 1);
93212+ htons(len), htons(len + TCPOLEN_MSS), 1);
93213 opt[0] = TCPOPT_MSS;
93214 opt[1] = TCPOLEN_MSS;
93215 opt[2] = (newmss & 0xff00) >> 8;
93216diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c
93217index b68fa19..625fa1d 100644
93218--- a/net/netfilter/xt_TCPOPTSTRIP.c
93219+++ b/net/netfilter/xt_TCPOPTSTRIP.c
93220@@ -38,7 +38,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
93221 struct tcphdr *tcph;
93222 u_int16_t n, o;
93223 u_int8_t *opt;
93224- int len;
93225+ int len, tcp_hdrlen;
93226
93227 /* This is a fragment, no TCP header is available */
93228 if (par->fragoff != 0)
93229@@ -52,7 +52,9 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
93230 return NF_DROP;
93231
93232 tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff);
93233- if (tcph->doff * 4 > len)
93234+ tcp_hdrlen = tcph->doff * 4;
93235+
93236+ if (len < tcp_hdrlen)
93237 return NF_DROP;
93238
93239 opt = (u_int8_t *)tcph;
93240@@ -61,10 +63,10 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
93241 * Walk through all TCP options - if we find some option to remove,
93242 * set all octets to %TCPOPT_NOP and adjust checksum.
93243 */
93244- for (i = sizeof(struct tcphdr); i < tcp_hdrlen(skb); i += optl) {
93245+ for (i = sizeof(struct tcphdr); i < tcp_hdrlen - 1; i += optl) {
93246 optl = optlen(opt, i);
93247
93248- if (i + optl > tcp_hdrlen(skb))
93249+ if (i + optl > tcp_hdrlen)
93250 break;
93251
93252 if (!tcpoptstrip_test_bit(info->strip_bmap, opt[i]))
93253diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
93254new file mode 100644
93255index 0000000..c566332
93256--- /dev/null
93257+++ b/net/netfilter/xt_gradm.c
93258@@ -0,0 +1,51 @@
93259+/*
93260+ * gradm match for netfilter
93261