]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.0-3.15.4-201407081937.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-3.0-3.15.4-201407081937.patch
CommitLineData
c0cbd738
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index 9de9813..1462492 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -3,9 +3,11 @@
6 *.bc
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -15,6 +17,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -51,14 +54,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@@ -72,9 +78,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@@ -83,6 +91,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@@ -95,32 +104,40 @@ 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 crc32table.h*
90 cscope.*
91 defkeymap.c
92+devicetable-offsets.h
93 devlist.h*
94 dnotify_test
95 docproc
96 dslm
97+dtc-lexer.lex.c
98 elf2ecoff
99 elfconfig.h*
100 evergreen_reg_safe.h
101+exception_policy.conf
102 fixdep
103 flask.h
104 fore200e_mkfirm
105@@ -128,12 +145,15 @@ fore200e_pca_fw.c*
106 gconf
107 gconf.glade.h
108 gen-devlist
109+gen-kdb_cmds.c
110 gen_crc32table
111 gen_init_cpio
112 generated
113 genheaders
114 genksyms
115 *_gray256.c
116+hash
117+hid-example
118 hpet_example
119 hugepage-mmap
120 hugepage-shm
121@@ -148,14 +168,14 @@ int32.c
122 int4.c
123 int8.c
124 kallsyms
125-kconfig
126+kern_constants.h
127 keywords.c
128 ksym.c*
129 ksym.h*
130 kxgettext
131 lex.c
132 lex.*.c
133-linux
134+lib1funcs.S
135 logo_*.c
136 logo_*_clut224.c
137 logo_*_mono.c
138@@ -165,14 +185,15 @@ mach-types.h
139 machtypes.h
140 map
141 map_hugetlb
142-media
143 mconf
144+mdp
145 miboot*
146 mk_elfconfig
147 mkboot
148 mkbugboot
149 mkcpustr
150 mkdep
151+mkpiggy
152 mkprep
153 mkregtable
154 mktables
155@@ -188,6 +209,8 @@ oui.c*
156 page-types
157 parse.c
158 parse.h
159+parse-events*
160+pasyms.h
161 patches*
162 pca200e.bin
163 pca200e_ecd.bin2
164@@ -197,6 +220,7 @@ perf-archive
165 piggyback
166 piggy.gzip
167 piggy.S
168+pmu-*
169 pnmtologo
170 ppc_defs.h*
171 pss_boot.h
172@@ -206,7 +230,12 @@ r200_reg_safe.h
173 r300_reg_safe.h
174 r420_reg_safe.h
175 r600_reg_safe.h
176+randomize_layout_hash.h
177+randomize_layout_seed.h
178+realmode.lds
179+realmode.relocs
180 recordmcount
181+regdb.c
182 relocs
183 rlim_names.h
184 rn50_reg_safe.h
185@@ -216,8 +245,12 @@ series
186 setup
187 setup.bin
188 setup.elf
189+signing_key*
190+size_overflow_hash.h
191 sImage
192+slabinfo
193 sm_tbl*
194+sortextable
195 split-include
196 syscalltab.h
197 tables.c
198@@ -227,6 +260,7 @@ tftpboot.img
199 timeconst.h
200 times.h*
201 trix_boot.h
202+user_constants.h
203 utsrelease.h*
204 vdso-syms.lds
205 vdso.lds
206@@ -238,13 +272,17 @@ vdso32.lds
207 vdso32.so.dbg
208 vdso64.lds
209 vdso64.so.dbg
210+vdsox32.lds
211+vdsox32-syms.lds
212 version.h*
213 vmImage
214 vmlinux
215 vmlinux-*
216 vmlinux.aout
217 vmlinux.bin.all
218+vmlinux.bin.bz2
219 vmlinux.lds
220+vmlinux.relocs
221 vmlinuz
222 voffset.h
223 vsyscall.lds
224@@ -252,9 +290,12 @@ vsyscall_32.lds
225 wanxlfw.inc
226 uImage
227 unifdef
228+utsrelease.h
229 wakeup.bin
230 wakeup.elf
231 wakeup.lds
232+x509*
233 zImage*
234 zconf.hash.c
235+zconf.lex.c
236 zoffset.h
237diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
238index 30a8ad0d..2ed9efd 100644
239--- a/Documentation/kernel-parameters.txt
240+++ b/Documentation/kernel-parameters.txt
241@@ -1103,6 +1103,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
242 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
243 Default: 1024
244
245+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
246+ ignore grsecurity's /proc restrictions
247+
248+
249 hashdist= [KNL,NUMA] Large hashes allocated during boot
250 are distributed across NUMA nodes. Defaults on
251 for 64-bit NUMA, off otherwise.
252@@ -2099,6 +2103,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
253 noexec=on: enable non-executable mappings (default)
254 noexec=off: disable non-executable mappings
255
256+ nopcid [X86-64]
257+ Disable PCID (Process-Context IDentifier) even if it
258+ is supported by the processor.
259+
260 nosmap [X86]
261 Disable SMAP (Supervisor Mode Access Prevention)
262 even if it is supported by processor.
263@@ -2366,6 +2374,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
264 the specified number of seconds. This is to be used if
265 your oopses keep scrolling off the screen.
266
267+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
268+ virtualization environments that don't cope well with the
269+ expand down segment used by UDEREF on X86-32 or the frequent
270+ page table updates on X86-64.
271+
272+ pax_sanitize_slab=
273+ 0/1 to disable/enable slab object sanitization (enabled by
274+ default).
275+
276+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
277+
278+ pax_extra_latent_entropy
279+ Enable a very simple form of latent entropy extraction
280+ from the first 4GB of memory as the bootmem allocator
281+ passes the memory pages to the buddy allocator.
282+
283+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
284+ when the processor supports PCID.
285+
286 pcbit= [HW,ISDN]
287
288 pcd. [PARIDE]
289diff --git a/Makefile b/Makefile
290index 25ecc1d..184bee9 100644
291--- a/Makefile
292+++ b/Makefile
293@@ -246,7 +246,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
294 HOSTCC = gcc
295 HOSTCXX = g++
296 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
297-HOSTCXXFLAGS = -O2
298+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
299+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
300+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
301
302 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
303 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
304@@ -438,8 +440,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
305 # Rules shared between *config targets and build targets
306
307 # Basic helpers built in scripts/
308-PHONY += scripts_basic
309-scripts_basic:
310+PHONY += scripts_basic gcc-plugins
311+scripts_basic: gcc-plugins
312 $(Q)$(MAKE) $(build)=scripts/basic
313 $(Q)rm -f .tmp_quiet_recordmcount
314
315@@ -600,6 +602,72 @@ else
316 KBUILD_CFLAGS += -O2
317 endif
318
319+ifndef DISABLE_PAX_PLUGINS
320+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
321+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
322+else
323+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
324+endif
325+ifneq ($(PLUGINCC),)
326+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
327+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
328+endif
329+ifdef CONFIG_PAX_MEMORY_STACKLEAK
330+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
331+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
332+endif
333+ifdef CONFIG_KALLOCSTAT_PLUGIN
334+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
335+endif
336+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
337+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
338+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
339+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
340+endif
341+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
342+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
343+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
344+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
345+endif
346+endif
347+ifdef CONFIG_CHECKER_PLUGIN
348+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
349+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
350+endif
351+endif
352+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
353+ifdef CONFIG_PAX_SIZE_OVERFLOW
354+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
355+endif
356+ifdef CONFIG_PAX_LATENT_ENTROPY
357+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
358+endif
359+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
360+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
361+endif
362+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
363+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
364+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
365+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
366+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
367+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
368+ifeq ($(KBUILD_EXTMOD),)
369+gcc-plugins:
370+ $(Q)$(MAKE) $(build)=tools/gcc
371+else
372+gcc-plugins: ;
373+endif
374+else
375+gcc-plugins:
376+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
377+ $(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.))
378+else
379+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
380+endif
381+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
382+endif
383+endif
384+
385 include $(srctree)/arch/$(SRCARCH)/Makefile
386
387 ifdef CONFIG_READABLE_ASM
388@@ -816,7 +884,7 @@ export mod_sign_cmd
389
390
391 ifeq ($(KBUILD_EXTMOD),)
392-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
393+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
394
395 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
396 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
397@@ -865,6 +933,8 @@ endif
398
399 # The actual objects are generated when descending,
400 # make sure no implicit rule kicks in
401+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
402+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
403 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
404
405 # Handle descending into subdirectories listed in $(vmlinux-dirs)
406@@ -874,7 +944,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
407 # Error messages still appears in the original language
408
409 PHONY += $(vmlinux-dirs)
410-$(vmlinux-dirs): prepare scripts
411+$(vmlinux-dirs): gcc-plugins prepare scripts
412 $(Q)$(MAKE) $(build)=$@
413
414 define filechk_kernel.release
415@@ -917,10 +987,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
416
417 archprepare: archheaders archscripts prepare1 scripts_basic
418
419+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
420+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
421 prepare0: archprepare FORCE
422 $(Q)$(MAKE) $(build)=.
423
424 # All the preparing..
425+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
426 prepare: prepare0
427
428 # Generate some files
429@@ -1028,6 +1101,8 @@ all: modules
430 # using awk while concatenating to the final file.
431
432 PHONY += modules
433+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
434+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
435 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
436 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
437 @$(kecho) ' Building modules, stage 2.';
438@@ -1043,7 +1118,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
439
440 # Target to prepare building external modules
441 PHONY += modules_prepare
442-modules_prepare: prepare scripts
443+modules_prepare: gcc-plugins prepare scripts
444
445 # Target to install modules
446 PHONY += modules_install
447@@ -1109,7 +1184,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
448 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
449 signing_key.priv signing_key.x509 x509.genkey \
450 extra_certificates signing_key.x509.keyid \
451- signing_key.x509.signer include/linux/version.h
452+ signing_key.x509.signer include/linux/version.h \
453+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
454+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
455+ tools/gcc/randomize_layout_seed.h
456
457 # clean - Delete most, but leave enough to build external modules
458 #
459@@ -1148,7 +1226,7 @@ distclean: mrproper
460 @find $(srctree) $(RCS_FIND_IGNORE) \
461 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
462 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
463- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
464+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
465 -type f -print | xargs rm -f
466
467
468@@ -1309,6 +1387,8 @@ PHONY += $(module-dirs) modules
469 $(module-dirs): crmodverdir $(objtree)/Module.symvers
470 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
471
472+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
473+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
474 modules: $(module-dirs)
475 @$(kecho) ' Building modules, stage 2.';
476 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
477@@ -1448,17 +1528,21 @@ else
478 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
479 endif
480
481-%.s: %.c prepare scripts FORCE
482+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
483+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
484+%.s: %.c gcc-plugins prepare scripts FORCE
485 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
486 %.i: %.c prepare scripts FORCE
487 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
488-%.o: %.c prepare scripts FORCE
489+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
490+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
491+%.o: %.c gcc-plugins prepare scripts FORCE
492 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
493 %.lst: %.c prepare scripts FORCE
494 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
495-%.s: %.S prepare scripts FORCE
496+%.s: %.S gcc-plugins prepare scripts FORCE
497 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
498-%.o: %.S prepare scripts FORCE
499+%.o: %.S gcc-plugins prepare scripts FORCE
500 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
501 %.symtypes: %.c prepare scripts FORCE
502 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
503@@ -1468,11 +1552,15 @@ endif
504 $(cmd_crmodverdir)
505 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
506 $(build)=$(build-dir)
507-%/: prepare scripts FORCE
508+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
509+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
510+%/: gcc-plugins prepare scripts FORCE
511 $(cmd_crmodverdir)
512 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
513 $(build)=$(build-dir)
514-%.ko: prepare scripts FORCE
515+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
516+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
517+%.ko: gcc-plugins prepare scripts FORCE
518 $(cmd_crmodverdir)
519 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
520 $(build)=$(build-dir) $(@:.ko=.o)
521diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
522index 78b03ef..da28a51 100644
523--- a/arch/alpha/include/asm/atomic.h
524+++ b/arch/alpha/include/asm/atomic.h
525@@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
526 #define atomic_dec(v) atomic_sub(1,(v))
527 #define atomic64_dec(v) atomic64_sub(1,(v))
528
529+#define atomic64_read_unchecked(v) atomic64_read(v)
530+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
531+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
532+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
533+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
534+#define atomic64_inc_unchecked(v) atomic64_inc(v)
535+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
536+#define atomic64_dec_unchecked(v) atomic64_dec(v)
537+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
538+
539 #define smp_mb__before_atomic_dec() smp_mb()
540 #define smp_mb__after_atomic_dec() smp_mb()
541 #define smp_mb__before_atomic_inc() smp_mb()
542diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
543index ad368a9..fbe0f25 100644
544--- a/arch/alpha/include/asm/cache.h
545+++ b/arch/alpha/include/asm/cache.h
546@@ -4,19 +4,19 @@
547 #ifndef __ARCH_ALPHA_CACHE_H
548 #define __ARCH_ALPHA_CACHE_H
549
550+#include <linux/const.h>
551
552 /* Bytes per L1 (data) cache line. */
553 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
554-# define L1_CACHE_BYTES 64
555 # define L1_CACHE_SHIFT 6
556 #else
557 /* Both EV4 and EV5 are write-through, read-allocate,
558 direct-mapped, physical.
559 */
560-# define L1_CACHE_BYTES 32
561 # define L1_CACHE_SHIFT 5
562 #endif
563
564+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
565 #define SMP_CACHE_BYTES L1_CACHE_BYTES
566
567 #endif
568diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
569index 968d999..d36b2df 100644
570--- a/arch/alpha/include/asm/elf.h
571+++ b/arch/alpha/include/asm/elf.h
572@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
573
574 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
575
576+#ifdef CONFIG_PAX_ASLR
577+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
578+
579+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
580+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
581+#endif
582+
583 /* $0 is set by ld.so to a pointer to a function which might be
584 registered using atexit. This provides a mean for the dynamic
585 linker to call DT_FINI functions for shared libraries that have
586diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
587index aab14a0..b4fa3e7 100644
588--- a/arch/alpha/include/asm/pgalloc.h
589+++ b/arch/alpha/include/asm/pgalloc.h
590@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
591 pgd_set(pgd, pmd);
592 }
593
594+static inline void
595+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
596+{
597+ pgd_populate(mm, pgd, pmd);
598+}
599+
600 extern pgd_t *pgd_alloc(struct mm_struct *mm);
601
602 static inline void
603diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
604index d8f9b7e..f6222fa 100644
605--- a/arch/alpha/include/asm/pgtable.h
606+++ b/arch/alpha/include/asm/pgtable.h
607@@ -102,6 +102,17 @@ struct vm_area_struct;
608 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
609 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
610 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
611+
612+#ifdef CONFIG_PAX_PAGEEXEC
613+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
614+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
615+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
616+#else
617+# define PAGE_SHARED_NOEXEC PAGE_SHARED
618+# define PAGE_COPY_NOEXEC PAGE_COPY
619+# define PAGE_READONLY_NOEXEC PAGE_READONLY
620+#endif
621+
622 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
623
624 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
625diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
626index 2fd00b7..cfd5069 100644
627--- a/arch/alpha/kernel/module.c
628+++ b/arch/alpha/kernel/module.c
629@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
630
631 /* The small sections were sorted to the end of the segment.
632 The following should definitely cover them. */
633- gp = (u64)me->module_core + me->core_size - 0x8000;
634+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
635 got = sechdrs[me->arch.gotsecindex].sh_addr;
636
637 for (i = 0; i < n; i++) {
638diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
639index 1402fcc..0b1abd2 100644
640--- a/arch/alpha/kernel/osf_sys.c
641+++ b/arch/alpha/kernel/osf_sys.c
642@@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
643 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
644
645 static unsigned long
646-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
647- unsigned long limit)
648+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
649+ unsigned long limit, unsigned long flags)
650 {
651 struct vm_unmapped_area_info info;
652+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
653
654 info.flags = 0;
655 info.length = len;
656@@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
657 info.high_limit = limit;
658 info.align_mask = 0;
659 info.align_offset = 0;
660+ info.threadstack_offset = offset;
661 return vm_unmapped_area(&info);
662 }
663
664@@ -1341,20 +1343,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
665 merely specific addresses, but regions of memory -- perhaps
666 this feature should be incorporated into all ports? */
667
668+#ifdef CONFIG_PAX_RANDMMAP
669+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
670+#endif
671+
672 if (addr) {
673- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
674+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
675 if (addr != (unsigned long) -ENOMEM)
676 return addr;
677 }
678
679 /* Next, try allocating at TASK_UNMAPPED_BASE. */
680- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
681- len, limit);
682+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
683+
684 if (addr != (unsigned long) -ENOMEM)
685 return addr;
686
687 /* Finally, try allocating in low memory. */
688- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
689+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
690
691 return addr;
692 }
693diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
694index 98838a0..b304fb4 100644
695--- a/arch/alpha/mm/fault.c
696+++ b/arch/alpha/mm/fault.c
697@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
698 __reload_thread(pcb);
699 }
700
701+#ifdef CONFIG_PAX_PAGEEXEC
702+/*
703+ * PaX: decide what to do with offenders (regs->pc = fault address)
704+ *
705+ * returns 1 when task should be killed
706+ * 2 when patched PLT trampoline was detected
707+ * 3 when unpatched PLT trampoline was detected
708+ */
709+static int pax_handle_fetch_fault(struct pt_regs *regs)
710+{
711+
712+#ifdef CONFIG_PAX_EMUPLT
713+ int err;
714+
715+ do { /* PaX: patched PLT emulation #1 */
716+ unsigned int ldah, ldq, jmp;
717+
718+ err = get_user(ldah, (unsigned int *)regs->pc);
719+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
720+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
721+
722+ if (err)
723+ break;
724+
725+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
726+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
727+ jmp == 0x6BFB0000U)
728+ {
729+ unsigned long r27, addr;
730+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
731+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
732+
733+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
734+ err = get_user(r27, (unsigned long *)addr);
735+ if (err)
736+ break;
737+
738+ regs->r27 = r27;
739+ regs->pc = r27;
740+ return 2;
741+ }
742+ } while (0);
743+
744+ do { /* PaX: patched PLT emulation #2 */
745+ unsigned int ldah, lda, br;
746+
747+ err = get_user(ldah, (unsigned int *)regs->pc);
748+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
749+ err |= get_user(br, (unsigned int *)(regs->pc+8));
750+
751+ if (err)
752+ break;
753+
754+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
755+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
756+ (br & 0xFFE00000U) == 0xC3E00000U)
757+ {
758+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
759+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
760+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
761+
762+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
763+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
764+ return 2;
765+ }
766+ } while (0);
767+
768+ do { /* PaX: unpatched PLT emulation */
769+ unsigned int br;
770+
771+ err = get_user(br, (unsigned int *)regs->pc);
772+
773+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
774+ unsigned int br2, ldq, nop, jmp;
775+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
776+
777+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
778+ err = get_user(br2, (unsigned int *)addr);
779+ err |= get_user(ldq, (unsigned int *)(addr+4));
780+ err |= get_user(nop, (unsigned int *)(addr+8));
781+ err |= get_user(jmp, (unsigned int *)(addr+12));
782+ err |= get_user(resolver, (unsigned long *)(addr+16));
783+
784+ if (err)
785+ break;
786+
787+ if (br2 == 0xC3600000U &&
788+ ldq == 0xA77B000CU &&
789+ nop == 0x47FF041FU &&
790+ jmp == 0x6B7B0000U)
791+ {
792+ regs->r28 = regs->pc+4;
793+ regs->r27 = addr+16;
794+ regs->pc = resolver;
795+ return 3;
796+ }
797+ }
798+ } while (0);
799+#endif
800+
801+ return 1;
802+}
803+
804+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
805+{
806+ unsigned long i;
807+
808+ printk(KERN_ERR "PAX: bytes at PC: ");
809+ for (i = 0; i < 5; i++) {
810+ unsigned int c;
811+ if (get_user(c, (unsigned int *)pc+i))
812+ printk(KERN_CONT "???????? ");
813+ else
814+ printk(KERN_CONT "%08x ", c);
815+ }
816+ printk("\n");
817+}
818+#endif
819
820 /*
821 * This routine handles page faults. It determines the address,
822@@ -133,8 +251,29 @@ retry:
823 good_area:
824 si_code = SEGV_ACCERR;
825 if (cause < 0) {
826- if (!(vma->vm_flags & VM_EXEC))
827+ if (!(vma->vm_flags & VM_EXEC)) {
828+
829+#ifdef CONFIG_PAX_PAGEEXEC
830+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
831+ goto bad_area;
832+
833+ up_read(&mm->mmap_sem);
834+ switch (pax_handle_fetch_fault(regs)) {
835+
836+#ifdef CONFIG_PAX_EMUPLT
837+ case 2:
838+ case 3:
839+ return;
840+#endif
841+
842+ }
843+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
844+ do_group_exit(SIGKILL);
845+#else
846 goto bad_area;
847+#endif
848+
849+ }
850 } else if (!cause) {
851 /* Allow reads even for write-only mappings */
852 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
853diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
854index db3c541..a1acc89 100644
855--- a/arch/arm/Kconfig
856+++ b/arch/arm/Kconfig
857@@ -1877,7 +1877,7 @@ config ALIGNMENT_TRAP
858
859 config UACCESS_WITH_MEMCPY
860 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
861- depends on MMU
862+ depends on MMU && !PAX_MEMORY_UDEREF
863 default y if CPU_FEROCEON
864 help
865 Implement faster copy_to_user and clear_user methods for CPU
866@@ -2141,6 +2141,7 @@ config XIP_PHYS_ADDR
867 config KEXEC
868 bool "Kexec system call (EXPERIMENTAL)"
869 depends on (!SMP || PM_SLEEP_SMP)
870+ depends on !GRKERNSEC_KMEM
871 help
872 kexec is a system call that implements the ability to shutdown your
873 current kernel, and to start another kernel. It is like a reboot
874diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
875index 9a92fd7..3502a80 100644
876--- a/arch/arm/include/asm/atomic.h
877+++ b/arch/arm/include/asm/atomic.h
878@@ -18,17 +18,35 @@
879 #include <asm/barrier.h>
880 #include <asm/cmpxchg.h>
881
882+#ifdef CONFIG_GENERIC_ATOMIC64
883+#include <asm-generic/atomic64.h>
884+#endif
885+
886 #define ATOMIC_INIT(i) { (i) }
887
888 #ifdef __KERNEL__
889
890+#define _ASM_EXTABLE(from, to) \
891+" .pushsection __ex_table,\"a\"\n"\
892+" .align 3\n" \
893+" .long " #from ", " #to"\n" \
894+" .popsection"
895+
896 /*
897 * On ARM, ordinary assignment (str instruction) doesn't clear the local
898 * strex/ldrex monitor on some implementations. The reason we can use it for
899 * atomic_set() is the clrex or dummy strex done on every exception return.
900 */
901 #define atomic_read(v) (*(volatile int *)&(v)->counter)
902+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
903+{
904+ return v->counter;
905+}
906 #define atomic_set(v,i) (((v)->counter) = (i))
907+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
908+{
909+ v->counter = i;
910+}
911
912 #if __LINUX_ARM_ARCH__ >= 6
913
914@@ -44,6 +62,36 @@ static inline void atomic_add(int i, atomic_t *v)
915
916 prefetchw(&v->counter);
917 __asm__ __volatile__("@ atomic_add\n"
918+"1: ldrex %1, [%3]\n"
919+" adds %0, %1, %4\n"
920+
921+#ifdef CONFIG_PAX_REFCOUNT
922+" bvc 3f\n"
923+"2: bkpt 0xf103\n"
924+"3:\n"
925+#endif
926+
927+" strex %1, %0, [%3]\n"
928+" teq %1, #0\n"
929+" bne 1b"
930+
931+#ifdef CONFIG_PAX_REFCOUNT
932+"\n4:\n"
933+ _ASM_EXTABLE(2b, 4b)
934+#endif
935+
936+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
937+ : "r" (&v->counter), "Ir" (i)
938+ : "cc");
939+}
940+
941+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
942+{
943+ unsigned long tmp;
944+ int result;
945+
946+ prefetchw(&v->counter);
947+ __asm__ __volatile__("@ atomic_add_unchecked\n"
948 "1: ldrex %0, [%3]\n"
949 " add %0, %0, %4\n"
950 " strex %1, %0, [%3]\n"
951@@ -63,6 +111,43 @@ static inline int atomic_add_return(int i, atomic_t *v)
952 prefetchw(&v->counter);
953
954 __asm__ __volatile__("@ atomic_add_return\n"
955+"1: ldrex %1, [%3]\n"
956+" adds %0, %1, %4\n"
957+
958+#ifdef CONFIG_PAX_REFCOUNT
959+" bvc 3f\n"
960+" mov %0, %1\n"
961+"2: bkpt 0xf103\n"
962+"3:\n"
963+#endif
964+
965+" strex %1, %0, [%3]\n"
966+" teq %1, #0\n"
967+" bne 1b"
968+
969+#ifdef CONFIG_PAX_REFCOUNT
970+"\n4:\n"
971+ _ASM_EXTABLE(2b, 4b)
972+#endif
973+
974+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
975+ : "r" (&v->counter), "Ir" (i)
976+ : "cc");
977+
978+ smp_mb();
979+
980+ return result;
981+}
982+
983+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
984+{
985+ unsigned long tmp;
986+ int result;
987+
988+ smp_mb();
989+ prefetchw(&v->counter);
990+
991+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
992 "1: ldrex %0, [%3]\n"
993 " add %0, %0, %4\n"
994 " strex %1, %0, [%3]\n"
995@@ -84,6 +169,36 @@ static inline void atomic_sub(int i, atomic_t *v)
996
997 prefetchw(&v->counter);
998 __asm__ __volatile__("@ atomic_sub\n"
999+"1: ldrex %1, [%3]\n"
1000+" subs %0, %1, %4\n"
1001+
1002+#ifdef CONFIG_PAX_REFCOUNT
1003+" bvc 3f\n"
1004+"2: bkpt 0xf103\n"
1005+"3:\n"
1006+#endif
1007+
1008+" strex %1, %0, [%3]\n"
1009+" teq %1, #0\n"
1010+" bne 1b"
1011+
1012+#ifdef CONFIG_PAX_REFCOUNT
1013+"\n4:\n"
1014+ _ASM_EXTABLE(2b, 4b)
1015+#endif
1016+
1017+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1018+ : "r" (&v->counter), "Ir" (i)
1019+ : "cc");
1020+}
1021+
1022+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1023+{
1024+ unsigned long tmp;
1025+ int result;
1026+
1027+ prefetchw(&v->counter);
1028+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
1029 "1: ldrex %0, [%3]\n"
1030 " sub %0, %0, %4\n"
1031 " strex %1, %0, [%3]\n"
1032@@ -103,11 +218,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1033 prefetchw(&v->counter);
1034
1035 __asm__ __volatile__("@ atomic_sub_return\n"
1036-"1: ldrex %0, [%3]\n"
1037-" sub %0, %0, %4\n"
1038+"1: ldrex %1, [%3]\n"
1039+" subs %0, %1, %4\n"
1040+
1041+#ifdef CONFIG_PAX_REFCOUNT
1042+" bvc 3f\n"
1043+" mov %0, %1\n"
1044+"2: bkpt 0xf103\n"
1045+"3:\n"
1046+#endif
1047+
1048 " strex %1, %0, [%3]\n"
1049 " teq %1, #0\n"
1050 " bne 1b"
1051+
1052+#ifdef CONFIG_PAX_REFCOUNT
1053+"\n4:\n"
1054+ _ASM_EXTABLE(2b, 4b)
1055+#endif
1056+
1057 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1058 : "r" (&v->counter), "Ir" (i)
1059 : "cc");
1060@@ -152,12 +281,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1061 __asm__ __volatile__ ("@ atomic_add_unless\n"
1062 "1: ldrex %0, [%4]\n"
1063 " teq %0, %5\n"
1064-" beq 2f\n"
1065-" add %1, %0, %6\n"
1066+" beq 4f\n"
1067+" adds %1, %0, %6\n"
1068+
1069+#ifdef CONFIG_PAX_REFCOUNT
1070+" bvc 3f\n"
1071+"2: bkpt 0xf103\n"
1072+"3:\n"
1073+#endif
1074+
1075 " strex %2, %1, [%4]\n"
1076 " teq %2, #0\n"
1077 " bne 1b\n"
1078-"2:"
1079+"4:"
1080+
1081+#ifdef CONFIG_PAX_REFCOUNT
1082+ _ASM_EXTABLE(2b, 4b)
1083+#endif
1084+
1085 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1086 : "r" (&v->counter), "r" (u), "r" (a)
1087 : "cc");
1088@@ -168,6 +309,28 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1089 return oldval;
1090 }
1091
1092+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1093+{
1094+ unsigned long oldval, res;
1095+
1096+ smp_mb();
1097+
1098+ do {
1099+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1100+ "ldrex %1, [%3]\n"
1101+ "mov %0, #0\n"
1102+ "teq %1, %4\n"
1103+ "strexeq %0, %5, [%3]\n"
1104+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1105+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1106+ : "cc");
1107+ } while (res);
1108+
1109+ smp_mb();
1110+
1111+ return oldval;
1112+}
1113+
1114 #else /* ARM_ARCH_6 */
1115
1116 #ifdef CONFIG_SMP
1117@@ -186,7 +349,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
1118
1119 return val;
1120 }
1121+
1122+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
1123+{
1124+ return atomic_add_return(i, v);
1125+}
1126+
1127 #define atomic_add(i, v) (void) atomic_add_return(i, v)
1128+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1129+{
1130+ (void) atomic_add_return(i, v);
1131+}
1132
1133 static inline int atomic_sub_return(int i, atomic_t *v)
1134 {
1135@@ -201,6 +374,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1136 return val;
1137 }
1138 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1139+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1140+{
1141+ (void) atomic_sub_return(i, v);
1142+}
1143
1144 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1145 {
1146@@ -216,6 +393,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1147 return ret;
1148 }
1149
1150+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1151+{
1152+ return atomic_cmpxchg(v, old, new);
1153+}
1154+
1155 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1156 {
1157 int c, old;
1158@@ -229,13 +411,33 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1159 #endif /* __LINUX_ARM_ARCH__ */
1160
1161 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1162+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1163+{
1164+ return xchg(&v->counter, new);
1165+}
1166
1167 #define atomic_inc(v) atomic_add(1, v)
1168+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1169+{
1170+ atomic_add_unchecked(1, v);
1171+}
1172 #define atomic_dec(v) atomic_sub(1, v)
1173+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1174+{
1175+ atomic_sub_unchecked(1, v);
1176+}
1177
1178 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1179+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1180+{
1181+ return atomic_add_return_unchecked(1, v) == 0;
1182+}
1183 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1184 #define atomic_inc_return(v) (atomic_add_return(1, v))
1185+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1186+{
1187+ return atomic_add_return_unchecked(1, v);
1188+}
1189 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1190 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1191
1192@@ -251,6 +453,14 @@ typedef struct {
1193 long long counter;
1194 } atomic64_t;
1195
1196+#ifdef CONFIG_PAX_REFCOUNT
1197+typedef struct {
1198+ long long counter;
1199+} atomic64_unchecked_t;
1200+#else
1201+typedef atomic64_t atomic64_unchecked_t;
1202+#endif
1203+
1204 #define ATOMIC64_INIT(i) { (i) }
1205
1206 #ifdef CONFIG_ARM_LPAE
1207@@ -267,6 +477,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1208 return result;
1209 }
1210
1211+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1212+{
1213+ long long result;
1214+
1215+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1216+" ldrd %0, %H0, [%1]"
1217+ : "=&r" (result)
1218+ : "r" (&v->counter), "Qo" (v->counter)
1219+ );
1220+
1221+ return result;
1222+}
1223+
1224 static inline void atomic64_set(atomic64_t *v, long long i)
1225 {
1226 __asm__ __volatile__("@ atomic64_set\n"
1227@@ -275,6 +498,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1228 : "r" (&v->counter), "r" (i)
1229 );
1230 }
1231+
1232+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1233+{
1234+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1235+" strd %2, %H2, [%1]"
1236+ : "=Qo" (v->counter)
1237+ : "r" (&v->counter), "r" (i)
1238+ );
1239+}
1240 #else
1241 static inline long long atomic64_read(const atomic64_t *v)
1242 {
1243@@ -289,6 +521,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1244 return result;
1245 }
1246
1247+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1248+{
1249+ long long result;
1250+
1251+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1252+" ldrexd %0, %H0, [%1]"
1253+ : "=&r" (result)
1254+ : "r" (&v->counter), "Qo" (v->counter)
1255+ );
1256+
1257+ return result;
1258+}
1259+
1260 static inline void atomic64_set(atomic64_t *v, long long i)
1261 {
1262 long long tmp;
1263@@ -303,6 +548,21 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1264 : "r" (&v->counter), "r" (i)
1265 : "cc");
1266 }
1267+
1268+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1269+{
1270+ long long tmp;
1271+
1272+ prefetchw(&v->counter);
1273+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1274+"1: ldrexd %0, %H0, [%2]\n"
1275+" strexd %0, %3, %H3, [%2]\n"
1276+" teq %0, #0\n"
1277+" bne 1b"
1278+ : "=&r" (tmp), "=Qo" (v->counter)
1279+ : "r" (&v->counter), "r" (i)
1280+ : "cc");
1281+}
1282 #endif
1283
1284 static inline void atomic64_add(long long i, atomic64_t *v)
1285@@ -314,6 +574,37 @@ static inline void atomic64_add(long long i, atomic64_t *v)
1286 __asm__ __volatile__("@ atomic64_add\n"
1287 "1: ldrexd %0, %H0, [%3]\n"
1288 " adds %Q0, %Q0, %Q4\n"
1289+" adcs %R0, %R0, %R4\n"
1290+
1291+#ifdef CONFIG_PAX_REFCOUNT
1292+" bvc 3f\n"
1293+"2: bkpt 0xf103\n"
1294+"3:\n"
1295+#endif
1296+
1297+" strexd %1, %0, %H0, [%3]\n"
1298+" teq %1, #0\n"
1299+" bne 1b"
1300+
1301+#ifdef CONFIG_PAX_REFCOUNT
1302+"\n4:\n"
1303+ _ASM_EXTABLE(2b, 4b)
1304+#endif
1305+
1306+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1307+ : "r" (&v->counter), "r" (i)
1308+ : "cc");
1309+}
1310+
1311+static inline void atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
1312+{
1313+ long long result;
1314+ unsigned long tmp;
1315+
1316+ prefetchw(&v->counter);
1317+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1318+"1: ldrexd %0, %H0, [%3]\n"
1319+" adds %Q0, %Q0, %Q4\n"
1320 " adc %R0, %R0, %R4\n"
1321 " strexd %1, %0, %H0, [%3]\n"
1322 " teq %1, #0\n"
1323@@ -334,6 +625,44 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
1324 __asm__ __volatile__("@ atomic64_add_return\n"
1325 "1: ldrexd %0, %H0, [%3]\n"
1326 " adds %Q0, %Q0, %Q4\n"
1327+" adcs %R0, %R0, %R4\n"
1328+
1329+#ifdef CONFIG_PAX_REFCOUNT
1330+" bvc 3f\n"
1331+" mov %0, %1\n"
1332+" mov %H0, %H1\n"
1333+"2: bkpt 0xf103\n"
1334+"3:\n"
1335+#endif
1336+
1337+" strexd %1, %0, %H0, [%3]\n"
1338+" teq %1, #0\n"
1339+" bne 1b"
1340+
1341+#ifdef CONFIG_PAX_REFCOUNT
1342+"\n4:\n"
1343+ _ASM_EXTABLE(2b, 4b)
1344+#endif
1345+
1346+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1347+ : "r" (&v->counter), "r" (i)
1348+ : "cc");
1349+
1350+ smp_mb();
1351+
1352+ return result;
1353+}
1354+
1355+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
1356+{
1357+ long long result;
1358+ unsigned long tmp;
1359+
1360+ smp_mb();
1361+
1362+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1363+"1: ldrexd %0, %H0, [%3]\n"
1364+" adds %Q0, %Q0, %Q4\n"
1365 " adc %R0, %R0, %R4\n"
1366 " strexd %1, %0, %H0, [%3]\n"
1367 " teq %1, #0\n"
1368@@ -356,6 +685,37 @@ static inline void atomic64_sub(long long i, atomic64_t *v)
1369 __asm__ __volatile__("@ atomic64_sub\n"
1370 "1: ldrexd %0, %H0, [%3]\n"
1371 " subs %Q0, %Q0, %Q4\n"
1372+" sbcs %R0, %R0, %R4\n"
1373+
1374+#ifdef CONFIG_PAX_REFCOUNT
1375+" bvc 3f\n"
1376+"2: bkpt 0xf103\n"
1377+"3:\n"
1378+#endif
1379+
1380+" strexd %1, %0, %H0, [%3]\n"
1381+" teq %1, #0\n"
1382+" bne 1b"
1383+
1384+#ifdef CONFIG_PAX_REFCOUNT
1385+"\n4:\n"
1386+ _ASM_EXTABLE(2b, 4b)
1387+#endif
1388+
1389+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1390+ : "r" (&v->counter), "r" (i)
1391+ : "cc");
1392+}
1393+
1394+static inline void atomic64_sub_unchecked(long long i, atomic64_unchecked_t *v)
1395+{
1396+ long long result;
1397+ unsigned long tmp;
1398+
1399+ prefetchw(&v->counter);
1400+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1401+"1: ldrexd %0, %H0, [%3]\n"
1402+" subs %Q0, %Q0, %Q4\n"
1403 " sbc %R0, %R0, %R4\n"
1404 " strexd %1, %0, %H0, [%3]\n"
1405 " teq %1, #0\n"
1406@@ -376,16 +736,29 @@ static inline long long atomic64_sub_return(long long i, atomic64_t *v)
1407 __asm__ __volatile__("@ atomic64_sub_return\n"
1408 "1: ldrexd %0, %H0, [%3]\n"
1409 " subs %Q0, %Q0, %Q4\n"
1410-" sbc %R0, %R0, %R4\n"
1411+" sbcs %R0, %R0, %R4\n"
1412+
1413+#ifdef CONFIG_PAX_REFCOUNT
1414+" bvc 3f\n"
1415+" mov %0, %1\n"
1416+" mov %H0, %H1\n"
1417+"2: bkpt 0xf103\n"
1418+"3:\n"
1419+#endif
1420+
1421 " strexd %1, %0, %H0, [%3]\n"
1422 " teq %1, #0\n"
1423 " bne 1b"
1424+
1425+#ifdef CONFIG_PAX_REFCOUNT
1426+"\n4:\n"
1427+ _ASM_EXTABLE(2b, 4b)
1428+#endif
1429+
1430 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1431 : "r" (&v->counter), "r" (i)
1432 : "cc");
1433
1434- smp_mb();
1435-
1436 return result;
1437 }
1438
1439@@ -415,6 +788,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1440 return oldval;
1441 }
1442
1443+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1444+ long long new)
1445+{
1446+ long long oldval;
1447+ unsigned long res;
1448+
1449+ smp_mb();
1450+
1451+ do {
1452+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1453+ "ldrexd %1, %H1, [%3]\n"
1454+ "mov %0, #0\n"
1455+ "teq %1, %4\n"
1456+ "teqeq %H1, %H4\n"
1457+ "strexdeq %0, %5, %H5, [%3]"
1458+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1459+ : "r" (&ptr->counter), "r" (old), "r" (new)
1460+ : "cc");
1461+ } while (res);
1462+
1463+ smp_mb();
1464+
1465+ return oldval;
1466+}
1467+
1468 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1469 {
1470 long long result;
1471@@ -440,21 +838,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1472 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1473 {
1474 long long result;
1475- unsigned long tmp;
1476+ u64 tmp;
1477
1478 smp_mb();
1479 prefetchw(&v->counter);
1480
1481 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1482-"1: ldrexd %0, %H0, [%3]\n"
1483-" subs %Q0, %Q0, #1\n"
1484-" sbc %R0, %R0, #0\n"
1485+"1: ldrexd %1, %H1, [%3]\n"
1486+" subs %Q0, %Q1, #1\n"
1487+" sbcs %R0, %R1, #0\n"
1488+
1489+#ifdef CONFIG_PAX_REFCOUNT
1490+" bvc 3f\n"
1491+" mov %Q0, %Q1\n"
1492+" mov %R0, %R1\n"
1493+"2: bkpt 0xf103\n"
1494+"3:\n"
1495+#endif
1496+
1497 " teq %R0, #0\n"
1498-" bmi 2f\n"
1499+" bmi 4f\n"
1500 " strexd %1, %0, %H0, [%3]\n"
1501 " teq %1, #0\n"
1502 " bne 1b\n"
1503-"2:"
1504+"4:\n"
1505+
1506+#ifdef CONFIG_PAX_REFCOUNT
1507+ _ASM_EXTABLE(2b, 4b)
1508+#endif
1509+
1510 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1511 : "r" (&v->counter)
1512 : "cc");
1513@@ -478,13 +890,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1514 " teq %0, %5\n"
1515 " teqeq %H0, %H5\n"
1516 " moveq %1, #0\n"
1517-" beq 2f\n"
1518+" beq 4f\n"
1519 " adds %Q0, %Q0, %Q6\n"
1520-" adc %R0, %R0, %R6\n"
1521+" adcs %R0, %R0, %R6\n"
1522+
1523+#ifdef CONFIG_PAX_REFCOUNT
1524+" bvc 3f\n"
1525+"2: bkpt 0xf103\n"
1526+"3:\n"
1527+#endif
1528+
1529 " strexd %2, %0, %H0, [%4]\n"
1530 " teq %2, #0\n"
1531 " bne 1b\n"
1532-"2:"
1533+"4:\n"
1534+
1535+#ifdef CONFIG_PAX_REFCOUNT
1536+ _ASM_EXTABLE(2b, 4b)
1537+#endif
1538+
1539 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1540 : "r" (&v->counter), "r" (u), "r" (a)
1541 : "cc");
1542@@ -497,10 +921,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1543
1544 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1545 #define atomic64_inc(v) atomic64_add(1LL, (v))
1546+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1547 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1548+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1549 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1550 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1551 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1552+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1553 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1554 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1555 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1556diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1557index 2f59f74..1594659 100644
1558--- a/arch/arm/include/asm/barrier.h
1559+++ b/arch/arm/include/asm/barrier.h
1560@@ -63,7 +63,7 @@
1561 do { \
1562 compiletime_assert_atomic_type(*p); \
1563 smp_mb(); \
1564- ACCESS_ONCE(*p) = (v); \
1565+ ACCESS_ONCE_RW(*p) = (v); \
1566 } while (0)
1567
1568 #define smp_load_acquire(p) \
1569diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1570index 75fe66b..ba3dee4 100644
1571--- a/arch/arm/include/asm/cache.h
1572+++ b/arch/arm/include/asm/cache.h
1573@@ -4,8 +4,10 @@
1574 #ifndef __ASMARM_CACHE_H
1575 #define __ASMARM_CACHE_H
1576
1577+#include <linux/const.h>
1578+
1579 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1580-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1581+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1582
1583 /*
1584 * Memory returned by kmalloc() may be used for DMA, so we must make
1585@@ -24,5 +26,6 @@
1586 #endif
1587
1588 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1589+#define __read_only __attribute__ ((__section__(".data..read_only")))
1590
1591 #endif
1592diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1593index 8b8b616..d973d24 100644
1594--- a/arch/arm/include/asm/cacheflush.h
1595+++ b/arch/arm/include/asm/cacheflush.h
1596@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1597 void (*dma_unmap_area)(const void *, size_t, int);
1598
1599 void (*dma_flush_range)(const void *, const void *);
1600-};
1601+} __no_const;
1602
1603 /*
1604 * Select the calling method
1605diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1606index 5233151..87a71fa 100644
1607--- a/arch/arm/include/asm/checksum.h
1608+++ b/arch/arm/include/asm/checksum.h
1609@@ -37,7 +37,19 @@ __wsum
1610 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1611
1612 __wsum
1613-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1614+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1615+
1616+static inline __wsum
1617+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1618+{
1619+ __wsum ret;
1620+ pax_open_userland();
1621+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1622+ pax_close_userland();
1623+ return ret;
1624+}
1625+
1626+
1627
1628 /*
1629 * Fold a partial checksum without adding pseudo headers
1630diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1631index abb2c37..96db950 100644
1632--- a/arch/arm/include/asm/cmpxchg.h
1633+++ b/arch/arm/include/asm/cmpxchg.h
1634@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1635
1636 #define xchg(ptr,x) \
1637 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1638+#define xchg_unchecked(ptr,x) \
1639+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1640
1641 #include <asm-generic/cmpxchg-local.h>
1642
1643diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1644index 6ddbe44..b5e38b1 100644
1645--- a/arch/arm/include/asm/domain.h
1646+++ b/arch/arm/include/asm/domain.h
1647@@ -48,18 +48,37 @@
1648 * Domain types
1649 */
1650 #define DOMAIN_NOACCESS 0
1651-#define DOMAIN_CLIENT 1
1652 #ifdef CONFIG_CPU_USE_DOMAINS
1653+#define DOMAIN_USERCLIENT 1
1654+#define DOMAIN_KERNELCLIENT 1
1655 #define DOMAIN_MANAGER 3
1656+#define DOMAIN_VECTORS DOMAIN_USER
1657 #else
1658+
1659+#ifdef CONFIG_PAX_KERNEXEC
1660 #define DOMAIN_MANAGER 1
1661+#define DOMAIN_KERNEXEC 3
1662+#else
1663+#define DOMAIN_MANAGER 1
1664+#endif
1665+
1666+#ifdef CONFIG_PAX_MEMORY_UDEREF
1667+#define DOMAIN_USERCLIENT 0
1668+#define DOMAIN_UDEREF 1
1669+#define DOMAIN_VECTORS DOMAIN_KERNEL
1670+#else
1671+#define DOMAIN_USERCLIENT 1
1672+#define DOMAIN_VECTORS DOMAIN_USER
1673+#endif
1674+#define DOMAIN_KERNELCLIENT 1
1675+
1676 #endif
1677
1678 #define domain_val(dom,type) ((type) << (2*(dom)))
1679
1680 #ifndef __ASSEMBLY__
1681
1682-#ifdef CONFIG_CPU_USE_DOMAINS
1683+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1684 static inline void set_domain(unsigned val)
1685 {
1686 asm volatile(
1687@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1688 isb();
1689 }
1690
1691-#define modify_domain(dom,type) \
1692- do { \
1693- struct thread_info *thread = current_thread_info(); \
1694- unsigned int domain = thread->cpu_domain; \
1695- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1696- thread->cpu_domain = domain | domain_val(dom, type); \
1697- set_domain(thread->cpu_domain); \
1698- } while (0)
1699-
1700+extern void modify_domain(unsigned int dom, unsigned int type);
1701 #else
1702 static inline void set_domain(unsigned val) { }
1703 static inline void modify_domain(unsigned dom, unsigned type) { }
1704diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1705index f4b46d3..abc9b2b 100644
1706--- a/arch/arm/include/asm/elf.h
1707+++ b/arch/arm/include/asm/elf.h
1708@@ -114,7 +114,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1709 the loader. We need to make sure that it is out of the way of the program
1710 that it will "exec", and that there is sufficient room for the brk. */
1711
1712-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1713+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1714+
1715+#ifdef CONFIG_PAX_ASLR
1716+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1717+
1718+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1719+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1720+#endif
1721
1722 /* When the program starts, a1 contains a pointer to a function to be
1723 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1724@@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1725 extern void elf_set_personality(const struct elf32_hdr *);
1726 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1727
1728-struct mm_struct;
1729-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1730-#define arch_randomize_brk arch_randomize_brk
1731-
1732 #ifdef CONFIG_MMU
1733 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1734 struct linux_binprm;
1735diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1736index de53547..52b9a28 100644
1737--- a/arch/arm/include/asm/fncpy.h
1738+++ b/arch/arm/include/asm/fncpy.h
1739@@ -81,7 +81,9 @@
1740 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1741 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1742 \
1743+ pax_open_kernel(); \
1744 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1745+ pax_close_kernel(); \
1746 flush_icache_range((unsigned long)(dest_buf), \
1747 (unsigned long)(dest_buf) + (size)); \
1748 \
1749diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1750index 53e69da..3fdc896 100644
1751--- a/arch/arm/include/asm/futex.h
1752+++ b/arch/arm/include/asm/futex.h
1753@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1755 return -EFAULT;
1756
1757+ pax_open_userland();
1758+
1759 smp_mb();
1760 /* Prefetching cannot fault */
1761 prefetchw(uaddr);
1762@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1763 : "cc", "memory");
1764 smp_mb();
1765
1766+ pax_close_userland();
1767+
1768 *uval = val;
1769 return ret;
1770 }
1771@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1772 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1773 return -EFAULT;
1774
1775+ pax_open_userland();
1776+
1777 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1778 "1: " TUSER(ldr) " %1, [%4]\n"
1779 " teq %1, %2\n"
1780@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1781 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1782 : "cc", "memory");
1783
1784+ pax_close_userland();
1785+
1786 *uval = val;
1787 return ret;
1788 }
1789@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1790 return -EFAULT;
1791
1792 pagefault_disable(); /* implies preempt_disable() */
1793+ pax_open_userland();
1794
1795 switch (op) {
1796 case FUTEX_OP_SET:
1797@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1798 ret = -ENOSYS;
1799 }
1800
1801+ pax_close_userland();
1802 pagefault_enable(); /* subsumes preempt_enable() */
1803
1804 if (!ret) {
1805diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1806index 83eb2f7..ed77159 100644
1807--- a/arch/arm/include/asm/kmap_types.h
1808+++ b/arch/arm/include/asm/kmap_types.h
1809@@ -4,6 +4,6 @@
1810 /*
1811 * This is the "bare minimum". AIO seems to require this.
1812 */
1813-#define KM_TYPE_NR 16
1814+#define KM_TYPE_NR 17
1815
1816 #endif
1817diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1818index 9e614a1..3302cca 100644
1819--- a/arch/arm/include/asm/mach/dma.h
1820+++ b/arch/arm/include/asm/mach/dma.h
1821@@ -22,7 +22,7 @@ struct dma_ops {
1822 int (*residue)(unsigned int, dma_t *); /* optional */
1823 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1824 const char *type;
1825-};
1826+} __do_const;
1827
1828 struct dma_struct {
1829 void *addr; /* single DMA address */
1830diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1831index f98c7f3..e5c626d 100644
1832--- a/arch/arm/include/asm/mach/map.h
1833+++ b/arch/arm/include/asm/mach/map.h
1834@@ -23,17 +23,19 @@ struct map_desc {
1835
1836 /* types 0-3 are defined in asm/io.h */
1837 enum {
1838- MT_UNCACHED = 4,
1839- MT_CACHECLEAN,
1840- MT_MINICLEAN,
1841+ MT_UNCACHED_RW = 4,
1842+ MT_CACHECLEAN_RO,
1843+ MT_MINICLEAN_RO,
1844 MT_LOW_VECTORS,
1845 MT_HIGH_VECTORS,
1846- MT_MEMORY_RWX,
1847+ __MT_MEMORY_RWX,
1848 MT_MEMORY_RW,
1849- MT_ROM,
1850- MT_MEMORY_RWX_NONCACHED,
1851+ MT_MEMORY_RX,
1852+ MT_ROM_RX,
1853+ MT_MEMORY_RW_NONCACHED,
1854+ MT_MEMORY_RX_NONCACHED,
1855 MT_MEMORY_RW_DTCM,
1856- MT_MEMORY_RWX_ITCM,
1857+ MT_MEMORY_RX_ITCM,
1858 MT_MEMORY_RW_SO,
1859 MT_MEMORY_DMA_READY,
1860 };
1861diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1862index f94784f..9a09a4a 100644
1863--- a/arch/arm/include/asm/outercache.h
1864+++ b/arch/arm/include/asm/outercache.h
1865@@ -35,7 +35,7 @@ struct outer_cache_fns {
1866 #endif
1867 void (*set_debug)(unsigned long);
1868 void (*resume)(void);
1869-};
1870+} __no_const;
1871
1872 extern struct outer_cache_fns outer_cache;
1873
1874diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1875index 4355f0e..cd9168e 100644
1876--- a/arch/arm/include/asm/page.h
1877+++ b/arch/arm/include/asm/page.h
1878@@ -23,6 +23,7 @@
1879
1880 #else
1881
1882+#include <linux/compiler.h>
1883 #include <asm/glue.h>
1884
1885 /*
1886@@ -114,7 +115,7 @@ struct cpu_user_fns {
1887 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1888 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1889 unsigned long vaddr, struct vm_area_struct *vma);
1890-};
1891+} __no_const;
1892
1893 #ifdef MULTI_USER
1894 extern struct cpu_user_fns cpu_user;
1895diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1896index 78a7793..e3dc06c 100644
1897--- a/arch/arm/include/asm/pgalloc.h
1898+++ b/arch/arm/include/asm/pgalloc.h
1899@@ -17,6 +17,7 @@
1900 #include <asm/processor.h>
1901 #include <asm/cacheflush.h>
1902 #include <asm/tlbflush.h>
1903+#include <asm/system_info.h>
1904
1905 #define check_pgt_cache() do { } while (0)
1906
1907@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1908 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1909 }
1910
1911+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1912+{
1913+ pud_populate(mm, pud, pmd);
1914+}
1915+
1916 #else /* !CONFIG_ARM_LPAE */
1917
1918 /*
1919@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1920 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1921 #define pmd_free(mm, pmd) do { } while (0)
1922 #define pud_populate(mm,pmd,pte) BUG()
1923+#define pud_populate_kernel(mm,pmd,pte) BUG()
1924
1925 #endif /* CONFIG_ARM_LPAE */
1926
1927@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1928 __free_page(pte);
1929 }
1930
1931+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1932+{
1933+#ifdef CONFIG_ARM_LPAE
1934+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1935+#else
1936+ if (addr & SECTION_SIZE)
1937+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1938+ else
1939+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1940+#endif
1941+ flush_pmd_entry(pmdp);
1942+}
1943+
1944 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1945 pmdval_t prot)
1946 {
1947@@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1948 static inline void
1949 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1950 {
1951- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1952+ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1953 }
1954 #define pmd_pgtable(pmd) pmd_page(pmd)
1955
1956diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1957index 5cfba15..f415e1a 100644
1958--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1959+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1960@@ -20,12 +20,15 @@
1961 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1962 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1963 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1964+#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1965 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1966 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1967 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1968+
1969 /*
1970 * - section
1971 */
1972+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1973 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1974 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1975 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1976@@ -37,6 +40,7 @@
1977 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1978 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1979 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1980+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1981
1982 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1983 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1984@@ -66,6 +70,7 @@
1985 * - extended small page/tiny page
1986 */
1987 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1988+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1989 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1990 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1991 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1992diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1993index 219ac88..73ec32a 100644
1994--- a/arch/arm/include/asm/pgtable-2level.h
1995+++ b/arch/arm/include/asm/pgtable-2level.h
1996@@ -126,6 +126,9 @@
1997 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1998 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1999
2000+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
2001+#define L_PTE_PXN (_AT(pteval_t, 0))
2002+
2003 /*
2004 * These are the memory types, defined to be compatible with
2005 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
2006diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
2007index 626989f..9d67a33 100644
2008--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
2009+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
2010@@ -75,6 +75,7 @@
2011 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2012 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
2013 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
2014+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2015 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
2016
2017 /*
2018diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
2019index 85c60ad..b0bbd7e 100644
2020--- a/arch/arm/include/asm/pgtable-3level.h
2021+++ b/arch/arm/include/asm/pgtable-3level.h
2022@@ -82,6 +82,7 @@
2023 #define L_PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */
2024 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2025 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
2026+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2027 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2028 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55) /* unused */
2029 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56) /* unused */
2030@@ -95,6 +96,7 @@
2031 /*
2032 * To be used in assembly code with the upper page attributes.
2033 */
2034+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2035 #define L_PTE_XN_HIGH (1 << (54 - 32))
2036 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2037
2038diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2039index 5478e5d..f5b5cb3 100644
2040--- a/arch/arm/include/asm/pgtable.h
2041+++ b/arch/arm/include/asm/pgtable.h
2042@@ -33,6 +33,9 @@
2043 #include <asm/pgtable-2level.h>
2044 #endif
2045
2046+#define ktla_ktva(addr) (addr)
2047+#define ktva_ktla(addr) (addr)
2048+
2049 /*
2050 * Just any arbitrary offset to the start of the vmalloc VM area: the
2051 * current 8MB value just means that there will be a 8MB "hole" after the
2052@@ -48,6 +51,9 @@
2053 #define LIBRARY_TEXT_START 0x0c000000
2054
2055 #ifndef __ASSEMBLY__
2056+extern pteval_t __supported_pte_mask;
2057+extern pmdval_t __supported_pmd_mask;
2058+
2059 extern void __pte_error(const char *file, int line, pte_t);
2060 extern void __pmd_error(const char *file, int line, pmd_t);
2061 extern void __pgd_error(const char *file, int line, pgd_t);
2062@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2063 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2064 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2065
2066+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2067+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2068+
2069+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2070+#include <asm/domain.h>
2071+#include <linux/thread_info.h>
2072+#include <linux/preempt.h>
2073+
2074+static inline int test_domain(int domain, int domaintype)
2075+{
2076+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2077+}
2078+#endif
2079+
2080+#ifdef CONFIG_PAX_KERNEXEC
2081+static inline unsigned long pax_open_kernel(void) {
2082+#ifdef CONFIG_ARM_LPAE
2083+ /* TODO */
2084+#else
2085+ preempt_disable();
2086+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2087+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2088+#endif
2089+ return 0;
2090+}
2091+
2092+static inline unsigned long pax_close_kernel(void) {
2093+#ifdef CONFIG_ARM_LPAE
2094+ /* TODO */
2095+#else
2096+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2097+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2098+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2099+ preempt_enable_no_resched();
2100+#endif
2101+ return 0;
2102+}
2103+#else
2104+static inline unsigned long pax_open_kernel(void) { return 0; }
2105+static inline unsigned long pax_close_kernel(void) { return 0; }
2106+#endif
2107+
2108 /*
2109 * This is the lowest virtual address we can permit any user space
2110 * mapping to be mapped at. This is particularly important for
2111@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2112 /*
2113 * The pgprot_* and protection_map entries will be fixed up in runtime
2114 * to include the cachable and bufferable bits based on memory policy,
2115- * as well as any architecture dependent bits like global/ASID and SMP
2116- * shared mapping bits.
2117+ * as well as any architecture dependent bits like global/ASID, PXN,
2118+ * and SMP shared mapping bits.
2119 */
2120 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2121
2122@@ -265,7 +313,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
2123 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2124 {
2125 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2126- L_PTE_NONE | L_PTE_VALID;
2127+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2128 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2129 return pte;
2130 }
2131diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2132index c4ae171..ea0c0c2 100644
2133--- a/arch/arm/include/asm/psci.h
2134+++ b/arch/arm/include/asm/psci.h
2135@@ -29,7 +29,7 @@ struct psci_operations {
2136 int (*cpu_off)(struct psci_power_state state);
2137 int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
2138 int (*migrate)(unsigned long cpuid);
2139-};
2140+} __no_const;
2141
2142 extern struct psci_operations psci_ops;
2143 extern struct smp_operations psci_smp_ops;
2144diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2145index 2ec765c..beb1fe16 100644
2146--- a/arch/arm/include/asm/smp.h
2147+++ b/arch/arm/include/asm/smp.h
2148@@ -113,7 +113,7 @@ struct smp_operations {
2149 int (*cpu_disable)(unsigned int cpu);
2150 #endif
2151 #endif
2152-};
2153+} __no_const;
2154
2155 struct of_cpu_method {
2156 const char *method;
2157diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2158index f989d7c..e8aa7f0 100644
2159--- a/arch/arm/include/asm/thread_info.h
2160+++ b/arch/arm/include/asm/thread_info.h
2161@@ -88,9 +88,9 @@ struct thread_info {
2162 .flags = 0, \
2163 .preempt_count = INIT_PREEMPT_COUNT, \
2164 .addr_limit = KERNEL_DS, \
2165- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2166- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2167- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2168+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2169+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2170+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2171 .restart_block = { \
2172 .fn = do_no_restart_syscall, \
2173 }, \
2174@@ -158,7 +158,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2175 #define TIF_SYSCALL_AUDIT 9
2176 #define TIF_SYSCALL_TRACEPOINT 10
2177 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2178-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2179+/* within 8 bits of TIF_SYSCALL_TRACE
2180+ * to meet flexible second operand requirements
2181+ */
2182+#define TIF_GRSEC_SETXID 12
2183+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2184 #define TIF_USING_IWMMXT 17
2185 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2186 #define TIF_RESTORE_SIGMASK 20
2187@@ -172,10 +176,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2188 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2189 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2190 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2191+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2192
2193 /* Checks for any syscall work in entry-common.S */
2194 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2195- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2196+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2197
2198 /*
2199 * Change these and you break ASM code in entry-common.S
2200diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2201index 75d9579..b5b40e4 100644
2202--- a/arch/arm/include/asm/uaccess.h
2203+++ b/arch/arm/include/asm/uaccess.h
2204@@ -18,6 +18,7 @@
2205 #include <asm/domain.h>
2206 #include <asm/unified.h>
2207 #include <asm/compiler.h>
2208+#include <asm/pgtable.h>
2209
2210 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2211 #include <asm-generic/uaccess-unaligned.h>
2212@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2213 static inline void set_fs(mm_segment_t fs)
2214 {
2215 current_thread_info()->addr_limit = fs;
2216- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2217+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2218 }
2219
2220 #define segment_eq(a,b) ((a) == (b))
2221
2222+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2223+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2224+
2225+static inline void pax_open_userland(void)
2226+{
2227+
2228+#ifdef CONFIG_PAX_MEMORY_UDEREF
2229+ if (segment_eq(get_fs(), USER_DS)) {
2230+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2231+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2232+ }
2233+#endif
2234+
2235+}
2236+
2237+static inline void pax_close_userland(void)
2238+{
2239+
2240+#ifdef CONFIG_PAX_MEMORY_UDEREF
2241+ if (segment_eq(get_fs(), USER_DS)) {
2242+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2243+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2244+ }
2245+#endif
2246+
2247+}
2248+
2249 #define __addr_ok(addr) ({ \
2250 unsigned long flag; \
2251 __asm__("cmp %2, %0; movlo %0, #0" \
2252@@ -150,8 +178,12 @@ extern int __get_user_4(void *);
2253
2254 #define get_user(x,p) \
2255 ({ \
2256+ int __e; \
2257 might_fault(); \
2258- __get_user_check(x,p); \
2259+ pax_open_userland(); \
2260+ __e = __get_user_check(x,p); \
2261+ pax_close_userland(); \
2262+ __e; \
2263 })
2264
2265 extern int __put_user_1(void *, unsigned int);
2266@@ -196,8 +228,12 @@ extern int __put_user_8(void *, unsigned long long);
2267
2268 #define put_user(x,p) \
2269 ({ \
2270+ int __e; \
2271 might_fault(); \
2272- __put_user_check(x,p); \
2273+ pax_open_userland(); \
2274+ __e = __put_user_check(x,p); \
2275+ pax_close_userland(); \
2276+ __e; \
2277 })
2278
2279 #else /* CONFIG_MMU */
2280@@ -221,6 +257,7 @@ static inline void set_fs(mm_segment_t fs)
2281
2282 #endif /* CONFIG_MMU */
2283
2284+#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2285 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2286
2287 #define user_addr_max() \
2288@@ -238,13 +275,17 @@ static inline void set_fs(mm_segment_t fs)
2289 #define __get_user(x,ptr) \
2290 ({ \
2291 long __gu_err = 0; \
2292+ pax_open_userland(); \
2293 __get_user_err((x),(ptr),__gu_err); \
2294+ pax_close_userland(); \
2295 __gu_err; \
2296 })
2297
2298 #define __get_user_error(x,ptr,err) \
2299 ({ \
2300+ pax_open_userland(); \
2301 __get_user_err((x),(ptr),err); \
2302+ pax_close_userland(); \
2303 (void) 0; \
2304 })
2305
2306@@ -320,13 +361,17 @@ do { \
2307 #define __put_user(x,ptr) \
2308 ({ \
2309 long __pu_err = 0; \
2310+ pax_open_userland(); \
2311 __put_user_err((x),(ptr),__pu_err); \
2312+ pax_close_userland(); \
2313 __pu_err; \
2314 })
2315
2316 #define __put_user_error(x,ptr,err) \
2317 ({ \
2318+ pax_open_userland(); \
2319 __put_user_err((x),(ptr),err); \
2320+ pax_close_userland(); \
2321 (void) 0; \
2322 })
2323
2324@@ -426,11 +471,44 @@ do { \
2325
2326
2327 #ifdef CONFIG_MMU
2328-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2329-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2330+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2331+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2332+
2333+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2334+{
2335+ unsigned long ret;
2336+
2337+ check_object_size(to, n, false);
2338+ pax_open_userland();
2339+ ret = ___copy_from_user(to, from, n);
2340+ pax_close_userland();
2341+ return ret;
2342+}
2343+
2344+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2345+{
2346+ unsigned long ret;
2347+
2348+ check_object_size(from, n, true);
2349+ pax_open_userland();
2350+ ret = ___copy_to_user(to, from, n);
2351+ pax_close_userland();
2352+ return ret;
2353+}
2354+
2355 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2356-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2357+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2358 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2359+
2360+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2361+{
2362+ unsigned long ret;
2363+ pax_open_userland();
2364+ ret = ___clear_user(addr, n);
2365+ pax_close_userland();
2366+ return ret;
2367+}
2368+
2369 #else
2370 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2371 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2372@@ -439,6 +517,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2373
2374 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2375 {
2376+ if ((long)n < 0)
2377+ return n;
2378+
2379 if (access_ok(VERIFY_READ, from, n))
2380 n = __copy_from_user(to, from, n);
2381 else /* security hole - plug it */
2382@@ -448,6 +529,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2383
2384 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2385 {
2386+ if ((long)n < 0)
2387+ return n;
2388+
2389 if (access_ok(VERIFY_WRITE, to, n))
2390 n = __copy_to_user(to, from, n);
2391 return n;
2392diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2393index 5af0ed1..cea83883 100644
2394--- a/arch/arm/include/uapi/asm/ptrace.h
2395+++ b/arch/arm/include/uapi/asm/ptrace.h
2396@@ -92,7 +92,7 @@
2397 * ARMv7 groups of PSR bits
2398 */
2399 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2400-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2401+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2402 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2403 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2404
2405diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2406index f7b450f..f5364c5 100644
2407--- a/arch/arm/kernel/armksyms.c
2408+++ b/arch/arm/kernel/armksyms.c
2409@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2410
2411 /* networking */
2412 EXPORT_SYMBOL(csum_partial);
2413-EXPORT_SYMBOL(csum_partial_copy_from_user);
2414+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2415 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2416 EXPORT_SYMBOL(__csum_ipv6_magic);
2417
2418@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2419 #ifdef CONFIG_MMU
2420 EXPORT_SYMBOL(copy_page);
2421
2422-EXPORT_SYMBOL(__copy_from_user);
2423-EXPORT_SYMBOL(__copy_to_user);
2424-EXPORT_SYMBOL(__clear_user);
2425+EXPORT_SYMBOL(___copy_from_user);
2426+EXPORT_SYMBOL(___copy_to_user);
2427+EXPORT_SYMBOL(___clear_user);
2428
2429 EXPORT_SYMBOL(__get_user_1);
2430 EXPORT_SYMBOL(__get_user_2);
2431diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2432index 1879e8d..b2207fc 100644
2433--- a/arch/arm/kernel/entry-armv.S
2434+++ b/arch/arm/kernel/entry-armv.S
2435@@ -47,6 +47,87 @@
2436 9997:
2437 .endm
2438
2439+ .macro pax_enter_kernel
2440+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2441+ @ make aligned space for saved DACR
2442+ sub sp, sp, #8
2443+ @ save regs
2444+ stmdb sp!, {r1, r2}
2445+ @ read DACR from cpu_domain into r1
2446+ mov r2, sp
2447+ @ assume 8K pages, since we have to split the immediate in two
2448+ bic r2, r2, #(0x1fc0)
2449+ bic r2, r2, #(0x3f)
2450+ ldr r1, [r2, #TI_CPU_DOMAIN]
2451+ @ store old DACR on stack
2452+ str r1, [sp, #8]
2453+#ifdef CONFIG_PAX_KERNEXEC
2454+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2455+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2456+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2457+#endif
2458+#ifdef CONFIG_PAX_MEMORY_UDEREF
2459+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2460+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2461+#endif
2462+ @ write r1 to current_thread_info()->cpu_domain
2463+ str r1, [r2, #TI_CPU_DOMAIN]
2464+ @ write r1 to DACR
2465+ mcr p15, 0, r1, c3, c0, 0
2466+ @ instruction sync
2467+ instr_sync
2468+ @ restore regs
2469+ ldmia sp!, {r1, r2}
2470+#endif
2471+ .endm
2472+
2473+ .macro pax_open_userland
2474+#ifdef CONFIG_PAX_MEMORY_UDEREF
2475+ @ save regs
2476+ stmdb sp!, {r0, r1}
2477+ @ read DACR from cpu_domain into r1
2478+ mov r0, sp
2479+ @ assume 8K pages, since we have to split the immediate in two
2480+ bic r0, r0, #(0x1fc0)
2481+ bic r0, r0, #(0x3f)
2482+ ldr r1, [r0, #TI_CPU_DOMAIN]
2483+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2484+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2485+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2486+ @ write r1 to current_thread_info()->cpu_domain
2487+ str r1, [r0, #TI_CPU_DOMAIN]
2488+ @ write r1 to DACR
2489+ mcr p15, 0, r1, c3, c0, 0
2490+ @ instruction sync
2491+ instr_sync
2492+ @ restore regs
2493+ ldmia sp!, {r0, r1}
2494+#endif
2495+ .endm
2496+
2497+ .macro pax_close_userland
2498+#ifdef CONFIG_PAX_MEMORY_UDEREF
2499+ @ save regs
2500+ stmdb sp!, {r0, r1}
2501+ @ read DACR from cpu_domain into r1
2502+ mov r0, sp
2503+ @ assume 8K pages, since we have to split the immediate in two
2504+ bic r0, r0, #(0x1fc0)
2505+ bic r0, r0, #(0x3f)
2506+ ldr r1, [r0, #TI_CPU_DOMAIN]
2507+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2508+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2509+ @ write r1 to current_thread_info()->cpu_domain
2510+ str r1, [r0, #TI_CPU_DOMAIN]
2511+ @ write r1 to DACR
2512+ mcr p15, 0, r1, c3, c0, 0
2513+ @ instruction sync
2514+ instr_sync
2515+ @ restore regs
2516+ ldmia sp!, {r0, r1}
2517+#endif
2518+ .endm
2519+
2520 .macro pabt_helper
2521 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2522 #ifdef MULTI_PABORT
2523@@ -89,11 +170,15 @@
2524 * Invalid mode handlers
2525 */
2526 .macro inv_entry, reason
2527+
2528+ pax_enter_kernel
2529+
2530 sub sp, sp, #S_FRAME_SIZE
2531 ARM( stmib sp, {r1 - lr} )
2532 THUMB( stmia sp, {r0 - r12} )
2533 THUMB( str sp, [sp, #S_SP] )
2534 THUMB( str lr, [sp, #S_LR] )
2535+
2536 mov r1, #\reason
2537 .endm
2538
2539@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2540 .macro svc_entry, stack_hole=0
2541 UNWIND(.fnstart )
2542 UNWIND(.save {r0 - pc} )
2543+
2544+ pax_enter_kernel
2545+
2546 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2547+
2548 #ifdef CONFIG_THUMB2_KERNEL
2549 SPFIX( str r0, [sp] ) @ temporarily saved
2550 SPFIX( mov r0, sp )
2551@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2552 ldmia r0, {r3 - r5}
2553 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2554 mov r6, #-1 @ "" "" "" ""
2555+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2556+ @ offset sp by 8 as done in pax_enter_kernel
2557+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2558+#else
2559 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2560+#endif
2561 SPFIX( addeq r2, r2, #4 )
2562 str r3, [sp, #-4]! @ save the "real" r0 copied
2563 @ from the exception stack
2564@@ -317,6 +411,9 @@ ENDPROC(__pabt_svc)
2565 .macro usr_entry
2566 UNWIND(.fnstart )
2567 UNWIND(.cantunwind ) @ don't unwind the user space
2568+
2569+ pax_enter_kernel_user
2570+
2571 sub sp, sp, #S_FRAME_SIZE
2572 ARM( stmib sp, {r1 - r12} )
2573 THUMB( stmia sp, {r0 - r12} )
2574@@ -416,7 +513,9 @@ __und_usr:
2575 tst r3, #PSR_T_BIT @ Thumb mode?
2576 bne __und_usr_thumb
2577 sub r4, r2, #4 @ ARM instr at LR - 4
2578+ pax_open_userland
2579 1: ldrt r0, [r4]
2580+ pax_close_userland
2581 ARM_BE8(rev r0, r0) @ little endian instruction
2582
2583 @ r0 = 32-bit ARM instruction which caused the exception
2584@@ -450,11 +549,15 @@ __und_usr_thumb:
2585 */
2586 .arch armv6t2
2587 #endif
2588+ pax_open_userland
2589 2: ldrht r5, [r4]
2590+ pax_close_userland
2591 ARM_BE8(rev16 r5, r5) @ little endian instruction
2592 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2593 blo __und_usr_fault_16 @ 16bit undefined instruction
2594+ pax_open_userland
2595 3: ldrht r0, [r2]
2596+ pax_close_userland
2597 ARM_BE8(rev16 r0, r0) @ little endian instruction
2598 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2599 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2600@@ -484,7 +587,8 @@ ENDPROC(__und_usr)
2601 */
2602 .pushsection .fixup, "ax"
2603 .align 2
2604-4: mov pc, r9
2605+4: pax_close_userland
2606+ mov pc, r9
2607 .popsection
2608 .pushsection __ex_table,"a"
2609 .long 1b, 4b
2610@@ -694,7 +798,7 @@ ENTRY(__switch_to)
2611 THUMB( str lr, [ip], #4 )
2612 ldr r4, [r2, #TI_TP_VALUE]
2613 ldr r5, [r2, #TI_TP_VALUE + 4]
2614-#ifdef CONFIG_CPU_USE_DOMAINS
2615+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2616 ldr r6, [r2, #TI_CPU_DOMAIN]
2617 #endif
2618 switch_tls r1, r4, r5, r3, r7
2619@@ -703,7 +807,7 @@ ENTRY(__switch_to)
2620 ldr r8, =__stack_chk_guard
2621 ldr r7, [r7, #TSK_STACK_CANARY]
2622 #endif
2623-#ifdef CONFIG_CPU_USE_DOMAINS
2624+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2625 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2626 #endif
2627 mov r5, r0
2628diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2629index a2dcafd..1048b5a 100644
2630--- a/arch/arm/kernel/entry-common.S
2631+++ b/arch/arm/kernel/entry-common.S
2632@@ -10,18 +10,46 @@
2633
2634 #include <asm/unistd.h>
2635 #include <asm/ftrace.h>
2636+#include <asm/domain.h>
2637 #include <asm/unwind.h>
2638
2639+#include "entry-header.S"
2640+
2641 #ifdef CONFIG_NEED_RET_TO_USER
2642 #include <mach/entry-macro.S>
2643 #else
2644 .macro arch_ret_to_user, tmp1, tmp2
2645+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2646+ @ save regs
2647+ stmdb sp!, {r1, r2}
2648+ @ read DACR from cpu_domain into r1
2649+ mov r2, sp
2650+ @ assume 8K pages, since we have to split the immediate in two
2651+ bic r2, r2, #(0x1fc0)
2652+ bic r2, r2, #(0x3f)
2653+ ldr r1, [r2, #TI_CPU_DOMAIN]
2654+#ifdef CONFIG_PAX_KERNEXEC
2655+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2656+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2657+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2658+#endif
2659+#ifdef CONFIG_PAX_MEMORY_UDEREF
2660+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2661+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2662+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2663+#endif
2664+ @ write r1 to current_thread_info()->cpu_domain
2665+ str r1, [r2, #TI_CPU_DOMAIN]
2666+ @ write r1 to DACR
2667+ mcr p15, 0, r1, c3, c0, 0
2668+ @ instruction sync
2669+ instr_sync
2670+ @ restore regs
2671+ ldmia sp!, {r1, r2}
2672+#endif
2673 .endm
2674 #endif
2675
2676-#include "entry-header.S"
2677-
2678-
2679 .align 5
2680 /*
2681 * This is the fast syscall return path. We do as little as
2682@@ -411,6 +439,12 @@ ENTRY(vector_swi)
2683 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2684 #endif
2685
2686+ /*
2687+ * do this here to avoid a performance hit of wrapping the code above
2688+ * that directly dereferences userland to parse the SWI instruction
2689+ */
2690+ pax_enter_kernel_user
2691+
2692 adr tbl, sys_call_table @ load syscall table pointer
2693
2694 #if defined(CONFIG_OABI_COMPAT)
2695diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2696index efb208d..d34bd02 100644
2697--- a/arch/arm/kernel/entry-header.S
2698+++ b/arch/arm/kernel/entry-header.S
2699@@ -188,6 +188,60 @@
2700 msr cpsr_c, \rtemp @ switch back to the SVC mode
2701 .endm
2702
2703+ .macro pax_enter_kernel_user
2704+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2705+ @ save regs
2706+ stmdb sp!, {r0, r1}
2707+ @ read DACR from cpu_domain into r1
2708+ mov r0, sp
2709+ @ assume 8K pages, since we have to split the immediate in two
2710+ bic r0, r0, #(0x1fc0)
2711+ bic r0, r0, #(0x3f)
2712+ ldr r1, [r0, #TI_CPU_DOMAIN]
2713+#ifdef CONFIG_PAX_MEMORY_UDEREF
2714+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2715+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2716+#endif
2717+#ifdef CONFIG_PAX_KERNEXEC
2718+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2719+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2720+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2721+#endif
2722+ @ write r1 to current_thread_info()->cpu_domain
2723+ str r1, [r0, #TI_CPU_DOMAIN]
2724+ @ write r1 to DACR
2725+ mcr p15, 0, r1, c3, c0, 0
2726+ @ instruction sync
2727+ instr_sync
2728+ @ restore regs
2729+ ldmia sp!, {r0, r1}
2730+#endif
2731+ .endm
2732+
2733+ .macro pax_exit_kernel
2734+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2735+ @ save regs
2736+ stmdb sp!, {r0, r1}
2737+ @ read old DACR from stack into r1
2738+ ldr r1, [sp, #(8 + S_SP)]
2739+ sub r1, r1, #8
2740+ ldr r1, [r1]
2741+
2742+ @ write r1 to current_thread_info()->cpu_domain
2743+ mov r0, sp
2744+ @ assume 8K pages, since we have to split the immediate in two
2745+ bic r0, r0, #(0x1fc0)
2746+ bic r0, r0, #(0x3f)
2747+ str r1, [r0, #TI_CPU_DOMAIN]
2748+ @ write r1 to DACR
2749+ mcr p15, 0, r1, c3, c0, 0
2750+ @ instruction sync
2751+ instr_sync
2752+ @ restore regs
2753+ ldmia sp!, {r0, r1}
2754+#endif
2755+ .endm
2756+
2757 #ifndef CONFIG_THUMB2_KERNEL
2758 .macro svc_exit, rpsr, irq = 0
2759 .if \irq != 0
2760@@ -207,6 +261,9 @@
2761 blne trace_hardirqs_off
2762 #endif
2763 .endif
2764+
2765+ pax_exit_kernel
2766+
2767 msr spsr_cxsf, \rpsr
2768 #if defined(CONFIG_CPU_V6)
2769 ldr r0, [sp]
2770@@ -265,6 +322,9 @@
2771 blne trace_hardirqs_off
2772 #endif
2773 .endif
2774+
2775+ pax_exit_kernel
2776+
2777 ldr lr, [sp, #S_SP] @ top of the stack
2778 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2779 clrex @ clear the exclusive monitor
2780diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2781index 918875d..cd5fa27 100644
2782--- a/arch/arm/kernel/fiq.c
2783+++ b/arch/arm/kernel/fiq.c
2784@@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
2785 void *base = vectors_page;
2786 unsigned offset = FIQ_OFFSET;
2787
2788+ pax_open_kernel();
2789 memcpy(base + offset, start, length);
2790+ pax_close_kernel();
2791+
2792 if (!cache_is_vipt_nonaliasing())
2793 flush_icache_range((unsigned long)base + offset, offset +
2794 length);
2795diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2796index 591d6e4..8322a26 100644
2797--- a/arch/arm/kernel/head.S
2798+++ b/arch/arm/kernel/head.S
2799@@ -437,7 +437,7 @@ __enable_mmu:
2800 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2802 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2803- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2804+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2805 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2806 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2807 #endif
2808diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2809index 45e4781..8eac93d 100644
2810--- a/arch/arm/kernel/module.c
2811+++ b/arch/arm/kernel/module.c
2812@@ -38,12 +38,39 @@
2813 #endif
2814
2815 #ifdef CONFIG_MMU
2816-void *module_alloc(unsigned long size)
2817+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2818 {
2819+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2820+ return NULL;
2821 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2822- GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2823+ GFP_KERNEL, prot, NUMA_NO_NODE,
2824 __builtin_return_address(0));
2825 }
2826+
2827+void *module_alloc(unsigned long size)
2828+{
2829+
2830+#ifdef CONFIG_PAX_KERNEXEC
2831+ return __module_alloc(size, PAGE_KERNEL);
2832+#else
2833+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2834+#endif
2835+
2836+}
2837+
2838+#ifdef CONFIG_PAX_KERNEXEC
2839+void module_free_exec(struct module *mod, void *module_region)
2840+{
2841+ module_free(mod, module_region);
2842+}
2843+EXPORT_SYMBOL(module_free_exec);
2844+
2845+void *module_alloc_exec(unsigned long size)
2846+{
2847+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2848+}
2849+EXPORT_SYMBOL(module_alloc_exec);
2850+#endif
2851 #endif
2852
2853 int
2854diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2855index 07314af..c46655c 100644
2856--- a/arch/arm/kernel/patch.c
2857+++ b/arch/arm/kernel/patch.c
2858@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2859 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2860 int size;
2861
2862+ pax_open_kernel();
2863 if (thumb2 && __opcode_is_thumb16(insn)) {
2864 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2865 size = sizeof(u16);
2866@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2867 *(u32 *)addr = insn;
2868 size = sizeof(u32);
2869 }
2870+ pax_close_kernel();
2871
2872 flush_icache_range((uintptr_t)(addr),
2873 (uintptr_t)(addr) + size);
2874diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2875index 81ef686..f4130b8 100644
2876--- a/arch/arm/kernel/process.c
2877+++ b/arch/arm/kernel/process.c
2878@@ -212,6 +212,7 @@ void machine_power_off(void)
2879
2880 if (pm_power_off)
2881 pm_power_off();
2882+ BUG();
2883 }
2884
2885 /*
2886@@ -225,7 +226,7 @@ void machine_power_off(void)
2887 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2888 * to use. Implementing such co-ordination would be essentially impossible.
2889 */
2890-void machine_restart(char *cmd)
2891+__noreturn void machine_restart(char *cmd)
2892 {
2893 local_irq_disable();
2894 smp_send_stop();
2895@@ -248,8 +249,8 @@ void __show_regs(struct pt_regs *regs)
2896
2897 show_regs_print_info(KERN_DEFAULT);
2898
2899- print_symbol("PC is at %s\n", instruction_pointer(regs));
2900- print_symbol("LR is at %s\n", regs->ARM_lr);
2901+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2902+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2903 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2904 "sp : %08lx ip : %08lx fp : %08lx\n",
2905 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2906@@ -425,12 +426,6 @@ unsigned long get_wchan(struct task_struct *p)
2907 return 0;
2908 }
2909
2910-unsigned long arch_randomize_brk(struct mm_struct *mm)
2911-{
2912- unsigned long range_end = mm->brk + 0x02000000;
2913- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2914-}
2915-
2916 #ifdef CONFIG_MMU
2917 #ifdef CONFIG_KUSER_HELPERS
2918 /*
2919@@ -446,7 +441,7 @@ static struct vm_area_struct gate_vma = {
2920
2921 static int __init gate_vma_init(void)
2922 {
2923- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2924+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2925 return 0;
2926 }
2927 arch_initcall(gate_vma_init);
2928@@ -472,41 +467,16 @@ int in_gate_area_no_mm(unsigned long addr)
2929
2930 const char *arch_vma_name(struct vm_area_struct *vma)
2931 {
2932- return is_gate_vma(vma) ? "[vectors]" :
2933- (vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?
2934- "[sigpage]" : NULL;
2935+ return is_gate_vma(vma) ? "[vectors]" : NULL;
2936 }
2937
2938-static struct page *signal_page;
2939-extern struct page *get_signal_page(void);
2940-
2941 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2942 {
2943 struct mm_struct *mm = current->mm;
2944- unsigned long addr;
2945- int ret;
2946-
2947- if (!signal_page)
2948- signal_page = get_signal_page();
2949- if (!signal_page)
2950- return -ENOMEM;
2951
2952 down_write(&mm->mmap_sem);
2953- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
2954- if (IS_ERR_VALUE(addr)) {
2955- ret = addr;
2956- goto up_fail;
2957- }
2958-
2959- ret = install_special_mapping(mm, addr, PAGE_SIZE,
2960- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2961- &signal_page);
2962-
2963- if (ret == 0)
2964- mm->context.sigpage = addr;
2965-
2966- up_fail:
2967+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2968 up_write(&mm->mmap_sem);
2969- return ret;
2970+ return 0;
2971 }
2972 #endif
2973diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2974index 4693188..4596c5e 100644
2975--- a/arch/arm/kernel/psci.c
2976+++ b/arch/arm/kernel/psci.c
2977@@ -24,7 +24,7 @@
2978 #include <asm/opcodes-virt.h>
2979 #include <asm/psci.h>
2980
2981-struct psci_operations psci_ops;
2982+struct psci_operations psci_ops __read_only;
2983
2984 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2985
2986diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2987index 0dd3b79..b67388e 100644
2988--- a/arch/arm/kernel/ptrace.c
2989+++ b/arch/arm/kernel/ptrace.c
2990@@ -908,7 +908,7 @@ enum ptrace_syscall_dir {
2991 PTRACE_SYSCALL_EXIT,
2992 };
2993
2994-static int tracehook_report_syscall(struct pt_regs *regs,
2995+static void tracehook_report_syscall(struct pt_regs *regs,
2996 enum ptrace_syscall_dir dir)
2997 {
2998 unsigned long ip;
2999@@ -926,19 +926,29 @@ static int tracehook_report_syscall(struct pt_regs *regs,
3000 current_thread_info()->syscall = -1;
3001
3002 regs->ARM_ip = ip;
3003- return current_thread_info()->syscall;
3004 }
3005
3006+#ifdef CONFIG_GRKERNSEC_SETXID
3007+extern void gr_delayed_cred_worker(void);
3008+#endif
3009+
3010 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3011 {
3012 current_thread_info()->syscall = scno;
3013
3014+#ifdef CONFIG_GRKERNSEC_SETXID
3015+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3016+ gr_delayed_cred_worker();
3017+#endif
3018+
3019 /* Do the secure computing check first; failures should be fast. */
3020 if (secure_computing(scno) == -1)
3021 return -1;
3022
3023 if (test_thread_flag(TIF_SYSCALL_TRACE))
3024- scno = tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
3025+ tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
3026+
3027+ scno = current_thread_info()->syscall;
3028
3029 if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
3030 trace_sys_enter(regs, scno);
3031diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3032index 50e198c..a8b5f49 100644
3033--- a/arch/arm/kernel/setup.c
3034+++ b/arch/arm/kernel/setup.c
3035@@ -103,21 +103,23 @@ EXPORT_SYMBOL(elf_hwcap);
3036 unsigned int elf_hwcap2 __read_mostly;
3037 EXPORT_SYMBOL(elf_hwcap2);
3038
3039+pteval_t __supported_pte_mask __read_only;
3040+pmdval_t __supported_pmd_mask __read_only;
3041
3042 #ifdef MULTI_CPU
3043-struct processor processor __read_mostly;
3044+struct processor processor __read_only;
3045 #endif
3046 #ifdef MULTI_TLB
3047-struct cpu_tlb_fns cpu_tlb __read_mostly;
3048+struct cpu_tlb_fns cpu_tlb __read_only;
3049 #endif
3050 #ifdef MULTI_USER
3051-struct cpu_user_fns cpu_user __read_mostly;
3052+struct cpu_user_fns cpu_user __read_only;
3053 #endif
3054 #ifdef MULTI_CACHE
3055-struct cpu_cache_fns cpu_cache __read_mostly;
3056+struct cpu_cache_fns cpu_cache __read_only;
3057 #endif
3058 #ifdef CONFIG_OUTER_CACHE
3059-struct outer_cache_fns outer_cache __read_mostly;
3060+struct outer_cache_fns outer_cache __read_only;
3061 EXPORT_SYMBOL(outer_cache);
3062 #endif
3063
3064@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3065 asm("mrc p15, 0, %0, c0, c1, 4"
3066 : "=r" (mmfr0));
3067 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3068- (mmfr0 & 0x000000f0) >= 0x00000030)
3069+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3070 cpu_arch = CPU_ARCH_ARMv7;
3071- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3072+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3073+ __supported_pte_mask |= L_PTE_PXN;
3074+ __supported_pmd_mask |= PMD_PXNTABLE;
3075+ }
3076+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3077 (mmfr0 & 0x000000f0) == 0x00000020)
3078 cpu_arch = CPU_ARCH_ARMv6;
3079 else
3080diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3081index bd19834..e4d8c66 100644
3082--- a/arch/arm/kernel/signal.c
3083+++ b/arch/arm/kernel/signal.c
3084@@ -24,8 +24,6 @@
3085
3086 extern const unsigned long sigreturn_codes[7];
3087
3088-static unsigned long signal_return_offset;
3089-
3090 #ifdef CONFIG_CRUNCH
3091 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3092 {
3093@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3094 * except when the MPU has protected the vectors
3095 * page from PL0
3096 */
3097- retcode = mm->context.sigpage + signal_return_offset +
3098- (idx << 2) + thumb;
3099+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3100 } else
3101 #endif
3102 {
3103@@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3104 } while (thread_flags & _TIF_WORK_MASK);
3105 return 0;
3106 }
3107-
3108-struct page *get_signal_page(void)
3109-{
3110- unsigned long ptr;
3111- unsigned offset;
3112- struct page *page;
3113- void *addr;
3114-
3115- page = alloc_pages(GFP_KERNEL, 0);
3116-
3117- if (!page)
3118- return NULL;
3119-
3120- addr = page_address(page);
3121-
3122- /* Give the signal return code some randomness */
3123- offset = 0x200 + (get_random_int() & 0x7fc);
3124- signal_return_offset = offset;
3125-
3126- /*
3127- * Copy signal return handlers into the vector page, and
3128- * set sigreturn to be a pointer to these.
3129- */
3130- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3131-
3132- ptr = (unsigned long)addr + offset;
3133- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3134-
3135- return page;
3136-}
3137diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3138index 7c4fada..8581286 100644
3139--- a/arch/arm/kernel/smp.c
3140+++ b/arch/arm/kernel/smp.c
3141@@ -73,7 +73,7 @@ enum ipi_msg_type {
3142
3143 static DECLARE_COMPLETION(cpu_running);
3144
3145-static struct smp_operations smp_ops;
3146+static struct smp_operations smp_ops __read_only;
3147
3148 void __init smp_set_ops(struct smp_operations *ops)
3149 {
3150diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3151index 7a3be1d..b00c7de 100644
3152--- a/arch/arm/kernel/tcm.c
3153+++ b/arch/arm/kernel/tcm.c
3154@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3155 .virtual = ITCM_OFFSET,
3156 .pfn = __phys_to_pfn(ITCM_OFFSET),
3157 .length = 0,
3158- .type = MT_MEMORY_RWX_ITCM,
3159+ .type = MT_MEMORY_RX_ITCM,
3160 }
3161 };
3162
3163@@ -267,7 +267,9 @@ no_dtcm:
3164 start = &__sitcm_text;
3165 end = &__eitcm_text;
3166 ram = &__itcm_start;
3167+ pax_open_kernel();
3168 memcpy(start, ram, itcm_code_sz);
3169+ pax_close_kernel();
3170 pr_debug("CPU ITCM: copied code from %p - %p\n",
3171 start, end);
3172 itcm_present = true;
3173diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3174index abd2fc0..895dbb6 100644
3175--- a/arch/arm/kernel/traps.c
3176+++ b/arch/arm/kernel/traps.c
3177@@ -62,7 +62,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3178 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3179 {
3180 #ifdef CONFIG_KALLSYMS
3181- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3182+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3183 #else
3184 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3185 #endif
3186@@ -264,6 +264,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3187 static int die_owner = -1;
3188 static unsigned int die_nest_count;
3189
3190+extern void gr_handle_kernel_exploit(void);
3191+
3192 static unsigned long oops_begin(void)
3193 {
3194 int cpu;
3195@@ -306,6 +308,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3196 panic("Fatal exception in interrupt");
3197 if (panic_on_oops)
3198 panic("Fatal exception");
3199+
3200+ gr_handle_kernel_exploit();
3201+
3202 if (signr)
3203 do_exit(signr);
3204 }
3205@@ -643,7 +648,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
3206 * The user helper at 0xffff0fe0 must be used instead.
3207 * (see entry-armv.S for details)
3208 */
3209+ pax_open_kernel();
3210 *((unsigned int *)0xffff0ff0) = regs->ARM_r0;
3211+ pax_close_kernel();
3212 }
3213 return 0;
3214
3215@@ -900,7 +907,11 @@ void __init early_trap_init(void *vectors_base)
3216 kuser_init(vectors_base);
3217
3218 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3219- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3220+
3221+#ifndef CONFIG_PAX_MEMORY_UDEREF
3222+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3223+#endif
3224+
3225 #else /* ifndef CONFIG_CPU_V7M */
3226 /*
3227 * on V7-M there is no need to copy the vector table to a dedicated
3228diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3229index 7bcee5c..e2f3249 100644
3230--- a/arch/arm/kernel/vmlinux.lds.S
3231+++ b/arch/arm/kernel/vmlinux.lds.S
3232@@ -8,7 +8,11 @@
3233 #include <asm/thread_info.h>
3234 #include <asm/memory.h>
3235 #include <asm/page.h>
3236-
3237+
3238+#ifdef CONFIG_PAX_KERNEXEC
3239+#include <asm/pgtable.h>
3240+#endif
3241+
3242 #define PROC_INFO \
3243 . = ALIGN(4); \
3244 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3245@@ -34,7 +38,7 @@
3246 #endif
3247
3248 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3249- defined(CONFIG_GENERIC_BUG)
3250+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3251 #define ARM_EXIT_KEEP(x) x
3252 #define ARM_EXIT_DISCARD(x)
3253 #else
3254@@ -90,6 +94,11 @@ SECTIONS
3255 _text = .;
3256 HEAD_TEXT
3257 }
3258+
3259+#ifdef CONFIG_PAX_KERNEXEC
3260+ . = ALIGN(1<<SECTION_SHIFT);
3261+#endif
3262+
3263 .text : { /* Real text segment */
3264 _stext = .; /* Text and read-only data */
3265 __exception_text_start = .;
3266@@ -112,6 +121,8 @@ SECTIONS
3267 ARM_CPU_KEEP(PROC_INFO)
3268 }
3269
3270+ _etext = .; /* End of text section */
3271+
3272 RO_DATA(PAGE_SIZE)
3273
3274 . = ALIGN(4);
3275@@ -142,7 +153,9 @@ SECTIONS
3276
3277 NOTES
3278
3279- _etext = .; /* End of text and rodata section */
3280+#ifdef CONFIG_PAX_KERNEXEC
3281+ . = ALIGN(1<<SECTION_SHIFT);
3282+#endif
3283
3284 #ifndef CONFIG_XIP_KERNEL
3285 . = ALIGN(PAGE_SIZE);
3286@@ -220,6 +233,11 @@ SECTIONS
3287 . = PAGE_OFFSET + TEXT_OFFSET;
3288 #else
3289 __init_end = .;
3290+
3291+#ifdef CONFIG_PAX_KERNEXEC
3292+ . = ALIGN(1<<SECTION_SHIFT);
3293+#endif
3294+
3295 . = ALIGN(THREAD_SIZE);
3296 __data_loc = .;
3297 #endif
3298diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3299index f0e50a0..8d5d36c 100644
3300--- a/arch/arm/kvm/arm.c
3301+++ b/arch/arm/kvm/arm.c
3302@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3303 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3304
3305 /* The VMID used in the VTTBR */
3306-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3307+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3308 static u8 kvm_next_vmid;
3309 static DEFINE_SPINLOCK(kvm_vmid_lock);
3310
3311@@ -408,7 +408,7 @@ void force_vm_exit(const cpumask_t *mask)
3312 */
3313 static bool need_new_vmid_gen(struct kvm *kvm)
3314 {
3315- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3316+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3317 }
3318
3319 /**
3320@@ -441,7 +441,7 @@ static void update_vttbr(struct kvm *kvm)
3321
3322 /* First user of a new VMID generation? */
3323 if (unlikely(kvm_next_vmid == 0)) {
3324- atomic64_inc(&kvm_vmid_gen);
3325+ atomic64_inc_unchecked(&kvm_vmid_gen);
3326 kvm_next_vmid = 1;
3327
3328 /*
3329@@ -458,7 +458,7 @@ static void update_vttbr(struct kvm *kvm)
3330 kvm_call_hyp(__kvm_flush_vm_context);
3331 }
3332
3333- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3334+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3335 kvm->arch.vmid = kvm_next_vmid;
3336 kvm_next_vmid++;
3337
3338diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3339index 14a0d98..7771a7d 100644
3340--- a/arch/arm/lib/clear_user.S
3341+++ b/arch/arm/lib/clear_user.S
3342@@ -12,14 +12,14 @@
3343
3344 .text
3345
3346-/* Prototype: int __clear_user(void *addr, size_t sz)
3347+/* Prototype: int ___clear_user(void *addr, size_t sz)
3348 * Purpose : clear some user memory
3349 * Params : addr - user memory address to clear
3350 * : sz - number of bytes to clear
3351 * Returns : number of bytes NOT cleared
3352 */
3353 ENTRY(__clear_user_std)
3354-WEAK(__clear_user)
3355+WEAK(___clear_user)
3356 stmfd sp!, {r1, lr}
3357 mov r2, #0
3358 cmp r1, #4
3359@@ -44,7 +44,7 @@ WEAK(__clear_user)
3360 USER( strnebt r2, [r0])
3361 mov r0, #0
3362 ldmfd sp!, {r1, pc}
3363-ENDPROC(__clear_user)
3364+ENDPROC(___clear_user)
3365 ENDPROC(__clear_user_std)
3366
3367 .pushsection .fixup,"ax"
3368diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3369index 66a477a..bee61d3 100644
3370--- a/arch/arm/lib/copy_from_user.S
3371+++ b/arch/arm/lib/copy_from_user.S
3372@@ -16,7 +16,7 @@
3373 /*
3374 * Prototype:
3375 *
3376- * size_t __copy_from_user(void *to, const void *from, size_t n)
3377+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3378 *
3379 * Purpose:
3380 *
3381@@ -84,11 +84,11 @@
3382
3383 .text
3384
3385-ENTRY(__copy_from_user)
3386+ENTRY(___copy_from_user)
3387
3388 #include "copy_template.S"
3389
3390-ENDPROC(__copy_from_user)
3391+ENDPROC(___copy_from_user)
3392
3393 .pushsection .fixup,"ax"
3394 .align 0
3395diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3396index 6ee2f67..d1cce76 100644
3397--- a/arch/arm/lib/copy_page.S
3398+++ b/arch/arm/lib/copy_page.S
3399@@ -10,6 +10,7 @@
3400 * ASM optimised string functions
3401 */
3402 #include <linux/linkage.h>
3403+#include <linux/const.h>
3404 #include <asm/assembler.h>
3405 #include <asm/asm-offsets.h>
3406 #include <asm/cache.h>
3407diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3408index d066df6..df28194 100644
3409--- a/arch/arm/lib/copy_to_user.S
3410+++ b/arch/arm/lib/copy_to_user.S
3411@@ -16,7 +16,7 @@
3412 /*
3413 * Prototype:
3414 *
3415- * size_t __copy_to_user(void *to, const void *from, size_t n)
3416+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3417 *
3418 * Purpose:
3419 *
3420@@ -88,11 +88,11 @@
3421 .text
3422
3423 ENTRY(__copy_to_user_std)
3424-WEAK(__copy_to_user)
3425+WEAK(___copy_to_user)
3426
3427 #include "copy_template.S"
3428
3429-ENDPROC(__copy_to_user)
3430+ENDPROC(___copy_to_user)
3431 ENDPROC(__copy_to_user_std)
3432
3433 .pushsection .fixup,"ax"
3434diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3435index 7d08b43..f7ca7ea 100644
3436--- a/arch/arm/lib/csumpartialcopyuser.S
3437+++ b/arch/arm/lib/csumpartialcopyuser.S
3438@@ -57,8 +57,8 @@
3439 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3440 */
3441
3442-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3443-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3444+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3445+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3446
3447 #include "csumpartialcopygeneric.S"
3448
3449diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3450index 5306de3..aed6d03 100644
3451--- a/arch/arm/lib/delay.c
3452+++ b/arch/arm/lib/delay.c
3453@@ -28,7 +28,7 @@
3454 /*
3455 * Default to the loop-based delay implementation.
3456 */
3457-struct arm_delay_ops arm_delay_ops = {
3458+struct arm_delay_ops arm_delay_ops __read_only = {
3459 .delay = __loop_delay,
3460 .const_udelay = __loop_const_udelay,
3461 .udelay = __loop_udelay,
3462diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3463index 3e58d71..029817c 100644
3464--- a/arch/arm/lib/uaccess_with_memcpy.c
3465+++ b/arch/arm/lib/uaccess_with_memcpy.c
3466@@ -136,7 +136,7 @@ out:
3467 }
3468
3469 unsigned long
3470-__copy_to_user(void __user *to, const void *from, unsigned long n)
3471+___copy_to_user(void __user *to, const void *from, unsigned long n)
3472 {
3473 /*
3474 * This test is stubbed out of the main function above to keep
3475@@ -190,7 +190,7 @@ out:
3476 return n;
3477 }
3478
3479-unsigned long __clear_user(void __user *addr, unsigned long n)
3480+unsigned long ___clear_user(void __user *addr, unsigned long n)
3481 {
3482 /* See rational for this in __copy_to_user() above. */
3483 if (n < 64)
3484diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3485index f7a07a5..258e1f7 100644
3486--- a/arch/arm/mach-at91/setup.c
3487+++ b/arch/arm/mach-at91/setup.c
3488@@ -81,7 +81,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3489
3490 desc->pfn = __phys_to_pfn(base);
3491 desc->length = length;
3492- desc->type = MT_MEMORY_RWX_NONCACHED;
3493+ desc->type = MT_MEMORY_RW_NONCACHED;
3494
3495 pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3496 base, length, desc->virtual);
3497diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
3498index 255f33a..507b157 100644
3499--- a/arch/arm/mach-kirkwood/common.c
3500+++ b/arch/arm/mach-kirkwood/common.c
3501@@ -157,7 +157,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
3502 clk_gate_ops.disable(hw);
3503 }
3504
3505-static struct clk_ops clk_gate_fn_ops;
3506+static int clk_gate_fn_is_enabled(struct clk_hw *hw)
3507+{
3508+ return clk_gate_ops.is_enabled(hw);
3509+}
3510+
3511+static struct clk_ops clk_gate_fn_ops = {
3512+ .enable = clk_gate_fn_enable,
3513+ .disable = clk_gate_fn_disable,
3514+ .is_enabled = clk_gate_fn_is_enabled,
3515+};
3516
3517 static struct clk __init *clk_register_gate_fn(struct device *dev,
3518 const char *name,
3519@@ -191,14 +200,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
3520 gate_fn->fn_en = fn_en;
3521 gate_fn->fn_dis = fn_dis;
3522
3523- /* ops is the gate ops, but with our enable/disable functions */
3524- if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
3525- clk_gate_fn_ops.disable != clk_gate_fn_disable) {
3526- clk_gate_fn_ops = clk_gate_ops;
3527- clk_gate_fn_ops.enable = clk_gate_fn_enable;
3528- clk_gate_fn_ops.disable = clk_gate_fn_disable;
3529- }
3530-
3531 clk = clk_register(dev, &gate_fn->gate.hw);
3532
3533 if (IS_ERR(clk))
3534diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3535index aead77a..a2253fa 100644
3536--- a/arch/arm/mach-omap2/board-n8x0.c
3537+++ b/arch/arm/mach-omap2/board-n8x0.c
3538@@ -568,7 +568,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3539 }
3540 #endif
3541
3542-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3543+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3544 .late_init = n8x0_menelaus_late_init,
3545 };
3546
3547diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3548index 9fe8c94..c014a4d 100644
3549--- a/arch/arm/mach-omap2/gpmc.c
3550+++ b/arch/arm/mach-omap2/gpmc.c
3551@@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
3552 };
3553
3554 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3555-static struct irq_chip gpmc_irq_chip;
3556 static int gpmc_irq_start;
3557
3558 static struct resource gpmc_mem_root;
3559@@ -727,6 +726,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3560
3561 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3562
3563+static struct irq_chip gpmc_irq_chip = {
3564+ .name = "gpmc",
3565+ .irq_startup = gpmc_irq_noop_ret,
3566+ .irq_enable = gpmc_irq_enable,
3567+ .irq_disable = gpmc_irq_disable,
3568+ .irq_shutdown = gpmc_irq_noop,
3569+ .irq_ack = gpmc_irq_noop,
3570+ .irq_mask = gpmc_irq_noop,
3571+ .irq_unmask = gpmc_irq_noop,
3572+
3573+};
3574+
3575 static int gpmc_setup_irq(void)
3576 {
3577 int i;
3578@@ -741,15 +752,6 @@ static int gpmc_setup_irq(void)
3579 return gpmc_irq_start;
3580 }
3581
3582- gpmc_irq_chip.name = "gpmc";
3583- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3584- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3585- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3586- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3587- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3588- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3589- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3590-
3591 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3592 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3593
3594diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3595index 667915d..2ee1219 100644
3596--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3597+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3598@@ -84,7 +84,7 @@ struct cpu_pm_ops {
3599 int (*finish_suspend)(unsigned long cpu_state);
3600 void (*resume)(void);
3601 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3602-};
3603+} __no_const;
3604
3605 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3606 static struct powerdomain *mpuss_pd;
3607@@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
3608 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3609 {}
3610
3611-struct cpu_pm_ops omap_pm_ops = {
3612+static struct cpu_pm_ops omap_pm_ops __read_only = {
3613 .finish_suspend = default_finish_suspend,
3614 .resume = dummy_cpu_resume,
3615 .scu_prepare = dummy_scu_prepare,
3616diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3617index 693fe48..c15ea73 100644
3618--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3619+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3620@@ -343,7 +343,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3621 return NOTIFY_OK;
3622 }
3623
3624-static struct notifier_block __refdata irq_hotplug_notifier = {
3625+static struct notifier_block irq_hotplug_notifier = {
3626 .notifier_call = irq_cpu_hotplug_notify,
3627 };
3628
3629diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3630index 01ef59d..32ae28a8 100644
3631--- a/arch/arm/mach-omap2/omap_device.c
3632+++ b/arch/arm/mach-omap2/omap_device.c
3633@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3634 struct platform_device __init *omap_device_build(const char *pdev_name,
3635 int pdev_id,
3636 struct omap_hwmod *oh,
3637- void *pdata, int pdata_len)
3638+ const void *pdata, int pdata_len)
3639 {
3640 struct omap_hwmod *ohs[] = { oh };
3641
3642@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3643 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3644 int pdev_id,
3645 struct omap_hwmod **ohs,
3646- int oh_cnt, void *pdata,
3647+ int oh_cnt, const void *pdata,
3648 int pdata_len)
3649 {
3650 int ret = -ENOMEM;
3651diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3652index 78c02b3..c94109a 100644
3653--- a/arch/arm/mach-omap2/omap_device.h
3654+++ b/arch/arm/mach-omap2/omap_device.h
3655@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3656 /* Core code interface */
3657
3658 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3659- struct omap_hwmod *oh, void *pdata,
3660+ struct omap_hwmod *oh, const void *pdata,
3661 int pdata_len);
3662
3663 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3664 struct omap_hwmod **oh, int oh_cnt,
3665- void *pdata, int pdata_len);
3666+ const void *pdata, int pdata_len);
3667
3668 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3669 struct omap_hwmod **ohs, int oh_cnt);
3670diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3671index 66c60fe..c78950d 100644
3672--- a/arch/arm/mach-omap2/omap_hwmod.c
3673+++ b/arch/arm/mach-omap2/omap_hwmod.c
3674@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3675 int (*init_clkdm)(struct omap_hwmod *oh);
3676 void (*update_context_lost)(struct omap_hwmod *oh);
3677 int (*get_context_lost)(struct omap_hwmod *oh);
3678-};
3679+} __no_const;
3680
3681 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3682-static struct omap_hwmod_soc_ops soc_ops;
3683+static struct omap_hwmod_soc_ops soc_ops __read_only;
3684
3685 /* omap_hwmod_list contains all registered struct omap_hwmods */
3686 static LIST_HEAD(omap_hwmod_list);
3687diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3688index 95fee54..cfa9cf1 100644
3689--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3690+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3691@@ -10,6 +10,7 @@
3692
3693 #include <linux/kernel.h>
3694 #include <linux/init.h>
3695+#include <asm/pgtable.h>
3696
3697 #include "powerdomain.h"
3698
3699@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3700
3701 void __init am43xx_powerdomains_init(void)
3702 {
3703- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3704+ pax_open_kernel();
3705+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3706+ pax_close_kernel();
3707 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3708 pwrdm_register_pwrdms(powerdomains_am43xx);
3709 pwrdm_complete_init();
3710diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3711index d15c7bb..b2d1f0c 100644
3712--- a/arch/arm/mach-omap2/wd_timer.c
3713+++ b/arch/arm/mach-omap2/wd_timer.c
3714@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3715 struct omap_hwmod *oh;
3716 char *oh_name = "wd_timer2";
3717 char *dev_name = "omap_wdt";
3718- struct omap_wd_timer_platform_data pdata;
3719+ static struct omap_wd_timer_platform_data pdata = {
3720+ .read_reset_sources = prm_read_reset_sources
3721+ };
3722
3723 if (!cpu_class_is_omap2() || of_have_populated_dt())
3724 return 0;
3725@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3726 return -EINVAL;
3727 }
3728
3729- pdata.read_reset_sources = prm_read_reset_sources;
3730-
3731 pdev = omap_device_build(dev_name, id, oh, &pdata,
3732 sizeof(struct omap_wd_timer_platform_data));
3733 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3734diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3735index b82dcae..44ee5b6 100644
3736--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3737+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3738@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3739 bool entered_lp2 = false;
3740
3741 if (tegra_pending_sgi())
3742- ACCESS_ONCE(abort_flag) = true;
3743+ ACCESS_ONCE_RW(abort_flag) = true;
3744
3745 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3746
3747diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3748index 2dea8b5..6499da2 100644
3749--- a/arch/arm/mach-ux500/setup.h
3750+++ b/arch/arm/mach-ux500/setup.h
3751@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3752 .type = MT_DEVICE, \
3753 }
3754
3755-#define __MEM_DEV_DESC(x, sz) { \
3756- .virtual = IO_ADDRESS(x), \
3757- .pfn = __phys_to_pfn(x), \
3758- .length = sz, \
3759- .type = MT_MEMORY_RWX, \
3760-}
3761-
3762 extern struct smp_operations ux500_smp_ops;
3763 extern void ux500_cpu_die(unsigned int cpu);
3764
3765diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3766index 5bf7c3c..571e67e 100644
3767--- a/arch/arm/mm/Kconfig
3768+++ b/arch/arm/mm/Kconfig
3769@@ -446,6 +446,7 @@ config CPU_32v5
3770
3771 config CPU_32v6
3772 bool
3773+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3774 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3775
3776 config CPU_32v6K
3777@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3778
3779 config CPU_USE_DOMAINS
3780 bool
3781+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3782 help
3783 This option enables or disables the use of domain switching
3784 via the set_fs() function.
3785@@ -799,6 +801,7 @@ config NEED_KUSER_HELPERS
3786 config KUSER_HELPERS
3787 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3788 default y
3789+ depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
3790 help
3791 Warning: disabling this option may break user programs.
3792
3793@@ -811,7 +814,7 @@ config KUSER_HELPERS
3794 See Documentation/arm/kernel_user_helpers.txt for details.
3795
3796 However, the fixed address nature of these helpers can be used
3797- by ROP (return orientated programming) authors when creating
3798+ by ROP (Return Oriented Programming) authors when creating
3799 exploits.
3800
3801 If all of the binaries and libraries which run on your platform
3802diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3803index 9240364..a2b8cf3 100644
3804--- a/arch/arm/mm/alignment.c
3805+++ b/arch/arm/mm/alignment.c
3806@@ -212,10 +212,12 @@ union offset_union {
3807 #define __get16_unaligned_check(ins,val,addr) \
3808 do { \
3809 unsigned int err = 0, v, a = addr; \
3810+ pax_open_userland(); \
3811 __get8_unaligned_check(ins,v,a,err); \
3812 val = v << ((BE) ? 8 : 0); \
3813 __get8_unaligned_check(ins,v,a,err); \
3814 val |= v << ((BE) ? 0 : 8); \
3815+ pax_close_userland(); \
3816 if (err) \
3817 goto fault; \
3818 } while (0)
3819@@ -229,6 +231,7 @@ union offset_union {
3820 #define __get32_unaligned_check(ins,val,addr) \
3821 do { \
3822 unsigned int err = 0, v, a = addr; \
3823+ pax_open_userland(); \
3824 __get8_unaligned_check(ins,v,a,err); \
3825 val = v << ((BE) ? 24 : 0); \
3826 __get8_unaligned_check(ins,v,a,err); \
3827@@ -237,6 +240,7 @@ union offset_union {
3828 val |= v << ((BE) ? 8 : 16); \
3829 __get8_unaligned_check(ins,v,a,err); \
3830 val |= v << ((BE) ? 0 : 24); \
3831+ pax_close_userland(); \
3832 if (err) \
3833 goto fault; \
3834 } while (0)
3835@@ -250,6 +254,7 @@ union offset_union {
3836 #define __put16_unaligned_check(ins,val,addr) \
3837 do { \
3838 unsigned int err = 0, v = val, a = addr; \
3839+ pax_open_userland(); \
3840 __asm__( FIRST_BYTE_16 \
3841 ARM( "1: "ins" %1, [%2], #1\n" ) \
3842 THUMB( "1: "ins" %1, [%2]\n" ) \
3843@@ -269,6 +274,7 @@ union offset_union {
3844 " .popsection\n" \
3845 : "=r" (err), "=&r" (v), "=&r" (a) \
3846 : "0" (err), "1" (v), "2" (a)); \
3847+ pax_close_userland(); \
3848 if (err) \
3849 goto fault; \
3850 } while (0)
3851@@ -282,6 +288,7 @@ union offset_union {
3852 #define __put32_unaligned_check(ins,val,addr) \
3853 do { \
3854 unsigned int err = 0, v = val, a = addr; \
3855+ pax_open_userland(); \
3856 __asm__( FIRST_BYTE_32 \
3857 ARM( "1: "ins" %1, [%2], #1\n" ) \
3858 THUMB( "1: "ins" %1, [%2]\n" ) \
3859@@ -311,6 +318,7 @@ union offset_union {
3860 " .popsection\n" \
3861 : "=r" (err), "=&r" (v), "=&r" (a) \
3862 : "0" (err), "1" (v), "2" (a)); \
3863+ pax_close_userland(); \
3864 if (err) \
3865 goto fault; \
3866 } while (0)
3867diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3868index 7abde2c..9df495f 100644
3869--- a/arch/arm/mm/cache-l2x0.c
3870+++ b/arch/arm/mm/cache-l2x0.c
3871@@ -46,7 +46,7 @@ struct l2x0_of_data {
3872 void (*setup)(const struct device_node *, u32 *, u32 *);
3873 void (*save)(void);
3874 struct outer_cache_fns outer_cache;
3875-};
3876+} __do_const;
3877
3878 static bool of_init = false;
3879
3880diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3881index 6eb97b3..ac509f6 100644
3882--- a/arch/arm/mm/context.c
3883+++ b/arch/arm/mm/context.c
3884@@ -43,7 +43,7 @@
3885 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3886
3887 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3888-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3889+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3890 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3891
3892 static DEFINE_PER_CPU(atomic64_t, active_asids);
3893@@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3894 {
3895 static u32 cur_idx = 1;
3896 u64 asid = atomic64_read(&mm->context.id);
3897- u64 generation = atomic64_read(&asid_generation);
3898+ u64 generation = atomic64_read_unchecked(&asid_generation);
3899
3900 if (asid != 0 && is_reserved_asid(asid)) {
3901 /*
3902@@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3903 */
3904 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3905 if (asid == NUM_USER_ASIDS) {
3906- generation = atomic64_add_return(ASID_FIRST_VERSION,
3907+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3908 &asid_generation);
3909 flush_context(cpu);
3910 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3911@@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3912 cpu_set_reserved_ttbr0();
3913
3914 asid = atomic64_read(&mm->context.id);
3915- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3916+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3917 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3918 goto switch_mm_fastpath;
3919
3920 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3921 /* Check that our ASID belongs to the current generation. */
3922 asid = atomic64_read(&mm->context.id);
3923- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3924+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3925 asid = new_context(mm, cpu);
3926 atomic64_set(&mm->context.id, asid);
3927 }
3928diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3929index eb8830a..5360ce7 100644
3930--- a/arch/arm/mm/fault.c
3931+++ b/arch/arm/mm/fault.c
3932@@ -25,6 +25,7 @@
3933 #include <asm/system_misc.h>
3934 #include <asm/system_info.h>
3935 #include <asm/tlbflush.h>
3936+#include <asm/sections.h>
3937
3938 #include "fault.h"
3939
3940@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3941 if (fixup_exception(regs))
3942 return;
3943
3944+#ifdef CONFIG_PAX_MEMORY_UDEREF
3945+ if (addr < TASK_SIZE) {
3946+ if (current->signal->curr_ip)
3947+ 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),
3948+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3949+ else
3950+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3951+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3952+ }
3953+#endif
3954+
3955+#ifdef CONFIG_PAX_KERNEXEC
3956+ if ((fsr & FSR_WRITE) &&
3957+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3958+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3959+ {
3960+ if (current->signal->curr_ip)
3961+ 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),
3962+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3963+ else
3964+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3965+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3966+ }
3967+#endif
3968+
3969 /*
3970 * No handler, we'll have to terminate things with extreme prejudice.
3971 */
3972@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3973 }
3974 #endif
3975
3976+#ifdef CONFIG_PAX_PAGEEXEC
3977+ if (fsr & FSR_LNX_PF) {
3978+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3979+ do_group_exit(SIGKILL);
3980+ }
3981+#endif
3982+
3983 tsk->thread.address = addr;
3984 tsk->thread.error_code = fsr;
3985 tsk->thread.trap_no = 14;
3986@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3987 }
3988 #endif /* CONFIG_MMU */
3989
3990+#ifdef CONFIG_PAX_PAGEEXEC
3991+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3992+{
3993+ long i;
3994+
3995+ printk(KERN_ERR "PAX: bytes at PC: ");
3996+ for (i = 0; i < 20; i++) {
3997+ unsigned char c;
3998+ if (get_user(c, (__force unsigned char __user *)pc+i))
3999+ printk(KERN_CONT "?? ");
4000+ else
4001+ printk(KERN_CONT "%02x ", c);
4002+ }
4003+ printk("\n");
4004+
4005+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4006+ for (i = -1; i < 20; i++) {
4007+ unsigned long c;
4008+ if (get_user(c, (__force unsigned long __user *)sp+i))
4009+ printk(KERN_CONT "???????? ");
4010+ else
4011+ printk(KERN_CONT "%08lx ", c);
4012+ }
4013+ printk("\n");
4014+}
4015+#endif
4016+
4017 /*
4018 * First Level Translation Fault Handler
4019 *
4020@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4021 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4022 struct siginfo info;
4023
4024+#ifdef CONFIG_PAX_MEMORY_UDEREF
4025+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4026+ if (current->signal->curr_ip)
4027+ 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),
4028+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4029+ else
4030+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4031+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4032+ goto die;
4033+ }
4034+#endif
4035+
4036 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4037 return;
4038
4039+die:
4040 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4041 inf->name, fsr, addr);
4042
4043@@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4044 ifsr_info[nr].name = name;
4045 }
4046
4047+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4048+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4049+
4050 asmlinkage void __exception
4051 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4052 {
4053 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4054 struct siginfo info;
4055+ unsigned long pc = instruction_pointer(regs);
4056+
4057+ if (user_mode(regs)) {
4058+ unsigned long sigpage = current->mm->context.sigpage;
4059+
4060+ if (sigpage <= pc && pc < sigpage + 7*4) {
4061+ if (pc < sigpage + 3*4)
4062+ sys_sigreturn(regs);
4063+ else
4064+ sys_rt_sigreturn(regs);
4065+ return;
4066+ }
4067+ if (pc == 0xffff0f60UL) {
4068+ /*
4069+ * PaX: __kuser_cmpxchg64 emulation
4070+ */
4071+ // TODO
4072+ //regs->ARM_pc = regs->ARM_lr;
4073+ //return;
4074+ }
4075+ if (pc == 0xffff0fa0UL) {
4076+ /*
4077+ * PaX: __kuser_memory_barrier emulation
4078+ */
4079+ // dmb(); implied by the exception
4080+ regs->ARM_pc = regs->ARM_lr;
4081+ return;
4082+ }
4083+ if (pc == 0xffff0fc0UL) {
4084+ /*
4085+ * PaX: __kuser_cmpxchg emulation
4086+ */
4087+ // TODO
4088+ //long new;
4089+ //int op;
4090+
4091+ //op = FUTEX_OP_SET << 28;
4092+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4093+ //regs->ARM_r0 = old != new;
4094+ //regs->ARM_pc = regs->ARM_lr;
4095+ //return;
4096+ }
4097+ if (pc == 0xffff0fe0UL) {
4098+ /*
4099+ * PaX: __kuser_get_tls emulation
4100+ */
4101+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4102+ regs->ARM_pc = regs->ARM_lr;
4103+ return;
4104+ }
4105+ }
4106+
4107+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4108+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4109+ if (current->signal->curr_ip)
4110+ 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),
4111+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4112+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4113+ else
4114+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4115+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4116+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4117+ goto die;
4118+ }
4119+#endif
4120+
4121+#ifdef CONFIG_PAX_REFCOUNT
4122+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4123+ unsigned int bkpt;
4124+
4125+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4126+ current->thread.error_code = ifsr;
4127+ current->thread.trap_no = 0;
4128+ pax_report_refcount_overflow(regs);
4129+ fixup_exception(regs);
4130+ return;
4131+ }
4132+ }
4133+#endif
4134
4135 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4136 return;
4137
4138+die:
4139 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4140 inf->name, ifsr, addr);
4141
4142diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4143index cf08bdf..772656c 100644
4144--- a/arch/arm/mm/fault.h
4145+++ b/arch/arm/mm/fault.h
4146@@ -3,6 +3,7 @@
4147
4148 /*
4149 * Fault status register encodings. We steal bit 31 for our own purposes.
4150+ * Set when the FSR value is from an instruction fault.
4151 */
4152 #define FSR_LNX_PF (1 << 31)
4153 #define FSR_WRITE (1 << 11)
4154@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4155 }
4156 #endif
4157
4158+/* valid for LPAE and !LPAE */
4159+static inline int is_xn_fault(unsigned int fsr)
4160+{
4161+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4162+}
4163+
4164+static inline int is_domain_fault(unsigned int fsr)
4165+{
4166+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4167+}
4168+
4169 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4170 unsigned long search_exception_table(unsigned long addr);
4171
4172diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4173index 2a77ba8..68e6a7a 100644
4174--- a/arch/arm/mm/init.c
4175+++ b/arch/arm/mm/init.c
4176@@ -30,6 +30,8 @@
4177 #include <asm/setup.h>
4178 #include <asm/tlb.h>
4179 #include <asm/fixmap.h>
4180+#include <asm/system_info.h>
4181+#include <asm/cp15.h>
4182
4183 #include <asm/mach/arch.h>
4184 #include <asm/mach/map.h>
4185@@ -627,7 +629,46 @@ void free_initmem(void)
4186 {
4187 #ifdef CONFIG_HAVE_TCM
4188 extern char __tcm_start, __tcm_end;
4189+#endif
4190
4191+#ifdef CONFIG_PAX_KERNEXEC
4192+ unsigned long addr;
4193+ pgd_t *pgd;
4194+ pud_t *pud;
4195+ pmd_t *pmd;
4196+ int cpu_arch = cpu_architecture();
4197+ unsigned int cr = get_cr();
4198+
4199+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4200+ /* make pages tables, etc before .text NX */
4201+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4202+ pgd = pgd_offset_k(addr);
4203+ pud = pud_offset(pgd, addr);
4204+ pmd = pmd_offset(pud, addr);
4205+ __section_update(pmd, addr, PMD_SECT_XN);
4206+ }
4207+ /* make init NX */
4208+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4209+ pgd = pgd_offset_k(addr);
4210+ pud = pud_offset(pgd, addr);
4211+ pmd = pmd_offset(pud, addr);
4212+ __section_update(pmd, addr, PMD_SECT_XN);
4213+ }
4214+ /* make kernel code/rodata RX */
4215+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4216+ pgd = pgd_offset_k(addr);
4217+ pud = pud_offset(pgd, addr);
4218+ pmd = pmd_offset(pud, addr);
4219+#ifdef CONFIG_ARM_LPAE
4220+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4221+#else
4222+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4223+#endif
4224+ }
4225+ }
4226+#endif
4227+
4228+#ifdef CONFIG_HAVE_TCM
4229 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4230 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4231 #endif
4232diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4233index f9c32ba..8540068 100644
4234--- a/arch/arm/mm/ioremap.c
4235+++ b/arch/arm/mm/ioremap.c
4236@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4237 unsigned int mtype;
4238
4239 if (cached)
4240- mtype = MT_MEMORY_RWX;
4241+ mtype = MT_MEMORY_RX;
4242 else
4243- mtype = MT_MEMORY_RWX_NONCACHED;
4244+ mtype = MT_MEMORY_RX_NONCACHED;
4245
4246 return __arm_ioremap_caller(phys_addr, size, mtype,
4247 __builtin_return_address(0));
4248diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4249index 5e85ed3..b10a7ed 100644
4250--- a/arch/arm/mm/mmap.c
4251+++ b/arch/arm/mm/mmap.c
4252@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4253 struct vm_area_struct *vma;
4254 int do_align = 0;
4255 int aliasing = cache_is_vipt_aliasing();
4256+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4257 struct vm_unmapped_area_info info;
4258
4259 /*
4260@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4261 if (len > TASK_SIZE)
4262 return -ENOMEM;
4263
4264+#ifdef CONFIG_PAX_RANDMMAP
4265+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4266+#endif
4267+
4268 if (addr) {
4269 if (do_align)
4270 addr = COLOUR_ALIGN(addr, pgoff);
4271@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4272 addr = PAGE_ALIGN(addr);
4273
4274 vma = find_vma(mm, addr);
4275- if (TASK_SIZE - len >= addr &&
4276- (!vma || addr + len <= vma->vm_start))
4277+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4278 return addr;
4279 }
4280
4281@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4282 info.high_limit = TASK_SIZE;
4283 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4284 info.align_offset = pgoff << PAGE_SHIFT;
4285+ info.threadstack_offset = offset;
4286 return vm_unmapped_area(&info);
4287 }
4288
4289@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4290 unsigned long addr = addr0;
4291 int do_align = 0;
4292 int aliasing = cache_is_vipt_aliasing();
4293+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4294 struct vm_unmapped_area_info info;
4295
4296 /*
4297@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4298 return addr;
4299 }
4300
4301+#ifdef CONFIG_PAX_RANDMMAP
4302+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4303+#endif
4304+
4305 /* requesting a specific address */
4306 if (addr) {
4307 if (do_align)
4308@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4309 else
4310 addr = PAGE_ALIGN(addr);
4311 vma = find_vma(mm, addr);
4312- if (TASK_SIZE - len >= addr &&
4313- (!vma || addr + len <= vma->vm_start))
4314+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4315 return addr;
4316 }
4317
4318@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4319 info.high_limit = mm->mmap_base;
4320 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4321 info.align_offset = pgoff << PAGE_SHIFT;
4322+ info.threadstack_offset = offset;
4323 addr = vm_unmapped_area(&info);
4324
4325 /*
4326@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4327 {
4328 unsigned long random_factor = 0UL;
4329
4330+#ifdef CONFIG_PAX_RANDMMAP
4331+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4332+#endif
4333+
4334 /* 8 bits of randomness in 20 address space bits */
4335 if ((current->flags & PF_RANDOMIZE) &&
4336 !(current->personality & ADDR_NO_RANDOMIZE))
4337@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4338
4339 if (mmap_is_legacy()) {
4340 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4341+
4342+#ifdef CONFIG_PAX_RANDMMAP
4343+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4344+ mm->mmap_base += mm->delta_mmap;
4345+#endif
4346+
4347 mm->get_unmapped_area = arch_get_unmapped_area;
4348 } else {
4349 mm->mmap_base = mmap_base(random_factor);
4350+
4351+#ifdef CONFIG_PAX_RANDMMAP
4352+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4353+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4354+#endif
4355+
4356 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4357 }
4358 }
4359diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4360index b68c6b2..f66c492 100644
4361--- a/arch/arm/mm/mmu.c
4362+++ b/arch/arm/mm/mmu.c
4363@@ -39,6 +39,22 @@
4364 #include "mm.h"
4365 #include "tcm.h"
4366
4367+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4368+void modify_domain(unsigned int dom, unsigned int type)
4369+{
4370+ struct thread_info *thread = current_thread_info();
4371+ unsigned int domain = thread->cpu_domain;
4372+ /*
4373+ * DOMAIN_MANAGER might be defined to some other value,
4374+ * use the arch-defined constant
4375+ */
4376+ domain &= ~domain_val(dom, 3);
4377+ thread->cpu_domain = domain | domain_val(dom, type);
4378+ set_domain(thread->cpu_domain);
4379+}
4380+EXPORT_SYMBOL(modify_domain);
4381+#endif
4382+
4383 /*
4384 * empty_zero_page is a special page that is used for
4385 * zero-initialized data and COW.
4386@@ -235,7 +251,15 @@ __setup("noalign", noalign_setup);
4387 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4388 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4389
4390-static struct mem_type mem_types[] = {
4391+#ifdef CONFIG_PAX_KERNEXEC
4392+#define L_PTE_KERNEXEC L_PTE_RDONLY
4393+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4394+#else
4395+#define L_PTE_KERNEXEC L_PTE_DIRTY
4396+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4397+#endif
4398+
4399+static struct mem_type mem_types[] __read_only = {
4400 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4401 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4402 L_PTE_SHARED,
4403@@ -264,19 +288,19 @@ static struct mem_type mem_types[] = {
4404 .prot_sect = PROT_SECT_DEVICE,
4405 .domain = DOMAIN_IO,
4406 },
4407- [MT_UNCACHED] = {
4408+ [MT_UNCACHED_RW] = {
4409 .prot_pte = PROT_PTE_DEVICE,
4410 .prot_l1 = PMD_TYPE_TABLE,
4411 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4412 .domain = DOMAIN_IO,
4413 },
4414- [MT_CACHECLEAN] = {
4415- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4416+ [MT_CACHECLEAN_RO] = {
4417+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4418 .domain = DOMAIN_KERNEL,
4419 },
4420 #ifndef CONFIG_ARM_LPAE
4421- [MT_MINICLEAN] = {
4422- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4423+ [MT_MINICLEAN_RO] = {
4424+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427 #endif
4428@@ -284,15 +308,15 @@ static struct mem_type mem_types[] = {
4429 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4430 L_PTE_RDONLY,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432- .domain = DOMAIN_USER,
4433+ .domain = DOMAIN_VECTORS,
4434 },
4435 [MT_HIGH_VECTORS] = {
4436 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4437 L_PTE_USER | L_PTE_RDONLY,
4438 .prot_l1 = PMD_TYPE_TABLE,
4439- .domain = DOMAIN_USER,
4440+ .domain = DOMAIN_VECTORS,
4441 },
4442- [MT_MEMORY_RWX] = {
4443+ [__MT_MEMORY_RWX] = {
4444 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4445 .prot_l1 = PMD_TYPE_TABLE,
4446 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4447@@ -305,17 +329,30 @@ static struct mem_type mem_types[] = {
4448 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4449 .domain = DOMAIN_KERNEL,
4450 },
4451- [MT_ROM] = {
4452- .prot_sect = PMD_TYPE_SECT,
4453+ [MT_MEMORY_RX] = {
4454+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4455+ .prot_l1 = PMD_TYPE_TABLE,
4456+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4457+ .domain = DOMAIN_KERNEL,
4458+ },
4459+ [MT_ROM_RX] = {
4460+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4461 .domain = DOMAIN_KERNEL,
4462 },
4463- [MT_MEMORY_RWX_NONCACHED] = {
4464+ [MT_MEMORY_RW_NONCACHED] = {
4465 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4466 L_PTE_MT_BUFFERABLE,
4467 .prot_l1 = PMD_TYPE_TABLE,
4468 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4469 .domain = DOMAIN_KERNEL,
4470 },
4471+ [MT_MEMORY_RX_NONCACHED] = {
4472+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4473+ L_PTE_MT_BUFFERABLE,
4474+ .prot_l1 = PMD_TYPE_TABLE,
4475+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4476+ .domain = DOMAIN_KERNEL,
4477+ },
4478 [MT_MEMORY_RW_DTCM] = {
4479 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4480 L_PTE_XN,
4481@@ -323,9 +360,10 @@ static struct mem_type mem_types[] = {
4482 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4483 .domain = DOMAIN_KERNEL,
4484 },
4485- [MT_MEMORY_RWX_ITCM] = {
4486- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4487+ [MT_MEMORY_RX_ITCM] = {
4488+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4489 .prot_l1 = PMD_TYPE_TABLE,
4490+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4491 .domain = DOMAIN_KERNEL,
4492 },
4493 [MT_MEMORY_RW_SO] = {
4494@@ -534,9 +572,14 @@ static void __init build_mem_type_table(void)
4495 * Mark cache clean areas and XIP ROM read only
4496 * from SVC mode and no access from userspace.
4497 */
4498- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4499- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4500- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4501+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4502+#ifdef CONFIG_PAX_KERNEXEC
4503+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4504+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4505+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4506+#endif
4507+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4508+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4509 #endif
4510
4511 if (is_smp()) {
4512@@ -552,13 +595,17 @@ static void __init build_mem_type_table(void)
4513 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4514 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4515 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4516- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4517- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4518+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4519+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4520 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4521 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4522+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4523+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4524 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4525- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4526- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4527+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4528+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4529+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4530+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4531 }
4532 }
4533
4534@@ -569,15 +616,20 @@ static void __init build_mem_type_table(void)
4535 if (cpu_arch >= CPU_ARCH_ARMv6) {
4536 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4537 /* Non-cacheable Normal is XCB = 001 */
4538- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4539+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4540+ PMD_SECT_BUFFERED;
4541+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4542 PMD_SECT_BUFFERED;
4543 } else {
4544 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4545- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4546+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4547+ PMD_SECT_TEX(1);
4548+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4549 PMD_SECT_TEX(1);
4550 }
4551 } else {
4552- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4553+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4554+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4555 }
4556
4557 #ifdef CONFIG_ARM_LPAE
4558@@ -593,6 +645,8 @@ static void __init build_mem_type_table(void)
4559 vecs_pgprot |= PTE_EXT_AF;
4560 #endif
4561
4562+ user_pgprot |= __supported_pte_mask;
4563+
4564 for (i = 0; i < 16; i++) {
4565 pteval_t v = pgprot_val(protection_map[i]);
4566 protection_map[i] = __pgprot(v | user_pgprot);
4567@@ -610,21 +664,24 @@ static void __init build_mem_type_table(void)
4568
4569 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4570 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4571- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4572- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4573+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4574+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4575 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4576 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4577+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4578+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4579 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4580- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4581- mem_types[MT_ROM].prot_sect |= cp->pmd;
4582+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4583+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4584+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4585
4586 switch (cp->pmd) {
4587 case PMD_SECT_WT:
4588- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4589+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4590 break;
4591 case PMD_SECT_WB:
4592 case PMD_SECT_WBWA:
4593- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4594+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4595 break;
4596 }
4597 pr_info("Memory policy: %sData cache %s\n",
4598@@ -842,7 +899,7 @@ static void __init create_mapping(struct map_desc *md)
4599 return;
4600 }
4601
4602- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4603+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4604 md->virtual >= PAGE_OFFSET &&
4605 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4606 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4607@@ -1257,18 +1314,15 @@ void __init arm_mm_memblock_reserve(void)
4608 * called function. This means you can't use any function or debugging
4609 * method which may touch any device, otherwise the kernel _will_ crash.
4610 */
4611+
4612+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4613+
4614 static void __init devicemaps_init(const struct machine_desc *mdesc)
4615 {
4616 struct map_desc map;
4617 unsigned long addr;
4618- void *vectors;
4619
4620- /*
4621- * Allocate the vector page early.
4622- */
4623- vectors = early_alloc(PAGE_SIZE * 2);
4624-
4625- early_trap_init(vectors);
4626+ early_trap_init(&vectors);
4627
4628 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4629 pmd_clear(pmd_off_k(addr));
4630@@ -1281,7 +1335,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4631 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4632 map.virtual = MODULES_VADDR;
4633 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4634- map.type = MT_ROM;
4635+ map.type = MT_ROM_RX;
4636 create_mapping(&map);
4637 #endif
4638
4639@@ -1292,14 +1346,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4640 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4641 map.virtual = FLUSH_BASE;
4642 map.length = SZ_1M;
4643- map.type = MT_CACHECLEAN;
4644+ map.type = MT_CACHECLEAN_RO;
4645 create_mapping(&map);
4646 #endif
4647 #ifdef FLUSH_BASE_MINICACHE
4648 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4649 map.virtual = FLUSH_BASE_MINICACHE;
4650 map.length = SZ_1M;
4651- map.type = MT_MINICLEAN;
4652+ map.type = MT_MINICLEAN_RO;
4653 create_mapping(&map);
4654 #endif
4655
4656@@ -1308,7 +1362,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4657 * location (0xffff0000). If we aren't using high-vectors, also
4658 * create a mapping at the low-vectors virtual address.
4659 */
4660- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4661+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4662 map.virtual = 0xffff0000;
4663 map.length = PAGE_SIZE;
4664 #ifdef CONFIG_KUSER_HELPERS
4665@@ -1365,8 +1419,10 @@ static void __init kmap_init(void)
4666 static void __init map_lowmem(void)
4667 {
4668 struct memblock_region *reg;
4669+#ifndef CONFIG_PAX_KERNEXEC
4670 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4671 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4672+#endif
4673
4674 /* Map all the lowmem memory banks. */
4675 for_each_memblock(memory, reg) {
4676@@ -1379,11 +1435,48 @@ static void __init map_lowmem(void)
4677 if (start >= end)
4678 break;
4679
4680+#ifdef CONFIG_PAX_KERNEXEC
4681+ map.pfn = __phys_to_pfn(start);
4682+ map.virtual = __phys_to_virt(start);
4683+ map.length = end - start;
4684+
4685+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4686+ struct map_desc kernel;
4687+ struct map_desc initmap;
4688+
4689+ /* when freeing initmem we will make this RW */
4690+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4691+ initmap.virtual = (unsigned long)__init_begin;
4692+ initmap.length = _sdata - __init_begin;
4693+ initmap.type = __MT_MEMORY_RWX;
4694+ create_mapping(&initmap);
4695+
4696+ /* when freeing initmem we will make this RX */
4697+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4698+ kernel.virtual = (unsigned long)_stext;
4699+ kernel.length = __init_begin - _stext;
4700+ kernel.type = __MT_MEMORY_RWX;
4701+ create_mapping(&kernel);
4702+
4703+ if (map.virtual < (unsigned long)_stext) {
4704+ map.length = (unsigned long)_stext - map.virtual;
4705+ map.type = __MT_MEMORY_RWX;
4706+ create_mapping(&map);
4707+ }
4708+
4709+ map.pfn = __phys_to_pfn(__pa(_sdata));
4710+ map.virtual = (unsigned long)_sdata;
4711+ map.length = end - __pa(_sdata);
4712+ }
4713+
4714+ map.type = MT_MEMORY_RW;
4715+ create_mapping(&map);
4716+#else
4717 if (end < kernel_x_start || start >= kernel_x_end) {
4718 map.pfn = __phys_to_pfn(start);
4719 map.virtual = __phys_to_virt(start);
4720 map.length = end - start;
4721- map.type = MT_MEMORY_RWX;
4722+ map.type = __MT_MEMORY_RWX;
4723
4724 create_mapping(&map);
4725 } else {
4726@@ -1400,7 +1493,7 @@ static void __init map_lowmem(void)
4727 map.pfn = __phys_to_pfn(kernel_x_start);
4728 map.virtual = __phys_to_virt(kernel_x_start);
4729 map.length = kernel_x_end - kernel_x_start;
4730- map.type = MT_MEMORY_RWX;
4731+ map.type = __MT_MEMORY_RWX;
4732
4733 create_mapping(&map);
4734
4735@@ -1413,6 +1506,7 @@ static void __init map_lowmem(void)
4736 create_mapping(&map);
4737 }
4738 }
4739+#endif
4740 }
4741 }
4742
4743diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4744index 5b217f4..c23f40e 100644
4745--- a/arch/arm/plat-iop/setup.c
4746+++ b/arch/arm/plat-iop/setup.c
4747@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4748 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4749 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4750 .length = IOP3XX_PERIPHERAL_SIZE,
4751- .type = MT_UNCACHED,
4752+ .type = MT_UNCACHED_RW,
4753 },
4754 };
4755
4756diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4757index a5bc92d..0bb4730 100644
4758--- a/arch/arm/plat-omap/sram.c
4759+++ b/arch/arm/plat-omap/sram.c
4760@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4761 * Looks like we need to preserve some bootloader code at the
4762 * beginning of SRAM for jumping to flash for reboot to work...
4763 */
4764+ pax_open_kernel();
4765 memset_io(omap_sram_base + omap_sram_skip, 0,
4766 omap_sram_size - omap_sram_skip);
4767+ pax_close_kernel();
4768 }
4769diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4770index ce6d763..cfea917 100644
4771--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4772+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4773@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4774 int (*started)(unsigned ch);
4775 int (*flush)(unsigned ch);
4776 int (*stop)(unsigned ch);
4777-};
4778+} __no_const;
4779
4780 extern void *samsung_dmadev_get_ops(void);
4781 extern void *s3c_dma_get_ops(void);
4782diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4783index 66eb764..b529b84 100644
4784--- a/arch/arm64/include/asm/barrier.h
4785+++ b/arch/arm64/include/asm/barrier.h
4786@@ -41,7 +41,7 @@
4787 do { \
4788 compiletime_assert_atomic_type(*p); \
4789 smp_mb(); \
4790- ACCESS_ONCE(*p) = (v); \
4791+ ACCESS_ONCE_RW(*p) = (v); \
4792 } while (0)
4793
4794 #define smp_load_acquire(p) \
4795diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4796index 3bf8f4e..5dd5491 100644
4797--- a/arch/arm64/include/asm/uaccess.h
4798+++ b/arch/arm64/include/asm/uaccess.h
4799@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4800 flag; \
4801 })
4802
4803+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4804 #define access_ok(type, addr, size) __range_ok(addr, size)
4805 #define user_addr_max get_fs
4806
4807diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4808index c3a58a1..78fbf54 100644
4809--- a/arch/avr32/include/asm/cache.h
4810+++ b/arch/avr32/include/asm/cache.h
4811@@ -1,8 +1,10 @@
4812 #ifndef __ASM_AVR32_CACHE_H
4813 #define __ASM_AVR32_CACHE_H
4814
4815+#include <linux/const.h>
4816+
4817 #define L1_CACHE_SHIFT 5
4818-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4819+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4820
4821 /*
4822 * Memory returned by kmalloc() may be used for DMA, so we must make
4823diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4824index d232888..87c8df1 100644
4825--- a/arch/avr32/include/asm/elf.h
4826+++ b/arch/avr32/include/asm/elf.h
4827@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4828 the loader. We need to make sure that it is out of the way of the program
4829 that it will "exec", and that there is sufficient room for the brk. */
4830
4831-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4832+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4833
4834+#ifdef CONFIG_PAX_ASLR
4835+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4836+
4837+#define PAX_DELTA_MMAP_LEN 15
4838+#define PAX_DELTA_STACK_LEN 15
4839+#endif
4840
4841 /* This yields a mask that user programs can use to figure out what
4842 instruction set this CPU supports. This could be done in user space,
4843diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4844index 479330b..53717a8 100644
4845--- a/arch/avr32/include/asm/kmap_types.h
4846+++ b/arch/avr32/include/asm/kmap_types.h
4847@@ -2,9 +2,9 @@
4848 #define __ASM_AVR32_KMAP_TYPES_H
4849
4850 #ifdef CONFIG_DEBUG_HIGHMEM
4851-# define KM_TYPE_NR 29
4852+# define KM_TYPE_NR 30
4853 #else
4854-# define KM_TYPE_NR 14
4855+# define KM_TYPE_NR 15
4856 #endif
4857
4858 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4859diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4860index 0eca933..eb78c7b 100644
4861--- a/arch/avr32/mm/fault.c
4862+++ b/arch/avr32/mm/fault.c
4863@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4864
4865 int exception_trace = 1;
4866
4867+#ifdef CONFIG_PAX_PAGEEXEC
4868+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4869+{
4870+ unsigned long i;
4871+
4872+ printk(KERN_ERR "PAX: bytes at PC: ");
4873+ for (i = 0; i < 20; i++) {
4874+ unsigned char c;
4875+ if (get_user(c, (unsigned char *)pc+i))
4876+ printk(KERN_CONT "???????? ");
4877+ else
4878+ printk(KERN_CONT "%02x ", c);
4879+ }
4880+ printk("\n");
4881+}
4882+#endif
4883+
4884 /*
4885 * This routine handles page faults. It determines the address and the
4886 * problem, and then passes it off to one of the appropriate routines.
4887@@ -176,6 +193,16 @@ bad_area:
4888 up_read(&mm->mmap_sem);
4889
4890 if (user_mode(regs)) {
4891+
4892+#ifdef CONFIG_PAX_PAGEEXEC
4893+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4894+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4895+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4896+ do_group_exit(SIGKILL);
4897+ }
4898+ }
4899+#endif
4900+
4901 if (exception_trace && printk_ratelimit())
4902 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4903 "sp %08lx ecr %lu\n",
4904diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4905index 568885a..f8008df 100644
4906--- a/arch/blackfin/include/asm/cache.h
4907+++ b/arch/blackfin/include/asm/cache.h
4908@@ -7,6 +7,7 @@
4909 #ifndef __ARCH_BLACKFIN_CACHE_H
4910 #define __ARCH_BLACKFIN_CACHE_H
4911
4912+#include <linux/const.h>
4913 #include <linux/linkage.h> /* for asmlinkage */
4914
4915 /*
4916@@ -14,7 +15,7 @@
4917 * Blackfin loads 32 bytes for cache
4918 */
4919 #define L1_CACHE_SHIFT 5
4920-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4921+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4922 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4923
4924 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4925diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4926index aea2718..3639a60 100644
4927--- a/arch/cris/include/arch-v10/arch/cache.h
4928+++ b/arch/cris/include/arch-v10/arch/cache.h
4929@@ -1,8 +1,9 @@
4930 #ifndef _ASM_ARCH_CACHE_H
4931 #define _ASM_ARCH_CACHE_H
4932
4933+#include <linux/const.h>
4934 /* Etrax 100LX have 32-byte cache-lines. */
4935-#define L1_CACHE_BYTES 32
4936 #define L1_CACHE_SHIFT 5
4937+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4938
4939 #endif /* _ASM_ARCH_CACHE_H */
4940diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4941index 7caf25d..ee65ac5 100644
4942--- a/arch/cris/include/arch-v32/arch/cache.h
4943+++ b/arch/cris/include/arch-v32/arch/cache.h
4944@@ -1,11 +1,12 @@
4945 #ifndef _ASM_CRIS_ARCH_CACHE_H
4946 #define _ASM_CRIS_ARCH_CACHE_H
4947
4948+#include <linux/const.h>
4949 #include <arch/hwregs/dma.h>
4950
4951 /* A cache-line is 32 bytes. */
4952-#define L1_CACHE_BYTES 32
4953 #define L1_CACHE_SHIFT 5
4954+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4955
4956 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4957
4958diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4959index b86329d..6709906 100644
4960--- a/arch/frv/include/asm/atomic.h
4961+++ b/arch/frv/include/asm/atomic.h
4962@@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
4963 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4964 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4965
4966+#define atomic64_read_unchecked(v) atomic64_read(v)
4967+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4968+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4969+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4970+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4971+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4972+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4973+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4974+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4975+
4976 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4977 {
4978 int c, old;
4979diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4980index 2797163..c2a401d 100644
4981--- a/arch/frv/include/asm/cache.h
4982+++ b/arch/frv/include/asm/cache.h
4983@@ -12,10 +12,11 @@
4984 #ifndef __ASM_CACHE_H
4985 #define __ASM_CACHE_H
4986
4987+#include <linux/const.h>
4988
4989 /* bytes per L1 cache line */
4990 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
4991-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4992+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4993
4994 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4995 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
4996diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
4997index 43901f2..0d8b865 100644
4998--- a/arch/frv/include/asm/kmap_types.h
4999+++ b/arch/frv/include/asm/kmap_types.h
5000@@ -2,6 +2,6 @@
5001 #ifndef _ASM_KMAP_TYPES_H
5002 #define _ASM_KMAP_TYPES_H
5003
5004-#define KM_TYPE_NR 17
5005+#define KM_TYPE_NR 18
5006
5007 #endif
5008diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5009index 836f147..4cf23f5 100644
5010--- a/arch/frv/mm/elf-fdpic.c
5011+++ b/arch/frv/mm/elf-fdpic.c
5012@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5013 {
5014 struct vm_area_struct *vma;
5015 struct vm_unmapped_area_info info;
5016+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5017
5018 if (len > TASK_SIZE)
5019 return -ENOMEM;
5020@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5021 if (addr) {
5022 addr = PAGE_ALIGN(addr);
5023 vma = find_vma(current->mm, addr);
5024- if (TASK_SIZE - len >= addr &&
5025- (!vma || addr + len <= vma->vm_start))
5026+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5027 goto success;
5028 }
5029
5030@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5031 info.high_limit = (current->mm->start_stack - 0x00200000);
5032 info.align_mask = 0;
5033 info.align_offset = 0;
5034+ info.threadstack_offset = offset;
5035 addr = vm_unmapped_area(&info);
5036 if (!(addr & ~PAGE_MASK))
5037 goto success;
5038diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5039index f4ca594..adc72fd6 100644
5040--- a/arch/hexagon/include/asm/cache.h
5041+++ b/arch/hexagon/include/asm/cache.h
5042@@ -21,9 +21,11 @@
5043 #ifndef __ASM_CACHE_H
5044 #define __ASM_CACHE_H
5045
5046+#include <linux/const.h>
5047+
5048 /* Bytes per L1 cache line */
5049-#define L1_CACHE_SHIFT (5)
5050-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5051+#define L1_CACHE_SHIFT 5
5052+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5053
5054 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5055 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5056diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5057index 12c3afe..b1abab2 100644
5058--- a/arch/ia64/Kconfig
5059+++ b/arch/ia64/Kconfig
5060@@ -546,6 +546,7 @@ source "drivers/sn/Kconfig"
5061 config KEXEC
5062 bool "kexec system call"
5063 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5064+ depends on !GRKERNSEC_KMEM
5065 help
5066 kexec is a system call that implements the ability to shutdown your
5067 current kernel, and to start another kernel. It is like a reboot
5068diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5069index 6e6fe18..a6ae668 100644
5070--- a/arch/ia64/include/asm/atomic.h
5071+++ b/arch/ia64/include/asm/atomic.h
5072@@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5073 #define atomic64_inc(v) atomic64_add(1, (v))
5074 #define atomic64_dec(v) atomic64_sub(1, (v))
5075
5076+#define atomic64_read_unchecked(v) atomic64_read(v)
5077+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5078+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5079+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5080+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5081+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5082+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5083+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5084+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5085+
5086 /* Atomic operations are already serializing */
5087 #define smp_mb__before_atomic_dec() barrier()
5088 #define smp_mb__after_atomic_dec() barrier()
5089diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5090index d0a69aa..142f878 100644
5091--- a/arch/ia64/include/asm/barrier.h
5092+++ b/arch/ia64/include/asm/barrier.h
5093@@ -64,7 +64,7 @@
5094 do { \
5095 compiletime_assert_atomic_type(*p); \
5096 barrier(); \
5097- ACCESS_ONCE(*p) = (v); \
5098+ ACCESS_ONCE_RW(*p) = (v); \
5099 } while (0)
5100
5101 #define smp_load_acquire(p) \
5102diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5103index 988254a..e1ee885 100644
5104--- a/arch/ia64/include/asm/cache.h
5105+++ b/arch/ia64/include/asm/cache.h
5106@@ -1,6 +1,7 @@
5107 #ifndef _ASM_IA64_CACHE_H
5108 #define _ASM_IA64_CACHE_H
5109
5110+#include <linux/const.h>
5111
5112 /*
5113 * Copyright (C) 1998-2000 Hewlett-Packard Co
5114@@ -9,7 +10,7 @@
5115
5116 /* Bytes per L1 (data) cache line. */
5117 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5118-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5119+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5120
5121 #ifdef CONFIG_SMP
5122 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5123diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5124index 5a83c5c..4d7f553 100644
5125--- a/arch/ia64/include/asm/elf.h
5126+++ b/arch/ia64/include/asm/elf.h
5127@@ -42,6 +42,13 @@
5128 */
5129 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5130
5131+#ifdef CONFIG_PAX_ASLR
5132+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5133+
5134+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5135+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5136+#endif
5137+
5138 #define PT_IA_64_UNWIND 0x70000001
5139
5140 /* IA-64 relocations: */
5141diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5142index 5767cdf..7462574 100644
5143--- a/arch/ia64/include/asm/pgalloc.h
5144+++ b/arch/ia64/include/asm/pgalloc.h
5145@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5146 pgd_val(*pgd_entry) = __pa(pud);
5147 }
5148
5149+static inline void
5150+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5151+{
5152+ pgd_populate(mm, pgd_entry, pud);
5153+}
5154+
5155 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5156 {
5157 return quicklist_alloc(0, GFP_KERNEL, NULL);
5158@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5159 pud_val(*pud_entry) = __pa(pmd);
5160 }
5161
5162+static inline void
5163+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5164+{
5165+ pud_populate(mm, pud_entry, pmd);
5166+}
5167+
5168 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5169 {
5170 return quicklist_alloc(0, GFP_KERNEL, NULL);
5171diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5172index 7935115..c0eca6a 100644
5173--- a/arch/ia64/include/asm/pgtable.h
5174+++ b/arch/ia64/include/asm/pgtable.h
5175@@ -12,7 +12,7 @@
5176 * David Mosberger-Tang <davidm@hpl.hp.com>
5177 */
5178
5179-
5180+#include <linux/const.h>
5181 #include <asm/mman.h>
5182 #include <asm/page.h>
5183 #include <asm/processor.h>
5184@@ -142,6 +142,17 @@
5185 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5186 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5187 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5188+
5189+#ifdef CONFIG_PAX_PAGEEXEC
5190+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5191+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5192+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5193+#else
5194+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5195+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5196+# define PAGE_COPY_NOEXEC PAGE_COPY
5197+#endif
5198+
5199 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5200 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5201 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5202diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5203index 45698cd..e8e2dbc 100644
5204--- a/arch/ia64/include/asm/spinlock.h
5205+++ b/arch/ia64/include/asm/spinlock.h
5206@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5207 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5208
5209 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5210- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5211+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5212 }
5213
5214 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5215diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5216index 449c8c0..3d4b1e9 100644
5217--- a/arch/ia64/include/asm/uaccess.h
5218+++ b/arch/ia64/include/asm/uaccess.h
5219@@ -70,6 +70,7 @@
5220 && ((segment).seg == KERNEL_DS.seg \
5221 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5222 })
5223+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5224 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5225
5226 /*
5227@@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5228 static inline unsigned long
5229 __copy_to_user (void __user *to, const void *from, unsigned long count)
5230 {
5231+ if (count > INT_MAX)
5232+ return count;
5233+
5234+ if (!__builtin_constant_p(count))
5235+ check_object_size(from, count, true);
5236+
5237 return __copy_user(to, (__force void __user *) from, count);
5238 }
5239
5240 static inline unsigned long
5241 __copy_from_user (void *to, const void __user *from, unsigned long count)
5242 {
5243+ if (count > INT_MAX)
5244+ return count;
5245+
5246+ if (!__builtin_constant_p(count))
5247+ check_object_size(to, count, false);
5248+
5249 return __copy_user((__force void __user *) to, from, count);
5250 }
5251
5252@@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5253 ({ \
5254 void __user *__cu_to = (to); \
5255 const void *__cu_from = (from); \
5256- long __cu_len = (n); \
5257+ unsigned long __cu_len = (n); \
5258 \
5259- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5260+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5261+ if (!__builtin_constant_p(n)) \
5262+ check_object_size(__cu_from, __cu_len, true); \
5263 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5264+ } \
5265 __cu_len; \
5266 })
5267
5268@@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5269 ({ \
5270 void *__cu_to = (to); \
5271 const void __user *__cu_from = (from); \
5272- long __cu_len = (n); \
5273+ unsigned long __cu_len = (n); \
5274 \
5275 __chk_user_ptr(__cu_from); \
5276- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5277+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5278+ if (!__builtin_constant_p(n)) \
5279+ check_object_size(__cu_to, __cu_len, false); \
5280 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5281+ } \
5282 __cu_len; \
5283 })
5284
5285diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5286index 24603be..948052d 100644
5287--- a/arch/ia64/kernel/module.c
5288+++ b/arch/ia64/kernel/module.c
5289@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5290 void
5291 module_free (struct module *mod, void *module_region)
5292 {
5293- if (mod && mod->arch.init_unw_table &&
5294- module_region == mod->module_init) {
5295+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5296 unw_remove_unwind_table(mod->arch.init_unw_table);
5297 mod->arch.init_unw_table = NULL;
5298 }
5299@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5300 }
5301
5302 static inline int
5303+in_init_rx (const struct module *mod, uint64_t addr)
5304+{
5305+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5306+}
5307+
5308+static inline int
5309+in_init_rw (const struct module *mod, uint64_t addr)
5310+{
5311+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5312+}
5313+
5314+static inline int
5315 in_init (const struct module *mod, uint64_t addr)
5316 {
5317- return addr - (uint64_t) mod->module_init < mod->init_size;
5318+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5319+}
5320+
5321+static inline int
5322+in_core_rx (const struct module *mod, uint64_t addr)
5323+{
5324+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5325+}
5326+
5327+static inline int
5328+in_core_rw (const struct module *mod, uint64_t addr)
5329+{
5330+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5331 }
5332
5333 static inline int
5334 in_core (const struct module *mod, uint64_t addr)
5335 {
5336- return addr - (uint64_t) mod->module_core < mod->core_size;
5337+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5338 }
5339
5340 static inline int
5341@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5342 break;
5343
5344 case RV_BDREL:
5345- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5346+ if (in_init_rx(mod, val))
5347+ val -= (uint64_t) mod->module_init_rx;
5348+ else if (in_init_rw(mod, val))
5349+ val -= (uint64_t) mod->module_init_rw;
5350+ else if (in_core_rx(mod, val))
5351+ val -= (uint64_t) mod->module_core_rx;
5352+ else if (in_core_rw(mod, val))
5353+ val -= (uint64_t) mod->module_core_rw;
5354 break;
5355
5356 case RV_LTV:
5357@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5358 * addresses have been selected...
5359 */
5360 uint64_t gp;
5361- if (mod->core_size > MAX_LTOFF)
5362+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5363 /*
5364 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5365 * at the end of the module.
5366 */
5367- gp = mod->core_size - MAX_LTOFF / 2;
5368+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5369 else
5370- gp = mod->core_size / 2;
5371- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5372+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5373+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5374 mod->arch.gp = gp;
5375 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5376 }
5377diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5378index c39c3cd..3c77738 100644
5379--- a/arch/ia64/kernel/palinfo.c
5380+++ b/arch/ia64/kernel/palinfo.c
5381@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5382 return NOTIFY_OK;
5383 }
5384
5385-static struct notifier_block __refdata palinfo_cpu_notifier =
5386+static struct notifier_block palinfo_cpu_notifier =
5387 {
5388 .notifier_call = palinfo_cpu_callback,
5389 .priority = 0,
5390diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5391index 41e33f8..65180b2a 100644
5392--- a/arch/ia64/kernel/sys_ia64.c
5393+++ b/arch/ia64/kernel/sys_ia64.c
5394@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5395 unsigned long align_mask = 0;
5396 struct mm_struct *mm = current->mm;
5397 struct vm_unmapped_area_info info;
5398+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5399
5400 if (len > RGN_MAP_LIMIT)
5401 return -ENOMEM;
5402@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5403 if (REGION_NUMBER(addr) == RGN_HPAGE)
5404 addr = 0;
5405 #endif
5406+
5407+#ifdef CONFIG_PAX_RANDMMAP
5408+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5409+ addr = mm->free_area_cache;
5410+ else
5411+#endif
5412+
5413 if (!addr)
5414 addr = TASK_UNMAPPED_BASE;
5415
5416@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5417 info.high_limit = TASK_SIZE;
5418 info.align_mask = align_mask;
5419 info.align_offset = 0;
5420+ info.threadstack_offset = offset;
5421 return vm_unmapped_area(&info);
5422 }
5423
5424diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5425index 84f8a52..7c76178 100644
5426--- a/arch/ia64/kernel/vmlinux.lds.S
5427+++ b/arch/ia64/kernel/vmlinux.lds.S
5428@@ -192,7 +192,7 @@ SECTIONS {
5429 /* Per-cpu data: */
5430 . = ALIGN(PERCPU_PAGE_SIZE);
5431 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5432- __phys_per_cpu_start = __per_cpu_load;
5433+ __phys_per_cpu_start = per_cpu_load;
5434 /*
5435 * ensure percpu data fits
5436 * into percpu page size
5437diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5438index 7225dad..2a7c8256 100644
5439--- a/arch/ia64/mm/fault.c
5440+++ b/arch/ia64/mm/fault.c
5441@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5442 return pte_present(pte);
5443 }
5444
5445+#ifdef CONFIG_PAX_PAGEEXEC
5446+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5447+{
5448+ unsigned long i;
5449+
5450+ printk(KERN_ERR "PAX: bytes at PC: ");
5451+ for (i = 0; i < 8; i++) {
5452+ unsigned int c;
5453+ if (get_user(c, (unsigned int *)pc+i))
5454+ printk(KERN_CONT "???????? ");
5455+ else
5456+ printk(KERN_CONT "%08x ", c);
5457+ }
5458+ printk("\n");
5459+}
5460+#endif
5461+
5462 # define VM_READ_BIT 0
5463 # define VM_WRITE_BIT 1
5464 # define VM_EXEC_BIT 2
5465@@ -151,8 +168,21 @@ retry:
5466 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5467 goto bad_area;
5468
5469- if ((vma->vm_flags & mask) != mask)
5470+ if ((vma->vm_flags & mask) != mask) {
5471+
5472+#ifdef CONFIG_PAX_PAGEEXEC
5473+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5474+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5475+ goto bad_area;
5476+
5477+ up_read(&mm->mmap_sem);
5478+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5479+ do_group_exit(SIGKILL);
5480+ }
5481+#endif
5482+
5483 goto bad_area;
5484+ }
5485
5486 /*
5487 * If for any reason at all we couldn't handle the fault, make
5488diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5489index 76069c1..c2aa816 100644
5490--- a/arch/ia64/mm/hugetlbpage.c
5491+++ b/arch/ia64/mm/hugetlbpage.c
5492@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5493 unsigned long pgoff, unsigned long flags)
5494 {
5495 struct vm_unmapped_area_info info;
5496+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5497
5498 if (len > RGN_MAP_LIMIT)
5499 return -ENOMEM;
5500@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5501 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5502 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5503 info.align_offset = 0;
5504+ info.threadstack_offset = offset;
5505 return vm_unmapped_area(&info);
5506 }
5507
5508diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5509index 25c3502..560dae7 100644
5510--- a/arch/ia64/mm/init.c
5511+++ b/arch/ia64/mm/init.c
5512@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5513 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5514 vma->vm_end = vma->vm_start + PAGE_SIZE;
5515 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5516+
5517+#ifdef CONFIG_PAX_PAGEEXEC
5518+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5519+ vma->vm_flags &= ~VM_EXEC;
5520+
5521+#ifdef CONFIG_PAX_MPROTECT
5522+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5523+ vma->vm_flags &= ~VM_MAYEXEC;
5524+#endif
5525+
5526+ }
5527+#endif
5528+
5529 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5530 down_write(&current->mm->mmap_sem);
5531 if (insert_vm_struct(current->mm, vma)) {
5532diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5533index 40b3ee9..8c2c112 100644
5534--- a/arch/m32r/include/asm/cache.h
5535+++ b/arch/m32r/include/asm/cache.h
5536@@ -1,8 +1,10 @@
5537 #ifndef _ASM_M32R_CACHE_H
5538 #define _ASM_M32R_CACHE_H
5539
5540+#include <linux/const.h>
5541+
5542 /* L1 cache line size */
5543 #define L1_CACHE_SHIFT 4
5544-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5545+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5546
5547 #endif /* _ASM_M32R_CACHE_H */
5548diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5549index 82abd15..d95ae5d 100644
5550--- a/arch/m32r/lib/usercopy.c
5551+++ b/arch/m32r/lib/usercopy.c
5552@@ -14,6 +14,9 @@
5553 unsigned long
5554 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5555 {
5556+ if ((long)n < 0)
5557+ return n;
5558+
5559 prefetch(from);
5560 if (access_ok(VERIFY_WRITE, to, n))
5561 __copy_user(to,from,n);
5562@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5563 unsigned long
5564 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5565 {
5566+ if ((long)n < 0)
5567+ return n;
5568+
5569 prefetchw(to);
5570 if (access_ok(VERIFY_READ, from, n))
5571 __copy_user_zeroing(to,from,n);
5572diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5573index 0395c51..5f26031 100644
5574--- a/arch/m68k/include/asm/cache.h
5575+++ b/arch/m68k/include/asm/cache.h
5576@@ -4,9 +4,11 @@
5577 #ifndef __ARCH_M68K_CACHE_H
5578 #define __ARCH_M68K_CACHE_H
5579
5580+#include <linux/const.h>
5581+
5582 /* bytes per L1 cache line */
5583 #define L1_CACHE_SHIFT 4
5584-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5585+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5586
5587 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5588
5589diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5590index 2d6f0de..de5f5ac 100644
5591--- a/arch/metag/include/asm/barrier.h
5592+++ b/arch/metag/include/asm/barrier.h
5593@@ -89,7 +89,7 @@ static inline void fence(void)
5594 do { \
5595 compiletime_assert_atomic_type(*p); \
5596 smp_mb(); \
5597- ACCESS_ONCE(*p) = (v); \
5598+ ACCESS_ONCE_RW(*p) = (v); \
5599 } while (0)
5600
5601 #define smp_load_acquire(p) \
5602diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5603index 3c52fa6..11b2ad8 100644
5604--- a/arch/metag/mm/hugetlbpage.c
5605+++ b/arch/metag/mm/hugetlbpage.c
5606@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5607 info.high_limit = TASK_SIZE;
5608 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5609 info.align_offset = 0;
5610+ info.threadstack_offset = 0;
5611 return vm_unmapped_area(&info);
5612 }
5613
5614diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5615index 4efe96a..60e8699 100644
5616--- a/arch/microblaze/include/asm/cache.h
5617+++ b/arch/microblaze/include/asm/cache.h
5618@@ -13,11 +13,12 @@
5619 #ifndef _ASM_MICROBLAZE_CACHE_H
5620 #define _ASM_MICROBLAZE_CACHE_H
5621
5622+#include <linux/const.h>
5623 #include <asm/registers.h>
5624
5625 #define L1_CACHE_SHIFT 5
5626 /* word-granular cache in microblaze */
5627-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5628+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5629
5630 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5631
5632diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5633index 5cd695f..9a24ad0 100644
5634--- a/arch/mips/Kconfig
5635+++ b/arch/mips/Kconfig
5636@@ -2395,6 +2395,7 @@ source "kernel/Kconfig.preempt"
5637
5638 config KEXEC
5639 bool "Kexec system call"
5640+ depends on !GRKERNSEC_KMEM
5641 help
5642 kexec is a system call that implements the ability to shutdown your
5643 current kernel, and to start another kernel. It is like a reboot
5644diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5645index 02f2444..506969c 100644
5646--- a/arch/mips/cavium-octeon/dma-octeon.c
5647+++ b/arch/mips/cavium-octeon/dma-octeon.c
5648@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5649 if (dma_release_from_coherent(dev, order, vaddr))
5650 return;
5651
5652- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5653+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5654 }
5655
5656 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5657diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5658index e8eb3d5..2e665d1 100644
5659--- a/arch/mips/include/asm/atomic.h
5660+++ b/arch/mips/include/asm/atomic.h
5661@@ -21,15 +21,39 @@
5662 #include <asm/cmpxchg.h>
5663 #include <asm/war.h>
5664
5665+#ifdef CONFIG_GENERIC_ATOMIC64
5666+#include <asm-generic/atomic64.h>
5667+#endif
5668+
5669 #define ATOMIC_INIT(i) { (i) }
5670
5671+#ifdef CONFIG_64BIT
5672+#define _ASM_EXTABLE(from, to) \
5673+" .section __ex_table,\"a\"\n" \
5674+" .dword " #from ", " #to"\n" \
5675+" .previous\n"
5676+#else
5677+#define _ASM_EXTABLE(from, to) \
5678+" .section __ex_table,\"a\"\n" \
5679+" .word " #from ", " #to"\n" \
5680+" .previous\n"
5681+#endif
5682+
5683 /*
5684 * atomic_read - read atomic variable
5685 * @v: pointer of type atomic_t
5686 *
5687 * Atomically reads the value of @v.
5688 */
5689-#define atomic_read(v) (*(volatile int *)&(v)->counter)
5690+static inline int atomic_read(const atomic_t *v)
5691+{
5692+ return (*(volatile const int *) &v->counter);
5693+}
5694+
5695+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5696+{
5697+ return (*(volatile const int *) &v->counter);
5698+}
5699
5700 /*
5701 * atomic_set - set atomic variable
5702@@ -38,7 +62,15 @@
5703 *
5704 * Atomically sets the value of @v to @i.
5705 */
5706-#define atomic_set(v, i) ((v)->counter = (i))
5707+static inline void atomic_set(atomic_t *v, int i)
5708+{
5709+ v->counter = i;
5710+}
5711+
5712+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5713+{
5714+ v->counter = i;
5715+}
5716
5717 /*
5718 * atomic_add - add integer to atomic variable
5719@@ -47,7 +79,67 @@
5720 *
5721 * Atomically adds @i to @v.
5722 */
5723-static __inline__ void atomic_add(int i, atomic_t * v)
5724+static __inline__ void atomic_add(int i, atomic_t *v)
5725+{
5726+ int temp;
5727+
5728+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5729+ __asm__ __volatile__(
5730+ " .set mips3 \n"
5731+ "1: ll %0, %1 # atomic_add \n"
5732+#ifdef CONFIG_PAX_REFCOUNT
5733+ /* Exception on overflow. */
5734+ "2: add %0, %2 \n"
5735+#else
5736+ " addu %0, %2 \n"
5737+#endif
5738+ " sc %0, %1 \n"
5739+ " beqzl %0, 1b \n"
5740+#ifdef CONFIG_PAX_REFCOUNT
5741+ "3: \n"
5742+ _ASM_EXTABLE(2b, 3b)
5743+#endif
5744+ " .set mips0 \n"
5745+ : "=&r" (temp), "+m" (v->counter)
5746+ : "Ir" (i));
5747+ } else if (kernel_uses_llsc) {
5748+ __asm__ __volatile__(
5749+ " .set mips3 \n"
5750+ "1: ll %0, %1 # atomic_add \n"
5751+#ifdef CONFIG_PAX_REFCOUNT
5752+ /* Exception on overflow. */
5753+ "2: add %0, %2 \n"
5754+#else
5755+ " addu %0, %2 \n"
5756+#endif
5757+ " sc %0, %1 \n"
5758+ " beqz %0, 1b \n"
5759+#ifdef CONFIG_PAX_REFCOUNT
5760+ "3: \n"
5761+ _ASM_EXTABLE(2b, 3b)
5762+#endif
5763+ " .set mips0 \n"
5764+ : "=&r" (temp), "+m" (v->counter)
5765+ : "Ir" (i));
5766+ } else {
5767+ unsigned long flags;
5768+
5769+ raw_local_irq_save(flags);
5770+ __asm__ __volatile__(
5771+#ifdef CONFIG_PAX_REFCOUNT
5772+ /* Exception on overflow. */
5773+ "1: add %0, %1 \n"
5774+ "2: \n"
5775+ _ASM_EXTABLE(1b, 2b)
5776+#else
5777+ " addu %0, %1 \n"
5778+#endif
5779+ : "+r" (v->counter) : "Ir" (i));
5780+ raw_local_irq_restore(flags);
5781+ }
5782+}
5783+
5784+static __inline__ void atomic_add_unchecked(int i, atomic_unchecked_t *v)
5785 {
5786 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5787 int temp;
5788@@ -90,7 +182,67 @@ static __inline__ void atomic_add(int i, atomic_t * v)
5789 *
5790 * Atomically subtracts @i from @v.
5791 */
5792-static __inline__ void atomic_sub(int i, atomic_t * v)
5793+static __inline__ void atomic_sub(int i, atomic_t *v)
5794+{
5795+ int temp;
5796+
5797+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5798+ __asm__ __volatile__(
5799+ " .set mips3 \n"
5800+ "1: ll %0, %1 # atomic64_sub \n"
5801+#ifdef CONFIG_PAX_REFCOUNT
5802+ /* Exception on overflow. */
5803+ "2: sub %0, %2 \n"
5804+#else
5805+ " subu %0, %2 \n"
5806+#endif
5807+ " sc %0, %1 \n"
5808+ " beqzl %0, 1b \n"
5809+#ifdef CONFIG_PAX_REFCOUNT
5810+ "3: \n"
5811+ _ASM_EXTABLE(2b, 3b)
5812+#endif
5813+ " .set mips0 \n"
5814+ : "=&r" (temp), "+m" (v->counter)
5815+ : "Ir" (i));
5816+ } else if (kernel_uses_llsc) {
5817+ __asm__ __volatile__(
5818+ " .set mips3 \n"
5819+ "1: ll %0, %1 # atomic64_sub \n"
5820+#ifdef CONFIG_PAX_REFCOUNT
5821+ /* Exception on overflow. */
5822+ "2: sub %0, %2 \n"
5823+#else
5824+ " subu %0, %2 \n"
5825+#endif
5826+ " sc %0, %1 \n"
5827+ " beqz %0, 1b \n"
5828+#ifdef CONFIG_PAX_REFCOUNT
5829+ "3: \n"
5830+ _ASM_EXTABLE(2b, 3b)
5831+#endif
5832+ " .set mips0 \n"
5833+ : "=&r" (temp), "+m" (v->counter)
5834+ : "Ir" (i));
5835+ } else {
5836+ unsigned long flags;
5837+
5838+ raw_local_irq_save(flags);
5839+ __asm__ __volatile__(
5840+#ifdef CONFIG_PAX_REFCOUNT
5841+ /* Exception on overflow. */
5842+ "1: sub %0, %1 \n"
5843+ "2: \n"
5844+ _ASM_EXTABLE(1b, 2b)
5845+#else
5846+ " subu %0, %1 \n"
5847+#endif
5848+ : "+r" (v->counter) : "Ir" (i));
5849+ raw_local_irq_restore(flags);
5850+ }
5851+}
5852+
5853+static __inline__ void atomic_sub_unchecked(long i, atomic_unchecked_t *v)
5854 {
5855 if (kernel_uses_llsc && R10000_LLSC_WAR) {
5856 int temp;
5857@@ -129,7 +281,93 @@ static __inline__ void atomic_sub(int i, atomic_t * v)
5858 /*
5859 * Same as above, but return the result value
5860 */
5861-static __inline__ int atomic_add_return(int i, atomic_t * v)
5862+static __inline__ int atomic_add_return(int i, atomic_t *v)
5863+{
5864+ int result;
5865+ int temp;
5866+
5867+ smp_mb__before_llsc();
5868+
5869+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5870+ __asm__ __volatile__(
5871+ " .set mips3 \n"
5872+ "1: ll %1, %2 # atomic_add_return \n"
5873+#ifdef CONFIG_PAX_REFCOUNT
5874+ "2: add %0, %1, %3 \n"
5875+#else
5876+ " addu %0, %1, %3 \n"
5877+#endif
5878+ " sc %0, %2 \n"
5879+ " beqzl %0, 1b \n"
5880+#ifdef CONFIG_PAX_REFCOUNT
5881+ " b 4f \n"
5882+ " .set noreorder \n"
5883+ "3: b 5f \n"
5884+ " move %0, %1 \n"
5885+ " .set reorder \n"
5886+ _ASM_EXTABLE(2b, 3b)
5887+#endif
5888+ "4: addu %0, %1, %3 \n"
5889+#ifdef CONFIG_PAX_REFCOUNT
5890+ "5: \n"
5891+#endif
5892+ " .set mips0 \n"
5893+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5894+ : "Ir" (i));
5895+ } else if (kernel_uses_llsc) {
5896+ __asm__ __volatile__(
5897+ " .set mips3 \n"
5898+ "1: ll %1, %2 # atomic_add_return \n"
5899+#ifdef CONFIG_PAX_REFCOUNT
5900+ "2: add %0, %1, %3 \n"
5901+#else
5902+ " addu %0, %1, %3 \n"
5903+#endif
5904+ " sc %0, %2 \n"
5905+ " bnez %0, 4f \n"
5906+ " b 1b \n"
5907+#ifdef CONFIG_PAX_REFCOUNT
5908+ " .set noreorder \n"
5909+ "3: b 5f \n"
5910+ " move %0, %1 \n"
5911+ " .set reorder \n"
5912+ _ASM_EXTABLE(2b, 3b)
5913+#endif
5914+ "4: addu %0, %1, %3 \n"
5915+#ifdef CONFIG_PAX_REFCOUNT
5916+ "5: \n"
5917+#endif
5918+ " .set mips0 \n"
5919+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
5920+ : "Ir" (i));
5921+ } else {
5922+ unsigned long flags;
5923+
5924+ raw_local_irq_save(flags);
5925+ __asm__ __volatile__(
5926+ " lw %0, %1 \n"
5927+#ifdef CONFIG_PAX_REFCOUNT
5928+ /* Exception on overflow. */
5929+ "1: add %0, %2 \n"
5930+#else
5931+ " addu %0, %2 \n"
5932+#endif
5933+ " sw %0, %1 \n"
5934+#ifdef CONFIG_PAX_REFCOUNT
5935+ /* Note: Dest reg is not modified on overflow */
5936+ "2: \n"
5937+ _ASM_EXTABLE(1b, 2b)
5938+#endif
5939+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
5940+ raw_local_irq_restore(flags);
5941+ }
5942+
5943+ smp_llsc_mb();
5944+
5945+ return result;
5946+}
5947+
5948+static __inline__ int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5949 {
5950 int result;
5951
5952@@ -178,7 +416,93 @@ static __inline__ int atomic_add_return(int i, atomic_t * v)
5953 return result;
5954 }
5955
5956-static __inline__ int atomic_sub_return(int i, atomic_t * v)
5957+static __inline__ int atomic_sub_return(int i, atomic_t *v)
5958+{
5959+ int result;
5960+ int temp;
5961+
5962+ smp_mb__before_llsc();
5963+
5964+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
5965+ __asm__ __volatile__(
5966+ " .set mips3 \n"
5967+ "1: ll %1, %2 # atomic_sub_return \n"
5968+#ifdef CONFIG_PAX_REFCOUNT
5969+ "2: sub %0, %1, %3 \n"
5970+#else
5971+ " subu %0, %1, %3 \n"
5972+#endif
5973+ " sc %0, %2 \n"
5974+ " beqzl %0, 1b \n"
5975+#ifdef CONFIG_PAX_REFCOUNT
5976+ " b 4f \n"
5977+ " .set noreorder \n"
5978+ "3: b 5f \n"
5979+ " move %0, %1 \n"
5980+ " .set reorder \n"
5981+ _ASM_EXTABLE(2b, 3b)
5982+#endif
5983+ "4: subu %0, %1, %3 \n"
5984+#ifdef CONFIG_PAX_REFCOUNT
5985+ "5: \n"
5986+#endif
5987+ " .set mips0 \n"
5988+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
5989+ : "Ir" (i), "m" (v->counter)
5990+ : "memory");
5991+ } else if (kernel_uses_llsc) {
5992+ __asm__ __volatile__(
5993+ " .set mips3 \n"
5994+ "1: ll %1, %2 # atomic_sub_return \n"
5995+#ifdef CONFIG_PAX_REFCOUNT
5996+ "2: sub %0, %1, %3 \n"
5997+#else
5998+ " subu %0, %1, %3 \n"
5999+#endif
6000+ " sc %0, %2 \n"
6001+ " bnez %0, 4f \n"
6002+ " b 1b \n"
6003+#ifdef CONFIG_PAX_REFCOUNT
6004+ " .set noreorder \n"
6005+ "3: b 5f \n"
6006+ " move %0, %1 \n"
6007+ " .set reorder \n"
6008+ _ASM_EXTABLE(2b, 3b)
6009+#endif
6010+ "4: subu %0, %1, %3 \n"
6011+#ifdef CONFIG_PAX_REFCOUNT
6012+ "5: \n"
6013+#endif
6014+ " .set mips0 \n"
6015+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6016+ : "Ir" (i));
6017+ } else {
6018+ unsigned long flags;
6019+
6020+ raw_local_irq_save(flags);
6021+ __asm__ __volatile__(
6022+ " lw %0, %1 \n"
6023+#ifdef CONFIG_PAX_REFCOUNT
6024+ /* Exception on overflow. */
6025+ "1: sub %0, %2 \n"
6026+#else
6027+ " subu %0, %2 \n"
6028+#endif
6029+ " sw %0, %1 \n"
6030+#ifdef CONFIG_PAX_REFCOUNT
6031+ /* Note: Dest reg is not modified on overflow */
6032+ "2: \n"
6033+ _ASM_EXTABLE(1b, 2b)
6034+#endif
6035+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6036+ raw_local_irq_restore(flags);
6037+ }
6038+
6039+ smp_llsc_mb();
6040+
6041+ return result;
6042+}
6043+static __inline__ int atomic_sub_return_unchecked(int i, atomic_unchecked_t *v)
6044 {
6045 int result;
6046
6047@@ -238,7 +562,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v)
6048 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6049 * The function returns the old value of @v minus @i.
6050 */
6051-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6052+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6053 {
6054 int result;
6055
6056@@ -295,8 +619,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6057 return result;
6058 }
6059
6060-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6061-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6062+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6063+{
6064+ return cmpxchg(&v->counter, old, new);
6065+}
6066+
6067+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6068+ int new)
6069+{
6070+ return cmpxchg(&(v->counter), old, new);
6071+}
6072+
6073+static inline int atomic_xchg(atomic_t *v, int new)
6074+{
6075+ return xchg(&v->counter, new);
6076+}
6077+
6078+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6079+{
6080+ return xchg(&(v->counter), new);
6081+}
6082
6083 /**
6084 * __atomic_add_unless - add unless the number is a given value
6085@@ -324,6 +666,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6086
6087 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6088 #define atomic_inc_return(v) atomic_add_return(1, (v))
6089+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6090+{
6091+ return atomic_add_return_unchecked(1, v);
6092+}
6093
6094 /*
6095 * atomic_sub_and_test - subtract value from variable and test result
6096@@ -345,6 +691,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6097 * other cases.
6098 */
6099 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6100+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6101+{
6102+ return atomic_add_return_unchecked(1, v) == 0;
6103+}
6104
6105 /*
6106 * atomic_dec_and_test - decrement by 1 and test
6107@@ -369,6 +719,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6108 * Atomically increments @v by 1.
6109 */
6110 #define atomic_inc(v) atomic_add(1, (v))
6111+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6112+{
6113+ atomic_add_unchecked(1, v);
6114+}
6115
6116 /*
6117 * atomic_dec - decrement and test
6118@@ -377,6 +731,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6119 * Atomically decrements @v by 1.
6120 */
6121 #define atomic_dec(v) atomic_sub(1, (v))
6122+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6123+{
6124+ atomic_sub_unchecked(1, v);
6125+}
6126
6127 /*
6128 * atomic_add_negative - add and test if negative
6129@@ -398,14 +756,30 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6130 * @v: pointer of type atomic64_t
6131 *
6132 */
6133-#define atomic64_read(v) (*(volatile long *)&(v)->counter)
6134+static inline long atomic64_read(const atomic64_t *v)
6135+{
6136+ return (*(volatile const long *) &v->counter);
6137+}
6138+
6139+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6140+{
6141+ return (*(volatile const long *) &v->counter);
6142+}
6143
6144 /*
6145 * atomic64_set - set atomic variable
6146 * @v: pointer of type atomic64_t
6147 * @i: required value
6148 */
6149-#define atomic64_set(v, i) ((v)->counter = (i))
6150+static inline void atomic64_set(atomic64_t *v, long i)
6151+{
6152+ v->counter = i;
6153+}
6154+
6155+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6156+{
6157+ v->counter = i;
6158+}
6159
6160 /*
6161 * atomic64_add - add integer to atomic variable
6162@@ -414,7 +788,66 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6163 *
6164 * Atomically adds @i to @v.
6165 */
6166-static __inline__ void atomic64_add(long i, atomic64_t * v)
6167+static __inline__ void atomic64_add(long i, atomic64_t *v)
6168+{
6169+ long temp;
6170+
6171+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6172+ __asm__ __volatile__(
6173+ " .set mips3 \n"
6174+ "1: lld %0, %1 # atomic64_add \n"
6175+#ifdef CONFIG_PAX_REFCOUNT
6176+ /* Exception on overflow. */
6177+ "2: dadd %0, %2 \n"
6178+#else
6179+ " daddu %0, %2 \n"
6180+#endif
6181+ " scd %0, %1 \n"
6182+ " beqzl %0, 1b \n"
6183+#ifdef CONFIG_PAX_REFCOUNT
6184+ "3: \n"
6185+ _ASM_EXTABLE(2b, 3b)
6186+#endif
6187+ " .set mips0 \n"
6188+ : "=&r" (temp), "+m" (v->counter)
6189+ : "Ir" (i));
6190+ } else if (kernel_uses_llsc) {
6191+ __asm__ __volatile__(
6192+ " .set mips3 \n"
6193+ "1: lld %0, %1 # atomic64_add \n"
6194+#ifdef CONFIG_PAX_REFCOUNT
6195+ /* Exception on overflow. */
6196+ "2: dadd %0, %2 \n"
6197+#else
6198+ " daddu %0, %2 \n"
6199+#endif
6200+ " scd %0, %1 \n"
6201+ " beqz %0, 1b \n"
6202+#ifdef CONFIG_PAX_REFCOUNT
6203+ "3: \n"
6204+ _ASM_EXTABLE(2b, 3b)
6205+#endif
6206+ " .set mips0 \n"
6207+ : "=&r" (temp), "+m" (v->counter)
6208+ : "Ir" (i));
6209+ } else {
6210+ unsigned long flags;
6211+
6212+ raw_local_irq_save(flags);
6213+ __asm__ __volatile__(
6214+#ifdef CONFIG_PAX_REFCOUNT
6215+ /* Exception on overflow. */
6216+ "1: dadd %0, %1 \n"
6217+ "2: \n"
6218+ _ASM_EXTABLE(1b, 2b)
6219+#else
6220+ " daddu %0, %1 \n"
6221+#endif
6222+ : "+r" (v->counter) : "Ir" (i));
6223+ raw_local_irq_restore(flags);
6224+ }
6225+}
6226+static __inline__ void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
6227 {
6228 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6229 long temp;
6230@@ -457,7 +890,67 @@ static __inline__ void atomic64_add(long i, atomic64_t * v)
6231 *
6232 * Atomically subtracts @i from @v.
6233 */
6234-static __inline__ void atomic64_sub(long i, atomic64_t * v)
6235+static __inline__ void atomic64_sub(long i, atomic64_t *v)
6236+{
6237+ long temp;
6238+
6239+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6240+ __asm__ __volatile__(
6241+ " .set mips3 \n"
6242+ "1: lld %0, %1 # atomic64_sub \n"
6243+#ifdef CONFIG_PAX_REFCOUNT
6244+ /* Exception on overflow. */
6245+ "2: dsub %0, %2 \n"
6246+#else
6247+ " dsubu %0, %2 \n"
6248+#endif
6249+ " scd %0, %1 \n"
6250+ " beqzl %0, 1b \n"
6251+#ifdef CONFIG_PAX_REFCOUNT
6252+ "3: \n"
6253+ _ASM_EXTABLE(2b, 3b)
6254+#endif
6255+ " .set mips0 \n"
6256+ : "=&r" (temp), "+m" (v->counter)
6257+ : "Ir" (i));
6258+ } else if (kernel_uses_llsc) {
6259+ __asm__ __volatile__(
6260+ " .set mips3 \n"
6261+ "1: lld %0, %1 # atomic64_sub \n"
6262+#ifdef CONFIG_PAX_REFCOUNT
6263+ /* Exception on overflow. */
6264+ "2: dsub %0, %2 \n"
6265+#else
6266+ " dsubu %0, %2 \n"
6267+#endif
6268+ " scd %0, %1 \n"
6269+ " beqz %0, 1b \n"
6270+#ifdef CONFIG_PAX_REFCOUNT
6271+ "3: \n"
6272+ _ASM_EXTABLE(2b, 3b)
6273+#endif
6274+ " .set mips0 \n"
6275+ : "=&r" (temp), "+m" (v->counter)
6276+ : "Ir" (i));
6277+ } else {
6278+ unsigned long flags;
6279+
6280+ raw_local_irq_save(flags);
6281+ __asm__ __volatile__(
6282+#ifdef CONFIG_PAX_REFCOUNT
6283+ /* Exception on overflow. */
6284+ "1: dsub %0, %1 \n"
6285+ "2: \n"
6286+ _ASM_EXTABLE(1b, 2b)
6287+#else
6288+ " dsubu %0, %1 \n"
6289+#endif
6290+ : "+r" (v->counter) : "Ir" (i));
6291+ raw_local_irq_restore(flags);
6292+ }
6293+}
6294+
6295+static __inline__ void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
6296 {
6297 if (kernel_uses_llsc && R10000_LLSC_WAR) {
6298 long temp;
6299@@ -496,7 +989,93 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
6300 /*
6301 * Same as above, but return the result value
6302 */
6303-static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6304+static __inline__ long atomic64_add_return(long i, atomic64_t *v)
6305+{
6306+ long result;
6307+ long temp;
6308+
6309+ smp_mb__before_llsc();
6310+
6311+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6312+ __asm__ __volatile__(
6313+ " .set mips3 \n"
6314+ "1: lld %1, %2 # atomic64_add_return \n"
6315+#ifdef CONFIG_PAX_REFCOUNT
6316+ "2: dadd %0, %1, %3 \n"
6317+#else
6318+ " daddu %0, %1, %3 \n"
6319+#endif
6320+ " scd %0, %2 \n"
6321+ " beqzl %0, 1b \n"
6322+#ifdef CONFIG_PAX_REFCOUNT
6323+ " b 4f \n"
6324+ " .set noreorder \n"
6325+ "3: b 5f \n"
6326+ " move %0, %1 \n"
6327+ " .set reorder \n"
6328+ _ASM_EXTABLE(2b, 3b)
6329+#endif
6330+ "4: daddu %0, %1, %3 \n"
6331+#ifdef CONFIG_PAX_REFCOUNT
6332+ "5: \n"
6333+#endif
6334+ " .set mips0 \n"
6335+ : "=&r" (result), "=&r" (temp), "+m" (v->counter)
6336+ : "Ir" (i));
6337+ } else if (kernel_uses_llsc) {
6338+ __asm__ __volatile__(
6339+ " .set mips3 \n"
6340+ "1: lld %1, %2 # atomic64_add_return \n"
6341+#ifdef CONFIG_PAX_REFCOUNT
6342+ "2: dadd %0, %1, %3 \n"
6343+#else
6344+ " daddu %0, %1, %3 \n"
6345+#endif
6346+ " scd %0, %2 \n"
6347+ " bnez %0, 4f \n"
6348+ " b 1b \n"
6349+#ifdef CONFIG_PAX_REFCOUNT
6350+ " .set noreorder \n"
6351+ "3: b 5f \n"
6352+ " move %0, %1 \n"
6353+ " .set reorder \n"
6354+ _ASM_EXTABLE(2b, 3b)
6355+#endif
6356+ "4: daddu %0, %1, %3 \n"
6357+#ifdef CONFIG_PAX_REFCOUNT
6358+ "5: \n"
6359+#endif
6360+ " .set mips0 \n"
6361+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6362+ : "Ir" (i), "m" (v->counter)
6363+ : "memory");
6364+ } else {
6365+ unsigned long flags;
6366+
6367+ raw_local_irq_save(flags);
6368+ __asm__ __volatile__(
6369+ " ld %0, %1 \n"
6370+#ifdef CONFIG_PAX_REFCOUNT
6371+ /* Exception on overflow. */
6372+ "1: dadd %0, %2 \n"
6373+#else
6374+ " daddu %0, %2 \n"
6375+#endif
6376+ " sd %0, %1 \n"
6377+#ifdef CONFIG_PAX_REFCOUNT
6378+ /* Note: Dest reg is not modified on overflow */
6379+ "2: \n"
6380+ _ASM_EXTABLE(1b, 2b)
6381+#endif
6382+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6383+ raw_local_irq_restore(flags);
6384+ }
6385+
6386+ smp_llsc_mb();
6387+
6388+ return result;
6389+}
6390+static __inline__ long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
6391 {
6392 long result;
6393
6394@@ -546,7 +1125,97 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v)
6395 return result;
6396 }
6397
6398-static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6399+static __inline__ long atomic64_sub_return(long i, atomic64_t *v)
6400+{
6401+ long result;
6402+ long temp;
6403+
6404+ smp_mb__before_llsc();
6405+
6406+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6407+ long temp;
6408+
6409+ __asm__ __volatile__(
6410+ " .set mips3 \n"
6411+ "1: lld %1, %2 # atomic64_sub_return \n"
6412+#ifdef CONFIG_PAX_REFCOUNT
6413+ "2: dsub %0, %1, %3 \n"
6414+#else
6415+ " dsubu %0, %1, %3 \n"
6416+#endif
6417+ " scd %0, %2 \n"
6418+ " beqzl %0, 1b \n"
6419+#ifdef CONFIG_PAX_REFCOUNT
6420+ " b 4f \n"
6421+ " .set noreorder \n"
6422+ "3: b 5f \n"
6423+ " move %0, %1 \n"
6424+ " .set reorder \n"
6425+ _ASM_EXTABLE(2b, 3b)
6426+#endif
6427+ "4: dsubu %0, %1, %3 \n"
6428+#ifdef CONFIG_PAX_REFCOUNT
6429+ "5: \n"
6430+#endif
6431+ " .set mips0 \n"
6432+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6433+ : "Ir" (i), "m" (v->counter)
6434+ : "memory");
6435+ } else if (kernel_uses_llsc) {
6436+ __asm__ __volatile__(
6437+ " .set mips3 \n"
6438+ "1: lld %1, %2 # atomic64_sub_return \n"
6439+#ifdef CONFIG_PAX_REFCOUNT
6440+ "2: dsub %0, %1, %3 \n"
6441+#else
6442+ " dsubu %0, %1, %3 \n"
6443+#endif
6444+ " scd %0, %2 \n"
6445+ " bnez %0, 4f \n"
6446+ " b 1b \n"
6447+#ifdef CONFIG_PAX_REFCOUNT
6448+ " .set noreorder \n"
6449+ "3: b 5f \n"
6450+ " move %0, %1 \n"
6451+ " .set reorder \n"
6452+ _ASM_EXTABLE(2b, 3b)
6453+#endif
6454+ "4: dsubu %0, %1, %3 \n"
6455+#ifdef CONFIG_PAX_REFCOUNT
6456+ "5: \n"
6457+#endif
6458+ " .set mips0 \n"
6459+ : "=&r" (result), "=&r" (temp), "=m" (v->counter)
6460+ : "Ir" (i), "m" (v->counter)
6461+ : "memory");
6462+ } else {
6463+ unsigned long flags;
6464+
6465+ raw_local_irq_save(flags);
6466+ __asm__ __volatile__(
6467+ " ld %0, %1 \n"
6468+#ifdef CONFIG_PAX_REFCOUNT
6469+ /* Exception on overflow. */
6470+ "1: dsub %0, %2 \n"
6471+#else
6472+ " dsubu %0, %2 \n"
6473+#endif
6474+ " sd %0, %1 \n"
6475+#ifdef CONFIG_PAX_REFCOUNT
6476+ /* Note: Dest reg is not modified on overflow */
6477+ "2: \n"
6478+ _ASM_EXTABLE(1b, 2b)
6479+#endif
6480+ : "=&r" (result), "+m" (v->counter) : "Ir" (i));
6481+ raw_local_irq_restore(flags);
6482+ }
6483+
6484+ smp_llsc_mb();
6485+
6486+ return result;
6487+}
6488+
6489+static __inline__ long atomic64_sub_return_unchecked(long i, atomic64_unchecked_t *v)
6490 {
6491 long result;
6492
6493@@ -605,7 +1274,7 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
6494 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6495 * The function returns the old value of @v minus @i.
6496 */
6497-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6498+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6499 {
6500 long result;
6501
6502@@ -662,9 +1331,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6503 return result;
6504 }
6505
6506-#define atomic64_cmpxchg(v, o, n) \
6507- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6508-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6509+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6510+{
6511+ return cmpxchg(&v->counter, old, new);
6512+}
6513+
6514+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6515+ long new)
6516+{
6517+ return cmpxchg(&(v->counter), old, new);
6518+}
6519+
6520+static inline long atomic64_xchg(atomic64_t *v, long new)
6521+{
6522+ return xchg(&v->counter, new);
6523+}
6524+
6525+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6526+{
6527+ return xchg(&(v->counter), new);
6528+}
6529
6530 /**
6531 * atomic64_add_unless - add unless the number is a given value
6532@@ -694,6 +1380,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6533
6534 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6535 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6536+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6537
6538 /*
6539 * atomic64_sub_and_test - subtract value from variable and test result
6540@@ -715,6 +1402,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6541 * other cases.
6542 */
6543 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6544+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6545
6546 /*
6547 * atomic64_dec_and_test - decrement by 1 and test
6548@@ -739,6 +1427,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6549 * Atomically increments @v by 1.
6550 */
6551 #define atomic64_inc(v) atomic64_add(1, (v))
6552+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6553
6554 /*
6555 * atomic64_dec - decrement and test
6556@@ -747,6 +1436,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6557 * Atomically decrements @v by 1.
6558 */
6559 #define atomic64_dec(v) atomic64_sub(1, (v))
6560+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6561
6562 /*
6563 * atomic64_add_negative - add and test if negative
6564diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6565index e1aa4e4..670b68b 100644
6566--- a/arch/mips/include/asm/barrier.h
6567+++ b/arch/mips/include/asm/barrier.h
6568@@ -184,7 +184,7 @@
6569 do { \
6570 compiletime_assert_atomic_type(*p); \
6571 smp_mb(); \
6572- ACCESS_ONCE(*p) = (v); \
6573+ ACCESS_ONCE_RW(*p) = (v); \
6574 } while (0)
6575
6576 #define smp_load_acquire(p) \
6577diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6578index b4db69f..8f3b093 100644
6579--- a/arch/mips/include/asm/cache.h
6580+++ b/arch/mips/include/asm/cache.h
6581@@ -9,10 +9,11 @@
6582 #ifndef _ASM_CACHE_H
6583 #define _ASM_CACHE_H
6584
6585+#include <linux/const.h>
6586 #include <kmalloc.h>
6587
6588 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6589-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6590+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6591
6592 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6593 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6594diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6595index d414405..6bb4ba2 100644
6596--- a/arch/mips/include/asm/elf.h
6597+++ b/arch/mips/include/asm/elf.h
6598@@ -398,13 +398,16 @@ extern const char *__elf_platform;
6599 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6600 #endif
6601
6602+#ifdef CONFIG_PAX_ASLR
6603+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6604+
6605+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6606+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6607+#endif
6608+
6609 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6610 struct linux_binprm;
6611 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6612 int uses_interp);
6613
6614-struct mm_struct;
6615-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6616-#define arch_randomize_brk arch_randomize_brk
6617-
6618 #endif /* _ASM_ELF_H */
6619diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6620index c1f6afa..38cc6e9 100644
6621--- a/arch/mips/include/asm/exec.h
6622+++ b/arch/mips/include/asm/exec.h
6623@@ -12,6 +12,6 @@
6624 #ifndef _ASM_EXEC_H
6625 #define _ASM_EXEC_H
6626
6627-extern unsigned long arch_align_stack(unsigned long sp);
6628+#define arch_align_stack(x) ((x) & ~0xfUL)
6629
6630 #endif /* _ASM_EXEC_H */
6631diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6632index 9e8ef59..1139d6b 100644
6633--- a/arch/mips/include/asm/hw_irq.h
6634+++ b/arch/mips/include/asm/hw_irq.h
6635@@ -10,7 +10,7 @@
6636
6637 #include <linux/atomic.h>
6638
6639-extern atomic_t irq_err_count;
6640+extern atomic_unchecked_t irq_err_count;
6641
6642 /*
6643 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6644diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6645index 46dfc3c..a16b13a 100644
6646--- a/arch/mips/include/asm/local.h
6647+++ b/arch/mips/include/asm/local.h
6648@@ -12,15 +12,25 @@ typedef struct
6649 atomic_long_t a;
6650 } local_t;
6651
6652+typedef struct {
6653+ atomic_long_unchecked_t a;
6654+} local_unchecked_t;
6655+
6656 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6657
6658 #define local_read(l) atomic_long_read(&(l)->a)
6659+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6660 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6661+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6662
6663 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6664+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6665 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6666+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6667 #define local_inc(l) atomic_long_inc(&(l)->a)
6668+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6669 #define local_dec(l) atomic_long_dec(&(l)->a)
6670+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6671
6672 /*
6673 * Same as above, but return the result value
6674@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6675 return result;
6676 }
6677
6678+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6679+{
6680+ unsigned long result;
6681+
6682+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6683+ unsigned long temp;
6684+
6685+ __asm__ __volatile__(
6686+ " .set mips3 \n"
6687+ "1:" __LL "%1, %2 # local_add_return \n"
6688+ " addu %0, %1, %3 \n"
6689+ __SC "%0, %2 \n"
6690+ " beqzl %0, 1b \n"
6691+ " addu %0, %1, %3 \n"
6692+ " .set mips0 \n"
6693+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6694+ : "Ir" (i), "m" (l->a.counter)
6695+ : "memory");
6696+ } else if (kernel_uses_llsc) {
6697+ unsigned long temp;
6698+
6699+ __asm__ __volatile__(
6700+ " .set mips3 \n"
6701+ "1:" __LL "%1, %2 # local_add_return \n"
6702+ " addu %0, %1, %3 \n"
6703+ __SC "%0, %2 \n"
6704+ " beqz %0, 1b \n"
6705+ " addu %0, %1, %3 \n"
6706+ " .set mips0 \n"
6707+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6708+ : "Ir" (i), "m" (l->a.counter)
6709+ : "memory");
6710+ } else {
6711+ unsigned long flags;
6712+
6713+ local_irq_save(flags);
6714+ result = l->a.counter;
6715+ result += i;
6716+ l->a.counter = result;
6717+ local_irq_restore(flags);
6718+ }
6719+
6720+ return result;
6721+}
6722+
6723 static __inline__ long local_sub_return(long i, local_t * l)
6724 {
6725 unsigned long result;
6726@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6727
6728 #define local_cmpxchg(l, o, n) \
6729 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6730+#define local_cmpxchg_unchecked(l, o, n) \
6731+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6732 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6733
6734 /**
6735diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6736index 5699ec3..95def83 100644
6737--- a/arch/mips/include/asm/page.h
6738+++ b/arch/mips/include/asm/page.h
6739@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6740 #ifdef CONFIG_CPU_MIPS32
6741 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6742 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6743- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6744+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6745 #else
6746 typedef struct { unsigned long long pte; } pte_t;
6747 #define pte_val(x) ((x).pte)
6748diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6749index b336037..5b874cc 100644
6750--- a/arch/mips/include/asm/pgalloc.h
6751+++ b/arch/mips/include/asm/pgalloc.h
6752@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6753 {
6754 set_pud(pud, __pud((unsigned long)pmd));
6755 }
6756+
6757+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6758+{
6759+ pud_populate(mm, pud, pmd);
6760+}
6761 #endif
6762
6763 /*
6764diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6765index 008324d..f67c239 100644
6766--- a/arch/mips/include/asm/pgtable.h
6767+++ b/arch/mips/include/asm/pgtable.h
6768@@ -20,6 +20,9 @@
6769 #include <asm/io.h>
6770 #include <asm/pgtable-bits.h>
6771
6772+#define ktla_ktva(addr) (addr)
6773+#define ktva_ktla(addr) (addr)
6774+
6775 struct mm_struct;
6776 struct vm_area_struct;
6777
6778diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
6779index 25da651..ae2a259 100644
6780--- a/arch/mips/include/asm/smtc_proc.h
6781+++ b/arch/mips/include/asm/smtc_proc.h
6782@@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
6783
6784 /* Count of number of recoveries of "stolen" FPU access rights on 34K */
6785
6786-extern atomic_t smtc_fpu_recoveries;
6787+extern atomic_unchecked_t smtc_fpu_recoveries;
6788
6789 #endif /* __ASM_SMTC_PROC_H */
6790diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6791index d2d961d..a674df0 100644
6792--- a/arch/mips/include/asm/thread_info.h
6793+++ b/arch/mips/include/asm/thread_info.h
6794@@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6795 #define TIF_SECCOMP 4 /* secure computing */
6796 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6797 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6798+/* li takes a 32bit immediate */
6799+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6800+
6801 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6802 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6803 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6804@@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6805 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6806 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6807 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6808+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6809
6810 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6811 _TIF_SYSCALL_AUDIT | \
6812- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6813+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6814+ _TIF_GRSEC_SETXID)
6815
6816 /* work to do in syscall_trace_leave() */
6817 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6818- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6819+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6820
6821 /* work to do on interrupt/exception return */
6822 #define _TIF_WORK_MASK \
6823@@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6824 /* work to do on any return to u-space */
6825 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6826 _TIF_WORK_SYSCALL_EXIT | \
6827- _TIF_SYSCALL_TRACEPOINT)
6828+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6829
6830 /*
6831 * We stash processor id into a COP0 register to retrieve it fast
6832diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6833index a109510..94ee3f6 100644
6834--- a/arch/mips/include/asm/uaccess.h
6835+++ b/arch/mips/include/asm/uaccess.h
6836@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6837 __ok == 0; \
6838 })
6839
6840+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6841 #define access_ok(type, addr, size) \
6842 likely(__access_ok((addr), (size), __access_mask))
6843
6844diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6845index 1188e00..41cf144 100644
6846--- a/arch/mips/kernel/binfmt_elfn32.c
6847+++ b/arch/mips/kernel/binfmt_elfn32.c
6848@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6849 #undef ELF_ET_DYN_BASE
6850 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6851
6852+#ifdef CONFIG_PAX_ASLR
6853+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6854+
6855+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6856+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6857+#endif
6858+
6859 #include <asm/processor.h>
6860 #include <linux/module.h>
6861 #include <linux/elfcore.h>
6862diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6863index 7faf5f2..f3d3cf4 100644
6864--- a/arch/mips/kernel/binfmt_elfo32.c
6865+++ b/arch/mips/kernel/binfmt_elfo32.c
6866@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6867 #undef ELF_ET_DYN_BASE
6868 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6869
6870+#ifdef CONFIG_PAX_ASLR
6871+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6872+
6873+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6874+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6875+#endif
6876+
6877 #include <asm/processor.h>
6878
6879 /*
6880diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6881index 2b91fe8..fe4f6b4 100644
6882--- a/arch/mips/kernel/i8259.c
6883+++ b/arch/mips/kernel/i8259.c
6884@@ -205,7 +205,7 @@ spurious_8259A_irq:
6885 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6886 spurious_irq_mask |= irqmask;
6887 }
6888- atomic_inc(&irq_err_count);
6889+ atomic_inc_unchecked(&irq_err_count);
6890 /*
6891 * Theoretically we do not have to handle this IRQ,
6892 * but in Linux this does not cause problems and is
6893diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6894index 44a1f79..2bd6aa3 100644
6895--- a/arch/mips/kernel/irq-gt641xx.c
6896+++ b/arch/mips/kernel/irq-gt641xx.c
6897@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6898 }
6899 }
6900
6901- atomic_inc(&irq_err_count);
6902+ atomic_inc_unchecked(&irq_err_count);
6903 }
6904
6905 void __init gt641xx_irq_init(void)
6906diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6907index d1fea7a..2e591b0 100644
6908--- a/arch/mips/kernel/irq.c
6909+++ b/arch/mips/kernel/irq.c
6910@@ -77,17 +77,17 @@ void ack_bad_irq(unsigned int irq)
6911 printk("unexpected IRQ # %d\n", irq);
6912 }
6913
6914-atomic_t irq_err_count;
6915+atomic_unchecked_t irq_err_count;
6916
6917 int arch_show_interrupts(struct seq_file *p, int prec)
6918 {
6919- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6920+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6921 return 0;
6922 }
6923
6924 asmlinkage void spurious_interrupt(void)
6925 {
6926- atomic_inc(&irq_err_count);
6927+ atomic_inc_unchecked(&irq_err_count);
6928 }
6929
6930 void __init init_IRQ(void)
6931@@ -110,7 +110,10 @@ void __init init_IRQ(void)
6932 #endif
6933 }
6934
6935+
6936 #ifdef DEBUG_STACKOVERFLOW
6937+extern void gr_handle_kernel_exploit(void);
6938+
6939 static inline void check_stack_overflow(void)
6940 {
6941 unsigned long sp;
6942@@ -126,6 +129,7 @@ static inline void check_stack_overflow(void)
6943 printk("do_IRQ: stack overflow: %ld\n",
6944 sp - sizeof(struct thread_info));
6945 dump_stack();
6946+ gr_handle_kernel_exploit();
6947 }
6948 }
6949 #else
6950diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6951index 60e39dc..b4829bf 100644
6952--- a/arch/mips/kernel/process.c
6953+++ b/arch/mips/kernel/process.c
6954@@ -579,15 +579,3 @@ unsigned long get_wchan(struct task_struct *task)
6955 out:
6956 return pc;
6957 }
6958-
6959-/*
6960- * Don't forget that the stack pointer must be aligned on a 8 bytes
6961- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6962- */
6963-unsigned long arch_align_stack(unsigned long sp)
6964-{
6965- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6966- sp -= get_random_int() & ~PAGE_MASK;
6967-
6968- return sp & ALMASK;
6969-}
6970diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6971index f639ccd..e4b110d 100644
6972--- a/arch/mips/kernel/ptrace.c
6973+++ b/arch/mips/kernel/ptrace.c
6974@@ -630,6 +630,10 @@ long arch_ptrace(struct task_struct *child, long request,
6975 return ret;
6976 }
6977
6978+#ifdef CONFIG_GRKERNSEC_SETXID
6979+extern void gr_delayed_cred_worker(void);
6980+#endif
6981+
6982 /*
6983 * Notification of system call entry/exit
6984 * - triggered by current->work.syscall_trace
6985@@ -646,6 +650,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6986 tracehook_report_syscall_entry(regs))
6987 ret = -1;
6988
6989+#ifdef CONFIG_GRKERNSEC_SETXID
6990+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6991+ gr_delayed_cred_worker();
6992+#endif
6993+
6994 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6995 trace_sys_enter(regs, regs->regs[2]);
6996
6997diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6998index 07fc524..b9d7f28 100644
6999--- a/arch/mips/kernel/reset.c
7000+++ b/arch/mips/kernel/reset.c
7001@@ -13,6 +13,7 @@
7002 #include <linux/reboot.h>
7003
7004 #include <asm/reboot.h>
7005+#include <asm/bug.h>
7006
7007 /*
7008 * Urgs ... Too many MIPS machines to handle this in a generic way.
7009@@ -29,16 +30,19 @@ void machine_restart(char *command)
7010 {
7011 if (_machine_restart)
7012 _machine_restart(command);
7013+ BUG();
7014 }
7015
7016 void machine_halt(void)
7017 {
7018 if (_machine_halt)
7019 _machine_halt();
7020+ BUG();
7021 }
7022
7023 void machine_power_off(void)
7024 {
7025 if (pm_power_off)
7026 pm_power_off();
7027+ BUG();
7028 }
7029diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
7030index 38635a9..3fcd5e0 100644
7031--- a/arch/mips/kernel/smtc-proc.c
7032+++ b/arch/mips/kernel/smtc-proc.c
7033@@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
7034
7035 struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
7036
7037-atomic_t smtc_fpu_recoveries;
7038+atomic_unchecked_t smtc_fpu_recoveries;
7039
7040 static int smtc_proc_show(struct seq_file *m, void *v)
7041 {
7042@@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
7043 for(i = 0; i < NR_CPUS; i++)
7044 seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
7045 seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
7046- atomic_read(&smtc_fpu_recoveries));
7047+ atomic_read_unchecked(&smtc_fpu_recoveries));
7048 return 0;
7049 }
7050
7051@@ -73,7 +73,7 @@ void init_smtc_stats(void)
7052 smtc_cpu_stats[i].selfipis = 0;
7053 }
7054
7055- atomic_set(&smtc_fpu_recoveries, 0);
7056+ atomic_set_unchecked(&smtc_fpu_recoveries, 0);
7057
7058 proc_create("smtc", 0444, NULL, &smtc_proc_fops);
7059 }
7060diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
7061index c1681d6..9f881d1 100644
7062--- a/arch/mips/kernel/smtc.c
7063+++ b/arch/mips/kernel/smtc.c
7064@@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
7065 }
7066 smtc_ipi_qdump();
7067 printk("%d Recoveries of \"stolen\" FPU\n",
7068- atomic_read(&smtc_fpu_recoveries));
7069+ atomic_read_unchecked(&smtc_fpu_recoveries));
7070 }
7071
7072
7073diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
7074index c24ad5f..9983ab2 100644
7075--- a/arch/mips/kernel/sync-r4k.c
7076+++ b/arch/mips/kernel/sync-r4k.c
7077@@ -20,8 +20,8 @@
7078 #include <asm/mipsregs.h>
7079
7080 static atomic_t count_start_flag = ATOMIC_INIT(0);
7081-static atomic_t count_count_start = ATOMIC_INIT(0);
7082-static atomic_t count_count_stop = ATOMIC_INIT(0);
7083+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
7084+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
7085 static atomic_t count_reference = ATOMIC_INIT(0);
7086
7087 #define COUNTON 100
7088@@ -68,13 +68,13 @@ void synchronise_count_master(int cpu)
7089
7090 for (i = 0; i < NR_LOOPS; i++) {
7091 /* slaves loop on '!= 2' */
7092- while (atomic_read(&count_count_start) != 1)
7093+ while (atomic_read_unchecked(&count_count_start) != 1)
7094 mb();
7095- atomic_set(&count_count_stop, 0);
7096+ atomic_set_unchecked(&count_count_stop, 0);
7097 smp_wmb();
7098
7099 /* this lets the slaves write their count register */
7100- atomic_inc(&count_count_start);
7101+ atomic_inc_unchecked(&count_count_start);
7102
7103 /*
7104 * Everyone initialises count in the last loop:
7105@@ -85,11 +85,11 @@ void synchronise_count_master(int cpu)
7106 /*
7107 * Wait for all slaves to leave the synchronization point:
7108 */
7109- while (atomic_read(&count_count_stop) != 1)
7110+ while (atomic_read_unchecked(&count_count_stop) != 1)
7111 mb();
7112- atomic_set(&count_count_start, 0);
7113+ atomic_set_unchecked(&count_count_start, 0);
7114 smp_wmb();
7115- atomic_inc(&count_count_stop);
7116+ atomic_inc_unchecked(&count_count_stop);
7117 }
7118 /* Arrange for an interrupt in a short while */
7119 write_c0_compare(read_c0_count() + COUNTON);
7120@@ -130,8 +130,8 @@ void synchronise_count_slave(int cpu)
7121 initcount = atomic_read(&count_reference);
7122
7123 for (i = 0; i < NR_LOOPS; i++) {
7124- atomic_inc(&count_count_start);
7125- while (atomic_read(&count_count_start) != 2)
7126+ atomic_inc_unchecked(&count_count_start);
7127+ while (atomic_read_unchecked(&count_count_start) != 2)
7128 mb();
7129
7130 /*
7131@@ -140,8 +140,8 @@ void synchronise_count_slave(int cpu)
7132 if (i == NR_LOOPS-1)
7133 write_c0_count(initcount);
7134
7135- atomic_inc(&count_count_stop);
7136- while (atomic_read(&count_count_stop) != 2)
7137+ atomic_inc_unchecked(&count_count_stop);
7138+ while (atomic_read_unchecked(&count_count_stop) != 2)
7139 mb();
7140 }
7141 /* Arrange for an interrupt in a short while */
7142diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
7143index 8119ac2..b229939 100644
7144--- a/arch/mips/kernel/traps.c
7145+++ b/arch/mips/kernel/traps.c
7146@@ -695,7 +695,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
7147 siginfo_t info;
7148
7149 prev_state = exception_enter();
7150- die_if_kernel("Integer overflow", regs);
7151+ if (unlikely(!user_mode(regs))) {
7152+
7153+#ifdef CONFIG_PAX_REFCOUNT
7154+ if (fixup_exception(regs)) {
7155+ pax_report_refcount_overflow(regs);
7156+ exception_exit(prev_state);
7157+ return;
7158+ }
7159+#endif
7160+
7161+ die("Integer overflow", regs);
7162+ }
7163
7164 info.si_code = FPE_INTOVF;
7165 info.si_signo = SIGFPE;
7166diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
7167index becc42b..9e43d4b 100644
7168--- a/arch/mips/mm/fault.c
7169+++ b/arch/mips/mm/fault.c
7170@@ -28,6 +28,23 @@
7171 #include <asm/highmem.h> /* For VMALLOC_END */
7172 #include <linux/kdebug.h>
7173
7174+#ifdef CONFIG_PAX_PAGEEXEC
7175+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7176+{
7177+ unsigned long i;
7178+
7179+ printk(KERN_ERR "PAX: bytes at PC: ");
7180+ for (i = 0; i < 5; i++) {
7181+ unsigned int c;
7182+ if (get_user(c, (unsigned int *)pc+i))
7183+ printk(KERN_CONT "???????? ");
7184+ else
7185+ printk(KERN_CONT "%08x ", c);
7186+ }
7187+ printk("\n");
7188+}
7189+#endif
7190+
7191 /*
7192 * This routine handles page faults. It determines the address,
7193 * and the problem, and then passes it off to one of the appropriate
7194@@ -199,6 +216,14 @@ bad_area:
7195 bad_area_nosemaphore:
7196 /* User mode accesses just cause a SIGSEGV */
7197 if (user_mode(regs)) {
7198+
7199+#ifdef CONFIG_PAX_PAGEEXEC
7200+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
7201+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
7202+ do_group_exit(SIGKILL);
7203+ }
7204+#endif
7205+
7206 tsk->thread.cp0_badvaddr = address;
7207 tsk->thread.error_code = write;
7208 #if 0
7209diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
7210index f1baadd..5472dca 100644
7211--- a/arch/mips/mm/mmap.c
7212+++ b/arch/mips/mm/mmap.c
7213@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7214 struct vm_area_struct *vma;
7215 unsigned long addr = addr0;
7216 int do_color_align;
7217+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7218 struct vm_unmapped_area_info info;
7219
7220 if (unlikely(len > TASK_SIZE))
7221@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7222 do_color_align = 1;
7223
7224 /* requesting a specific address */
7225+
7226+#ifdef CONFIG_PAX_RANDMMAP
7227+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7228+#endif
7229+
7230 if (addr) {
7231 if (do_color_align)
7232 addr = COLOUR_ALIGN(addr, pgoff);
7233@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7234 addr = PAGE_ALIGN(addr);
7235
7236 vma = find_vma(mm, addr);
7237- if (TASK_SIZE - len >= addr &&
7238- (!vma || addr + len <= vma->vm_start))
7239+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7240 return addr;
7241 }
7242
7243 info.length = len;
7244 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7245 info.align_offset = pgoff << PAGE_SHIFT;
7246+ info.threadstack_offset = offset;
7247
7248 if (dir == DOWN) {
7249 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7250@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7251 {
7252 unsigned long random_factor = 0UL;
7253
7254+#ifdef CONFIG_PAX_RANDMMAP
7255+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7256+#endif
7257+
7258 if (current->flags & PF_RANDOMIZE) {
7259 random_factor = get_random_int();
7260 random_factor = random_factor << PAGE_SHIFT;
7261@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7262
7263 if (mmap_is_legacy()) {
7264 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7265+
7266+#ifdef CONFIG_PAX_RANDMMAP
7267+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7268+ mm->mmap_base += mm->delta_mmap;
7269+#endif
7270+
7271 mm->get_unmapped_area = arch_get_unmapped_area;
7272 } else {
7273 mm->mmap_base = mmap_base(random_factor);
7274+
7275+#ifdef CONFIG_PAX_RANDMMAP
7276+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7277+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7278+#endif
7279+
7280 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7281 }
7282 }
7283
7284-static inline unsigned long brk_rnd(void)
7285-{
7286- unsigned long rnd = get_random_int();
7287-
7288- rnd = rnd << PAGE_SHIFT;
7289- /* 8MB for 32bit, 256MB for 64bit */
7290- if (TASK_IS_32BIT_ADDR)
7291- rnd = rnd & 0x7ffffful;
7292- else
7293- rnd = rnd & 0xffffffful;
7294-
7295- return rnd;
7296-}
7297-
7298-unsigned long arch_randomize_brk(struct mm_struct *mm)
7299-{
7300- unsigned long base = mm->brk;
7301- unsigned long ret;
7302-
7303- ret = PAGE_ALIGN(base + brk_rnd());
7304-
7305- if (ret < mm->brk)
7306- return mm->brk;
7307-
7308- return ret;
7309-}
7310-
7311 int __virt_addr_valid(const volatile void *kaddr)
7312 {
7313 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7314diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7315index 59cccd9..f39ac2f 100644
7316--- a/arch/mips/pci/pci-octeon.c
7317+++ b/arch/mips/pci/pci-octeon.c
7318@@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7319
7320
7321 static struct pci_ops octeon_pci_ops = {
7322- octeon_read_config,
7323- octeon_write_config,
7324+ .read = octeon_read_config,
7325+ .write = octeon_write_config,
7326 };
7327
7328 static struct resource octeon_pci_mem_resource = {
7329diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7330index 5e36c33..eb4a17b 100644
7331--- a/arch/mips/pci/pcie-octeon.c
7332+++ b/arch/mips/pci/pcie-octeon.c
7333@@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7334 }
7335
7336 static struct pci_ops octeon_pcie0_ops = {
7337- octeon_pcie0_read_config,
7338- octeon_pcie0_write_config,
7339+ .read = octeon_pcie0_read_config,
7340+ .write = octeon_pcie0_write_config,
7341 };
7342
7343 static struct resource octeon_pcie0_mem_resource = {
7344@@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7345 };
7346
7347 static struct pci_ops octeon_pcie1_ops = {
7348- octeon_pcie1_read_config,
7349- octeon_pcie1_write_config,
7350+ .read = octeon_pcie1_read_config,
7351+ .write = octeon_pcie1_write_config,
7352 };
7353
7354 static struct resource octeon_pcie1_mem_resource = {
7355@@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7356 };
7357
7358 static struct pci_ops octeon_dummy_ops = {
7359- octeon_dummy_read_config,
7360- octeon_dummy_write_config,
7361+ .read = octeon_dummy_read_config,
7362+ .write = octeon_dummy_write_config,
7363 };
7364
7365 static struct resource octeon_dummy_mem_resource = {
7366diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7367index a2358b4..7cead4f 100644
7368--- a/arch/mips/sgi-ip27/ip27-nmi.c
7369+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7370@@ -187,9 +187,9 @@ void
7371 cont_nmi_dump(void)
7372 {
7373 #ifndef REAL_NMI_SIGNAL
7374- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7375+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7376
7377- atomic_inc(&nmied_cpus);
7378+ atomic_inc_unchecked(&nmied_cpus);
7379 #endif
7380 /*
7381 * Only allow 1 cpu to proceed
7382@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7383 udelay(10000);
7384 }
7385 #else
7386- while (atomic_read(&nmied_cpus) != num_online_cpus());
7387+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7388 #endif
7389
7390 /*
7391diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7392index a046b30..6799527 100644
7393--- a/arch/mips/sni/rm200.c
7394+++ b/arch/mips/sni/rm200.c
7395@@ -270,7 +270,7 @@ spurious_8259A_irq:
7396 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7397 spurious_irq_mask |= irqmask;
7398 }
7399- atomic_inc(&irq_err_count);
7400+ atomic_inc_unchecked(&irq_err_count);
7401 /*
7402 * Theoretically we do not have to handle this IRQ,
7403 * but in Linux this does not cause problems and is
7404diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7405index 41e873b..34d33a7 100644
7406--- a/arch/mips/vr41xx/common/icu.c
7407+++ b/arch/mips/vr41xx/common/icu.c
7408@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7409
7410 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7411
7412- atomic_inc(&irq_err_count);
7413+ atomic_inc_unchecked(&irq_err_count);
7414
7415 return -1;
7416 }
7417diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7418index ae0e4ee..e8f0692 100644
7419--- a/arch/mips/vr41xx/common/irq.c
7420+++ b/arch/mips/vr41xx/common/irq.c
7421@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7422 irq_cascade_t *cascade;
7423
7424 if (irq >= NR_IRQS) {
7425- atomic_inc(&irq_err_count);
7426+ atomic_inc_unchecked(&irq_err_count);
7427 return;
7428 }
7429
7430@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7431 ret = cascade->get_irq(irq);
7432 irq = ret;
7433 if (ret < 0)
7434- atomic_inc(&irq_err_count);
7435+ atomic_inc_unchecked(&irq_err_count);
7436 else
7437 irq_dispatch(irq);
7438 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7439diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7440index 967d144..db12197 100644
7441--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7442+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7443@@ -11,12 +11,14 @@
7444 #ifndef _ASM_PROC_CACHE_H
7445 #define _ASM_PROC_CACHE_H
7446
7447+#include <linux/const.h>
7448+
7449 /* L1 cache */
7450
7451 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7452 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7453-#define L1_CACHE_BYTES 16 /* bytes per entry */
7454 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7455+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7456 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7457
7458 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7459diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7460index bcb5df2..84fabd2 100644
7461--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7462+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7463@@ -16,13 +16,15 @@
7464 #ifndef _ASM_PROC_CACHE_H
7465 #define _ASM_PROC_CACHE_H
7466
7467+#include <linux/const.h>
7468+
7469 /*
7470 * L1 cache
7471 */
7472 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7473 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7474-#define L1_CACHE_BYTES 32 /* bytes per entry */
7475 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7476+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7477 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7478
7479 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7480diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7481index 4ce7a01..449202a 100644
7482--- a/arch/openrisc/include/asm/cache.h
7483+++ b/arch/openrisc/include/asm/cache.h
7484@@ -19,11 +19,13 @@
7485 #ifndef __ASM_OPENRISC_CACHE_H
7486 #define __ASM_OPENRISC_CACHE_H
7487
7488+#include <linux/const.h>
7489+
7490 /* FIXME: How can we replace these with values from the CPU...
7491 * they shouldn't be hard-coded!
7492 */
7493
7494-#define L1_CACHE_BYTES 16
7495 #define L1_CACHE_SHIFT 4
7496+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7497
7498 #endif /* __ASM_OPENRISC_CACHE_H */
7499diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7500index 472886c..00e7df9 100644
7501--- a/arch/parisc/include/asm/atomic.h
7502+++ b/arch/parisc/include/asm/atomic.h
7503@@ -252,6 +252,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7504 return dec;
7505 }
7506
7507+#define atomic64_read_unchecked(v) atomic64_read(v)
7508+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7509+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7510+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7511+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7512+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7513+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7514+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7515+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7516+
7517 #endif /* !CONFIG_64BIT */
7518
7519
7520diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7521index 47f11c7..3420df2 100644
7522--- a/arch/parisc/include/asm/cache.h
7523+++ b/arch/parisc/include/asm/cache.h
7524@@ -5,6 +5,7 @@
7525 #ifndef __ARCH_PARISC_CACHE_H
7526 #define __ARCH_PARISC_CACHE_H
7527
7528+#include <linux/const.h>
7529
7530 /*
7531 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7532@@ -15,13 +16,13 @@
7533 * just ruin performance.
7534 */
7535 #ifdef CONFIG_PA20
7536-#define L1_CACHE_BYTES 64
7537 #define L1_CACHE_SHIFT 6
7538 #else
7539-#define L1_CACHE_BYTES 32
7540 #define L1_CACHE_SHIFT 5
7541 #endif
7542
7543+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7544+
7545 #ifndef __ASSEMBLY__
7546
7547 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7548diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7549index 3391d06..c23a2cc 100644
7550--- a/arch/parisc/include/asm/elf.h
7551+++ b/arch/parisc/include/asm/elf.h
7552@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7553
7554 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7555
7556+#ifdef CONFIG_PAX_ASLR
7557+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7558+
7559+#define PAX_DELTA_MMAP_LEN 16
7560+#define PAX_DELTA_STACK_LEN 16
7561+#endif
7562+
7563 /* This yields a mask that user programs can use to figure out what
7564 instruction set this CPU supports. This could be done in user space,
7565 but it's not easy, and we've already done it here. */
7566diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7567index f213f5b..0af3e8e 100644
7568--- a/arch/parisc/include/asm/pgalloc.h
7569+++ b/arch/parisc/include/asm/pgalloc.h
7570@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7571 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7572 }
7573
7574+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7575+{
7576+ pgd_populate(mm, pgd, pmd);
7577+}
7578+
7579 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7580 {
7581 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7582@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7583 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7584 #define pmd_free(mm, x) do { } while (0)
7585 #define pgd_populate(mm, pmd, pte) BUG()
7586+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7587
7588 #endif
7589
7590diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7591index 22b89d1..ce34230 100644
7592--- a/arch/parisc/include/asm/pgtable.h
7593+++ b/arch/parisc/include/asm/pgtable.h
7594@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7595 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7596 #define PAGE_COPY PAGE_EXECREAD
7597 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7598+
7599+#ifdef CONFIG_PAX_PAGEEXEC
7600+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7601+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7602+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7603+#else
7604+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7605+# define PAGE_COPY_NOEXEC PAGE_COPY
7606+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7607+#endif
7608+
7609 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7610 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7611 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7612diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7613index 4006964..fcb3cc2 100644
7614--- a/arch/parisc/include/asm/uaccess.h
7615+++ b/arch/parisc/include/asm/uaccess.h
7616@@ -246,10 +246,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7617 const void __user *from,
7618 unsigned long n)
7619 {
7620- int sz = __compiletime_object_size(to);
7621+ size_t sz = __compiletime_object_size(to);
7622 int ret = -EFAULT;
7623
7624- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7625+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7626 ret = __copy_from_user(to, from, n);
7627 else
7628 copy_from_user_overflow();
7629diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7630index 50dfafc..b9fc230 100644
7631--- a/arch/parisc/kernel/module.c
7632+++ b/arch/parisc/kernel/module.c
7633@@ -98,16 +98,38 @@
7634
7635 /* three functions to determine where in the module core
7636 * or init pieces the location is */
7637+static inline int in_init_rx(struct module *me, void *loc)
7638+{
7639+ return (loc >= me->module_init_rx &&
7640+ loc < (me->module_init_rx + me->init_size_rx));
7641+}
7642+
7643+static inline int in_init_rw(struct module *me, void *loc)
7644+{
7645+ return (loc >= me->module_init_rw &&
7646+ loc < (me->module_init_rw + me->init_size_rw));
7647+}
7648+
7649 static inline int in_init(struct module *me, void *loc)
7650 {
7651- return (loc >= me->module_init &&
7652- loc <= (me->module_init + me->init_size));
7653+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7654+}
7655+
7656+static inline int in_core_rx(struct module *me, void *loc)
7657+{
7658+ return (loc >= me->module_core_rx &&
7659+ loc < (me->module_core_rx + me->core_size_rx));
7660+}
7661+
7662+static inline int in_core_rw(struct module *me, void *loc)
7663+{
7664+ return (loc >= me->module_core_rw &&
7665+ loc < (me->module_core_rw + me->core_size_rw));
7666 }
7667
7668 static inline int in_core(struct module *me, void *loc)
7669 {
7670- return (loc >= me->module_core &&
7671- loc <= (me->module_core + me->core_size));
7672+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7673 }
7674
7675 static inline int in_local(struct module *me, void *loc)
7676@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7677 }
7678
7679 /* align things a bit */
7680- me->core_size = ALIGN(me->core_size, 16);
7681- me->arch.got_offset = me->core_size;
7682- me->core_size += gots * sizeof(struct got_entry);
7683+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7684+ me->arch.got_offset = me->core_size_rw;
7685+ me->core_size_rw += gots * sizeof(struct got_entry);
7686
7687- me->core_size = ALIGN(me->core_size, 16);
7688- me->arch.fdesc_offset = me->core_size;
7689- me->core_size += fdescs * sizeof(Elf_Fdesc);
7690+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7691+ me->arch.fdesc_offset = me->core_size_rw;
7692+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7693
7694 me->arch.got_max = gots;
7695 me->arch.fdesc_max = fdescs;
7696@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7697
7698 BUG_ON(value == 0);
7699
7700- got = me->module_core + me->arch.got_offset;
7701+ got = me->module_core_rw + me->arch.got_offset;
7702 for (i = 0; got[i].addr; i++)
7703 if (got[i].addr == value)
7704 goto out;
7705@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7706 #ifdef CONFIG_64BIT
7707 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7708 {
7709- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7710+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7711
7712 if (!value) {
7713 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7714@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7715
7716 /* Create new one */
7717 fdesc->addr = value;
7718- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7719+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7720 return (Elf_Addr)fdesc;
7721 }
7722 #endif /* CONFIG_64BIT */
7723@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7724
7725 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7726 end = table + sechdrs[me->arch.unwind_section].sh_size;
7727- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7728+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7729
7730 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7731 me->arch.unwind_section, table, end, gp);
7732diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7733index e1ffea2..46ed66e 100644
7734--- a/arch/parisc/kernel/sys_parisc.c
7735+++ b/arch/parisc/kernel/sys_parisc.c
7736@@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7737 unsigned long task_size = TASK_SIZE;
7738 int do_color_align, last_mmap;
7739 struct vm_unmapped_area_info info;
7740+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7741
7742 if (len > task_size)
7743 return -ENOMEM;
7744@@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7745 goto found_addr;
7746 }
7747
7748+#ifdef CONFIG_PAX_RANDMMAP
7749+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7750+#endif
7751+
7752 if (addr) {
7753 if (do_color_align && last_mmap)
7754 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7755@@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7756 info.high_limit = mmap_upper_limit();
7757 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7758 info.align_offset = shared_align_offset(last_mmap, pgoff);
7759+ info.threadstack_offset = offset;
7760 addr = vm_unmapped_area(&info);
7761
7762 found_addr:
7763@@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7764 unsigned long addr = addr0;
7765 int do_color_align, last_mmap;
7766 struct vm_unmapped_area_info info;
7767+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7768
7769 #ifdef CONFIG_64BIT
7770 /* This should only ever run for 32-bit processes. */
7771@@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7772 }
7773
7774 /* requesting a specific address */
7775+#ifdef CONFIG_PAX_RANDMMAP
7776+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7777+#endif
7778+
7779 if (addr) {
7780 if (do_color_align && last_mmap)
7781 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7782@@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7783 info.high_limit = mm->mmap_base;
7784 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7785 info.align_offset = shared_align_offset(last_mmap, pgoff);
7786+ info.threadstack_offset = offset;
7787 addr = vm_unmapped_area(&info);
7788 if (!(addr & ~PAGE_MASK))
7789 goto found_addr;
7790@@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7791 mm->mmap_legacy_base = mmap_legacy_base();
7792 mm->mmap_base = mmap_upper_limit();
7793
7794+#ifdef CONFIG_PAX_RANDMMAP
7795+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7796+ mm->mmap_legacy_base += mm->delta_mmap;
7797+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7798+ }
7799+#endif
7800+
7801 if (mmap_is_legacy()) {
7802 mm->mmap_base = mm->mmap_legacy_base;
7803 mm->get_unmapped_area = arch_get_unmapped_area;
7804diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7805index 47ee620..1107387 100644
7806--- a/arch/parisc/kernel/traps.c
7807+++ b/arch/parisc/kernel/traps.c
7808@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7809
7810 down_read(&current->mm->mmap_sem);
7811 vma = find_vma(current->mm,regs->iaoq[0]);
7812- if (vma && (regs->iaoq[0] >= vma->vm_start)
7813- && (vma->vm_flags & VM_EXEC)) {
7814-
7815+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7816 fault_address = regs->iaoq[0];
7817 fault_space = regs->iasq[0];
7818
7819diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7820index 3ca9c11..d163ef7 100644
7821--- a/arch/parisc/mm/fault.c
7822+++ b/arch/parisc/mm/fault.c
7823@@ -15,6 +15,7 @@
7824 #include <linux/sched.h>
7825 #include <linux/interrupt.h>
7826 #include <linux/module.h>
7827+#include <linux/unistd.h>
7828
7829 #include <asm/uaccess.h>
7830 #include <asm/traps.h>
7831@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7832 static unsigned long
7833 parisc_acctyp(unsigned long code, unsigned int inst)
7834 {
7835- if (code == 6 || code == 16)
7836+ if (code == 6 || code == 7 || code == 16)
7837 return VM_EXEC;
7838
7839 switch (inst & 0xf0000000) {
7840@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7841 }
7842 #endif
7843
7844+#ifdef CONFIG_PAX_PAGEEXEC
7845+/*
7846+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7847+ *
7848+ * returns 1 when task should be killed
7849+ * 2 when rt_sigreturn trampoline was detected
7850+ * 3 when unpatched PLT trampoline was detected
7851+ */
7852+static int pax_handle_fetch_fault(struct pt_regs *regs)
7853+{
7854+
7855+#ifdef CONFIG_PAX_EMUPLT
7856+ int err;
7857+
7858+ do { /* PaX: unpatched PLT emulation */
7859+ unsigned int bl, depwi;
7860+
7861+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7862+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7863+
7864+ if (err)
7865+ break;
7866+
7867+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7868+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7869+
7870+ err = get_user(ldw, (unsigned int *)addr);
7871+ err |= get_user(bv, (unsigned int *)(addr+4));
7872+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7873+
7874+ if (err)
7875+ break;
7876+
7877+ if (ldw == 0x0E801096U &&
7878+ bv == 0xEAC0C000U &&
7879+ ldw2 == 0x0E881095U)
7880+ {
7881+ unsigned int resolver, map;
7882+
7883+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7884+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7885+ if (err)
7886+ break;
7887+
7888+ regs->gr[20] = instruction_pointer(regs)+8;
7889+ regs->gr[21] = map;
7890+ regs->gr[22] = resolver;
7891+ regs->iaoq[0] = resolver | 3UL;
7892+ regs->iaoq[1] = regs->iaoq[0] + 4;
7893+ return 3;
7894+ }
7895+ }
7896+ } while (0);
7897+#endif
7898+
7899+#ifdef CONFIG_PAX_EMUTRAMP
7900+
7901+#ifndef CONFIG_PAX_EMUSIGRT
7902+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7903+ return 1;
7904+#endif
7905+
7906+ do { /* PaX: rt_sigreturn emulation */
7907+ unsigned int ldi1, ldi2, bel, nop;
7908+
7909+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7910+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7911+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7912+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7913+
7914+ if (err)
7915+ break;
7916+
7917+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7918+ ldi2 == 0x3414015AU &&
7919+ bel == 0xE4008200U &&
7920+ nop == 0x08000240U)
7921+ {
7922+ regs->gr[25] = (ldi1 & 2) >> 1;
7923+ regs->gr[20] = __NR_rt_sigreturn;
7924+ regs->gr[31] = regs->iaoq[1] + 16;
7925+ regs->sr[0] = regs->iasq[1];
7926+ regs->iaoq[0] = 0x100UL;
7927+ regs->iaoq[1] = regs->iaoq[0] + 4;
7928+ regs->iasq[0] = regs->sr[2];
7929+ regs->iasq[1] = regs->sr[2];
7930+ return 2;
7931+ }
7932+ } while (0);
7933+#endif
7934+
7935+ return 1;
7936+}
7937+
7938+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7939+{
7940+ unsigned long i;
7941+
7942+ printk(KERN_ERR "PAX: bytes at PC: ");
7943+ for (i = 0; i < 5; i++) {
7944+ unsigned int c;
7945+ if (get_user(c, (unsigned int *)pc+i))
7946+ printk(KERN_CONT "???????? ");
7947+ else
7948+ printk(KERN_CONT "%08x ", c);
7949+ }
7950+ printk("\n");
7951+}
7952+#endif
7953+
7954 int fixup_exception(struct pt_regs *regs)
7955 {
7956 const struct exception_table_entry *fix;
7957@@ -234,8 +345,33 @@ retry:
7958
7959 good_area:
7960
7961- if ((vma->vm_flags & acc_type) != acc_type)
7962+ if ((vma->vm_flags & acc_type) != acc_type) {
7963+
7964+#ifdef CONFIG_PAX_PAGEEXEC
7965+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7966+ (address & ~3UL) == instruction_pointer(regs))
7967+ {
7968+ up_read(&mm->mmap_sem);
7969+ switch (pax_handle_fetch_fault(regs)) {
7970+
7971+#ifdef CONFIG_PAX_EMUPLT
7972+ case 3:
7973+ return;
7974+#endif
7975+
7976+#ifdef CONFIG_PAX_EMUTRAMP
7977+ case 2:
7978+ return;
7979+#endif
7980+
7981+ }
7982+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7983+ do_group_exit(SIGKILL);
7984+ }
7985+#endif
7986+
7987 goto bad_area;
7988+ }
7989
7990 /*
7991 * If for any reason at all we couldn't handle the fault, make
7992diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7993index e099899..457d6a8 100644
7994--- a/arch/powerpc/Kconfig
7995+++ b/arch/powerpc/Kconfig
7996@@ -397,6 +397,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7997 config KEXEC
7998 bool "kexec system call"
7999 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
8000+ depends on !GRKERNSEC_KMEM
8001 help
8002 kexec is a system call that implements the ability to shutdown your
8003 current kernel, and to start another kernel. It is like a reboot
8004diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
8005index e3b1d41..8e81edf 100644
8006--- a/arch/powerpc/include/asm/atomic.h
8007+++ b/arch/powerpc/include/asm/atomic.h
8008@@ -523,6 +523,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
8009 return t1;
8010 }
8011
8012+#define atomic64_read_unchecked(v) atomic64_read(v)
8013+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
8014+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
8015+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
8016+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
8017+#define atomic64_inc_unchecked(v) atomic64_inc(v)
8018+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
8019+#define atomic64_dec_unchecked(v) atomic64_dec(v)
8020+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
8021+
8022 #endif /* __powerpc64__ */
8023
8024 #endif /* __KERNEL__ */
8025diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8026index f89da80..7f5b05a 100644
8027--- a/arch/powerpc/include/asm/barrier.h
8028+++ b/arch/powerpc/include/asm/barrier.h
8029@@ -73,7 +73,7 @@
8030 do { \
8031 compiletime_assert_atomic_type(*p); \
8032 __lwsync(); \
8033- ACCESS_ONCE(*p) = (v); \
8034+ ACCESS_ONCE_RW(*p) = (v); \
8035 } while (0)
8036
8037 #define smp_load_acquire(p) \
8038diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8039index ed0afc1..0332825 100644
8040--- a/arch/powerpc/include/asm/cache.h
8041+++ b/arch/powerpc/include/asm/cache.h
8042@@ -3,6 +3,7 @@
8043
8044 #ifdef __KERNEL__
8045
8046+#include <linux/const.h>
8047
8048 /* bytes per L1 cache line */
8049 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8050@@ -22,7 +23,7 @@
8051 #define L1_CACHE_SHIFT 7
8052 #endif
8053
8054-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8055+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8056
8057 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8058
8059diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8060index 935b5e7..7001d2d 100644
8061--- a/arch/powerpc/include/asm/elf.h
8062+++ b/arch/powerpc/include/asm/elf.h
8063@@ -28,8 +28,19 @@
8064 the loader. We need to make sure that it is out of the way of the program
8065 that it will "exec", and that there is sufficient room for the brk. */
8066
8067-extern unsigned long randomize_et_dyn(unsigned long base);
8068-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8069+#define ELF_ET_DYN_BASE (0x20000000)
8070+
8071+#ifdef CONFIG_PAX_ASLR
8072+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8073+
8074+#ifdef __powerpc64__
8075+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8076+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8077+#else
8078+#define PAX_DELTA_MMAP_LEN 15
8079+#define PAX_DELTA_STACK_LEN 15
8080+#endif
8081+#endif
8082
8083 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8084
8085@@ -127,10 +138,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8086 (0x7ff >> (PAGE_SHIFT - 12)) : \
8087 (0x3ffff >> (PAGE_SHIFT - 12)))
8088
8089-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8090-#define arch_randomize_brk arch_randomize_brk
8091-
8092-
8093 #ifdef CONFIG_SPU_BASE
8094 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8095 #define NT_SPU 1
8096diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8097index 8196e9c..d83a9f3 100644
8098--- a/arch/powerpc/include/asm/exec.h
8099+++ b/arch/powerpc/include/asm/exec.h
8100@@ -4,6 +4,6 @@
8101 #ifndef _ASM_POWERPC_EXEC_H
8102 #define _ASM_POWERPC_EXEC_H
8103
8104-extern unsigned long arch_align_stack(unsigned long sp);
8105+#define arch_align_stack(x) ((x) & ~0xfUL)
8106
8107 #endif /* _ASM_POWERPC_EXEC_H */
8108diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8109index 5acabbd..7ea14fa 100644
8110--- a/arch/powerpc/include/asm/kmap_types.h
8111+++ b/arch/powerpc/include/asm/kmap_types.h
8112@@ -10,7 +10,7 @@
8113 * 2 of the License, or (at your option) any later version.
8114 */
8115
8116-#define KM_TYPE_NR 16
8117+#define KM_TYPE_NR 17
8118
8119 #endif /* __KERNEL__ */
8120 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8121diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8122index b8da913..60b608a 100644
8123--- a/arch/powerpc/include/asm/local.h
8124+++ b/arch/powerpc/include/asm/local.h
8125@@ -9,15 +9,26 @@ typedef struct
8126 atomic_long_t a;
8127 } local_t;
8128
8129+typedef struct
8130+{
8131+ atomic_long_unchecked_t a;
8132+} local_unchecked_t;
8133+
8134 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8135
8136 #define local_read(l) atomic_long_read(&(l)->a)
8137+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8138 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8139+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8140
8141 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8142+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8143 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8144+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8145 #define local_inc(l) atomic_long_inc(&(l)->a)
8146+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8147 #define local_dec(l) atomic_long_dec(&(l)->a)
8148+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8149
8150 static __inline__ long local_add_return(long a, local_t *l)
8151 {
8152@@ -35,6 +46,7 @@ static __inline__ long local_add_return(long a, local_t *l)
8153
8154 return t;
8155 }
8156+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
8157
8158 #define local_add_negative(a, l) (local_add_return((a), (l)) < 0)
8159
8160@@ -54,6 +66,7 @@ static __inline__ long local_sub_return(long a, local_t *l)
8161
8162 return t;
8163 }
8164+#define local_sub_return_unchecked(i, l) atomic_long_sub_return_unchecked((i), (&(l)->a))
8165
8166 static __inline__ long local_inc_return(local_t *l)
8167 {
8168@@ -101,6 +114,8 @@ static __inline__ long local_dec_return(local_t *l)
8169
8170 #define local_cmpxchg(l, o, n) \
8171 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8172+#define local_cmpxchg_unchecked(l, o, n) \
8173+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8174 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8175
8176 /**
8177diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8178index 8565c25..2865190 100644
8179--- a/arch/powerpc/include/asm/mman.h
8180+++ b/arch/powerpc/include/asm/mman.h
8181@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8182 }
8183 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8184
8185-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8186+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8187 {
8188 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8189 }
8190diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8191index 32e4e21..62afb12 100644
8192--- a/arch/powerpc/include/asm/page.h
8193+++ b/arch/powerpc/include/asm/page.h
8194@@ -230,8 +230,9 @@ extern long long virt_phys_offset;
8195 * and needs to be executable. This means the whole heap ends
8196 * up being executable.
8197 */
8198-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8199- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8200+#define VM_DATA_DEFAULT_FLAGS32 \
8201+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8202+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8203
8204 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8205 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8206@@ -259,6 +260,9 @@ extern long long virt_phys_offset;
8207 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8208 #endif
8209
8210+#define ktla_ktva(addr) (addr)
8211+#define ktva_ktla(addr) (addr)
8212+
8213 #ifndef CONFIG_PPC_BOOK3S_64
8214 /*
8215 * Use the top bit of the higher-level page table entries to indicate whether
8216diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8217index 88693ce..ac6f9ab 100644
8218--- a/arch/powerpc/include/asm/page_64.h
8219+++ b/arch/powerpc/include/asm/page_64.h
8220@@ -153,15 +153,18 @@ do { \
8221 * stack by default, so in the absence of a PT_GNU_STACK program header
8222 * we turn execute permission off.
8223 */
8224-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8225- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8226+#define VM_STACK_DEFAULT_FLAGS32 \
8227+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8228+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8229
8230 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8231 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8232
8233+#ifndef CONFIG_PAX_PAGEEXEC
8234 #define VM_STACK_DEFAULT_FLAGS \
8235 (is_32bit_task() ? \
8236 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8237+#endif
8238
8239 #include <asm-generic/getorder.h>
8240
8241diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8242index 4b0be20..c15a27d 100644
8243--- a/arch/powerpc/include/asm/pgalloc-64.h
8244+++ b/arch/powerpc/include/asm/pgalloc-64.h
8245@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8246 #ifndef CONFIG_PPC_64K_PAGES
8247
8248 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8249+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8250
8251 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8252 {
8253@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8254 pud_set(pud, (unsigned long)pmd);
8255 }
8256
8257+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8258+{
8259+ pud_populate(mm, pud, pmd);
8260+}
8261+
8262 #define pmd_populate(mm, pmd, pte_page) \
8263 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8264 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8265@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8266 #endif
8267
8268 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8269+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8270
8271 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8272 pte_t *pte)
8273diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8274index 3ebb188..e17dddf 100644
8275--- a/arch/powerpc/include/asm/pgtable.h
8276+++ b/arch/powerpc/include/asm/pgtable.h
8277@@ -2,6 +2,7 @@
8278 #define _ASM_POWERPC_PGTABLE_H
8279 #ifdef __KERNEL__
8280
8281+#include <linux/const.h>
8282 #ifndef __ASSEMBLY__
8283 #include <linux/mmdebug.h>
8284 #include <asm/processor.h> /* For TASK_SIZE */
8285diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8286index 4aad413..85d86bf 100644
8287--- a/arch/powerpc/include/asm/pte-hash32.h
8288+++ b/arch/powerpc/include/asm/pte-hash32.h
8289@@ -21,6 +21,7 @@
8290 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8291 #define _PAGE_USER 0x004 /* usermode access allowed */
8292 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8293+#define _PAGE_EXEC _PAGE_GUARDED
8294 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8295 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8296 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8297diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8298index e5d2e0b..9ac74b1 100644
8299--- a/arch/powerpc/include/asm/reg.h
8300+++ b/arch/powerpc/include/asm/reg.h
8301@@ -249,6 +249,7 @@
8302 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8303 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8304 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8305+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8306 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8307 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8308 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8309diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8310index ff51046..b982dd4 100644
8311--- a/arch/powerpc/include/asm/smp.h
8312+++ b/arch/powerpc/include/asm/smp.h
8313@@ -51,7 +51,7 @@ struct smp_ops_t {
8314 int (*cpu_disable)(void);
8315 void (*cpu_die)(unsigned int nr);
8316 int (*cpu_bootable)(unsigned int nr);
8317-};
8318+} __no_const;
8319
8320 extern void smp_send_debugger_break(void);
8321 extern void start_secondary_resume(void);
8322diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8323index b034ecd..af7e31f 100644
8324--- a/arch/powerpc/include/asm/thread_info.h
8325+++ b/arch/powerpc/include/asm/thread_info.h
8326@@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8327 #if defined(CONFIG_PPC64)
8328 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8329 #endif
8330+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8331+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8332
8333 /* as above, but as bit values */
8334 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8335@@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8336 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8337 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8338 #define _TIF_NOHZ (1<<TIF_NOHZ)
8339+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8340 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8341 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8342- _TIF_NOHZ)
8343+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8344
8345 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8346 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8347diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8348index 9485b43..3bd3c16 100644
8349--- a/arch/powerpc/include/asm/uaccess.h
8350+++ b/arch/powerpc/include/asm/uaccess.h
8351@@ -58,6 +58,7 @@
8352
8353 #endif
8354
8355+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8356 #define access_ok(type, addr, size) \
8357 (__chk_user_ptr(addr), \
8358 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8359@@ -318,52 +319,6 @@ do { \
8360 extern unsigned long __copy_tofrom_user(void __user *to,
8361 const void __user *from, unsigned long size);
8362
8363-#ifndef __powerpc64__
8364-
8365-static inline unsigned long copy_from_user(void *to,
8366- const void __user *from, unsigned long n)
8367-{
8368- unsigned long over;
8369-
8370- if (access_ok(VERIFY_READ, from, n))
8371- return __copy_tofrom_user((__force void __user *)to, from, n);
8372- if ((unsigned long)from < TASK_SIZE) {
8373- over = (unsigned long)from + n - TASK_SIZE;
8374- return __copy_tofrom_user((__force void __user *)to, from,
8375- n - over) + over;
8376- }
8377- return n;
8378-}
8379-
8380-static inline unsigned long copy_to_user(void __user *to,
8381- const void *from, unsigned long n)
8382-{
8383- unsigned long over;
8384-
8385- if (access_ok(VERIFY_WRITE, to, n))
8386- return __copy_tofrom_user(to, (__force void __user *)from, n);
8387- if ((unsigned long)to < TASK_SIZE) {
8388- over = (unsigned long)to + n - TASK_SIZE;
8389- return __copy_tofrom_user(to, (__force void __user *)from,
8390- n - over) + over;
8391- }
8392- return n;
8393-}
8394-
8395-#else /* __powerpc64__ */
8396-
8397-#define __copy_in_user(to, from, size) \
8398- __copy_tofrom_user((to), (from), (size))
8399-
8400-extern unsigned long copy_from_user(void *to, const void __user *from,
8401- unsigned long n);
8402-extern unsigned long copy_to_user(void __user *to, const void *from,
8403- unsigned long n);
8404-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8405- unsigned long n);
8406-
8407-#endif /* __powerpc64__ */
8408-
8409 static inline unsigned long __copy_from_user_inatomic(void *to,
8410 const void __user *from, unsigned long n)
8411 {
8412@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8413 if (ret == 0)
8414 return 0;
8415 }
8416+
8417+ if (!__builtin_constant_p(n))
8418+ check_object_size(to, n, false);
8419+
8420 return __copy_tofrom_user((__force void __user *)to, from, n);
8421 }
8422
8423@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8424 if (ret == 0)
8425 return 0;
8426 }
8427+
8428+ if (!__builtin_constant_p(n))
8429+ check_object_size(from, n, true);
8430+
8431 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8432 }
8433
8434@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8435 return __copy_to_user_inatomic(to, from, size);
8436 }
8437
8438+#ifndef __powerpc64__
8439+
8440+static inline unsigned long __must_check copy_from_user(void *to,
8441+ const void __user *from, unsigned long n)
8442+{
8443+ unsigned long over;
8444+
8445+ if ((long)n < 0)
8446+ return n;
8447+
8448+ if (access_ok(VERIFY_READ, from, n)) {
8449+ if (!__builtin_constant_p(n))
8450+ check_object_size(to, n, false);
8451+ return __copy_tofrom_user((__force void __user *)to, from, n);
8452+ }
8453+ if ((unsigned long)from < TASK_SIZE) {
8454+ over = (unsigned long)from + n - TASK_SIZE;
8455+ if (!__builtin_constant_p(n - over))
8456+ check_object_size(to, n - over, false);
8457+ return __copy_tofrom_user((__force void __user *)to, from,
8458+ n - over) + over;
8459+ }
8460+ return n;
8461+}
8462+
8463+static inline unsigned long __must_check copy_to_user(void __user *to,
8464+ const void *from, unsigned long n)
8465+{
8466+ unsigned long over;
8467+
8468+ if ((long)n < 0)
8469+ return n;
8470+
8471+ if (access_ok(VERIFY_WRITE, to, n)) {
8472+ if (!__builtin_constant_p(n))
8473+ check_object_size(from, n, true);
8474+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8475+ }
8476+ if ((unsigned long)to < TASK_SIZE) {
8477+ over = (unsigned long)to + n - TASK_SIZE;
8478+ if (!__builtin_constant_p(n))
8479+ check_object_size(from, n - over, true);
8480+ return __copy_tofrom_user(to, (__force void __user *)from,
8481+ n - over) + over;
8482+ }
8483+ return n;
8484+}
8485+
8486+#else /* __powerpc64__ */
8487+
8488+#define __copy_in_user(to, from, size) \
8489+ __copy_tofrom_user((to), (from), (size))
8490+
8491+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8492+{
8493+ if ((long)n < 0 || n > INT_MAX)
8494+ return n;
8495+
8496+ if (!__builtin_constant_p(n))
8497+ check_object_size(to, n, false);
8498+
8499+ if (likely(access_ok(VERIFY_READ, from, n)))
8500+ n = __copy_from_user(to, from, n);
8501+ else
8502+ memset(to, 0, n);
8503+ return n;
8504+}
8505+
8506+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8507+{
8508+ if ((long)n < 0 || n > INT_MAX)
8509+ return n;
8510+
8511+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8512+ if (!__builtin_constant_p(n))
8513+ check_object_size(from, n, true);
8514+ n = __copy_to_user(to, from, n);
8515+ }
8516+ return n;
8517+}
8518+
8519+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8520+ unsigned long n);
8521+
8522+#endif /* __powerpc64__ */
8523+
8524 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8525
8526 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8527diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8528index fcc9a89..07be2bb 100644
8529--- a/arch/powerpc/kernel/Makefile
8530+++ b/arch/powerpc/kernel/Makefile
8531@@ -26,6 +26,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8532 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8533 endif
8534
8535+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8536+
8537 obj-y := cputable.o ptrace.o syscalls.o \
8538 irq.o align.o signal_32.o pmc.o vdso.o \
8539 process.o systbl.o idle.o \
8540diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8541index c1bee3c..5b42583 100644
8542--- a/arch/powerpc/kernel/exceptions-64e.S
8543+++ b/arch/powerpc/kernel/exceptions-64e.S
8544@@ -1010,6 +1010,7 @@ storage_fault_common:
8545 std r14,_DAR(r1)
8546 std r15,_DSISR(r1)
8547 addi r3,r1,STACK_FRAME_OVERHEAD
8548+ bl .save_nvgprs
8549 mr r4,r14
8550 mr r5,r15
8551 ld r14,PACA_EXGEN+EX_R14(r13)
8552@@ -1018,8 +1019,7 @@ storage_fault_common:
8553 cmpdi r3,0
8554 bne- 1f
8555 b .ret_from_except_lite
8556-1: bl .save_nvgprs
8557- mr r5,r3
8558+1: mr r5,r3
8559 addi r3,r1,STACK_FRAME_OVERHEAD
8560 ld r4,_DAR(r1)
8561 bl .bad_page_fault
8562diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8563index 3afd391..18f9e36 100644
8564--- a/arch/powerpc/kernel/exceptions-64s.S
8565+++ b/arch/powerpc/kernel/exceptions-64s.S
8566@@ -1587,10 +1587,10 @@ handle_page_fault:
8567 11: ld r4,_DAR(r1)
8568 ld r5,_DSISR(r1)
8569 addi r3,r1,STACK_FRAME_OVERHEAD
8570+ bl .save_nvgprs
8571 bl .do_page_fault
8572 cmpdi r3,0
8573 beq+ 12f
8574- bl .save_nvgprs
8575 mr r5,r3
8576 addi r3,r1,STACK_FRAME_OVERHEAD
8577 lwz r4,_DAR(r1)
8578diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8579index ca1cd74..6f0241a 100644
8580--- a/arch/powerpc/kernel/irq.c
8581+++ b/arch/powerpc/kernel/irq.c
8582@@ -447,6 +447,8 @@ void migrate_irqs(void)
8583 }
8584 #endif
8585
8586+extern void gr_handle_kernel_exploit(void);
8587+
8588 static inline void check_stack_overflow(void)
8589 {
8590 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8591@@ -459,6 +461,7 @@ static inline void check_stack_overflow(void)
8592 printk("do_IRQ: stack overflow: %ld\n",
8593 sp - sizeof(struct thread_info));
8594 dump_stack();
8595+ gr_handle_kernel_exploit();
8596 }
8597 #endif
8598 }
8599diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8600index 6cff040..74ac5d1 100644
8601--- a/arch/powerpc/kernel/module_32.c
8602+++ b/arch/powerpc/kernel/module_32.c
8603@@ -161,7 +161,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8604 me->arch.core_plt_section = i;
8605 }
8606 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8607- printk("Module doesn't contain .plt or .init.plt sections.\n");
8608+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
8609 return -ENOEXEC;
8610 }
8611
8612@@ -191,11 +191,16 @@ static uint32_t do_plt_call(void *location,
8613
8614 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8615 /* Init, or core PLT? */
8616- if (location >= mod->module_core
8617- && location < mod->module_core + mod->core_size)
8618+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8619+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8620 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8621- else
8622+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8623+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8624 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8625+ else {
8626+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8627+ return ~0UL;
8628+ }
8629
8630 /* Find this entry, or if that fails, the next avail. entry */
8631 while (entry->jump[0]) {
8632@@ -299,7 +304,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8633 }
8634 #ifdef CONFIG_DYNAMIC_FTRACE
8635 module->arch.tramp =
8636- do_plt_call(module->module_core,
8637+ do_plt_call(module->module_core_rx,
8638 (unsigned long)ftrace_caller,
8639 sechdrs, module);
8640 #endif
8641diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8642index 31d0215..206af70 100644
8643--- a/arch/powerpc/kernel/process.c
8644+++ b/arch/powerpc/kernel/process.c
8645@@ -1031,8 +1031,8 @@ void show_regs(struct pt_regs * regs)
8646 * Lookup NIP late so we have the best change of getting the
8647 * above info out without failing
8648 */
8649- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8650- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8651+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8652+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8653 #endif
8654 show_stack(current, (unsigned long *) regs->gpr[1]);
8655 if (!user_mode(regs))
8656@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8657 newsp = stack[0];
8658 ip = stack[STACK_FRAME_LR_SAVE];
8659 if (!firstframe || ip != lr) {
8660- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8661+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8662 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8663 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8664- printk(" (%pS)",
8665+ printk(" (%pA)",
8666 (void *)current->ret_stack[curr_frame].ret);
8667 curr_frame--;
8668 }
8669@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8670 struct pt_regs *regs = (struct pt_regs *)
8671 (sp + STACK_FRAME_OVERHEAD);
8672 lr = regs->link;
8673- printk("--- Exception: %lx at %pS\n LR = %pS\n",
8674+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
8675 regs->trap, (void *)regs->nip, (void *)lr);
8676 firstframe = 1;
8677 }
8678@@ -1613,58 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
8679 mtspr(SPRN_CTRLT, ctrl);
8680 }
8681 #endif /* CONFIG_PPC64 */
8682-
8683-unsigned long arch_align_stack(unsigned long sp)
8684-{
8685- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8686- sp -= get_random_int() & ~PAGE_MASK;
8687- return sp & ~0xf;
8688-}
8689-
8690-static inline unsigned long brk_rnd(void)
8691-{
8692- unsigned long rnd = 0;
8693-
8694- /* 8MB for 32bit, 1GB for 64bit */
8695- if (is_32bit_task())
8696- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8697- else
8698- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8699-
8700- return rnd << PAGE_SHIFT;
8701-}
8702-
8703-unsigned long arch_randomize_brk(struct mm_struct *mm)
8704-{
8705- unsigned long base = mm->brk;
8706- unsigned long ret;
8707-
8708-#ifdef CONFIG_PPC_STD_MMU_64
8709- /*
8710- * If we are using 1TB segments and we are allowed to randomise
8711- * the heap, we can put it above 1TB so it is backed by a 1TB
8712- * segment. Otherwise the heap will be in the bottom 1TB
8713- * which always uses 256MB segments and this may result in a
8714- * performance penalty.
8715- */
8716- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8717- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8718-#endif
8719-
8720- ret = PAGE_ALIGN(base + brk_rnd());
8721-
8722- if (ret < mm->brk)
8723- return mm->brk;
8724-
8725- return ret;
8726-}
8727-
8728-unsigned long randomize_et_dyn(unsigned long base)
8729-{
8730- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8731-
8732- if (ret < base)
8733- return base;
8734-
8735- return ret;
8736-}
8737diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
8738index 2e3d2bf..35df241 100644
8739--- a/arch/powerpc/kernel/ptrace.c
8740+++ b/arch/powerpc/kernel/ptrace.c
8741@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
8742 return ret;
8743 }
8744
8745+#ifdef CONFIG_GRKERNSEC_SETXID
8746+extern void gr_delayed_cred_worker(void);
8747+#endif
8748+
8749 /*
8750 * We must return the syscall number to actually look up in the table.
8751 * This can be -1L to skip running any syscall at all.
8752@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
8753
8754 secure_computing_strict(regs->gpr[0]);
8755
8756+#ifdef CONFIG_GRKERNSEC_SETXID
8757+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8758+ gr_delayed_cred_worker();
8759+#endif
8760+
8761 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
8762 tracehook_report_syscall_entry(regs))
8763 /*
8764@@ -1808,6 +1817,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
8765 {
8766 int step;
8767
8768+#ifdef CONFIG_GRKERNSEC_SETXID
8769+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
8770+ gr_delayed_cred_worker();
8771+#endif
8772+
8773 audit_syscall_exit(regs);
8774
8775 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
8776diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
8777index 4e47db6..6dcc96e 100644
8778--- a/arch/powerpc/kernel/signal_32.c
8779+++ b/arch/powerpc/kernel/signal_32.c
8780@@ -1013,7 +1013,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
8781 /* Save user registers on the stack */
8782 frame = &rt_sf->uc.uc_mcontext;
8783 addr = frame;
8784- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
8785+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8786 sigret = 0;
8787 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
8788 } else {
8789diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
8790index d501dc4..e5a0de0 100644
8791--- a/arch/powerpc/kernel/signal_64.c
8792+++ b/arch/powerpc/kernel/signal_64.c
8793@@ -760,7 +760,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
8794 current->thread.fp_state.fpscr = 0;
8795
8796 /* Set up to return from userspace. */
8797- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
8798+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
8799 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
8800 } else {
8801 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
8802diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
8803index 1bd7ca2..9b78c2f 100644
8804--- a/arch/powerpc/kernel/traps.c
8805+++ b/arch/powerpc/kernel/traps.c
8806@@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
8807 return flags;
8808 }
8809
8810+extern void gr_handle_kernel_exploit(void);
8811+
8812 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8813 int signr)
8814 {
8815@@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
8816 panic("Fatal exception in interrupt");
8817 if (panic_on_oops)
8818 panic("Fatal exception");
8819+
8820+ gr_handle_kernel_exploit();
8821+
8822 do_exit(signr);
8823 }
8824
8825diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
8826index ce74c33..0803371 100644
8827--- a/arch/powerpc/kernel/vdso.c
8828+++ b/arch/powerpc/kernel/vdso.c
8829@@ -35,6 +35,7 @@
8830 #include <asm/vdso.h>
8831 #include <asm/vdso_datapage.h>
8832 #include <asm/setup.h>
8833+#include <asm/mman.h>
8834
8835 #undef DEBUG
8836
8837@@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8838 vdso_base = VDSO32_MBASE;
8839 #endif
8840
8841- current->mm->context.vdso_base = 0;
8842+ current->mm->context.vdso_base = ~0UL;
8843
8844 /* vDSO has a problem and was disabled, just don't "enable" it for the
8845 * process
8846@@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
8847 vdso_base = get_unmapped_area(NULL, vdso_base,
8848 (vdso_pages << PAGE_SHIFT) +
8849 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
8850- 0, 0);
8851+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
8852 if (IS_ERR_VALUE(vdso_base)) {
8853 rc = vdso_base;
8854 goto fail_mmapsem;
8855diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
8856index 3cf541a..ab2d825 100644
8857--- a/arch/powerpc/kvm/powerpc.c
8858+++ b/arch/powerpc/kvm/powerpc.c
8859@@ -1153,7 +1153,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
8860 }
8861 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
8862
8863-int kvm_arch_init(void *opaque)
8864+int kvm_arch_init(const void *opaque)
8865 {
8866 return 0;
8867 }
8868diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
8869index 5eea6f3..5d10396 100644
8870--- a/arch/powerpc/lib/usercopy_64.c
8871+++ b/arch/powerpc/lib/usercopy_64.c
8872@@ -9,22 +9,6 @@
8873 #include <linux/module.h>
8874 #include <asm/uaccess.h>
8875
8876-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
8877-{
8878- if (likely(access_ok(VERIFY_READ, from, n)))
8879- n = __copy_from_user(to, from, n);
8880- else
8881- memset(to, 0, n);
8882- return n;
8883-}
8884-
8885-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
8886-{
8887- if (likely(access_ok(VERIFY_WRITE, to, n)))
8888- n = __copy_to_user(to, from, n);
8889- return n;
8890-}
8891-
8892 unsigned long copy_in_user(void __user *to, const void __user *from,
8893 unsigned long n)
8894 {
8895@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
8896 return n;
8897 }
8898
8899-EXPORT_SYMBOL(copy_from_user);
8900-EXPORT_SYMBOL(copy_to_user);
8901 EXPORT_SYMBOL(copy_in_user);
8902
8903diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
8904index 51ab9e7..7d3c78b 100644
8905--- a/arch/powerpc/mm/fault.c
8906+++ b/arch/powerpc/mm/fault.c
8907@@ -33,6 +33,10 @@
8908 #include <linux/magic.h>
8909 #include <linux/ratelimit.h>
8910 #include <linux/context_tracking.h>
8911+#include <linux/slab.h>
8912+#include <linux/pagemap.h>
8913+#include <linux/compiler.h>
8914+#include <linux/unistd.h>
8915
8916 #include <asm/firmware.h>
8917 #include <asm/page.h>
8918@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
8919 }
8920 #endif
8921
8922+#ifdef CONFIG_PAX_PAGEEXEC
8923+/*
8924+ * PaX: decide what to do with offenders (regs->nip = fault address)
8925+ *
8926+ * returns 1 when task should be killed
8927+ */
8928+static int pax_handle_fetch_fault(struct pt_regs *regs)
8929+{
8930+ return 1;
8931+}
8932+
8933+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
8934+{
8935+ unsigned long i;
8936+
8937+ printk(KERN_ERR "PAX: bytes at PC: ");
8938+ for (i = 0; i < 5; i++) {
8939+ unsigned int c;
8940+ if (get_user(c, (unsigned int __user *)pc+i))
8941+ printk(KERN_CONT "???????? ");
8942+ else
8943+ printk(KERN_CONT "%08x ", c);
8944+ }
8945+ printk("\n");
8946+}
8947+#endif
8948+
8949 /*
8950 * Check whether the instruction at regs->nip is a store using
8951 * an update addressing form which will update r1.
8952@@ -216,7 +247,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
8953 * indicate errors in DSISR but can validly be set in SRR1.
8954 */
8955 if (trap == 0x400)
8956- error_code &= 0x48200000;
8957+ error_code &= 0x58200000;
8958 else
8959 is_write = error_code & DSISR_ISSTORE;
8960 #else
8961@@ -378,7 +409,7 @@ good_area:
8962 * "undefined". Of those that can be set, this is the only
8963 * one which seems bad.
8964 */
8965- if (error_code & 0x10000000)
8966+ if (error_code & DSISR_GUARDED)
8967 /* Guarded storage error. */
8968 goto bad_area;
8969 #endif /* CONFIG_8xx */
8970@@ -393,7 +424,7 @@ good_area:
8971 * processors use the same I/D cache coherency mechanism
8972 * as embedded.
8973 */
8974- if (error_code & DSISR_PROTFAULT)
8975+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
8976 goto bad_area;
8977 #endif /* CONFIG_PPC_STD_MMU */
8978
8979@@ -483,6 +514,23 @@ bad_area:
8980 bad_area_nosemaphore:
8981 /* User mode accesses cause a SIGSEGV */
8982 if (user_mode(regs)) {
8983+
8984+#ifdef CONFIG_PAX_PAGEEXEC
8985+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
8986+#ifdef CONFIG_PPC_STD_MMU
8987+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
8988+#else
8989+ if (is_exec && regs->nip == address) {
8990+#endif
8991+ switch (pax_handle_fetch_fault(regs)) {
8992+ }
8993+
8994+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
8995+ do_group_exit(SIGKILL);
8996+ }
8997+ }
8998+#endif
8999+
9000 _exception(SIGSEGV, regs, code, address);
9001 goto bail;
9002 }
9003diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9004index cb8bdbe..cde4bc7 100644
9005--- a/arch/powerpc/mm/mmap.c
9006+++ b/arch/powerpc/mm/mmap.c
9007@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9008 return sysctl_legacy_va_layout;
9009 }
9010
9011-static unsigned long mmap_rnd(void)
9012+static unsigned long mmap_rnd(struct mm_struct *mm)
9013 {
9014 unsigned long rnd = 0;
9015
9016+#ifdef CONFIG_PAX_RANDMMAP
9017+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9018+#endif
9019+
9020 if (current->flags & PF_RANDOMIZE) {
9021 /* 8MB for 32bit, 1GB for 64bit */
9022 if (is_32bit_task())
9023@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9024 return rnd << PAGE_SHIFT;
9025 }
9026
9027-static inline unsigned long mmap_base(void)
9028+static inline unsigned long mmap_base(struct mm_struct *mm)
9029 {
9030 unsigned long gap = rlimit(RLIMIT_STACK);
9031
9032@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9033 else if (gap > MAX_GAP)
9034 gap = MAX_GAP;
9035
9036- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9037+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9038 }
9039
9040 /*
9041@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9042 */
9043 if (mmap_is_legacy()) {
9044 mm->mmap_base = TASK_UNMAPPED_BASE;
9045+
9046+#ifdef CONFIG_PAX_RANDMMAP
9047+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9048+ mm->mmap_base += mm->delta_mmap;
9049+#endif
9050+
9051 mm->get_unmapped_area = arch_get_unmapped_area;
9052 } else {
9053- mm->mmap_base = mmap_base();
9054+ mm->mmap_base = mmap_base(mm);
9055+
9056+#ifdef CONFIG_PAX_RANDMMAP
9057+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9058+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9059+#endif
9060+
9061 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9062 }
9063 }
9064diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9065index b0c75cc..ef7fb93 100644
9066--- a/arch/powerpc/mm/slice.c
9067+++ b/arch/powerpc/mm/slice.c
9068@@ -103,7 +103,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9069 if ((mm->task_size - len) < addr)
9070 return 0;
9071 vma = find_vma(mm, addr);
9072- return (!vma || (addr + len) <= vma->vm_start);
9073+ return check_heap_stack_gap(vma, addr, len, 0);
9074 }
9075
9076 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9077@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9078 info.align_offset = 0;
9079
9080 addr = TASK_UNMAPPED_BASE;
9081+
9082+#ifdef CONFIG_PAX_RANDMMAP
9083+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9084+ addr += mm->delta_mmap;
9085+#endif
9086+
9087 while (addr < TASK_SIZE) {
9088 info.low_limit = addr;
9089 if (!slice_scan_available(addr, available, 1, &addr))
9090@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9091 if (fixed && addr > (mm->task_size - len))
9092 return -ENOMEM;
9093
9094+#ifdef CONFIG_PAX_RANDMMAP
9095+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9096+ addr = 0;
9097+#endif
9098+
9099 /* If hint, make sure it matches our alignment restrictions */
9100 if (!fixed && addr) {
9101 addr = _ALIGN_UP(addr, 1ul << pshift);
9102diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9103index 4278acf..67fd0e6 100644
9104--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9105+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9106@@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9107 }
9108
9109 static struct pci_ops scc_pciex_pci_ops = {
9110- scc_pciex_read_config,
9111- scc_pciex_write_config,
9112+ .read = scc_pciex_read_config,
9113+ .write = scc_pciex_write_config,
9114 };
9115
9116 static void pciex_clear_intr_all(unsigned int __iomem *base)
9117diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9118index 9098692..3d54cd1 100644
9119--- a/arch/powerpc/platforms/cell/spufs/file.c
9120+++ b/arch/powerpc/platforms/cell/spufs/file.c
9121@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9122 return VM_FAULT_NOPAGE;
9123 }
9124
9125-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9126+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9127 unsigned long address,
9128- void *buf, int len, int write)
9129+ void *buf, size_t len, int write)
9130 {
9131 struct spu_context *ctx = vma->vm_file->private_data;
9132 unsigned long offset = address - vma->vm_start;
9133diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9134index 1d47061..0714963 100644
9135--- a/arch/s390/include/asm/atomic.h
9136+++ b/arch/s390/include/asm/atomic.h
9137@@ -412,6 +412,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9138 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9139 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9140
9141+#define atomic64_read_unchecked(v) atomic64_read(v)
9142+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9143+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9144+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9145+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9146+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9147+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9148+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9149+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9150+
9151 #define smp_mb__before_atomic_dec() smp_mb()
9152 #define smp_mb__after_atomic_dec() smp_mb()
9153 #define smp_mb__before_atomic_inc() smp_mb()
9154diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9155index 578680f..0eb3b11 100644
9156--- a/arch/s390/include/asm/barrier.h
9157+++ b/arch/s390/include/asm/barrier.h
9158@@ -36,7 +36,7 @@
9159 do { \
9160 compiletime_assert_atomic_type(*p); \
9161 barrier(); \
9162- ACCESS_ONCE(*p) = (v); \
9163+ ACCESS_ONCE_RW(*p) = (v); \
9164 } while (0)
9165
9166 #define smp_load_acquire(p) \
9167diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9168index 4d7ccac..d03d0ad 100644
9169--- a/arch/s390/include/asm/cache.h
9170+++ b/arch/s390/include/asm/cache.h
9171@@ -9,8 +9,10 @@
9172 #ifndef __ARCH_S390_CACHE_H
9173 #define __ARCH_S390_CACHE_H
9174
9175-#define L1_CACHE_BYTES 256
9176+#include <linux/const.h>
9177+
9178 #define L1_CACHE_SHIFT 8
9179+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9180 #define NET_SKB_PAD 32
9181
9182 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9183diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9184index 78f4f87..598ce39 100644
9185--- a/arch/s390/include/asm/elf.h
9186+++ b/arch/s390/include/asm/elf.h
9187@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
9188 the loader. We need to make sure that it is out of the way of the program
9189 that it will "exec", and that there is sufficient room for the brk. */
9190
9191-extern unsigned long randomize_et_dyn(unsigned long base);
9192-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9193+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9194+
9195+#ifdef CONFIG_PAX_ASLR
9196+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9197+
9198+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9199+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9200+#endif
9201
9202 /* This yields a mask that user programs can use to figure out what
9203 instruction set this CPU supports. */
9204@@ -222,9 +228,6 @@ struct linux_binprm;
9205 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9206 int arch_setup_additional_pages(struct linux_binprm *, int);
9207
9208-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9209-#define arch_randomize_brk arch_randomize_brk
9210-
9211 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
9212
9213 #endif
9214diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9215index c4a93d6..4d2a9b4 100644
9216--- a/arch/s390/include/asm/exec.h
9217+++ b/arch/s390/include/asm/exec.h
9218@@ -7,6 +7,6 @@
9219 #ifndef __ASM_EXEC_H
9220 #define __ASM_EXEC_H
9221
9222-extern unsigned long arch_align_stack(unsigned long sp);
9223+#define arch_align_stack(x) ((x) & ~0xfUL)
9224
9225 #endif /* __ASM_EXEC_H */
9226diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9227index 1be64a1..086839d1 100644
9228--- a/arch/s390/include/asm/uaccess.h
9229+++ b/arch/s390/include/asm/uaccess.h
9230@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9231 __range_ok((unsigned long)(addr), (size)); \
9232 })
9233
9234+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9235 #define access_ok(type, addr, size) __access_ok(addr, size)
9236
9237 /*
9238@@ -245,6 +246,10 @@ static inline unsigned long __must_check
9239 copy_to_user(void __user *to, const void *from, unsigned long n)
9240 {
9241 might_fault();
9242+
9243+ if ((long)n < 0)
9244+ return n;
9245+
9246 return __copy_to_user(to, from, n);
9247 }
9248
9249@@ -273,10 +278,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9250 static inline unsigned long __must_check
9251 copy_from_user(void *to, const void __user *from, unsigned long n)
9252 {
9253- unsigned int sz = __compiletime_object_size(to);
9254+ size_t sz = __compiletime_object_size(to);
9255
9256 might_fault();
9257- if (unlikely(sz != -1 && sz < n)) {
9258+
9259+ if ((long)n < 0)
9260+ return n;
9261+
9262+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9263 copy_from_user_overflow();
9264 return n;
9265 }
9266diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9267index b89b591..fd9609d 100644
9268--- a/arch/s390/kernel/module.c
9269+++ b/arch/s390/kernel/module.c
9270@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9271
9272 /* Increase core size by size of got & plt and set start
9273 offsets for got and plt. */
9274- me->core_size = ALIGN(me->core_size, 4);
9275- me->arch.got_offset = me->core_size;
9276- me->core_size += me->arch.got_size;
9277- me->arch.plt_offset = me->core_size;
9278- me->core_size += me->arch.plt_size;
9279+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9280+ me->arch.got_offset = me->core_size_rw;
9281+ me->core_size_rw += me->arch.got_size;
9282+ me->arch.plt_offset = me->core_size_rx;
9283+ me->core_size_rx += me->arch.plt_size;
9284 return 0;
9285 }
9286
9287@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9288 if (info->got_initialized == 0) {
9289 Elf_Addr *gotent;
9290
9291- gotent = me->module_core + me->arch.got_offset +
9292+ gotent = me->module_core_rw + me->arch.got_offset +
9293 info->got_offset;
9294 *gotent = val;
9295 info->got_initialized = 1;
9296@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9297 rc = apply_rela_bits(loc, val, 0, 64, 0);
9298 else if (r_type == R_390_GOTENT ||
9299 r_type == R_390_GOTPLTENT) {
9300- val += (Elf_Addr) me->module_core - loc;
9301+ val += (Elf_Addr) me->module_core_rw - loc;
9302 rc = apply_rela_bits(loc, val, 1, 32, 1);
9303 }
9304 break;
9305@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9306 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9307 if (info->plt_initialized == 0) {
9308 unsigned int *ip;
9309- ip = me->module_core + me->arch.plt_offset +
9310+ ip = me->module_core_rx + me->arch.plt_offset +
9311 info->plt_offset;
9312 #ifndef CONFIG_64BIT
9313 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9314@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9315 val - loc + 0xffffUL < 0x1ffffeUL) ||
9316 (r_type == R_390_PLT32DBL &&
9317 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9318- val = (Elf_Addr) me->module_core +
9319+ val = (Elf_Addr) me->module_core_rx +
9320 me->arch.plt_offset +
9321 info->plt_offset;
9322 val += rela->r_addend - loc;
9323@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9324 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9325 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9326 val = val + rela->r_addend -
9327- ((Elf_Addr) me->module_core + me->arch.got_offset);
9328+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9329 if (r_type == R_390_GOTOFF16)
9330 rc = apply_rela_bits(loc, val, 0, 16, 0);
9331 else if (r_type == R_390_GOTOFF32)
9332@@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9333 break;
9334 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9335 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9336- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9337+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9338 rela->r_addend - loc;
9339 if (r_type == R_390_GOTPC)
9340 rc = apply_rela_bits(loc, val, 1, 32, 0);
9341diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9342index dd14532..1dfc145 100644
9343--- a/arch/s390/kernel/process.c
9344+++ b/arch/s390/kernel/process.c
9345@@ -242,37 +242,3 @@ unsigned long get_wchan(struct task_struct *p)
9346 }
9347 return 0;
9348 }
9349-
9350-unsigned long arch_align_stack(unsigned long sp)
9351-{
9352- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9353- sp -= get_random_int() & ~PAGE_MASK;
9354- return sp & ~0xf;
9355-}
9356-
9357-static inline unsigned long brk_rnd(void)
9358-{
9359- /* 8MB for 32bit, 1GB for 64bit */
9360- if (is_32bit_task())
9361- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9362- else
9363- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9364-}
9365-
9366-unsigned long arch_randomize_brk(struct mm_struct *mm)
9367-{
9368- unsigned long ret;
9369-
9370- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9371- return (ret > mm->brk) ? ret : mm->brk;
9372-}
9373-
9374-unsigned long randomize_et_dyn(unsigned long base)
9375-{
9376- unsigned long ret;
9377-
9378- if (!(current->flags & PF_RANDOMIZE))
9379- return base;
9380- ret = PAGE_ALIGN(base + brk_rnd());
9381- return (ret > base) ? ret : base;
9382-}
9383diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9384index 9b436c2..54fbf0a 100644
9385--- a/arch/s390/mm/mmap.c
9386+++ b/arch/s390/mm/mmap.c
9387@@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9388 */
9389 if (mmap_is_legacy()) {
9390 mm->mmap_base = mmap_base_legacy();
9391+
9392+#ifdef CONFIG_PAX_RANDMMAP
9393+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9394+ mm->mmap_base += mm->delta_mmap;
9395+#endif
9396+
9397 mm->get_unmapped_area = arch_get_unmapped_area;
9398 } else {
9399 mm->mmap_base = mmap_base();
9400+
9401+#ifdef CONFIG_PAX_RANDMMAP
9402+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9403+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9404+#endif
9405+
9406 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9407 }
9408 }
9409@@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9410 */
9411 if (mmap_is_legacy()) {
9412 mm->mmap_base = mmap_base_legacy();
9413+
9414+#ifdef CONFIG_PAX_RANDMMAP
9415+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9416+ mm->mmap_base += mm->delta_mmap;
9417+#endif
9418+
9419 mm->get_unmapped_area = s390_get_unmapped_area;
9420 } else {
9421 mm->mmap_base = mmap_base();
9422+
9423+#ifdef CONFIG_PAX_RANDMMAP
9424+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9425+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9426+#endif
9427+
9428 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9429 }
9430 }
9431diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9432index ae3d59f..f65f075 100644
9433--- a/arch/score/include/asm/cache.h
9434+++ b/arch/score/include/asm/cache.h
9435@@ -1,7 +1,9 @@
9436 #ifndef _ASM_SCORE_CACHE_H
9437 #define _ASM_SCORE_CACHE_H
9438
9439+#include <linux/const.h>
9440+
9441 #define L1_CACHE_SHIFT 4
9442-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9443+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9444
9445 #endif /* _ASM_SCORE_CACHE_H */
9446diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9447index f9f3cd5..58ff438 100644
9448--- a/arch/score/include/asm/exec.h
9449+++ b/arch/score/include/asm/exec.h
9450@@ -1,6 +1,6 @@
9451 #ifndef _ASM_SCORE_EXEC_H
9452 #define _ASM_SCORE_EXEC_H
9453
9454-extern unsigned long arch_align_stack(unsigned long sp);
9455+#define arch_align_stack(x) (x)
9456
9457 #endif /* _ASM_SCORE_EXEC_H */
9458diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9459index a1519ad3..e8ac1ff 100644
9460--- a/arch/score/kernel/process.c
9461+++ b/arch/score/kernel/process.c
9462@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9463
9464 return task_pt_regs(task)->cp0_epc;
9465 }
9466-
9467-unsigned long arch_align_stack(unsigned long sp)
9468-{
9469- return sp;
9470-}
9471diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9472index ef9e555..331bd29 100644
9473--- a/arch/sh/include/asm/cache.h
9474+++ b/arch/sh/include/asm/cache.h
9475@@ -9,10 +9,11 @@
9476 #define __ASM_SH_CACHE_H
9477 #ifdef __KERNEL__
9478
9479+#include <linux/const.h>
9480 #include <linux/init.h>
9481 #include <cpu/cache.h>
9482
9483-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9484+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9485
9486 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9487
9488diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9489index 6777177..cb5e44f 100644
9490--- a/arch/sh/mm/mmap.c
9491+++ b/arch/sh/mm/mmap.c
9492@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9493 struct mm_struct *mm = current->mm;
9494 struct vm_area_struct *vma;
9495 int do_colour_align;
9496+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9497 struct vm_unmapped_area_info info;
9498
9499 if (flags & MAP_FIXED) {
9500@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9501 if (filp || (flags & MAP_SHARED))
9502 do_colour_align = 1;
9503
9504+#ifdef CONFIG_PAX_RANDMMAP
9505+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9506+#endif
9507+
9508 if (addr) {
9509 if (do_colour_align)
9510 addr = COLOUR_ALIGN(addr, pgoff);
9511@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9512 addr = PAGE_ALIGN(addr);
9513
9514 vma = find_vma(mm, addr);
9515- if (TASK_SIZE - len >= addr &&
9516- (!vma || addr + len <= vma->vm_start))
9517+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9518 return addr;
9519 }
9520
9521 info.flags = 0;
9522 info.length = len;
9523- info.low_limit = TASK_UNMAPPED_BASE;
9524+ info.low_limit = mm->mmap_base;
9525 info.high_limit = TASK_SIZE;
9526 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9527 info.align_offset = pgoff << PAGE_SHIFT;
9528@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9529 struct mm_struct *mm = current->mm;
9530 unsigned long addr = addr0;
9531 int do_colour_align;
9532+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9533 struct vm_unmapped_area_info info;
9534
9535 if (flags & MAP_FIXED) {
9536@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9537 if (filp || (flags & MAP_SHARED))
9538 do_colour_align = 1;
9539
9540+#ifdef CONFIG_PAX_RANDMMAP
9541+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9542+#endif
9543+
9544 /* requesting a specific address */
9545 if (addr) {
9546 if (do_colour_align)
9547@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9548 addr = PAGE_ALIGN(addr);
9549
9550 vma = find_vma(mm, addr);
9551- if (TASK_SIZE - len >= addr &&
9552- (!vma || addr + len <= vma->vm_start))
9553+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9554 return addr;
9555 }
9556
9557@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9558 VM_BUG_ON(addr != -ENOMEM);
9559 info.flags = 0;
9560 info.low_limit = TASK_UNMAPPED_BASE;
9561+
9562+#ifdef CONFIG_PAX_RANDMMAP
9563+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9564+ info.low_limit += mm->delta_mmap;
9565+#endif
9566+
9567 info.high_limit = TASK_SIZE;
9568 addr = vm_unmapped_area(&info);
9569 }
9570diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9571index be56a24..443328f 100644
9572--- a/arch/sparc/include/asm/atomic_64.h
9573+++ b/arch/sparc/include/asm/atomic_64.h
9574@@ -14,18 +14,40 @@
9575 #define ATOMIC64_INIT(i) { (i) }
9576
9577 #define atomic_read(v) (*(volatile int *)&(v)->counter)
9578+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9579+{
9580+ return v->counter;
9581+}
9582 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
9583+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9584+{
9585+ return v->counter;
9586+}
9587
9588 #define atomic_set(v, i) (((v)->counter) = i)
9589+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9590+{
9591+ v->counter = i;
9592+}
9593 #define atomic64_set(v, i) (((v)->counter) = i)
9594+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9595+{
9596+ v->counter = i;
9597+}
9598
9599 extern void atomic_add(int, atomic_t *);
9600+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
9601 extern void atomic64_add(long, atomic64_t *);
9602+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
9603 extern void atomic_sub(int, atomic_t *);
9604+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
9605 extern void atomic64_sub(long, atomic64_t *);
9606+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
9607
9608 extern int atomic_add_ret(int, atomic_t *);
9609+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
9610 extern long atomic64_add_ret(long, atomic64_t *);
9611+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
9612 extern int atomic_sub_ret(int, atomic_t *);
9613 extern long atomic64_sub_ret(long, atomic64_t *);
9614
9615@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9616 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
9617
9618 #define atomic_inc_return(v) atomic_add_ret(1, v)
9619+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9620+{
9621+ return atomic_add_ret_unchecked(1, v);
9622+}
9623 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
9624+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9625+{
9626+ return atomic64_add_ret_unchecked(1, v);
9627+}
9628
9629 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
9630 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
9631
9632 #define atomic_add_return(i, v) atomic_add_ret(i, v)
9633+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9634+{
9635+ return atomic_add_ret_unchecked(i, v);
9636+}
9637 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
9638+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9639+{
9640+ return atomic64_add_ret_unchecked(i, v);
9641+}
9642
9643 /*
9644 * atomic_inc_and_test - increment and test
9645@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9646 * other cases.
9647 */
9648 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9649+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9650+{
9651+ return atomic_inc_return_unchecked(v) == 0;
9652+}
9653 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9654
9655 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
9656@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
9657 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
9658
9659 #define atomic_inc(v) atomic_add(1, v)
9660+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9661+{
9662+ atomic_add_unchecked(1, v);
9663+}
9664 #define atomic64_inc(v) atomic64_add(1, v)
9665+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9666+{
9667+ atomic64_add_unchecked(1, v);
9668+}
9669
9670 #define atomic_dec(v) atomic_sub(1, v)
9671+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9672+{
9673+ atomic_sub_unchecked(1, v);
9674+}
9675 #define atomic64_dec(v) atomic64_sub(1, v)
9676+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9677+{
9678+ atomic64_sub_unchecked(1, v);
9679+}
9680
9681 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
9682 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
9683
9684 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9685+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9686+{
9687+ return cmpxchg(&v->counter, old, new);
9688+}
9689 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9690+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9691+{
9692+ return xchg(&v->counter, new);
9693+}
9694
9695 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9696 {
9697- int c, old;
9698+ int c, old, new;
9699 c = atomic_read(v);
9700 for (;;) {
9701- if (unlikely(c == (u)))
9702+ if (unlikely(c == u))
9703 break;
9704- old = atomic_cmpxchg((v), c, c + (a));
9705+
9706+ asm volatile("addcc %2, %0, %0\n"
9707+
9708+#ifdef CONFIG_PAX_REFCOUNT
9709+ "tvs %%icc, 6\n"
9710+#endif
9711+
9712+ : "=r" (new)
9713+ : "0" (c), "ir" (a)
9714+ : "cc");
9715+
9716+ old = atomic_cmpxchg(v, c, new);
9717 if (likely(old == c))
9718 break;
9719 c = old;
9720@@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9721 #define atomic64_cmpxchg(v, o, n) \
9722 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9723 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9724+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9725+{
9726+ return xchg(&v->counter, new);
9727+}
9728
9729 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9730 {
9731- long c, old;
9732+ long c, old, new;
9733 c = atomic64_read(v);
9734 for (;;) {
9735- if (unlikely(c == (u)))
9736+ if (unlikely(c == u))
9737 break;
9738- old = atomic64_cmpxchg((v), c, c + (a));
9739+
9740+ asm volatile("addcc %2, %0, %0\n"
9741+
9742+#ifdef CONFIG_PAX_REFCOUNT
9743+ "tvs %%xcc, 6\n"
9744+#endif
9745+
9746+ : "=r" (new)
9747+ : "0" (c), "ir" (a)
9748+ : "cc");
9749+
9750+ old = atomic64_cmpxchg(v, c, new);
9751 if (likely(old == c))
9752 break;
9753 c = old;
9754 }
9755- return c != (u);
9756+ return c != u;
9757 }
9758
9759 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9760diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
9761index b5aad96..99d7465 100644
9762--- a/arch/sparc/include/asm/barrier_64.h
9763+++ b/arch/sparc/include/asm/barrier_64.h
9764@@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
9765 do { \
9766 compiletime_assert_atomic_type(*p); \
9767 barrier(); \
9768- ACCESS_ONCE(*p) = (v); \
9769+ ACCESS_ONCE_RW(*p) = (v); \
9770 } while (0)
9771
9772 #define smp_load_acquire(p) \
9773diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
9774index 5bb6991..5c2132e 100644
9775--- a/arch/sparc/include/asm/cache.h
9776+++ b/arch/sparc/include/asm/cache.h
9777@@ -7,10 +7,12 @@
9778 #ifndef _SPARC_CACHE_H
9779 #define _SPARC_CACHE_H
9780
9781+#include <linux/const.h>
9782+
9783 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
9784
9785 #define L1_CACHE_SHIFT 5
9786-#define L1_CACHE_BYTES 32
9787+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9788
9789 #ifdef CONFIG_SPARC32
9790 #define SMP_CACHE_BYTES_SHIFT 5
9791diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
9792index a24e41f..47677ff 100644
9793--- a/arch/sparc/include/asm/elf_32.h
9794+++ b/arch/sparc/include/asm/elf_32.h
9795@@ -114,6 +114,13 @@ typedef struct {
9796
9797 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
9798
9799+#ifdef CONFIG_PAX_ASLR
9800+#define PAX_ELF_ET_DYN_BASE 0x10000UL
9801+
9802+#define PAX_DELTA_MMAP_LEN 16
9803+#define PAX_DELTA_STACK_LEN 16
9804+#endif
9805+
9806 /* This yields a mask that user programs can use to figure out what
9807 instruction set this cpu supports. This can NOT be done in userspace
9808 on Sparc. */
9809diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
9810index 370ca1e..d4f4a98 100644
9811--- a/arch/sparc/include/asm/elf_64.h
9812+++ b/arch/sparc/include/asm/elf_64.h
9813@@ -189,6 +189,13 @@ typedef struct {
9814 #define ELF_ET_DYN_BASE 0x0000010000000000UL
9815 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
9816
9817+#ifdef CONFIG_PAX_ASLR
9818+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
9819+
9820+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
9821+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
9822+#endif
9823+
9824 extern unsigned long sparc64_elf_hwcap;
9825 #define ELF_HWCAP sparc64_elf_hwcap
9826
9827diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
9828index 9b1c36d..209298b 100644
9829--- a/arch/sparc/include/asm/pgalloc_32.h
9830+++ b/arch/sparc/include/asm/pgalloc_32.h
9831@@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
9832 }
9833
9834 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
9835+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
9836
9837 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
9838 unsigned long address)
9839diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
9840index bcfe063..b333142 100644
9841--- a/arch/sparc/include/asm/pgalloc_64.h
9842+++ b/arch/sparc/include/asm/pgalloc_64.h
9843@@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
9844 }
9845
9846 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
9847+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
9848
9849 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
9850 {
9851diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
9852index 59ba6f6..4518128 100644
9853--- a/arch/sparc/include/asm/pgtable.h
9854+++ b/arch/sparc/include/asm/pgtable.h
9855@@ -5,4 +5,8 @@
9856 #else
9857 #include <asm/pgtable_32.h>
9858 #endif
9859+
9860+#define ktla_ktva(addr) (addr)
9861+#define ktva_ktla(addr) (addr)
9862+
9863 #endif
9864diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
9865index 502f632..da1917f 100644
9866--- a/arch/sparc/include/asm/pgtable_32.h
9867+++ b/arch/sparc/include/asm/pgtable_32.h
9868@@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
9869 #define PAGE_SHARED SRMMU_PAGE_SHARED
9870 #define PAGE_COPY SRMMU_PAGE_COPY
9871 #define PAGE_READONLY SRMMU_PAGE_RDONLY
9872+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
9873+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
9874+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
9875 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
9876
9877 /* Top-level page directory - dummy used by init-mm.
9878@@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
9879
9880 /* xwr */
9881 #define __P000 PAGE_NONE
9882-#define __P001 PAGE_READONLY
9883-#define __P010 PAGE_COPY
9884-#define __P011 PAGE_COPY
9885+#define __P001 PAGE_READONLY_NOEXEC
9886+#define __P010 PAGE_COPY_NOEXEC
9887+#define __P011 PAGE_COPY_NOEXEC
9888 #define __P100 PAGE_READONLY
9889 #define __P101 PAGE_READONLY
9890 #define __P110 PAGE_COPY
9891 #define __P111 PAGE_COPY
9892
9893 #define __S000 PAGE_NONE
9894-#define __S001 PAGE_READONLY
9895-#define __S010 PAGE_SHARED
9896-#define __S011 PAGE_SHARED
9897+#define __S001 PAGE_READONLY_NOEXEC
9898+#define __S010 PAGE_SHARED_NOEXEC
9899+#define __S011 PAGE_SHARED_NOEXEC
9900 #define __S100 PAGE_READONLY
9901 #define __S101 PAGE_READONLY
9902 #define __S110 PAGE_SHARED
9903diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
9904index 79da178..c2eede8 100644
9905--- a/arch/sparc/include/asm/pgtsrmmu.h
9906+++ b/arch/sparc/include/asm/pgtsrmmu.h
9907@@ -115,6 +115,11 @@
9908 SRMMU_EXEC | SRMMU_REF)
9909 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
9910 SRMMU_EXEC | SRMMU_REF)
9911+
9912+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
9913+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9914+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
9915+
9916 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
9917 SRMMU_DIRTY | SRMMU_REF)
9918
9919diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
9920index 9689176..63c18ea 100644
9921--- a/arch/sparc/include/asm/spinlock_64.h
9922+++ b/arch/sparc/include/asm/spinlock_64.h
9923@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
9924
9925 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
9926
9927-static void inline arch_read_lock(arch_rwlock_t *lock)
9928+static inline void arch_read_lock(arch_rwlock_t *lock)
9929 {
9930 unsigned long tmp1, tmp2;
9931
9932 __asm__ __volatile__ (
9933 "1: ldsw [%2], %0\n"
9934 " brlz,pn %0, 2f\n"
9935-"4: add %0, 1, %1\n"
9936+"4: addcc %0, 1, %1\n"
9937+
9938+#ifdef CONFIG_PAX_REFCOUNT
9939+" tvs %%icc, 6\n"
9940+#endif
9941+
9942 " cas [%2], %0, %1\n"
9943 " cmp %0, %1\n"
9944 " bne,pn %%icc, 1b\n"
9945@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
9946 " .previous"
9947 : "=&r" (tmp1), "=&r" (tmp2)
9948 : "r" (lock)
9949- : "memory");
9950+ : "memory", "cc");
9951 }
9952
9953-static int inline arch_read_trylock(arch_rwlock_t *lock)
9954+static inline int arch_read_trylock(arch_rwlock_t *lock)
9955 {
9956 int tmp1, tmp2;
9957
9958@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9959 "1: ldsw [%2], %0\n"
9960 " brlz,a,pn %0, 2f\n"
9961 " mov 0, %0\n"
9962-" add %0, 1, %1\n"
9963+" addcc %0, 1, %1\n"
9964+
9965+#ifdef CONFIG_PAX_REFCOUNT
9966+" tvs %%icc, 6\n"
9967+#endif
9968+
9969 " cas [%2], %0, %1\n"
9970 " cmp %0, %1\n"
9971 " bne,pn %%icc, 1b\n"
9972@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
9973 return tmp1;
9974 }
9975
9976-static void inline arch_read_unlock(arch_rwlock_t *lock)
9977+static inline void arch_read_unlock(arch_rwlock_t *lock)
9978 {
9979 unsigned long tmp1, tmp2;
9980
9981 __asm__ __volatile__(
9982 "1: lduw [%2], %0\n"
9983-" sub %0, 1, %1\n"
9984+" subcc %0, 1, %1\n"
9985+
9986+#ifdef CONFIG_PAX_REFCOUNT
9987+" tvs %%icc, 6\n"
9988+#endif
9989+
9990 " cas [%2], %0, %1\n"
9991 " cmp %0, %1\n"
9992 " bne,pn %%xcc, 1b\n"
9993@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
9994 : "memory");
9995 }
9996
9997-static void inline arch_write_lock(arch_rwlock_t *lock)
9998+static inline void arch_write_lock(arch_rwlock_t *lock)
9999 {
10000 unsigned long mask, tmp1, tmp2;
10001
10002@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10003 : "memory");
10004 }
10005
10006-static void inline arch_write_unlock(arch_rwlock_t *lock)
10007+static inline void arch_write_unlock(arch_rwlock_t *lock)
10008 {
10009 __asm__ __volatile__(
10010 " stw %%g0, [%0]"
10011@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10012 : "memory");
10013 }
10014
10015-static int inline arch_write_trylock(arch_rwlock_t *lock)
10016+static inline int arch_write_trylock(arch_rwlock_t *lock)
10017 {
10018 unsigned long mask, tmp1, tmp2, result;
10019
10020diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10021index 96efa7a..16858bf 100644
10022--- a/arch/sparc/include/asm/thread_info_32.h
10023+++ b/arch/sparc/include/asm/thread_info_32.h
10024@@ -49,6 +49,8 @@ struct thread_info {
10025 unsigned long w_saved;
10026
10027 struct restart_block restart_block;
10028+
10029+ unsigned long lowest_stack;
10030 };
10031
10032 /*
10033diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10034index a5f01ac..703b554 100644
10035--- a/arch/sparc/include/asm/thread_info_64.h
10036+++ b/arch/sparc/include/asm/thread_info_64.h
10037@@ -63,6 +63,8 @@ struct thread_info {
10038 struct pt_regs *kern_una_regs;
10039 unsigned int kern_una_insn;
10040
10041+ unsigned long lowest_stack;
10042+
10043 unsigned long fpregs[0] __attribute__ ((aligned(64)));
10044 };
10045
10046@@ -188,12 +190,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10047 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10048 /* flag bit 4 is available */
10049 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10050-/* flag bit 6 is available */
10051+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10052 #define TIF_32BIT 7 /* 32-bit binary */
10053 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10054 #define TIF_SECCOMP 9 /* secure computing */
10055 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10056 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10057+
10058 /* NOTE: Thread flags >= 12 should be ones we have no interest
10059 * in using in assembly, else we can't use the mask as
10060 * an immediate value in instructions such as andcc.
10061@@ -213,12 +216,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
10062 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10063 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10064 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10065+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10066
10067 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10068 _TIF_DO_NOTIFY_RESUME_MASK | \
10069 _TIF_NEED_RESCHED)
10070 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10071
10072+#define _TIF_WORK_SYSCALL \
10073+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10074+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10075+
10076+
10077 /*
10078 * Thread-synchronous status.
10079 *
10080diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10081index 0167d26..767bb0c 100644
10082--- a/arch/sparc/include/asm/uaccess.h
10083+++ b/arch/sparc/include/asm/uaccess.h
10084@@ -1,5 +1,6 @@
10085 #ifndef ___ASM_SPARC_UACCESS_H
10086 #define ___ASM_SPARC_UACCESS_H
10087+
10088 #if defined(__sparc__) && defined(__arch64__)
10089 #include <asm/uaccess_64.h>
10090 #else
10091diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10092index 53a28dd..50c38c3 100644
10093--- a/arch/sparc/include/asm/uaccess_32.h
10094+++ b/arch/sparc/include/asm/uaccess_32.h
10095@@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
10096
10097 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10098 {
10099- if (n && __access_ok((unsigned long) to, n))
10100+ if ((long)n < 0)
10101+ return n;
10102+
10103+ if (n && __access_ok((unsigned long) to, n)) {
10104+ if (!__builtin_constant_p(n))
10105+ check_object_size(from, n, true);
10106 return __copy_user(to, (__force void __user *) from, n);
10107- else
10108+ } else
10109 return n;
10110 }
10111
10112 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10113 {
10114+ if ((long)n < 0)
10115+ return n;
10116+
10117+ if (!__builtin_constant_p(n))
10118+ check_object_size(from, n, true);
10119+
10120 return __copy_user(to, (__force void __user *) from, n);
10121 }
10122
10123 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10124 {
10125- if (n && __access_ok((unsigned long) from, n))
10126+ if ((long)n < 0)
10127+ return n;
10128+
10129+ if (n && __access_ok((unsigned long) from, n)) {
10130+ if (!__builtin_constant_p(n))
10131+ check_object_size(to, n, false);
10132 return __copy_user((__force void __user *) to, from, n);
10133- else
10134+ } else
10135 return n;
10136 }
10137
10138 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10139 {
10140+ if ((long)n < 0)
10141+ return n;
10142+
10143 return __copy_user((__force void __user *) to, from, n);
10144 }
10145
10146diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10147index ad7e178..c9e7423 100644
10148--- a/arch/sparc/include/asm/uaccess_64.h
10149+++ b/arch/sparc/include/asm/uaccess_64.h
10150@@ -10,6 +10,7 @@
10151 #include <linux/compiler.h>
10152 #include <linux/string.h>
10153 #include <linux/thread_info.h>
10154+#include <linux/kernel.h>
10155 #include <asm/asi.h>
10156 #include <asm/spitfire.h>
10157 #include <asm-generic/uaccess-unaligned.h>
10158@@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
10159 static inline unsigned long __must_check
10160 copy_from_user(void *to, const void __user *from, unsigned long size)
10161 {
10162- unsigned long ret = ___copy_from_user(to, from, size);
10163+ unsigned long ret;
10164
10165+ if ((long)size < 0 || size > INT_MAX)
10166+ return size;
10167+
10168+ if (!__builtin_constant_p(size))
10169+ check_object_size(to, size, false);
10170+
10171+ ret = ___copy_from_user(to, from, size);
10172 if (unlikely(ret))
10173 ret = copy_from_user_fixup(to, from, size);
10174
10175@@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
10176 static inline unsigned long __must_check
10177 copy_to_user(void __user *to, const void *from, unsigned long size)
10178 {
10179- unsigned long ret = ___copy_to_user(to, from, size);
10180+ unsigned long ret;
10181
10182+ if ((long)size < 0 || size > INT_MAX)
10183+ return size;
10184+
10185+ if (!__builtin_constant_p(size))
10186+ check_object_size(from, size, true);
10187+
10188+ ret = ___copy_to_user(to, from, size);
10189 if (unlikely(ret))
10190 ret = copy_to_user_fixup(to, from, size);
10191 return ret;
10192diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10193index d15cc17..d0ae796 100644
10194--- a/arch/sparc/kernel/Makefile
10195+++ b/arch/sparc/kernel/Makefile
10196@@ -4,7 +4,7 @@
10197 #
10198
10199 asflags-y := -ansi
10200-ccflags-y := -Werror
10201+#ccflags-y := -Werror
10202
10203 extra-y := head_$(BITS).o
10204
10205diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10206index 510baec..9ff2607 100644
10207--- a/arch/sparc/kernel/process_32.c
10208+++ b/arch/sparc/kernel/process_32.c
10209@@ -115,14 +115,14 @@ void show_regs(struct pt_regs *r)
10210
10211 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10212 r->psr, r->pc, r->npc, r->y, print_tainted());
10213- printk("PC: <%pS>\n", (void *) r->pc);
10214+ printk("PC: <%pA>\n", (void *) r->pc);
10215 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10216 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10217 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10218 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10219 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10220 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10221- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10222+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10223
10224 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10225 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10226@@ -159,7 +159,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10227 rw = (struct reg_window32 *) fp;
10228 pc = rw->ins[7];
10229 printk("[%08lx : ", pc);
10230- printk("%pS ] ", (void *) pc);
10231+ printk("%pA ] ", (void *) pc);
10232 fp = rw->ins[6];
10233 } while (++count < 16);
10234 printk("\n");
10235diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10236index d7b4967..2edf827 100644
10237--- a/arch/sparc/kernel/process_64.c
10238+++ b/arch/sparc/kernel/process_64.c
10239@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10240 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10241 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10242 if (regs->tstate & TSTATE_PRIV)
10243- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10244+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10245 }
10246
10247 void show_regs(struct pt_regs *regs)
10248@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10249
10250 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10251 regs->tpc, regs->tnpc, regs->y, print_tainted());
10252- printk("TPC: <%pS>\n", (void *) regs->tpc);
10253+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10254 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10255 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10256 regs->u_regs[3]);
10257@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10258 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10259 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10260 regs->u_regs[15]);
10261- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10262+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10263 show_regwindow(regs);
10264 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10265 }
10266@@ -272,7 +272,7 @@ void arch_trigger_all_cpu_backtrace(void)
10267 ((tp && tp->task) ? tp->task->pid : -1));
10268
10269 if (gp->tstate & TSTATE_PRIV) {
10270- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10271+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10272 (void *) gp->tpc,
10273 (void *) gp->o7,
10274 (void *) gp->i7,
10275diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10276index 79cc0d1..ec62734 100644
10277--- a/arch/sparc/kernel/prom_common.c
10278+++ b/arch/sparc/kernel/prom_common.c
10279@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10280
10281 unsigned int prom_early_allocated __initdata;
10282
10283-static struct of_pdt_ops prom_sparc_ops __initdata = {
10284+static struct of_pdt_ops prom_sparc_ops __initconst = {
10285 .nextprop = prom_common_nextprop,
10286 .getproplen = prom_getproplen,
10287 .getproperty = prom_getproperty,
10288diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10289index c13c9f2..d572c34 100644
10290--- a/arch/sparc/kernel/ptrace_64.c
10291+++ b/arch/sparc/kernel/ptrace_64.c
10292@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10293 return ret;
10294 }
10295
10296+#ifdef CONFIG_GRKERNSEC_SETXID
10297+extern void gr_delayed_cred_worker(void);
10298+#endif
10299+
10300 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10301 {
10302 int ret = 0;
10303@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10304 if (test_thread_flag(TIF_NOHZ))
10305 user_exit();
10306
10307+#ifdef CONFIG_GRKERNSEC_SETXID
10308+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10309+ gr_delayed_cred_worker();
10310+#endif
10311+
10312 if (test_thread_flag(TIF_SYSCALL_TRACE))
10313 ret = tracehook_report_syscall_entry(regs);
10314
10315@@ -1093,6 +1102,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10316 if (test_thread_flag(TIF_NOHZ))
10317 user_exit();
10318
10319+#ifdef CONFIG_GRKERNSEC_SETXID
10320+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10321+ gr_delayed_cred_worker();
10322+#endif
10323+
10324 audit_syscall_exit(regs);
10325
10326 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10327diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10328index 745a363..b5566b1 100644
10329--- a/arch/sparc/kernel/smp_64.c
10330+++ b/arch/sparc/kernel/smp_64.c
10331@@ -868,8 +868,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
10332 extern unsigned long xcall_flush_dcache_page_spitfire;
10333
10334 #ifdef CONFIG_DEBUG_DCFLUSH
10335-extern atomic_t dcpage_flushes;
10336-extern atomic_t dcpage_flushes_xcall;
10337+extern atomic_unchecked_t dcpage_flushes;
10338+extern atomic_unchecked_t dcpage_flushes_xcall;
10339 #endif
10340
10341 static inline void __local_flush_dcache_page(struct page *page)
10342@@ -893,7 +893,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10343 return;
10344
10345 #ifdef CONFIG_DEBUG_DCFLUSH
10346- atomic_inc(&dcpage_flushes);
10347+ atomic_inc_unchecked(&dcpage_flushes);
10348 #endif
10349
10350 this_cpu = get_cpu();
10351@@ -917,7 +917,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10352 xcall_deliver(data0, __pa(pg_addr),
10353 (u64) pg_addr, cpumask_of(cpu));
10354 #ifdef CONFIG_DEBUG_DCFLUSH
10355- atomic_inc(&dcpage_flushes_xcall);
10356+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10357 #endif
10358 }
10359 }
10360@@ -936,7 +936,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10361 preempt_disable();
10362
10363 #ifdef CONFIG_DEBUG_DCFLUSH
10364- atomic_inc(&dcpage_flushes);
10365+ atomic_inc_unchecked(&dcpage_flushes);
10366 #endif
10367 data0 = 0;
10368 pg_addr = page_address(page);
10369@@ -953,7 +953,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10370 xcall_deliver(data0, __pa(pg_addr),
10371 (u64) pg_addr, cpu_online_mask);
10372 #ifdef CONFIG_DEBUG_DCFLUSH
10373- atomic_inc(&dcpage_flushes_xcall);
10374+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10375 #endif
10376 }
10377 __local_flush_dcache_page(page);
10378diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10379index 3a8d184..49498a8 100644
10380--- a/arch/sparc/kernel/sys_sparc_32.c
10381+++ b/arch/sparc/kernel/sys_sparc_32.c
10382@@ -52,7 +52,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10383 if (len > TASK_SIZE - PAGE_SIZE)
10384 return -ENOMEM;
10385 if (!addr)
10386- addr = TASK_UNMAPPED_BASE;
10387+ addr = current->mm->mmap_base;
10388
10389 info.flags = 0;
10390 info.length = len;
10391diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10392index beb0b5a..5a153f7 100644
10393--- a/arch/sparc/kernel/sys_sparc_64.c
10394+++ b/arch/sparc/kernel/sys_sparc_64.c
10395@@ -88,13 +88,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10396 struct vm_area_struct * vma;
10397 unsigned long task_size = TASK_SIZE;
10398 int do_color_align;
10399+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10400 struct vm_unmapped_area_info info;
10401
10402 if (flags & MAP_FIXED) {
10403 /* We do not accept a shared mapping if it would violate
10404 * cache aliasing constraints.
10405 */
10406- if ((flags & MAP_SHARED) &&
10407+ if ((filp || (flags & MAP_SHARED)) &&
10408 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10409 return -EINVAL;
10410 return addr;
10411@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10412 if (filp || (flags & MAP_SHARED))
10413 do_color_align = 1;
10414
10415+#ifdef CONFIG_PAX_RANDMMAP
10416+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10417+#endif
10418+
10419 if (addr) {
10420 if (do_color_align)
10421 addr = COLOR_ALIGN(addr, pgoff);
10422@@ -116,22 +121,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10423 addr = PAGE_ALIGN(addr);
10424
10425 vma = find_vma(mm, addr);
10426- if (task_size - len >= addr &&
10427- (!vma || addr + len <= vma->vm_start))
10428+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10429 return addr;
10430 }
10431
10432 info.flags = 0;
10433 info.length = len;
10434- info.low_limit = TASK_UNMAPPED_BASE;
10435+ info.low_limit = mm->mmap_base;
10436 info.high_limit = min(task_size, VA_EXCLUDE_START);
10437 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10438 info.align_offset = pgoff << PAGE_SHIFT;
10439+ info.threadstack_offset = offset;
10440 addr = vm_unmapped_area(&info);
10441
10442 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10443 VM_BUG_ON(addr != -ENOMEM);
10444 info.low_limit = VA_EXCLUDE_END;
10445+
10446+#ifdef CONFIG_PAX_RANDMMAP
10447+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10448+ info.low_limit += mm->delta_mmap;
10449+#endif
10450+
10451 info.high_limit = task_size;
10452 addr = vm_unmapped_area(&info);
10453 }
10454@@ -149,6 +160,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10455 unsigned long task_size = STACK_TOP32;
10456 unsigned long addr = addr0;
10457 int do_color_align;
10458+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10459 struct vm_unmapped_area_info info;
10460
10461 /* This should only ever run for 32-bit processes. */
10462@@ -158,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10463 /* We do not accept a shared mapping if it would violate
10464 * cache aliasing constraints.
10465 */
10466- if ((flags & MAP_SHARED) &&
10467+ if ((filp || (flags & MAP_SHARED)) &&
10468 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10469 return -EINVAL;
10470 return addr;
10471@@ -171,6 +183,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10472 if (filp || (flags & MAP_SHARED))
10473 do_color_align = 1;
10474
10475+#ifdef CONFIG_PAX_RANDMMAP
10476+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10477+#endif
10478+
10479 /* requesting a specific address */
10480 if (addr) {
10481 if (do_color_align)
10482@@ -179,8 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10483 addr = PAGE_ALIGN(addr);
10484
10485 vma = find_vma(mm, addr);
10486- if (task_size - len >= addr &&
10487- (!vma || addr + len <= vma->vm_start))
10488+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10489 return addr;
10490 }
10491
10492@@ -190,6 +205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10493 info.high_limit = mm->mmap_base;
10494 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10495 info.align_offset = pgoff << PAGE_SHIFT;
10496+ info.threadstack_offset = offset;
10497 addr = vm_unmapped_area(&info);
10498
10499 /*
10500@@ -202,6 +218,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10501 VM_BUG_ON(addr != -ENOMEM);
10502 info.flags = 0;
10503 info.low_limit = TASK_UNMAPPED_BASE;
10504+
10505+#ifdef CONFIG_PAX_RANDMMAP
10506+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10507+ info.low_limit += mm->delta_mmap;
10508+#endif
10509+
10510 info.high_limit = STACK_TOP32;
10511 addr = vm_unmapped_area(&info);
10512 }
10513@@ -258,10 +280,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10514 EXPORT_SYMBOL(get_fb_unmapped_area);
10515
10516 /* Essentially the same as PowerPC. */
10517-static unsigned long mmap_rnd(void)
10518+static unsigned long mmap_rnd(struct mm_struct *mm)
10519 {
10520 unsigned long rnd = 0UL;
10521
10522+#ifdef CONFIG_PAX_RANDMMAP
10523+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10524+#endif
10525+
10526 if (current->flags & PF_RANDOMIZE) {
10527 unsigned long val = get_random_int();
10528 if (test_thread_flag(TIF_32BIT))
10529@@ -274,7 +300,7 @@ static unsigned long mmap_rnd(void)
10530
10531 void arch_pick_mmap_layout(struct mm_struct *mm)
10532 {
10533- unsigned long random_factor = mmap_rnd();
10534+ unsigned long random_factor = mmap_rnd(mm);
10535 unsigned long gap;
10536
10537 /*
10538@@ -287,6 +313,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10539 gap == RLIM_INFINITY ||
10540 sysctl_legacy_va_layout) {
10541 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10542+
10543+#ifdef CONFIG_PAX_RANDMMAP
10544+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10545+ mm->mmap_base += mm->delta_mmap;
10546+#endif
10547+
10548 mm->get_unmapped_area = arch_get_unmapped_area;
10549 } else {
10550 /* We know it's 32-bit */
10551@@ -298,6 +330,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10552 gap = (task_size / 6 * 5);
10553
10554 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10555+
10556+#ifdef CONFIG_PAX_RANDMMAP
10557+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10558+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10559+#endif
10560+
10561 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10562 }
10563 }
10564diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10565index 33a17e7..d87fb1f 100644
10566--- a/arch/sparc/kernel/syscalls.S
10567+++ b/arch/sparc/kernel/syscalls.S
10568@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10569 #endif
10570 .align 32
10571 1: ldx [%g6 + TI_FLAGS], %l5
10572- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10573+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10574 be,pt %icc, rtrap
10575 nop
10576 call syscall_trace_leave
10577@@ -184,7 +184,7 @@ linux_sparc_syscall32:
10578
10579 srl %i3, 0, %o3 ! IEU0
10580 srl %i2, 0, %o2 ! IEU0 Group
10581- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10582+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10583 bne,pn %icc, linux_syscall_trace32 ! CTI
10584 mov %i0, %l5 ! IEU1
10585 5: call %l7 ! CTI Group brk forced
10586@@ -208,7 +208,7 @@ linux_sparc_syscall:
10587
10588 mov %i3, %o3 ! IEU1
10589 mov %i4, %o4 ! IEU0 Group
10590- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10591+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10592 bne,pn %icc, linux_syscall_trace ! CTI Group
10593 mov %i0, %l5 ! IEU0
10594 2: call %l7 ! CTI Group brk forced
10595@@ -223,7 +223,7 @@ ret_sys_call:
10596
10597 cmp %o0, -ERESTART_RESTARTBLOCK
10598 bgeu,pn %xcc, 1f
10599- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10600+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10601 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10602
10603 2:
10604diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10605index 6629829..036032d 100644
10606--- a/arch/sparc/kernel/traps_32.c
10607+++ b/arch/sparc/kernel/traps_32.c
10608@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10609 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10610 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10611
10612+extern void gr_handle_kernel_exploit(void);
10613+
10614 void die_if_kernel(char *str, struct pt_regs *regs)
10615 {
10616 static int die_counter;
10617@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10618 count++ < 30 &&
10619 (((unsigned long) rw) >= PAGE_OFFSET) &&
10620 !(((unsigned long) rw) & 0x7)) {
10621- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10622+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10623 (void *) rw->ins[7]);
10624 rw = (struct reg_window32 *)rw->ins[6];
10625 }
10626 }
10627 printk("Instruction DUMP:");
10628 instruction_dump ((unsigned long *) regs->pc);
10629- if(regs->psr & PSR_PS)
10630+ if(regs->psr & PSR_PS) {
10631+ gr_handle_kernel_exploit();
10632 do_exit(SIGKILL);
10633+ }
10634 do_exit(SIGSEGV);
10635 }
10636
10637diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10638index 4ced92f..965eeed 100644
10639--- a/arch/sparc/kernel/traps_64.c
10640+++ b/arch/sparc/kernel/traps_64.c
10641@@ -77,7 +77,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10642 i + 1,
10643 p->trapstack[i].tstate, p->trapstack[i].tpc,
10644 p->trapstack[i].tnpc, p->trapstack[i].tt);
10645- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10646+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10647 }
10648 }
10649
10650@@ -97,6 +97,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10651
10652 lvl -= 0x100;
10653 if (regs->tstate & TSTATE_PRIV) {
10654+
10655+#ifdef CONFIG_PAX_REFCOUNT
10656+ if (lvl == 6)
10657+ pax_report_refcount_overflow(regs);
10658+#endif
10659+
10660 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10661 die_if_kernel(buffer, regs);
10662 }
10663@@ -115,11 +121,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10664 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10665 {
10666 char buffer[32];
10667-
10668+
10669 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10670 0, lvl, SIGTRAP) == NOTIFY_STOP)
10671 return;
10672
10673+#ifdef CONFIG_PAX_REFCOUNT
10674+ if (lvl == 6)
10675+ pax_report_refcount_overflow(regs);
10676+#endif
10677+
10678 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10679
10680 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10681@@ -1149,7 +1160,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10682 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10683 printk("%s" "ERROR(%d): ",
10684 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10685- printk("TPC<%pS>\n", (void *) regs->tpc);
10686+ printk("TPC<%pA>\n", (void *) regs->tpc);
10687 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10688 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10689 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10690@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10691 smp_processor_id(),
10692 (type & 0x1) ? 'I' : 'D',
10693 regs->tpc);
10694- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10695+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10696 panic("Irrecoverable Cheetah+ parity error.");
10697 }
10698
10699@@ -1764,7 +1775,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10700 smp_processor_id(),
10701 (type & 0x1) ? 'I' : 'D',
10702 regs->tpc);
10703- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10704+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10705 }
10706
10707 struct sun4v_error_entry {
10708@@ -1837,8 +1848,8 @@ struct sun4v_error_entry {
10709 /*0x38*/u64 reserved_5;
10710 };
10711
10712-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10713-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10714+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10715+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10716
10717 static const char *sun4v_err_type_to_str(u8 type)
10718 {
10719@@ -1930,7 +1941,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
10720 }
10721
10722 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10723- int cpu, const char *pfx, atomic_t *ocnt)
10724+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
10725 {
10726 u64 *raw_ptr = (u64 *) ent;
10727 u32 attrs;
10728@@ -1988,8 +1999,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
10729
10730 show_regs(regs);
10731
10732- if ((cnt = atomic_read(ocnt)) != 0) {
10733- atomic_set(ocnt, 0);
10734+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
10735+ atomic_set_unchecked(ocnt, 0);
10736 wmb();
10737 printk("%s: Queue overflowed %d times.\n",
10738 pfx, cnt);
10739@@ -2046,7 +2057,7 @@ out:
10740 */
10741 void sun4v_resum_overflow(struct pt_regs *regs)
10742 {
10743- atomic_inc(&sun4v_resum_oflow_cnt);
10744+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
10745 }
10746
10747 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
10748@@ -2099,7 +2110,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
10749 /* XXX Actually even this can make not that much sense. Perhaps
10750 * XXX we should just pull the plug and panic directly from here?
10751 */
10752- atomic_inc(&sun4v_nonresum_oflow_cnt);
10753+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
10754 }
10755
10756 unsigned long sun4v_err_itlb_vaddr;
10757@@ -2114,9 +2125,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
10758
10759 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
10760 regs->tpc, tl);
10761- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
10762+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
10763 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10764- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
10765+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
10766 (void *) regs->u_regs[UREG_I7]);
10767 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
10768 "pte[%lx] error[%lx]\n",
10769@@ -2138,9 +2149,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
10770
10771 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
10772 regs->tpc, tl);
10773- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
10774+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
10775 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
10776- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
10777+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
10778 (void *) regs->u_regs[UREG_I7]);
10779 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
10780 "pte[%lx] error[%lx]\n",
10781@@ -2359,13 +2370,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10782 fp = (unsigned long)sf->fp + STACK_BIAS;
10783 }
10784
10785- printk(" [%016lx] %pS\n", pc, (void *) pc);
10786+ printk(" [%016lx] %pA\n", pc, (void *) pc);
10787 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
10788 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
10789 int index = tsk->curr_ret_stack;
10790 if (tsk->ret_stack && index >= graph) {
10791 pc = tsk->ret_stack[index - graph].ret;
10792- printk(" [%016lx] %pS\n", pc, (void *) pc);
10793+ printk(" [%016lx] %pA\n", pc, (void *) pc);
10794 graph++;
10795 }
10796 }
10797@@ -2383,6 +2394,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
10798 return (struct reg_window *) (fp + STACK_BIAS);
10799 }
10800
10801+extern void gr_handle_kernel_exploit(void);
10802+
10803 void die_if_kernel(char *str, struct pt_regs *regs)
10804 {
10805 static int die_counter;
10806@@ -2411,7 +2424,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10807 while (rw &&
10808 count++ < 30 &&
10809 kstack_valid(tp, (unsigned long) rw)) {
10810- printk("Caller[%016lx]: %pS\n", rw->ins[7],
10811+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
10812 (void *) rw->ins[7]);
10813
10814 rw = kernel_stack_up(rw);
10815@@ -2424,8 +2437,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
10816 }
10817 user_instruction_dump ((unsigned int __user *) regs->tpc);
10818 }
10819- if (regs->tstate & TSTATE_PRIV)
10820+ if (regs->tstate & TSTATE_PRIV) {
10821+ gr_handle_kernel_exploit();
10822 do_exit(SIGKILL);
10823+ }
10824 do_exit(SIGSEGV);
10825 }
10826 EXPORT_SYMBOL(die_if_kernel);
10827diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
10828index 35ab8b6..9046547 100644
10829--- a/arch/sparc/kernel/unaligned_64.c
10830+++ b/arch/sparc/kernel/unaligned_64.c
10831@@ -295,7 +295,7 @@ static void log_unaligned(struct pt_regs *regs)
10832 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
10833
10834 if (__ratelimit(&ratelimit)) {
10835- printk("Kernel unaligned access at TPC[%lx] %pS\n",
10836+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
10837 regs->tpc, (void *) regs->tpc);
10838 }
10839 }
10840diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
10841index dbe119b..089c7c1 100644
10842--- a/arch/sparc/lib/Makefile
10843+++ b/arch/sparc/lib/Makefile
10844@@ -2,7 +2,7 @@
10845 #
10846
10847 asflags-y := -ansi -DST_DIV0=0x02
10848-ccflags-y := -Werror
10849+#ccflags-y := -Werror
10850
10851 lib-$(CONFIG_SPARC32) += ashrdi3.o
10852 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
10853diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
10854index 85c233d..68500e0 100644
10855--- a/arch/sparc/lib/atomic_64.S
10856+++ b/arch/sparc/lib/atomic_64.S
10857@@ -17,7 +17,12 @@
10858 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10859 BACKOFF_SETUP(%o2)
10860 1: lduw [%o1], %g1
10861- add %g1, %o0, %g7
10862+ addcc %g1, %o0, %g7
10863+
10864+#ifdef CONFIG_PAX_REFCOUNT
10865+ tvs %icc, 6
10866+#endif
10867+
10868 cas [%o1], %g1, %g7
10869 cmp %g1, %g7
10870 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10871@@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
10872 2: BACKOFF_SPIN(%o2, %o3, 1b)
10873 ENDPROC(atomic_add)
10874
10875+ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10876+ BACKOFF_SETUP(%o2)
10877+1: lduw [%o1], %g1
10878+ add %g1, %o0, %g7
10879+ cas [%o1], %g1, %g7
10880+ cmp %g1, %g7
10881+ bne,pn %icc, 2f
10882+ nop
10883+ retl
10884+ nop
10885+2: BACKOFF_SPIN(%o2, %o3, 1b)
10886+ENDPROC(atomic_add_unchecked)
10887+
10888 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10889 BACKOFF_SETUP(%o2)
10890 1: lduw [%o1], %g1
10891- sub %g1, %o0, %g7
10892+ subcc %g1, %o0, %g7
10893+
10894+#ifdef CONFIG_PAX_REFCOUNT
10895+ tvs %icc, 6
10896+#endif
10897+
10898 cas [%o1], %g1, %g7
10899 cmp %g1, %g7
10900 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10901@@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10902 2: BACKOFF_SPIN(%o2, %o3, 1b)
10903 ENDPROC(atomic_sub)
10904
10905+ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
10906+ BACKOFF_SETUP(%o2)
10907+1: lduw [%o1], %g1
10908+ sub %g1, %o0, %g7
10909+ cas [%o1], %g1, %g7
10910+ cmp %g1, %g7
10911+ bne,pn %icc, 2f
10912+ nop
10913+ retl
10914+ nop
10915+2: BACKOFF_SPIN(%o2, %o3, 1b)
10916+ENDPROC(atomic_sub_unchecked)
10917+
10918 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10919 BACKOFF_SETUP(%o2)
10920 1: lduw [%o1], %g1
10921- add %g1, %o0, %g7
10922+ addcc %g1, %o0, %g7
10923+
10924+#ifdef CONFIG_PAX_REFCOUNT
10925+ tvs %icc, 6
10926+#endif
10927+
10928 cas [%o1], %g1, %g7
10929 cmp %g1, %g7
10930 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10931@@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
10932 2: BACKOFF_SPIN(%o2, %o3, 1b)
10933 ENDPROC(atomic_add_ret)
10934
10935+ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10936+ BACKOFF_SETUP(%o2)
10937+1: lduw [%o1], %g1
10938+ addcc %g1, %o0, %g7
10939+ cas [%o1], %g1, %g7
10940+ cmp %g1, %g7
10941+ bne,pn %icc, 2f
10942+ add %g7, %o0, %g7
10943+ sra %g7, 0, %o0
10944+ retl
10945+ nop
10946+2: BACKOFF_SPIN(%o2, %o3, 1b)
10947+ENDPROC(atomic_add_ret_unchecked)
10948+
10949 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
10950 BACKOFF_SETUP(%o2)
10951 1: lduw [%o1], %g1
10952- sub %g1, %o0, %g7
10953+ subcc %g1, %o0, %g7
10954+
10955+#ifdef CONFIG_PAX_REFCOUNT
10956+ tvs %icc, 6
10957+#endif
10958+
10959 cas [%o1], %g1, %g7
10960 cmp %g1, %g7
10961 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
10962@@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
10963 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10964 BACKOFF_SETUP(%o2)
10965 1: ldx [%o1], %g1
10966- add %g1, %o0, %g7
10967+ addcc %g1, %o0, %g7
10968+
10969+#ifdef CONFIG_PAX_REFCOUNT
10970+ tvs %xcc, 6
10971+#endif
10972+
10973 casx [%o1], %g1, %g7
10974 cmp %g1, %g7
10975 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
10976@@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
10977 2: BACKOFF_SPIN(%o2, %o3, 1b)
10978 ENDPROC(atomic64_add)
10979
10980+ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
10981+ BACKOFF_SETUP(%o2)
10982+1: ldx [%o1], %g1
10983+ addcc %g1, %o0, %g7
10984+ casx [%o1], %g1, %g7
10985+ cmp %g1, %g7
10986+ bne,pn %xcc, 2f
10987+ nop
10988+ retl
10989+ nop
10990+2: BACKOFF_SPIN(%o2, %o3, 1b)
10991+ENDPROC(atomic64_add_unchecked)
10992+
10993 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
10994 BACKOFF_SETUP(%o2)
10995 1: ldx [%o1], %g1
10996- sub %g1, %o0, %g7
10997+ subcc %g1, %o0, %g7
10998+
10999+#ifdef CONFIG_PAX_REFCOUNT
11000+ tvs %xcc, 6
11001+#endif
11002+
11003 casx [%o1], %g1, %g7
11004 cmp %g1, %g7
11005 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
11006@@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
11007 2: BACKOFF_SPIN(%o2, %o3, 1b)
11008 ENDPROC(atomic64_sub)
11009
11010+ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
11011+ BACKOFF_SETUP(%o2)
11012+1: ldx [%o1], %g1
11013+ subcc %g1, %o0, %g7
11014+ casx [%o1], %g1, %g7
11015+ cmp %g1, %g7
11016+ bne,pn %xcc, 2f
11017+ nop
11018+ retl
11019+ nop
11020+2: BACKOFF_SPIN(%o2, %o3, 1b)
11021+ENDPROC(atomic64_sub_unchecked)
11022+
11023 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
11024 BACKOFF_SETUP(%o2)
11025 1: ldx [%o1], %g1
11026- add %g1, %o0, %g7
11027+ addcc %g1, %o0, %g7
11028+
11029+#ifdef CONFIG_PAX_REFCOUNT
11030+ tvs %xcc, 6
11031+#endif
11032+
11033 casx [%o1], %g1, %g7
11034 cmp %g1, %g7
11035 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
11036@@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
11037 2: BACKOFF_SPIN(%o2, %o3, 1b)
11038 ENDPROC(atomic64_add_ret)
11039
11040+ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
11041+ BACKOFF_SETUP(%o2)
11042+1: ldx [%o1], %g1
11043+ addcc %g1, %o0, %g7
11044+ casx [%o1], %g1, %g7
11045+ cmp %g1, %g7
11046+ bne,pn %xcc, 2f
11047+ add %g7, %o0, %g7
11048+ mov %g7, %o0
11049+ retl
11050+ nop
11051+2: BACKOFF_SPIN(%o2, %o3, 1b)
11052+ENDPROC(atomic64_add_ret_unchecked)
11053+
11054 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
11055 BACKOFF_SETUP(%o2)
11056 1: ldx [%o1], %g1
11057- sub %g1, %o0, %g7
11058+ subcc %g1, %o0, %g7
11059+
11060+#ifdef CONFIG_PAX_REFCOUNT
11061+ tvs %xcc, 6
11062+#endif
11063+
11064 casx [%o1], %g1, %g7
11065 cmp %g1, %g7
11066 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
11067diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11068index 323335b..ed85ea2 100644
11069--- a/arch/sparc/lib/ksyms.c
11070+++ b/arch/sparc/lib/ksyms.c
11071@@ -100,12 +100,18 @@ EXPORT_SYMBOL(__clear_user);
11072
11073 /* Atomic counter implementation. */
11074 EXPORT_SYMBOL(atomic_add);
11075+EXPORT_SYMBOL(atomic_add_unchecked);
11076 EXPORT_SYMBOL(atomic_add_ret);
11077+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11078 EXPORT_SYMBOL(atomic_sub);
11079+EXPORT_SYMBOL(atomic_sub_unchecked);
11080 EXPORT_SYMBOL(atomic_sub_ret);
11081 EXPORT_SYMBOL(atomic64_add);
11082+EXPORT_SYMBOL(atomic64_add_unchecked);
11083 EXPORT_SYMBOL(atomic64_add_ret);
11084+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11085 EXPORT_SYMBOL(atomic64_sub);
11086+EXPORT_SYMBOL(atomic64_sub_unchecked);
11087 EXPORT_SYMBOL(atomic64_sub_ret);
11088 EXPORT_SYMBOL(atomic64_dec_if_positive);
11089
11090diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11091index 30c3ecc..736f015 100644
11092--- a/arch/sparc/mm/Makefile
11093+++ b/arch/sparc/mm/Makefile
11094@@ -2,7 +2,7 @@
11095 #
11096
11097 asflags-y := -ansi
11098-ccflags-y := -Werror
11099+#ccflags-y := -Werror
11100
11101 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11102 obj-y += fault_$(BITS).o
11103diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11104index 59dbd46..1dd7f5e 100644
11105--- a/arch/sparc/mm/fault_32.c
11106+++ b/arch/sparc/mm/fault_32.c
11107@@ -21,6 +21,9 @@
11108 #include <linux/perf_event.h>
11109 #include <linux/interrupt.h>
11110 #include <linux/kdebug.h>
11111+#include <linux/slab.h>
11112+#include <linux/pagemap.h>
11113+#include <linux/compiler.h>
11114
11115 #include <asm/page.h>
11116 #include <asm/pgtable.h>
11117@@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11118 return safe_compute_effective_address(regs, insn);
11119 }
11120
11121+#ifdef CONFIG_PAX_PAGEEXEC
11122+#ifdef CONFIG_PAX_DLRESOLVE
11123+static void pax_emuplt_close(struct vm_area_struct *vma)
11124+{
11125+ vma->vm_mm->call_dl_resolve = 0UL;
11126+}
11127+
11128+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11129+{
11130+ unsigned int *kaddr;
11131+
11132+ vmf->page = alloc_page(GFP_HIGHUSER);
11133+ if (!vmf->page)
11134+ return VM_FAULT_OOM;
11135+
11136+ kaddr = kmap(vmf->page);
11137+ memset(kaddr, 0, PAGE_SIZE);
11138+ kaddr[0] = 0x9DE3BFA8U; /* save */
11139+ flush_dcache_page(vmf->page);
11140+ kunmap(vmf->page);
11141+ return VM_FAULT_MAJOR;
11142+}
11143+
11144+static const struct vm_operations_struct pax_vm_ops = {
11145+ .close = pax_emuplt_close,
11146+ .fault = pax_emuplt_fault
11147+};
11148+
11149+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11150+{
11151+ int ret;
11152+
11153+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11154+ vma->vm_mm = current->mm;
11155+ vma->vm_start = addr;
11156+ vma->vm_end = addr + PAGE_SIZE;
11157+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11158+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11159+ vma->vm_ops = &pax_vm_ops;
11160+
11161+ ret = insert_vm_struct(current->mm, vma);
11162+ if (ret)
11163+ return ret;
11164+
11165+ ++current->mm->total_vm;
11166+ return 0;
11167+}
11168+#endif
11169+
11170+/*
11171+ * PaX: decide what to do with offenders (regs->pc = fault address)
11172+ *
11173+ * returns 1 when task should be killed
11174+ * 2 when patched PLT trampoline was detected
11175+ * 3 when unpatched PLT trampoline was detected
11176+ */
11177+static int pax_handle_fetch_fault(struct pt_regs *regs)
11178+{
11179+
11180+#ifdef CONFIG_PAX_EMUPLT
11181+ int err;
11182+
11183+ do { /* PaX: patched PLT emulation #1 */
11184+ unsigned int sethi1, sethi2, jmpl;
11185+
11186+ err = get_user(sethi1, (unsigned int *)regs->pc);
11187+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11188+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11189+
11190+ if (err)
11191+ break;
11192+
11193+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11194+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11195+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11196+ {
11197+ unsigned int addr;
11198+
11199+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11200+ addr = regs->u_regs[UREG_G1];
11201+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11202+ regs->pc = addr;
11203+ regs->npc = addr+4;
11204+ return 2;
11205+ }
11206+ } while (0);
11207+
11208+ do { /* PaX: patched PLT emulation #2 */
11209+ unsigned int ba;
11210+
11211+ err = get_user(ba, (unsigned int *)regs->pc);
11212+
11213+ if (err)
11214+ break;
11215+
11216+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11217+ unsigned int addr;
11218+
11219+ if ((ba & 0xFFC00000U) == 0x30800000U)
11220+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11221+ else
11222+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11223+ regs->pc = addr;
11224+ regs->npc = addr+4;
11225+ return 2;
11226+ }
11227+ } while (0);
11228+
11229+ do { /* PaX: patched PLT emulation #3 */
11230+ unsigned int sethi, bajmpl, nop;
11231+
11232+ err = get_user(sethi, (unsigned int *)regs->pc);
11233+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11234+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11235+
11236+ if (err)
11237+ break;
11238+
11239+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11240+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11241+ nop == 0x01000000U)
11242+ {
11243+ unsigned int addr;
11244+
11245+ addr = (sethi & 0x003FFFFFU) << 10;
11246+ regs->u_regs[UREG_G1] = addr;
11247+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11248+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11249+ else
11250+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11251+ regs->pc = addr;
11252+ regs->npc = addr+4;
11253+ return 2;
11254+ }
11255+ } while (0);
11256+
11257+ do { /* PaX: unpatched PLT emulation step 1 */
11258+ unsigned int sethi, ba, nop;
11259+
11260+ err = get_user(sethi, (unsigned int *)regs->pc);
11261+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11262+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11263+
11264+ if (err)
11265+ break;
11266+
11267+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11268+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11269+ nop == 0x01000000U)
11270+ {
11271+ unsigned int addr, save, call;
11272+
11273+ if ((ba & 0xFFC00000U) == 0x30800000U)
11274+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11275+ else
11276+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11277+
11278+ err = get_user(save, (unsigned int *)addr);
11279+ err |= get_user(call, (unsigned int *)(addr+4));
11280+ err |= get_user(nop, (unsigned int *)(addr+8));
11281+ if (err)
11282+ break;
11283+
11284+#ifdef CONFIG_PAX_DLRESOLVE
11285+ if (save == 0x9DE3BFA8U &&
11286+ (call & 0xC0000000U) == 0x40000000U &&
11287+ nop == 0x01000000U)
11288+ {
11289+ struct vm_area_struct *vma;
11290+ unsigned long call_dl_resolve;
11291+
11292+ down_read(&current->mm->mmap_sem);
11293+ call_dl_resolve = current->mm->call_dl_resolve;
11294+ up_read(&current->mm->mmap_sem);
11295+ if (likely(call_dl_resolve))
11296+ goto emulate;
11297+
11298+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11299+
11300+ down_write(&current->mm->mmap_sem);
11301+ if (current->mm->call_dl_resolve) {
11302+ call_dl_resolve = current->mm->call_dl_resolve;
11303+ up_write(&current->mm->mmap_sem);
11304+ if (vma)
11305+ kmem_cache_free(vm_area_cachep, vma);
11306+ goto emulate;
11307+ }
11308+
11309+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11310+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11311+ up_write(&current->mm->mmap_sem);
11312+ if (vma)
11313+ kmem_cache_free(vm_area_cachep, vma);
11314+ return 1;
11315+ }
11316+
11317+ if (pax_insert_vma(vma, call_dl_resolve)) {
11318+ up_write(&current->mm->mmap_sem);
11319+ kmem_cache_free(vm_area_cachep, vma);
11320+ return 1;
11321+ }
11322+
11323+ current->mm->call_dl_resolve = call_dl_resolve;
11324+ up_write(&current->mm->mmap_sem);
11325+
11326+emulate:
11327+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11328+ regs->pc = call_dl_resolve;
11329+ regs->npc = addr+4;
11330+ return 3;
11331+ }
11332+#endif
11333+
11334+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11335+ if ((save & 0xFFC00000U) == 0x05000000U &&
11336+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11337+ nop == 0x01000000U)
11338+ {
11339+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11340+ regs->u_regs[UREG_G2] = addr + 4;
11341+ addr = (save & 0x003FFFFFU) << 10;
11342+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11343+ regs->pc = addr;
11344+ regs->npc = addr+4;
11345+ return 3;
11346+ }
11347+ }
11348+ } while (0);
11349+
11350+ do { /* PaX: unpatched PLT emulation step 2 */
11351+ unsigned int save, call, nop;
11352+
11353+ err = get_user(save, (unsigned int *)(regs->pc-4));
11354+ err |= get_user(call, (unsigned int *)regs->pc);
11355+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11356+ if (err)
11357+ break;
11358+
11359+ if (save == 0x9DE3BFA8U &&
11360+ (call & 0xC0000000U) == 0x40000000U &&
11361+ nop == 0x01000000U)
11362+ {
11363+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11364+
11365+ regs->u_regs[UREG_RETPC] = regs->pc;
11366+ regs->pc = dl_resolve;
11367+ regs->npc = dl_resolve+4;
11368+ return 3;
11369+ }
11370+ } while (0);
11371+#endif
11372+
11373+ return 1;
11374+}
11375+
11376+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11377+{
11378+ unsigned long i;
11379+
11380+ printk(KERN_ERR "PAX: bytes at PC: ");
11381+ for (i = 0; i < 8; i++) {
11382+ unsigned int c;
11383+ if (get_user(c, (unsigned int *)pc+i))
11384+ printk(KERN_CONT "???????? ");
11385+ else
11386+ printk(KERN_CONT "%08x ", c);
11387+ }
11388+ printk("\n");
11389+}
11390+#endif
11391+
11392 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11393 int text_fault)
11394 {
11395@@ -229,6 +503,24 @@ good_area:
11396 if (!(vma->vm_flags & VM_WRITE))
11397 goto bad_area;
11398 } else {
11399+
11400+#ifdef CONFIG_PAX_PAGEEXEC
11401+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11402+ up_read(&mm->mmap_sem);
11403+ switch (pax_handle_fetch_fault(regs)) {
11404+
11405+#ifdef CONFIG_PAX_EMUPLT
11406+ case 2:
11407+ case 3:
11408+ return;
11409+#endif
11410+
11411+ }
11412+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11413+ do_group_exit(SIGKILL);
11414+ }
11415+#endif
11416+
11417 /* Allow reads even for write-only mappings */
11418 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11419 goto bad_area;
11420diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11421index 4ced3fc..234f1e4 100644
11422--- a/arch/sparc/mm/fault_64.c
11423+++ b/arch/sparc/mm/fault_64.c
11424@@ -22,6 +22,9 @@
11425 #include <linux/kdebug.h>
11426 #include <linux/percpu.h>
11427 #include <linux/context_tracking.h>
11428+#include <linux/slab.h>
11429+#include <linux/pagemap.h>
11430+#include <linux/compiler.h>
11431
11432 #include <asm/page.h>
11433 #include <asm/pgtable.h>
11434@@ -75,7 +78,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11435 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11436 regs->tpc);
11437 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11438- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11439+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11440 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11441 dump_stack();
11442 unhandled_fault(regs->tpc, current, regs);
11443@@ -281,6 +284,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11444 show_regs(regs);
11445 }
11446
11447+#ifdef CONFIG_PAX_PAGEEXEC
11448+#ifdef CONFIG_PAX_DLRESOLVE
11449+static void pax_emuplt_close(struct vm_area_struct *vma)
11450+{
11451+ vma->vm_mm->call_dl_resolve = 0UL;
11452+}
11453+
11454+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11455+{
11456+ unsigned int *kaddr;
11457+
11458+ vmf->page = alloc_page(GFP_HIGHUSER);
11459+ if (!vmf->page)
11460+ return VM_FAULT_OOM;
11461+
11462+ kaddr = kmap(vmf->page);
11463+ memset(kaddr, 0, PAGE_SIZE);
11464+ kaddr[0] = 0x9DE3BFA8U; /* save */
11465+ flush_dcache_page(vmf->page);
11466+ kunmap(vmf->page);
11467+ return VM_FAULT_MAJOR;
11468+}
11469+
11470+static const struct vm_operations_struct pax_vm_ops = {
11471+ .close = pax_emuplt_close,
11472+ .fault = pax_emuplt_fault
11473+};
11474+
11475+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11476+{
11477+ int ret;
11478+
11479+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11480+ vma->vm_mm = current->mm;
11481+ vma->vm_start = addr;
11482+ vma->vm_end = addr + PAGE_SIZE;
11483+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11484+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11485+ vma->vm_ops = &pax_vm_ops;
11486+
11487+ ret = insert_vm_struct(current->mm, vma);
11488+ if (ret)
11489+ return ret;
11490+
11491+ ++current->mm->total_vm;
11492+ return 0;
11493+}
11494+#endif
11495+
11496+/*
11497+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11498+ *
11499+ * returns 1 when task should be killed
11500+ * 2 when patched PLT trampoline was detected
11501+ * 3 when unpatched PLT trampoline was detected
11502+ */
11503+static int pax_handle_fetch_fault(struct pt_regs *regs)
11504+{
11505+
11506+#ifdef CONFIG_PAX_EMUPLT
11507+ int err;
11508+
11509+ do { /* PaX: patched PLT emulation #1 */
11510+ unsigned int sethi1, sethi2, jmpl;
11511+
11512+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11513+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11514+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11515+
11516+ if (err)
11517+ break;
11518+
11519+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11520+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11521+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11522+ {
11523+ unsigned long addr;
11524+
11525+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11526+ addr = regs->u_regs[UREG_G1];
11527+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11528+
11529+ if (test_thread_flag(TIF_32BIT))
11530+ addr &= 0xFFFFFFFFUL;
11531+
11532+ regs->tpc = addr;
11533+ regs->tnpc = addr+4;
11534+ return 2;
11535+ }
11536+ } while (0);
11537+
11538+ do { /* PaX: patched PLT emulation #2 */
11539+ unsigned int ba;
11540+
11541+ err = get_user(ba, (unsigned int *)regs->tpc);
11542+
11543+ if (err)
11544+ break;
11545+
11546+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11547+ unsigned long addr;
11548+
11549+ if ((ba & 0xFFC00000U) == 0x30800000U)
11550+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11551+ else
11552+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11553+
11554+ if (test_thread_flag(TIF_32BIT))
11555+ addr &= 0xFFFFFFFFUL;
11556+
11557+ regs->tpc = addr;
11558+ regs->tnpc = addr+4;
11559+ return 2;
11560+ }
11561+ } while (0);
11562+
11563+ do { /* PaX: patched PLT emulation #3 */
11564+ unsigned int sethi, bajmpl, nop;
11565+
11566+ err = get_user(sethi, (unsigned int *)regs->tpc);
11567+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11568+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11569+
11570+ if (err)
11571+ break;
11572+
11573+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11574+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11575+ nop == 0x01000000U)
11576+ {
11577+ unsigned long addr;
11578+
11579+ addr = (sethi & 0x003FFFFFU) << 10;
11580+ regs->u_regs[UREG_G1] = addr;
11581+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11582+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11583+ else
11584+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11585+
11586+ if (test_thread_flag(TIF_32BIT))
11587+ addr &= 0xFFFFFFFFUL;
11588+
11589+ regs->tpc = addr;
11590+ regs->tnpc = addr+4;
11591+ return 2;
11592+ }
11593+ } while (0);
11594+
11595+ do { /* PaX: patched PLT emulation #4 */
11596+ unsigned int sethi, mov1, call, mov2;
11597+
11598+ err = get_user(sethi, (unsigned int *)regs->tpc);
11599+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11600+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11601+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11602+
11603+ if (err)
11604+ break;
11605+
11606+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11607+ mov1 == 0x8210000FU &&
11608+ (call & 0xC0000000U) == 0x40000000U &&
11609+ mov2 == 0x9E100001U)
11610+ {
11611+ unsigned long addr;
11612+
11613+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11614+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11615+
11616+ if (test_thread_flag(TIF_32BIT))
11617+ addr &= 0xFFFFFFFFUL;
11618+
11619+ regs->tpc = addr;
11620+ regs->tnpc = addr+4;
11621+ return 2;
11622+ }
11623+ } while (0);
11624+
11625+ do { /* PaX: patched PLT emulation #5 */
11626+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11627+
11628+ err = get_user(sethi, (unsigned int *)regs->tpc);
11629+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11630+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11631+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11632+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11633+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11634+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11635+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11636+
11637+ if (err)
11638+ break;
11639+
11640+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11641+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11642+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11643+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11644+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11645+ sllx == 0x83287020U &&
11646+ jmpl == 0x81C04005U &&
11647+ nop == 0x01000000U)
11648+ {
11649+ unsigned long addr;
11650+
11651+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11652+ regs->u_regs[UREG_G1] <<= 32;
11653+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11654+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11655+ regs->tpc = addr;
11656+ regs->tnpc = addr+4;
11657+ return 2;
11658+ }
11659+ } while (0);
11660+
11661+ do { /* PaX: patched PLT emulation #6 */
11662+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11663+
11664+ err = get_user(sethi, (unsigned int *)regs->tpc);
11665+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11666+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11667+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11668+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11669+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11670+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11671+
11672+ if (err)
11673+ break;
11674+
11675+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11676+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11677+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11678+ sllx == 0x83287020U &&
11679+ (or & 0xFFFFE000U) == 0x8A116000U &&
11680+ jmpl == 0x81C04005U &&
11681+ nop == 0x01000000U)
11682+ {
11683+ unsigned long addr;
11684+
11685+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11686+ regs->u_regs[UREG_G1] <<= 32;
11687+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11688+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11689+ regs->tpc = addr;
11690+ regs->tnpc = addr+4;
11691+ return 2;
11692+ }
11693+ } while (0);
11694+
11695+ do { /* PaX: unpatched PLT emulation step 1 */
11696+ unsigned int sethi, ba, nop;
11697+
11698+ err = get_user(sethi, (unsigned int *)regs->tpc);
11699+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11700+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11701+
11702+ if (err)
11703+ break;
11704+
11705+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11706+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11707+ nop == 0x01000000U)
11708+ {
11709+ unsigned long addr;
11710+ unsigned int save, call;
11711+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11712+
11713+ if ((ba & 0xFFC00000U) == 0x30800000U)
11714+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11715+ else
11716+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11717+
11718+ if (test_thread_flag(TIF_32BIT))
11719+ addr &= 0xFFFFFFFFUL;
11720+
11721+ err = get_user(save, (unsigned int *)addr);
11722+ err |= get_user(call, (unsigned int *)(addr+4));
11723+ err |= get_user(nop, (unsigned int *)(addr+8));
11724+ if (err)
11725+ break;
11726+
11727+#ifdef CONFIG_PAX_DLRESOLVE
11728+ if (save == 0x9DE3BFA8U &&
11729+ (call & 0xC0000000U) == 0x40000000U &&
11730+ nop == 0x01000000U)
11731+ {
11732+ struct vm_area_struct *vma;
11733+ unsigned long call_dl_resolve;
11734+
11735+ down_read(&current->mm->mmap_sem);
11736+ call_dl_resolve = current->mm->call_dl_resolve;
11737+ up_read(&current->mm->mmap_sem);
11738+ if (likely(call_dl_resolve))
11739+ goto emulate;
11740+
11741+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11742+
11743+ down_write(&current->mm->mmap_sem);
11744+ if (current->mm->call_dl_resolve) {
11745+ call_dl_resolve = current->mm->call_dl_resolve;
11746+ up_write(&current->mm->mmap_sem);
11747+ if (vma)
11748+ kmem_cache_free(vm_area_cachep, vma);
11749+ goto emulate;
11750+ }
11751+
11752+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11753+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11754+ up_write(&current->mm->mmap_sem);
11755+ if (vma)
11756+ kmem_cache_free(vm_area_cachep, vma);
11757+ return 1;
11758+ }
11759+
11760+ if (pax_insert_vma(vma, call_dl_resolve)) {
11761+ up_write(&current->mm->mmap_sem);
11762+ kmem_cache_free(vm_area_cachep, vma);
11763+ return 1;
11764+ }
11765+
11766+ current->mm->call_dl_resolve = call_dl_resolve;
11767+ up_write(&current->mm->mmap_sem);
11768+
11769+emulate:
11770+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11771+ regs->tpc = call_dl_resolve;
11772+ regs->tnpc = addr+4;
11773+ return 3;
11774+ }
11775+#endif
11776+
11777+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11778+ if ((save & 0xFFC00000U) == 0x05000000U &&
11779+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11780+ nop == 0x01000000U)
11781+ {
11782+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11783+ regs->u_regs[UREG_G2] = addr + 4;
11784+ addr = (save & 0x003FFFFFU) << 10;
11785+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11786+
11787+ if (test_thread_flag(TIF_32BIT))
11788+ addr &= 0xFFFFFFFFUL;
11789+
11790+ regs->tpc = addr;
11791+ regs->tnpc = addr+4;
11792+ return 3;
11793+ }
11794+
11795+ /* PaX: 64-bit PLT stub */
11796+ err = get_user(sethi1, (unsigned int *)addr);
11797+ err |= get_user(sethi2, (unsigned int *)(addr+4));
11798+ err |= get_user(or1, (unsigned int *)(addr+8));
11799+ err |= get_user(or2, (unsigned int *)(addr+12));
11800+ err |= get_user(sllx, (unsigned int *)(addr+16));
11801+ err |= get_user(add, (unsigned int *)(addr+20));
11802+ err |= get_user(jmpl, (unsigned int *)(addr+24));
11803+ err |= get_user(nop, (unsigned int *)(addr+28));
11804+ if (err)
11805+ break;
11806+
11807+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
11808+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11809+ (or1 & 0xFFFFE000U) == 0x88112000U &&
11810+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11811+ sllx == 0x89293020U &&
11812+ add == 0x8A010005U &&
11813+ jmpl == 0x89C14000U &&
11814+ nop == 0x01000000U)
11815+ {
11816+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11817+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11818+ regs->u_regs[UREG_G4] <<= 32;
11819+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11820+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
11821+ regs->u_regs[UREG_G4] = addr + 24;
11822+ addr = regs->u_regs[UREG_G5];
11823+ regs->tpc = addr;
11824+ regs->tnpc = addr+4;
11825+ return 3;
11826+ }
11827+ }
11828+ } while (0);
11829+
11830+#ifdef CONFIG_PAX_DLRESOLVE
11831+ do { /* PaX: unpatched PLT emulation step 2 */
11832+ unsigned int save, call, nop;
11833+
11834+ err = get_user(save, (unsigned int *)(regs->tpc-4));
11835+ err |= get_user(call, (unsigned int *)regs->tpc);
11836+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
11837+ if (err)
11838+ break;
11839+
11840+ if (save == 0x9DE3BFA8U &&
11841+ (call & 0xC0000000U) == 0x40000000U &&
11842+ nop == 0x01000000U)
11843+ {
11844+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11845+
11846+ if (test_thread_flag(TIF_32BIT))
11847+ dl_resolve &= 0xFFFFFFFFUL;
11848+
11849+ regs->u_regs[UREG_RETPC] = regs->tpc;
11850+ regs->tpc = dl_resolve;
11851+ regs->tnpc = dl_resolve+4;
11852+ return 3;
11853+ }
11854+ } while (0);
11855+#endif
11856+
11857+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
11858+ unsigned int sethi, ba, nop;
11859+
11860+ err = get_user(sethi, (unsigned int *)regs->tpc);
11861+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11862+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11863+
11864+ if (err)
11865+ break;
11866+
11867+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11868+ (ba & 0xFFF00000U) == 0x30600000U &&
11869+ nop == 0x01000000U)
11870+ {
11871+ unsigned long addr;
11872+
11873+ addr = (sethi & 0x003FFFFFU) << 10;
11874+ regs->u_regs[UREG_G1] = addr;
11875+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11876+
11877+ if (test_thread_flag(TIF_32BIT))
11878+ addr &= 0xFFFFFFFFUL;
11879+
11880+ regs->tpc = addr;
11881+ regs->tnpc = addr+4;
11882+ return 2;
11883+ }
11884+ } while (0);
11885+
11886+#endif
11887+
11888+ return 1;
11889+}
11890+
11891+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11892+{
11893+ unsigned long i;
11894+
11895+ printk(KERN_ERR "PAX: bytes at PC: ");
11896+ for (i = 0; i < 8; i++) {
11897+ unsigned int c;
11898+ if (get_user(c, (unsigned int *)pc+i))
11899+ printk(KERN_CONT "???????? ");
11900+ else
11901+ printk(KERN_CONT "%08x ", c);
11902+ }
11903+ printk("\n");
11904+}
11905+#endif
11906+
11907 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
11908 {
11909 enum ctx_state prev_state = exception_enter();
11910@@ -352,6 +815,29 @@ retry:
11911 if (!vma)
11912 goto bad_area;
11913
11914+#ifdef CONFIG_PAX_PAGEEXEC
11915+ /* PaX: detect ITLB misses on non-exec pages */
11916+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
11917+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
11918+ {
11919+ if (address != regs->tpc)
11920+ goto good_area;
11921+
11922+ up_read(&mm->mmap_sem);
11923+ switch (pax_handle_fetch_fault(regs)) {
11924+
11925+#ifdef CONFIG_PAX_EMUPLT
11926+ case 2:
11927+ case 3:
11928+ return;
11929+#endif
11930+
11931+ }
11932+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
11933+ do_group_exit(SIGKILL);
11934+ }
11935+#endif
11936+
11937 /* Pure DTLB misses do not tell us whether the fault causing
11938 * load/store/atomic was a write or not, it only says that there
11939 * was no match. So in such a case we (carefully) read the
11940diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
11941index d329537..2c3746a 100644
11942--- a/arch/sparc/mm/hugetlbpage.c
11943+++ b/arch/sparc/mm/hugetlbpage.c
11944@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11945 unsigned long addr,
11946 unsigned long len,
11947 unsigned long pgoff,
11948- unsigned long flags)
11949+ unsigned long flags,
11950+ unsigned long offset)
11951 {
11952+ struct mm_struct *mm = current->mm;
11953 unsigned long task_size = TASK_SIZE;
11954 struct vm_unmapped_area_info info;
11955
11956@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
11957
11958 info.flags = 0;
11959 info.length = len;
11960- info.low_limit = TASK_UNMAPPED_BASE;
11961+ info.low_limit = mm->mmap_base;
11962 info.high_limit = min(task_size, VA_EXCLUDE_START);
11963 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11964 info.align_offset = 0;
11965+ info.threadstack_offset = offset;
11966 addr = vm_unmapped_area(&info);
11967
11968 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
11969 VM_BUG_ON(addr != -ENOMEM);
11970 info.low_limit = VA_EXCLUDE_END;
11971+
11972+#ifdef CONFIG_PAX_RANDMMAP
11973+ if (mm->pax_flags & MF_PAX_RANDMMAP)
11974+ info.low_limit += mm->delta_mmap;
11975+#endif
11976+
11977 info.high_limit = task_size;
11978 addr = vm_unmapped_area(&info);
11979 }
11980@@ -55,7 +64,8 @@ static unsigned long
11981 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11982 const unsigned long len,
11983 const unsigned long pgoff,
11984- const unsigned long flags)
11985+ const unsigned long flags,
11986+ const unsigned long offset)
11987 {
11988 struct mm_struct *mm = current->mm;
11989 unsigned long addr = addr0;
11990@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11991 info.high_limit = mm->mmap_base;
11992 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
11993 info.align_offset = 0;
11994+ info.threadstack_offset = offset;
11995 addr = vm_unmapped_area(&info);
11996
11997 /*
11998@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
11999 VM_BUG_ON(addr != -ENOMEM);
12000 info.flags = 0;
12001 info.low_limit = TASK_UNMAPPED_BASE;
12002+
12003+#ifdef CONFIG_PAX_RANDMMAP
12004+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12005+ info.low_limit += mm->delta_mmap;
12006+#endif
12007+
12008 info.high_limit = STACK_TOP32;
12009 addr = vm_unmapped_area(&info);
12010 }
12011@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12012 struct mm_struct *mm = current->mm;
12013 struct vm_area_struct *vma;
12014 unsigned long task_size = TASK_SIZE;
12015+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12016
12017 if (test_thread_flag(TIF_32BIT))
12018 task_size = STACK_TOP32;
12019@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12020 return addr;
12021 }
12022
12023+#ifdef CONFIG_PAX_RANDMMAP
12024+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12025+#endif
12026+
12027 if (addr) {
12028 addr = ALIGN(addr, HPAGE_SIZE);
12029 vma = find_vma(mm, addr);
12030- if (task_size - len >= addr &&
12031- (!vma || addr + len <= vma->vm_start))
12032+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12033 return addr;
12034 }
12035 if (mm->get_unmapped_area == arch_get_unmapped_area)
12036 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12037- pgoff, flags);
12038+ pgoff, flags, offset);
12039 else
12040 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12041- pgoff, flags);
12042+ pgoff, flags, offset);
12043 }
12044
12045 pte_t *huge_pte_alloc(struct mm_struct *mm,
12046diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12047index ed3c969..42fe48d 100644
12048--- a/arch/sparc/mm/init_64.c
12049+++ b/arch/sparc/mm/init_64.c
12050@@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12051 int num_kernel_image_mappings;
12052
12053 #ifdef CONFIG_DEBUG_DCFLUSH
12054-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12055+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12056 #ifdef CONFIG_SMP
12057-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12058+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12059 #endif
12060 #endif
12061
12062@@ -198,7 +198,7 @@ inline void flush_dcache_page_impl(struct page *page)
12063 {
12064 BUG_ON(tlb_type == hypervisor);
12065 #ifdef CONFIG_DEBUG_DCFLUSH
12066- atomic_inc(&dcpage_flushes);
12067+ atomic_inc_unchecked(&dcpage_flushes);
12068 #endif
12069
12070 #ifdef DCACHE_ALIASING_POSSIBLE
12071@@ -466,10 +466,10 @@ void mmu_info(struct seq_file *m)
12072
12073 #ifdef CONFIG_DEBUG_DCFLUSH
12074 seq_printf(m, "DCPageFlushes\t: %d\n",
12075- atomic_read(&dcpage_flushes));
12076+ atomic_read_unchecked(&dcpage_flushes));
12077 #ifdef CONFIG_SMP
12078 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12079- atomic_read(&dcpage_flushes_xcall));
12080+ atomic_read_unchecked(&dcpage_flushes_xcall));
12081 #endif /* CONFIG_SMP */
12082 #endif /* CONFIG_DEBUG_DCFLUSH */
12083 }
12084diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12085index 85258ca..df97c79 100644
12086--- a/arch/tile/Kconfig
12087+++ b/arch/tile/Kconfig
12088@@ -190,6 +190,7 @@ source "kernel/Kconfig.hz"
12089
12090 config KEXEC
12091 bool "kexec system call"
12092+ depends on !GRKERNSEC_KMEM
12093 ---help---
12094 kexec is a system call that implements the ability to shutdown your
12095 current kernel, and to start another kernel. It is like a reboot
12096diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12097index ad220ee..2f537b3 100644
12098--- a/arch/tile/include/asm/atomic_64.h
12099+++ b/arch/tile/include/asm/atomic_64.h
12100@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12101
12102 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12103
12104+#define atomic64_read_unchecked(v) atomic64_read(v)
12105+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12106+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12107+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12108+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12109+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12110+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12111+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12112+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12113+
12114 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
12115 #define smp_mb__before_atomic_dec() smp_mb()
12116 #define smp_mb__after_atomic_dec() smp_mb()
12117diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12118index 6160761..00cac88 100644
12119--- a/arch/tile/include/asm/cache.h
12120+++ b/arch/tile/include/asm/cache.h
12121@@ -15,11 +15,12 @@
12122 #ifndef _ASM_TILE_CACHE_H
12123 #define _ASM_TILE_CACHE_H
12124
12125+#include <linux/const.h>
12126 #include <arch/chip.h>
12127
12128 /* bytes per L1 data cache line */
12129 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12130-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12131+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12132
12133 /* bytes per L2 cache line */
12134 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12135diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12136index b6cde32..c0cb736 100644
12137--- a/arch/tile/include/asm/uaccess.h
12138+++ b/arch/tile/include/asm/uaccess.h
12139@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12140 const void __user *from,
12141 unsigned long n)
12142 {
12143- int sz = __compiletime_object_size(to);
12144+ size_t sz = __compiletime_object_size(to);
12145
12146- if (likely(sz == -1 || sz >= n))
12147+ if (likely(sz == (size_t)-1 || sz >= n))
12148 n = _copy_from_user(to, from, n);
12149 else
12150 copy_from_user_overflow();
12151diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12152index e514899..f8743c4 100644
12153--- a/arch/tile/mm/hugetlbpage.c
12154+++ b/arch/tile/mm/hugetlbpage.c
12155@@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12156 info.high_limit = TASK_SIZE;
12157 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12158 info.align_offset = 0;
12159+ info.threadstack_offset = 0;
12160 return vm_unmapped_area(&info);
12161 }
12162
12163@@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12164 info.high_limit = current->mm->mmap_base;
12165 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12166 info.align_offset = 0;
12167+ info.threadstack_offset = 0;
12168 addr = vm_unmapped_area(&info);
12169
12170 /*
12171diff --git a/arch/um/Makefile b/arch/um/Makefile
12172index 36e658a..71a5c5a 100644
12173--- a/arch/um/Makefile
12174+++ b/arch/um/Makefile
12175@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12176 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12177 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12178
12179+ifdef CONSTIFY_PLUGIN
12180+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12181+endif
12182+
12183 #This will adjust *FLAGS accordingly to the platform.
12184 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12185
12186diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12187index 19e1bdd..3665b77 100644
12188--- a/arch/um/include/asm/cache.h
12189+++ b/arch/um/include/asm/cache.h
12190@@ -1,6 +1,7 @@
12191 #ifndef __UM_CACHE_H
12192 #define __UM_CACHE_H
12193
12194+#include <linux/const.h>
12195
12196 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12197 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12198@@ -12,6 +13,6 @@
12199 # define L1_CACHE_SHIFT 5
12200 #endif
12201
12202-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12203+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12204
12205 #endif
12206diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12207index 2e0a6b1..a64d0f5 100644
12208--- a/arch/um/include/asm/kmap_types.h
12209+++ b/arch/um/include/asm/kmap_types.h
12210@@ -8,6 +8,6 @@
12211
12212 /* No more #include "asm/arch/kmap_types.h" ! */
12213
12214-#define KM_TYPE_NR 14
12215+#define KM_TYPE_NR 15
12216
12217 #endif
12218diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12219index 5ff53d9..5850cdf 100644
12220--- a/arch/um/include/asm/page.h
12221+++ b/arch/um/include/asm/page.h
12222@@ -14,6 +14,9 @@
12223 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12224 #define PAGE_MASK (~(PAGE_SIZE-1))
12225
12226+#define ktla_ktva(addr) (addr)
12227+#define ktva_ktla(addr) (addr)
12228+
12229 #ifndef __ASSEMBLY__
12230
12231 struct page;
12232diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12233index 0032f92..cd151e0 100644
12234--- a/arch/um/include/asm/pgtable-3level.h
12235+++ b/arch/um/include/asm/pgtable-3level.h
12236@@ -58,6 +58,7 @@
12237 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12238 #define pud_populate(mm, pud, pmd) \
12239 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12240+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12241
12242 #ifdef CONFIG_64BIT
12243 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12244diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12245index f17bca8..48adb87 100644
12246--- a/arch/um/kernel/process.c
12247+++ b/arch/um/kernel/process.c
12248@@ -356,22 +356,6 @@ int singlestepping(void * t)
12249 return 2;
12250 }
12251
12252-/*
12253- * Only x86 and x86_64 have an arch_align_stack().
12254- * All other arches have "#define arch_align_stack(x) (x)"
12255- * in their asm/exec.h
12256- * As this is included in UML from asm-um/system-generic.h,
12257- * we can use it to behave as the subarch does.
12258- */
12259-#ifndef arch_align_stack
12260-unsigned long arch_align_stack(unsigned long sp)
12261-{
12262- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12263- sp -= get_random_int() % 8192;
12264- return sp & ~0xf;
12265-}
12266-#endif
12267-
12268 unsigned long get_wchan(struct task_struct *p)
12269 {
12270 unsigned long stack_page, sp, ip;
12271diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12272index ad8f795..2c7eec6 100644
12273--- a/arch/unicore32/include/asm/cache.h
12274+++ b/arch/unicore32/include/asm/cache.h
12275@@ -12,8 +12,10 @@
12276 #ifndef __UNICORE_CACHE_H__
12277 #define __UNICORE_CACHE_H__
12278
12279-#define L1_CACHE_SHIFT (5)
12280-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12281+#include <linux/const.h>
12282+
12283+#define L1_CACHE_SHIFT 5
12284+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12285
12286 /*
12287 * Memory returned by kmalloc() may be used for DMA, so we must make
12288diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12289index 6b8b429..7b21fe4 100644
12290--- a/arch/x86/Kconfig
12291+++ b/arch/x86/Kconfig
12292@@ -127,7 +127,7 @@ config X86
12293 select RTC_LIB
12294 select HAVE_DEBUG_STACKOVERFLOW
12295 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12296- select HAVE_CC_STACKPROTECTOR
12297+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12298 select GENERIC_CPU_AUTOPROBE
12299 select HAVE_ARCH_AUDITSYSCALL
12300
12301@@ -251,7 +251,7 @@ config X86_HT
12302
12303 config X86_32_LAZY_GS
12304 def_bool y
12305- depends on X86_32 && !CC_STACKPROTECTOR
12306+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12307
12308 config ARCH_HWEIGHT_CFLAGS
12309 string
12310@@ -545,6 +545,7 @@ config SCHED_OMIT_FRAME_POINTER
12311
12312 menuconfig HYPERVISOR_GUEST
12313 bool "Linux guest support"
12314+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12315 ---help---
12316 Say Y here to enable options for running Linux under various hyper-
12317 visors. This option enables basic hypervisor detection and platform
12318@@ -1054,6 +1055,7 @@ choice
12319
12320 config NOHIGHMEM
12321 bool "off"
12322+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12323 ---help---
12324 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12325 However, the address space of 32-bit x86 processors is only 4
12326@@ -1090,6 +1092,7 @@ config NOHIGHMEM
12327
12328 config HIGHMEM4G
12329 bool "4GB"
12330+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12331 ---help---
12332 Select this if you have a 32-bit processor and between 1 and 4
12333 gigabytes of physical RAM.
12334@@ -1142,7 +1145,7 @@ config PAGE_OFFSET
12335 hex
12336 default 0xB0000000 if VMSPLIT_3G_OPT
12337 default 0x80000000 if VMSPLIT_2G
12338- default 0x78000000 if VMSPLIT_2G_OPT
12339+ default 0x70000000 if VMSPLIT_2G_OPT
12340 default 0x40000000 if VMSPLIT_1G
12341 default 0xC0000000
12342 depends on X86_32
12343@@ -1555,6 +1558,7 @@ source kernel/Kconfig.hz
12344
12345 config KEXEC
12346 bool "kexec system call"
12347+ depends on !GRKERNSEC_KMEM
12348 ---help---
12349 kexec is a system call that implements the ability to shutdown your
12350 current kernel, and to start another kernel. It is like a reboot
12351@@ -1706,7 +1710,9 @@ config X86_NEED_RELOCS
12352
12353 config PHYSICAL_ALIGN
12354 hex "Alignment value to which kernel should be aligned"
12355- default "0x200000"
12356+ default "0x1000000"
12357+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12358+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12359 range 0x2000 0x1000000 if X86_32
12360 range 0x200000 0x1000000 if X86_64
12361 ---help---
12362@@ -1789,6 +1795,7 @@ config COMPAT_VDSO
12363 def_bool n
12364 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12365 depends on X86_32 || IA32_EMULATION
12366+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12367 ---help---
12368 Certain buggy versions of glibc will crash if they are
12369 presented with a 32-bit vDSO that is not mapped at the address
12370diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12371index 6983314..54ad7e8 100644
12372--- a/arch/x86/Kconfig.cpu
12373+++ b/arch/x86/Kconfig.cpu
12374@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12375
12376 config X86_F00F_BUG
12377 def_bool y
12378- depends on M586MMX || M586TSC || M586 || M486
12379+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12380
12381 config X86_INVD_BUG
12382 def_bool y
12383@@ -327,7 +327,7 @@ config X86_INVD_BUG
12384
12385 config X86_ALIGNMENT_16
12386 def_bool y
12387- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12388+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12389
12390 config X86_INTEL_USERCOPY
12391 def_bool y
12392@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12393 # generates cmov.
12394 config X86_CMOV
12395 def_bool y
12396- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12397+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12398
12399 config X86_MINIMUM_CPU_FAMILY
12400 int
12401diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12402index 61bd2ad..50b625d 100644
12403--- a/arch/x86/Kconfig.debug
12404+++ b/arch/x86/Kconfig.debug
12405@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12406 config DEBUG_RODATA
12407 bool "Write protect kernel read-only data structures"
12408 default y
12409- depends on DEBUG_KERNEL
12410+ depends on DEBUG_KERNEL && BROKEN
12411 ---help---
12412 Mark the kernel read-only data as write-protected in the pagetables,
12413 in order to catch accidental (and incorrect) writes to such const
12414@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12415
12416 config DEBUG_SET_MODULE_RONX
12417 bool "Set loadable kernel module data as NX and text as RO"
12418- depends on MODULES
12419+ depends on MODULES && BROKEN
12420 ---help---
12421 This option helps catch unintended modifications to loadable
12422 kernel module's text and read-only data. It also prevents execution
12423diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12424index 33f71b0..c2cefa2 100644
12425--- a/arch/x86/Makefile
12426+++ b/arch/x86/Makefile
12427@@ -71,9 +71,6 @@ ifeq ($(CONFIG_X86_32),y)
12428 # CPU-specific tuning. Anything which can be shared with UML should go here.
12429 include $(srctree)/arch/x86/Makefile_32.cpu
12430 KBUILD_CFLAGS += $(cflags-y)
12431-
12432- # temporary until string.h is fixed
12433- KBUILD_CFLAGS += -ffreestanding
12434 else
12435 BITS := 64
12436 UTS_MACHINE := x86_64
12437@@ -114,6 +111,9 @@ else
12438 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12439 endif
12440
12441+# temporary until string.h is fixed
12442+KBUILD_CFLAGS += -ffreestanding
12443+
12444 # Make sure compiler does not have buggy stack-protector support.
12445 ifdef CONFIG_CC_STACKPROTECTOR
12446 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12447@@ -271,3 +271,12 @@ define archhelp
12448 echo ' FDINITRD=file initrd for the booted kernel'
12449 echo ' kvmconfig - Enable additional options for guest kernel support'
12450 endef
12451+
12452+define OLD_LD
12453+
12454+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12455+*** Please upgrade your binutils to 2.18 or newer
12456+endef
12457+
12458+archprepare:
12459+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12460diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12461index dbe8dd2..2f0a98f 100644
12462--- a/arch/x86/boot/Makefile
12463+++ b/arch/x86/boot/Makefile
12464@@ -52,6 +52,9 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE
12465 # ---------------------------------------------------------------------------
12466
12467 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12468+ifdef CONSTIFY_PLUGIN
12469+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12470+endif
12471 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12472 GCOV_PROFILE := n
12473
12474diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12475index 878e4b9..20537ab 100644
12476--- a/arch/x86/boot/bitops.h
12477+++ b/arch/x86/boot/bitops.h
12478@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12479 u8 v;
12480 const u32 *p = (const u32 *)addr;
12481
12482- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12483+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12484 return v;
12485 }
12486
12487@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12488
12489 static inline void set_bit(int nr, void *addr)
12490 {
12491- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12492+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12493 }
12494
12495 #endif /* BOOT_BITOPS_H */
12496diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12497index bd49ec6..94c7f58 100644
12498--- a/arch/x86/boot/boot.h
12499+++ b/arch/x86/boot/boot.h
12500@@ -84,7 +84,7 @@ static inline void io_delay(void)
12501 static inline u16 ds(void)
12502 {
12503 u16 seg;
12504- asm("movw %%ds,%0" : "=rm" (seg));
12505+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12506 return seg;
12507 }
12508
12509diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12510index 0fcd913..3bb5c42 100644
12511--- a/arch/x86/boot/compressed/Makefile
12512+++ b/arch/x86/boot/compressed/Makefile
12513@@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12514 KBUILD_CFLAGS += -mno-mmx -mno-sse
12515 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12516 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12517+ifdef CONSTIFY_PLUGIN
12518+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12519+endif
12520
12521 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12522 GCOV_PROFILE := n
12523diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12524index a53440e..c3dbf1e 100644
12525--- a/arch/x86/boot/compressed/efi_stub_32.S
12526+++ b/arch/x86/boot/compressed/efi_stub_32.S
12527@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12528 * parameter 2, ..., param n. To make things easy, we save the return
12529 * address of efi_call_phys in a global variable.
12530 */
12531- popl %ecx
12532- movl %ecx, saved_return_addr(%edx)
12533- /* get the function pointer into ECX*/
12534- popl %ecx
12535- movl %ecx, efi_rt_function_ptr(%edx)
12536+ popl saved_return_addr(%edx)
12537+ popl efi_rt_function_ptr(%edx)
12538
12539 /*
12540 * 3. Call the physical function.
12541 */
12542- call *%ecx
12543+ call *efi_rt_function_ptr(%edx)
12544
12545 /*
12546 * 4. Balance the stack. And because EAX contain the return value,
12547@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12548 1: popl %edx
12549 subl $1b, %edx
12550
12551- movl efi_rt_function_ptr(%edx), %ecx
12552- pushl %ecx
12553+ pushl efi_rt_function_ptr(%edx)
12554
12555 /*
12556 * 10. Push the saved return address onto the stack and return.
12557 */
12558- movl saved_return_addr(%edx), %ecx
12559- pushl %ecx
12560- ret
12561+ jmpl *saved_return_addr(%edx)
12562 ENDPROC(efi_call_phys)
12563 .previous
12564
12565diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12566index cbed140..5f2ca57 100644
12567--- a/arch/x86/boot/compressed/head_32.S
12568+++ b/arch/x86/boot/compressed/head_32.S
12569@@ -140,10 +140,10 @@ preferred_addr:
12570 addl %eax, %ebx
12571 notl %eax
12572 andl %eax, %ebx
12573- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12574+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12575 jge 1f
12576 #endif
12577- movl $LOAD_PHYSICAL_ADDR, %ebx
12578+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12579 1:
12580
12581 /* Target address to relocate to for decompression */
12582diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12583index 0d558ee..58f257e 100644
12584--- a/arch/x86/boot/compressed/head_64.S
12585+++ b/arch/x86/boot/compressed/head_64.S
12586@@ -94,10 +94,10 @@ ENTRY(startup_32)
12587 addl %eax, %ebx
12588 notl %eax
12589 andl %eax, %ebx
12590- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12591+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12592 jge 1f
12593 #endif
12594- movl $LOAD_PHYSICAL_ADDR, %ebx
12595+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12596 1:
12597
12598 /* Target address to relocate to for decompression */
12599@@ -322,10 +322,10 @@ preferred_addr:
12600 addq %rax, %rbp
12601 notq %rax
12602 andq %rax, %rbp
12603- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12604+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12605 jge 1f
12606 #endif
12607- movq $LOAD_PHYSICAL_ADDR, %rbp
12608+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12609 1:
12610
12611 /* Target address to relocate to for decompression */
12612@@ -431,8 +431,8 @@ gdt:
12613 .long gdt
12614 .word 0
12615 .quad 0x0000000000000000 /* NULL descriptor */
12616- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12617- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12618+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12619+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12620 .quad 0x0080890000000000 /* TS descriptor */
12621 .quad 0x0000000000000000 /* TS continued */
12622 gdt_end:
12623diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12624index 57ab74d..7c52182 100644
12625--- a/arch/x86/boot/compressed/misc.c
12626+++ b/arch/x86/boot/compressed/misc.c
12627@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12628 * Calculate the delta between where vmlinux was linked to load
12629 * and where it was actually loaded.
12630 */
12631- delta = min_addr - LOAD_PHYSICAL_ADDR;
12632+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12633 if (!delta) {
12634 debug_putstr("No relocation needed... ");
12635 return;
12636@@ -312,7 +312,7 @@ static void parse_elf(void *output)
12637 Elf32_Ehdr ehdr;
12638 Elf32_Phdr *phdrs, *phdr;
12639 #endif
12640- void *dest;
12641+ void *dest, *prev;
12642 int i;
12643
12644 memcpy(&ehdr, output, sizeof(ehdr));
12645@@ -339,13 +339,16 @@ static void parse_elf(void *output)
12646 case PT_LOAD:
12647 #ifdef CONFIG_RELOCATABLE
12648 dest = output;
12649- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12650+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12651 #else
12652 dest = (void *)(phdr->p_paddr);
12653 #endif
12654 memcpy(dest,
12655 output + phdr->p_offset,
12656 phdr->p_filesz);
12657+ if (i)
12658+ memset(prev, 0xff, dest - prev);
12659+ prev = dest + phdr->p_filesz;
12660 break;
12661 default: /* Ignore other PT_* */ break;
12662 }
12663@@ -395,7 +398,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12664 error("Destination address too large");
12665 #endif
12666 #ifndef CONFIG_RELOCATABLE
12667- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12668+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12669 error("Wrong destination address");
12670 #endif
12671
12672diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12673index 1fd7d57..0f7d096 100644
12674--- a/arch/x86/boot/cpucheck.c
12675+++ b/arch/x86/boot/cpucheck.c
12676@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12677 u32 ecx = MSR_K7_HWCR;
12678 u32 eax, edx;
12679
12680- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12681+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12682 eax &= ~(1 << 15);
12683- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12684+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12685
12686 get_cpuflags(); /* Make sure it really did something */
12687 err = check_cpuflags();
12688@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12689 u32 ecx = MSR_VIA_FCR;
12690 u32 eax, edx;
12691
12692- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12693+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12694 eax |= (1<<1)|(1<<7);
12695- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12696+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12697
12698 set_bit(X86_FEATURE_CX8, cpu.flags);
12699 err = check_cpuflags();
12700@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12701 u32 eax, edx;
12702 u32 level = 1;
12703
12704- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12705- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12706- asm("cpuid"
12707+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12708+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12709+ asm volatile("cpuid"
12710 : "+a" (level), "=d" (cpu.flags[0])
12711 : : "ecx", "ebx");
12712- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12713+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12714
12715 err = check_cpuflags();
12716 } else if (err == 0x01 &&
12717diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12718index 84c2234..3ef6360 100644
12719--- a/arch/x86/boot/header.S
12720+++ b/arch/x86/boot/header.S
12721@@ -420,10 +420,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12722 # single linked list of
12723 # struct setup_data
12724
12725-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12726+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12727
12728 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12729+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12730+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12731+#else
12732 #define VO_INIT_SIZE (VO__end - VO__text)
12733+#endif
12734 #if ZO_INIT_SIZE > VO_INIT_SIZE
12735 #define INIT_SIZE ZO_INIT_SIZE
12736 #else
12737diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12738index db75d07..8e6d0af 100644
12739--- a/arch/x86/boot/memory.c
12740+++ b/arch/x86/boot/memory.c
12741@@ -19,7 +19,7 @@
12742
12743 static int detect_memory_e820(void)
12744 {
12745- int count = 0;
12746+ unsigned int count = 0;
12747 struct biosregs ireg, oreg;
12748 struct e820entry *desc = boot_params.e820_map;
12749 static struct e820entry buf; /* static so it is zeroed */
12750diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12751index ba3e100..6501b8f 100644
12752--- a/arch/x86/boot/video-vesa.c
12753+++ b/arch/x86/boot/video-vesa.c
12754@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
12755
12756 boot_params.screen_info.vesapm_seg = oreg.es;
12757 boot_params.screen_info.vesapm_off = oreg.di;
12758+ boot_params.screen_info.vesapm_size = oreg.cx;
12759 }
12760
12761 /*
12762diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12763index 43eda28..5ab5fdb 100644
12764--- a/arch/x86/boot/video.c
12765+++ b/arch/x86/boot/video.c
12766@@ -96,7 +96,7 @@ static void store_mode_params(void)
12767 static unsigned int get_entry(void)
12768 {
12769 char entry_buf[4];
12770- int i, len = 0;
12771+ unsigned int i, len = 0;
12772 int key;
12773 unsigned int v;
12774
12775diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
12776index 9105655..41779c1 100644
12777--- a/arch/x86/crypto/aes-x86_64-asm_64.S
12778+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
12779@@ -8,6 +8,8 @@
12780 * including this sentence is retained in full.
12781 */
12782
12783+#include <asm/alternative-asm.h>
12784+
12785 .extern crypto_ft_tab
12786 .extern crypto_it_tab
12787 .extern crypto_fl_tab
12788@@ -70,6 +72,8 @@
12789 je B192; \
12790 leaq 32(r9),r9;
12791
12792+#define ret pax_force_retaddr; ret
12793+
12794 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
12795 movq r1,r2; \
12796 movq r3,r4; \
12797diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
12798index 477e9d7..c92c7d8 100644
12799--- a/arch/x86/crypto/aesni-intel_asm.S
12800+++ b/arch/x86/crypto/aesni-intel_asm.S
12801@@ -31,6 +31,7 @@
12802
12803 #include <linux/linkage.h>
12804 #include <asm/inst.h>
12805+#include <asm/alternative-asm.h>
12806
12807 #ifdef __x86_64__
12808 .data
12809@@ -205,7 +206,7 @@ enc: .octa 0x2
12810 * num_initial_blocks = b mod 4
12811 * encrypt the initial num_initial_blocks blocks and apply ghash on
12812 * the ciphertext
12813-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12814+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12815 * are clobbered
12816 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12817 */
12818@@ -214,8 +215,8 @@ enc: .octa 0x2
12819 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12820 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12821 mov arg7, %r10 # %r10 = AAD
12822- mov arg8, %r12 # %r12 = aadLen
12823- mov %r12, %r11
12824+ mov arg8, %r15 # %r15 = aadLen
12825+ mov %r15, %r11
12826 pxor %xmm\i, %xmm\i
12827 _get_AAD_loop\num_initial_blocks\operation:
12828 movd (%r10), \TMP1
12829@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12830 psrldq $4, %xmm\i
12831 pxor \TMP1, %xmm\i
12832 add $4, %r10
12833- sub $4, %r12
12834+ sub $4, %r15
12835 jne _get_AAD_loop\num_initial_blocks\operation
12836 cmp $16, %r11
12837 je _get_AAD_loop2_done\num_initial_blocks\operation
12838- mov $16, %r12
12839+ mov $16, %r15
12840 _get_AAD_loop2\num_initial_blocks\operation:
12841 psrldq $4, %xmm\i
12842- sub $4, %r12
12843- cmp %r11, %r12
12844+ sub $4, %r15
12845+ cmp %r11, %r15
12846 jne _get_AAD_loop2\num_initial_blocks\operation
12847 _get_AAD_loop2_done\num_initial_blocks\operation:
12848 movdqa SHUF_MASK(%rip), %xmm14
12849@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
12850 * num_initial_blocks = b mod 4
12851 * encrypt the initial num_initial_blocks blocks and apply ghash on
12852 * the ciphertext
12853-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12854+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
12855 * are clobbered
12856 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
12857 */
12858@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
12859 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
12860 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
12861 mov arg7, %r10 # %r10 = AAD
12862- mov arg8, %r12 # %r12 = aadLen
12863- mov %r12, %r11
12864+ mov arg8, %r15 # %r15 = aadLen
12865+ mov %r15, %r11
12866 pxor %xmm\i, %xmm\i
12867 _get_AAD_loop\num_initial_blocks\operation:
12868 movd (%r10), \TMP1
12869@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
12870 psrldq $4, %xmm\i
12871 pxor \TMP1, %xmm\i
12872 add $4, %r10
12873- sub $4, %r12
12874+ sub $4, %r15
12875 jne _get_AAD_loop\num_initial_blocks\operation
12876 cmp $16, %r11
12877 je _get_AAD_loop2_done\num_initial_blocks\operation
12878- mov $16, %r12
12879+ mov $16, %r15
12880 _get_AAD_loop2\num_initial_blocks\operation:
12881 psrldq $4, %xmm\i
12882- sub $4, %r12
12883- cmp %r11, %r12
12884+ sub $4, %r15
12885+ cmp %r11, %r15
12886 jne _get_AAD_loop2\num_initial_blocks\operation
12887 _get_AAD_loop2_done\num_initial_blocks\operation:
12888 movdqa SHUF_MASK(%rip), %xmm14
12889@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
12890 *
12891 *****************************************************************************/
12892 ENTRY(aesni_gcm_dec)
12893- push %r12
12894+ push %r15
12895 push %r13
12896 push %r14
12897 mov %rsp, %r14
12898@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
12899 */
12900 sub $VARIABLE_OFFSET, %rsp
12901 and $~63, %rsp # align rsp to 64 bytes
12902- mov %arg6, %r12
12903- movdqu (%r12), %xmm13 # %xmm13 = HashKey
12904+ mov %arg6, %r15
12905+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
12906 movdqa SHUF_MASK(%rip), %xmm2
12907 PSHUFB_XMM %xmm2, %xmm13
12908
12909@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
12910 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
12911 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
12912 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
12913- mov %r13, %r12
12914- and $(3<<4), %r12
12915+ mov %r13, %r15
12916+ and $(3<<4), %r15
12917 jz _initial_num_blocks_is_0_decrypt
12918- cmp $(2<<4), %r12
12919+ cmp $(2<<4), %r15
12920 jb _initial_num_blocks_is_1_decrypt
12921 je _initial_num_blocks_is_2_decrypt
12922 _initial_num_blocks_is_3_decrypt:
12923@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
12924 sub $16, %r11
12925 add %r13, %r11
12926 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
12927- lea SHIFT_MASK+16(%rip), %r12
12928- sub %r13, %r12
12929+ lea SHIFT_MASK+16(%rip), %r15
12930+ sub %r13, %r15
12931 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
12932 # (%r13 is the number of bytes in plaintext mod 16)
12933- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
12934+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
12935 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
12936
12937 movdqa %xmm1, %xmm2
12938 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
12939- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
12940+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
12941 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
12942 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
12943 pand %xmm1, %xmm2
12944@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
12945 sub $1, %r13
12946 jne _less_than_8_bytes_left_decrypt
12947 _multiple_of_16_bytes_decrypt:
12948- mov arg8, %r12 # %r13 = aadLen (number of bytes)
12949- shl $3, %r12 # convert into number of bits
12950- movd %r12d, %xmm15 # len(A) in %xmm15
12951+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
12952+ shl $3, %r15 # convert into number of bits
12953+ movd %r15d, %xmm15 # len(A) in %xmm15
12954 shl $3, %arg4 # len(C) in bits (*128)
12955 MOVQ_R64_XMM %arg4, %xmm1
12956 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
12957@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
12958 mov %r14, %rsp
12959 pop %r14
12960 pop %r13
12961- pop %r12
12962+ pop %r15
12963+ pax_force_retaddr
12964 ret
12965 ENDPROC(aesni_gcm_dec)
12966
12967@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
12968 * poly = x^128 + x^127 + x^126 + x^121 + 1
12969 ***************************************************************************/
12970 ENTRY(aesni_gcm_enc)
12971- push %r12
12972+ push %r15
12973 push %r13
12974 push %r14
12975 mov %rsp, %r14
12976@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
12977 #
12978 sub $VARIABLE_OFFSET, %rsp
12979 and $~63, %rsp
12980- mov %arg6, %r12
12981- movdqu (%r12), %xmm13
12982+ mov %arg6, %r15
12983+ movdqu (%r15), %xmm13
12984 movdqa SHUF_MASK(%rip), %xmm2
12985 PSHUFB_XMM %xmm2, %xmm13
12986
12987@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
12988 movdqa %xmm13, HashKey(%rsp)
12989 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
12990 and $-16, %r13
12991- mov %r13, %r12
12992+ mov %r13, %r15
12993
12994 # Encrypt first few blocks
12995
12996- and $(3<<4), %r12
12997+ and $(3<<4), %r15
12998 jz _initial_num_blocks_is_0_encrypt
12999- cmp $(2<<4), %r12
13000+ cmp $(2<<4), %r15
13001 jb _initial_num_blocks_is_1_encrypt
13002 je _initial_num_blocks_is_2_encrypt
13003 _initial_num_blocks_is_3_encrypt:
13004@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13005 sub $16, %r11
13006 add %r13, %r11
13007 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13008- lea SHIFT_MASK+16(%rip), %r12
13009- sub %r13, %r12
13010+ lea SHIFT_MASK+16(%rip), %r15
13011+ sub %r13, %r15
13012 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13013 # (%r13 is the number of bytes in plaintext mod 16)
13014- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13015+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13016 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13017 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13018- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13019+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13020 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13021 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13022 movdqa SHUF_MASK(%rip), %xmm10
13023@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13024 sub $1, %r13
13025 jne _less_than_8_bytes_left_encrypt
13026 _multiple_of_16_bytes_encrypt:
13027- mov arg8, %r12 # %r12 = addLen (number of bytes)
13028- shl $3, %r12
13029- movd %r12d, %xmm15 # len(A) in %xmm15
13030+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13031+ shl $3, %r15
13032+ movd %r15d, %xmm15 # len(A) in %xmm15
13033 shl $3, %arg4 # len(C) in bits (*128)
13034 MOVQ_R64_XMM %arg4, %xmm1
13035 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13036@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13037 mov %r14, %rsp
13038 pop %r14
13039 pop %r13
13040- pop %r12
13041+ pop %r15
13042+ pax_force_retaddr
13043 ret
13044 ENDPROC(aesni_gcm_enc)
13045
13046@@ -1722,6 +1725,7 @@ _key_expansion_256a:
13047 pxor %xmm1, %xmm0
13048 movaps %xmm0, (TKEYP)
13049 add $0x10, TKEYP
13050+ pax_force_retaddr
13051 ret
13052 ENDPROC(_key_expansion_128)
13053 ENDPROC(_key_expansion_256a)
13054@@ -1748,6 +1752,7 @@ _key_expansion_192a:
13055 shufps $0b01001110, %xmm2, %xmm1
13056 movaps %xmm1, 0x10(TKEYP)
13057 add $0x20, TKEYP
13058+ pax_force_retaddr
13059 ret
13060 ENDPROC(_key_expansion_192a)
13061
13062@@ -1768,6 +1773,7 @@ _key_expansion_192b:
13063
13064 movaps %xmm0, (TKEYP)
13065 add $0x10, TKEYP
13066+ pax_force_retaddr
13067 ret
13068 ENDPROC(_key_expansion_192b)
13069
13070@@ -1781,6 +1787,7 @@ _key_expansion_256b:
13071 pxor %xmm1, %xmm2
13072 movaps %xmm2, (TKEYP)
13073 add $0x10, TKEYP
13074+ pax_force_retaddr
13075 ret
13076 ENDPROC(_key_expansion_256b)
13077
13078@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13079 #ifndef __x86_64__
13080 popl KEYP
13081 #endif
13082+ pax_force_retaddr
13083 ret
13084 ENDPROC(aesni_set_key)
13085
13086@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13087 popl KLEN
13088 popl KEYP
13089 #endif
13090+ pax_force_retaddr
13091 ret
13092 ENDPROC(aesni_enc)
13093
13094@@ -1974,6 +1983,7 @@ _aesni_enc1:
13095 AESENC KEY STATE
13096 movaps 0x70(TKEYP), KEY
13097 AESENCLAST KEY STATE
13098+ pax_force_retaddr
13099 ret
13100 ENDPROC(_aesni_enc1)
13101
13102@@ -2083,6 +2093,7 @@ _aesni_enc4:
13103 AESENCLAST KEY STATE2
13104 AESENCLAST KEY STATE3
13105 AESENCLAST KEY STATE4
13106+ pax_force_retaddr
13107 ret
13108 ENDPROC(_aesni_enc4)
13109
13110@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13111 popl KLEN
13112 popl KEYP
13113 #endif
13114+ pax_force_retaddr
13115 ret
13116 ENDPROC(aesni_dec)
13117
13118@@ -2164,6 +2176,7 @@ _aesni_dec1:
13119 AESDEC KEY STATE
13120 movaps 0x70(TKEYP), KEY
13121 AESDECLAST KEY STATE
13122+ pax_force_retaddr
13123 ret
13124 ENDPROC(_aesni_dec1)
13125
13126@@ -2273,6 +2286,7 @@ _aesni_dec4:
13127 AESDECLAST KEY STATE2
13128 AESDECLAST KEY STATE3
13129 AESDECLAST KEY STATE4
13130+ pax_force_retaddr
13131 ret
13132 ENDPROC(_aesni_dec4)
13133
13134@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13135 popl KEYP
13136 popl LEN
13137 #endif
13138+ pax_force_retaddr
13139 ret
13140 ENDPROC(aesni_ecb_enc)
13141
13142@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13143 popl KEYP
13144 popl LEN
13145 #endif
13146+ pax_force_retaddr
13147 ret
13148 ENDPROC(aesni_ecb_dec)
13149
13150@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13151 popl LEN
13152 popl IVP
13153 #endif
13154+ pax_force_retaddr
13155 ret
13156 ENDPROC(aesni_cbc_enc)
13157
13158@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13159 popl LEN
13160 popl IVP
13161 #endif
13162+ pax_force_retaddr
13163 ret
13164 ENDPROC(aesni_cbc_dec)
13165
13166@@ -2550,6 +2568,7 @@ _aesni_inc_init:
13167 mov $1, TCTR_LOW
13168 MOVQ_R64_XMM TCTR_LOW INC
13169 MOVQ_R64_XMM CTR TCTR_LOW
13170+ pax_force_retaddr
13171 ret
13172 ENDPROC(_aesni_inc_init)
13173
13174@@ -2579,6 +2598,7 @@ _aesni_inc:
13175 .Linc_low:
13176 movaps CTR, IV
13177 PSHUFB_XMM BSWAP_MASK IV
13178+ pax_force_retaddr
13179 ret
13180 ENDPROC(_aesni_inc)
13181
13182@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13183 .Lctr_enc_ret:
13184 movups IV, (IVP)
13185 .Lctr_enc_just_ret:
13186+ pax_force_retaddr
13187 ret
13188 ENDPROC(aesni_ctr_enc)
13189
13190@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13191 pxor INC, STATE4
13192 movdqu STATE4, 0x70(OUTP)
13193
13194+ pax_force_retaddr
13195 ret
13196 ENDPROC(aesni_xts_crypt8)
13197
13198diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13199index 246c670..466e2d6 100644
13200--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13201+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13202@@ -21,6 +21,7 @@
13203 */
13204
13205 #include <linux/linkage.h>
13206+#include <asm/alternative-asm.h>
13207
13208 .file "blowfish-x86_64-asm.S"
13209 .text
13210@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13211 jnz .L__enc_xor;
13212
13213 write_block();
13214+ pax_force_retaddr
13215 ret;
13216 .L__enc_xor:
13217 xor_block();
13218+ pax_force_retaddr
13219 ret;
13220 ENDPROC(__blowfish_enc_blk)
13221
13222@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13223
13224 movq %r11, %rbp;
13225
13226+ pax_force_retaddr
13227 ret;
13228 ENDPROC(blowfish_dec_blk)
13229
13230@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13231
13232 popq %rbx;
13233 popq %rbp;
13234+ pax_force_retaddr
13235 ret;
13236
13237 .L__enc_xor4:
13238@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13239
13240 popq %rbx;
13241 popq %rbp;
13242+ pax_force_retaddr
13243 ret;
13244 ENDPROC(__blowfish_enc_blk_4way)
13245
13246@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13247 popq %rbx;
13248 popq %rbp;
13249
13250+ pax_force_retaddr
13251 ret;
13252 ENDPROC(blowfish_dec_blk_4way)
13253diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13254index ce71f92..1dce7ec 100644
13255--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13256+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13257@@ -16,6 +16,7 @@
13258 */
13259
13260 #include <linux/linkage.h>
13261+#include <asm/alternative-asm.h>
13262
13263 #define CAMELLIA_TABLE_BYTE_LEN 272
13264
13265@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13266 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13267 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13268 %rcx, (%r9));
13269+ pax_force_retaddr
13270 ret;
13271 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13272
13273@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13274 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13275 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13276 %rax, (%r9));
13277+ pax_force_retaddr
13278 ret;
13279 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13280
13281@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13282 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13283 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13284
13285+ pax_force_retaddr
13286 ret;
13287
13288 .align 8
13289@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13290 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13291 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13292
13293+ pax_force_retaddr
13294 ret;
13295
13296 .align 8
13297@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13298 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13299 %xmm8, %rsi);
13300
13301+ pax_force_retaddr
13302 ret;
13303 ENDPROC(camellia_ecb_enc_16way)
13304
13305@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13306 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13307 %xmm8, %rsi);
13308
13309+ pax_force_retaddr
13310 ret;
13311 ENDPROC(camellia_ecb_dec_16way)
13312
13313@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13314 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13315 %xmm8, %rsi);
13316
13317+ pax_force_retaddr
13318 ret;
13319 ENDPROC(camellia_cbc_dec_16way)
13320
13321@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13322 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13323 %xmm8, %rsi);
13324
13325+ pax_force_retaddr
13326 ret;
13327 ENDPROC(camellia_ctr_16way)
13328
13329@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13330 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13331 %xmm8, %rsi);
13332
13333+ pax_force_retaddr
13334 ret;
13335 ENDPROC(camellia_xts_crypt_16way)
13336
13337diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13338index 0e0b886..5a3123c 100644
13339--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13340+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13341@@ -11,6 +11,7 @@
13342 */
13343
13344 #include <linux/linkage.h>
13345+#include <asm/alternative-asm.h>
13346
13347 #define CAMELLIA_TABLE_BYTE_LEN 272
13348
13349@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13350 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13351 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13352 %rcx, (%r9));
13353+ pax_force_retaddr
13354 ret;
13355 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13356
13357@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13358 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13359 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13360 %rax, (%r9));
13361+ pax_force_retaddr
13362 ret;
13363 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13364
13365@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13366 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13367 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13368
13369+ pax_force_retaddr
13370 ret;
13371
13372 .align 8
13373@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13374 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13375 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13376
13377+ pax_force_retaddr
13378 ret;
13379
13380 .align 8
13381@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13382
13383 vzeroupper;
13384
13385+ pax_force_retaddr
13386 ret;
13387 ENDPROC(camellia_ecb_enc_32way)
13388
13389@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13390
13391 vzeroupper;
13392
13393+ pax_force_retaddr
13394 ret;
13395 ENDPROC(camellia_ecb_dec_32way)
13396
13397@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13398
13399 vzeroupper;
13400
13401+ pax_force_retaddr
13402 ret;
13403 ENDPROC(camellia_cbc_dec_32way)
13404
13405@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13406
13407 vzeroupper;
13408
13409+ pax_force_retaddr
13410 ret;
13411 ENDPROC(camellia_ctr_32way)
13412
13413@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13414
13415 vzeroupper;
13416
13417+ pax_force_retaddr
13418 ret;
13419 ENDPROC(camellia_xts_crypt_32way)
13420
13421diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13422index 310319c..db3d7b5 100644
13423--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13424+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13425@@ -21,6 +21,7 @@
13426 */
13427
13428 #include <linux/linkage.h>
13429+#include <asm/alternative-asm.h>
13430
13431 .file "camellia-x86_64-asm_64.S"
13432 .text
13433@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13434 enc_outunpack(mov, RT1);
13435
13436 movq RRBP, %rbp;
13437+ pax_force_retaddr
13438 ret;
13439
13440 .L__enc_xor:
13441 enc_outunpack(xor, RT1);
13442
13443 movq RRBP, %rbp;
13444+ pax_force_retaddr
13445 ret;
13446 ENDPROC(__camellia_enc_blk)
13447
13448@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13449 dec_outunpack();
13450
13451 movq RRBP, %rbp;
13452+ pax_force_retaddr
13453 ret;
13454 ENDPROC(camellia_dec_blk)
13455
13456@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13457
13458 movq RRBP, %rbp;
13459 popq %rbx;
13460+ pax_force_retaddr
13461 ret;
13462
13463 .L__enc2_xor:
13464@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13465
13466 movq RRBP, %rbp;
13467 popq %rbx;
13468+ pax_force_retaddr
13469 ret;
13470 ENDPROC(__camellia_enc_blk_2way)
13471
13472@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13473
13474 movq RRBP, %rbp;
13475 movq RXOR, %rbx;
13476+ pax_force_retaddr
13477 ret;
13478 ENDPROC(camellia_dec_blk_2way)
13479diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13480index c35fd5d..2d8c7db 100644
13481--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13482+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13483@@ -24,6 +24,7 @@
13484 */
13485
13486 #include <linux/linkage.h>
13487+#include <asm/alternative-asm.h>
13488
13489 .file "cast5-avx-x86_64-asm_64.S"
13490
13491@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13492 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13493 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13494
13495+ pax_force_retaddr
13496 ret;
13497 ENDPROC(__cast5_enc_blk16)
13498
13499@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13500 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13501 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13502
13503+ pax_force_retaddr
13504 ret;
13505
13506 .L__skip_dec:
13507@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13508 vmovdqu RR4, (6*4*4)(%r11);
13509 vmovdqu RL4, (7*4*4)(%r11);
13510
13511+ pax_force_retaddr
13512 ret;
13513 ENDPROC(cast5_ecb_enc_16way)
13514
13515@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13516 vmovdqu RR4, (6*4*4)(%r11);
13517 vmovdqu RL4, (7*4*4)(%r11);
13518
13519+ pax_force_retaddr
13520 ret;
13521 ENDPROC(cast5_ecb_dec_16way)
13522
13523@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13524 * %rdx: src
13525 */
13526
13527- pushq %r12;
13528+ pushq %r14;
13529
13530 movq %rsi, %r11;
13531- movq %rdx, %r12;
13532+ movq %rdx, %r14;
13533
13534 vmovdqu (0*16)(%rdx), RL1;
13535 vmovdqu (1*16)(%rdx), RR1;
13536@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13537 call __cast5_dec_blk16;
13538
13539 /* xor with src */
13540- vmovq (%r12), RX;
13541+ vmovq (%r14), RX;
13542 vpshufd $0x4f, RX, RX;
13543 vpxor RX, RR1, RR1;
13544- vpxor 0*16+8(%r12), RL1, RL1;
13545- vpxor 1*16+8(%r12), RR2, RR2;
13546- vpxor 2*16+8(%r12), RL2, RL2;
13547- vpxor 3*16+8(%r12), RR3, RR3;
13548- vpxor 4*16+8(%r12), RL3, RL3;
13549- vpxor 5*16+8(%r12), RR4, RR4;
13550- vpxor 6*16+8(%r12), RL4, RL4;
13551+ vpxor 0*16+8(%r14), RL1, RL1;
13552+ vpxor 1*16+8(%r14), RR2, RR2;
13553+ vpxor 2*16+8(%r14), RL2, RL2;
13554+ vpxor 3*16+8(%r14), RR3, RR3;
13555+ vpxor 4*16+8(%r14), RL3, RL3;
13556+ vpxor 5*16+8(%r14), RR4, RR4;
13557+ vpxor 6*16+8(%r14), RL4, RL4;
13558
13559 vmovdqu RR1, (0*16)(%r11);
13560 vmovdqu RL1, (1*16)(%r11);
13561@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13562 vmovdqu RR4, (6*16)(%r11);
13563 vmovdqu RL4, (7*16)(%r11);
13564
13565- popq %r12;
13566+ popq %r14;
13567
13568+ pax_force_retaddr
13569 ret;
13570 ENDPROC(cast5_cbc_dec_16way)
13571
13572@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13573 * %rcx: iv (big endian, 64bit)
13574 */
13575
13576- pushq %r12;
13577+ pushq %r14;
13578
13579 movq %rsi, %r11;
13580- movq %rdx, %r12;
13581+ movq %rdx, %r14;
13582
13583 vpcmpeqd RTMP, RTMP, RTMP;
13584 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13585@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13586 call __cast5_enc_blk16;
13587
13588 /* dst = src ^ iv */
13589- vpxor (0*16)(%r12), RR1, RR1;
13590- vpxor (1*16)(%r12), RL1, RL1;
13591- vpxor (2*16)(%r12), RR2, RR2;
13592- vpxor (3*16)(%r12), RL2, RL2;
13593- vpxor (4*16)(%r12), RR3, RR3;
13594- vpxor (5*16)(%r12), RL3, RL3;
13595- vpxor (6*16)(%r12), RR4, RR4;
13596- vpxor (7*16)(%r12), RL4, RL4;
13597+ vpxor (0*16)(%r14), RR1, RR1;
13598+ vpxor (1*16)(%r14), RL1, RL1;
13599+ vpxor (2*16)(%r14), RR2, RR2;
13600+ vpxor (3*16)(%r14), RL2, RL2;
13601+ vpxor (4*16)(%r14), RR3, RR3;
13602+ vpxor (5*16)(%r14), RL3, RL3;
13603+ vpxor (6*16)(%r14), RR4, RR4;
13604+ vpxor (7*16)(%r14), RL4, RL4;
13605 vmovdqu RR1, (0*16)(%r11);
13606 vmovdqu RL1, (1*16)(%r11);
13607 vmovdqu RR2, (2*16)(%r11);
13608@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13609 vmovdqu RR4, (6*16)(%r11);
13610 vmovdqu RL4, (7*16)(%r11);
13611
13612- popq %r12;
13613+ popq %r14;
13614
13615+ pax_force_retaddr
13616 ret;
13617 ENDPROC(cast5_ctr_16way)
13618diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13619index e3531f8..e123f35 100644
13620--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13621+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13622@@ -24,6 +24,7 @@
13623 */
13624
13625 #include <linux/linkage.h>
13626+#include <asm/alternative-asm.h>
13627 #include "glue_helper-asm-avx.S"
13628
13629 .file "cast6-avx-x86_64-asm_64.S"
13630@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13631 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13632 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13633
13634+ pax_force_retaddr
13635 ret;
13636 ENDPROC(__cast6_enc_blk8)
13637
13638@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13639 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13640 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13641
13642+ pax_force_retaddr
13643 ret;
13644 ENDPROC(__cast6_dec_blk8)
13645
13646@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13647
13648 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13649
13650+ pax_force_retaddr
13651 ret;
13652 ENDPROC(cast6_ecb_enc_8way)
13653
13654@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13655
13656 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13657
13658+ pax_force_retaddr
13659 ret;
13660 ENDPROC(cast6_ecb_dec_8way)
13661
13662@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13663 * %rdx: src
13664 */
13665
13666- pushq %r12;
13667+ pushq %r14;
13668
13669 movq %rsi, %r11;
13670- movq %rdx, %r12;
13671+ movq %rdx, %r14;
13672
13673 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13674
13675 call __cast6_dec_blk8;
13676
13677- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13678+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13679
13680- popq %r12;
13681+ popq %r14;
13682
13683+ pax_force_retaddr
13684 ret;
13685 ENDPROC(cast6_cbc_dec_8way)
13686
13687@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13688 * %rcx: iv (little endian, 128bit)
13689 */
13690
13691- pushq %r12;
13692+ pushq %r14;
13693
13694 movq %rsi, %r11;
13695- movq %rdx, %r12;
13696+ movq %rdx, %r14;
13697
13698 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13699 RD2, RX, RKR, RKM);
13700
13701 call __cast6_enc_blk8;
13702
13703- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13704+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13705
13706- popq %r12;
13707+ popq %r14;
13708
13709+ pax_force_retaddr
13710 ret;
13711 ENDPROC(cast6_ctr_8way)
13712
13713@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13714 /* dst <= regs xor IVs(in dst) */
13715 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13716
13717+ pax_force_retaddr
13718 ret;
13719 ENDPROC(cast6_xts_enc_8way)
13720
13721@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13722 /* dst <= regs xor IVs(in dst) */
13723 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13724
13725+ pax_force_retaddr
13726 ret;
13727 ENDPROC(cast6_xts_dec_8way)
13728diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13729index dbc4339..de6e120 100644
13730--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13731+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13732@@ -45,6 +45,7 @@
13733
13734 #include <asm/inst.h>
13735 #include <linux/linkage.h>
13736+#include <asm/alternative-asm.h>
13737
13738 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13739
13740@@ -312,6 +313,7 @@ do_return:
13741 popq %rsi
13742 popq %rdi
13743 popq %rbx
13744+ pax_force_retaddr
13745 ret
13746
13747 ################################################################
13748diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13749index 185fad4..ff4cd36 100644
13750--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13751+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13752@@ -18,6 +18,7 @@
13753
13754 #include <linux/linkage.h>
13755 #include <asm/inst.h>
13756+#include <asm/alternative-asm.h>
13757
13758 .data
13759
13760@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
13761 psrlq $1, T2
13762 pxor T2, T1
13763 pxor T1, DATA
13764+ pax_force_retaddr
13765 ret
13766 ENDPROC(__clmul_gf128mul_ble)
13767
13768@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
13769 call __clmul_gf128mul_ble
13770 PSHUFB_XMM BSWAP DATA
13771 movups DATA, (%rdi)
13772+ pax_force_retaddr
13773 ret
13774 ENDPROC(clmul_ghash_mul)
13775
13776@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
13777 PSHUFB_XMM BSWAP DATA
13778 movups DATA, (%rdi)
13779 .Lupdate_just_ret:
13780+ pax_force_retaddr
13781 ret
13782 ENDPROC(clmul_ghash_update)
13783diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13784index 9279e0b..c4b3d2c 100644
13785--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
13786+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
13787@@ -1,4 +1,5 @@
13788 #include <linux/linkage.h>
13789+#include <asm/alternative-asm.h>
13790
13791 # enter salsa20_encrypt_bytes
13792 ENTRY(salsa20_encrypt_bytes)
13793@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
13794 add %r11,%rsp
13795 mov %rdi,%rax
13796 mov %rsi,%rdx
13797+ pax_force_retaddr
13798 ret
13799 # bytesatleast65:
13800 ._bytesatleast65:
13801@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
13802 add %r11,%rsp
13803 mov %rdi,%rax
13804 mov %rsi,%rdx
13805+ pax_force_retaddr
13806 ret
13807 ENDPROC(salsa20_keysetup)
13808
13809@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
13810 add %r11,%rsp
13811 mov %rdi,%rax
13812 mov %rsi,%rdx
13813+ pax_force_retaddr
13814 ret
13815 ENDPROC(salsa20_ivsetup)
13816diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13817index 2f202f4..d9164d6 100644
13818--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13819+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
13820@@ -24,6 +24,7 @@
13821 */
13822
13823 #include <linux/linkage.h>
13824+#include <asm/alternative-asm.h>
13825 #include "glue_helper-asm-avx.S"
13826
13827 .file "serpent-avx-x86_64-asm_64.S"
13828@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
13829 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13830 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13831
13832+ pax_force_retaddr
13833 ret;
13834 ENDPROC(__serpent_enc_blk8_avx)
13835
13836@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
13837 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13838 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13839
13840+ pax_force_retaddr
13841 ret;
13842 ENDPROC(__serpent_dec_blk8_avx)
13843
13844@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
13845
13846 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13847
13848+ pax_force_retaddr
13849 ret;
13850 ENDPROC(serpent_ecb_enc_8way_avx)
13851
13852@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
13853
13854 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13855
13856+ pax_force_retaddr
13857 ret;
13858 ENDPROC(serpent_ecb_dec_8way_avx)
13859
13860@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
13861
13862 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13863
13864+ pax_force_retaddr
13865 ret;
13866 ENDPROC(serpent_cbc_dec_8way_avx)
13867
13868@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
13869
13870 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13871
13872+ pax_force_retaddr
13873 ret;
13874 ENDPROC(serpent_ctr_8way_avx)
13875
13876@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
13877 /* dst <= regs xor IVs(in dst) */
13878 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13879
13880+ pax_force_retaddr
13881 ret;
13882 ENDPROC(serpent_xts_enc_8way_avx)
13883
13884@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
13885 /* dst <= regs xor IVs(in dst) */
13886 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
13887
13888+ pax_force_retaddr
13889 ret;
13890 ENDPROC(serpent_xts_dec_8way_avx)
13891diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
13892index b222085..abd483c 100644
13893--- a/arch/x86/crypto/serpent-avx2-asm_64.S
13894+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
13895@@ -15,6 +15,7 @@
13896 */
13897
13898 #include <linux/linkage.h>
13899+#include <asm/alternative-asm.h>
13900 #include "glue_helper-asm-avx2.S"
13901
13902 .file "serpent-avx2-asm_64.S"
13903@@ -610,6 +611,7 @@ __serpent_enc_blk16:
13904 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13905 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13906
13907+ pax_force_retaddr
13908 ret;
13909 ENDPROC(__serpent_enc_blk16)
13910
13911@@ -664,6 +666,7 @@ __serpent_dec_blk16:
13912 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13913 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13914
13915+ pax_force_retaddr
13916 ret;
13917 ENDPROC(__serpent_dec_blk16)
13918
13919@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
13920
13921 vzeroupper;
13922
13923+ pax_force_retaddr
13924 ret;
13925 ENDPROC(serpent_ecb_enc_16way)
13926
13927@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
13928
13929 vzeroupper;
13930
13931+ pax_force_retaddr
13932 ret;
13933 ENDPROC(serpent_ecb_dec_16way)
13934
13935@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
13936
13937 vzeroupper;
13938
13939+ pax_force_retaddr
13940 ret;
13941 ENDPROC(serpent_cbc_dec_16way)
13942
13943@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
13944
13945 vzeroupper;
13946
13947+ pax_force_retaddr
13948 ret;
13949 ENDPROC(serpent_ctr_16way)
13950
13951@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
13952
13953 vzeroupper;
13954
13955+ pax_force_retaddr
13956 ret;
13957 ENDPROC(serpent_xts_enc_16way)
13958
13959@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
13960
13961 vzeroupper;
13962
13963+ pax_force_retaddr
13964 ret;
13965 ENDPROC(serpent_xts_dec_16way)
13966diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13967index acc066c..1559cc4 100644
13968--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13969+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
13970@@ -25,6 +25,7 @@
13971 */
13972
13973 #include <linux/linkage.h>
13974+#include <asm/alternative-asm.h>
13975
13976 .file "serpent-sse2-x86_64-asm_64.S"
13977 .text
13978@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
13979 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13980 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13981
13982+ pax_force_retaddr
13983 ret;
13984
13985 .L__enc_xor8:
13986 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
13987 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
13988
13989+ pax_force_retaddr
13990 ret;
13991 ENDPROC(__serpent_enc_blk_8way)
13992
13993@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
13994 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
13995 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
13996
13997+ pax_force_retaddr
13998 ret;
13999 ENDPROC(serpent_dec_blk_8way)
14000diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14001index a410950..9dfe7ad 100644
14002--- a/arch/x86/crypto/sha1_ssse3_asm.S
14003+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14004@@ -29,6 +29,7 @@
14005 */
14006
14007 #include <linux/linkage.h>
14008+#include <asm/alternative-asm.h>
14009
14010 #define CTX %rdi // arg1
14011 #define BUF %rsi // arg2
14012@@ -75,9 +76,9 @@
14013
14014 push %rbx
14015 push %rbp
14016- push %r12
14017+ push %r14
14018
14019- mov %rsp, %r12
14020+ mov %rsp, %r14
14021 sub $64, %rsp # allocate workspace
14022 and $~15, %rsp # align stack
14023
14024@@ -99,11 +100,12 @@
14025 xor %rax, %rax
14026 rep stosq
14027
14028- mov %r12, %rsp # deallocate workspace
14029+ mov %r14, %rsp # deallocate workspace
14030
14031- pop %r12
14032+ pop %r14
14033 pop %rbp
14034 pop %rbx
14035+ pax_force_retaddr
14036 ret
14037
14038 ENDPROC(\name)
14039diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14040index 642f156..51a513c 100644
14041--- a/arch/x86/crypto/sha256-avx-asm.S
14042+++ b/arch/x86/crypto/sha256-avx-asm.S
14043@@ -49,6 +49,7 @@
14044
14045 #ifdef CONFIG_AS_AVX
14046 #include <linux/linkage.h>
14047+#include <asm/alternative-asm.h>
14048
14049 ## assume buffers not aligned
14050 #define VMOVDQ vmovdqu
14051@@ -460,6 +461,7 @@ done_hash:
14052 popq %r13
14053 popq %rbp
14054 popq %rbx
14055+ pax_force_retaddr
14056 ret
14057 ENDPROC(sha256_transform_avx)
14058
14059diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14060index 9e86944..3795e6a 100644
14061--- a/arch/x86/crypto/sha256-avx2-asm.S
14062+++ b/arch/x86/crypto/sha256-avx2-asm.S
14063@@ -50,6 +50,7 @@
14064
14065 #ifdef CONFIG_AS_AVX2
14066 #include <linux/linkage.h>
14067+#include <asm/alternative-asm.h>
14068
14069 ## assume buffers not aligned
14070 #define VMOVDQ vmovdqu
14071@@ -720,6 +721,7 @@ done_hash:
14072 popq %r12
14073 popq %rbp
14074 popq %rbx
14075+ pax_force_retaddr
14076 ret
14077 ENDPROC(sha256_transform_rorx)
14078
14079diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14080index f833b74..8c62a9e 100644
14081--- a/arch/x86/crypto/sha256-ssse3-asm.S
14082+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14083@@ -47,6 +47,7 @@
14084 ########################################################################
14085
14086 #include <linux/linkage.h>
14087+#include <asm/alternative-asm.h>
14088
14089 ## assume buffers not aligned
14090 #define MOVDQ movdqu
14091@@ -471,6 +472,7 @@ done_hash:
14092 popq %rbp
14093 popq %rbx
14094
14095+ pax_force_retaddr
14096 ret
14097 ENDPROC(sha256_transform_ssse3)
14098
14099diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14100index 974dde9..a823ff9 100644
14101--- a/arch/x86/crypto/sha512-avx-asm.S
14102+++ b/arch/x86/crypto/sha512-avx-asm.S
14103@@ -49,6 +49,7 @@
14104
14105 #ifdef CONFIG_AS_AVX
14106 #include <linux/linkage.h>
14107+#include <asm/alternative-asm.h>
14108
14109 .text
14110
14111@@ -364,6 +365,7 @@ updateblock:
14112 mov frame_RSPSAVE(%rsp), %rsp
14113
14114 nowork:
14115+ pax_force_retaddr
14116 ret
14117 ENDPROC(sha512_transform_avx)
14118
14119diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14120index 568b961..ed20c37 100644
14121--- a/arch/x86/crypto/sha512-avx2-asm.S
14122+++ b/arch/x86/crypto/sha512-avx2-asm.S
14123@@ -51,6 +51,7 @@
14124
14125 #ifdef CONFIG_AS_AVX2
14126 #include <linux/linkage.h>
14127+#include <asm/alternative-asm.h>
14128
14129 .text
14130
14131@@ -678,6 +679,7 @@ done_hash:
14132
14133 # Restore Stack Pointer
14134 mov frame_RSPSAVE(%rsp), %rsp
14135+ pax_force_retaddr
14136 ret
14137 ENDPROC(sha512_transform_rorx)
14138
14139diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14140index fb56855..6edd768 100644
14141--- a/arch/x86/crypto/sha512-ssse3-asm.S
14142+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14143@@ -48,6 +48,7 @@
14144 ########################################################################
14145
14146 #include <linux/linkage.h>
14147+#include <asm/alternative-asm.h>
14148
14149 .text
14150
14151@@ -363,6 +364,7 @@ updateblock:
14152 mov frame_RSPSAVE(%rsp), %rsp
14153
14154 nowork:
14155+ pax_force_retaddr
14156 ret
14157 ENDPROC(sha512_transform_ssse3)
14158
14159diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14160index 0505813..b067311 100644
14161--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14162+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14163@@ -24,6 +24,7 @@
14164 */
14165
14166 #include <linux/linkage.h>
14167+#include <asm/alternative-asm.h>
14168 #include "glue_helper-asm-avx.S"
14169
14170 .file "twofish-avx-x86_64-asm_64.S"
14171@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14172 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14173 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14174
14175+ pax_force_retaddr
14176 ret;
14177 ENDPROC(__twofish_enc_blk8)
14178
14179@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14180 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14181 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14182
14183+ pax_force_retaddr
14184 ret;
14185 ENDPROC(__twofish_dec_blk8)
14186
14187@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14188
14189 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14190
14191+ pax_force_retaddr
14192 ret;
14193 ENDPROC(twofish_ecb_enc_8way)
14194
14195@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14196
14197 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14198
14199+ pax_force_retaddr
14200 ret;
14201 ENDPROC(twofish_ecb_dec_8way)
14202
14203@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14204 * %rdx: src
14205 */
14206
14207- pushq %r12;
14208+ pushq %r14;
14209
14210 movq %rsi, %r11;
14211- movq %rdx, %r12;
14212+ movq %rdx, %r14;
14213
14214 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14215
14216 call __twofish_dec_blk8;
14217
14218- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14219+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14220
14221- popq %r12;
14222+ popq %r14;
14223
14224+ pax_force_retaddr
14225 ret;
14226 ENDPROC(twofish_cbc_dec_8way)
14227
14228@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14229 * %rcx: iv (little endian, 128bit)
14230 */
14231
14232- pushq %r12;
14233+ pushq %r14;
14234
14235 movq %rsi, %r11;
14236- movq %rdx, %r12;
14237+ movq %rdx, %r14;
14238
14239 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14240 RD2, RX0, RX1, RY0);
14241
14242 call __twofish_enc_blk8;
14243
14244- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14245+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14246
14247- popq %r12;
14248+ popq %r14;
14249
14250+ pax_force_retaddr
14251 ret;
14252 ENDPROC(twofish_ctr_8way)
14253
14254@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14255 /* dst <= regs xor IVs(in dst) */
14256 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14257
14258+ pax_force_retaddr
14259 ret;
14260 ENDPROC(twofish_xts_enc_8way)
14261
14262@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14263 /* dst <= regs xor IVs(in dst) */
14264 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14265
14266+ pax_force_retaddr
14267 ret;
14268 ENDPROC(twofish_xts_dec_8way)
14269diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14270index 1c3b7ce..02f578d 100644
14271--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14272+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14273@@ -21,6 +21,7 @@
14274 */
14275
14276 #include <linux/linkage.h>
14277+#include <asm/alternative-asm.h>
14278
14279 .file "twofish-x86_64-asm-3way.S"
14280 .text
14281@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14282 popq %r13;
14283 popq %r14;
14284 popq %r15;
14285+ pax_force_retaddr
14286 ret;
14287
14288 .L__enc_xor3:
14289@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14290 popq %r13;
14291 popq %r14;
14292 popq %r15;
14293+ pax_force_retaddr
14294 ret;
14295 ENDPROC(__twofish_enc_blk_3way)
14296
14297@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14298 popq %r13;
14299 popq %r14;
14300 popq %r15;
14301+ pax_force_retaddr
14302 ret;
14303 ENDPROC(twofish_dec_blk_3way)
14304diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14305index a039d21..524b8b2 100644
14306--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14307+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14308@@ -22,6 +22,7 @@
14309
14310 #include <linux/linkage.h>
14311 #include <asm/asm-offsets.h>
14312+#include <asm/alternative-asm.h>
14313
14314 #define a_offset 0
14315 #define b_offset 4
14316@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14317
14318 popq R1
14319 movq $1,%rax
14320+ pax_force_retaddr
14321 ret
14322 ENDPROC(twofish_enc_blk)
14323
14324@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14325
14326 popq R1
14327 movq $1,%rax
14328+ pax_force_retaddr
14329 ret
14330 ENDPROC(twofish_dec_blk)
14331diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14332index d21ff89..6da8e6e 100644
14333--- a/arch/x86/ia32/ia32_aout.c
14334+++ b/arch/x86/ia32/ia32_aout.c
14335@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14336 unsigned long dump_start, dump_size;
14337 struct user32 dump;
14338
14339+ memset(&dump, 0, sizeof(dump));
14340+
14341 fs = get_fs();
14342 set_fs(KERNEL_DS);
14343 has_dumped = 1;
14344diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14345index 2206757..85cbcfa 100644
14346--- a/arch/x86/ia32/ia32_signal.c
14347+++ b/arch/x86/ia32/ia32_signal.c
14348@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14349 if (__get_user(set.sig[0], &frame->sc.oldmask)
14350 || (_COMPAT_NSIG_WORDS > 1
14351 && __copy_from_user((((char *) &set.sig) + 4),
14352- &frame->extramask,
14353+ frame->extramask,
14354 sizeof(frame->extramask))))
14355 goto badframe;
14356
14357@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14358 sp -= frame_size;
14359 /* Align the stack pointer according to the i386 ABI,
14360 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14361- sp = ((sp + 4) & -16ul) - 4;
14362+ sp = ((sp - 12) & -16ul) - 4;
14363 return (void __user *) sp;
14364 }
14365
14366@@ -386,7 +386,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14367 restorer = VDSO32_SYMBOL(current->mm->context.vdso,
14368 sigreturn);
14369 else
14370- restorer = &frame->retcode;
14371+ restorer = frame->retcode;
14372 }
14373
14374 put_user_try {
14375@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14376 * These are actually not used anymore, but left because some
14377 * gdb versions depend on them as a marker.
14378 */
14379- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14380+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14381 } put_user_catch(err);
14382
14383 if (err)
14384@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14385 0xb8,
14386 __NR_ia32_rt_sigreturn,
14387 0x80cd,
14388- 0,
14389+ 0
14390 };
14391
14392 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14393@@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14394
14395 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14396 restorer = ksig->ka.sa.sa_restorer;
14397+ else if (current->mm->context.vdso)
14398+ /* Return stub is in 32bit vsyscall page */
14399+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
14400 else
14401- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
14402- rt_sigreturn);
14403+ restorer = frame->retcode;
14404 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14405
14406 /*
14407 * Not actually used anymore, but left because some gdb
14408 * versions need it.
14409 */
14410- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14411+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14412 } put_user_catch(err);
14413
14414 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14415diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14416index 4299eb0..c0687a7 100644
14417--- a/arch/x86/ia32/ia32entry.S
14418+++ b/arch/x86/ia32/ia32entry.S
14419@@ -15,8 +15,10 @@
14420 #include <asm/irqflags.h>
14421 #include <asm/asm.h>
14422 #include <asm/smap.h>
14423+#include <asm/pgtable.h>
14424 #include <linux/linkage.h>
14425 #include <linux/err.h>
14426+#include <asm/alternative-asm.h>
14427
14428 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14429 #include <linux/elf-em.h>
14430@@ -62,12 +64,12 @@
14431 */
14432 .macro LOAD_ARGS32 offset, _r9=0
14433 .if \_r9
14434- movl \offset+16(%rsp),%r9d
14435+ movl \offset+R9(%rsp),%r9d
14436 .endif
14437- movl \offset+40(%rsp),%ecx
14438- movl \offset+48(%rsp),%edx
14439- movl \offset+56(%rsp),%esi
14440- movl \offset+64(%rsp),%edi
14441+ movl \offset+RCX(%rsp),%ecx
14442+ movl \offset+RDX(%rsp),%edx
14443+ movl \offset+RSI(%rsp),%esi
14444+ movl \offset+RDI(%rsp),%edi
14445 movl %eax,%eax /* zero extension */
14446 .endm
14447
14448@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14449 ENDPROC(native_irq_enable_sysexit)
14450 #endif
14451
14452+ .macro pax_enter_kernel_user
14453+ pax_set_fptr_mask
14454+#ifdef CONFIG_PAX_MEMORY_UDEREF
14455+ call pax_enter_kernel_user
14456+#endif
14457+ .endm
14458+
14459+ .macro pax_exit_kernel_user
14460+#ifdef CONFIG_PAX_MEMORY_UDEREF
14461+ call pax_exit_kernel_user
14462+#endif
14463+#ifdef CONFIG_PAX_RANDKSTACK
14464+ pushq %rax
14465+ pushq %r11
14466+ call pax_randomize_kstack
14467+ popq %r11
14468+ popq %rax
14469+#endif
14470+ .endm
14471+
14472+ .macro pax_erase_kstack
14473+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14474+ call pax_erase_kstack
14475+#endif
14476+ .endm
14477+
14478 /*
14479 * 32bit SYSENTER instruction entry.
14480 *
14481@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14482 CFI_REGISTER rsp,rbp
14483 SWAPGS_UNSAFE_STACK
14484 movq PER_CPU_VAR(kernel_stack), %rsp
14485- addq $(KERNEL_STACK_OFFSET),%rsp
14486- /*
14487- * No need to follow this irqs on/off section: the syscall
14488- * disabled irqs, here we enable it straight after entry:
14489- */
14490- ENABLE_INTERRUPTS(CLBR_NONE)
14491 movl %ebp,%ebp /* zero extension */
14492 pushq_cfi $__USER32_DS
14493 /*CFI_REL_OFFSET ss,0*/
14494@@ -135,24 +157,49 @@ ENTRY(ia32_sysenter_target)
14495 CFI_REL_OFFSET rsp,0
14496 pushfq_cfi
14497 /*CFI_REL_OFFSET rflags,0*/
14498- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14499- CFI_REGISTER rip,r10
14500+ orl $X86_EFLAGS_IF,(%rsp)
14501+ GET_THREAD_INFO(%r11)
14502+ movl TI_sysenter_return(%r11), %r11d
14503+ CFI_REGISTER rip,r11
14504 pushq_cfi $__USER32_CS
14505 /*CFI_REL_OFFSET cs,0*/
14506 movl %eax, %eax
14507- pushq_cfi %r10
14508+ pushq_cfi %r11
14509 CFI_REL_OFFSET rip,0
14510 pushq_cfi %rax
14511 cld
14512 SAVE_ARGS 0,1,0
14513+ pax_enter_kernel_user
14514+
14515+#ifdef CONFIG_PAX_RANDKSTACK
14516+ pax_erase_kstack
14517+#endif
14518+
14519+ /*
14520+ * No need to follow this irqs on/off section: the syscall
14521+ * disabled irqs, here we enable it straight after entry:
14522+ */
14523+ ENABLE_INTERRUPTS(CLBR_NONE)
14524 /* no need to do an access_ok check here because rbp has been
14525 32bit zero extended */
14526+
14527+#ifdef CONFIG_PAX_MEMORY_UDEREF
14528+ addq pax_user_shadow_base,%rbp
14529+ ASM_PAX_OPEN_USERLAND
14530+#endif
14531+
14532 ASM_STAC
14533 1: movl (%rbp),%ebp
14534 _ASM_EXTABLE(1b,ia32_badarg)
14535 ASM_CLAC
14536- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14537- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14538+
14539+#ifdef CONFIG_PAX_MEMORY_UDEREF
14540+ ASM_PAX_CLOSE_USERLAND
14541+#endif
14542+
14543+ GET_THREAD_INFO(%r11)
14544+ orl $TS_COMPAT,TI_status(%r11)
14545+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14546 CFI_REMEMBER_STATE
14547 jnz sysenter_tracesys
14548 cmpq $(IA32_NR_syscalls-1),%rax
14549@@ -162,15 +209,18 @@ sysenter_do_call:
14550 sysenter_dispatch:
14551 call *ia32_sys_call_table(,%rax,8)
14552 movq %rax,RAX-ARGOFFSET(%rsp)
14553+ GET_THREAD_INFO(%r11)
14554 DISABLE_INTERRUPTS(CLBR_NONE)
14555 TRACE_IRQS_OFF
14556- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14557+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14558 jnz sysexit_audit
14559 sysexit_from_sys_call:
14560- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14561+ pax_exit_kernel_user
14562+ pax_erase_kstack
14563+ andl $~TS_COMPAT,TI_status(%r11)
14564 /* clear IF, that popfq doesn't enable interrupts early */
14565- andl $~0x200,EFLAGS-R11(%rsp)
14566- movl RIP-R11(%rsp),%edx /* User %eip */
14567+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14568+ movl RIP(%rsp),%edx /* User %eip */
14569 CFI_REGISTER rip,rdx
14570 RESTORE_ARGS 0,24,0,0,0,0
14571 xorq %r8,%r8
14572@@ -193,6 +243,9 @@ sysexit_from_sys_call:
14573 movl %eax,%esi /* 2nd arg: syscall number */
14574 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
14575 call __audit_syscall_entry
14576+
14577+ pax_erase_kstack
14578+
14579 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14580 cmpq $(IA32_NR_syscalls-1),%rax
14581 ja ia32_badsys
14582@@ -204,7 +257,7 @@ sysexit_from_sys_call:
14583 .endm
14584
14585 .macro auditsys_exit exit
14586- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14587+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14588 jnz ia32_ret_from_sys_call
14589 TRACE_IRQS_ON
14590 ENABLE_INTERRUPTS(CLBR_NONE)
14591@@ -215,11 +268,12 @@ sysexit_from_sys_call:
14592 1: setbe %al /* 1 if error, 0 if not */
14593 movzbl %al,%edi /* zero-extend that into %edi */
14594 call __audit_syscall_exit
14595+ GET_THREAD_INFO(%r11)
14596 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14597 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14598 DISABLE_INTERRUPTS(CLBR_NONE)
14599 TRACE_IRQS_OFF
14600- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14601+ testl %edi,TI_flags(%r11)
14602 jz \exit
14603 CLEAR_RREGS -ARGOFFSET
14604 jmp int_with_check
14605@@ -237,7 +291,7 @@ sysexit_audit:
14606
14607 sysenter_tracesys:
14608 #ifdef CONFIG_AUDITSYSCALL
14609- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14610+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14611 jz sysenter_auditsys
14612 #endif
14613 SAVE_REST
14614@@ -249,6 +303,9 @@ sysenter_tracesys:
14615 RESTORE_REST
14616 cmpq $(IA32_NR_syscalls-1),%rax
14617 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14618+
14619+ pax_erase_kstack
14620+
14621 jmp sysenter_do_call
14622 CFI_ENDPROC
14623 ENDPROC(ia32_sysenter_target)
14624@@ -276,19 +333,25 @@ ENDPROC(ia32_sysenter_target)
14625 ENTRY(ia32_cstar_target)
14626 CFI_STARTPROC32 simple
14627 CFI_SIGNAL_FRAME
14628- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14629+ CFI_DEF_CFA rsp,0
14630 CFI_REGISTER rip,rcx
14631 /*CFI_REGISTER rflags,r11*/
14632 SWAPGS_UNSAFE_STACK
14633 movl %esp,%r8d
14634 CFI_REGISTER rsp,r8
14635 movq PER_CPU_VAR(kernel_stack),%rsp
14636+ SAVE_ARGS 8*6,0,0
14637+ pax_enter_kernel_user
14638+
14639+#ifdef CONFIG_PAX_RANDKSTACK
14640+ pax_erase_kstack
14641+#endif
14642+
14643 /*
14644 * No need to follow this irqs on/off section: the syscall
14645 * disabled irqs and here we enable it straight after entry:
14646 */
14647 ENABLE_INTERRUPTS(CLBR_NONE)
14648- SAVE_ARGS 8,0,0
14649 movl %eax,%eax /* zero extension */
14650 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14651 movq %rcx,RIP-ARGOFFSET(%rsp)
14652@@ -304,12 +367,25 @@ ENTRY(ia32_cstar_target)
14653 /* no need to do an access_ok check here because r8 has been
14654 32bit zero extended */
14655 /* hardware stack frame is complete now */
14656+
14657+#ifdef CONFIG_PAX_MEMORY_UDEREF
14658+ ASM_PAX_OPEN_USERLAND
14659+ movq pax_user_shadow_base,%r8
14660+ addq RSP-ARGOFFSET(%rsp),%r8
14661+#endif
14662+
14663 ASM_STAC
14664 1: movl (%r8),%r9d
14665 _ASM_EXTABLE(1b,ia32_badarg)
14666 ASM_CLAC
14667- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14668- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14669+
14670+#ifdef CONFIG_PAX_MEMORY_UDEREF
14671+ ASM_PAX_CLOSE_USERLAND
14672+#endif
14673+
14674+ GET_THREAD_INFO(%r11)
14675+ orl $TS_COMPAT,TI_status(%r11)
14676+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14677 CFI_REMEMBER_STATE
14678 jnz cstar_tracesys
14679 cmpq $IA32_NR_syscalls-1,%rax
14680@@ -319,13 +395,16 @@ cstar_do_call:
14681 cstar_dispatch:
14682 call *ia32_sys_call_table(,%rax,8)
14683 movq %rax,RAX-ARGOFFSET(%rsp)
14684+ GET_THREAD_INFO(%r11)
14685 DISABLE_INTERRUPTS(CLBR_NONE)
14686 TRACE_IRQS_OFF
14687- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14688+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14689 jnz sysretl_audit
14690 sysretl_from_sys_call:
14691- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14692- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14693+ pax_exit_kernel_user
14694+ pax_erase_kstack
14695+ andl $~TS_COMPAT,TI_status(%r11)
14696+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14697 movl RIP-ARGOFFSET(%rsp),%ecx
14698 CFI_REGISTER rip,rcx
14699 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14700@@ -352,7 +431,7 @@ sysretl_audit:
14701
14702 cstar_tracesys:
14703 #ifdef CONFIG_AUDITSYSCALL
14704- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14705+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14706 jz cstar_auditsys
14707 #endif
14708 xchgl %r9d,%ebp
14709@@ -366,11 +445,19 @@ cstar_tracesys:
14710 xchgl %ebp,%r9d
14711 cmpq $(IA32_NR_syscalls-1),%rax
14712 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14713+
14714+ pax_erase_kstack
14715+
14716 jmp cstar_do_call
14717 END(ia32_cstar_target)
14718
14719 ia32_badarg:
14720 ASM_CLAC
14721+
14722+#ifdef CONFIG_PAX_MEMORY_UDEREF
14723+ ASM_PAX_CLOSE_USERLAND
14724+#endif
14725+
14726 movq $-EFAULT,%rax
14727 jmp ia32_sysret
14728 CFI_ENDPROC
14729@@ -407,19 +494,26 @@ ENTRY(ia32_syscall)
14730 CFI_REL_OFFSET rip,RIP-RIP
14731 PARAVIRT_ADJUST_EXCEPTION_FRAME
14732 SWAPGS
14733- /*
14734- * No need to follow this irqs on/off section: the syscall
14735- * disabled irqs and here we enable it straight after entry:
14736- */
14737- ENABLE_INTERRUPTS(CLBR_NONE)
14738 movl %eax,%eax
14739 pushq_cfi %rax
14740 cld
14741 /* note the registers are not zero extended to the sf.
14742 this could be a problem. */
14743 SAVE_ARGS 0,1,0
14744- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14745- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14746+ pax_enter_kernel_user
14747+
14748+#ifdef CONFIG_PAX_RANDKSTACK
14749+ pax_erase_kstack
14750+#endif
14751+
14752+ /*
14753+ * No need to follow this irqs on/off section: the syscall
14754+ * disabled irqs and here we enable it straight after entry:
14755+ */
14756+ ENABLE_INTERRUPTS(CLBR_NONE)
14757+ GET_THREAD_INFO(%r11)
14758+ orl $TS_COMPAT,TI_status(%r11)
14759+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14760 jnz ia32_tracesys
14761 cmpq $(IA32_NR_syscalls-1),%rax
14762 ja ia32_badsys
14763@@ -442,6 +536,9 @@ ia32_tracesys:
14764 RESTORE_REST
14765 cmpq $(IA32_NR_syscalls-1),%rax
14766 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
14767+
14768+ pax_erase_kstack
14769+
14770 jmp ia32_do_call
14771 END(ia32_syscall)
14772
14773diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
14774index 8e0ceec..af13504 100644
14775--- a/arch/x86/ia32/sys_ia32.c
14776+++ b/arch/x86/ia32/sys_ia32.c
14777@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
14778 */
14779 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
14780 {
14781- typeof(ubuf->st_uid) uid = 0;
14782- typeof(ubuf->st_gid) gid = 0;
14783+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
14784+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
14785 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
14786 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
14787 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
14788diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
14789index 372231c..51b537d 100644
14790--- a/arch/x86/include/asm/alternative-asm.h
14791+++ b/arch/x86/include/asm/alternative-asm.h
14792@@ -18,6 +18,45 @@
14793 .endm
14794 #endif
14795
14796+#ifdef KERNEXEC_PLUGIN
14797+ .macro pax_force_retaddr_bts rip=0
14798+ btsq $63,\rip(%rsp)
14799+ .endm
14800+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
14801+ .macro pax_force_retaddr rip=0, reload=0
14802+ btsq $63,\rip(%rsp)
14803+ .endm
14804+ .macro pax_force_fptr ptr
14805+ btsq $63,\ptr
14806+ .endm
14807+ .macro pax_set_fptr_mask
14808+ .endm
14809+#endif
14810+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14811+ .macro pax_force_retaddr rip=0, reload=0
14812+ .if \reload
14813+ pax_set_fptr_mask
14814+ .endif
14815+ orq %r12,\rip(%rsp)
14816+ .endm
14817+ .macro pax_force_fptr ptr
14818+ orq %r12,\ptr
14819+ .endm
14820+ .macro pax_set_fptr_mask
14821+ movabs $0x8000000000000000,%r12
14822+ .endm
14823+#endif
14824+#else
14825+ .macro pax_force_retaddr rip=0, reload=0
14826+ .endm
14827+ .macro pax_force_fptr ptr
14828+ .endm
14829+ .macro pax_force_retaddr_bts rip=0
14830+ .endm
14831+ .macro pax_set_fptr_mask
14832+ .endm
14833+#endif
14834+
14835 .macro altinstruction_entry orig alt feature orig_len alt_len
14836 .long \orig - .
14837 .long \alt - .
14838diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
14839index 0a3f9c9..c9d081d 100644
14840--- a/arch/x86/include/asm/alternative.h
14841+++ b/arch/x86/include/asm/alternative.h
14842@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14843 ".pushsection .discard,\"aw\",@progbits\n" \
14844 DISCARD_ENTRY(1) \
14845 ".popsection\n" \
14846- ".pushsection .altinstr_replacement, \"ax\"\n" \
14847+ ".pushsection .altinstr_replacement, \"a\"\n" \
14848 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
14849 ".popsection"
14850
14851@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
14852 DISCARD_ENTRY(1) \
14853 DISCARD_ENTRY(2) \
14854 ".popsection\n" \
14855- ".pushsection .altinstr_replacement, \"ax\"\n" \
14856+ ".pushsection .altinstr_replacement, \"a\"\n" \
14857 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
14858 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
14859 ".popsection"
14860diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
14861index 19b0eba..12254cd 100644
14862--- a/arch/x86/include/asm/apic.h
14863+++ b/arch/x86/include/asm/apic.h
14864@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
14865
14866 #ifdef CONFIG_X86_LOCAL_APIC
14867
14868-extern unsigned int apic_verbosity;
14869+extern int apic_verbosity;
14870 extern int local_apic_timer_c2_ok;
14871
14872 extern int disable_apic;
14873diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
14874index 20370c6..a2eb9b0 100644
14875--- a/arch/x86/include/asm/apm.h
14876+++ b/arch/x86/include/asm/apm.h
14877@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
14878 __asm__ __volatile__(APM_DO_ZERO_SEGS
14879 "pushl %%edi\n\t"
14880 "pushl %%ebp\n\t"
14881- "lcall *%%cs:apm_bios_entry\n\t"
14882+ "lcall *%%ss:apm_bios_entry\n\t"
14883 "setc %%al\n\t"
14884 "popl %%ebp\n\t"
14885 "popl %%edi\n\t"
14886@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
14887 __asm__ __volatile__(APM_DO_ZERO_SEGS
14888 "pushl %%edi\n\t"
14889 "pushl %%ebp\n\t"
14890- "lcall *%%cs:apm_bios_entry\n\t"
14891+ "lcall *%%ss:apm_bios_entry\n\t"
14892 "setc %%bl\n\t"
14893 "popl %%ebp\n\t"
14894 "popl %%edi\n\t"
14895diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
14896index b17f4f4..9620151 100644
14897--- a/arch/x86/include/asm/atomic.h
14898+++ b/arch/x86/include/asm/atomic.h
14899@@ -23,7 +23,18 @@
14900 */
14901 static inline int atomic_read(const atomic_t *v)
14902 {
14903- return (*(volatile int *)&(v)->counter);
14904+ return (*(volatile const int *)&(v)->counter);
14905+}
14906+
14907+/**
14908+ * atomic_read_unchecked - read atomic variable
14909+ * @v: pointer of type atomic_unchecked_t
14910+ *
14911+ * Atomically reads the value of @v.
14912+ */
14913+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
14914+{
14915+ return (*(volatile const int *)&(v)->counter);
14916 }
14917
14918 /**
14919@@ -39,6 +50,18 @@ static inline void atomic_set(atomic_t *v, int i)
14920 }
14921
14922 /**
14923+ * atomic_set_unchecked - set atomic variable
14924+ * @v: pointer of type atomic_unchecked_t
14925+ * @i: required value
14926+ *
14927+ * Atomically sets the value of @v to @i.
14928+ */
14929+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
14930+{
14931+ v->counter = i;
14932+}
14933+
14934+/**
14935 * atomic_add - add integer to atomic variable
14936 * @i: integer value to add
14937 * @v: pointer of type atomic_t
14938@@ -47,7 +70,29 @@ static inline void atomic_set(atomic_t *v, int i)
14939 */
14940 static inline void atomic_add(int i, atomic_t *v)
14941 {
14942- asm volatile(LOCK_PREFIX "addl %1,%0"
14943+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
14944+
14945+#ifdef CONFIG_PAX_REFCOUNT
14946+ "jno 0f\n"
14947+ LOCK_PREFIX "subl %1,%0\n"
14948+ "int $4\n0:\n"
14949+ _ASM_EXTABLE(0b, 0b)
14950+#endif
14951+
14952+ : "+m" (v->counter)
14953+ : "ir" (i));
14954+}
14955+
14956+/**
14957+ * atomic_add_unchecked - add integer to atomic variable
14958+ * @i: integer value to add
14959+ * @v: pointer of type atomic_unchecked_t
14960+ *
14961+ * Atomically adds @i to @v.
14962+ */
14963+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
14964+{
14965+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
14966 : "+m" (v->counter)
14967 : "ir" (i));
14968 }
14969@@ -61,7 +106,29 @@ static inline void atomic_add(int i, atomic_t *v)
14970 */
14971 static inline void atomic_sub(int i, atomic_t *v)
14972 {
14973- asm volatile(LOCK_PREFIX "subl %1,%0"
14974+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
14975+
14976+#ifdef CONFIG_PAX_REFCOUNT
14977+ "jno 0f\n"
14978+ LOCK_PREFIX "addl %1,%0\n"
14979+ "int $4\n0:\n"
14980+ _ASM_EXTABLE(0b, 0b)
14981+#endif
14982+
14983+ : "+m" (v->counter)
14984+ : "ir" (i));
14985+}
14986+
14987+/**
14988+ * atomic_sub_unchecked - subtract integer from atomic variable
14989+ * @i: integer value to subtract
14990+ * @v: pointer of type atomic_unchecked_t
14991+ *
14992+ * Atomically subtracts @i from @v.
14993+ */
14994+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
14995+{
14996+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
14997 : "+m" (v->counter)
14998 : "ir" (i));
14999 }
15000@@ -77,7 +144,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15001 */
15002 static inline int atomic_sub_and_test(int i, atomic_t *v)
15003 {
15004- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15005+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15006 }
15007
15008 /**
15009@@ -88,7 +155,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15010 */
15011 static inline void atomic_inc(atomic_t *v)
15012 {
15013- asm volatile(LOCK_PREFIX "incl %0"
15014+ asm volatile(LOCK_PREFIX "incl %0\n"
15015+
15016+#ifdef CONFIG_PAX_REFCOUNT
15017+ "jno 0f\n"
15018+ LOCK_PREFIX "decl %0\n"
15019+ "int $4\n0:\n"
15020+ _ASM_EXTABLE(0b, 0b)
15021+#endif
15022+
15023+ : "+m" (v->counter));
15024+}
15025+
15026+/**
15027+ * atomic_inc_unchecked - increment atomic variable
15028+ * @v: pointer of type atomic_unchecked_t
15029+ *
15030+ * Atomically increments @v by 1.
15031+ */
15032+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15033+{
15034+ asm volatile(LOCK_PREFIX "incl %0\n"
15035 : "+m" (v->counter));
15036 }
15037
15038@@ -100,7 +187,27 @@ static inline void atomic_inc(atomic_t *v)
15039 */
15040 static inline void atomic_dec(atomic_t *v)
15041 {
15042- asm volatile(LOCK_PREFIX "decl %0"
15043+ asm volatile(LOCK_PREFIX "decl %0\n"
15044+
15045+#ifdef CONFIG_PAX_REFCOUNT
15046+ "jno 0f\n"
15047+ LOCK_PREFIX "incl %0\n"
15048+ "int $4\n0:\n"
15049+ _ASM_EXTABLE(0b, 0b)
15050+#endif
15051+
15052+ : "+m" (v->counter));
15053+}
15054+
15055+/**
15056+ * atomic_dec_unchecked - decrement atomic variable
15057+ * @v: pointer of type atomic_unchecked_t
15058+ *
15059+ * Atomically decrements @v by 1.
15060+ */
15061+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15062+{
15063+ asm volatile(LOCK_PREFIX "decl %0\n"
15064 : "+m" (v->counter));
15065 }
15066
15067@@ -114,7 +221,7 @@ static inline void atomic_dec(atomic_t *v)
15068 */
15069 static inline int atomic_dec_and_test(atomic_t *v)
15070 {
15071- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15072+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15073 }
15074
15075 /**
15076@@ -127,7 +234,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15077 */
15078 static inline int atomic_inc_and_test(atomic_t *v)
15079 {
15080- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15081+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15082+}
15083+
15084+/**
15085+ * atomic_inc_and_test_unchecked - increment and test
15086+ * @v: pointer of type atomic_unchecked_t
15087+ *
15088+ * Atomically increments @v by 1
15089+ * and returns true if the result is zero, or false for all
15090+ * other cases.
15091+ */
15092+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15093+{
15094+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15095 }
15096
15097 /**
15098@@ -141,7 +261,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15099 */
15100 static inline int atomic_add_negative(int i, atomic_t *v)
15101 {
15102- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15103+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15104 }
15105
15106 /**
15107@@ -153,6 +273,18 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15108 */
15109 static inline int atomic_add_return(int i, atomic_t *v)
15110 {
15111+ return i + xadd_check_overflow(&v->counter, i);
15112+}
15113+
15114+/**
15115+ * atomic_add_return_unchecked - add integer and return
15116+ * @i: integer value to add
15117+ * @v: pointer of type atomic_unchecked_t
15118+ *
15119+ * Atomically adds @i to @v and returns @i + @v
15120+ */
15121+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15122+{
15123 return i + xadd(&v->counter, i);
15124 }
15125
15126@@ -169,9 +301,18 @@ static inline int atomic_sub_return(int i, atomic_t *v)
15127 }
15128
15129 #define atomic_inc_return(v) (atomic_add_return(1, v))
15130+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15131+{
15132+ return atomic_add_return_unchecked(1, v);
15133+}
15134 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15135
15136-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15137+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15138+{
15139+ return cmpxchg(&v->counter, old, new);
15140+}
15141+
15142+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15143 {
15144 return cmpxchg(&v->counter, old, new);
15145 }
15146@@ -181,6 +322,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15147 return xchg(&v->counter, new);
15148 }
15149
15150+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15151+{
15152+ return xchg(&v->counter, new);
15153+}
15154+
15155 /**
15156 * __atomic_add_unless - add unless the number is already a given value
15157 * @v: pointer of type atomic_t
15158@@ -190,14 +336,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15159 * Atomically adds @a to @v, so long as @v was not already @u.
15160 * Returns the old value of @v.
15161 */
15162-static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15163+static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15164 {
15165- int c, old;
15166+ int c, old, new;
15167 c = atomic_read(v);
15168 for (;;) {
15169- if (unlikely(c == (u)))
15170+ if (unlikely(c == u))
15171 break;
15172- old = atomic_cmpxchg((v), c, c + (a));
15173+
15174+ asm volatile("addl %2,%0\n"
15175+
15176+#ifdef CONFIG_PAX_REFCOUNT
15177+ "jno 0f\n"
15178+ "subl %2,%0\n"
15179+ "int $4\n0:\n"
15180+ _ASM_EXTABLE(0b, 0b)
15181+#endif
15182+
15183+ : "=r" (new)
15184+ : "0" (c), "ir" (a));
15185+
15186+ old = atomic_cmpxchg(v, c, new);
15187 if (likely(old == c))
15188 break;
15189 c = old;
15190@@ -206,6 +365,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15191 }
15192
15193 /**
15194+ * atomic_inc_not_zero_hint - increment if not null
15195+ * @v: pointer of type atomic_t
15196+ * @hint: probable value of the atomic before the increment
15197+ *
15198+ * This version of atomic_inc_not_zero() gives a hint of probable
15199+ * value of the atomic. This helps processor to not read the memory
15200+ * before doing the atomic read/modify/write cycle, lowering
15201+ * number of bus transactions on some arches.
15202+ *
15203+ * Returns: 0 if increment was not done, 1 otherwise.
15204+ */
15205+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15206+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15207+{
15208+ int val, c = hint, new;
15209+
15210+ /* sanity test, should be removed by compiler if hint is a constant */
15211+ if (!hint)
15212+ return __atomic_add_unless(v, 1, 0);
15213+
15214+ do {
15215+ asm volatile("incl %0\n"
15216+
15217+#ifdef CONFIG_PAX_REFCOUNT
15218+ "jno 0f\n"
15219+ "decl %0\n"
15220+ "int $4\n0:\n"
15221+ _ASM_EXTABLE(0b, 0b)
15222+#endif
15223+
15224+ : "=r" (new)
15225+ : "0" (c));
15226+
15227+ val = atomic_cmpxchg(v, c, new);
15228+ if (val == c)
15229+ return 1;
15230+ c = val;
15231+ } while (c);
15232+
15233+ return 0;
15234+}
15235+
15236+/**
15237 * atomic_inc_short - increment of a short integer
15238 * @v: pointer to type int
15239 *
15240@@ -234,14 +436,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
15241 #endif
15242
15243 /* These are x86-specific, used by some header files */
15244-#define atomic_clear_mask(mask, addr) \
15245- asm volatile(LOCK_PREFIX "andl %0,%1" \
15246- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15247+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15248+{
15249+ asm volatile(LOCK_PREFIX "andl %1,%0"
15250+ : "+m" (v->counter)
15251+ : "r" (~(mask))
15252+ : "memory");
15253+}
15254
15255-#define atomic_set_mask(mask, addr) \
15256- asm volatile(LOCK_PREFIX "orl %0,%1" \
15257- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15258- : "memory")
15259+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15260+{
15261+ asm volatile(LOCK_PREFIX "andl %1,%0"
15262+ : "+m" (v->counter)
15263+ : "r" (~(mask))
15264+ : "memory");
15265+}
15266+
15267+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15268+{
15269+ asm volatile(LOCK_PREFIX "orl %1,%0"
15270+ : "+m" (v->counter)
15271+ : "r" (mask)
15272+ : "memory");
15273+}
15274+
15275+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15276+{
15277+ asm volatile(LOCK_PREFIX "orl %1,%0"
15278+ : "+m" (v->counter)
15279+ : "r" (mask)
15280+ : "memory");
15281+}
15282
15283 /* Atomic operations are already serializing on x86 */
15284 #define smp_mb__before_atomic_dec() barrier()
15285diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15286index b154de7..bf18a5a 100644
15287--- a/arch/x86/include/asm/atomic64_32.h
15288+++ b/arch/x86/include/asm/atomic64_32.h
15289@@ -12,6 +12,14 @@ typedef struct {
15290 u64 __aligned(8) counter;
15291 } atomic64_t;
15292
15293+#ifdef CONFIG_PAX_REFCOUNT
15294+typedef struct {
15295+ u64 __aligned(8) counter;
15296+} atomic64_unchecked_t;
15297+#else
15298+typedef atomic64_t atomic64_unchecked_t;
15299+#endif
15300+
15301 #define ATOMIC64_INIT(val) { (val) }
15302
15303 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15304@@ -37,21 +45,31 @@ typedef struct {
15305 ATOMIC64_DECL_ONE(sym##_386)
15306
15307 ATOMIC64_DECL_ONE(add_386);
15308+ATOMIC64_DECL_ONE(add_unchecked_386);
15309 ATOMIC64_DECL_ONE(sub_386);
15310+ATOMIC64_DECL_ONE(sub_unchecked_386);
15311 ATOMIC64_DECL_ONE(inc_386);
15312+ATOMIC64_DECL_ONE(inc_unchecked_386);
15313 ATOMIC64_DECL_ONE(dec_386);
15314+ATOMIC64_DECL_ONE(dec_unchecked_386);
15315 #endif
15316
15317 #define alternative_atomic64(f, out, in...) \
15318 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15319
15320 ATOMIC64_DECL(read);
15321+ATOMIC64_DECL(read_unchecked);
15322 ATOMIC64_DECL(set);
15323+ATOMIC64_DECL(set_unchecked);
15324 ATOMIC64_DECL(xchg);
15325 ATOMIC64_DECL(add_return);
15326+ATOMIC64_DECL(add_return_unchecked);
15327 ATOMIC64_DECL(sub_return);
15328+ATOMIC64_DECL(sub_return_unchecked);
15329 ATOMIC64_DECL(inc_return);
15330+ATOMIC64_DECL(inc_return_unchecked);
15331 ATOMIC64_DECL(dec_return);
15332+ATOMIC64_DECL(dec_return_unchecked);
15333 ATOMIC64_DECL(dec_if_positive);
15334 ATOMIC64_DECL(inc_not_zero);
15335 ATOMIC64_DECL(add_unless);
15336@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15337 }
15338
15339 /**
15340+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15341+ * @p: pointer to type atomic64_unchecked_t
15342+ * @o: expected value
15343+ * @n: new value
15344+ *
15345+ * Atomically sets @v to @n if it was equal to @o and returns
15346+ * the old value.
15347+ */
15348+
15349+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15350+{
15351+ return cmpxchg64(&v->counter, o, n);
15352+}
15353+
15354+/**
15355 * atomic64_xchg - xchg atomic64 variable
15356 * @v: pointer to type atomic64_t
15357 * @n: value to assign
15358@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15359 }
15360
15361 /**
15362+ * atomic64_set_unchecked - set atomic64 variable
15363+ * @v: pointer to type atomic64_unchecked_t
15364+ * @n: value to assign
15365+ *
15366+ * Atomically sets the value of @v to @n.
15367+ */
15368+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15369+{
15370+ unsigned high = (unsigned)(i >> 32);
15371+ unsigned low = (unsigned)i;
15372+ alternative_atomic64(set, /* no output */,
15373+ "S" (v), "b" (low), "c" (high)
15374+ : "eax", "edx", "memory");
15375+}
15376+
15377+/**
15378 * atomic64_read - read atomic64 variable
15379 * @v: pointer to type atomic64_t
15380 *
15381@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15382 }
15383
15384 /**
15385+ * atomic64_read_unchecked - read atomic64 variable
15386+ * @v: pointer to type atomic64_unchecked_t
15387+ *
15388+ * Atomically reads the value of @v and returns it.
15389+ */
15390+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15391+{
15392+ long long r;
15393+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15394+ return r;
15395+ }
15396+
15397+/**
15398 * atomic64_add_return - add and return
15399 * @i: integer value to add
15400 * @v: pointer to type atomic64_t
15401@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15402 return i;
15403 }
15404
15405+/**
15406+ * atomic64_add_return_unchecked - add and return
15407+ * @i: integer value to add
15408+ * @v: pointer to type atomic64_unchecked_t
15409+ *
15410+ * Atomically adds @i to @v and returns @i + *@v
15411+ */
15412+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15413+{
15414+ alternative_atomic64(add_return_unchecked,
15415+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15416+ ASM_NO_INPUT_CLOBBER("memory"));
15417+ return i;
15418+}
15419+
15420 /*
15421 * Other variants with different arithmetic operators:
15422 */
15423@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15424 return a;
15425 }
15426
15427+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15428+{
15429+ long long a;
15430+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15431+ "S" (v) : "memory", "ecx");
15432+ return a;
15433+}
15434+
15435 static inline long long atomic64_dec_return(atomic64_t *v)
15436 {
15437 long long a;
15438@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15439 }
15440
15441 /**
15442+ * atomic64_add_unchecked - add integer to atomic64 variable
15443+ * @i: integer value to add
15444+ * @v: pointer to type atomic64_unchecked_t
15445+ *
15446+ * Atomically adds @i to @v.
15447+ */
15448+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15449+{
15450+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15451+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15452+ ASM_NO_INPUT_CLOBBER("memory"));
15453+ return i;
15454+}
15455+
15456+/**
15457 * atomic64_sub - subtract the atomic64 variable
15458 * @i: integer value to subtract
15459 * @v: pointer to type atomic64_t
15460diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15461index 46e9052..ae45136 100644
15462--- a/arch/x86/include/asm/atomic64_64.h
15463+++ b/arch/x86/include/asm/atomic64_64.h
15464@@ -18,7 +18,19 @@
15465 */
15466 static inline long atomic64_read(const atomic64_t *v)
15467 {
15468- return (*(volatile long *)&(v)->counter);
15469+ return (*(volatile const long *)&(v)->counter);
15470+}
15471+
15472+/**
15473+ * atomic64_read_unchecked - read atomic64 variable
15474+ * @v: pointer of type atomic64_unchecked_t
15475+ *
15476+ * Atomically reads the value of @v.
15477+ * Doesn't imply a read memory barrier.
15478+ */
15479+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15480+{
15481+ return (*(volatile const long *)&(v)->counter);
15482 }
15483
15484 /**
15485@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15486 }
15487
15488 /**
15489+ * atomic64_set_unchecked - set atomic64 variable
15490+ * @v: pointer to type atomic64_unchecked_t
15491+ * @i: required value
15492+ *
15493+ * Atomically sets the value of @v to @i.
15494+ */
15495+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15496+{
15497+ v->counter = i;
15498+}
15499+
15500+/**
15501 * atomic64_add - add integer to atomic64 variable
15502 * @i: integer value to add
15503 * @v: pointer to type atomic64_t
15504@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15505 */
15506 static inline void atomic64_add(long i, atomic64_t *v)
15507 {
15508+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15509+
15510+#ifdef CONFIG_PAX_REFCOUNT
15511+ "jno 0f\n"
15512+ LOCK_PREFIX "subq %1,%0\n"
15513+ "int $4\n0:\n"
15514+ _ASM_EXTABLE(0b, 0b)
15515+#endif
15516+
15517+ : "=m" (v->counter)
15518+ : "er" (i), "m" (v->counter));
15519+}
15520+
15521+/**
15522+ * atomic64_add_unchecked - add integer to atomic64 variable
15523+ * @i: integer value to add
15524+ * @v: pointer to type atomic64_unchecked_t
15525+ *
15526+ * Atomically adds @i to @v.
15527+ */
15528+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15529+{
15530 asm volatile(LOCK_PREFIX "addq %1,%0"
15531 : "=m" (v->counter)
15532 : "er" (i), "m" (v->counter));
15533@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15534 */
15535 static inline void atomic64_sub(long i, atomic64_t *v)
15536 {
15537- asm volatile(LOCK_PREFIX "subq %1,%0"
15538+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15539+
15540+#ifdef CONFIG_PAX_REFCOUNT
15541+ "jno 0f\n"
15542+ LOCK_PREFIX "addq %1,%0\n"
15543+ "int $4\n0:\n"
15544+ _ASM_EXTABLE(0b, 0b)
15545+#endif
15546+
15547+ : "=m" (v->counter)
15548+ : "er" (i), "m" (v->counter));
15549+}
15550+
15551+/**
15552+ * atomic64_sub_unchecked - subtract the atomic64 variable
15553+ * @i: integer value to subtract
15554+ * @v: pointer to type atomic64_unchecked_t
15555+ *
15556+ * Atomically subtracts @i from @v.
15557+ */
15558+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15559+{
15560+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15561 : "=m" (v->counter)
15562 : "er" (i), "m" (v->counter));
15563 }
15564@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15565 */
15566 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15567 {
15568- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15569+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15570 }
15571
15572 /**
15573@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15574 */
15575 static inline void atomic64_inc(atomic64_t *v)
15576 {
15577+ asm volatile(LOCK_PREFIX "incq %0\n"
15578+
15579+#ifdef CONFIG_PAX_REFCOUNT
15580+ "jno 0f\n"
15581+ LOCK_PREFIX "decq %0\n"
15582+ "int $4\n0:\n"
15583+ _ASM_EXTABLE(0b, 0b)
15584+#endif
15585+
15586+ : "=m" (v->counter)
15587+ : "m" (v->counter));
15588+}
15589+
15590+/**
15591+ * atomic64_inc_unchecked - increment atomic64 variable
15592+ * @v: pointer to type atomic64_unchecked_t
15593+ *
15594+ * Atomically increments @v by 1.
15595+ */
15596+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15597+{
15598 asm volatile(LOCK_PREFIX "incq %0"
15599 : "=m" (v->counter)
15600 : "m" (v->counter));
15601@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15602 */
15603 static inline void atomic64_dec(atomic64_t *v)
15604 {
15605- asm volatile(LOCK_PREFIX "decq %0"
15606+ asm volatile(LOCK_PREFIX "decq %0\n"
15607+
15608+#ifdef CONFIG_PAX_REFCOUNT
15609+ "jno 0f\n"
15610+ LOCK_PREFIX "incq %0\n"
15611+ "int $4\n0:\n"
15612+ _ASM_EXTABLE(0b, 0b)
15613+#endif
15614+
15615+ : "=m" (v->counter)
15616+ : "m" (v->counter));
15617+}
15618+
15619+/**
15620+ * atomic64_dec_unchecked - decrement atomic64 variable
15621+ * @v: pointer to type atomic64_t
15622+ *
15623+ * Atomically decrements @v by 1.
15624+ */
15625+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15626+{
15627+ asm volatile(LOCK_PREFIX "decq %0\n"
15628 : "=m" (v->counter)
15629 : "m" (v->counter));
15630 }
15631@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15632 */
15633 static inline int atomic64_dec_and_test(atomic64_t *v)
15634 {
15635- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15636+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15637 }
15638
15639 /**
15640@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15641 */
15642 static inline int atomic64_inc_and_test(atomic64_t *v)
15643 {
15644- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15645+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15646 }
15647
15648 /**
15649@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15650 */
15651 static inline int atomic64_add_negative(long i, atomic64_t *v)
15652 {
15653- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15654+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15655 }
15656
15657 /**
15658@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15659 */
15660 static inline long atomic64_add_return(long i, atomic64_t *v)
15661 {
15662+ return i + xadd_check_overflow(&v->counter, i);
15663+}
15664+
15665+/**
15666+ * atomic64_add_return_unchecked - add and return
15667+ * @i: integer value to add
15668+ * @v: pointer to type atomic64_unchecked_t
15669+ *
15670+ * Atomically adds @i to @v and returns @i + @v
15671+ */
15672+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15673+{
15674 return i + xadd(&v->counter, i);
15675 }
15676
15677@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15678 }
15679
15680 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15681+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15682+{
15683+ return atomic64_add_return_unchecked(1, v);
15684+}
15685 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15686
15687 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15688@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15689 return cmpxchg(&v->counter, old, new);
15690 }
15691
15692+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15693+{
15694+ return cmpxchg(&v->counter, old, new);
15695+}
15696+
15697 static inline long atomic64_xchg(atomic64_t *v, long new)
15698 {
15699 return xchg(&v->counter, new);
15700@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15701 */
15702 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15703 {
15704- long c, old;
15705+ long c, old, new;
15706 c = atomic64_read(v);
15707 for (;;) {
15708- if (unlikely(c == (u)))
15709+ if (unlikely(c == u))
15710 break;
15711- old = atomic64_cmpxchg((v), c, c + (a));
15712+
15713+ asm volatile("add %2,%0\n"
15714+
15715+#ifdef CONFIG_PAX_REFCOUNT
15716+ "jno 0f\n"
15717+ "sub %2,%0\n"
15718+ "int $4\n0:\n"
15719+ _ASM_EXTABLE(0b, 0b)
15720+#endif
15721+
15722+ : "=r" (new)
15723+ : "0" (c), "ir" (a));
15724+
15725+ old = atomic64_cmpxchg(v, c, new);
15726 if (likely(old == c))
15727 break;
15728 c = old;
15729 }
15730- return c != (u);
15731+ return c != u;
15732 }
15733
15734 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15735diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
15736index 69bbb48..32517fe 100644
15737--- a/arch/x86/include/asm/barrier.h
15738+++ b/arch/x86/include/asm/barrier.h
15739@@ -107,7 +107,7 @@
15740 do { \
15741 compiletime_assert_atomic_type(*p); \
15742 smp_mb(); \
15743- ACCESS_ONCE(*p) = (v); \
15744+ ACCESS_ONCE_RW(*p) = (v); \
15745 } while (0)
15746
15747 #define smp_load_acquire(p) \
15748@@ -124,7 +124,7 @@ do { \
15749 do { \
15750 compiletime_assert_atomic_type(*p); \
15751 barrier(); \
15752- ACCESS_ONCE(*p) = (v); \
15753+ ACCESS_ONCE_RW(*p) = (v); \
15754 } while (0)
15755
15756 #define smp_load_acquire(p) \
15757diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
15758index 9fc1af7..776d75a 100644
15759--- a/arch/x86/include/asm/bitops.h
15760+++ b/arch/x86/include/asm/bitops.h
15761@@ -49,7 +49,7 @@
15762 * a mask operation on a byte.
15763 */
15764 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
15765-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
15766+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
15767 #define CONST_MASK(nr) (1 << ((nr) & 7))
15768
15769 /**
15770@@ -205,7 +205,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
15771 */
15772 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
15773 {
15774- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
15775+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
15776 }
15777
15778 /**
15779@@ -251,7 +251,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
15780 */
15781 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
15782 {
15783- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
15784+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
15785 }
15786
15787 /**
15788@@ -304,7 +304,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
15789 */
15790 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
15791 {
15792- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
15793+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
15794 }
15795
15796 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
15797@@ -345,7 +345,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
15798 *
15799 * Undefined if no bit exists, so code should check against 0 first.
15800 */
15801-static inline unsigned long __ffs(unsigned long word)
15802+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
15803 {
15804 asm("rep; bsf %1,%0"
15805 : "=r" (word)
15806@@ -359,7 +359,7 @@ static inline unsigned long __ffs(unsigned long word)
15807 *
15808 * Undefined if no zero exists, so code should check against ~0UL first.
15809 */
15810-static inline unsigned long ffz(unsigned long word)
15811+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
15812 {
15813 asm("rep; bsf %1,%0"
15814 : "=r" (word)
15815@@ -373,7 +373,7 @@ static inline unsigned long ffz(unsigned long word)
15816 *
15817 * Undefined if no set bit exists, so code should check against 0 first.
15818 */
15819-static inline unsigned long __fls(unsigned long word)
15820+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
15821 {
15822 asm("bsr %1,%0"
15823 : "=r" (word)
15824@@ -436,7 +436,7 @@ static inline int ffs(int x)
15825 * set bit if value is nonzero. The last (most significant) bit is
15826 * at position 32.
15827 */
15828-static inline int fls(int x)
15829+static inline int __intentional_overflow(-1) fls(int x)
15830 {
15831 int r;
15832
15833@@ -478,7 +478,7 @@ static inline int fls(int x)
15834 * at position 64.
15835 */
15836 #ifdef CONFIG_X86_64
15837-static __always_inline int fls64(__u64 x)
15838+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
15839 {
15840 int bitpos = -1;
15841 /*
15842diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
15843index 4fa687a..60f2d39 100644
15844--- a/arch/x86/include/asm/boot.h
15845+++ b/arch/x86/include/asm/boot.h
15846@@ -6,10 +6,15 @@
15847 #include <uapi/asm/boot.h>
15848
15849 /* Physical address where kernel should be loaded. */
15850-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15851+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
15852 + (CONFIG_PHYSICAL_ALIGN - 1)) \
15853 & ~(CONFIG_PHYSICAL_ALIGN - 1))
15854
15855+#ifndef __ASSEMBLY__
15856+extern unsigned char __LOAD_PHYSICAL_ADDR[];
15857+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
15858+#endif
15859+
15860 /* Minimum kernel alignment, as a power of two */
15861 #ifdef CONFIG_X86_64
15862 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
15863diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
15864index 48f99f1..d78ebf9 100644
15865--- a/arch/x86/include/asm/cache.h
15866+++ b/arch/x86/include/asm/cache.h
15867@@ -5,12 +5,13 @@
15868
15869 /* L1 cache line size */
15870 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
15871-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
15872+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
15873
15874 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
15875+#define __read_only __attribute__((__section__(".data..read_only")))
15876
15877 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
15878-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
15879+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
15880
15881 #ifdef CONFIG_X86_VSMP
15882 #ifdef CONFIG_SMP
15883diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
15884index 9863ee3..4a1f8e1 100644
15885--- a/arch/x86/include/asm/cacheflush.h
15886+++ b/arch/x86/include/asm/cacheflush.h
15887@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
15888 unsigned long pg_flags = pg->flags & _PGMT_MASK;
15889
15890 if (pg_flags == _PGMT_DEFAULT)
15891- return -1;
15892+ return ~0UL;
15893 else if (pg_flags == _PGMT_WC)
15894 return _PAGE_CACHE_WC;
15895 else if (pg_flags == _PGMT_UC_MINUS)
15896diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
15897index cb4c73b..c473c29 100644
15898--- a/arch/x86/include/asm/calling.h
15899+++ b/arch/x86/include/asm/calling.h
15900@@ -82,103 +82,113 @@ For 32-bit we have the following conventions - kernel is built with
15901 #define RSP 152
15902 #define SS 160
15903
15904-#define ARGOFFSET R11
15905-#define SWFRAME ORIG_RAX
15906+#define ARGOFFSET R15
15907
15908 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
15909- subq $9*8+\addskip, %rsp
15910- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
15911- movq_cfi rdi, 8*8
15912- movq_cfi rsi, 7*8
15913- movq_cfi rdx, 6*8
15914+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
15915+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
15916+ movq_cfi rdi, RDI
15917+ movq_cfi rsi, RSI
15918+ movq_cfi rdx, RDX
15919
15920 .if \save_rcx
15921- movq_cfi rcx, 5*8
15922+ movq_cfi rcx, RCX
15923 .endif
15924
15925- movq_cfi rax, 4*8
15926+ movq_cfi rax, RAX
15927
15928 .if \save_r891011
15929- movq_cfi r8, 3*8
15930- movq_cfi r9, 2*8
15931- movq_cfi r10, 1*8
15932- movq_cfi r11, 0*8
15933+ movq_cfi r8, R8
15934+ movq_cfi r9, R9
15935+ movq_cfi r10, R10
15936+ movq_cfi r11, R11
15937 .endif
15938
15939+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15940+ movq_cfi r12, R12
15941+#endif
15942+
15943 .endm
15944
15945-#define ARG_SKIP (9*8)
15946+#define ARG_SKIP ORIG_RAX
15947
15948 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
15949 rstor_r8910=1, rstor_rdx=1
15950+
15951+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15952+ movq_cfi_restore R12, r12
15953+#endif
15954+
15955 .if \rstor_r11
15956- movq_cfi_restore 0*8, r11
15957+ movq_cfi_restore R11, r11
15958 .endif
15959
15960 .if \rstor_r8910
15961- movq_cfi_restore 1*8, r10
15962- movq_cfi_restore 2*8, r9
15963- movq_cfi_restore 3*8, r8
15964+ movq_cfi_restore R10, r10
15965+ movq_cfi_restore R9, r9
15966+ movq_cfi_restore R8, r8
15967 .endif
15968
15969 .if \rstor_rax
15970- movq_cfi_restore 4*8, rax
15971+ movq_cfi_restore RAX, rax
15972 .endif
15973
15974 .if \rstor_rcx
15975- movq_cfi_restore 5*8, rcx
15976+ movq_cfi_restore RCX, rcx
15977 .endif
15978
15979 .if \rstor_rdx
15980- movq_cfi_restore 6*8, rdx
15981+ movq_cfi_restore RDX, rdx
15982 .endif
15983
15984- movq_cfi_restore 7*8, rsi
15985- movq_cfi_restore 8*8, rdi
15986+ movq_cfi_restore RSI, rsi
15987+ movq_cfi_restore RDI, rdi
15988
15989- .if ARG_SKIP+\addskip > 0
15990- addq $ARG_SKIP+\addskip, %rsp
15991- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
15992+ .if ORIG_RAX+\addskip > 0
15993+ addq $ORIG_RAX+\addskip, %rsp
15994+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
15995 .endif
15996 .endm
15997
15998- .macro LOAD_ARGS offset, skiprax=0
15999- movq \offset(%rsp), %r11
16000- movq \offset+8(%rsp), %r10
16001- movq \offset+16(%rsp), %r9
16002- movq \offset+24(%rsp), %r8
16003- movq \offset+40(%rsp), %rcx
16004- movq \offset+48(%rsp), %rdx
16005- movq \offset+56(%rsp), %rsi
16006- movq \offset+64(%rsp), %rdi
16007+ .macro LOAD_ARGS skiprax=0
16008+ movq R11(%rsp), %r11
16009+ movq R10(%rsp), %r10
16010+ movq R9(%rsp), %r9
16011+ movq R8(%rsp), %r8
16012+ movq RCX(%rsp), %rcx
16013+ movq RDX(%rsp), %rdx
16014+ movq RSI(%rsp), %rsi
16015+ movq RDI(%rsp), %rdi
16016 .if \skiprax
16017 .else
16018- movq \offset+72(%rsp), %rax
16019+ movq RAX(%rsp), %rax
16020 .endif
16021 .endm
16022
16023-#define REST_SKIP (6*8)
16024-
16025 .macro SAVE_REST
16026- subq $REST_SKIP, %rsp
16027- CFI_ADJUST_CFA_OFFSET REST_SKIP
16028- movq_cfi rbx, 5*8
16029- movq_cfi rbp, 4*8
16030- movq_cfi r12, 3*8
16031- movq_cfi r13, 2*8
16032- movq_cfi r14, 1*8
16033- movq_cfi r15, 0*8
16034+ movq_cfi rbx, RBX
16035+ movq_cfi rbp, RBP
16036+
16037+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16038+ movq_cfi r12, R12
16039+#endif
16040+
16041+ movq_cfi r13, R13
16042+ movq_cfi r14, R14
16043+ movq_cfi r15, R15
16044 .endm
16045
16046 .macro RESTORE_REST
16047- movq_cfi_restore 0*8, r15
16048- movq_cfi_restore 1*8, r14
16049- movq_cfi_restore 2*8, r13
16050- movq_cfi_restore 3*8, r12
16051- movq_cfi_restore 4*8, rbp
16052- movq_cfi_restore 5*8, rbx
16053- addq $REST_SKIP, %rsp
16054- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16055+ movq_cfi_restore R15, r15
16056+ movq_cfi_restore R14, r14
16057+ movq_cfi_restore R13, r13
16058+
16059+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16060+ movq_cfi_restore R12, r12
16061+#endif
16062+
16063+ movq_cfi_restore RBP, rbp
16064+ movq_cfi_restore RBX, rbx
16065 .endm
16066
16067 .macro SAVE_ALL
16068diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16069index f50de69..2b0a458 100644
16070--- a/arch/x86/include/asm/checksum_32.h
16071+++ b/arch/x86/include/asm/checksum_32.h
16072@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16073 int len, __wsum sum,
16074 int *src_err_ptr, int *dst_err_ptr);
16075
16076+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16077+ int len, __wsum sum,
16078+ int *src_err_ptr, int *dst_err_ptr);
16079+
16080+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16081+ int len, __wsum sum,
16082+ int *src_err_ptr, int *dst_err_ptr);
16083+
16084 /*
16085 * Note: when you get a NULL pointer exception here this means someone
16086 * passed in an incorrect kernel address to one of these functions.
16087@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16088
16089 might_sleep();
16090 stac();
16091- ret = csum_partial_copy_generic((__force void *)src, dst,
16092+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16093 len, sum, err_ptr, NULL);
16094 clac();
16095
16096@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16097 might_sleep();
16098 if (access_ok(VERIFY_WRITE, dst, len)) {
16099 stac();
16100- ret = csum_partial_copy_generic(src, (__force void *)dst,
16101+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16102 len, sum, NULL, err_ptr);
16103 clac();
16104 return ret;
16105diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16106index d47786a..2d8883e 100644
16107--- a/arch/x86/include/asm/cmpxchg.h
16108+++ b/arch/x86/include/asm/cmpxchg.h
16109@@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
16110 __compiletime_error("Bad argument size for cmpxchg");
16111 extern void __xadd_wrong_size(void)
16112 __compiletime_error("Bad argument size for xadd");
16113+extern void __xadd_check_overflow_wrong_size(void)
16114+ __compiletime_error("Bad argument size for xadd_check_overflow");
16115 extern void __add_wrong_size(void)
16116 __compiletime_error("Bad argument size for add");
16117+extern void __add_check_overflow_wrong_size(void)
16118+ __compiletime_error("Bad argument size for add_check_overflow");
16119
16120 /*
16121 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16122@@ -67,6 +71,38 @@ extern void __add_wrong_size(void)
16123 __ret; \
16124 })
16125
16126+#ifdef CONFIG_PAX_REFCOUNT
16127+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16128+ ({ \
16129+ __typeof__ (*(ptr)) __ret = (arg); \
16130+ switch (sizeof(*(ptr))) { \
16131+ case __X86_CASE_L: \
16132+ asm volatile (lock #op "l %0, %1\n" \
16133+ "jno 0f\n" \
16134+ "mov %0,%1\n" \
16135+ "int $4\n0:\n" \
16136+ _ASM_EXTABLE(0b, 0b) \
16137+ : "+r" (__ret), "+m" (*(ptr)) \
16138+ : : "memory", "cc"); \
16139+ break; \
16140+ case __X86_CASE_Q: \
16141+ asm volatile (lock #op "q %q0, %1\n" \
16142+ "jno 0f\n" \
16143+ "mov %0,%1\n" \
16144+ "int $4\n0:\n" \
16145+ _ASM_EXTABLE(0b, 0b) \
16146+ : "+r" (__ret), "+m" (*(ptr)) \
16147+ : : "memory", "cc"); \
16148+ break; \
16149+ default: \
16150+ __ ## op ## _check_overflow_wrong_size(); \
16151+ } \
16152+ __ret; \
16153+ })
16154+#else
16155+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16156+#endif
16157+
16158 /*
16159 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16160 * Since this is generally used to protect other memory information, we
16161@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16162 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16163 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16164
16165+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16166+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16167+
16168 #define __add(ptr, inc, lock) \
16169 ({ \
16170 __typeof__ (*(ptr)) __ret = (inc); \
16171diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16172index 59c6c40..5e0b22c 100644
16173--- a/arch/x86/include/asm/compat.h
16174+++ b/arch/x86/include/asm/compat.h
16175@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16176 typedef u32 compat_uint_t;
16177 typedef u32 compat_ulong_t;
16178 typedef u64 __attribute__((aligned(4))) compat_u64;
16179-typedef u32 compat_uptr_t;
16180+typedef u32 __user compat_uptr_t;
16181
16182 struct compat_timespec {
16183 compat_time_t tv_sec;
16184diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16185index e265ff9..72c253b 100644
16186--- a/arch/x86/include/asm/cpufeature.h
16187+++ b/arch/x86/include/asm/cpufeature.h
16188@@ -203,7 +203,7 @@
16189 #define X86_FEATURE_DECODEASSISTS (8*32+12) /* AMD Decode Assists support */
16190 #define X86_FEATURE_PAUSEFILTER (8*32+13) /* AMD filtered pause intercept */
16191 #define X86_FEATURE_PFTHRESHOLD (8*32+14) /* AMD pause filter threshold */
16192-
16193+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16194
16195 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16196 #define X86_FEATURE_FSGSBASE (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16197@@ -211,7 +211,7 @@
16198 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
16199 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
16200 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
16201-#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
16202+#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
16203 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
16204 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16205 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
16206@@ -359,6 +359,7 @@ extern const char * const x86_power_flags[32];
16207 #undef cpu_has_centaur_mcr
16208 #define cpu_has_centaur_mcr 0
16209
16210+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16211 #endif /* CONFIG_X86_64 */
16212
16213 #if __GNUC__ >= 4
16214@@ -411,7 +412,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16215
16216 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16217 t_warn:
16218- warn_pre_alternatives();
16219+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16220+ warn_pre_alternatives();
16221 return false;
16222 #endif
16223
16224@@ -431,7 +433,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16225 ".section .discard,\"aw\",@progbits\n"
16226 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16227 ".previous\n"
16228- ".section .altinstr_replacement,\"ax\"\n"
16229+ ".section .altinstr_replacement,\"a\"\n"
16230 "3: movb $1,%0\n"
16231 "4:\n"
16232 ".previous\n"
16233@@ -468,7 +470,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16234 " .byte 2b - 1b\n" /* src len */
16235 " .byte 4f - 3f\n" /* repl len */
16236 ".previous\n"
16237- ".section .altinstr_replacement,\"ax\"\n"
16238+ ".section .altinstr_replacement,\"a\"\n"
16239 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16240 "4:\n"
16241 ".previous\n"
16242@@ -501,7 +503,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16243 ".section .discard,\"aw\",@progbits\n"
16244 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16245 ".previous\n"
16246- ".section .altinstr_replacement,\"ax\"\n"
16247+ ".section .altinstr_replacement,\"a\"\n"
16248 "3: movb $0,%0\n"
16249 "4:\n"
16250 ".previous\n"
16251@@ -515,7 +517,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16252 ".section .discard,\"aw\",@progbits\n"
16253 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16254 ".previous\n"
16255- ".section .altinstr_replacement,\"ax\"\n"
16256+ ".section .altinstr_replacement,\"a\"\n"
16257 "5: movb $1,%0\n"
16258 "6:\n"
16259 ".previous\n"
16260diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16261index 50d033a..37deb26 100644
16262--- a/arch/x86/include/asm/desc.h
16263+++ b/arch/x86/include/asm/desc.h
16264@@ -4,6 +4,7 @@
16265 #include <asm/desc_defs.h>
16266 #include <asm/ldt.h>
16267 #include <asm/mmu.h>
16268+#include <asm/pgtable.h>
16269
16270 #include <linux/smp.h>
16271 #include <linux/percpu.h>
16272@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16273
16274 desc->type = (info->read_exec_only ^ 1) << 1;
16275 desc->type |= info->contents << 2;
16276+ desc->type |= info->seg_not_present ^ 1;
16277
16278 desc->s = 1;
16279 desc->dpl = 0x3;
16280@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16281 }
16282
16283 extern struct desc_ptr idt_descr;
16284-extern gate_desc idt_table[];
16285-extern struct desc_ptr debug_idt_descr;
16286-extern gate_desc debug_idt_table[];
16287-
16288-struct gdt_page {
16289- struct desc_struct gdt[GDT_ENTRIES];
16290-} __attribute__((aligned(PAGE_SIZE)));
16291-
16292-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16293+extern gate_desc idt_table[IDT_ENTRIES];
16294+extern const struct desc_ptr debug_idt_descr;
16295+extern gate_desc debug_idt_table[IDT_ENTRIES];
16296
16297+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16298 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16299 {
16300- return per_cpu(gdt_page, cpu).gdt;
16301+ return cpu_gdt_table[cpu];
16302 }
16303
16304 #ifdef CONFIG_X86_64
16305@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16306 unsigned long base, unsigned dpl, unsigned flags,
16307 unsigned short seg)
16308 {
16309- gate->a = (seg << 16) | (base & 0xffff);
16310- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16311+ gate->gate.offset_low = base;
16312+ gate->gate.seg = seg;
16313+ gate->gate.reserved = 0;
16314+ gate->gate.type = type;
16315+ gate->gate.s = 0;
16316+ gate->gate.dpl = dpl;
16317+ gate->gate.p = 1;
16318+ gate->gate.offset_high = base >> 16;
16319 }
16320
16321 #endif
16322@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16323
16324 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16325 {
16326+ pax_open_kernel();
16327 memcpy(&idt[entry], gate, sizeof(*gate));
16328+ pax_close_kernel();
16329 }
16330
16331 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16332 {
16333+ pax_open_kernel();
16334 memcpy(&ldt[entry], desc, 8);
16335+ pax_close_kernel();
16336 }
16337
16338 static inline void
16339@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16340 default: size = sizeof(*gdt); break;
16341 }
16342
16343+ pax_open_kernel();
16344 memcpy(&gdt[entry], desc, size);
16345+ pax_close_kernel();
16346 }
16347
16348 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16349@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16350
16351 static inline void native_load_tr_desc(void)
16352 {
16353+ pax_open_kernel();
16354 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16355+ pax_close_kernel();
16356 }
16357
16358 static inline void native_load_gdt(const struct desc_ptr *dtr)
16359@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16360 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16361 unsigned int i;
16362
16363+ pax_open_kernel();
16364 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16365 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16366+ pax_close_kernel();
16367 }
16368
16369 #define _LDT_empty(info) \
16370@@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16371 preempt_enable();
16372 }
16373
16374-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16375+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16376 {
16377 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16378 }
16379@@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16380 }
16381
16382 #ifdef CONFIG_X86_64
16383-static inline void set_nmi_gate(int gate, void *addr)
16384+static inline void set_nmi_gate(int gate, const void *addr)
16385 {
16386 gate_desc s;
16387
16388@@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16389 #endif
16390
16391 #ifdef CONFIG_TRACING
16392-extern struct desc_ptr trace_idt_descr;
16393-extern gate_desc trace_idt_table[];
16394+extern const struct desc_ptr trace_idt_descr;
16395+extern gate_desc trace_idt_table[IDT_ENTRIES];
16396 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16397 {
16398 write_idt_entry(trace_idt_table, entry, gate);
16399 }
16400
16401-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16402+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16403 unsigned dpl, unsigned ist, unsigned seg)
16404 {
16405 gate_desc s;
16406@@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16407 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16408 #endif
16409
16410-static inline void _set_gate(int gate, unsigned type, void *addr,
16411+static inline void _set_gate(int gate, unsigned type, const void *addr,
16412 unsigned dpl, unsigned ist, unsigned seg)
16413 {
16414 gate_desc s;
16415@@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16416 #define set_intr_gate(n, addr) \
16417 do { \
16418 BUG_ON((unsigned)n > 0xFF); \
16419- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16420+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16421 __KERNEL_CS); \
16422- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16423+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16424 0, 0, __KERNEL_CS); \
16425 } while (0)
16426
16427@@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16428 /*
16429 * This routine sets up an interrupt gate at directory privilege level 3.
16430 */
16431-static inline void set_system_intr_gate(unsigned int n, void *addr)
16432+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16433 {
16434 BUG_ON((unsigned)n > 0xFF);
16435 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16436 }
16437
16438-static inline void set_system_trap_gate(unsigned int n, void *addr)
16439+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16440 {
16441 BUG_ON((unsigned)n > 0xFF);
16442 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16443 }
16444
16445-static inline void set_trap_gate(unsigned int n, void *addr)
16446+static inline void set_trap_gate(unsigned int n, const void *addr)
16447 {
16448 BUG_ON((unsigned)n > 0xFF);
16449 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16450@@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16451 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16452 {
16453 BUG_ON((unsigned)n > 0xFF);
16454- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16455+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16456 }
16457
16458-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16459+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16460 {
16461 BUG_ON((unsigned)n > 0xFF);
16462 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16463 }
16464
16465-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16466+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16467 {
16468 BUG_ON((unsigned)n > 0xFF);
16469 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16470@@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16471 else
16472 load_idt((const struct desc_ptr *)&idt_descr);
16473 }
16474+
16475+#ifdef CONFIG_X86_32
16476+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16477+{
16478+ struct desc_struct d;
16479+
16480+ if (likely(limit))
16481+ limit = (limit - 1UL) >> PAGE_SHIFT;
16482+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16483+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16484+}
16485+#endif
16486+
16487 #endif /* _ASM_X86_DESC_H */
16488diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16489index 278441f..b95a174 100644
16490--- a/arch/x86/include/asm/desc_defs.h
16491+++ b/arch/x86/include/asm/desc_defs.h
16492@@ -31,6 +31,12 @@ struct desc_struct {
16493 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16494 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16495 };
16496+ struct {
16497+ u16 offset_low;
16498+ u16 seg;
16499+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16500+ unsigned offset_high: 16;
16501+ } gate;
16502 };
16503 } __attribute__((packed));
16504
16505diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16506index ced283a..ffe04cc 100644
16507--- a/arch/x86/include/asm/div64.h
16508+++ b/arch/x86/include/asm/div64.h
16509@@ -39,7 +39,7 @@
16510 __mod; \
16511 })
16512
16513-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16514+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16515 {
16516 union {
16517 u64 v64;
16518diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16519index 2c71182..731124d 100644
16520--- a/arch/x86/include/asm/elf.h
16521+++ b/arch/x86/include/asm/elf.h
16522@@ -243,7 +243,25 @@ extern int force_personality32;
16523 the loader. We need to make sure that it is out of the way of the program
16524 that it will "exec", and that there is sufficient room for the brk. */
16525
16526+#ifdef CONFIG_PAX_SEGMEXEC
16527+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16528+#else
16529 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16530+#endif
16531+
16532+#ifdef CONFIG_PAX_ASLR
16533+#ifdef CONFIG_X86_32
16534+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16535+
16536+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16537+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16538+#else
16539+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16540+
16541+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16542+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16543+#endif
16544+#endif
16545
16546 /* This yields a mask that user programs can use to figure out what
16547 instruction set this CPU supports. This could be done in user space,
16548@@ -292,16 +310,12 @@ do { \
16549
16550 #define ARCH_DLINFO \
16551 do { \
16552- if (vdso_enabled) \
16553- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16554- (unsigned long)current->mm->context.vdso); \
16555+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16556 } while (0)
16557
16558 #define ARCH_DLINFO_X32 \
16559 do { \
16560- if (vdso_enabled) \
16561- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16562- (unsigned long)current->mm->context.vdso); \
16563+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16564 } while (0)
16565
16566 #define AT_SYSINFO 32
16567@@ -316,7 +330,7 @@ else \
16568
16569 #endif /* !CONFIG_X86_32 */
16570
16571-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16572+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16573
16574 #define VDSO_ENTRY \
16575 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
16576@@ -332,9 +346,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
16577 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
16578 #define compat_arch_setup_additional_pages syscall32_setup_pages
16579
16580-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16581-#define arch_randomize_brk arch_randomize_brk
16582-
16583 /*
16584 * True on X86_32 or when emulating IA32 on X86_64
16585 */
16586diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16587index 77a99ac..39ff7f5 100644
16588--- a/arch/x86/include/asm/emergency-restart.h
16589+++ b/arch/x86/include/asm/emergency-restart.h
16590@@ -1,6 +1,6 @@
16591 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16592 #define _ASM_X86_EMERGENCY_RESTART_H
16593
16594-extern void machine_emergency_restart(void);
16595+extern void machine_emergency_restart(void) __noreturn;
16596
16597 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16598diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16599index 1c7eefe..d0e4702 100644
16600--- a/arch/x86/include/asm/floppy.h
16601+++ b/arch/x86/include/asm/floppy.h
16602@@ -229,18 +229,18 @@ static struct fd_routine_l {
16603 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16604 } fd_routine[] = {
16605 {
16606- request_dma,
16607- free_dma,
16608- get_dma_residue,
16609- dma_mem_alloc,
16610- hard_dma_setup
16611+ ._request_dma = request_dma,
16612+ ._free_dma = free_dma,
16613+ ._get_dma_residue = get_dma_residue,
16614+ ._dma_mem_alloc = dma_mem_alloc,
16615+ ._dma_setup = hard_dma_setup
16616 },
16617 {
16618- vdma_request_dma,
16619- vdma_nop,
16620- vdma_get_dma_residue,
16621- vdma_mem_alloc,
16622- vdma_dma_setup
16623+ ._request_dma = vdma_request_dma,
16624+ ._free_dma = vdma_nop,
16625+ ._get_dma_residue = vdma_get_dma_residue,
16626+ ._dma_mem_alloc = vdma_mem_alloc,
16627+ ._dma_setup = vdma_dma_setup
16628 }
16629 };
16630
16631diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16632index cea1c76..6c0d79b 100644
16633--- a/arch/x86/include/asm/fpu-internal.h
16634+++ b/arch/x86/include/asm/fpu-internal.h
16635@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16636 #define user_insn(insn, output, input...) \
16637 ({ \
16638 int err; \
16639+ pax_open_userland(); \
16640 asm volatile(ASM_STAC "\n" \
16641- "1:" #insn "\n\t" \
16642+ "1:" \
16643+ __copyuser_seg \
16644+ #insn "\n\t" \
16645 "2: " ASM_CLAC "\n" \
16646 ".section .fixup,\"ax\"\n" \
16647 "3: movl $-1,%[err]\n" \
16648@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16649 _ASM_EXTABLE(1b, 3b) \
16650 : [err] "=r" (err), output \
16651 : "0"(0), input); \
16652+ pax_close_userland(); \
16653 err; \
16654 })
16655
16656@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16657 "fnclex\n\t"
16658 "emms\n\t"
16659 "fildl %P[addr]" /* set F?P to defined value */
16660- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16661+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16662 }
16663
16664 return fpu_restore_checking(&tsk->thread.fpu);
16665diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16666index b4c1f54..e290c08 100644
16667--- a/arch/x86/include/asm/futex.h
16668+++ b/arch/x86/include/asm/futex.h
16669@@ -12,6 +12,7 @@
16670 #include <asm/smap.h>
16671
16672 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16673+ typecheck(u32 __user *, uaddr); \
16674 asm volatile("\t" ASM_STAC "\n" \
16675 "1:\t" insn "\n" \
16676 "2:\t" ASM_CLAC "\n" \
16677@@ -20,15 +21,16 @@
16678 "\tjmp\t2b\n" \
16679 "\t.previous\n" \
16680 _ASM_EXTABLE(1b, 3b) \
16681- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16682+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16683 : "i" (-EFAULT), "0" (oparg), "1" (0))
16684
16685 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16686+ typecheck(u32 __user *, uaddr); \
16687 asm volatile("\t" ASM_STAC "\n" \
16688 "1:\tmovl %2, %0\n" \
16689 "\tmovl\t%0, %3\n" \
16690 "\t" insn "\n" \
16691- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16692+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16693 "\tjnz\t1b\n" \
16694 "3:\t" ASM_CLAC "\n" \
16695 "\t.section .fixup,\"ax\"\n" \
16696@@ -38,7 +40,7 @@
16697 _ASM_EXTABLE(1b, 4b) \
16698 _ASM_EXTABLE(2b, 4b) \
16699 : "=&a" (oldval), "=&r" (ret), \
16700- "+m" (*uaddr), "=&r" (tem) \
16701+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16702 : "r" (oparg), "i" (-EFAULT), "1" (0))
16703
16704 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16705@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16706
16707 pagefault_disable();
16708
16709+ pax_open_userland();
16710 switch (op) {
16711 case FUTEX_OP_SET:
16712- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16713+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16714 break;
16715 case FUTEX_OP_ADD:
16716- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16717+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16718 uaddr, oparg);
16719 break;
16720 case FUTEX_OP_OR:
16721@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16722 default:
16723 ret = -ENOSYS;
16724 }
16725+ pax_close_userland();
16726
16727 pagefault_enable();
16728
16729diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16730index a307b75..ec74ca2 100644
16731--- a/arch/x86/include/asm/hw_irq.h
16732+++ b/arch/x86/include/asm/hw_irq.h
16733@@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
16734 extern void enable_IO_APIC(void);
16735
16736 /* Statistics */
16737-extern atomic_t irq_err_count;
16738-extern atomic_t irq_mis_count;
16739+extern atomic_unchecked_t irq_err_count;
16740+extern atomic_unchecked_t irq_mis_count;
16741
16742 /* EISA */
16743 extern void eisa_set_level_irq(unsigned int irq);
16744diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
16745index a203659..9889f1c 100644
16746--- a/arch/x86/include/asm/i8259.h
16747+++ b/arch/x86/include/asm/i8259.h
16748@@ -62,7 +62,7 @@ struct legacy_pic {
16749 void (*init)(int auto_eoi);
16750 int (*irq_pending)(unsigned int irq);
16751 void (*make_irq)(unsigned int irq);
16752-};
16753+} __do_const;
16754
16755 extern struct legacy_pic *legacy_pic;
16756 extern struct legacy_pic null_legacy_pic;
16757diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
16758index b8237d8..3e8864e 100644
16759--- a/arch/x86/include/asm/io.h
16760+++ b/arch/x86/include/asm/io.h
16761@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
16762 "m" (*(volatile type __force *)addr) barrier); }
16763
16764 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
16765-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
16766-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
16767+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
16768+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
16769
16770 build_mmio_read(__readb, "b", unsigned char, "=q", )
16771-build_mmio_read(__readw, "w", unsigned short, "=r", )
16772-build_mmio_read(__readl, "l", unsigned int, "=r", )
16773+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
16774+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
16775
16776 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
16777 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
16778@@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
16779 * this function
16780 */
16781
16782-static inline phys_addr_t virt_to_phys(volatile void *address)
16783+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
16784 {
16785 return __pa(address);
16786 }
16787@@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
16788 return ioremap_nocache(offset, size);
16789 }
16790
16791-extern void iounmap(volatile void __iomem *addr);
16792+extern void iounmap(const volatile void __iomem *addr);
16793
16794 extern void set_iounmap_nonlazy(void);
16795
16796@@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
16797
16798 #include <linux/vmalloc.h>
16799
16800+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
16801+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
16802+{
16803+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16804+}
16805+
16806+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
16807+{
16808+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
16809+}
16810+
16811 /*
16812 * Convert a virtual cached pointer to an uncached pointer
16813 */
16814diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
16815index bba3cf8..06bc8da 100644
16816--- a/arch/x86/include/asm/irqflags.h
16817+++ b/arch/x86/include/asm/irqflags.h
16818@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
16819 sti; \
16820 sysexit
16821
16822+#define GET_CR0_INTO_RDI mov %cr0, %rdi
16823+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
16824+#define GET_CR3_INTO_RDI mov %cr3, %rdi
16825+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
16826+
16827 #else
16828 #define INTERRUPT_RETURN iret
16829 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
16830diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
16831index 9454c16..e4100e3 100644
16832--- a/arch/x86/include/asm/kprobes.h
16833+++ b/arch/x86/include/asm/kprobes.h
16834@@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
16835 #define RELATIVEJUMP_SIZE 5
16836 #define RELATIVECALL_OPCODE 0xe8
16837 #define RELATIVE_ADDR_SIZE 4
16838-#define MAX_STACK_SIZE 64
16839-#define MIN_STACK_SIZE(ADDR) \
16840- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
16841- THREAD_SIZE - (unsigned long)(ADDR))) \
16842- ? (MAX_STACK_SIZE) \
16843- : (((unsigned long)current_thread_info()) + \
16844- THREAD_SIZE - (unsigned long)(ADDR)))
16845+#define MAX_STACK_SIZE 64UL
16846+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
16847
16848 #define flush_insn_slot(p) do { } while (0)
16849
16850diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
16851index 4ad6560..75c7bdd 100644
16852--- a/arch/x86/include/asm/local.h
16853+++ b/arch/x86/include/asm/local.h
16854@@ -10,33 +10,97 @@ typedef struct {
16855 atomic_long_t a;
16856 } local_t;
16857
16858+typedef struct {
16859+ atomic_long_unchecked_t a;
16860+} local_unchecked_t;
16861+
16862 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
16863
16864 #define local_read(l) atomic_long_read(&(l)->a)
16865+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
16866 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
16867+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
16868
16869 static inline void local_inc(local_t *l)
16870 {
16871- asm volatile(_ASM_INC "%0"
16872+ asm volatile(_ASM_INC "%0\n"
16873+
16874+#ifdef CONFIG_PAX_REFCOUNT
16875+ "jno 0f\n"
16876+ _ASM_DEC "%0\n"
16877+ "int $4\n0:\n"
16878+ _ASM_EXTABLE(0b, 0b)
16879+#endif
16880+
16881+ : "+m" (l->a.counter));
16882+}
16883+
16884+static inline void local_inc_unchecked(local_unchecked_t *l)
16885+{
16886+ asm volatile(_ASM_INC "%0\n"
16887 : "+m" (l->a.counter));
16888 }
16889
16890 static inline void local_dec(local_t *l)
16891 {
16892- asm volatile(_ASM_DEC "%0"
16893+ asm volatile(_ASM_DEC "%0\n"
16894+
16895+#ifdef CONFIG_PAX_REFCOUNT
16896+ "jno 0f\n"
16897+ _ASM_INC "%0\n"
16898+ "int $4\n0:\n"
16899+ _ASM_EXTABLE(0b, 0b)
16900+#endif
16901+
16902+ : "+m" (l->a.counter));
16903+}
16904+
16905+static inline void local_dec_unchecked(local_unchecked_t *l)
16906+{
16907+ asm volatile(_ASM_DEC "%0\n"
16908 : "+m" (l->a.counter));
16909 }
16910
16911 static inline void local_add(long i, local_t *l)
16912 {
16913- asm volatile(_ASM_ADD "%1,%0"
16914+ asm volatile(_ASM_ADD "%1,%0\n"
16915+
16916+#ifdef CONFIG_PAX_REFCOUNT
16917+ "jno 0f\n"
16918+ _ASM_SUB "%1,%0\n"
16919+ "int $4\n0:\n"
16920+ _ASM_EXTABLE(0b, 0b)
16921+#endif
16922+
16923+ : "+m" (l->a.counter)
16924+ : "ir" (i));
16925+}
16926+
16927+static inline void local_add_unchecked(long i, local_unchecked_t *l)
16928+{
16929+ asm volatile(_ASM_ADD "%1,%0\n"
16930 : "+m" (l->a.counter)
16931 : "ir" (i));
16932 }
16933
16934 static inline void local_sub(long i, local_t *l)
16935 {
16936- asm volatile(_ASM_SUB "%1,%0"
16937+ asm volatile(_ASM_SUB "%1,%0\n"
16938+
16939+#ifdef CONFIG_PAX_REFCOUNT
16940+ "jno 0f\n"
16941+ _ASM_ADD "%1,%0\n"
16942+ "int $4\n0:\n"
16943+ _ASM_EXTABLE(0b, 0b)
16944+#endif
16945+
16946+ : "+m" (l->a.counter)
16947+ : "ir" (i));
16948+}
16949+
16950+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
16951+{
16952+ asm volatile(_ASM_SUB "%1,%0\n"
16953 : "+m" (l->a.counter)
16954 : "ir" (i));
16955 }
16956@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
16957 */
16958 static inline int local_sub_and_test(long i, local_t *l)
16959 {
16960- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
16961+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
16962 }
16963
16964 /**
16965@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
16966 */
16967 static inline int local_dec_and_test(local_t *l)
16968 {
16969- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
16970+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
16971 }
16972
16973 /**
16974@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
16975 */
16976 static inline int local_inc_and_test(local_t *l)
16977 {
16978- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
16979+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
16980 }
16981
16982 /**
16983@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
16984 */
16985 static inline int local_add_negative(long i, local_t *l)
16986 {
16987- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
16988+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
16989 }
16990
16991 /**
16992@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
16993 static inline long local_add_return(long i, local_t *l)
16994 {
16995 long __i = i;
16996+ asm volatile(_ASM_XADD "%0, %1\n"
16997+
16998+#ifdef CONFIG_PAX_REFCOUNT
16999+ "jno 0f\n"
17000+ _ASM_MOV "%0,%1\n"
17001+ "int $4\n0:\n"
17002+ _ASM_EXTABLE(0b, 0b)
17003+#endif
17004+
17005+ : "+r" (i), "+m" (l->a.counter)
17006+ : : "memory");
17007+ return i + __i;
17008+}
17009+
17010+/**
17011+ * local_add_return_unchecked - add and return
17012+ * @i: integer value to add
17013+ * @l: pointer to type local_unchecked_t
17014+ *
17015+ * Atomically adds @i to @l and returns @i + @l
17016+ */
17017+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17018+{
17019+ long __i = i;
17020 asm volatile(_ASM_XADD "%0, %1;"
17021 : "+r" (i), "+m" (l->a.counter)
17022 : : "memory");
17023@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17024
17025 #define local_cmpxchg(l, o, n) \
17026 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17027+#define local_cmpxchg_unchecked(l, o, n) \
17028+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17029 /* Always has a lock prefix */
17030 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17031
17032diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17033new file mode 100644
17034index 0000000..2bfd3ba
17035--- /dev/null
17036+++ b/arch/x86/include/asm/mman.h
17037@@ -0,0 +1,15 @@
17038+#ifndef _X86_MMAN_H
17039+#define _X86_MMAN_H
17040+
17041+#include <uapi/asm/mman.h>
17042+
17043+#ifdef __KERNEL__
17044+#ifndef __ASSEMBLY__
17045+#ifdef CONFIG_X86_32
17046+#define arch_mmap_check i386_mmap_check
17047+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17048+#endif
17049+#endif
17050+#endif
17051+
17052+#endif /* X86_MMAN_H */
17053diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17054index 5f55e69..e20bfb1 100644
17055--- a/arch/x86/include/asm/mmu.h
17056+++ b/arch/x86/include/asm/mmu.h
17057@@ -9,7 +9,7 @@
17058 * we put the segment information here.
17059 */
17060 typedef struct {
17061- void *ldt;
17062+ struct desc_struct *ldt;
17063 int size;
17064
17065 #ifdef CONFIG_X86_64
17066@@ -18,7 +18,19 @@ typedef struct {
17067 #endif
17068
17069 struct mutex lock;
17070- void *vdso;
17071+ unsigned long vdso;
17072+
17073+#ifdef CONFIG_X86_32
17074+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17075+ unsigned long user_cs_base;
17076+ unsigned long user_cs_limit;
17077+
17078+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17079+ cpumask_t cpu_user_cs_mask;
17080+#endif
17081+
17082+#endif
17083+#endif
17084 } mm_context_t;
17085
17086 #ifdef CONFIG_SMP
17087diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17088index be12c53..4d24039 100644
17089--- a/arch/x86/include/asm/mmu_context.h
17090+++ b/arch/x86/include/asm/mmu_context.h
17091@@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
17092
17093 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17094 {
17095+
17096+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17097+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17098+ unsigned int i;
17099+ pgd_t *pgd;
17100+
17101+ pax_open_kernel();
17102+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17103+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17104+ set_pgd_batched(pgd+i, native_make_pgd(0));
17105+ pax_close_kernel();
17106+ }
17107+#endif
17108+
17109 #ifdef CONFIG_SMP
17110 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17111 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17112@@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17113 struct task_struct *tsk)
17114 {
17115 unsigned cpu = smp_processor_id();
17116+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17117+ int tlbstate = TLBSTATE_OK;
17118+#endif
17119
17120 if (likely(prev != next)) {
17121 #ifdef CONFIG_SMP
17122+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17123+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17124+#endif
17125 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17126 this_cpu_write(cpu_tlbstate.active_mm, next);
17127 #endif
17128 cpumask_set_cpu(cpu, mm_cpumask(next));
17129
17130 /* Re-load page tables */
17131+#ifdef CONFIG_PAX_PER_CPU_PGD
17132+ pax_open_kernel();
17133+
17134+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17135+ if (static_cpu_has(X86_FEATURE_PCID))
17136+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17137+ else
17138+#endif
17139+
17140+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17141+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17142+ pax_close_kernel();
17143+ 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));
17144+
17145+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17146+ if (static_cpu_has(X86_FEATURE_PCID)) {
17147+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17148+ u64 descriptor[2];
17149+ descriptor[0] = PCID_USER;
17150+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17151+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17152+ descriptor[0] = PCID_KERNEL;
17153+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17154+ }
17155+ } else {
17156+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17157+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17158+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17159+ else
17160+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17161+ }
17162+ } else
17163+#endif
17164+
17165+ load_cr3(get_cpu_pgd(cpu, kernel));
17166+#else
17167 load_cr3(next->pgd);
17168+#endif
17169
17170 /* Stop flush ipis for the previous mm */
17171 cpumask_clear_cpu(cpu, mm_cpumask(prev));
17172@@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17173 /* Load the LDT, if the LDT is different: */
17174 if (unlikely(prev->context.ldt != next->context.ldt))
17175 load_LDT_nolock(&next->context);
17176+
17177+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17178+ if (!(__supported_pte_mask & _PAGE_NX)) {
17179+ smp_mb__before_clear_bit();
17180+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17181+ smp_mb__after_clear_bit();
17182+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17183+ }
17184+#endif
17185+
17186+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17187+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17188+ prev->context.user_cs_limit != next->context.user_cs_limit))
17189+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17190+#ifdef CONFIG_SMP
17191+ else if (unlikely(tlbstate != TLBSTATE_OK))
17192+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17193+#endif
17194+#endif
17195+
17196 }
17197+ else {
17198+
17199+#ifdef CONFIG_PAX_PER_CPU_PGD
17200+ pax_open_kernel();
17201+
17202+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17203+ if (static_cpu_has(X86_FEATURE_PCID))
17204+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17205+ else
17206+#endif
17207+
17208+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17209+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17210+ pax_close_kernel();
17211+ 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));
17212+
17213+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17214+ if (static_cpu_has(X86_FEATURE_PCID)) {
17215+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17216+ u64 descriptor[2];
17217+ descriptor[0] = PCID_USER;
17218+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17219+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17220+ descriptor[0] = PCID_KERNEL;
17221+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17222+ }
17223+ } else {
17224+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17225+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17226+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17227+ else
17228+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17229+ }
17230+ } else
17231+#endif
17232+
17233+ load_cr3(get_cpu_pgd(cpu, kernel));
17234+#endif
17235+
17236 #ifdef CONFIG_SMP
17237- else {
17238 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17239 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17240
17241@@ -70,11 +185,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17242 * tlb flush IPI delivery. We must reload CR3
17243 * to make sure to use no freed page tables.
17244 */
17245+
17246+#ifndef CONFIG_PAX_PER_CPU_PGD
17247 load_cr3(next->pgd);
17248+#endif
17249+
17250 load_LDT_nolock(&next->context);
17251+
17252+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17253+ if (!(__supported_pte_mask & _PAGE_NX))
17254+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17255+#endif
17256+
17257+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17258+#ifdef CONFIG_PAX_PAGEEXEC
17259+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17260+#endif
17261+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17262+#endif
17263+
17264 }
17265+#endif
17266 }
17267-#endif
17268 }
17269
17270 #define activate_mm(prev, next) \
17271diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17272index e3b7819..b257c64 100644
17273--- a/arch/x86/include/asm/module.h
17274+++ b/arch/x86/include/asm/module.h
17275@@ -5,6 +5,7 @@
17276
17277 #ifdef CONFIG_X86_64
17278 /* X86_64 does not define MODULE_PROC_FAMILY */
17279+#define MODULE_PROC_FAMILY ""
17280 #elif defined CONFIG_M486
17281 #define MODULE_PROC_FAMILY "486 "
17282 #elif defined CONFIG_M586
17283@@ -57,8 +58,20 @@
17284 #error unknown processor family
17285 #endif
17286
17287-#ifdef CONFIG_X86_32
17288-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17289+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17290+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17291+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17292+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17293+#else
17294+#define MODULE_PAX_KERNEXEC ""
17295 #endif
17296
17297+#ifdef CONFIG_PAX_MEMORY_UDEREF
17298+#define MODULE_PAX_UDEREF "UDEREF "
17299+#else
17300+#define MODULE_PAX_UDEREF ""
17301+#endif
17302+
17303+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17304+
17305 #endif /* _ASM_X86_MODULE_H */
17306diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17307index 5f2fc44..106caa6 100644
17308--- a/arch/x86/include/asm/nmi.h
17309+++ b/arch/x86/include/asm/nmi.h
17310@@ -36,26 +36,35 @@ enum {
17311
17312 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17313
17314+struct nmiaction;
17315+
17316+struct nmiwork {
17317+ const struct nmiaction *action;
17318+ u64 max_duration;
17319+ struct irq_work irq_work;
17320+};
17321+
17322 struct nmiaction {
17323 struct list_head list;
17324 nmi_handler_t handler;
17325- u64 max_duration;
17326- struct irq_work irq_work;
17327 unsigned long flags;
17328 const char *name;
17329-};
17330+ struct nmiwork *work;
17331+} __do_const;
17332
17333 #define register_nmi_handler(t, fn, fg, n, init...) \
17334 ({ \
17335- static struct nmiaction init fn##_na = { \
17336+ static struct nmiwork fn##_nw; \
17337+ static const struct nmiaction init fn##_na = { \
17338 .handler = (fn), \
17339 .name = (n), \
17340 .flags = (fg), \
17341+ .work = &fn##_nw, \
17342 }; \
17343 __register_nmi_handler((t), &fn##_na); \
17344 })
17345
17346-int __register_nmi_handler(unsigned int, struct nmiaction *);
17347+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17348
17349 void unregister_nmi_handler(unsigned int, const char *);
17350
17351diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17352index 775873d..04cd306 100644
17353--- a/arch/x86/include/asm/page.h
17354+++ b/arch/x86/include/asm/page.h
17355@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17356 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17357
17358 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17359+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17360
17361 #define __boot_va(x) __va(x)
17362 #define __boot_pa(x) __pa(x)
17363@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17364 * virt_to_page(kaddr) returns a valid pointer if and only if
17365 * virt_addr_valid(kaddr) returns true.
17366 */
17367-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17368 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17369 extern bool __virt_addr_valid(unsigned long kaddr);
17370 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17371
17372+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17373+#define virt_to_page(kaddr) \
17374+ ({ \
17375+ const void *__kaddr = (const void *)(kaddr); \
17376+ BUG_ON(!virt_addr_valid(__kaddr)); \
17377+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17378+ })
17379+#else
17380+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17381+#endif
17382+
17383 #endif /* __ASSEMBLY__ */
17384
17385 #include <asm-generic/memory_model.h>
17386diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17387index 0f1ddee..e2fc3d1 100644
17388--- a/arch/x86/include/asm/page_64.h
17389+++ b/arch/x86/include/asm/page_64.h
17390@@ -7,9 +7,9 @@
17391
17392 /* duplicated to the one in bootmem.h */
17393 extern unsigned long max_pfn;
17394-extern unsigned long phys_base;
17395+extern const unsigned long phys_base;
17396
17397-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17398+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17399 {
17400 unsigned long y = x - __START_KERNEL_map;
17401
17402diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17403index cd6e1610..70f4418 100644
17404--- a/arch/x86/include/asm/paravirt.h
17405+++ b/arch/x86/include/asm/paravirt.h
17406@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17407 return (pmd_t) { ret };
17408 }
17409
17410-static inline pmdval_t pmd_val(pmd_t pmd)
17411+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17412 {
17413 pmdval_t ret;
17414
17415@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17416 val);
17417 }
17418
17419+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17420+{
17421+ pgdval_t val = native_pgd_val(pgd);
17422+
17423+ if (sizeof(pgdval_t) > sizeof(long))
17424+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17425+ val, (u64)val >> 32);
17426+ else
17427+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17428+ val);
17429+}
17430+
17431 static inline void pgd_clear(pgd_t *pgdp)
17432 {
17433 set_pgd(pgdp, __pgd(0));
17434@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17435 pv_mmu_ops.set_fixmap(idx, phys, flags);
17436 }
17437
17438+#ifdef CONFIG_PAX_KERNEXEC
17439+static inline unsigned long pax_open_kernel(void)
17440+{
17441+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17442+}
17443+
17444+static inline unsigned long pax_close_kernel(void)
17445+{
17446+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17447+}
17448+#else
17449+static inline unsigned long pax_open_kernel(void) { return 0; }
17450+static inline unsigned long pax_close_kernel(void) { return 0; }
17451+#endif
17452+
17453 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17454
17455 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17456@@ -906,7 +933,7 @@ extern void default_banner(void);
17457
17458 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17459 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17460-#define PARA_INDIRECT(addr) *%cs:addr
17461+#define PARA_INDIRECT(addr) *%ss:addr
17462 #endif
17463
17464 #define INTERRUPT_RETURN \
17465@@ -981,6 +1008,21 @@ extern void default_banner(void);
17466 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17467 CLBR_NONE, \
17468 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17469+
17470+#define GET_CR0_INTO_RDI \
17471+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17472+ mov %rax,%rdi
17473+
17474+#define SET_RDI_INTO_CR0 \
17475+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17476+
17477+#define GET_CR3_INTO_RDI \
17478+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17479+ mov %rax,%rdi
17480+
17481+#define SET_RDI_INTO_CR3 \
17482+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17483+
17484 #endif /* CONFIG_X86_32 */
17485
17486 #endif /* __ASSEMBLY__ */
17487diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17488index 7549b8b..f0edfda 100644
17489--- a/arch/x86/include/asm/paravirt_types.h
17490+++ b/arch/x86/include/asm/paravirt_types.h
17491@@ -84,7 +84,7 @@ struct pv_init_ops {
17492 */
17493 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17494 unsigned long addr, unsigned len);
17495-};
17496+} __no_const __no_randomize_layout;
17497
17498
17499 struct pv_lazy_ops {
17500@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17501 void (*enter)(void);
17502 void (*leave)(void);
17503 void (*flush)(void);
17504-};
17505+} __no_randomize_layout;
17506
17507 struct pv_time_ops {
17508 unsigned long long (*sched_clock)(void);
17509 unsigned long long (*steal_clock)(int cpu);
17510 unsigned long (*get_tsc_khz)(void);
17511-};
17512+} __no_const __no_randomize_layout;
17513
17514 struct pv_cpu_ops {
17515 /* hooks for various privileged instructions */
17516@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17517
17518 void (*start_context_switch)(struct task_struct *prev);
17519 void (*end_context_switch)(struct task_struct *next);
17520-};
17521+} __no_const __no_randomize_layout;
17522
17523 struct pv_irq_ops {
17524 /*
17525@@ -215,7 +215,7 @@ struct pv_irq_ops {
17526 #ifdef CONFIG_X86_64
17527 void (*adjust_exception_frame)(void);
17528 #endif
17529-};
17530+} __no_randomize_layout;
17531
17532 struct pv_apic_ops {
17533 #ifdef CONFIG_X86_LOCAL_APIC
17534@@ -223,7 +223,7 @@ struct pv_apic_ops {
17535 unsigned long start_eip,
17536 unsigned long start_esp);
17537 #endif
17538-};
17539+} __no_const __no_randomize_layout;
17540
17541 struct pv_mmu_ops {
17542 unsigned long (*read_cr2)(void);
17543@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17544 struct paravirt_callee_save make_pud;
17545
17546 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17547+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17548 #endif /* PAGETABLE_LEVELS == 4 */
17549 #endif /* PAGETABLE_LEVELS >= 3 */
17550
17551@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17552 an mfn. We can tell which is which from the index. */
17553 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17554 phys_addr_t phys, pgprot_t flags);
17555-};
17556+
17557+#ifdef CONFIG_PAX_KERNEXEC
17558+ unsigned long (*pax_open_kernel)(void);
17559+ unsigned long (*pax_close_kernel)(void);
17560+#endif
17561+
17562+} __no_randomize_layout;
17563
17564 struct arch_spinlock;
17565 #ifdef CONFIG_SMP
17566@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17567 struct pv_lock_ops {
17568 struct paravirt_callee_save lock_spinning;
17569 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17570-};
17571+} __no_randomize_layout;
17572
17573 /* This contains all the paravirt structures: we get a convenient
17574 * number for each function using the offset which we use to indicate
17575- * what to patch. */
17576+ * what to patch.
17577+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17578+ */
17579+
17580 struct paravirt_patch_template {
17581 struct pv_init_ops pv_init_ops;
17582 struct pv_time_ops pv_time_ops;
17583@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17584 struct pv_apic_ops pv_apic_ops;
17585 struct pv_mmu_ops pv_mmu_ops;
17586 struct pv_lock_ops pv_lock_ops;
17587-};
17588+} __no_randomize_layout;
17589
17590 extern struct pv_info pv_info;
17591 extern struct pv_init_ops pv_init_ops;
17592diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17593index c4412e9..90e88c5 100644
17594--- a/arch/x86/include/asm/pgalloc.h
17595+++ b/arch/x86/include/asm/pgalloc.h
17596@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17597 pmd_t *pmd, pte_t *pte)
17598 {
17599 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17600+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17601+}
17602+
17603+static inline void pmd_populate_user(struct mm_struct *mm,
17604+ pmd_t *pmd, pte_t *pte)
17605+{
17606+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17607 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17608 }
17609
17610@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17611
17612 #ifdef CONFIG_X86_PAE
17613 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17614+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17615+{
17616+ pud_populate(mm, pudp, pmd);
17617+}
17618 #else /* !CONFIG_X86_PAE */
17619 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17620 {
17621 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17622 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17623 }
17624+
17625+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17626+{
17627+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17628+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17629+}
17630 #endif /* CONFIG_X86_PAE */
17631
17632 #if PAGETABLE_LEVELS > 3
17633@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17634 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17635 }
17636
17637+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17638+{
17639+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17640+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17641+}
17642+
17643 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17644 {
17645 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17646diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17647index 0d193e2..bf59aeb 100644
17648--- a/arch/x86/include/asm/pgtable-2level.h
17649+++ b/arch/x86/include/asm/pgtable-2level.h
17650@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17651
17652 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17653 {
17654+ pax_open_kernel();
17655 *pmdp = pmd;
17656+ pax_close_kernel();
17657 }
17658
17659 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17660diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17661index 81bb91b..9392125 100644
17662--- a/arch/x86/include/asm/pgtable-3level.h
17663+++ b/arch/x86/include/asm/pgtable-3level.h
17664@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17665
17666 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17667 {
17668+ pax_open_kernel();
17669 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17670+ pax_close_kernel();
17671 }
17672
17673 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17674 {
17675+ pax_open_kernel();
17676 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17677+ pax_close_kernel();
17678 }
17679
17680 /*
17681diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17682index b459ddf..b44081b 100644
17683--- a/arch/x86/include/asm/pgtable.h
17684+++ b/arch/x86/include/asm/pgtable.h
17685@@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17686
17687 #ifndef __PAGETABLE_PUD_FOLDED
17688 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17689+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17690 #define pgd_clear(pgd) native_pgd_clear(pgd)
17691 #endif
17692
17693@@ -83,12 +84,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17694
17695 #define arch_end_context_switch(prev) do {} while(0)
17696
17697+#define pax_open_kernel() native_pax_open_kernel()
17698+#define pax_close_kernel() native_pax_close_kernel()
17699 #endif /* CONFIG_PARAVIRT */
17700
17701+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17702+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17703+
17704+#ifdef CONFIG_PAX_KERNEXEC
17705+static inline unsigned long native_pax_open_kernel(void)
17706+{
17707+ unsigned long cr0;
17708+
17709+ preempt_disable();
17710+ barrier();
17711+ cr0 = read_cr0() ^ X86_CR0_WP;
17712+ BUG_ON(cr0 & X86_CR0_WP);
17713+ write_cr0(cr0);
17714+ return cr0 ^ X86_CR0_WP;
17715+}
17716+
17717+static inline unsigned long native_pax_close_kernel(void)
17718+{
17719+ unsigned long cr0;
17720+
17721+ cr0 = read_cr0() ^ X86_CR0_WP;
17722+ BUG_ON(!(cr0 & X86_CR0_WP));
17723+ write_cr0(cr0);
17724+ barrier();
17725+ preempt_enable_no_resched();
17726+ return cr0 ^ X86_CR0_WP;
17727+}
17728+#else
17729+static inline unsigned long native_pax_open_kernel(void) { return 0; }
17730+static inline unsigned long native_pax_close_kernel(void) { return 0; }
17731+#endif
17732+
17733 /*
17734 * The following only work if pte_present() is true.
17735 * Undefined behaviour if not..
17736 */
17737+static inline int pte_user(pte_t pte)
17738+{
17739+ return pte_val(pte) & _PAGE_USER;
17740+}
17741+
17742 static inline int pte_dirty(pte_t pte)
17743 {
17744 return pte_flags(pte) & _PAGE_DIRTY;
17745@@ -149,6 +189,11 @@ static inline unsigned long pud_pfn(pud_t pud)
17746 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
17747 }
17748
17749+static inline unsigned long pgd_pfn(pgd_t pgd)
17750+{
17751+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
17752+}
17753+
17754 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
17755
17756 static inline int pmd_large(pmd_t pte)
17757@@ -202,9 +247,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
17758 return pte_clear_flags(pte, _PAGE_RW);
17759 }
17760
17761+static inline pte_t pte_mkread(pte_t pte)
17762+{
17763+ return __pte(pte_val(pte) | _PAGE_USER);
17764+}
17765+
17766 static inline pte_t pte_mkexec(pte_t pte)
17767 {
17768- return pte_clear_flags(pte, _PAGE_NX);
17769+#ifdef CONFIG_X86_PAE
17770+ if (__supported_pte_mask & _PAGE_NX)
17771+ return pte_clear_flags(pte, _PAGE_NX);
17772+ else
17773+#endif
17774+ return pte_set_flags(pte, _PAGE_USER);
17775+}
17776+
17777+static inline pte_t pte_exprotect(pte_t pte)
17778+{
17779+#ifdef CONFIG_X86_PAE
17780+ if (__supported_pte_mask & _PAGE_NX)
17781+ return pte_set_flags(pte, _PAGE_NX);
17782+ else
17783+#endif
17784+ return pte_clear_flags(pte, _PAGE_USER);
17785 }
17786
17787 static inline pte_t pte_mkdirty(pte_t pte)
17788@@ -431,6 +496,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
17789 #endif
17790
17791 #ifndef __ASSEMBLY__
17792+
17793+#ifdef CONFIG_PAX_PER_CPU_PGD
17794+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
17795+enum cpu_pgd_type {kernel = 0, user = 1};
17796+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
17797+{
17798+ return cpu_pgd[cpu][type];
17799+}
17800+#endif
17801+
17802 #include <linux/mm_types.h>
17803 #include <linux/mmdebug.h>
17804 #include <linux/log2.h>
17805@@ -571,7 +646,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
17806 * Currently stuck as a macro due to indirect forward reference to
17807 * linux/mmzone.h's __section_mem_map_addr() definition:
17808 */
17809-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
17810+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
17811
17812 /* Find an entry in the second-level page table.. */
17813 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
17814@@ -611,7 +686,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
17815 * Currently stuck as a macro due to indirect forward reference to
17816 * linux/mmzone.h's __section_mem_map_addr() definition:
17817 */
17818-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
17819+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
17820
17821 /* to find an entry in a page-table-directory. */
17822 static inline unsigned long pud_index(unsigned long address)
17823@@ -626,7 +701,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
17824
17825 static inline int pgd_bad(pgd_t pgd)
17826 {
17827- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
17828+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
17829 }
17830
17831 static inline int pgd_none(pgd_t pgd)
17832@@ -649,7 +724,12 @@ static inline int pgd_none(pgd_t pgd)
17833 * pgd_offset() returns a (pgd_t *)
17834 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
17835 */
17836-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
17837+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
17838+
17839+#ifdef CONFIG_PAX_PER_CPU_PGD
17840+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
17841+#endif
17842+
17843 /*
17844 * a shortcut which implies the use of the kernel's pgd, instead
17845 * of a process's
17846@@ -660,6 +740,23 @@ static inline int pgd_none(pgd_t pgd)
17847 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
17848 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
17849
17850+#ifdef CONFIG_X86_32
17851+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
17852+#else
17853+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
17854+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
17855+
17856+#ifdef CONFIG_PAX_MEMORY_UDEREF
17857+#ifdef __ASSEMBLY__
17858+#define pax_user_shadow_base pax_user_shadow_base(%rip)
17859+#else
17860+extern unsigned long pax_user_shadow_base;
17861+extern pgdval_t clone_pgd_mask;
17862+#endif
17863+#endif
17864+
17865+#endif
17866+
17867 #ifndef __ASSEMBLY__
17868
17869 extern int direct_gbpages;
17870@@ -826,11 +923,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
17871 * dst and src can be on the same page, but the range must not overlap,
17872 * and must not cross a page boundary.
17873 */
17874-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
17875+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
17876 {
17877- memcpy(dst, src, count * sizeof(pgd_t));
17878+ pax_open_kernel();
17879+ while (count--)
17880+ *dst++ = *src++;
17881+ pax_close_kernel();
17882 }
17883
17884+#ifdef CONFIG_PAX_PER_CPU_PGD
17885+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
17886+#endif
17887+
17888+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17889+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
17890+#else
17891+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
17892+#endif
17893+
17894 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
17895 static inline int page_level_shift(enum pg_level level)
17896 {
17897diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
17898index 9ee3221..b979c6b 100644
17899--- a/arch/x86/include/asm/pgtable_32.h
17900+++ b/arch/x86/include/asm/pgtable_32.h
17901@@ -25,9 +25,6 @@
17902 struct mm_struct;
17903 struct vm_area_struct;
17904
17905-extern pgd_t swapper_pg_dir[1024];
17906-extern pgd_t initial_page_table[1024];
17907-
17908 static inline void pgtable_cache_init(void) { }
17909 static inline void check_pgt_cache(void) { }
17910 void paging_init(void);
17911@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17912 # include <asm/pgtable-2level.h>
17913 #endif
17914
17915+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
17916+extern pgd_t initial_page_table[PTRS_PER_PGD];
17917+#ifdef CONFIG_X86_PAE
17918+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
17919+#endif
17920+
17921 #if defined(CONFIG_HIGHPTE)
17922 #define pte_offset_map(dir, address) \
17923 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
17924@@ -62,12 +65,17 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
17925 /* Clear a kernel PTE and flush it from the TLB */
17926 #define kpte_clear_flush(ptep, vaddr) \
17927 do { \
17928+ pax_open_kernel(); \
17929 pte_clear(&init_mm, (vaddr), (ptep)); \
17930+ pax_close_kernel(); \
17931 __flush_tlb_one((vaddr)); \
17932 } while (0)
17933
17934 #endif /* !__ASSEMBLY__ */
17935
17936+#define HAVE_ARCH_UNMAPPED_AREA
17937+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
17938+
17939 /*
17940 * kern_addr_valid() is (1) for FLATMEM and (0) for
17941 * SPARSEMEM and DISCONTIGMEM
17942diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
17943index ed5903b..c7fe163 100644
17944--- a/arch/x86/include/asm/pgtable_32_types.h
17945+++ b/arch/x86/include/asm/pgtable_32_types.h
17946@@ -8,7 +8,7 @@
17947 */
17948 #ifdef CONFIG_X86_PAE
17949 # include <asm/pgtable-3level_types.h>
17950-# define PMD_SIZE (1UL << PMD_SHIFT)
17951+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
17952 # define PMD_MASK (~(PMD_SIZE - 1))
17953 #else
17954 # include <asm/pgtable-2level_types.h>
17955@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
17956 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
17957 #endif
17958
17959+#ifdef CONFIG_PAX_KERNEXEC
17960+#ifndef __ASSEMBLY__
17961+extern unsigned char MODULES_EXEC_VADDR[];
17962+extern unsigned char MODULES_EXEC_END[];
17963+#endif
17964+#include <asm/boot.h>
17965+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
17966+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
17967+#else
17968+#define ktla_ktva(addr) (addr)
17969+#define ktva_ktla(addr) (addr)
17970+#endif
17971+
17972 #define MODULES_VADDR VMALLOC_START
17973 #define MODULES_END VMALLOC_END
17974 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
17975diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
17976index e22c1db..23a625a 100644
17977--- a/arch/x86/include/asm/pgtable_64.h
17978+++ b/arch/x86/include/asm/pgtable_64.h
17979@@ -16,10 +16,14 @@
17980
17981 extern pud_t level3_kernel_pgt[512];
17982 extern pud_t level3_ident_pgt[512];
17983+extern pud_t level3_vmalloc_start_pgt[512];
17984+extern pud_t level3_vmalloc_end_pgt[512];
17985+extern pud_t level3_vmemmap_pgt[512];
17986+extern pud_t level2_vmemmap_pgt[512];
17987 extern pmd_t level2_kernel_pgt[512];
17988 extern pmd_t level2_fixmap_pgt[512];
17989-extern pmd_t level2_ident_pgt[512];
17990-extern pgd_t init_level4_pgt[];
17991+extern pmd_t level2_ident_pgt[512*2];
17992+extern pgd_t init_level4_pgt[512];
17993
17994 #define swapper_pg_dir init_level4_pgt
17995
17996@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17997
17998 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17999 {
18000+ pax_open_kernel();
18001 *pmdp = pmd;
18002+ pax_close_kernel();
18003 }
18004
18005 static inline void native_pmd_clear(pmd_t *pmd)
18006@@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18007
18008 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18009 {
18010+ pax_open_kernel();
18011 *pudp = pud;
18012+ pax_close_kernel();
18013 }
18014
18015 static inline void native_pud_clear(pud_t *pud)
18016@@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
18017
18018 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18019 {
18020+ pax_open_kernel();
18021+ *pgdp = pgd;
18022+ pax_close_kernel();
18023+}
18024+
18025+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18026+{
18027 *pgdp = pgd;
18028 }
18029
18030diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18031index c883bf7..19970b3 100644
18032--- a/arch/x86/include/asm/pgtable_64_types.h
18033+++ b/arch/x86/include/asm/pgtable_64_types.h
18034@@ -61,6 +61,11 @@ typedef struct { pteval_t pte; } pte_t;
18035 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18036 #define MODULES_END _AC(0xffffffffff000000, UL)
18037 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18038+#define MODULES_EXEC_VADDR MODULES_VADDR
18039+#define MODULES_EXEC_END MODULES_END
18040+
18041+#define ktla_ktva(addr) (addr)
18042+#define ktva_ktla(addr) (addr)
18043
18044 #define EARLY_DYNAMIC_PAGE_TABLES 64
18045
18046diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18047index eb3d449..8d95316 100644
18048--- a/arch/x86/include/asm/pgtable_types.h
18049+++ b/arch/x86/include/asm/pgtable_types.h
18050@@ -16,13 +16,12 @@
18051 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
18052 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
18053 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
18054-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
18055+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
18056 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
18057 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
18058 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
18059-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
18060-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
18061-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
18062+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
18063+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
18064 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
18065
18066 /* If _PAGE_BIT_PRESENT is clear, we use these: */
18067@@ -40,7 +39,6 @@
18068 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
18069 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
18070 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
18071-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
18072 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
18073 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
18074 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
18075@@ -87,8 +85,10 @@
18076
18077 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18078 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18079-#else
18080+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18081 #define _PAGE_NX (_AT(pteval_t, 0))
18082+#else
18083+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18084 #endif
18085
18086 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18087@@ -147,6 +147,9 @@
18088 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18089 _PAGE_ACCESSED)
18090
18091+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18092+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18093+
18094 #define __PAGE_KERNEL_EXEC \
18095 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18096 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18097@@ -157,7 +160,7 @@
18098 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18099 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18100 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18101-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18102+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18103 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18104 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18105 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18106@@ -214,7 +217,7 @@
18107 #ifdef CONFIG_X86_64
18108 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18109 #else
18110-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18111+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18112 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18113 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18114 #endif
18115@@ -253,7 +256,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18116 {
18117 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18118 }
18119+#endif
18120
18121+#if PAGETABLE_LEVELS == 3
18122+#include <asm-generic/pgtable-nopud.h>
18123+#endif
18124+
18125+#if PAGETABLE_LEVELS == 2
18126+#include <asm-generic/pgtable-nopmd.h>
18127+#endif
18128+
18129+#ifndef __ASSEMBLY__
18130 #if PAGETABLE_LEVELS > 3
18131 typedef struct { pudval_t pud; } pud_t;
18132
18133@@ -267,8 +280,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18134 return pud.pud;
18135 }
18136 #else
18137-#include <asm-generic/pgtable-nopud.h>
18138-
18139 static inline pudval_t native_pud_val(pud_t pud)
18140 {
18141 return native_pgd_val(pud.pgd);
18142@@ -288,8 +299,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18143 return pmd.pmd;
18144 }
18145 #else
18146-#include <asm-generic/pgtable-nopmd.h>
18147-
18148 static inline pmdval_t native_pmd_val(pmd_t pmd)
18149 {
18150 return native_pgd_val(pmd.pud.pgd);
18151@@ -329,7 +338,6 @@ typedef struct page *pgtable_t;
18152
18153 extern pteval_t __supported_pte_mask;
18154 extern void set_nx(void);
18155-extern int nx_enabled;
18156
18157 #define pgprot_writecombine pgprot_writecombine
18158 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18159diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18160index 7024c12..71c46b9 100644
18161--- a/arch/x86/include/asm/preempt.h
18162+++ b/arch/x86/include/asm/preempt.h
18163@@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18164 */
18165 static __always_inline bool __preempt_count_dec_and_test(void)
18166 {
18167- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18168+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18169 }
18170
18171 /*
18172diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18173index a4ea023..33aa874 100644
18174--- a/arch/x86/include/asm/processor.h
18175+++ b/arch/x86/include/asm/processor.h
18176@@ -128,7 +128,7 @@ struct cpuinfo_x86 {
18177 /* Index into per_cpu list: */
18178 u16 cpu_index;
18179 u32 microcode;
18180-} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18181+} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18182
18183 #define X86_VENDOR_INTEL 0
18184 #define X86_VENDOR_CYRIX 1
18185@@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18186 : "memory");
18187 }
18188
18189+/* invpcid (%rdx),%rax */
18190+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18191+
18192+#define INVPCID_SINGLE_ADDRESS 0UL
18193+#define INVPCID_SINGLE_CONTEXT 1UL
18194+#define INVPCID_ALL_GLOBAL 2UL
18195+#define INVPCID_ALL_MONGLOBAL 3UL
18196+
18197+#define PCID_KERNEL 0UL
18198+#define PCID_USER 1UL
18199+#define PCID_NOFLUSH (1UL << 63)
18200+
18201 static inline void load_cr3(pgd_t *pgdir)
18202 {
18203- write_cr3(__pa(pgdir));
18204+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18205 }
18206
18207 #ifdef CONFIG_X86_32
18208@@ -283,7 +295,7 @@ struct tss_struct {
18209
18210 } ____cacheline_aligned;
18211
18212-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18213+extern struct tss_struct init_tss[NR_CPUS];
18214
18215 /*
18216 * Save the original ist values for checking stack pointers during debugging
18217@@ -479,6 +491,7 @@ struct thread_struct {
18218 unsigned short ds;
18219 unsigned short fsindex;
18220 unsigned short gsindex;
18221+ unsigned short ss;
18222 #endif
18223 #ifdef CONFIG_X86_32
18224 unsigned long ip;
18225@@ -588,29 +601,8 @@ static inline void load_sp0(struct tss_struct *tss,
18226 extern unsigned long mmu_cr4_features;
18227 extern u32 *trampoline_cr4_features;
18228
18229-static inline void set_in_cr4(unsigned long mask)
18230-{
18231- unsigned long cr4;
18232-
18233- mmu_cr4_features |= mask;
18234- if (trampoline_cr4_features)
18235- *trampoline_cr4_features = mmu_cr4_features;
18236- cr4 = read_cr4();
18237- cr4 |= mask;
18238- write_cr4(cr4);
18239-}
18240-
18241-static inline void clear_in_cr4(unsigned long mask)
18242-{
18243- unsigned long cr4;
18244-
18245- mmu_cr4_features &= ~mask;
18246- if (trampoline_cr4_features)
18247- *trampoline_cr4_features = mmu_cr4_features;
18248- cr4 = read_cr4();
18249- cr4 &= ~mask;
18250- write_cr4(cr4);
18251-}
18252+extern void set_in_cr4(unsigned long mask);
18253+extern void clear_in_cr4(unsigned long mask);
18254
18255 typedef struct {
18256 unsigned long seg;
18257@@ -836,11 +828,18 @@ static inline void spin_lock_prefetch(const void *x)
18258 */
18259 #define TASK_SIZE PAGE_OFFSET
18260 #define TASK_SIZE_MAX TASK_SIZE
18261+
18262+#ifdef CONFIG_PAX_SEGMEXEC
18263+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18264+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18265+#else
18266 #define STACK_TOP TASK_SIZE
18267-#define STACK_TOP_MAX STACK_TOP
18268+#endif
18269+
18270+#define STACK_TOP_MAX TASK_SIZE
18271
18272 #define INIT_THREAD { \
18273- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18274+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18275 .vm86_info = NULL, \
18276 .sysenter_cs = __KERNEL_CS, \
18277 .io_bitmap_ptr = NULL, \
18278@@ -854,7 +853,7 @@ static inline void spin_lock_prefetch(const void *x)
18279 */
18280 #define INIT_TSS { \
18281 .x86_tss = { \
18282- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18283+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18284 .ss0 = __KERNEL_DS, \
18285 .ss1 = __KERNEL_CS, \
18286 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18287@@ -865,11 +864,7 @@ static inline void spin_lock_prefetch(const void *x)
18288 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18289
18290 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18291-#define KSTK_TOP(info) \
18292-({ \
18293- unsigned long *__ptr = (unsigned long *)(info); \
18294- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18295-})
18296+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18297
18298 /*
18299 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18300@@ -884,7 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18301 #define task_pt_regs(task) \
18302 ({ \
18303 struct pt_regs *__regs__; \
18304- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18305+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18306 __regs__ - 1; \
18307 })
18308
18309@@ -894,13 +889,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18310 /*
18311 * User space process size. 47bits minus one guard page.
18312 */
18313-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18314+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18315
18316 /* This decides where the kernel will search for a free chunk of vm
18317 * space during mmap's.
18318 */
18319 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18320- 0xc0000000 : 0xFFFFe000)
18321+ 0xc0000000 : 0xFFFFf000)
18322
18323 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18324 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18325@@ -911,11 +906,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18326 #define STACK_TOP_MAX TASK_SIZE_MAX
18327
18328 #define INIT_THREAD { \
18329- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18330+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18331 }
18332
18333 #define INIT_TSS { \
18334- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18335+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18336 }
18337
18338 /*
18339@@ -943,6 +938,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18340 */
18341 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18342
18343+#ifdef CONFIG_PAX_SEGMEXEC
18344+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18345+#endif
18346+
18347 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18348
18349 /* Get/set a process' ability to use the timestamp counter instruction */
18350@@ -969,7 +968,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18351 return 0;
18352 }
18353
18354-extern unsigned long arch_align_stack(unsigned long sp);
18355+#define arch_align_stack(x) ((x) & ~0xfUL)
18356 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18357
18358 void default_idle(void);
18359@@ -979,6 +978,6 @@ bool xen_set_default_idle(void);
18360 #define xen_set_default_idle 0
18361 #endif
18362
18363-void stop_this_cpu(void *dummy);
18364+void stop_this_cpu(void *dummy) __noreturn;
18365 void df_debug(struct pt_regs *regs, long error_code);
18366 #endif /* _ASM_X86_PROCESSOR_H */
18367diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18368index 6205f0c..b31a4a4 100644
18369--- a/arch/x86/include/asm/ptrace.h
18370+++ b/arch/x86/include/asm/ptrace.h
18371@@ -84,28 +84,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18372 }
18373
18374 /*
18375- * user_mode_vm(regs) determines whether a register set came from user mode.
18376+ * user_mode(regs) determines whether a register set came from user mode.
18377 * This is true if V8086 mode was enabled OR if the register set was from
18378 * protected mode with RPL-3 CS value. This tricky test checks that with
18379 * one comparison. Many places in the kernel can bypass this full check
18380- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18381+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18382+ * be used.
18383 */
18384-static inline int user_mode(struct pt_regs *regs)
18385+static inline int user_mode_novm(struct pt_regs *regs)
18386 {
18387 #ifdef CONFIG_X86_32
18388 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18389 #else
18390- return !!(regs->cs & 3);
18391+ return !!(regs->cs & SEGMENT_RPL_MASK);
18392 #endif
18393 }
18394
18395-static inline int user_mode_vm(struct pt_regs *regs)
18396+static inline int user_mode(struct pt_regs *regs)
18397 {
18398 #ifdef CONFIG_X86_32
18399 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18400 USER_RPL;
18401 #else
18402- return user_mode(regs);
18403+ return user_mode_novm(regs);
18404 #endif
18405 }
18406
18407@@ -121,15 +122,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18408 #ifdef CONFIG_X86_64
18409 static inline bool user_64bit_mode(struct pt_regs *regs)
18410 {
18411+ unsigned long cs = regs->cs & 0xffff;
18412 #ifndef CONFIG_PARAVIRT
18413 /*
18414 * On non-paravirt systems, this is the only long mode CPL 3
18415 * selector. We do not allow long mode selectors in the LDT.
18416 */
18417- return regs->cs == __USER_CS;
18418+ return cs == __USER_CS;
18419 #else
18420 /* Headers are too twisted for this to go in paravirt.h. */
18421- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18422+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18423 #endif
18424 }
18425
18426@@ -180,9 +182,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18427 * Traps from the kernel do not save sp and ss.
18428 * Use the helper function to retrieve sp.
18429 */
18430- if (offset == offsetof(struct pt_regs, sp) &&
18431- regs->cs == __KERNEL_CS)
18432- return kernel_stack_pointer(regs);
18433+ if (offset == offsetof(struct pt_regs, sp)) {
18434+ unsigned long cs = regs->cs & 0xffff;
18435+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18436+ return kernel_stack_pointer(regs);
18437+ }
18438 #endif
18439 return *(unsigned long *)((unsigned long)regs + offset);
18440 }
18441diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18442index 9c6b890..5305f53 100644
18443--- a/arch/x86/include/asm/realmode.h
18444+++ b/arch/x86/include/asm/realmode.h
18445@@ -22,16 +22,14 @@ struct real_mode_header {
18446 #endif
18447 /* APM/BIOS reboot */
18448 u32 machine_real_restart_asm;
18449-#ifdef CONFIG_X86_64
18450 u32 machine_real_restart_seg;
18451-#endif
18452 };
18453
18454 /* This must match data at trampoline_32/64.S */
18455 struct trampoline_header {
18456 #ifdef CONFIG_X86_32
18457 u32 start;
18458- u16 gdt_pad;
18459+ u16 boot_cs;
18460 u16 gdt_limit;
18461 u32 gdt_base;
18462 #else
18463diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18464index a82c4f1..ac45053 100644
18465--- a/arch/x86/include/asm/reboot.h
18466+++ b/arch/x86/include/asm/reboot.h
18467@@ -6,13 +6,13 @@
18468 struct pt_regs;
18469
18470 struct machine_ops {
18471- void (*restart)(char *cmd);
18472- void (*halt)(void);
18473- void (*power_off)(void);
18474+ void (* __noreturn restart)(char *cmd);
18475+ void (* __noreturn halt)(void);
18476+ void (* __noreturn power_off)(void);
18477 void (*shutdown)(void);
18478 void (*crash_shutdown)(struct pt_regs *);
18479- void (*emergency_restart)(void);
18480-};
18481+ void (* __noreturn emergency_restart)(void);
18482+} __no_const;
18483
18484 extern struct machine_ops machine_ops;
18485
18486diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18487index 8f7866a..e442f20 100644
18488--- a/arch/x86/include/asm/rmwcc.h
18489+++ b/arch/x86/include/asm/rmwcc.h
18490@@ -3,7 +3,34 @@
18491
18492 #ifdef CC_HAVE_ASM_GOTO
18493
18494-#define __GEN_RMWcc(fullop, var, cc, ...) \
18495+#ifdef CONFIG_PAX_REFCOUNT
18496+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18497+do { \
18498+ asm_volatile_goto (fullop \
18499+ ";jno 0f\n" \
18500+ fullantiop \
18501+ ";int $4\n0:\n" \
18502+ _ASM_EXTABLE(0b, 0b) \
18503+ ";j" cc " %l[cc_label]" \
18504+ : : "m" (var), ## __VA_ARGS__ \
18505+ : "memory" : cc_label); \
18506+ return 0; \
18507+cc_label: \
18508+ return 1; \
18509+} while (0)
18510+#else
18511+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18512+do { \
18513+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18514+ : : "m" (var), ## __VA_ARGS__ \
18515+ : "memory" : cc_label); \
18516+ return 0; \
18517+cc_label: \
18518+ return 1; \
18519+} while (0)
18520+#endif
18521+
18522+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18523 do { \
18524 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18525 : : "m" (var), ## __VA_ARGS__ \
18526@@ -13,15 +40,46 @@ cc_label: \
18527 return 1; \
18528 } while (0)
18529
18530-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18531- __GEN_RMWcc(op " " arg0, var, cc)
18532+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18533+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18534
18535-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18536- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18537+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18538+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18539+
18540+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18541+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18542+
18543+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18544+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18545
18546 #else /* !CC_HAVE_ASM_GOTO */
18547
18548-#define __GEN_RMWcc(fullop, var, cc, ...) \
18549+#ifdef CONFIG_PAX_REFCOUNT
18550+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18551+do { \
18552+ char c; \
18553+ asm volatile (fullop \
18554+ ";jno 0f\n" \
18555+ fullantiop \
18556+ ";int $4\n0:\n" \
18557+ _ASM_EXTABLE(0b, 0b) \
18558+ "; set" cc " %1" \
18559+ : "+m" (var), "=qm" (c) \
18560+ : __VA_ARGS__ : "memory"); \
18561+ return c != 0; \
18562+} while (0)
18563+#else
18564+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18565+do { \
18566+ char c; \
18567+ asm volatile (fullop "; set" cc " %1" \
18568+ : "+m" (var), "=qm" (c) \
18569+ : __VA_ARGS__ : "memory"); \
18570+ return c != 0; \
18571+} while (0)
18572+#endif
18573+
18574+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18575 do { \
18576 char c; \
18577 asm volatile (fullop "; set" cc " %1" \
18578@@ -30,11 +88,17 @@ do { \
18579 return c != 0; \
18580 } while (0)
18581
18582-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18583- __GEN_RMWcc(op " " arg0, var, cc)
18584+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18585+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18586+
18587+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18588+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18589+
18590+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18591+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18592
18593-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18594- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18595+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18596+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18597
18598 #endif /* CC_HAVE_ASM_GOTO */
18599
18600diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18601index cad82c9..2e5c5c1 100644
18602--- a/arch/x86/include/asm/rwsem.h
18603+++ b/arch/x86/include/asm/rwsem.h
18604@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18605 {
18606 asm volatile("# beginning down_read\n\t"
18607 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18608+
18609+#ifdef CONFIG_PAX_REFCOUNT
18610+ "jno 0f\n"
18611+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18612+ "int $4\n0:\n"
18613+ _ASM_EXTABLE(0b, 0b)
18614+#endif
18615+
18616 /* adds 0x00000001 */
18617 " jns 1f\n"
18618 " call call_rwsem_down_read_failed\n"
18619@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18620 "1:\n\t"
18621 " mov %1,%2\n\t"
18622 " add %3,%2\n\t"
18623+
18624+#ifdef CONFIG_PAX_REFCOUNT
18625+ "jno 0f\n"
18626+ "sub %3,%2\n"
18627+ "int $4\n0:\n"
18628+ _ASM_EXTABLE(0b, 0b)
18629+#endif
18630+
18631 " jle 2f\n\t"
18632 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18633 " jnz 1b\n\t"
18634@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18635 long tmp;
18636 asm volatile("# beginning down_write\n\t"
18637 LOCK_PREFIX " xadd %1,(%2)\n\t"
18638+
18639+#ifdef CONFIG_PAX_REFCOUNT
18640+ "jno 0f\n"
18641+ "mov %1,(%2)\n"
18642+ "int $4\n0:\n"
18643+ _ASM_EXTABLE(0b, 0b)
18644+#endif
18645+
18646 /* adds 0xffff0001, returns the old value */
18647 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18648 /* was the active mask 0 before? */
18649@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18650 long tmp;
18651 asm volatile("# beginning __up_read\n\t"
18652 LOCK_PREFIX " xadd %1,(%2)\n\t"
18653+
18654+#ifdef CONFIG_PAX_REFCOUNT
18655+ "jno 0f\n"
18656+ "mov %1,(%2)\n"
18657+ "int $4\n0:\n"
18658+ _ASM_EXTABLE(0b, 0b)
18659+#endif
18660+
18661 /* subtracts 1, returns the old value */
18662 " jns 1f\n\t"
18663 " call call_rwsem_wake\n" /* expects old value in %edx */
18664@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18665 long tmp;
18666 asm volatile("# beginning __up_write\n\t"
18667 LOCK_PREFIX " xadd %1,(%2)\n\t"
18668+
18669+#ifdef CONFIG_PAX_REFCOUNT
18670+ "jno 0f\n"
18671+ "mov %1,(%2)\n"
18672+ "int $4\n0:\n"
18673+ _ASM_EXTABLE(0b, 0b)
18674+#endif
18675+
18676 /* subtracts 0xffff0001, returns the old value */
18677 " jns 1f\n\t"
18678 " call call_rwsem_wake\n" /* expects old value in %edx */
18679@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18680 {
18681 asm volatile("# beginning __downgrade_write\n\t"
18682 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18683+
18684+#ifdef CONFIG_PAX_REFCOUNT
18685+ "jno 0f\n"
18686+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18687+ "int $4\n0:\n"
18688+ _ASM_EXTABLE(0b, 0b)
18689+#endif
18690+
18691 /*
18692 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18693 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18694@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18695 */
18696 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18697 {
18698- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18699+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18700+
18701+#ifdef CONFIG_PAX_REFCOUNT
18702+ "jno 0f\n"
18703+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18704+ "int $4\n0:\n"
18705+ _ASM_EXTABLE(0b, 0b)
18706+#endif
18707+
18708 : "+m" (sem->count)
18709 : "er" (delta));
18710 }
18711@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18712 */
18713 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18714 {
18715- return delta + xadd(&sem->count, delta);
18716+ return delta + xadd_check_overflow(&sem->count, delta);
18717 }
18718
18719 #endif /* __KERNEL__ */
18720diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18721index 6f1c3a8..7744f19 100644
18722--- a/arch/x86/include/asm/segment.h
18723+++ b/arch/x86/include/asm/segment.h
18724@@ -64,10 +64,15 @@
18725 * 26 - ESPFIX small SS
18726 * 27 - per-cpu [ offset to per-cpu data area ]
18727 * 28 - stack_canary-20 [ for stack protector ]
18728- * 29 - unused
18729- * 30 - unused
18730+ * 29 - PCI BIOS CS
18731+ * 30 - PCI BIOS DS
18732 * 31 - TSS for double fault handler
18733 */
18734+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18735+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18736+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18737+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18738+
18739 #define GDT_ENTRY_TLS_MIN 6
18740 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18741
18742@@ -79,6 +84,8 @@
18743
18744 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
18745
18746+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
18747+
18748 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
18749
18750 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
18751@@ -104,6 +111,12 @@
18752 #define __KERNEL_STACK_CANARY 0
18753 #endif
18754
18755+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
18756+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18757+
18758+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
18759+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
18760+
18761 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
18762
18763 /*
18764@@ -141,7 +154,7 @@
18765 */
18766
18767 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
18768-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
18769+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
18770
18771
18772 #else
18773@@ -165,6 +178,8 @@
18774 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
18775 #define __USER32_DS __USER_DS
18776
18777+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
18778+
18779 #define GDT_ENTRY_TSS 8 /* needs two entries */
18780 #define GDT_ENTRY_LDT 10 /* needs two entries */
18781 #define GDT_ENTRY_TLS_MIN 12
18782@@ -173,6 +188,8 @@
18783 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
18784 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
18785
18786+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
18787+
18788 /* TLS indexes for 64bit - hardcoded in arch_prctl */
18789 #define FS_TLS 0
18790 #define GS_TLS 1
18791@@ -180,12 +197,14 @@
18792 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
18793 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
18794
18795-#define GDT_ENTRIES 16
18796+#define GDT_ENTRIES 17
18797
18798 #endif
18799
18800 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
18801+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
18802 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
18803+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
18804 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
18805 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
18806 #ifndef CONFIG_PARAVIRT
18807@@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
18808 {
18809 unsigned long __limit;
18810 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
18811- return __limit + 1;
18812+ return __limit;
18813 }
18814
18815 #endif /* !__ASSEMBLY__ */
18816diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
18817index 8d3120f..352b440 100644
18818--- a/arch/x86/include/asm/smap.h
18819+++ b/arch/x86/include/asm/smap.h
18820@@ -25,11 +25,40 @@
18821
18822 #include <asm/alternative-asm.h>
18823
18824+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18825+#define ASM_PAX_OPEN_USERLAND \
18826+ 661: jmp 663f; \
18827+ .pushsection .altinstr_replacement, "a" ; \
18828+ 662: pushq %rax; nop; \
18829+ .popsection ; \
18830+ .pushsection .altinstructions, "a" ; \
18831+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18832+ .popsection ; \
18833+ call __pax_open_userland; \
18834+ popq %rax; \
18835+ 663:
18836+
18837+#define ASM_PAX_CLOSE_USERLAND \
18838+ 661: jmp 663f; \
18839+ .pushsection .altinstr_replacement, "a" ; \
18840+ 662: pushq %rax; nop; \
18841+ .popsection; \
18842+ .pushsection .altinstructions, "a" ; \
18843+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
18844+ .popsection; \
18845+ call __pax_close_userland; \
18846+ popq %rax; \
18847+ 663:
18848+#else
18849+#define ASM_PAX_OPEN_USERLAND
18850+#define ASM_PAX_CLOSE_USERLAND
18851+#endif
18852+
18853 #ifdef CONFIG_X86_SMAP
18854
18855 #define ASM_CLAC \
18856 661: ASM_NOP3 ; \
18857- .pushsection .altinstr_replacement, "ax" ; \
18858+ .pushsection .altinstr_replacement, "a" ; \
18859 662: __ASM_CLAC ; \
18860 .popsection ; \
18861 .pushsection .altinstructions, "a" ; \
18862@@ -38,7 +67,7 @@
18863
18864 #define ASM_STAC \
18865 661: ASM_NOP3 ; \
18866- .pushsection .altinstr_replacement, "ax" ; \
18867+ .pushsection .altinstr_replacement, "a" ; \
18868 662: __ASM_STAC ; \
18869 .popsection ; \
18870 .pushsection .altinstructions, "a" ; \
18871@@ -56,6 +85,37 @@
18872
18873 #include <asm/alternative.h>
18874
18875+#define __HAVE_ARCH_PAX_OPEN_USERLAND
18876+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
18877+
18878+extern void __pax_open_userland(void);
18879+static __always_inline unsigned long pax_open_userland(void)
18880+{
18881+
18882+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18883+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
18884+ :
18885+ : [open] "i" (__pax_open_userland)
18886+ : "memory", "rax");
18887+#endif
18888+
18889+ return 0;
18890+}
18891+
18892+extern void __pax_close_userland(void);
18893+static __always_inline unsigned long pax_close_userland(void)
18894+{
18895+
18896+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18897+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
18898+ :
18899+ : [close] "i" (__pax_close_userland)
18900+ : "memory", "rax");
18901+#endif
18902+
18903+ return 0;
18904+}
18905+
18906 #ifdef CONFIG_X86_SMAP
18907
18908 static __always_inline void clac(void)
18909diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
18910index 8cd27e0..7f05ec8 100644
18911--- a/arch/x86/include/asm/smp.h
18912+++ b/arch/x86/include/asm/smp.h
18913@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
18914 /* cpus sharing the last level cache: */
18915 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
18916 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
18917-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
18918+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
18919
18920 static inline struct cpumask *cpu_sibling_mask(int cpu)
18921 {
18922@@ -78,7 +78,7 @@ struct smp_ops {
18923
18924 void (*send_call_func_ipi)(const struct cpumask *mask);
18925 void (*send_call_func_single_ipi)(int cpu);
18926-};
18927+} __no_const;
18928
18929 /* Globals due to paravirt */
18930 extern void set_cpu_sibling_map(int cpu);
18931@@ -190,14 +190,8 @@ extern unsigned disabled_cpus;
18932 extern int safe_smp_processor_id(void);
18933
18934 #elif defined(CONFIG_X86_64_SMP)
18935-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18936-
18937-#define stack_smp_processor_id() \
18938-({ \
18939- struct thread_info *ti; \
18940- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
18941- ti->cpu; \
18942-})
18943+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
18944+#define stack_smp_processor_id() raw_smp_processor_id()
18945 #define safe_smp_processor_id() smp_processor_id()
18946
18947 #endif
18948diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
18949index 0f62f54..cb5d0dd 100644
18950--- a/arch/x86/include/asm/spinlock.h
18951+++ b/arch/x86/include/asm/spinlock.h
18952@@ -222,6 +222,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
18953 static inline void arch_read_lock(arch_rwlock_t *rw)
18954 {
18955 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
18956+
18957+#ifdef CONFIG_PAX_REFCOUNT
18958+ "jno 0f\n"
18959+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
18960+ "int $4\n0:\n"
18961+ _ASM_EXTABLE(0b, 0b)
18962+#endif
18963+
18964 "jns 1f\n"
18965 "call __read_lock_failed\n\t"
18966 "1:\n"
18967@@ -231,6 +239,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
18968 static inline void arch_write_lock(arch_rwlock_t *rw)
18969 {
18970 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
18971+
18972+#ifdef CONFIG_PAX_REFCOUNT
18973+ "jno 0f\n"
18974+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
18975+ "int $4\n0:\n"
18976+ _ASM_EXTABLE(0b, 0b)
18977+#endif
18978+
18979 "jz 1f\n"
18980 "call __write_lock_failed\n\t"
18981 "1:\n"
18982@@ -260,13 +276,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
18983
18984 static inline void arch_read_unlock(arch_rwlock_t *rw)
18985 {
18986- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
18987+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
18988+
18989+#ifdef CONFIG_PAX_REFCOUNT
18990+ "jno 0f\n"
18991+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
18992+ "int $4\n0:\n"
18993+ _ASM_EXTABLE(0b, 0b)
18994+#endif
18995+
18996 :"+m" (rw->lock) : : "memory");
18997 }
18998
18999 static inline void arch_write_unlock(arch_rwlock_t *rw)
19000 {
19001- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
19002+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
19003+
19004+#ifdef CONFIG_PAX_REFCOUNT
19005+ "jno 0f\n"
19006+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
19007+ "int $4\n0:\n"
19008+ _ASM_EXTABLE(0b, 0b)
19009+#endif
19010+
19011 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
19012 }
19013
19014diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19015index 6a99859..03cb807 100644
19016--- a/arch/x86/include/asm/stackprotector.h
19017+++ b/arch/x86/include/asm/stackprotector.h
19018@@ -47,7 +47,7 @@
19019 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19020 */
19021 #define GDT_STACK_CANARY_INIT \
19022- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19023+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19024
19025 /*
19026 * Initialize the stackprotector canary value.
19027@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19028
19029 static inline void load_stack_canary_segment(void)
19030 {
19031-#ifdef CONFIG_X86_32
19032+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19033 asm volatile ("mov %0, %%gs" : : "r" (0));
19034 #endif
19035 }
19036diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19037index 70bbe39..4ae2bd4 100644
19038--- a/arch/x86/include/asm/stacktrace.h
19039+++ b/arch/x86/include/asm/stacktrace.h
19040@@ -11,28 +11,20 @@
19041
19042 extern int kstack_depth_to_print;
19043
19044-struct thread_info;
19045+struct task_struct;
19046 struct stacktrace_ops;
19047
19048-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19049- unsigned long *stack,
19050- unsigned long bp,
19051- const struct stacktrace_ops *ops,
19052- void *data,
19053- unsigned long *end,
19054- int *graph);
19055+typedef unsigned long walk_stack_t(struct task_struct *task,
19056+ void *stack_start,
19057+ unsigned long *stack,
19058+ unsigned long bp,
19059+ const struct stacktrace_ops *ops,
19060+ void *data,
19061+ unsigned long *end,
19062+ int *graph);
19063
19064-extern unsigned long
19065-print_context_stack(struct thread_info *tinfo,
19066- unsigned long *stack, unsigned long bp,
19067- const struct stacktrace_ops *ops, void *data,
19068- unsigned long *end, int *graph);
19069-
19070-extern unsigned long
19071-print_context_stack_bp(struct thread_info *tinfo,
19072- unsigned long *stack, unsigned long bp,
19073- const struct stacktrace_ops *ops, void *data,
19074- unsigned long *end, int *graph);
19075+extern walk_stack_t print_context_stack;
19076+extern walk_stack_t print_context_stack_bp;
19077
19078 /* Generic stack tracer with callbacks */
19079
19080@@ -40,7 +32,7 @@ struct stacktrace_ops {
19081 void (*address)(void *data, unsigned long address, int reliable);
19082 /* On negative return stop dumping */
19083 int (*stack)(void *data, char *name);
19084- walk_stack_t walk_stack;
19085+ walk_stack_t *walk_stack;
19086 };
19087
19088 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19089diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19090index d7f3b3b..3cc39f1 100644
19091--- a/arch/x86/include/asm/switch_to.h
19092+++ b/arch/x86/include/asm/switch_to.h
19093@@ -108,7 +108,7 @@ do { \
19094 "call __switch_to\n\t" \
19095 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19096 __switch_canary \
19097- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19098+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19099 "movq %%rax,%%rdi\n\t" \
19100 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19101 "jnz ret_from_fork\n\t" \
19102@@ -119,7 +119,7 @@ do { \
19103 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19104 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19105 [_tif_fork] "i" (_TIF_FORK), \
19106- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19107+ [thread_info] "m" (current_tinfo), \
19108 [current_task] "m" (current_task) \
19109 __switch_canary_iparam \
19110 : "memory", "cc" __EXTRA_CLOBBER)
19111diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19112index 47e5de2..d3dda54 100644
19113--- a/arch/x86/include/asm/thread_info.h
19114+++ b/arch/x86/include/asm/thread_info.h
19115@@ -24,7 +24,6 @@ struct exec_domain;
19116 #include <linux/atomic.h>
19117
19118 struct thread_info {
19119- struct task_struct *task; /* main task structure */
19120 struct exec_domain *exec_domain; /* execution domain */
19121 __u32 flags; /* low level flags */
19122 __u32 status; /* thread synchronous flags */
19123@@ -33,13 +32,13 @@ struct thread_info {
19124 mm_segment_t addr_limit;
19125 struct restart_block restart_block;
19126 void __user *sysenter_return;
19127+ unsigned long lowest_stack;
19128 unsigned int sig_on_uaccess_error:1;
19129 unsigned int uaccess_err:1; /* uaccess failed */
19130 };
19131
19132-#define INIT_THREAD_INFO(tsk) \
19133+#define INIT_THREAD_INFO \
19134 { \
19135- .task = &tsk, \
19136 .exec_domain = &default_exec_domain, \
19137 .flags = 0, \
19138 .cpu = 0, \
19139@@ -50,7 +49,7 @@ struct thread_info {
19140 }, \
19141 }
19142
19143-#define init_thread_info (init_thread_union.thread_info)
19144+#define init_thread_info (init_thread_union.stack)
19145 #define init_stack (init_thread_union.stack)
19146
19147 #else /* !__ASSEMBLY__ */
19148@@ -90,6 +89,7 @@ struct thread_info {
19149 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19150 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19151 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19152+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19153
19154 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19155 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19156@@ -113,17 +113,18 @@ struct thread_info {
19157 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19158 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19159 #define _TIF_X32 (1 << TIF_X32)
19160+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19161
19162 /* work to do in syscall_trace_enter() */
19163 #define _TIF_WORK_SYSCALL_ENTRY \
19164 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19165 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19166- _TIF_NOHZ)
19167+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19168
19169 /* work to do in syscall_trace_leave() */
19170 #define _TIF_WORK_SYSCALL_EXIT \
19171 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19172- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19173+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19174
19175 /* work to do on interrupt/exception return */
19176 #define _TIF_WORK_MASK \
19177@@ -134,7 +135,7 @@ struct thread_info {
19178 /* work to do on any return to user space */
19179 #define _TIF_ALLWORK_MASK \
19180 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19181- _TIF_NOHZ)
19182+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19183
19184 /* Only used for 64 bit */
19185 #define _TIF_DO_NOTIFY_MASK \
19186@@ -149,7 +150,6 @@ struct thread_info {
19187 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19188
19189 #define STACK_WARN (THREAD_SIZE/8)
19190-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19191
19192 /*
19193 * macros/functions for gaining access to the thread information structure
19194@@ -160,26 +160,18 @@ struct thread_info {
19195
19196 DECLARE_PER_CPU(unsigned long, kernel_stack);
19197
19198+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19199+
19200 static inline struct thread_info *current_thread_info(void)
19201 {
19202- struct thread_info *ti;
19203- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19204- KERNEL_STACK_OFFSET - THREAD_SIZE);
19205- return ti;
19206+ return this_cpu_read_stable(current_tinfo);
19207 }
19208
19209 #else /* !__ASSEMBLY__ */
19210
19211 /* how to get the thread information struct from ASM */
19212 #define GET_THREAD_INFO(reg) \
19213- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19214- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19215-
19216-/*
19217- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19218- * a certain register (to be used in assembler memory operands).
19219- */
19220-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19221+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19222
19223 #endif
19224
19225@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19226 extern void arch_task_cache_init(void);
19227 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19228 extern void arch_release_task_struct(struct task_struct *tsk);
19229+
19230+#define __HAVE_THREAD_FUNCTIONS
19231+#define task_thread_info(task) (&(task)->tinfo)
19232+#define task_stack_page(task) ((task)->stack)
19233+#define setup_thread_stack(p, org) do {} while (0)
19234+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19235+
19236 #endif
19237 #endif /* _ASM_X86_THREAD_INFO_H */
19238diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19239index 04905bf..49203ca 100644
19240--- a/arch/x86/include/asm/tlbflush.h
19241+++ b/arch/x86/include/asm/tlbflush.h
19242@@ -17,18 +17,44 @@
19243
19244 static inline void __native_flush_tlb(void)
19245 {
19246+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19247+ u64 descriptor[2];
19248+
19249+ descriptor[0] = PCID_KERNEL;
19250+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
19251+ return;
19252+ }
19253+
19254+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19255+ if (static_cpu_has(X86_FEATURE_PCID)) {
19256+ unsigned int cpu = raw_get_cpu();
19257+
19258+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19259+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19260+ raw_put_cpu_no_resched();
19261+ return;
19262+ }
19263+#endif
19264+
19265 native_write_cr3(native_read_cr3());
19266 }
19267
19268 static inline void __native_flush_tlb_global_irq_disabled(void)
19269 {
19270- unsigned long cr4;
19271+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19272+ u64 descriptor[2];
19273
19274- cr4 = native_read_cr4();
19275- /* clear PGE */
19276- native_write_cr4(cr4 & ~X86_CR4_PGE);
19277- /* write old PGE again and flush TLBs */
19278- native_write_cr4(cr4);
19279+ descriptor[0] = PCID_KERNEL;
19280+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19281+ } else {
19282+ unsigned long cr4;
19283+
19284+ cr4 = native_read_cr4();
19285+ /* clear PGE */
19286+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19287+ /* write old PGE again and flush TLBs */
19288+ native_write_cr4(cr4);
19289+ }
19290 }
19291
19292 static inline void __native_flush_tlb_global(void)
19293@@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19294
19295 static inline void __native_flush_tlb_single(unsigned long addr)
19296 {
19297+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19298+ u64 descriptor[2];
19299+
19300+ descriptor[0] = PCID_KERNEL;
19301+ descriptor[1] = addr;
19302+
19303+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19304+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19305+ if (addr < TASK_SIZE_MAX)
19306+ descriptor[1] += pax_user_shadow_base;
19307+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19308+ }
19309+
19310+ descriptor[0] = PCID_USER;
19311+ descriptor[1] = addr;
19312+#endif
19313+
19314+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19315+ return;
19316+ }
19317+
19318+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19319+ if (static_cpu_has(X86_FEATURE_PCID)) {
19320+ unsigned int cpu = raw_get_cpu();
19321+
19322+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19323+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19324+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19325+ raw_put_cpu_no_resched();
19326+
19327+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19328+ addr += pax_user_shadow_base;
19329+ }
19330+#endif
19331+
19332 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19333 }
19334
19335diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19336index 0d592e0..7437fcc 100644
19337--- a/arch/x86/include/asm/uaccess.h
19338+++ b/arch/x86/include/asm/uaccess.h
19339@@ -7,6 +7,7 @@
19340 #include <linux/compiler.h>
19341 #include <linux/thread_info.h>
19342 #include <linux/string.h>
19343+#include <linux/spinlock.h>
19344 #include <asm/asm.h>
19345 #include <asm/page.h>
19346 #include <asm/smap.h>
19347@@ -29,7 +30,12 @@
19348
19349 #define get_ds() (KERNEL_DS)
19350 #define get_fs() (current_thread_info()->addr_limit)
19351+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19352+void __set_fs(mm_segment_t x);
19353+void set_fs(mm_segment_t x);
19354+#else
19355 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19356+#endif
19357
19358 #define segment_eq(a, b) ((a).seg == (b).seg)
19359
19360@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19361 * checks that the pointer is in the user space range - after calling
19362 * this function, memory access functions may still return -EFAULT.
19363 */
19364-#define access_ok(type, addr, size) \
19365- likely(!__range_not_ok(addr, size, user_addr_max()))
19366+extern int _cond_resched(void);
19367+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19368+#define access_ok(type, addr, size) \
19369+({ \
19370+ unsigned long __size = size; \
19371+ unsigned long __addr = (unsigned long)addr; \
19372+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19373+ if (__ret_ao && __size) { \
19374+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19375+ unsigned long __end_ao = __addr + __size - 1; \
19376+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19377+ while (__addr_ao <= __end_ao) { \
19378+ char __c_ao; \
19379+ __addr_ao += PAGE_SIZE; \
19380+ if (__size > PAGE_SIZE) \
19381+ _cond_resched(); \
19382+ if (__get_user(__c_ao, (char __user *)__addr)) \
19383+ break; \
19384+ if (type != VERIFY_WRITE) { \
19385+ __addr = __addr_ao; \
19386+ continue; \
19387+ } \
19388+ if (__put_user(__c_ao, (char __user *)__addr)) \
19389+ break; \
19390+ __addr = __addr_ao; \
19391+ } \
19392+ } \
19393+ } \
19394+ __ret_ao; \
19395+})
19396
19397 /*
19398 * The exception table consists of pairs of addresses relative to the
19399@@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19400 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19401 __chk_user_ptr(ptr); \
19402 might_fault(); \
19403+ pax_open_userland(); \
19404 asm volatile("call __get_user_%P3" \
19405 : "=a" (__ret_gu), "=r" (__val_gu) \
19406 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19407 (x) = (__typeof__(*(ptr))) __val_gu; \
19408+ pax_close_userland(); \
19409 __ret_gu; \
19410 })
19411
19412@@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19413 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19414 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19415
19416-
19417+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19418+#define __copyuser_seg "gs;"
19419+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19420+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19421+#else
19422+#define __copyuser_seg
19423+#define __COPYUSER_SET_ES
19424+#define __COPYUSER_RESTORE_ES
19425+#endif
19426
19427 #ifdef CONFIG_X86_32
19428 #define __put_user_asm_u64(x, addr, err, errret) \
19429 asm volatile(ASM_STAC "\n" \
19430- "1: movl %%eax,0(%2)\n" \
19431- "2: movl %%edx,4(%2)\n" \
19432+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19433+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19434 "3: " ASM_CLAC "\n" \
19435 ".section .fixup,\"ax\"\n" \
19436 "4: movl %3,%0\n" \
19437@@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19438
19439 #define __put_user_asm_ex_u64(x, addr) \
19440 asm volatile(ASM_STAC "\n" \
19441- "1: movl %%eax,0(%1)\n" \
19442- "2: movl %%edx,4(%1)\n" \
19443+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19444+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19445 "3: " ASM_CLAC "\n" \
19446 _ASM_EXTABLE_EX(1b, 2b) \
19447 _ASM_EXTABLE_EX(2b, 3b) \
19448@@ -257,7 +301,8 @@ extern void __put_user_8(void);
19449 __typeof__(*(ptr)) __pu_val; \
19450 __chk_user_ptr(ptr); \
19451 might_fault(); \
19452- __pu_val = x; \
19453+ __pu_val = (x); \
19454+ pax_open_userland(); \
19455 switch (sizeof(*(ptr))) { \
19456 case 1: \
19457 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19458@@ -275,6 +320,7 @@ extern void __put_user_8(void);
19459 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19460 break; \
19461 } \
19462+ pax_close_userland(); \
19463 __ret_pu; \
19464 })
19465
19466@@ -355,8 +401,10 @@ do { \
19467 } while (0)
19468
19469 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19470+do { \
19471+ pax_open_userland(); \
19472 asm volatile(ASM_STAC "\n" \
19473- "1: mov"itype" %2,%"rtype"1\n" \
19474+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19475 "2: " ASM_CLAC "\n" \
19476 ".section .fixup,\"ax\"\n" \
19477 "3: mov %3,%0\n" \
19478@@ -364,8 +412,10 @@ do { \
19479 " jmp 2b\n" \
19480 ".previous\n" \
19481 _ASM_EXTABLE(1b, 3b) \
19482- : "=r" (err), ltype(x) \
19483- : "m" (__m(addr)), "i" (errret), "0" (err))
19484+ : "=r" (err), ltype (x) \
19485+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19486+ pax_close_userland(); \
19487+} while (0)
19488
19489 #define __get_user_size_ex(x, ptr, size) \
19490 do { \
19491@@ -389,7 +439,7 @@ do { \
19492 } while (0)
19493
19494 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19495- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19496+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19497 "2:\n" \
19498 _ASM_EXTABLE_EX(1b, 2b) \
19499 : ltype(x) : "m" (__m(addr)))
19500@@ -406,13 +456,24 @@ do { \
19501 int __gu_err; \
19502 unsigned long __gu_val; \
19503 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19504- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19505+ (x) = (__typeof__(*(ptr)))__gu_val; \
19506 __gu_err; \
19507 })
19508
19509 /* FIXME: this hack is definitely wrong -AK */
19510 struct __large_struct { unsigned long buf[100]; };
19511-#define __m(x) (*(struct __large_struct __user *)(x))
19512+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19513+#define ____m(x) \
19514+({ \
19515+ unsigned long ____x = (unsigned long)(x); \
19516+ if (____x < pax_user_shadow_base) \
19517+ ____x += pax_user_shadow_base; \
19518+ (typeof(x))____x; \
19519+})
19520+#else
19521+#define ____m(x) (x)
19522+#endif
19523+#define __m(x) (*(struct __large_struct __user *)____m(x))
19524
19525 /*
19526 * Tell gcc we read from memory instead of writing: this is because
19527@@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19528 * aliasing issues.
19529 */
19530 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19531+do { \
19532+ pax_open_userland(); \
19533 asm volatile(ASM_STAC "\n" \
19534- "1: mov"itype" %"rtype"1,%2\n" \
19535+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19536 "2: " ASM_CLAC "\n" \
19537 ".section .fixup,\"ax\"\n" \
19538 "3: mov %3,%0\n" \
19539@@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19540 ".previous\n" \
19541 _ASM_EXTABLE(1b, 3b) \
19542 : "=r"(err) \
19543- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19544+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19545+ pax_close_userland(); \
19546+} while (0)
19547
19548 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19549- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19550+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19551 "2:\n" \
19552 _ASM_EXTABLE_EX(1b, 2b) \
19553 : : ltype(x), "m" (__m(addr)))
19554@@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19555 */
19556 #define uaccess_try do { \
19557 current_thread_info()->uaccess_err = 0; \
19558+ pax_open_userland(); \
19559 stac(); \
19560 barrier();
19561
19562 #define uaccess_catch(err) \
19563 clac(); \
19564+ pax_close_userland(); \
19565 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19566 } while (0)
19567
19568@@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19569 * On error, the variable @x is set to zero.
19570 */
19571
19572+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19573+#define __get_user(x, ptr) get_user((x), (ptr))
19574+#else
19575 #define __get_user(x, ptr) \
19576 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19577+#endif
19578
19579 /**
19580 * __put_user: - Write a simple value into user space, with less checking.
19581@@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19582 * Returns zero on success, or -EFAULT on error.
19583 */
19584
19585+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19586+#define __put_user(x, ptr) put_user((x), (ptr))
19587+#else
19588 #define __put_user(x, ptr) \
19589 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19590+#endif
19591
19592 #define __get_user_unaligned __get_user
19593 #define __put_user_unaligned __put_user
19594@@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19595 #define get_user_ex(x, ptr) do { \
19596 unsigned long __gue_val; \
19597 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19598- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19599+ (x) = (__typeof__(*(ptr)))__gue_val; \
19600 } while (0)
19601
19602 #define put_user_try uaccess_try
19603@@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19604 __typeof__(ptr) __uval = (uval); \
19605 __typeof__(*(ptr)) __old = (old); \
19606 __typeof__(*(ptr)) __new = (new); \
19607+ pax_open_userland(); \
19608 switch (size) { \
19609 case 1: \
19610 { \
19611 asm volatile("\t" ASM_STAC "\n" \
19612- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19613+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19614 "2:\t" ASM_CLAC "\n" \
19615 "\t.section .fixup, \"ax\"\n" \
19616 "3:\tmov %3, %0\n" \
19617 "\tjmp 2b\n" \
19618 "\t.previous\n" \
19619 _ASM_EXTABLE(1b, 3b) \
19620- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19621+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19622 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19623 : "memory" \
19624 ); \
19625@@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19626 case 2: \
19627 { \
19628 asm volatile("\t" ASM_STAC "\n" \
19629- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19630+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19631 "2:\t" ASM_CLAC "\n" \
19632 "\t.section .fixup, \"ax\"\n" \
19633 "3:\tmov %3, %0\n" \
19634 "\tjmp 2b\n" \
19635 "\t.previous\n" \
19636 _ASM_EXTABLE(1b, 3b) \
19637- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19638+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19639 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19640 : "memory" \
19641 ); \
19642@@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19643 case 4: \
19644 { \
19645 asm volatile("\t" ASM_STAC "\n" \
19646- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19647+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19648 "2:\t" ASM_CLAC "\n" \
19649 "\t.section .fixup, \"ax\"\n" \
19650 "3:\tmov %3, %0\n" \
19651 "\tjmp 2b\n" \
19652 "\t.previous\n" \
19653 _ASM_EXTABLE(1b, 3b) \
19654- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19655+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19656 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19657 : "memory" \
19658 ); \
19659@@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19660 __cmpxchg_wrong_size(); \
19661 \
19662 asm volatile("\t" ASM_STAC "\n" \
19663- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19664+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19665 "2:\t" ASM_CLAC "\n" \
19666 "\t.section .fixup, \"ax\"\n" \
19667 "3:\tmov %3, %0\n" \
19668 "\tjmp 2b\n" \
19669 "\t.previous\n" \
19670 _ASM_EXTABLE(1b, 3b) \
19671- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19672+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19673 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19674 : "memory" \
19675 ); \
19676@@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19677 default: \
19678 __cmpxchg_wrong_size(); \
19679 } \
19680+ pax_close_userland(); \
19681 *__uval = __old; \
19682 __ret; \
19683 })
19684@@ -636,17 +713,6 @@ extern struct movsl_mask {
19685
19686 #define ARCH_HAS_NOCACHE_UACCESS 1
19687
19688-#ifdef CONFIG_X86_32
19689-# include <asm/uaccess_32.h>
19690-#else
19691-# include <asm/uaccess_64.h>
19692-#endif
19693-
19694-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19695- unsigned n);
19696-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19697- unsigned n);
19698-
19699 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19700 # define copy_user_diag __compiletime_error
19701 #else
19702@@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19703 extern void copy_user_diag("copy_from_user() buffer size is too small")
19704 copy_from_user_overflow(void);
19705 extern void copy_user_diag("copy_to_user() buffer size is too small")
19706-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19707+copy_to_user_overflow(void);
19708
19709 #undef copy_user_diag
19710
19711@@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19712
19713 extern void
19714 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19715-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19716+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19717 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19718
19719 #else
19720@@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19721
19722 #endif
19723
19724+#ifdef CONFIG_X86_32
19725+# include <asm/uaccess_32.h>
19726+#else
19727+# include <asm/uaccess_64.h>
19728+#endif
19729+
19730 static inline unsigned long __must_check
19731 copy_from_user(void *to, const void __user *from, unsigned long n)
19732 {
19733- int sz = __compiletime_object_size(to);
19734+ size_t sz = __compiletime_object_size(to);
19735
19736 might_fault();
19737
19738@@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19739 * case, and do only runtime checking for non-constant sizes.
19740 */
19741
19742- if (likely(sz < 0 || sz >= n))
19743- n = _copy_from_user(to, from, n);
19744- else if(__builtin_constant_p(n))
19745- copy_from_user_overflow();
19746- else
19747- __copy_from_user_overflow(sz, n);
19748+ if (likely(sz != (size_t)-1 && sz < n)) {
19749+ if(__builtin_constant_p(n))
19750+ copy_from_user_overflow();
19751+ else
19752+ __copy_from_user_overflow(sz, n);
19753+ } if (access_ok(VERIFY_READ, from, n))
19754+ n = __copy_from_user(to, from, n);
19755+ else if ((long)n > 0)
19756+ memset(to, 0, n);
19757
19758 return n;
19759 }
19760@@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19761 static inline unsigned long __must_check
19762 copy_to_user(void __user *to, const void *from, unsigned long n)
19763 {
19764- int sz = __compiletime_object_size(from);
19765+ size_t sz = __compiletime_object_size(from);
19766
19767 might_fault();
19768
19769 /* See the comment in copy_from_user() above. */
19770- if (likely(sz < 0 || sz >= n))
19771- n = _copy_to_user(to, from, n);
19772- else if(__builtin_constant_p(n))
19773- copy_to_user_overflow();
19774- else
19775- __copy_to_user_overflow(sz, n);
19776+ if (likely(sz != (size_t)-1 && sz < n)) {
19777+ if(__builtin_constant_p(n))
19778+ copy_to_user_overflow();
19779+ else
19780+ __copy_to_user_overflow(sz, n);
19781+ } else if (access_ok(VERIFY_WRITE, to, n))
19782+ n = __copy_to_user(to, from, n);
19783
19784 return n;
19785 }
19786diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19787index 3c03a5d..1071638 100644
19788--- a/arch/x86/include/asm/uaccess_32.h
19789+++ b/arch/x86/include/asm/uaccess_32.h
19790@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19791 static __always_inline unsigned long __must_check
19792 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19793 {
19794+ if ((long)n < 0)
19795+ return n;
19796+
19797+ check_object_size(from, n, true);
19798+
19799 if (__builtin_constant_p(n)) {
19800 unsigned long ret;
19801
19802@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
19803 __copy_to_user(void __user *to, const void *from, unsigned long n)
19804 {
19805 might_fault();
19806+
19807 return __copy_to_user_inatomic(to, from, n);
19808 }
19809
19810 static __always_inline unsigned long
19811 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
19812 {
19813+ if ((long)n < 0)
19814+ return n;
19815+
19816 /* Avoid zeroing the tail if the copy fails..
19817 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
19818 * but as the zeroing behaviour is only significant when n is not
19819@@ -137,6 +146,12 @@ static __always_inline unsigned long
19820 __copy_from_user(void *to, const void __user *from, unsigned long n)
19821 {
19822 might_fault();
19823+
19824+ if ((long)n < 0)
19825+ return n;
19826+
19827+ check_object_size(to, n, false);
19828+
19829 if (__builtin_constant_p(n)) {
19830 unsigned long ret;
19831
19832@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
19833 const void __user *from, unsigned long n)
19834 {
19835 might_fault();
19836+
19837+ if ((long)n < 0)
19838+ return n;
19839+
19840 if (__builtin_constant_p(n)) {
19841 unsigned long ret;
19842
19843@@ -181,7 +200,10 @@ static __always_inline unsigned long
19844 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
19845 unsigned long n)
19846 {
19847- return __copy_from_user_ll_nocache_nozero(to, from, n);
19848+ if ((long)n < 0)
19849+ return n;
19850+
19851+ return __copy_from_user_ll_nocache_nozero(to, from, n);
19852 }
19853
19854 #endif /* _ASM_X86_UACCESS_32_H */
19855diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
19856index 12a26b9..206c200 100644
19857--- a/arch/x86/include/asm/uaccess_64.h
19858+++ b/arch/x86/include/asm/uaccess_64.h
19859@@ -10,6 +10,9 @@
19860 #include <asm/alternative.h>
19861 #include <asm/cpufeature.h>
19862 #include <asm/page.h>
19863+#include <asm/pgtable.h>
19864+
19865+#define set_fs(x) (current_thread_info()->addr_limit = (x))
19866
19867 /*
19868 * Copy To/From Userspace
19869@@ -17,14 +20,14 @@
19870
19871 /* Handles exceptions in both to and from, but doesn't do access_ok */
19872 __must_check unsigned long
19873-copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
19874+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
19875 __must_check unsigned long
19876-copy_user_generic_string(void *to, const void *from, unsigned len);
19877+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
19878 __must_check unsigned long
19879-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
19880+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
19881
19882 static __always_inline __must_check unsigned long
19883-copy_user_generic(void *to, const void *from, unsigned len)
19884+copy_user_generic(void *to, const void *from, unsigned long len)
19885 {
19886 unsigned ret;
19887
19888@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
19889 }
19890
19891 __must_check unsigned long
19892-copy_in_user(void __user *to, const void __user *from, unsigned len);
19893+copy_in_user(void __user *to, const void __user *from, unsigned long len);
19894
19895 static __always_inline __must_check
19896-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
19897+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
19898 {
19899- int ret = 0;
19900+ size_t sz = __compiletime_object_size(dst);
19901+ unsigned ret = 0;
19902+
19903+ if (size > INT_MAX)
19904+ return size;
19905+
19906+ check_object_size(dst, size, false);
19907+
19908+#ifdef CONFIG_PAX_MEMORY_UDEREF
19909+ if (!access_ok_noprefault(VERIFY_READ, src, size))
19910+ return size;
19911+#endif
19912+
19913+ if (unlikely(sz != (size_t)-1 && sz < size)) {
19914+ if(__builtin_constant_p(size))
19915+ copy_from_user_overflow();
19916+ else
19917+ __copy_from_user_overflow(sz, size);
19918+ return size;
19919+ }
19920
19921 if (!__builtin_constant_p(size))
19922- return copy_user_generic(dst, (__force void *)src, size);
19923+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19924 switch (size) {
19925- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
19926+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
19927 ret, "b", "b", "=q", 1);
19928 return ret;
19929- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
19930+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
19931 ret, "w", "w", "=r", 2);
19932 return ret;
19933- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
19934+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
19935 ret, "l", "k", "=r", 4);
19936 return ret;
19937- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
19938+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19939 ret, "q", "", "=r", 8);
19940 return ret;
19941 case 10:
19942- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19943+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19944 ret, "q", "", "=r", 10);
19945 if (unlikely(ret))
19946 return ret;
19947 __get_user_asm(*(u16 *)(8 + (char *)dst),
19948- (u16 __user *)(8 + (char __user *)src),
19949+ (const u16 __user *)(8 + (const char __user *)src),
19950 ret, "w", "w", "=r", 2);
19951 return ret;
19952 case 16:
19953- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
19954+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
19955 ret, "q", "", "=r", 16);
19956 if (unlikely(ret))
19957 return ret;
19958 __get_user_asm(*(u64 *)(8 + (char *)dst),
19959- (u64 __user *)(8 + (char __user *)src),
19960+ (const u64 __user *)(8 + (const char __user *)src),
19961 ret, "q", "", "=r", 8);
19962 return ret;
19963 default:
19964- return copy_user_generic(dst, (__force void *)src, size);
19965+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
19966 }
19967 }
19968
19969 static __always_inline __must_check
19970-int __copy_from_user(void *dst, const void __user *src, unsigned size)
19971+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
19972 {
19973 might_fault();
19974 return __copy_from_user_nocheck(dst, src, size);
19975 }
19976
19977 static __always_inline __must_check
19978-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
19979+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
19980 {
19981- int ret = 0;
19982+ size_t sz = __compiletime_object_size(src);
19983+ unsigned ret = 0;
19984+
19985+ if (size > INT_MAX)
19986+ return size;
19987+
19988+ check_object_size(src, size, true);
19989+
19990+#ifdef CONFIG_PAX_MEMORY_UDEREF
19991+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
19992+ return size;
19993+#endif
19994+
19995+ if (unlikely(sz != (size_t)-1 && sz < size)) {
19996+ if(__builtin_constant_p(size))
19997+ copy_to_user_overflow();
19998+ else
19999+ __copy_to_user_overflow(sz, size);
20000+ return size;
20001+ }
20002
20003 if (!__builtin_constant_p(size))
20004- return copy_user_generic((__force void *)dst, src, size);
20005+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20006 switch (size) {
20007- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20008+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20009 ret, "b", "b", "iq", 1);
20010 return ret;
20011- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20012+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20013 ret, "w", "w", "ir", 2);
20014 return ret;
20015- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20016+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20017 ret, "l", "k", "ir", 4);
20018 return ret;
20019- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20020+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20021 ret, "q", "", "er", 8);
20022 return ret;
20023 case 10:
20024- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20025+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20026 ret, "q", "", "er", 10);
20027 if (unlikely(ret))
20028 return ret;
20029 asm("":::"memory");
20030- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20031+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20032 ret, "w", "w", "ir", 2);
20033 return ret;
20034 case 16:
20035- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20036+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20037 ret, "q", "", "er", 16);
20038 if (unlikely(ret))
20039 return ret;
20040 asm("":::"memory");
20041- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20042+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20043 ret, "q", "", "er", 8);
20044 return ret;
20045 default:
20046- return copy_user_generic((__force void *)dst, src, size);
20047+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20048 }
20049 }
20050
20051 static __always_inline __must_check
20052-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20053+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20054 {
20055 might_fault();
20056 return __copy_to_user_nocheck(dst, src, size);
20057 }
20058
20059 static __always_inline __must_check
20060-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20061+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20062 {
20063- int ret = 0;
20064+ unsigned ret = 0;
20065
20066 might_fault();
20067+
20068+ if (size > INT_MAX)
20069+ return size;
20070+
20071+#ifdef CONFIG_PAX_MEMORY_UDEREF
20072+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20073+ return size;
20074+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20075+ return size;
20076+#endif
20077+
20078 if (!__builtin_constant_p(size))
20079- return copy_user_generic((__force void *)dst,
20080- (__force void *)src, size);
20081+ return copy_user_generic((__force_kernel void *)____m(dst),
20082+ (__force_kernel const void *)____m(src), size);
20083 switch (size) {
20084 case 1: {
20085 u8 tmp;
20086- __get_user_asm(tmp, (u8 __user *)src,
20087+ __get_user_asm(tmp, (const u8 __user *)src,
20088 ret, "b", "b", "=q", 1);
20089 if (likely(!ret))
20090 __put_user_asm(tmp, (u8 __user *)dst,
20091@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20092 }
20093 case 2: {
20094 u16 tmp;
20095- __get_user_asm(tmp, (u16 __user *)src,
20096+ __get_user_asm(tmp, (const u16 __user *)src,
20097 ret, "w", "w", "=r", 2);
20098 if (likely(!ret))
20099 __put_user_asm(tmp, (u16 __user *)dst,
20100@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20101
20102 case 4: {
20103 u32 tmp;
20104- __get_user_asm(tmp, (u32 __user *)src,
20105+ __get_user_asm(tmp, (const u32 __user *)src,
20106 ret, "l", "k", "=r", 4);
20107 if (likely(!ret))
20108 __put_user_asm(tmp, (u32 __user *)dst,
20109@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20110 }
20111 case 8: {
20112 u64 tmp;
20113- __get_user_asm(tmp, (u64 __user *)src,
20114+ __get_user_asm(tmp, (const u64 __user *)src,
20115 ret, "q", "", "=r", 8);
20116 if (likely(!ret))
20117 __put_user_asm(tmp, (u64 __user *)dst,
20118@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20119 return ret;
20120 }
20121 default:
20122- return copy_user_generic((__force void *)dst,
20123- (__force void *)src, size);
20124+ return copy_user_generic((__force_kernel void *)____m(dst),
20125+ (__force_kernel const void *)____m(src), size);
20126 }
20127 }
20128
20129-static __must_check __always_inline int
20130-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20131+static __must_check __always_inline unsigned long
20132+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20133 {
20134 return __copy_from_user_nocheck(dst, src, size);
20135 }
20136
20137-static __must_check __always_inline int
20138-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20139+static __must_check __always_inline unsigned long
20140+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20141 {
20142 return __copy_to_user_nocheck(dst, src, size);
20143 }
20144
20145-extern long __copy_user_nocache(void *dst, const void __user *src,
20146- unsigned size, int zerorest);
20147+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20148+ unsigned long size, int zerorest);
20149
20150-static inline int
20151-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20152+static inline unsigned long
20153+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20154 {
20155 might_fault();
20156+
20157+ if (size > INT_MAX)
20158+ return size;
20159+
20160+#ifdef CONFIG_PAX_MEMORY_UDEREF
20161+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20162+ return size;
20163+#endif
20164+
20165 return __copy_user_nocache(dst, src, size, 1);
20166 }
20167
20168-static inline int
20169+static inline unsigned long
20170 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20171- unsigned size)
20172+ unsigned long size)
20173 {
20174+ if (size > INT_MAX)
20175+ return size;
20176+
20177+#ifdef CONFIG_PAX_MEMORY_UDEREF
20178+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20179+ return size;
20180+#endif
20181+
20182 return __copy_user_nocache(dst, src, size, 0);
20183 }
20184
20185 unsigned long
20186-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20187+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20188
20189 #endif /* _ASM_X86_UACCESS_64_H */
20190diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20191index 5b238981..77fdd78 100644
20192--- a/arch/x86/include/asm/word-at-a-time.h
20193+++ b/arch/x86/include/asm/word-at-a-time.h
20194@@ -11,7 +11,7 @@
20195 * and shift, for example.
20196 */
20197 struct word_at_a_time {
20198- const unsigned long one_bits, high_bits;
20199+ unsigned long one_bits, high_bits;
20200 };
20201
20202 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20203diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20204index e45e4da..44e8572 100644
20205--- a/arch/x86/include/asm/x86_init.h
20206+++ b/arch/x86/include/asm/x86_init.h
20207@@ -129,7 +129,7 @@ struct x86_init_ops {
20208 struct x86_init_timers timers;
20209 struct x86_init_iommu iommu;
20210 struct x86_init_pci pci;
20211-};
20212+} __no_const;
20213
20214 /**
20215 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20216@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20217 void (*setup_percpu_clockev)(void);
20218 void (*early_percpu_clock_init)(void);
20219 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20220-};
20221+} __no_const;
20222
20223 struct timespec;
20224
20225@@ -168,7 +168,7 @@ struct x86_platform_ops {
20226 void (*save_sched_clock_state)(void);
20227 void (*restore_sched_clock_state)(void);
20228 void (*apic_post_init)(void);
20229-};
20230+} __no_const;
20231
20232 struct pci_dev;
20233 struct msi_msg;
20234@@ -185,7 +185,7 @@ struct x86_msi_ops {
20235 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20236 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20237 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20238-};
20239+} __no_const;
20240
20241 struct IO_APIC_route_entry;
20242 struct io_apic_irq_attr;
20243@@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20244 unsigned int destination, int vector,
20245 struct io_apic_irq_attr *attr);
20246 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20247-};
20248+} __no_const;
20249
20250 extern struct x86_init_ops x86_init;
20251 extern struct x86_cpuinit_ops x86_cpuinit;
20252diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20253index c949923..c22bfa4 100644
20254--- a/arch/x86/include/asm/xen/page.h
20255+++ b/arch/x86/include/asm/xen/page.h
20256@@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20257 extern struct page *m2p_find_override(unsigned long mfn);
20258 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20259
20260-static inline unsigned long pfn_to_mfn(unsigned long pfn)
20261+static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20262 {
20263 unsigned long mfn;
20264
20265diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20266index d949ef2..479b9d1 100644
20267--- a/arch/x86/include/asm/xsave.h
20268+++ b/arch/x86/include/asm/xsave.h
20269@@ -82,8 +82,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20270 if (unlikely(err))
20271 return -EFAULT;
20272
20273+ pax_open_userland();
20274 __asm__ __volatile__(ASM_STAC "\n"
20275- "1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
20276+ "1:"
20277+ __copyuser_seg
20278+ ".byte " REX_PREFIX "0x0f,0xae,0x27\n"
20279 "2: " ASM_CLAC "\n"
20280 ".section .fixup,\"ax\"\n"
20281 "3: movl $-1,%[err]\n"
20282@@ -93,18 +96,22 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20283 : [err] "=r" (err)
20284 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20285 : "memory");
20286+ pax_close_userland();
20287 return err;
20288 }
20289
20290 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20291 {
20292 int err;
20293- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20294+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20295 u32 lmask = mask;
20296 u32 hmask = mask >> 32;
20297
20298+ pax_open_userland();
20299 __asm__ __volatile__(ASM_STAC "\n"
20300- "1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20301+ "1:"
20302+ __copyuser_seg
20303+ ".byte " REX_PREFIX "0x0f,0xae,0x2f\n"
20304 "2: " ASM_CLAC "\n"
20305 ".section .fixup,\"ax\"\n"
20306 "3: movl $-1,%[err]\n"
20307@@ -114,6 +121,7 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20308 : [err] "=r" (err)
20309 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20310 : "memory"); /* memory required? */
20311+ pax_close_userland();
20312 return err;
20313 }
20314
20315diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20316index bbae024..e1528f9 100644
20317--- a/arch/x86/include/uapi/asm/e820.h
20318+++ b/arch/x86/include/uapi/asm/e820.h
20319@@ -63,7 +63,7 @@ struct e820map {
20320 #define ISA_START_ADDRESS 0xa0000
20321 #define ISA_END_ADDRESS 0x100000
20322
20323-#define BIOS_BEGIN 0x000a0000
20324+#define BIOS_BEGIN 0x000c0000
20325 #define BIOS_END 0x00100000
20326
20327 #define BIOS_ROM_BASE 0xffe00000
20328diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20329index 7b0a55a..ad115bf 100644
20330--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20331+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20332@@ -49,7 +49,6 @@
20333 #define EFLAGS 144
20334 #define RSP 152
20335 #define SS 160
20336-#define ARGOFFSET R11
20337 #endif /* __ASSEMBLY__ */
20338
20339 /* top of stack page */
20340diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20341index f4d9600..b45af01 100644
20342--- a/arch/x86/kernel/Makefile
20343+++ b/arch/x86/kernel/Makefile
20344@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20345 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20346 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20347 obj-y += probe_roms.o
20348-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20349+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20350 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20351 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20352 obj-$(CONFIG_X86_64) += vsyscall_64.o
20353diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20354index 86281ff..e046fc2 100644
20355--- a/arch/x86/kernel/acpi/boot.c
20356+++ b/arch/x86/kernel/acpi/boot.c
20357@@ -1296,7 +1296,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20358 * If your system is blacklisted here, but you find that acpi=force
20359 * works for you, please contact linux-acpi@vger.kernel.org
20360 */
20361-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20362+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20363 /*
20364 * Boxes that need ACPI disabled
20365 */
20366@@ -1371,7 +1371,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20367 };
20368
20369 /* second table for DMI checks that should run after early-quirks */
20370-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20371+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20372 /*
20373 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20374 * which includes some code which overrides all temperature
20375diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20376index 3136820..e2c6577 100644
20377--- a/arch/x86/kernel/acpi/sleep.c
20378+++ b/arch/x86/kernel/acpi/sleep.c
20379@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20380 #else /* CONFIG_64BIT */
20381 #ifdef CONFIG_SMP
20382 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20383+
20384+ pax_open_kernel();
20385 early_gdt_descr.address =
20386 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20387+ pax_close_kernel();
20388+
20389 initial_gs = per_cpu_offset(smp_processor_id());
20390 #endif
20391 initial_code = (unsigned long)wakeup_long64;
20392diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20393index 665c6b7..eae4d56 100644
20394--- a/arch/x86/kernel/acpi/wakeup_32.S
20395+++ b/arch/x86/kernel/acpi/wakeup_32.S
20396@@ -29,13 +29,11 @@ wakeup_pmode_return:
20397 # and restore the stack ... but you need gdt for this to work
20398 movl saved_context_esp, %esp
20399
20400- movl %cs:saved_magic, %eax
20401- cmpl $0x12345678, %eax
20402+ cmpl $0x12345678, saved_magic
20403 jne bogus_magic
20404
20405 # jump to place where we left off
20406- movl saved_eip, %eax
20407- jmp *%eax
20408+ jmp *(saved_eip)
20409
20410 bogus_magic:
20411 jmp bogus_magic
20412diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20413index df94598..b7162f9 100644
20414--- a/arch/x86/kernel/alternative.c
20415+++ b/arch/x86/kernel/alternative.c
20416@@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20417 */
20418 for (a = start; a < end; a++) {
20419 instr = (u8 *)&a->instr_offset + a->instr_offset;
20420+
20421+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20422+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20423+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20424+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20425+#endif
20426+
20427 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20428 BUG_ON(a->replacementlen > a->instrlen);
20429 BUG_ON(a->instrlen > sizeof(insnbuf));
20430@@ -285,6 +292,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20431 add_nops(insnbuf + a->replacementlen,
20432 a->instrlen - a->replacementlen);
20433
20434+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20435+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20436+ instr = ktva_ktla(instr);
20437+#endif
20438+
20439 text_poke_early(instr, insnbuf, a->instrlen);
20440 }
20441 }
20442@@ -300,10 +312,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20443 for (poff = start; poff < end; poff++) {
20444 u8 *ptr = (u8 *)poff + *poff;
20445
20446+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20447+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20448+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20449+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20450+#endif
20451+
20452 if (!*poff || ptr < text || ptr >= text_end)
20453 continue;
20454 /* turn DS segment override prefix into lock prefix */
20455- if (*ptr == 0x3e)
20456+ if (*ktla_ktva(ptr) == 0x3e)
20457 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20458 }
20459 mutex_unlock(&text_mutex);
20460@@ -318,10 +336,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20461 for (poff = start; poff < end; poff++) {
20462 u8 *ptr = (u8 *)poff + *poff;
20463
20464+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20465+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20466+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20467+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20468+#endif
20469+
20470 if (!*poff || ptr < text || ptr >= text_end)
20471 continue;
20472 /* turn lock prefix into DS segment override prefix */
20473- if (*ptr == 0xf0)
20474+ if (*ktla_ktva(ptr) == 0xf0)
20475 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20476 }
20477 mutex_unlock(&text_mutex);
20478@@ -458,7 +482,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20479
20480 BUG_ON(p->len > MAX_PATCH_LEN);
20481 /* prep the buffer with the original instructions */
20482- memcpy(insnbuf, p->instr, p->len);
20483+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20484 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20485 (unsigned long)p->instr, p->len);
20486
20487@@ -505,7 +529,7 @@ void __init alternative_instructions(void)
20488 if (!uniproc_patched || num_possible_cpus() == 1)
20489 free_init_pages("SMP alternatives",
20490 (unsigned long)__smp_locks,
20491- (unsigned long)__smp_locks_end);
20492+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20493 #endif
20494
20495 apply_paravirt(__parainstructions, __parainstructions_end);
20496@@ -525,13 +549,17 @@ void __init alternative_instructions(void)
20497 * instructions. And on the local CPU you need to be protected again NMI or MCE
20498 * handlers seeing an inconsistent instruction while you patch.
20499 */
20500-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20501+void *__kprobes text_poke_early(void *addr, const void *opcode,
20502 size_t len)
20503 {
20504 unsigned long flags;
20505 local_irq_save(flags);
20506- memcpy(addr, opcode, len);
20507+
20508+ pax_open_kernel();
20509+ memcpy(ktla_ktva(addr), opcode, len);
20510 sync_core();
20511+ pax_close_kernel();
20512+
20513 local_irq_restore(flags);
20514 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20515 that causes hangs on some VIA CPUs. */
20516@@ -553,36 +581,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20517 */
20518 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
20519 {
20520- unsigned long flags;
20521- char *vaddr;
20522+ unsigned char *vaddr = ktla_ktva(addr);
20523 struct page *pages[2];
20524- int i;
20525+ size_t i;
20526
20527 if (!core_kernel_text((unsigned long)addr)) {
20528- pages[0] = vmalloc_to_page(addr);
20529- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20530+ pages[0] = vmalloc_to_page(vaddr);
20531+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20532 } else {
20533- pages[0] = virt_to_page(addr);
20534+ pages[0] = virt_to_page(vaddr);
20535 WARN_ON(!PageReserved(pages[0]));
20536- pages[1] = virt_to_page(addr + PAGE_SIZE);
20537+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20538 }
20539 BUG_ON(!pages[0]);
20540- local_irq_save(flags);
20541- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20542- if (pages[1])
20543- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20544- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20545- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20546- clear_fixmap(FIX_TEXT_POKE0);
20547- if (pages[1])
20548- clear_fixmap(FIX_TEXT_POKE1);
20549- local_flush_tlb();
20550- sync_core();
20551- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20552- that causes hangs on some VIA CPUs. */
20553+ text_poke_early(addr, opcode, len);
20554 for (i = 0; i < len; i++)
20555- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20556- local_irq_restore(flags);
20557+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20558 return addr;
20559 }
20560
20561@@ -602,7 +616,7 @@ int poke_int3_handler(struct pt_regs *regs)
20562 if (likely(!bp_patching_in_progress))
20563 return 0;
20564
20565- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20566+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20567 return 0;
20568
20569 /* set up the specified breakpoint handler */
20570@@ -636,7 +650,7 @@ int poke_int3_handler(struct pt_regs *regs)
20571 */
20572 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20573 {
20574- unsigned char int3 = 0xcc;
20575+ const unsigned char int3 = 0xcc;
20576
20577 bp_int3_handler = handler;
20578 bp_int3_addr = (u8 *)addr + sizeof(int3);
20579diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20580index ad28db7..c538b2c 100644
20581--- a/arch/x86/kernel/apic/apic.c
20582+++ b/arch/x86/kernel/apic/apic.c
20583@@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20584 /*
20585 * Debug level, exported for io_apic.c
20586 */
20587-unsigned int apic_verbosity;
20588+int apic_verbosity;
20589
20590 int pic_mode;
20591
20592@@ -2000,7 +2000,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20593 apic_write(APIC_ESR, 0);
20594 v = apic_read(APIC_ESR);
20595 ack_APIC_irq();
20596- atomic_inc(&irq_err_count);
20597+ atomic_inc_unchecked(&irq_err_count);
20598
20599 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20600 smp_processor_id(), v);
20601diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20602index 7c1b294..e71d27f 100644
20603--- a/arch/x86/kernel/apic/apic_flat_64.c
20604+++ b/arch/x86/kernel/apic/apic_flat_64.c
20605@@ -154,7 +154,7 @@ static int flat_probe(void)
20606 return 1;
20607 }
20608
20609-static struct apic apic_flat = {
20610+static struct apic apic_flat __read_only = {
20611 .name = "flat",
20612 .probe = flat_probe,
20613 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20614@@ -268,7 +268,7 @@ static int physflat_probe(void)
20615 return 0;
20616 }
20617
20618-static struct apic apic_physflat = {
20619+static struct apic apic_physflat __read_only = {
20620
20621 .name = "physical flat",
20622 .probe = physflat_probe,
20623diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20624index 8c7c982..a225910 100644
20625--- a/arch/x86/kernel/apic/apic_noop.c
20626+++ b/arch/x86/kernel/apic/apic_noop.c
20627@@ -118,7 +118,7 @@ static void noop_apic_write(u32 reg, u32 v)
20628 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20629 }
20630
20631-struct apic apic_noop = {
20632+struct apic apic_noop __read_only = {
20633 .name = "noop",
20634 .probe = noop_probe,
20635 .acpi_madt_oem_check = NULL,
20636diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20637index e4840aa..e7d9dac 100644
20638--- a/arch/x86/kernel/apic/bigsmp_32.c
20639+++ b/arch/x86/kernel/apic/bigsmp_32.c
20640@@ -152,7 +152,7 @@ static int probe_bigsmp(void)
20641 return dmi_bigsmp;
20642 }
20643
20644-static struct apic apic_bigsmp = {
20645+static struct apic apic_bigsmp __read_only = {
20646
20647 .name = "bigsmp",
20648 .probe = probe_bigsmp,
20649diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20650index 992060e..ecdc3b3 100644
20651--- a/arch/x86/kernel/apic/io_apic.c
20652+++ b/arch/x86/kernel/apic/io_apic.c
20653@@ -1057,7 +1057,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
20654 }
20655 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20656
20657-void lock_vector_lock(void)
20658+void lock_vector_lock(void) __acquires(vector_lock)
20659 {
20660 /* Used to the online set of cpus does not change
20661 * during assign_irq_vector.
20662@@ -1065,7 +1065,7 @@ void lock_vector_lock(void)
20663 raw_spin_lock(&vector_lock);
20664 }
20665
20666-void unlock_vector_lock(void)
20667+void unlock_vector_lock(void) __releases(vector_lock)
20668 {
20669 raw_spin_unlock(&vector_lock);
20670 }
20671@@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_data *data)
20672 ack_APIC_irq();
20673 }
20674
20675-atomic_t irq_mis_count;
20676+atomic_unchecked_t irq_mis_count;
20677
20678 #ifdef CONFIG_GENERIC_PENDING_IRQ
20679 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20680@@ -2505,7 +2505,7 @@ static void ack_apic_level(struct irq_data *data)
20681 * at the cpu.
20682 */
20683 if (!(v & (1 << (i & 0x1f)))) {
20684- atomic_inc(&irq_mis_count);
20685+ atomic_inc_unchecked(&irq_mis_count);
20686
20687 eoi_ioapic_irq(irq, cfg);
20688 }
20689diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20690index cceb352..a635fd8 100644
20691--- a/arch/x86/kernel/apic/probe_32.c
20692+++ b/arch/x86/kernel/apic/probe_32.c
20693@@ -72,7 +72,7 @@ static int probe_default(void)
20694 return 1;
20695 }
20696
20697-static struct apic apic_default = {
20698+static struct apic apic_default __read_only = {
20699
20700 .name = "default",
20701 .probe = probe_default,
20702diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20703index e66766b..1c008ba 100644
20704--- a/arch/x86/kernel/apic/x2apic_cluster.c
20705+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20706@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20707 return notifier_from_errno(err);
20708 }
20709
20710-static struct notifier_block __refdata x2apic_cpu_notifier = {
20711+static struct notifier_block x2apic_cpu_notifier = {
20712 .notifier_call = update_clusterinfo,
20713 };
20714
20715@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20716 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20717 }
20718
20719-static struct apic apic_x2apic_cluster = {
20720+static struct apic apic_x2apic_cluster __read_only = {
20721
20722 .name = "cluster x2apic",
20723 .probe = x2apic_cluster_probe,
20724diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20725index 6d600eb..0300c00 100644
20726--- a/arch/x86/kernel/apic/x2apic_phys.c
20727+++ b/arch/x86/kernel/apic/x2apic_phys.c
20728@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20729 return apic == &apic_x2apic_phys;
20730 }
20731
20732-static struct apic apic_x2apic_phys = {
20733+static struct apic apic_x2apic_phys __read_only = {
20734
20735 .name = "physical x2apic",
20736 .probe = x2apic_phys_probe,
20737diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20738index 7834389..4ffc9c8 100644
20739--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20740+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20741@@ -350,7 +350,7 @@ static int uv_probe(void)
20742 return apic == &apic_x2apic_uv_x;
20743 }
20744
20745-static struct apic __refdata apic_x2apic_uv_x = {
20746+static struct apic apic_x2apic_uv_x __read_only = {
20747
20748 .name = "UV large system",
20749 .probe = uv_probe,
20750diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20751index 3ab0343..814c4787 100644
20752--- a/arch/x86/kernel/apm_32.c
20753+++ b/arch/x86/kernel/apm_32.c
20754@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20755 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20756 * even though they are called in protected mode.
20757 */
20758-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20759+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20760 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20761
20762 static const char driver_version[] = "1.16ac"; /* no spaces */
20763@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20764 BUG_ON(cpu != 0);
20765 gdt = get_cpu_gdt_table(cpu);
20766 save_desc_40 = gdt[0x40 / 8];
20767+
20768+ pax_open_kernel();
20769 gdt[0x40 / 8] = bad_bios_desc;
20770+ pax_close_kernel();
20771
20772 apm_irq_save(flags);
20773 APM_DO_SAVE_SEGS;
20774@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20775 &call->esi);
20776 APM_DO_RESTORE_SEGS;
20777 apm_irq_restore(flags);
20778+
20779+ pax_open_kernel();
20780 gdt[0x40 / 8] = save_desc_40;
20781+ pax_close_kernel();
20782+
20783 put_cpu();
20784
20785 return call->eax & 0xff;
20786@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
20787 BUG_ON(cpu != 0);
20788 gdt = get_cpu_gdt_table(cpu);
20789 save_desc_40 = gdt[0x40 / 8];
20790+
20791+ pax_open_kernel();
20792 gdt[0x40 / 8] = bad_bios_desc;
20793+ pax_close_kernel();
20794
20795 apm_irq_save(flags);
20796 APM_DO_SAVE_SEGS;
20797@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
20798 &call->eax);
20799 APM_DO_RESTORE_SEGS;
20800 apm_irq_restore(flags);
20801+
20802+ pax_open_kernel();
20803 gdt[0x40 / 8] = save_desc_40;
20804+ pax_close_kernel();
20805+
20806 put_cpu();
20807 return error;
20808 }
20809@@ -2362,12 +2376,15 @@ static int __init apm_init(void)
20810 * code to that CPU.
20811 */
20812 gdt = get_cpu_gdt_table(0);
20813+
20814+ pax_open_kernel();
20815 set_desc_base(&gdt[APM_CS >> 3],
20816 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
20817 set_desc_base(&gdt[APM_CS_16 >> 3],
20818 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
20819 set_desc_base(&gdt[APM_DS >> 3],
20820 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
20821+ pax_close_kernel();
20822
20823 proc_create("apm", 0, NULL, &apm_file_ops);
20824
20825diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
20826index 9f6b934..cf5ffb3 100644
20827--- a/arch/x86/kernel/asm-offsets.c
20828+++ b/arch/x86/kernel/asm-offsets.c
20829@@ -32,6 +32,8 @@ void common(void) {
20830 OFFSET(TI_flags, thread_info, flags);
20831 OFFSET(TI_status, thread_info, status);
20832 OFFSET(TI_addr_limit, thread_info, addr_limit);
20833+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
20834+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
20835
20836 BLANK();
20837 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
20838@@ -52,8 +54,26 @@ void common(void) {
20839 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
20840 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
20841 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
20842+
20843+#ifdef CONFIG_PAX_KERNEXEC
20844+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
20845 #endif
20846
20847+#ifdef CONFIG_PAX_MEMORY_UDEREF
20848+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
20849+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
20850+#ifdef CONFIG_X86_64
20851+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
20852+#endif
20853+#endif
20854+
20855+#endif
20856+
20857+ BLANK();
20858+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
20859+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
20860+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
20861+
20862 #ifdef CONFIG_XEN
20863 BLANK();
20864 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
20865diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
20866index e7c798b..2b2019b 100644
20867--- a/arch/x86/kernel/asm-offsets_64.c
20868+++ b/arch/x86/kernel/asm-offsets_64.c
20869@@ -77,6 +77,7 @@ int main(void)
20870 BLANK();
20871 #undef ENTRY
20872
20873+ DEFINE(TSS_size, sizeof(struct tss_struct));
20874 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
20875 BLANK();
20876
20877diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
20878index 7fd54f0..0691410 100644
20879--- a/arch/x86/kernel/cpu/Makefile
20880+++ b/arch/x86/kernel/cpu/Makefile
20881@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
20882 CFLAGS_REMOVE_perf_event.o = -pg
20883 endif
20884
20885-# Make sure load_percpu_segment has no stackprotector
20886-nostackp := $(call cc-option, -fno-stack-protector)
20887-CFLAGS_common.o := $(nostackp)
20888-
20889 obj-y := intel_cacheinfo.o scattered.o topology.o
20890 obj-y += proc.o capflags.o powerflags.o common.o
20891 obj-y += rdrand.o
20892diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
20893index ce8b8ff..d7d8851 100644
20894--- a/arch/x86/kernel/cpu/amd.c
20895+++ b/arch/x86/kernel/cpu/amd.c
20896@@ -728,7 +728,7 @@ static void init_amd(struct cpuinfo_x86 *c)
20897 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
20898 {
20899 /* AMD errata T13 (order #21922) */
20900- if ((c->x86 == 6)) {
20901+ if (c->x86 == 6) {
20902 /* Duron Rev A0 */
20903 if (c->x86_model == 3 && c->x86_mask == 0)
20904 size = 64;
20905diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
20906index a135239..41fb30a 100644
20907--- a/arch/x86/kernel/cpu/common.c
20908+++ b/arch/x86/kernel/cpu/common.c
20909@@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
20910
20911 static const struct cpu_dev *this_cpu = &default_cpu;
20912
20913-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
20914-#ifdef CONFIG_X86_64
20915- /*
20916- * We need valid kernel segments for data and code in long mode too
20917- * IRET will check the segment types kkeil 2000/10/28
20918- * Also sysret mandates a special GDT layout
20919- *
20920- * TLS descriptors are currently at a different place compared to i386.
20921- * Hopefully nobody expects them at a fixed place (Wine?)
20922- */
20923- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
20924- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
20925- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
20926- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
20927- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
20928- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
20929-#else
20930- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
20931- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20932- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
20933- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
20934- /*
20935- * Segments used for calling PnP BIOS have byte granularity.
20936- * They code segments and data segments have fixed 64k limits,
20937- * the transfer segment sizes are set at run time.
20938- */
20939- /* 32-bit code */
20940- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20941- /* 16-bit code */
20942- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20943- /* 16-bit data */
20944- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
20945- /* 16-bit data */
20946- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
20947- /* 16-bit data */
20948- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
20949- /*
20950- * The APM segments have byte granularity and their bases
20951- * are set at run time. All have 64k limits.
20952- */
20953- /* 32-bit code */
20954- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
20955- /* 16-bit code */
20956- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
20957- /* data */
20958- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
20959-
20960- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20961- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
20962- GDT_STACK_CANARY_INIT
20963-#endif
20964-} };
20965-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
20966-
20967 static int __init x86_xsave_setup(char *s)
20968 {
20969 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
20970@@ -293,6 +239,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
20971 }
20972 }
20973
20974+#ifdef CONFIG_X86_64
20975+static __init int setup_disable_pcid(char *arg)
20976+{
20977+ setup_clear_cpu_cap(X86_FEATURE_PCID);
20978+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
20979+
20980+#ifdef CONFIG_PAX_MEMORY_UDEREF
20981+ if (clone_pgd_mask != ~(pgdval_t)0UL)
20982+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20983+#endif
20984+
20985+ return 1;
20986+}
20987+__setup("nopcid", setup_disable_pcid);
20988+
20989+static void setup_pcid(struct cpuinfo_x86 *c)
20990+{
20991+ if (!cpu_has(c, X86_FEATURE_PCID)) {
20992+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
20993+
20994+#ifdef CONFIG_PAX_MEMORY_UDEREF
20995+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
20996+ pax_open_kernel();
20997+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
20998+ pax_close_kernel();
20999+ printk("PAX: slow and weak UDEREF enabled\n");
21000+ } else
21001+ printk("PAX: UDEREF disabled\n");
21002+#endif
21003+
21004+ return;
21005+ }
21006+
21007+ printk("PAX: PCID detected\n");
21008+ set_in_cr4(X86_CR4_PCIDE);
21009+
21010+#ifdef CONFIG_PAX_MEMORY_UDEREF
21011+ pax_open_kernel();
21012+ clone_pgd_mask = ~(pgdval_t)0UL;
21013+ pax_close_kernel();
21014+ if (pax_user_shadow_base)
21015+ printk("PAX: weak UDEREF enabled\n");
21016+ else {
21017+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21018+ printk("PAX: strong UDEREF enabled\n");
21019+ }
21020+#endif
21021+
21022+ if (cpu_has(c, X86_FEATURE_INVPCID))
21023+ printk("PAX: INVPCID detected\n");
21024+}
21025+#endif
21026+
21027 /*
21028 * Some CPU features depend on higher CPUID levels, which may not always
21029 * be available due to CPUID level capping or broken virtualization
21030@@ -393,7 +392,7 @@ void switch_to_new_gdt(int cpu)
21031 {
21032 struct desc_ptr gdt_descr;
21033
21034- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21035+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21036 gdt_descr.size = GDT_SIZE - 1;
21037 load_gdt(&gdt_descr);
21038 /* Reload the per-cpu base */
21039@@ -883,6 +882,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21040 setup_smep(c);
21041 setup_smap(c);
21042
21043+#ifdef CONFIG_X86_64
21044+ setup_pcid(c);
21045+#endif
21046+
21047 /*
21048 * The vendor-specific functions might have changed features.
21049 * Now we do "generic changes."
21050@@ -891,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21051 /* Filter out anything that depends on CPUID levels we don't have */
21052 filter_cpuid_features(c, true);
21053
21054+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21055+ setup_clear_cpu_cap(X86_FEATURE_SEP);
21056+#endif
21057+
21058 /* If the model name is still unset, do table lookup. */
21059 if (!c->x86_model_id[0]) {
21060 const char *p;
21061@@ -1079,14 +1086,16 @@ static __init int setup_disablecpuid(char *arg)
21062 }
21063 __setup("clearcpuid=", setup_disablecpuid);
21064
21065+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21066+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21067+
21068 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21069- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21070+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21071 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21072
21073 #ifdef CONFIG_X86_64
21074-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21075-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21076- (unsigned long) debug_idt_table };
21077+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21078+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21079
21080 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21081 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21082@@ -1246,7 +1255,7 @@ void cpu_init(void)
21083 load_ucode_ap();
21084
21085 cpu = stack_smp_processor_id();
21086- t = &per_cpu(init_tss, cpu);
21087+ t = init_tss + cpu;
21088 oist = &per_cpu(orig_ist, cpu);
21089
21090 #ifdef CONFIG_NUMA
21091@@ -1281,7 +1290,6 @@ void cpu_init(void)
21092 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21093 barrier();
21094
21095- x86_configure_nx();
21096 enable_x2apic();
21097
21098 /*
21099@@ -1333,7 +1341,7 @@ void cpu_init(void)
21100 {
21101 int cpu = smp_processor_id();
21102 struct task_struct *curr = current;
21103- struct tss_struct *t = &per_cpu(init_tss, cpu);
21104+ struct tss_struct *t = init_tss + cpu;
21105 struct thread_struct *thread = &curr->thread;
21106
21107 show_ucode_info_early();
21108diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21109index a952e9c..58a4cbb 100644
21110--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21111+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21112@@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
21113 };
21114
21115 #ifdef CONFIG_AMD_NB
21116+static struct attribute *default_attrs_amd_nb[] = {
21117+ &type.attr,
21118+ &level.attr,
21119+ &coherency_line_size.attr,
21120+ &physical_line_partition.attr,
21121+ &ways_of_associativity.attr,
21122+ &number_of_sets.attr,
21123+ &size.attr,
21124+ &shared_cpu_map.attr,
21125+ &shared_cpu_list.attr,
21126+ NULL,
21127+ NULL,
21128+ NULL,
21129+ NULL
21130+};
21131+
21132 static struct attribute **amd_l3_attrs(void)
21133 {
21134 static struct attribute **attrs;
21135@@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
21136
21137 n = ARRAY_SIZE(default_attrs);
21138
21139- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21140- n += 2;
21141-
21142- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21143- n += 1;
21144-
21145- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21146- if (attrs == NULL)
21147- return attrs = default_attrs;
21148-
21149- for (n = 0; default_attrs[n]; n++)
21150- attrs[n] = default_attrs[n];
21151+ attrs = default_attrs_amd_nb;
21152
21153 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21154 attrs[n++] = &cache_disable_0.attr;
21155@@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
21156 .default_attrs = default_attrs,
21157 };
21158
21159+#ifdef CONFIG_AMD_NB
21160+static struct kobj_type ktype_cache_amd_nb = {
21161+ .sysfs_ops = &sysfs_ops,
21162+ .default_attrs = default_attrs_amd_nb,
21163+};
21164+#endif
21165+
21166 static struct kobj_type ktype_percpu_entry = {
21167 .sysfs_ops = &sysfs_ops,
21168 };
21169@@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
21170 return retval;
21171 }
21172
21173+#ifdef CONFIG_AMD_NB
21174+ amd_l3_attrs();
21175+#endif
21176+
21177 for (i = 0; i < num_cache_leaves; i++) {
21178+ struct kobj_type *ktype;
21179+
21180 this_object = INDEX_KOBJECT_PTR(cpu, i);
21181 this_object->cpu = cpu;
21182 this_object->index = i;
21183
21184 this_leaf = CPUID4_INFO_IDX(cpu, i);
21185
21186- ktype_cache.default_attrs = default_attrs;
21187+ ktype = &ktype_cache;
21188 #ifdef CONFIG_AMD_NB
21189 if (this_leaf->base.nb)
21190- ktype_cache.default_attrs = amd_l3_attrs();
21191+ ktype = &ktype_cache_amd_nb;
21192 #endif
21193 retval = kobject_init_and_add(&(this_object->kobj),
21194- &ktype_cache,
21195+ ktype,
21196 per_cpu(ici_cache_kobject, cpu),
21197 "index%1lu", i);
21198 if (unlikely(retval)) {
21199diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21200index 68317c8..c860d41 100644
21201--- a/arch/x86/kernel/cpu/mcheck/mce.c
21202+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21203@@ -45,6 +45,7 @@
21204 #include <asm/processor.h>
21205 #include <asm/mce.h>
21206 #include <asm/msr.h>
21207+#include <asm/local.h>
21208
21209 #include "mce-internal.h"
21210
21211@@ -261,7 +262,7 @@ static void print_mce(struct mce *m)
21212 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21213 m->cs, m->ip);
21214
21215- if (m->cs == __KERNEL_CS)
21216+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21217 print_symbol("{%s}", m->ip);
21218 pr_cont("\n");
21219 }
21220@@ -294,10 +295,10 @@ static void print_mce(struct mce *m)
21221
21222 #define PANIC_TIMEOUT 5 /* 5 seconds */
21223
21224-static atomic_t mce_paniced;
21225+static atomic_unchecked_t mce_paniced;
21226
21227 static int fake_panic;
21228-static atomic_t mce_fake_paniced;
21229+static atomic_unchecked_t mce_fake_paniced;
21230
21231 /* Panic in progress. Enable interrupts and wait for final IPI */
21232 static void wait_for_panic(void)
21233@@ -321,7 +322,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21234 /*
21235 * Make sure only one CPU runs in machine check panic
21236 */
21237- if (atomic_inc_return(&mce_paniced) > 1)
21238+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21239 wait_for_panic();
21240 barrier();
21241
21242@@ -329,7 +330,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21243 console_verbose();
21244 } else {
21245 /* Don't log too much for fake panic */
21246- if (atomic_inc_return(&mce_fake_paniced) > 1)
21247+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21248 return;
21249 }
21250 /* First print corrected ones that are still unlogged */
21251@@ -368,7 +369,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21252 if (!fake_panic) {
21253 if (panic_timeout == 0)
21254 panic_timeout = mca_cfg.panic_timeout;
21255- panic(msg);
21256+ panic("%s", msg);
21257 } else
21258 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21259 }
21260@@ -699,7 +700,7 @@ static int mce_timed_out(u64 *t)
21261 * might have been modified by someone else.
21262 */
21263 rmb();
21264- if (atomic_read(&mce_paniced))
21265+ if (atomic_read_unchecked(&mce_paniced))
21266 wait_for_panic();
21267 if (!mca_cfg.monarch_timeout)
21268 goto out;
21269@@ -1680,7 +1681,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21270 }
21271
21272 /* Call the installed machine check handler for this CPU setup. */
21273-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21274+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21275 unexpected_machine_check;
21276
21277 /*
21278@@ -1703,7 +1704,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21279 return;
21280 }
21281
21282+ pax_open_kernel();
21283 machine_check_vector = do_machine_check;
21284+ pax_close_kernel();
21285
21286 __mcheck_cpu_init_generic();
21287 __mcheck_cpu_init_vendor(c);
21288@@ -1717,7 +1720,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21289 */
21290
21291 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21292-static int mce_chrdev_open_count; /* #times opened */
21293+static local_t mce_chrdev_open_count; /* #times opened */
21294 static int mce_chrdev_open_exclu; /* already open exclusive? */
21295
21296 static int mce_chrdev_open(struct inode *inode, struct file *file)
21297@@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21298 spin_lock(&mce_chrdev_state_lock);
21299
21300 if (mce_chrdev_open_exclu ||
21301- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21302+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21303 spin_unlock(&mce_chrdev_state_lock);
21304
21305 return -EBUSY;
21306@@ -1733,7 +1736,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21307
21308 if (file->f_flags & O_EXCL)
21309 mce_chrdev_open_exclu = 1;
21310- mce_chrdev_open_count++;
21311+ local_inc(&mce_chrdev_open_count);
21312
21313 spin_unlock(&mce_chrdev_state_lock);
21314
21315@@ -1744,7 +1747,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21316 {
21317 spin_lock(&mce_chrdev_state_lock);
21318
21319- mce_chrdev_open_count--;
21320+ local_dec(&mce_chrdev_open_count);
21321 mce_chrdev_open_exclu = 0;
21322
21323 spin_unlock(&mce_chrdev_state_lock);
21324@@ -2420,7 +2423,7 @@ static __init void mce_init_banks(void)
21325
21326 for (i = 0; i < mca_cfg.banks; i++) {
21327 struct mce_bank *b = &mce_banks[i];
21328- struct device_attribute *a = &b->attr;
21329+ device_attribute_no_const *a = &b->attr;
21330
21331 sysfs_attr_init(&a->attr);
21332 a->attr.name = b->attrname;
21333@@ -2492,7 +2495,7 @@ struct dentry *mce_get_debugfs_dir(void)
21334 static void mce_reset(void)
21335 {
21336 cpu_missing = 0;
21337- atomic_set(&mce_fake_paniced, 0);
21338+ atomic_set_unchecked(&mce_fake_paniced, 0);
21339 atomic_set(&mce_executing, 0);
21340 atomic_set(&mce_callin, 0);
21341 atomic_set(&global_nwo, 0);
21342diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21343index a304298..49b6d06 100644
21344--- a/arch/x86/kernel/cpu/mcheck/p5.c
21345+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21346@@ -10,6 +10,7 @@
21347 #include <asm/processor.h>
21348 #include <asm/mce.h>
21349 #include <asm/msr.h>
21350+#include <asm/pgtable.h>
21351
21352 /* By default disabled */
21353 int mce_p5_enabled __read_mostly;
21354@@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21355 if (!cpu_has(c, X86_FEATURE_MCE))
21356 return;
21357
21358+ pax_open_kernel();
21359 machine_check_vector = pentium_machine_check;
21360+ pax_close_kernel();
21361 /* Make sure the vector pointer is visible before we enable MCEs: */
21362 wmb();
21363
21364diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21365index 7dc5564..1273569 100644
21366--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21367+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21368@@ -9,6 +9,7 @@
21369 #include <asm/processor.h>
21370 #include <asm/mce.h>
21371 #include <asm/msr.h>
21372+#include <asm/pgtable.h>
21373
21374 /* Machine check handler for WinChip C6: */
21375 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21376@@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21377 {
21378 u32 lo, hi;
21379
21380+ pax_open_kernel();
21381 machine_check_vector = winchip_machine_check;
21382+ pax_close_kernel();
21383 /* Make sure the vector pointer is visible before we enable MCEs: */
21384 wmb();
21385
21386diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21387index 15c9876..0a43909 100644
21388--- a/arch/x86/kernel/cpu/microcode/core.c
21389+++ b/arch/x86/kernel/cpu/microcode/core.c
21390@@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21391 return NOTIFY_OK;
21392 }
21393
21394-static struct notifier_block __refdata mc_cpu_notifier = {
21395+static struct notifier_block mc_cpu_notifier = {
21396 .notifier_call = mc_cpu_callback,
21397 };
21398
21399diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21400index a276fa7..e66810f 100644
21401--- a/arch/x86/kernel/cpu/microcode/intel.c
21402+++ b/arch/x86/kernel/cpu/microcode/intel.c
21403@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21404
21405 static int get_ucode_user(void *to, const void *from, size_t n)
21406 {
21407- return copy_from_user(to, from, n);
21408+ return copy_from_user(to, (const void __force_user *)from, n);
21409 }
21410
21411 static enum ucode_state
21412 request_microcode_user(int cpu, const void __user *buf, size_t size)
21413 {
21414- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21415+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21416 }
21417
21418 static void microcode_fini_cpu(int cpu)
21419diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21420index f961de9..8a9d332 100644
21421--- a/arch/x86/kernel/cpu/mtrr/main.c
21422+++ b/arch/x86/kernel/cpu/mtrr/main.c
21423@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21424 u64 size_or_mask, size_and_mask;
21425 static bool mtrr_aps_delayed_init;
21426
21427-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21428+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21429
21430 const struct mtrr_ops *mtrr_if;
21431
21432diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21433index df5e41f..816c719 100644
21434--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21435+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21436@@ -25,7 +25,7 @@ struct mtrr_ops {
21437 int (*validate_add_page)(unsigned long base, unsigned long size,
21438 unsigned int type);
21439 int (*have_wrcomb)(void);
21440-};
21441+} __do_const;
21442
21443 extern int generic_get_free_region(unsigned long base, unsigned long size,
21444 int replace_reg);
21445diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21446index ae407f7..39c5b00 100644
21447--- a/arch/x86/kernel/cpu/perf_event.c
21448+++ b/arch/x86/kernel/cpu/perf_event.c
21449@@ -1367,7 +1367,7 @@ static void __init pmu_check_apic(void)
21450 pr_info("no hardware sampling interrupt available.\n");
21451 }
21452
21453-static struct attribute_group x86_pmu_format_group = {
21454+static attribute_group_no_const x86_pmu_format_group = {
21455 .name = "format",
21456 .attrs = NULL,
21457 };
21458@@ -1466,7 +1466,7 @@ static struct attribute *events_attr[] = {
21459 NULL,
21460 };
21461
21462-static struct attribute_group x86_pmu_events_group = {
21463+static attribute_group_no_const x86_pmu_events_group = {
21464 .name = "events",
21465 .attrs = events_attr,
21466 };
21467@@ -1990,7 +1990,7 @@ static unsigned long get_segment_base(unsigned int segment)
21468 if (idx > GDT_ENTRIES)
21469 return 0;
21470
21471- desc = __this_cpu_ptr(&gdt_page.gdt[0]);
21472+ desc = get_cpu_gdt_table(smp_processor_id());
21473 }
21474
21475 return get_desc_base(desc + idx);
21476@@ -2080,7 +2080,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21477 break;
21478
21479 perf_callchain_store(entry, frame.return_address);
21480- fp = frame.next_frame;
21481+ fp = (const void __force_user *)frame.next_frame;
21482 }
21483 }
21484
21485diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21486index 639d128..e92d7e5 100644
21487--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21488+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21489@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21490 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21491 {
21492 struct attribute **attrs;
21493- struct attribute_group *attr_group;
21494+ attribute_group_no_const *attr_group;
21495 int i = 0, j;
21496
21497 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21498diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21499index adb02aa..9688c02 100644
21500--- a/arch/x86/kernel/cpu/perf_event_intel.c
21501+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21502@@ -2308,10 +2308,10 @@ __init int intel_pmu_init(void)
21503 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21504
21505 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21506- u64 capabilities;
21507+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21508
21509- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21510- x86_pmu.intel_cap.capabilities = capabilities;
21511+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21512+ x86_pmu.intel_cap.capabilities = capabilities;
21513 }
21514
21515 intel_ds_init();
21516diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21517index 619f769..d510008 100644
21518--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21519+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21520@@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21521 NULL,
21522 };
21523
21524-static struct attribute_group rapl_pmu_events_group = {
21525+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21526 .name = "events",
21527 .attrs = NULL, /* patched at runtime */
21528 };
21529diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21530index 65bbbea..1438d9e 100644
21531--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21532+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21533@@ -3693,7 +3693,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21534 static int __init uncore_type_init(struct intel_uncore_type *type)
21535 {
21536 struct intel_uncore_pmu *pmus;
21537- struct attribute_group *attr_group;
21538+ attribute_group_no_const *attr_group;
21539 struct attribute **attrs;
21540 int i, j;
21541
21542diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21543index 90236f0..54cb20d 100644
21544--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21545+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21546@@ -503,7 +503,7 @@ struct intel_uncore_box {
21547 struct uncore_event_desc {
21548 struct kobj_attribute attr;
21549 const char *config;
21550-};
21551+} __do_const;
21552
21553 #define INTEL_UNCORE_EVENT_DESC(_name, _config) \
21554 { \
21555diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21556index 3225ae6c..ee3c6db 100644
21557--- a/arch/x86/kernel/cpuid.c
21558+++ b/arch/x86/kernel/cpuid.c
21559@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21560 return notifier_from_errno(err);
21561 }
21562
21563-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21564+static struct notifier_block cpuid_class_cpu_notifier =
21565 {
21566 .notifier_call = cpuid_class_cpu_callback,
21567 };
21568diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21569index 507de80..ebaae2a 100644
21570--- a/arch/x86/kernel/crash.c
21571+++ b/arch/x86/kernel/crash.c
21572@@ -58,7 +58,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21573 #ifdef CONFIG_X86_32
21574 struct pt_regs fixed_regs;
21575
21576- if (!user_mode_vm(regs)) {
21577+ if (!user_mode(regs)) {
21578 crash_fixup_ss_esp(&fixed_regs, regs);
21579 regs = &fixed_regs;
21580 }
21581diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21582index afa64ad..dce67dd 100644
21583--- a/arch/x86/kernel/crash_dump_64.c
21584+++ b/arch/x86/kernel/crash_dump_64.c
21585@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21586 return -ENOMEM;
21587
21588 if (userbuf) {
21589- if (copy_to_user(buf, vaddr + offset, csize)) {
21590+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21591 iounmap(vaddr);
21592 return -EFAULT;
21593 }
21594diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21595index f6dfd93..892ade4 100644
21596--- a/arch/x86/kernel/doublefault.c
21597+++ b/arch/x86/kernel/doublefault.c
21598@@ -12,7 +12,7 @@
21599
21600 #define DOUBLEFAULT_STACKSIZE (1024)
21601 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21602-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21603+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21604
21605 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21606
21607@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21608 unsigned long gdt, tss;
21609
21610 native_store_gdt(&gdt_desc);
21611- gdt = gdt_desc.address;
21612+ gdt = (unsigned long)gdt_desc.address;
21613
21614 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21615
21616@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21617 /* 0x2 bit is always set */
21618 .flags = X86_EFLAGS_SF | 0x2,
21619 .sp = STACK_START,
21620- .es = __USER_DS,
21621+ .es = __KERNEL_DS,
21622 .cs = __KERNEL_CS,
21623 .ss = __KERNEL_DS,
21624- .ds = __USER_DS,
21625+ .ds = __KERNEL_DS,
21626 .fs = __KERNEL_PERCPU,
21627
21628 .__cr3 = __pa_nodebug(swapper_pg_dir),
21629diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21630index d9c12d3..7858b62 100644
21631--- a/arch/x86/kernel/dumpstack.c
21632+++ b/arch/x86/kernel/dumpstack.c
21633@@ -2,6 +2,9 @@
21634 * Copyright (C) 1991, 1992 Linus Torvalds
21635 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21636 */
21637+#ifdef CONFIG_GRKERNSEC_HIDESYM
21638+#define __INCLUDED_BY_HIDESYM 1
21639+#endif
21640 #include <linux/kallsyms.h>
21641 #include <linux/kprobes.h>
21642 #include <linux/uaccess.h>
21643@@ -40,16 +43,14 @@ void printk_address(unsigned long address)
21644 static void
21645 print_ftrace_graph_addr(unsigned long addr, void *data,
21646 const struct stacktrace_ops *ops,
21647- struct thread_info *tinfo, int *graph)
21648+ struct task_struct *task, int *graph)
21649 {
21650- struct task_struct *task;
21651 unsigned long ret_addr;
21652 int index;
21653
21654 if (addr != (unsigned long)return_to_handler)
21655 return;
21656
21657- task = tinfo->task;
21658 index = task->curr_ret_stack;
21659
21660 if (!task->ret_stack || index < *graph)
21661@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21662 static inline void
21663 print_ftrace_graph_addr(unsigned long addr, void *data,
21664 const struct stacktrace_ops *ops,
21665- struct thread_info *tinfo, int *graph)
21666+ struct task_struct *task, int *graph)
21667 { }
21668 #endif
21669
21670@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21671 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21672 */
21673
21674-static inline int valid_stack_ptr(struct thread_info *tinfo,
21675- void *p, unsigned int size, void *end)
21676+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21677 {
21678- void *t = tinfo;
21679 if (end) {
21680 if (p < end && p >= (end-THREAD_SIZE))
21681 return 1;
21682@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21683 }
21684
21685 unsigned long
21686-print_context_stack(struct thread_info *tinfo,
21687+print_context_stack(struct task_struct *task, void *stack_start,
21688 unsigned long *stack, unsigned long bp,
21689 const struct stacktrace_ops *ops, void *data,
21690 unsigned long *end, int *graph)
21691 {
21692 struct stack_frame *frame = (struct stack_frame *)bp;
21693
21694- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21695+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21696 unsigned long addr;
21697
21698 addr = *stack;
21699@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21700 } else {
21701 ops->address(data, addr, 0);
21702 }
21703- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21704+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21705 }
21706 stack++;
21707 }
21708@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21709 EXPORT_SYMBOL_GPL(print_context_stack);
21710
21711 unsigned long
21712-print_context_stack_bp(struct thread_info *tinfo,
21713+print_context_stack_bp(struct task_struct *task, void *stack_start,
21714 unsigned long *stack, unsigned long bp,
21715 const struct stacktrace_ops *ops, void *data,
21716 unsigned long *end, int *graph)
21717@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21718 struct stack_frame *frame = (struct stack_frame *)bp;
21719 unsigned long *ret_addr = &frame->return_address;
21720
21721- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21722+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21723 unsigned long addr = *ret_addr;
21724
21725 if (!__kernel_text_address(addr))
21726@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21727 ops->address(data, addr, 1);
21728 frame = frame->next_frame;
21729 ret_addr = &frame->return_address;
21730- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21731+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21732 }
21733
21734 return (unsigned long)frame;
21735@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21736 static void print_trace_address(void *data, unsigned long addr, int reliable)
21737 {
21738 touch_nmi_watchdog();
21739- printk(data);
21740+ printk("%s", (char *)data);
21741 printk_stack_address(addr, reliable);
21742 }
21743
21744@@ -224,6 +223,8 @@ unsigned __kprobes long oops_begin(void)
21745 }
21746 EXPORT_SYMBOL_GPL(oops_begin);
21747
21748+extern void gr_handle_kernel_exploit(void);
21749+
21750 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21751 {
21752 if (regs && kexec_should_crash(current))
21753@@ -245,7 +246,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21754 panic("Fatal exception in interrupt");
21755 if (panic_on_oops)
21756 panic("Fatal exception");
21757- do_exit(signr);
21758+
21759+ gr_handle_kernel_exploit();
21760+
21761+ do_group_exit(signr);
21762 }
21763
21764 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
21765@@ -273,7 +277,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
21766 print_modules();
21767 show_regs(regs);
21768 #ifdef CONFIG_X86_32
21769- if (user_mode_vm(regs)) {
21770+ if (user_mode(regs)) {
21771 sp = regs->sp;
21772 ss = regs->ss & 0xffff;
21773 } else {
21774@@ -301,7 +305,7 @@ void die(const char *str, struct pt_regs *regs, long err)
21775 unsigned long flags = oops_begin();
21776 int sig = SIGSEGV;
21777
21778- if (!user_mode_vm(regs))
21779+ if (!user_mode(regs))
21780 report_bug(regs->ip, regs);
21781
21782 if (__die(str, regs, err))
21783diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
21784index 5abd4cd..c65733b 100644
21785--- a/arch/x86/kernel/dumpstack_32.c
21786+++ b/arch/x86/kernel/dumpstack_32.c
21787@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21788 bp = stack_frame(task, regs);
21789
21790 for (;;) {
21791- struct thread_info *context;
21792+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21793 void *end_stack;
21794
21795 end_stack = is_hardirq_stack(stack, cpu);
21796 if (!end_stack)
21797 end_stack = is_softirq_stack(stack, cpu);
21798
21799- context = task_thread_info(task);
21800- bp = ops->walk_stack(context, stack, bp, ops, data,
21801+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
21802 end_stack, &graph);
21803
21804 /* Stop if not on irq stack */
21805@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
21806 int i;
21807
21808 show_regs_print_info(KERN_EMERG);
21809- __show_regs(regs, !user_mode_vm(regs));
21810+ __show_regs(regs, !user_mode(regs));
21811
21812 /*
21813 * When in-kernel, we also print out the stack and code at the
21814 * time of the fault..
21815 */
21816- if (!user_mode_vm(regs)) {
21817+ if (!user_mode(regs)) {
21818 unsigned int code_prologue = code_bytes * 43 / 64;
21819 unsigned int code_len = code_bytes;
21820 unsigned char c;
21821 u8 *ip;
21822+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
21823
21824 pr_emerg("Stack:\n");
21825 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
21826
21827 pr_emerg("Code:");
21828
21829- ip = (u8 *)regs->ip - code_prologue;
21830+ ip = (u8 *)regs->ip - code_prologue + cs_base;
21831 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
21832 /* try starting at IP */
21833- ip = (u8 *)regs->ip;
21834+ ip = (u8 *)regs->ip + cs_base;
21835 code_len = code_len - code_prologue + 1;
21836 }
21837 for (i = 0; i < code_len; i++, ip++) {
21838@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
21839 pr_cont(" Bad EIP value.");
21840 break;
21841 }
21842- if (ip == (u8 *)regs->ip)
21843+ if (ip == (u8 *)regs->ip + cs_base)
21844 pr_cont(" <%02x>", c);
21845 else
21846 pr_cont(" %02x", c);
21847@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
21848 {
21849 unsigned short ud2;
21850
21851+ ip = ktla_ktva(ip);
21852 if (ip < PAGE_OFFSET)
21853 return 0;
21854 if (probe_kernel_address((unsigned short *)ip, ud2))
21855@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
21856
21857 return ud2 == 0x0b0f;
21858 }
21859+
21860+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
21861+void pax_check_alloca(unsigned long size)
21862+{
21863+ unsigned long sp = (unsigned long)&sp, stack_left;
21864+
21865+ /* all kernel stacks are of the same size */
21866+ stack_left = sp & (THREAD_SIZE - 1);
21867+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21868+}
21869+EXPORT_SYMBOL(pax_check_alloca);
21870+#endif
21871diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
21872index 1abcb50..6c8d702 100644
21873--- a/arch/x86/kernel/dumpstack_64.c
21874+++ b/arch/x86/kernel/dumpstack_64.c
21875@@ -154,12 +154,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21876 const struct stacktrace_ops *ops, void *data)
21877 {
21878 const unsigned cpu = get_cpu();
21879- struct thread_info *tinfo;
21880 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
21881 unsigned long dummy;
21882 unsigned used = 0;
21883 int graph = 0;
21884 int done = 0;
21885+ void *stack_start;
21886
21887 if (!task)
21888 task = current;
21889@@ -180,7 +180,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21890 * current stack address. If the stacks consist of nested
21891 * exceptions
21892 */
21893- tinfo = task_thread_info(task);
21894 while (!done) {
21895 unsigned long *stack_end;
21896 enum stack_type stype;
21897@@ -203,7 +202,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21898 if (ops->stack(data, id) < 0)
21899 break;
21900
21901- bp = ops->walk_stack(tinfo, stack, bp, ops,
21902+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
21903 data, stack_end, &graph);
21904 ops->stack(data, "<EOE>");
21905 /*
21906@@ -211,6 +210,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21907 * second-to-last pointer (index -2 to end) in the
21908 * exception stack:
21909 */
21910+ if ((u16)stack_end[-1] != __KERNEL_DS)
21911+ goto out;
21912 stack = (unsigned long *) stack_end[-2];
21913 done = 0;
21914 break;
21915@@ -219,7 +220,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21916
21917 if (ops->stack(data, "IRQ") < 0)
21918 break;
21919- bp = ops->walk_stack(tinfo, stack, bp,
21920+ bp = ops->walk_stack(task, irq_stack, stack, bp,
21921 ops, data, stack_end, &graph);
21922 /*
21923 * We link to the next stack (which would be
21924@@ -241,7 +242,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
21925 /*
21926 * This handles the process stack:
21927 */
21928- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
21929+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
21930+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
21931+out:
21932 put_cpu();
21933 }
21934 EXPORT_SYMBOL(dump_trace);
21935@@ -350,3 +353,50 @@ int is_valid_bugaddr(unsigned long ip)
21936
21937 return ud2 == 0x0b0f;
21938 }
21939+
21940+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
21941+void pax_check_alloca(unsigned long size)
21942+{
21943+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
21944+ unsigned cpu, used;
21945+ char *id;
21946+
21947+ /* check the process stack first */
21948+ stack_start = (unsigned long)task_stack_page(current);
21949+ stack_end = stack_start + THREAD_SIZE;
21950+ if (likely(stack_start <= sp && sp < stack_end)) {
21951+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
21952+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21953+ return;
21954+ }
21955+
21956+ cpu = get_cpu();
21957+
21958+ /* check the irq stacks */
21959+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
21960+ stack_start = stack_end - IRQ_STACK_SIZE;
21961+ if (stack_start <= sp && sp < stack_end) {
21962+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
21963+ put_cpu();
21964+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21965+ return;
21966+ }
21967+
21968+ /* check the exception stacks */
21969+ used = 0;
21970+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
21971+ stack_start = stack_end - EXCEPTION_STKSZ;
21972+ if (stack_end && stack_start <= sp && sp < stack_end) {
21973+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
21974+ put_cpu();
21975+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
21976+ return;
21977+ }
21978+
21979+ put_cpu();
21980+
21981+ /* unknown stack */
21982+ BUG();
21983+}
21984+EXPORT_SYMBOL(pax_check_alloca);
21985+#endif
21986diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
21987index 988c00a..4f673b6 100644
21988--- a/arch/x86/kernel/e820.c
21989+++ b/arch/x86/kernel/e820.c
21990@@ -803,8 +803,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
21991
21992 static void early_panic(char *msg)
21993 {
21994- early_printk(msg);
21995- panic(msg);
21996+ early_printk("%s", msg);
21997+ panic("%s", msg);
21998 }
21999
22000 static int userdef __initdata;
22001diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22002index 01d1c18..8073693 100644
22003--- a/arch/x86/kernel/early_printk.c
22004+++ b/arch/x86/kernel/early_printk.c
22005@@ -7,6 +7,7 @@
22006 #include <linux/pci_regs.h>
22007 #include <linux/pci_ids.h>
22008 #include <linux/errno.h>
22009+#include <linux/sched.h>
22010 #include <asm/io.h>
22011 #include <asm/processor.h>
22012 #include <asm/fcntl.h>
22013diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22014index 6491353..a918952 100644
22015--- a/arch/x86/kernel/entry_32.S
22016+++ b/arch/x86/kernel/entry_32.S
22017@@ -177,13 +177,153 @@
22018 /*CFI_REL_OFFSET gs, PT_GS*/
22019 .endm
22020 .macro SET_KERNEL_GS reg
22021+
22022+#ifdef CONFIG_CC_STACKPROTECTOR
22023 movl $(__KERNEL_STACK_CANARY), \reg
22024+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22025+ movl $(__USER_DS), \reg
22026+#else
22027+ xorl \reg, \reg
22028+#endif
22029+
22030 movl \reg, %gs
22031 .endm
22032
22033 #endif /* CONFIG_X86_32_LAZY_GS */
22034
22035-.macro SAVE_ALL
22036+.macro pax_enter_kernel
22037+#ifdef CONFIG_PAX_KERNEXEC
22038+ call pax_enter_kernel
22039+#endif
22040+.endm
22041+
22042+.macro pax_exit_kernel
22043+#ifdef CONFIG_PAX_KERNEXEC
22044+ call pax_exit_kernel
22045+#endif
22046+.endm
22047+
22048+#ifdef CONFIG_PAX_KERNEXEC
22049+ENTRY(pax_enter_kernel)
22050+#ifdef CONFIG_PARAVIRT
22051+ pushl %eax
22052+ pushl %ecx
22053+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22054+ mov %eax, %esi
22055+#else
22056+ mov %cr0, %esi
22057+#endif
22058+ bts $16, %esi
22059+ jnc 1f
22060+ mov %cs, %esi
22061+ cmp $__KERNEL_CS, %esi
22062+ jz 3f
22063+ ljmp $__KERNEL_CS, $3f
22064+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22065+2:
22066+#ifdef CONFIG_PARAVIRT
22067+ mov %esi, %eax
22068+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22069+#else
22070+ mov %esi, %cr0
22071+#endif
22072+3:
22073+#ifdef CONFIG_PARAVIRT
22074+ popl %ecx
22075+ popl %eax
22076+#endif
22077+ ret
22078+ENDPROC(pax_enter_kernel)
22079+
22080+ENTRY(pax_exit_kernel)
22081+#ifdef CONFIG_PARAVIRT
22082+ pushl %eax
22083+ pushl %ecx
22084+#endif
22085+ mov %cs, %esi
22086+ cmp $__KERNEXEC_KERNEL_CS, %esi
22087+ jnz 2f
22088+#ifdef CONFIG_PARAVIRT
22089+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22090+ mov %eax, %esi
22091+#else
22092+ mov %cr0, %esi
22093+#endif
22094+ btr $16, %esi
22095+ ljmp $__KERNEL_CS, $1f
22096+1:
22097+#ifdef CONFIG_PARAVIRT
22098+ mov %esi, %eax
22099+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22100+#else
22101+ mov %esi, %cr0
22102+#endif
22103+2:
22104+#ifdef CONFIG_PARAVIRT
22105+ popl %ecx
22106+ popl %eax
22107+#endif
22108+ ret
22109+ENDPROC(pax_exit_kernel)
22110+#endif
22111+
22112+ .macro pax_erase_kstack
22113+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22114+ call pax_erase_kstack
22115+#endif
22116+ .endm
22117+
22118+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22119+/*
22120+ * ebp: thread_info
22121+ */
22122+ENTRY(pax_erase_kstack)
22123+ pushl %edi
22124+ pushl %ecx
22125+ pushl %eax
22126+
22127+ mov TI_lowest_stack(%ebp), %edi
22128+ mov $-0xBEEF, %eax
22129+ std
22130+
22131+1: mov %edi, %ecx
22132+ and $THREAD_SIZE_asm - 1, %ecx
22133+ shr $2, %ecx
22134+ repne scasl
22135+ jecxz 2f
22136+
22137+ cmp $2*16, %ecx
22138+ jc 2f
22139+
22140+ mov $2*16, %ecx
22141+ repe scasl
22142+ jecxz 2f
22143+ jne 1b
22144+
22145+2: cld
22146+ mov %esp, %ecx
22147+ sub %edi, %ecx
22148+
22149+ cmp $THREAD_SIZE_asm, %ecx
22150+ jb 3f
22151+ ud2
22152+3:
22153+
22154+ shr $2, %ecx
22155+ rep stosl
22156+
22157+ mov TI_task_thread_sp0(%ebp), %edi
22158+ sub $128, %edi
22159+ mov %edi, TI_lowest_stack(%ebp)
22160+
22161+ popl %eax
22162+ popl %ecx
22163+ popl %edi
22164+ ret
22165+ENDPROC(pax_erase_kstack)
22166+#endif
22167+
22168+.macro __SAVE_ALL _DS
22169 cld
22170 PUSH_GS
22171 pushl_cfi %fs
22172@@ -206,7 +346,7 @@
22173 CFI_REL_OFFSET ecx, 0
22174 pushl_cfi %ebx
22175 CFI_REL_OFFSET ebx, 0
22176- movl $(__USER_DS), %edx
22177+ movl $\_DS, %edx
22178 movl %edx, %ds
22179 movl %edx, %es
22180 movl $(__KERNEL_PERCPU), %edx
22181@@ -214,6 +354,15 @@
22182 SET_KERNEL_GS %edx
22183 .endm
22184
22185+.macro SAVE_ALL
22186+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22187+ __SAVE_ALL __KERNEL_DS
22188+ pax_enter_kernel
22189+#else
22190+ __SAVE_ALL __USER_DS
22191+#endif
22192+.endm
22193+
22194 .macro RESTORE_INT_REGS
22195 popl_cfi %ebx
22196 CFI_RESTORE ebx
22197@@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
22198 popfl_cfi
22199 jmp syscall_exit
22200 CFI_ENDPROC
22201-END(ret_from_fork)
22202+ENDPROC(ret_from_fork)
22203
22204 ENTRY(ret_from_kernel_thread)
22205 CFI_STARTPROC
22206@@ -344,7 +493,15 @@ ret_from_intr:
22207 andl $SEGMENT_RPL_MASK, %eax
22208 #endif
22209 cmpl $USER_RPL, %eax
22210+
22211+#ifdef CONFIG_PAX_KERNEXEC
22212+ jae resume_userspace
22213+
22214+ pax_exit_kernel
22215+ jmp resume_kernel
22216+#else
22217 jb resume_kernel # not returning to v8086 or userspace
22218+#endif
22219
22220 ENTRY(resume_userspace)
22221 LOCKDEP_SYS_EXIT
22222@@ -356,8 +513,8 @@ ENTRY(resume_userspace)
22223 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22224 # int/exception return?
22225 jne work_pending
22226- jmp restore_all
22227-END(ret_from_exception)
22228+ jmp restore_all_pax
22229+ENDPROC(ret_from_exception)
22230
22231 #ifdef CONFIG_PREEMPT
22232 ENTRY(resume_kernel)
22233@@ -369,7 +526,7 @@ need_resched:
22234 jz restore_all
22235 call preempt_schedule_irq
22236 jmp need_resched
22237-END(resume_kernel)
22238+ENDPROC(resume_kernel)
22239 #endif
22240 CFI_ENDPROC
22241 /*
22242@@ -403,30 +560,45 @@ sysenter_past_esp:
22243 /*CFI_REL_OFFSET cs, 0*/
22244 /*
22245 * Push current_thread_info()->sysenter_return to the stack.
22246- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22247- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22248 */
22249- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22250+ pushl_cfi $0
22251 CFI_REL_OFFSET eip, 0
22252
22253 pushl_cfi %eax
22254 SAVE_ALL
22255+ GET_THREAD_INFO(%ebp)
22256+ movl TI_sysenter_return(%ebp),%ebp
22257+ movl %ebp,PT_EIP(%esp)
22258 ENABLE_INTERRUPTS(CLBR_NONE)
22259
22260 /*
22261 * Load the potential sixth argument from user stack.
22262 * Careful about security.
22263 */
22264+ movl PT_OLDESP(%esp),%ebp
22265+
22266+#ifdef CONFIG_PAX_MEMORY_UDEREF
22267+ mov PT_OLDSS(%esp),%ds
22268+1: movl %ds:(%ebp),%ebp
22269+ push %ss
22270+ pop %ds
22271+#else
22272 cmpl $__PAGE_OFFSET-3,%ebp
22273 jae syscall_fault
22274 ASM_STAC
22275 1: movl (%ebp),%ebp
22276 ASM_CLAC
22277+#endif
22278+
22279 movl %ebp,PT_EBP(%esp)
22280 _ASM_EXTABLE(1b,syscall_fault)
22281
22282 GET_THREAD_INFO(%ebp)
22283
22284+#ifdef CONFIG_PAX_RANDKSTACK
22285+ pax_erase_kstack
22286+#endif
22287+
22288 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22289 jnz sysenter_audit
22290 sysenter_do_call:
22291@@ -442,12 +614,24 @@ sysenter_after_call:
22292 testl $_TIF_ALLWORK_MASK, %ecx
22293 jne sysexit_audit
22294 sysenter_exit:
22295+
22296+#ifdef CONFIG_PAX_RANDKSTACK
22297+ pushl_cfi %eax
22298+ movl %esp, %eax
22299+ call pax_randomize_kstack
22300+ popl_cfi %eax
22301+#endif
22302+
22303+ pax_erase_kstack
22304+
22305 /* if something modifies registers it must also disable sysexit */
22306 movl PT_EIP(%esp), %edx
22307 movl PT_OLDESP(%esp), %ecx
22308 xorl %ebp,%ebp
22309 TRACE_IRQS_ON
22310 1: mov PT_FS(%esp), %fs
22311+2: mov PT_DS(%esp), %ds
22312+3: mov PT_ES(%esp), %es
22313 PTGS_TO_GS
22314 ENABLE_INTERRUPTS_SYSEXIT
22315
22316@@ -464,6 +648,9 @@ sysenter_audit:
22317 movl %eax,%edx /* 2nd arg: syscall number */
22318 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
22319 call __audit_syscall_entry
22320+
22321+ pax_erase_kstack
22322+
22323 pushl_cfi %ebx
22324 movl PT_EAX(%esp),%eax /* reload syscall number */
22325 jmp sysenter_do_call
22326@@ -489,10 +676,16 @@ sysexit_audit:
22327
22328 CFI_ENDPROC
22329 .pushsection .fixup,"ax"
22330-2: movl $0,PT_FS(%esp)
22331+4: movl $0,PT_FS(%esp)
22332+ jmp 1b
22333+5: movl $0,PT_DS(%esp)
22334+ jmp 1b
22335+6: movl $0,PT_ES(%esp)
22336 jmp 1b
22337 .popsection
22338- _ASM_EXTABLE(1b,2b)
22339+ _ASM_EXTABLE(1b,4b)
22340+ _ASM_EXTABLE(2b,5b)
22341+ _ASM_EXTABLE(3b,6b)
22342 PTGS_TO_GS_EX
22343 ENDPROC(ia32_sysenter_target)
22344
22345@@ -507,6 +700,11 @@ ENTRY(system_call)
22346 pushl_cfi %eax # save orig_eax
22347 SAVE_ALL
22348 GET_THREAD_INFO(%ebp)
22349+
22350+#ifdef CONFIG_PAX_RANDKSTACK
22351+ pax_erase_kstack
22352+#endif
22353+
22354 # system call tracing in operation / emulation
22355 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22356 jnz syscall_trace_entry
22357@@ -525,6 +723,15 @@ syscall_exit:
22358 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22359 jne syscall_exit_work
22360
22361+restore_all_pax:
22362+
22363+#ifdef CONFIG_PAX_RANDKSTACK
22364+ movl %esp, %eax
22365+ call pax_randomize_kstack
22366+#endif
22367+
22368+ pax_erase_kstack
22369+
22370 restore_all:
22371 TRACE_IRQS_IRET
22372 restore_all_notrace:
22373@@ -576,14 +783,34 @@ ldt_ss:
22374 * compensating for the offset by changing to the ESPFIX segment with
22375 * a base address that matches for the difference.
22376 */
22377-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22378+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22379 mov %esp, %edx /* load kernel esp */
22380 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22381 mov %dx, %ax /* eax: new kernel esp */
22382 sub %eax, %edx /* offset (low word is 0) */
22383+#ifdef CONFIG_SMP
22384+ movl PER_CPU_VAR(cpu_number), %ebx
22385+ shll $PAGE_SHIFT_asm, %ebx
22386+ addl $cpu_gdt_table, %ebx
22387+#else
22388+ movl $cpu_gdt_table, %ebx
22389+#endif
22390 shr $16, %edx
22391- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22392- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22393+
22394+#ifdef CONFIG_PAX_KERNEXEC
22395+ mov %cr0, %esi
22396+ btr $16, %esi
22397+ mov %esi, %cr0
22398+#endif
22399+
22400+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22401+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22402+
22403+#ifdef CONFIG_PAX_KERNEXEC
22404+ bts $16, %esi
22405+ mov %esi, %cr0
22406+#endif
22407+
22408 pushl_cfi $__ESPFIX_SS
22409 pushl_cfi %eax /* new kernel esp */
22410 /* Disable interrupts, but do not irqtrace this section: we
22411@@ -612,20 +839,18 @@ work_resched:
22412 movl TI_flags(%ebp), %ecx
22413 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22414 # than syscall tracing?
22415- jz restore_all
22416+ jz restore_all_pax
22417 testb $_TIF_NEED_RESCHED, %cl
22418 jnz work_resched
22419
22420 work_notifysig: # deal with pending signals and
22421 # notify-resume requests
22422+ movl %esp, %eax
22423 #ifdef CONFIG_VM86
22424 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22425- movl %esp, %eax
22426 jne work_notifysig_v86 # returning to kernel-space or
22427 # vm86-space
22428 1:
22429-#else
22430- movl %esp, %eax
22431 #endif
22432 TRACE_IRQS_ON
22433 ENABLE_INTERRUPTS(CLBR_NONE)
22434@@ -646,7 +871,7 @@ work_notifysig_v86:
22435 movl %eax, %esp
22436 jmp 1b
22437 #endif
22438-END(work_pending)
22439+ENDPROC(work_pending)
22440
22441 # perform syscall exit tracing
22442 ALIGN
22443@@ -654,11 +879,14 @@ syscall_trace_entry:
22444 movl $-ENOSYS,PT_EAX(%esp)
22445 movl %esp, %eax
22446 call syscall_trace_enter
22447+
22448+ pax_erase_kstack
22449+
22450 /* What it returned is what we'll actually use. */
22451 cmpl $(NR_syscalls), %eax
22452 jnae syscall_call
22453 jmp syscall_exit
22454-END(syscall_trace_entry)
22455+ENDPROC(syscall_trace_entry)
22456
22457 # perform syscall exit tracing
22458 ALIGN
22459@@ -671,26 +899,30 @@ syscall_exit_work:
22460 movl %esp, %eax
22461 call syscall_trace_leave
22462 jmp resume_userspace
22463-END(syscall_exit_work)
22464+ENDPROC(syscall_exit_work)
22465 CFI_ENDPROC
22466
22467 RING0_INT_FRAME # can't unwind into user space anyway
22468 syscall_fault:
22469+#ifdef CONFIG_PAX_MEMORY_UDEREF
22470+ push %ss
22471+ pop %ds
22472+#endif
22473 ASM_CLAC
22474 GET_THREAD_INFO(%ebp)
22475 movl $-EFAULT,PT_EAX(%esp)
22476 jmp resume_userspace
22477-END(syscall_fault)
22478+ENDPROC(syscall_fault)
22479
22480 syscall_badsys:
22481 movl $-ENOSYS,PT_EAX(%esp)
22482 jmp syscall_exit
22483-END(syscall_badsys)
22484+ENDPROC(syscall_badsys)
22485
22486 sysenter_badsys:
22487 movl $-ENOSYS,PT_EAX(%esp)
22488 jmp sysenter_after_call
22489-END(syscall_badsys)
22490+ENDPROC(sysenter_badsys)
22491 CFI_ENDPROC
22492 /*
22493 * End of kprobes section
22494@@ -706,8 +938,15 @@ END(syscall_badsys)
22495 * normal stack and adjusts ESP with the matching offset.
22496 */
22497 /* fixup the stack */
22498- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22499- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22500+#ifdef CONFIG_SMP
22501+ movl PER_CPU_VAR(cpu_number), %ebx
22502+ shll $PAGE_SHIFT_asm, %ebx
22503+ addl $cpu_gdt_table, %ebx
22504+#else
22505+ movl $cpu_gdt_table, %ebx
22506+#endif
22507+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22508+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22509 shl $16, %eax
22510 addl %esp, %eax /* the adjusted stack pointer */
22511 pushl_cfi $__KERNEL_DS
22512@@ -760,7 +999,7 @@ vector=vector+1
22513 .endr
22514 2: jmp common_interrupt
22515 .endr
22516-END(irq_entries_start)
22517+ENDPROC(irq_entries_start)
22518
22519 .previous
22520 END(interrupt)
22521@@ -821,7 +1060,7 @@ ENTRY(coprocessor_error)
22522 pushl_cfi $do_coprocessor_error
22523 jmp error_code
22524 CFI_ENDPROC
22525-END(coprocessor_error)
22526+ENDPROC(coprocessor_error)
22527
22528 ENTRY(simd_coprocessor_error)
22529 RING0_INT_FRAME
22530@@ -834,7 +1073,7 @@ ENTRY(simd_coprocessor_error)
22531 .section .altinstructions,"a"
22532 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22533 .previous
22534-.section .altinstr_replacement,"ax"
22535+.section .altinstr_replacement,"a"
22536 663: pushl $do_simd_coprocessor_error
22537 664:
22538 .previous
22539@@ -843,7 +1082,7 @@ ENTRY(simd_coprocessor_error)
22540 #endif
22541 jmp error_code
22542 CFI_ENDPROC
22543-END(simd_coprocessor_error)
22544+ENDPROC(simd_coprocessor_error)
22545
22546 ENTRY(device_not_available)
22547 RING0_INT_FRAME
22548@@ -852,18 +1091,18 @@ ENTRY(device_not_available)
22549 pushl_cfi $do_device_not_available
22550 jmp error_code
22551 CFI_ENDPROC
22552-END(device_not_available)
22553+ENDPROC(device_not_available)
22554
22555 #ifdef CONFIG_PARAVIRT
22556 ENTRY(native_iret)
22557 iret
22558 _ASM_EXTABLE(native_iret, iret_exc)
22559-END(native_iret)
22560+ENDPROC(native_iret)
22561
22562 ENTRY(native_irq_enable_sysexit)
22563 sti
22564 sysexit
22565-END(native_irq_enable_sysexit)
22566+ENDPROC(native_irq_enable_sysexit)
22567 #endif
22568
22569 ENTRY(overflow)
22570@@ -873,7 +1112,7 @@ ENTRY(overflow)
22571 pushl_cfi $do_overflow
22572 jmp error_code
22573 CFI_ENDPROC
22574-END(overflow)
22575+ENDPROC(overflow)
22576
22577 ENTRY(bounds)
22578 RING0_INT_FRAME
22579@@ -882,7 +1121,7 @@ ENTRY(bounds)
22580 pushl_cfi $do_bounds
22581 jmp error_code
22582 CFI_ENDPROC
22583-END(bounds)
22584+ENDPROC(bounds)
22585
22586 ENTRY(invalid_op)
22587 RING0_INT_FRAME
22588@@ -891,7 +1130,7 @@ ENTRY(invalid_op)
22589 pushl_cfi $do_invalid_op
22590 jmp error_code
22591 CFI_ENDPROC
22592-END(invalid_op)
22593+ENDPROC(invalid_op)
22594
22595 ENTRY(coprocessor_segment_overrun)
22596 RING0_INT_FRAME
22597@@ -900,7 +1139,7 @@ ENTRY(coprocessor_segment_overrun)
22598 pushl_cfi $do_coprocessor_segment_overrun
22599 jmp error_code
22600 CFI_ENDPROC
22601-END(coprocessor_segment_overrun)
22602+ENDPROC(coprocessor_segment_overrun)
22603
22604 ENTRY(invalid_TSS)
22605 RING0_EC_FRAME
22606@@ -908,7 +1147,7 @@ ENTRY(invalid_TSS)
22607 pushl_cfi $do_invalid_TSS
22608 jmp error_code
22609 CFI_ENDPROC
22610-END(invalid_TSS)
22611+ENDPROC(invalid_TSS)
22612
22613 ENTRY(segment_not_present)
22614 RING0_EC_FRAME
22615@@ -916,7 +1155,7 @@ ENTRY(segment_not_present)
22616 pushl_cfi $do_segment_not_present
22617 jmp error_code
22618 CFI_ENDPROC
22619-END(segment_not_present)
22620+ENDPROC(segment_not_present)
22621
22622 ENTRY(stack_segment)
22623 RING0_EC_FRAME
22624@@ -924,7 +1163,7 @@ ENTRY(stack_segment)
22625 pushl_cfi $do_stack_segment
22626 jmp error_code
22627 CFI_ENDPROC
22628-END(stack_segment)
22629+ENDPROC(stack_segment)
22630
22631 ENTRY(alignment_check)
22632 RING0_EC_FRAME
22633@@ -932,7 +1171,7 @@ ENTRY(alignment_check)
22634 pushl_cfi $do_alignment_check
22635 jmp error_code
22636 CFI_ENDPROC
22637-END(alignment_check)
22638+ENDPROC(alignment_check)
22639
22640 ENTRY(divide_error)
22641 RING0_INT_FRAME
22642@@ -941,7 +1180,7 @@ ENTRY(divide_error)
22643 pushl_cfi $do_divide_error
22644 jmp error_code
22645 CFI_ENDPROC
22646-END(divide_error)
22647+ENDPROC(divide_error)
22648
22649 #ifdef CONFIG_X86_MCE
22650 ENTRY(machine_check)
22651@@ -951,7 +1190,7 @@ ENTRY(machine_check)
22652 pushl_cfi machine_check_vector
22653 jmp error_code
22654 CFI_ENDPROC
22655-END(machine_check)
22656+ENDPROC(machine_check)
22657 #endif
22658
22659 ENTRY(spurious_interrupt_bug)
22660@@ -961,7 +1200,7 @@ ENTRY(spurious_interrupt_bug)
22661 pushl_cfi $do_spurious_interrupt_bug
22662 jmp error_code
22663 CFI_ENDPROC
22664-END(spurious_interrupt_bug)
22665+ENDPROC(spurious_interrupt_bug)
22666 /*
22667 * End of kprobes section
22668 */
22669@@ -1071,7 +1310,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22670
22671 ENTRY(mcount)
22672 ret
22673-END(mcount)
22674+ENDPROC(mcount)
22675
22676 ENTRY(ftrace_caller)
22677 cmpl $0, function_trace_stop
22678@@ -1104,7 +1343,7 @@ ftrace_graph_call:
22679 .globl ftrace_stub
22680 ftrace_stub:
22681 ret
22682-END(ftrace_caller)
22683+ENDPROC(ftrace_caller)
22684
22685 ENTRY(ftrace_regs_caller)
22686 pushf /* push flags before compare (in cs location) */
22687@@ -1208,7 +1447,7 @@ trace:
22688 popl %ecx
22689 popl %eax
22690 jmp ftrace_stub
22691-END(mcount)
22692+ENDPROC(mcount)
22693 #endif /* CONFIG_DYNAMIC_FTRACE */
22694 #endif /* CONFIG_FUNCTION_TRACER */
22695
22696@@ -1226,7 +1465,7 @@ ENTRY(ftrace_graph_caller)
22697 popl %ecx
22698 popl %eax
22699 ret
22700-END(ftrace_graph_caller)
22701+ENDPROC(ftrace_graph_caller)
22702
22703 .globl return_to_handler
22704 return_to_handler:
22705@@ -1292,15 +1531,18 @@ error_code:
22706 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22707 REG_TO_PTGS %ecx
22708 SET_KERNEL_GS %ecx
22709- movl $(__USER_DS), %ecx
22710+ movl $(__KERNEL_DS), %ecx
22711 movl %ecx, %ds
22712 movl %ecx, %es
22713+
22714+ pax_enter_kernel
22715+
22716 TRACE_IRQS_OFF
22717 movl %esp,%eax # pt_regs pointer
22718 call *%edi
22719 jmp ret_from_exception
22720 CFI_ENDPROC
22721-END(page_fault)
22722+ENDPROC(page_fault)
22723
22724 /*
22725 * Debug traps and NMI can happen at the one SYSENTER instruction
22726@@ -1343,7 +1585,7 @@ debug_stack_correct:
22727 call do_debug
22728 jmp ret_from_exception
22729 CFI_ENDPROC
22730-END(debug)
22731+ENDPROC(debug)
22732
22733 /*
22734 * NMI is doubly nasty. It can happen _while_ we're handling
22735@@ -1381,6 +1623,9 @@ nmi_stack_correct:
22736 xorl %edx,%edx # zero error code
22737 movl %esp,%eax # pt_regs pointer
22738 call do_nmi
22739+
22740+ pax_exit_kernel
22741+
22742 jmp restore_all_notrace
22743 CFI_ENDPROC
22744
22745@@ -1417,12 +1662,15 @@ nmi_espfix_stack:
22746 FIXUP_ESPFIX_STACK # %eax == %esp
22747 xorl %edx,%edx # zero error code
22748 call do_nmi
22749+
22750+ pax_exit_kernel
22751+
22752 RESTORE_REGS
22753 lss 12+4(%esp), %esp # back to espfix stack
22754 CFI_ADJUST_CFA_OFFSET -24
22755 jmp irq_return
22756 CFI_ENDPROC
22757-END(nmi)
22758+ENDPROC(nmi)
22759
22760 ENTRY(int3)
22761 RING0_INT_FRAME
22762@@ -1435,14 +1683,14 @@ ENTRY(int3)
22763 call do_int3
22764 jmp ret_from_exception
22765 CFI_ENDPROC
22766-END(int3)
22767+ENDPROC(int3)
22768
22769 ENTRY(general_protection)
22770 RING0_EC_FRAME
22771 pushl_cfi $do_general_protection
22772 jmp error_code
22773 CFI_ENDPROC
22774-END(general_protection)
22775+ENDPROC(general_protection)
22776
22777 #ifdef CONFIG_KVM_GUEST
22778 ENTRY(async_page_fault)
22779@@ -1451,7 +1699,7 @@ ENTRY(async_page_fault)
22780 pushl_cfi $do_async_page_fault
22781 jmp error_code
22782 CFI_ENDPROC
22783-END(async_page_fault)
22784+ENDPROC(async_page_fault)
22785 #endif
22786
22787 /*
22788diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
22789index 1e96c36..3ff710a 100644
22790--- a/arch/x86/kernel/entry_64.S
22791+++ b/arch/x86/kernel/entry_64.S
22792@@ -59,6 +59,8 @@
22793 #include <asm/context_tracking.h>
22794 #include <asm/smap.h>
22795 #include <linux/err.h>
22796+#include <asm/pgtable.h>
22797+#include <asm/alternative-asm.h>
22798
22799 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
22800 #include <linux/elf-em.h>
22801@@ -80,8 +82,9 @@
22802 #ifdef CONFIG_DYNAMIC_FTRACE
22803
22804 ENTRY(function_hook)
22805+ pax_force_retaddr
22806 retq
22807-END(function_hook)
22808+ENDPROC(function_hook)
22809
22810 /* skip is set if stack has been adjusted */
22811 .macro ftrace_caller_setup skip=0
22812@@ -122,8 +125,9 @@ GLOBAL(ftrace_graph_call)
22813 #endif
22814
22815 GLOBAL(ftrace_stub)
22816+ pax_force_retaddr
22817 retq
22818-END(ftrace_caller)
22819+ENDPROC(ftrace_caller)
22820
22821 ENTRY(ftrace_regs_caller)
22822 /* Save the current flags before compare (in SS location)*/
22823@@ -191,7 +195,7 @@ ftrace_restore_flags:
22824 popfq
22825 jmp ftrace_stub
22826
22827-END(ftrace_regs_caller)
22828+ENDPROC(ftrace_regs_caller)
22829
22830
22831 #else /* ! CONFIG_DYNAMIC_FTRACE */
22832@@ -212,6 +216,7 @@ ENTRY(function_hook)
22833 #endif
22834
22835 GLOBAL(ftrace_stub)
22836+ pax_force_retaddr
22837 retq
22838
22839 trace:
22840@@ -225,12 +230,13 @@ trace:
22841 #endif
22842 subq $MCOUNT_INSN_SIZE, %rdi
22843
22844+ pax_force_fptr ftrace_trace_function
22845 call *ftrace_trace_function
22846
22847 MCOUNT_RESTORE_FRAME
22848
22849 jmp ftrace_stub
22850-END(function_hook)
22851+ENDPROC(function_hook)
22852 #endif /* CONFIG_DYNAMIC_FTRACE */
22853 #endif /* CONFIG_FUNCTION_TRACER */
22854
22855@@ -252,8 +258,9 @@ ENTRY(ftrace_graph_caller)
22856
22857 MCOUNT_RESTORE_FRAME
22858
22859+ pax_force_retaddr
22860 retq
22861-END(ftrace_graph_caller)
22862+ENDPROC(ftrace_graph_caller)
22863
22864 GLOBAL(return_to_handler)
22865 subq $24, %rsp
22866@@ -269,7 +276,9 @@ GLOBAL(return_to_handler)
22867 movq 8(%rsp), %rdx
22868 movq (%rsp), %rax
22869 addq $24, %rsp
22870+ pax_force_fptr %rdi
22871 jmp *%rdi
22872+ENDPROC(return_to_handler)
22873 #endif
22874
22875
22876@@ -284,6 +293,430 @@ ENTRY(native_usergs_sysret64)
22877 ENDPROC(native_usergs_sysret64)
22878 #endif /* CONFIG_PARAVIRT */
22879
22880+ .macro ljmpq sel, off
22881+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
22882+ .byte 0x48; ljmp *1234f(%rip)
22883+ .pushsection .rodata
22884+ .align 16
22885+ 1234: .quad \off; .word \sel
22886+ .popsection
22887+#else
22888+ pushq $\sel
22889+ pushq $\off
22890+ lretq
22891+#endif
22892+ .endm
22893+
22894+ .macro pax_enter_kernel
22895+ pax_set_fptr_mask
22896+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22897+ call pax_enter_kernel
22898+#endif
22899+ .endm
22900+
22901+ .macro pax_exit_kernel
22902+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22903+ call pax_exit_kernel
22904+#endif
22905+
22906+ .endm
22907+
22908+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22909+ENTRY(pax_enter_kernel)
22910+ pushq %rdi
22911+
22912+#ifdef CONFIG_PARAVIRT
22913+ PV_SAVE_REGS(CLBR_RDI)
22914+#endif
22915+
22916+#ifdef CONFIG_PAX_KERNEXEC
22917+ GET_CR0_INTO_RDI
22918+ bts $16,%rdi
22919+ jnc 3f
22920+ mov %cs,%edi
22921+ cmp $__KERNEL_CS,%edi
22922+ jnz 2f
22923+1:
22924+#endif
22925+
22926+#ifdef CONFIG_PAX_MEMORY_UDEREF
22927+ 661: jmp 111f
22928+ .pushsection .altinstr_replacement, "a"
22929+ 662: ASM_NOP2
22930+ .popsection
22931+ .pushsection .altinstructions, "a"
22932+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22933+ .popsection
22934+ GET_CR3_INTO_RDI
22935+ cmp $0,%dil
22936+ jnz 112f
22937+ mov $__KERNEL_DS,%edi
22938+ mov %edi,%ss
22939+ jmp 111f
22940+112: cmp $1,%dil
22941+ jz 113f
22942+ ud2
22943+113: sub $4097,%rdi
22944+ bts $63,%rdi
22945+ SET_RDI_INTO_CR3
22946+ mov $__UDEREF_KERNEL_DS,%edi
22947+ mov %edi,%ss
22948+111:
22949+#endif
22950+
22951+#ifdef CONFIG_PARAVIRT
22952+ PV_RESTORE_REGS(CLBR_RDI)
22953+#endif
22954+
22955+ popq %rdi
22956+ pax_force_retaddr
22957+ retq
22958+
22959+#ifdef CONFIG_PAX_KERNEXEC
22960+2: ljmpq __KERNEL_CS,1b
22961+3: ljmpq __KERNEXEC_KERNEL_CS,4f
22962+4: SET_RDI_INTO_CR0
22963+ jmp 1b
22964+#endif
22965+ENDPROC(pax_enter_kernel)
22966+
22967+ENTRY(pax_exit_kernel)
22968+ pushq %rdi
22969+
22970+#ifdef CONFIG_PARAVIRT
22971+ PV_SAVE_REGS(CLBR_RDI)
22972+#endif
22973+
22974+#ifdef CONFIG_PAX_KERNEXEC
22975+ mov %cs,%rdi
22976+ cmp $__KERNEXEC_KERNEL_CS,%edi
22977+ jz 2f
22978+ GET_CR0_INTO_RDI
22979+ bts $16,%rdi
22980+ jnc 4f
22981+1:
22982+#endif
22983+
22984+#ifdef CONFIG_PAX_MEMORY_UDEREF
22985+ 661: jmp 111f
22986+ .pushsection .altinstr_replacement, "a"
22987+ 662: ASM_NOP2
22988+ .popsection
22989+ .pushsection .altinstructions, "a"
22990+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
22991+ .popsection
22992+ mov %ss,%edi
22993+ cmp $__UDEREF_KERNEL_DS,%edi
22994+ jnz 111f
22995+ GET_CR3_INTO_RDI
22996+ cmp $0,%dil
22997+ jz 112f
22998+ ud2
22999+112: add $4097,%rdi
23000+ bts $63,%rdi
23001+ SET_RDI_INTO_CR3
23002+ mov $__KERNEL_DS,%edi
23003+ mov %edi,%ss
23004+111:
23005+#endif
23006+
23007+#ifdef CONFIG_PARAVIRT
23008+ PV_RESTORE_REGS(CLBR_RDI);
23009+#endif
23010+
23011+ popq %rdi
23012+ pax_force_retaddr
23013+ retq
23014+
23015+#ifdef CONFIG_PAX_KERNEXEC
23016+2: GET_CR0_INTO_RDI
23017+ btr $16,%rdi
23018+ jnc 4f
23019+ ljmpq __KERNEL_CS,3f
23020+3: SET_RDI_INTO_CR0
23021+ jmp 1b
23022+4: ud2
23023+ jmp 4b
23024+#endif
23025+ENDPROC(pax_exit_kernel)
23026+#endif
23027+
23028+ .macro pax_enter_kernel_user
23029+ pax_set_fptr_mask
23030+#ifdef CONFIG_PAX_MEMORY_UDEREF
23031+ call pax_enter_kernel_user
23032+#endif
23033+ .endm
23034+
23035+ .macro pax_exit_kernel_user
23036+#ifdef CONFIG_PAX_MEMORY_UDEREF
23037+ call pax_exit_kernel_user
23038+#endif
23039+#ifdef CONFIG_PAX_RANDKSTACK
23040+ pushq %rax
23041+ pushq %r11
23042+ call pax_randomize_kstack
23043+ popq %r11
23044+ popq %rax
23045+#endif
23046+ .endm
23047+
23048+#ifdef CONFIG_PAX_MEMORY_UDEREF
23049+ENTRY(pax_enter_kernel_user)
23050+ pushq %rdi
23051+ pushq %rbx
23052+
23053+#ifdef CONFIG_PARAVIRT
23054+ PV_SAVE_REGS(CLBR_RDI)
23055+#endif
23056+
23057+ 661: jmp 111f
23058+ .pushsection .altinstr_replacement, "a"
23059+ 662: ASM_NOP2
23060+ .popsection
23061+ .pushsection .altinstructions, "a"
23062+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23063+ .popsection
23064+ GET_CR3_INTO_RDI
23065+ cmp $1,%dil
23066+ jnz 4f
23067+ sub $4097,%rdi
23068+ bts $63,%rdi
23069+ SET_RDI_INTO_CR3
23070+ jmp 3f
23071+111:
23072+
23073+ GET_CR3_INTO_RDI
23074+ mov %rdi,%rbx
23075+ add $__START_KERNEL_map,%rbx
23076+ sub phys_base(%rip),%rbx
23077+
23078+#ifdef CONFIG_PARAVIRT
23079+ cmpl $0, pv_info+PARAVIRT_enabled
23080+ jz 1f
23081+ pushq %rdi
23082+ i = 0
23083+ .rept USER_PGD_PTRS
23084+ mov i*8(%rbx),%rsi
23085+ mov $0,%sil
23086+ lea i*8(%rbx),%rdi
23087+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23088+ i = i + 1
23089+ .endr
23090+ popq %rdi
23091+ jmp 2f
23092+1:
23093+#endif
23094+
23095+ i = 0
23096+ .rept USER_PGD_PTRS
23097+ movb $0,i*8(%rbx)
23098+ i = i + 1
23099+ .endr
23100+
23101+2: SET_RDI_INTO_CR3
23102+
23103+#ifdef CONFIG_PAX_KERNEXEC
23104+ GET_CR0_INTO_RDI
23105+ bts $16,%rdi
23106+ SET_RDI_INTO_CR0
23107+#endif
23108+
23109+3:
23110+
23111+#ifdef CONFIG_PARAVIRT
23112+ PV_RESTORE_REGS(CLBR_RDI)
23113+#endif
23114+
23115+ popq %rbx
23116+ popq %rdi
23117+ pax_force_retaddr
23118+ retq
23119+4: ud2
23120+ENDPROC(pax_enter_kernel_user)
23121+
23122+ENTRY(pax_exit_kernel_user)
23123+ pushq %rdi
23124+ pushq %rbx
23125+
23126+#ifdef CONFIG_PARAVIRT
23127+ PV_SAVE_REGS(CLBR_RDI)
23128+#endif
23129+
23130+ GET_CR3_INTO_RDI
23131+ 661: jmp 1f
23132+ .pushsection .altinstr_replacement, "a"
23133+ 662: ASM_NOP2
23134+ .popsection
23135+ .pushsection .altinstructions, "a"
23136+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23137+ .popsection
23138+ cmp $0,%dil
23139+ jnz 3f
23140+ add $4097,%rdi
23141+ bts $63,%rdi
23142+ SET_RDI_INTO_CR3
23143+ jmp 2f
23144+1:
23145+
23146+ mov %rdi,%rbx
23147+
23148+#ifdef CONFIG_PAX_KERNEXEC
23149+ GET_CR0_INTO_RDI
23150+ btr $16,%rdi
23151+ jnc 3f
23152+ SET_RDI_INTO_CR0
23153+#endif
23154+
23155+ add $__START_KERNEL_map,%rbx
23156+ sub phys_base(%rip),%rbx
23157+
23158+#ifdef CONFIG_PARAVIRT
23159+ cmpl $0, pv_info+PARAVIRT_enabled
23160+ jz 1f
23161+ i = 0
23162+ .rept USER_PGD_PTRS
23163+ mov i*8(%rbx),%rsi
23164+ mov $0x67,%sil
23165+ lea i*8(%rbx),%rdi
23166+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23167+ i = i + 1
23168+ .endr
23169+ jmp 2f
23170+1:
23171+#endif
23172+
23173+ i = 0
23174+ .rept USER_PGD_PTRS
23175+ movb $0x67,i*8(%rbx)
23176+ i = i + 1
23177+ .endr
23178+2:
23179+
23180+#ifdef CONFIG_PARAVIRT
23181+ PV_RESTORE_REGS(CLBR_RDI)
23182+#endif
23183+
23184+ popq %rbx
23185+ popq %rdi
23186+ pax_force_retaddr
23187+ retq
23188+3: ud2
23189+ENDPROC(pax_exit_kernel_user)
23190+#endif
23191+
23192+ .macro pax_enter_kernel_nmi
23193+ pax_set_fptr_mask
23194+
23195+#ifdef CONFIG_PAX_KERNEXEC
23196+ GET_CR0_INTO_RDI
23197+ bts $16,%rdi
23198+ jc 110f
23199+ SET_RDI_INTO_CR0
23200+ or $2,%ebx
23201+110:
23202+#endif
23203+
23204+#ifdef CONFIG_PAX_MEMORY_UDEREF
23205+ 661: jmp 111f
23206+ .pushsection .altinstr_replacement, "a"
23207+ 662: ASM_NOP2
23208+ .popsection
23209+ .pushsection .altinstructions, "a"
23210+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23211+ .popsection
23212+ GET_CR3_INTO_RDI
23213+ cmp $0,%dil
23214+ jz 111f
23215+ sub $4097,%rdi
23216+ or $4,%ebx
23217+ bts $63,%rdi
23218+ SET_RDI_INTO_CR3
23219+ mov $__UDEREF_KERNEL_DS,%edi
23220+ mov %edi,%ss
23221+111:
23222+#endif
23223+ .endm
23224+
23225+ .macro pax_exit_kernel_nmi
23226+#ifdef CONFIG_PAX_KERNEXEC
23227+ btr $1,%ebx
23228+ jnc 110f
23229+ GET_CR0_INTO_RDI
23230+ btr $16,%rdi
23231+ SET_RDI_INTO_CR0
23232+110:
23233+#endif
23234+
23235+#ifdef CONFIG_PAX_MEMORY_UDEREF
23236+ btr $2,%ebx
23237+ jnc 111f
23238+ GET_CR3_INTO_RDI
23239+ add $4097,%rdi
23240+ bts $63,%rdi
23241+ SET_RDI_INTO_CR3
23242+ mov $__KERNEL_DS,%edi
23243+ mov %edi,%ss
23244+111:
23245+#endif
23246+ .endm
23247+
23248+ .macro pax_erase_kstack
23249+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23250+ call pax_erase_kstack
23251+#endif
23252+ .endm
23253+
23254+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23255+ENTRY(pax_erase_kstack)
23256+ pushq %rdi
23257+ pushq %rcx
23258+ pushq %rax
23259+ pushq %r11
23260+
23261+ GET_THREAD_INFO(%r11)
23262+ mov TI_lowest_stack(%r11), %rdi
23263+ mov $-0xBEEF, %rax
23264+ std
23265+
23266+1: mov %edi, %ecx
23267+ and $THREAD_SIZE_asm - 1, %ecx
23268+ shr $3, %ecx
23269+ repne scasq
23270+ jecxz 2f
23271+
23272+ cmp $2*8, %ecx
23273+ jc 2f
23274+
23275+ mov $2*8, %ecx
23276+ repe scasq
23277+ jecxz 2f
23278+ jne 1b
23279+
23280+2: cld
23281+ mov %esp, %ecx
23282+ sub %edi, %ecx
23283+
23284+ cmp $THREAD_SIZE_asm, %rcx
23285+ jb 3f
23286+ ud2
23287+3:
23288+
23289+ shr $3, %ecx
23290+ rep stosq
23291+
23292+ mov TI_task_thread_sp0(%r11), %rdi
23293+ sub $256, %rdi
23294+ mov %rdi, TI_lowest_stack(%r11)
23295+
23296+ popq %r11
23297+ popq %rax
23298+ popq %rcx
23299+ popq %rdi
23300+ pax_force_retaddr
23301+ ret
23302+ENDPROC(pax_erase_kstack)
23303+#endif
23304
23305 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23306 #ifdef CONFIG_TRACE_IRQFLAGS
23307@@ -320,7 +753,7 @@ ENDPROC(native_usergs_sysret64)
23308 .endm
23309
23310 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23311- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23312+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23313 jnc 1f
23314 TRACE_IRQS_ON_DEBUG
23315 1:
23316@@ -358,27 +791,6 @@ ENDPROC(native_usergs_sysret64)
23317 movq \tmp,R11+\offset(%rsp)
23318 .endm
23319
23320- .macro FAKE_STACK_FRAME child_rip
23321- /* push in order ss, rsp, eflags, cs, rip */
23322- xorl %eax, %eax
23323- pushq_cfi $__KERNEL_DS /* ss */
23324- /*CFI_REL_OFFSET ss,0*/
23325- pushq_cfi %rax /* rsp */
23326- CFI_REL_OFFSET rsp,0
23327- pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23328- /*CFI_REL_OFFSET rflags,0*/
23329- pushq_cfi $__KERNEL_CS /* cs */
23330- /*CFI_REL_OFFSET cs,0*/
23331- pushq_cfi \child_rip /* rip */
23332- CFI_REL_OFFSET rip,0
23333- pushq_cfi %rax /* orig rax */
23334- .endm
23335-
23336- .macro UNFAKE_STACK_FRAME
23337- addq $8*6, %rsp
23338- CFI_ADJUST_CFA_OFFSET -(6*8)
23339- .endm
23340-
23341 /*
23342 * initial frame state for interrupts (and exceptions without error code)
23343 */
23344@@ -445,25 +857,26 @@ ENDPROC(native_usergs_sysret64)
23345 /* save partial stack frame */
23346 .macro SAVE_ARGS_IRQ
23347 cld
23348- /* start from rbp in pt_regs and jump over */
23349- movq_cfi rdi, (RDI-RBP)
23350- movq_cfi rsi, (RSI-RBP)
23351- movq_cfi rdx, (RDX-RBP)
23352- movq_cfi rcx, (RCX-RBP)
23353- movq_cfi rax, (RAX-RBP)
23354- movq_cfi r8, (R8-RBP)
23355- movq_cfi r9, (R9-RBP)
23356- movq_cfi r10, (R10-RBP)
23357- movq_cfi r11, (R11-RBP)
23358+ /* start from r15 in pt_regs and jump over */
23359+ movq_cfi rdi, RDI
23360+ movq_cfi rsi, RSI
23361+ movq_cfi rdx, RDX
23362+ movq_cfi rcx, RCX
23363+ movq_cfi rax, RAX
23364+ movq_cfi r8, R8
23365+ movq_cfi r9, R9
23366+ movq_cfi r10, R10
23367+ movq_cfi r11, R11
23368+ movq_cfi r12, R12
23369
23370 /* Save rbp so that we can unwind from get_irq_regs() */
23371- movq_cfi rbp, 0
23372+ movq_cfi rbp, RBP
23373
23374 /* Save previous stack value */
23375 movq %rsp, %rsi
23376
23377- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23378- testl $3, CS-RBP(%rsi)
23379+ movq %rsp,%rdi /* arg1 for handler */
23380+ testb $3, CS(%rsi)
23381 je 1f
23382 SWAPGS
23383 /*
23384@@ -483,6 +896,18 @@ ENDPROC(native_usergs_sysret64)
23385 0x06 /* DW_OP_deref */, \
23386 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23387 0x22 /* DW_OP_plus */
23388+
23389+#ifdef CONFIG_PAX_MEMORY_UDEREF
23390+ testb $3, CS(%rdi)
23391+ jnz 1f
23392+ pax_enter_kernel
23393+ jmp 2f
23394+1: pax_enter_kernel_user
23395+2:
23396+#else
23397+ pax_enter_kernel
23398+#endif
23399+
23400 /* We entered an interrupt context - irqs are off: */
23401 TRACE_IRQS_OFF
23402 .endm
23403@@ -514,9 +939,52 @@ ENTRY(save_paranoid)
23404 js 1f /* negative -> in kernel */
23405 SWAPGS
23406 xorl %ebx,%ebx
23407-1: ret
23408+1:
23409+#ifdef CONFIG_PAX_MEMORY_UDEREF
23410+ testb $3, CS+8(%rsp)
23411+ jnz 1f
23412+ pax_enter_kernel
23413+ jmp 2f
23414+1: pax_enter_kernel_user
23415+2:
23416+#else
23417+ pax_enter_kernel
23418+#endif
23419+ pax_force_retaddr
23420+ ret
23421 CFI_ENDPROC
23422-END(save_paranoid)
23423+ENDPROC(save_paranoid)
23424+
23425+ENTRY(save_paranoid_nmi)
23426+ XCPT_FRAME 1 RDI+8
23427+ cld
23428+ movq_cfi rdi, RDI+8
23429+ movq_cfi rsi, RSI+8
23430+ movq_cfi rdx, RDX+8
23431+ movq_cfi rcx, RCX+8
23432+ movq_cfi rax, RAX+8
23433+ movq_cfi r8, R8+8
23434+ movq_cfi r9, R9+8
23435+ movq_cfi r10, R10+8
23436+ movq_cfi r11, R11+8
23437+ movq_cfi rbx, RBX+8
23438+ movq_cfi rbp, RBP+8
23439+ movq_cfi r12, R12+8
23440+ movq_cfi r13, R13+8
23441+ movq_cfi r14, R14+8
23442+ movq_cfi r15, R15+8
23443+ movl $1,%ebx
23444+ movl $MSR_GS_BASE,%ecx
23445+ rdmsr
23446+ testl %edx,%edx
23447+ js 1f /* negative -> in kernel */
23448+ SWAPGS
23449+ xorl %ebx,%ebx
23450+1: pax_enter_kernel_nmi
23451+ pax_force_retaddr
23452+ ret
23453+ CFI_ENDPROC
23454+ENDPROC(save_paranoid_nmi)
23455 .popsection
23456
23457 /*
23458@@ -538,7 +1006,7 @@ ENTRY(ret_from_fork)
23459
23460 RESTORE_REST
23461
23462- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23463+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23464 jz 1f
23465
23466 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23467@@ -548,15 +1016,13 @@ ENTRY(ret_from_fork)
23468 jmp ret_from_sys_call # go to the SYSRET fastpath
23469
23470 1:
23471- subq $REST_SKIP, %rsp # leave space for volatiles
23472- CFI_ADJUST_CFA_OFFSET REST_SKIP
23473 movq %rbp, %rdi
23474 call *%rbx
23475 movl $0, RAX(%rsp)
23476 RESTORE_REST
23477 jmp int_ret_from_sys_call
23478 CFI_ENDPROC
23479-END(ret_from_fork)
23480+ENDPROC(ret_from_fork)
23481
23482 /*
23483 * System call entry. Up to 6 arguments in registers are supported.
23484@@ -593,7 +1059,7 @@ END(ret_from_fork)
23485 ENTRY(system_call)
23486 CFI_STARTPROC simple
23487 CFI_SIGNAL_FRAME
23488- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23489+ CFI_DEF_CFA rsp,0
23490 CFI_REGISTER rip,rcx
23491 /*CFI_REGISTER rflags,r11*/
23492 SWAPGS_UNSAFE_STACK
23493@@ -606,16 +1072,23 @@ GLOBAL(system_call_after_swapgs)
23494
23495 movq %rsp,PER_CPU_VAR(old_rsp)
23496 movq PER_CPU_VAR(kernel_stack),%rsp
23497+ SAVE_ARGS 8*6,0
23498+ pax_enter_kernel_user
23499+
23500+#ifdef CONFIG_PAX_RANDKSTACK
23501+ pax_erase_kstack
23502+#endif
23503+
23504 /*
23505 * No need to follow this irqs off/on section - it's straight
23506 * and short:
23507 */
23508 ENABLE_INTERRUPTS(CLBR_NONE)
23509- SAVE_ARGS 8,0
23510 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
23511 movq %rcx,RIP-ARGOFFSET(%rsp)
23512 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23513- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23514+ GET_THREAD_INFO(%rcx)
23515+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23516 jnz tracesys
23517 system_call_fastpath:
23518 #if __SYSCALL_MASK == ~0
23519@@ -639,10 +1112,13 @@ sysret_check:
23520 LOCKDEP_SYS_EXIT
23521 DISABLE_INTERRUPTS(CLBR_NONE)
23522 TRACE_IRQS_OFF
23523- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23524+ GET_THREAD_INFO(%rcx)
23525+ movl TI_flags(%rcx),%edx
23526 andl %edi,%edx
23527 jnz sysret_careful
23528 CFI_REMEMBER_STATE
23529+ pax_exit_kernel_user
23530+ pax_erase_kstack
23531 /*
23532 * sysretq will re-enable interrupts:
23533 */
23534@@ -701,6 +1177,9 @@ auditsys:
23535 movq %rax,%rsi /* 2nd arg: syscall number */
23536 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
23537 call __audit_syscall_entry
23538+
23539+ pax_erase_kstack
23540+
23541 LOAD_ARGS 0 /* reload call-clobbered registers */
23542 jmp system_call_fastpath
23543
23544@@ -722,7 +1201,7 @@ sysret_audit:
23545 /* Do syscall tracing */
23546 tracesys:
23547 #ifdef CONFIG_AUDITSYSCALL
23548- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23549+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
23550 jz auditsys
23551 #endif
23552 SAVE_REST
23553@@ -730,12 +1209,15 @@ tracesys:
23554 FIXUP_TOP_OF_STACK %rdi
23555 movq %rsp,%rdi
23556 call syscall_trace_enter
23557+
23558+ pax_erase_kstack
23559+
23560 /*
23561 * Reload arg registers from stack in case ptrace changed them.
23562 * We don't reload %rax because syscall_trace_enter() returned
23563 * the value it wants us to use in the table lookup.
23564 */
23565- LOAD_ARGS ARGOFFSET, 1
23566+ LOAD_ARGS 1
23567 RESTORE_REST
23568 #if __SYSCALL_MASK == ~0
23569 cmpq $__NR_syscall_max,%rax
23570@@ -765,7 +1247,9 @@ GLOBAL(int_with_check)
23571 andl %edi,%edx
23572 jnz int_careful
23573 andl $~TS_COMPAT,TI_status(%rcx)
23574- jmp retint_swapgs
23575+ pax_exit_kernel_user
23576+ pax_erase_kstack
23577+ jmp retint_swapgs_pax
23578
23579 /* Either reschedule or signal or syscall exit tracking needed. */
23580 /* First do a reschedule test. */
23581@@ -811,7 +1295,7 @@ int_restore_rest:
23582 TRACE_IRQS_OFF
23583 jmp int_with_check
23584 CFI_ENDPROC
23585-END(system_call)
23586+ENDPROC(system_call)
23587
23588 .macro FORK_LIKE func
23589 ENTRY(stub_\func)
23590@@ -824,9 +1308,10 @@ ENTRY(stub_\func)
23591 DEFAULT_FRAME 0 8 /* offset 8: return address */
23592 call sys_\func
23593 RESTORE_TOP_OF_STACK %r11, 8
23594- ret $REST_SKIP /* pop extended registers */
23595+ pax_force_retaddr
23596+ ret
23597 CFI_ENDPROC
23598-END(stub_\func)
23599+ENDPROC(stub_\func)
23600 .endm
23601
23602 .macro FIXED_FRAME label,func
23603@@ -836,9 +1321,10 @@ ENTRY(\label)
23604 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23605 call \func
23606 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23607+ pax_force_retaddr
23608 ret
23609 CFI_ENDPROC
23610-END(\label)
23611+ENDPROC(\label)
23612 .endm
23613
23614 FORK_LIKE clone
23615@@ -846,19 +1332,6 @@ END(\label)
23616 FORK_LIKE vfork
23617 FIXED_FRAME stub_iopl, sys_iopl
23618
23619-ENTRY(ptregscall_common)
23620- DEFAULT_FRAME 1 8 /* offset 8: return address */
23621- RESTORE_TOP_OF_STACK %r11, 8
23622- movq_cfi_restore R15+8, r15
23623- movq_cfi_restore R14+8, r14
23624- movq_cfi_restore R13+8, r13
23625- movq_cfi_restore R12+8, r12
23626- movq_cfi_restore RBP+8, rbp
23627- movq_cfi_restore RBX+8, rbx
23628- ret $REST_SKIP /* pop extended registers */
23629- CFI_ENDPROC
23630-END(ptregscall_common)
23631-
23632 ENTRY(stub_execve)
23633 CFI_STARTPROC
23634 addq $8, %rsp
23635@@ -870,7 +1343,7 @@ ENTRY(stub_execve)
23636 RESTORE_REST
23637 jmp int_ret_from_sys_call
23638 CFI_ENDPROC
23639-END(stub_execve)
23640+ENDPROC(stub_execve)
23641
23642 /*
23643 * sigreturn is special because it needs to restore all registers on return.
23644@@ -887,7 +1360,7 @@ ENTRY(stub_rt_sigreturn)
23645 RESTORE_REST
23646 jmp int_ret_from_sys_call
23647 CFI_ENDPROC
23648-END(stub_rt_sigreturn)
23649+ENDPROC(stub_rt_sigreturn)
23650
23651 #ifdef CONFIG_X86_X32_ABI
23652 ENTRY(stub_x32_rt_sigreturn)
23653@@ -901,7 +1374,7 @@ ENTRY(stub_x32_rt_sigreturn)
23654 RESTORE_REST
23655 jmp int_ret_from_sys_call
23656 CFI_ENDPROC
23657-END(stub_x32_rt_sigreturn)
23658+ENDPROC(stub_x32_rt_sigreturn)
23659
23660 ENTRY(stub_x32_execve)
23661 CFI_STARTPROC
23662@@ -915,7 +1388,7 @@ ENTRY(stub_x32_execve)
23663 RESTORE_REST
23664 jmp int_ret_from_sys_call
23665 CFI_ENDPROC
23666-END(stub_x32_execve)
23667+ENDPROC(stub_x32_execve)
23668
23669 #endif
23670
23671@@ -952,7 +1425,7 @@ vector=vector+1
23672 2: jmp common_interrupt
23673 .endr
23674 CFI_ENDPROC
23675-END(irq_entries_start)
23676+ENDPROC(irq_entries_start)
23677
23678 .previous
23679 END(interrupt)
23680@@ -969,8 +1442,8 @@ END(interrupt)
23681 /* 0(%rsp): ~(interrupt number) */
23682 .macro interrupt func
23683 /* reserve pt_regs for scratch regs and rbp */
23684- subq $ORIG_RAX-RBP, %rsp
23685- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23686+ subq $ORIG_RAX, %rsp
23687+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23688 SAVE_ARGS_IRQ
23689 call \func
23690 .endm
23691@@ -997,14 +1470,14 @@ ret_from_intr:
23692
23693 /* Restore saved previous stack */
23694 popq %rsi
23695- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23696- leaq ARGOFFSET-RBP(%rsi), %rsp
23697+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23698+ movq %rsi, %rsp
23699 CFI_DEF_CFA_REGISTER rsp
23700- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23701+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23702
23703 exit_intr:
23704 GET_THREAD_INFO(%rcx)
23705- testl $3,CS-ARGOFFSET(%rsp)
23706+ testb $3,CS-ARGOFFSET(%rsp)
23707 je retint_kernel
23708
23709 /* Interrupt came from user space */
23710@@ -1026,12 +1499,16 @@ retint_swapgs: /* return to user-space */
23711 * The iretq could re-enable interrupts:
23712 */
23713 DISABLE_INTERRUPTS(CLBR_ANY)
23714+ pax_exit_kernel_user
23715+retint_swapgs_pax:
23716 TRACE_IRQS_IRETQ
23717 SWAPGS
23718 jmp restore_args
23719
23720 retint_restore_args: /* return to kernel space */
23721 DISABLE_INTERRUPTS(CLBR_ANY)
23722+ pax_exit_kernel
23723+ pax_force_retaddr (RIP-ARGOFFSET)
23724 /*
23725 * The iretq could re-enable interrupts:
23726 */
23727@@ -1112,7 +1589,7 @@ ENTRY(retint_kernel)
23728 #endif
23729
23730 CFI_ENDPROC
23731-END(common_interrupt)
23732+ENDPROC(common_interrupt)
23733 /*
23734 * End of kprobes section
23735 */
23736@@ -1130,7 +1607,7 @@ ENTRY(\sym)
23737 interrupt \do_sym
23738 jmp ret_from_intr
23739 CFI_ENDPROC
23740-END(\sym)
23741+ENDPROC(\sym)
23742 .endm
23743
23744 #ifdef CONFIG_TRACING
23745@@ -1218,7 +1695,7 @@ ENTRY(\sym)
23746 call \do_sym
23747 jmp error_exit /* %ebx: no swapgs flag */
23748 CFI_ENDPROC
23749-END(\sym)
23750+ENDPROC(\sym)
23751 .endm
23752
23753 .macro paranoidzeroentry sym do_sym
23754@@ -1236,10 +1713,10 @@ ENTRY(\sym)
23755 call \do_sym
23756 jmp paranoid_exit /* %ebx: no swapgs flag */
23757 CFI_ENDPROC
23758-END(\sym)
23759+ENDPROC(\sym)
23760 .endm
23761
23762-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23763+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23764 .macro paranoidzeroentry_ist sym do_sym ist
23765 ENTRY(\sym)
23766 INTR_FRAME
23767@@ -1252,12 +1729,18 @@ ENTRY(\sym)
23768 TRACE_IRQS_OFF_DEBUG
23769 movq %rsp,%rdi /* pt_regs pointer */
23770 xorl %esi,%esi /* no error code */
23771+#ifdef CONFIG_SMP
23772+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23773+ lea init_tss(%r13), %r13
23774+#else
23775+ lea init_tss(%rip), %r13
23776+#endif
23777 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
23778 call \do_sym
23779 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
23780 jmp paranoid_exit /* %ebx: no swapgs flag */
23781 CFI_ENDPROC
23782-END(\sym)
23783+ENDPROC(\sym)
23784 .endm
23785
23786 .macro errorentry sym do_sym
23787@@ -1275,7 +1758,7 @@ ENTRY(\sym)
23788 call \do_sym
23789 jmp error_exit /* %ebx: no swapgs flag */
23790 CFI_ENDPROC
23791-END(\sym)
23792+ENDPROC(\sym)
23793 .endm
23794
23795 #ifdef CONFIG_TRACING
23796@@ -1306,7 +1789,7 @@ ENTRY(\sym)
23797 call \do_sym
23798 jmp paranoid_exit /* %ebx: no swapgs flag */
23799 CFI_ENDPROC
23800-END(\sym)
23801+ENDPROC(\sym)
23802 .endm
23803
23804 zeroentry divide_error do_divide_error
23805@@ -1336,9 +1819,10 @@ gs_change:
23806 2: mfence /* workaround */
23807 SWAPGS
23808 popfq_cfi
23809+ pax_force_retaddr
23810 ret
23811 CFI_ENDPROC
23812-END(native_load_gs_index)
23813+ENDPROC(native_load_gs_index)
23814
23815 _ASM_EXTABLE(gs_change,bad_gs)
23816 .section .fixup,"ax"
23817@@ -1366,9 +1850,10 @@ ENTRY(do_softirq_own_stack)
23818 CFI_DEF_CFA_REGISTER rsp
23819 CFI_ADJUST_CFA_OFFSET -8
23820 decl PER_CPU_VAR(irq_count)
23821+ pax_force_retaddr
23822 ret
23823 CFI_ENDPROC
23824-END(do_softirq_own_stack)
23825+ENDPROC(do_softirq_own_stack)
23826
23827 #ifdef CONFIG_XEN
23828 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
23829@@ -1406,7 +1891,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23830 decl PER_CPU_VAR(irq_count)
23831 jmp error_exit
23832 CFI_ENDPROC
23833-END(xen_do_hypervisor_callback)
23834+ENDPROC(xen_do_hypervisor_callback)
23835
23836 /*
23837 * Hypervisor uses this for application faults while it executes.
23838@@ -1465,7 +1950,7 @@ ENTRY(xen_failsafe_callback)
23839 SAVE_ALL
23840 jmp error_exit
23841 CFI_ENDPROC
23842-END(xen_failsafe_callback)
23843+ENDPROC(xen_failsafe_callback)
23844
23845 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23846 xen_hvm_callback_vector xen_evtchn_do_upcall
23847@@ -1517,18 +2002,33 @@ ENTRY(paranoid_exit)
23848 DEFAULT_FRAME
23849 DISABLE_INTERRUPTS(CLBR_NONE)
23850 TRACE_IRQS_OFF_DEBUG
23851- testl %ebx,%ebx /* swapgs needed? */
23852+ testl $1,%ebx /* swapgs needed? */
23853 jnz paranoid_restore
23854- testl $3,CS(%rsp)
23855+ testb $3,CS(%rsp)
23856 jnz paranoid_userspace
23857+#ifdef CONFIG_PAX_MEMORY_UDEREF
23858+ pax_exit_kernel
23859+ TRACE_IRQS_IRETQ 0
23860+ SWAPGS_UNSAFE_STACK
23861+ RESTORE_ALL 8
23862+ pax_force_retaddr_bts
23863+ jmp irq_return
23864+#endif
23865 paranoid_swapgs:
23866+#ifdef CONFIG_PAX_MEMORY_UDEREF
23867+ pax_exit_kernel_user
23868+#else
23869+ pax_exit_kernel
23870+#endif
23871 TRACE_IRQS_IRETQ 0
23872 SWAPGS_UNSAFE_STACK
23873 RESTORE_ALL 8
23874 jmp irq_return
23875 paranoid_restore:
23876+ pax_exit_kernel
23877 TRACE_IRQS_IRETQ_DEBUG 0
23878 RESTORE_ALL 8
23879+ pax_force_retaddr_bts
23880 jmp irq_return
23881 paranoid_userspace:
23882 GET_THREAD_INFO(%rcx)
23883@@ -1557,7 +2057,7 @@ paranoid_schedule:
23884 TRACE_IRQS_OFF
23885 jmp paranoid_userspace
23886 CFI_ENDPROC
23887-END(paranoid_exit)
23888+ENDPROC(paranoid_exit)
23889
23890 /*
23891 * Exception entry point. This expects an error code/orig_rax on the stack.
23892@@ -1584,12 +2084,23 @@ ENTRY(error_entry)
23893 movq_cfi r14, R14+8
23894 movq_cfi r15, R15+8
23895 xorl %ebx,%ebx
23896- testl $3,CS+8(%rsp)
23897+ testb $3,CS+8(%rsp)
23898 je error_kernelspace
23899 error_swapgs:
23900 SWAPGS
23901 error_sti:
23902+#ifdef CONFIG_PAX_MEMORY_UDEREF
23903+ testb $3, CS+8(%rsp)
23904+ jnz 1f
23905+ pax_enter_kernel
23906+ jmp 2f
23907+1: pax_enter_kernel_user
23908+2:
23909+#else
23910+ pax_enter_kernel
23911+#endif
23912 TRACE_IRQS_OFF
23913+ pax_force_retaddr
23914 ret
23915
23916 /*
23917@@ -1616,7 +2127,7 @@ bstep_iret:
23918 movq %rcx,RIP+8(%rsp)
23919 jmp error_swapgs
23920 CFI_ENDPROC
23921-END(error_entry)
23922+ENDPROC(error_entry)
23923
23924
23925 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
23926@@ -1627,7 +2138,7 @@ ENTRY(error_exit)
23927 DISABLE_INTERRUPTS(CLBR_NONE)
23928 TRACE_IRQS_OFF
23929 GET_THREAD_INFO(%rcx)
23930- testl %eax,%eax
23931+ testl $1,%eax
23932 jne retint_kernel
23933 LOCKDEP_SYS_EXIT_IRQ
23934 movl TI_flags(%rcx),%edx
23935@@ -1636,7 +2147,7 @@ ENTRY(error_exit)
23936 jnz retint_careful
23937 jmp retint_swapgs
23938 CFI_ENDPROC
23939-END(error_exit)
23940+ENDPROC(error_exit)
23941
23942 /*
23943 * Test if a given stack is an NMI stack or not.
23944@@ -1694,9 +2205,11 @@ ENTRY(nmi)
23945 * If %cs was not the kernel segment, then the NMI triggered in user
23946 * space, which means it is definitely not nested.
23947 */
23948+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
23949+ je 1f
23950 cmpl $__KERNEL_CS, 16(%rsp)
23951 jne first_nmi
23952-
23953+1:
23954 /*
23955 * Check the special variable on the stack to see if NMIs are
23956 * executing.
23957@@ -1730,8 +2243,7 @@ nested_nmi:
23958
23959 1:
23960 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
23961- leaq -1*8(%rsp), %rdx
23962- movq %rdx, %rsp
23963+ subq $8, %rsp
23964 CFI_ADJUST_CFA_OFFSET 1*8
23965 leaq -10*8(%rsp), %rdx
23966 pushq_cfi $__KERNEL_DS
23967@@ -1749,6 +2261,7 @@ nested_nmi_out:
23968 CFI_RESTORE rdx
23969
23970 /* No need to check faults here */
23971+# pax_force_retaddr_bts
23972 INTERRUPT_RETURN
23973
23974 CFI_RESTORE_STATE
23975@@ -1845,13 +2358,13 @@ end_repeat_nmi:
23976 subq $ORIG_RAX-R15, %rsp
23977 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
23978 /*
23979- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
23980+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
23981 * as we should not be calling schedule in NMI context.
23982 * Even with normal interrupts enabled. An NMI should not be
23983 * setting NEED_RESCHED or anything that normal interrupts and
23984 * exceptions might do.
23985 */
23986- call save_paranoid
23987+ call save_paranoid_nmi
23988 DEFAULT_FRAME 0
23989
23990 /*
23991@@ -1861,9 +2374,9 @@ end_repeat_nmi:
23992 * NMI itself takes a page fault, the page fault that was preempted
23993 * will read the information from the NMI page fault and not the
23994 * origin fault. Save it off and restore it if it changes.
23995- * Use the r12 callee-saved register.
23996+ * Use the r13 callee-saved register.
23997 */
23998- movq %cr2, %r12
23999+ movq %cr2, %r13
24000
24001 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24002 movq %rsp,%rdi
24003@@ -1872,31 +2385,36 @@ end_repeat_nmi:
24004
24005 /* Did the NMI take a page fault? Restore cr2 if it did */
24006 movq %cr2, %rcx
24007- cmpq %rcx, %r12
24008+ cmpq %rcx, %r13
24009 je 1f
24010- movq %r12, %cr2
24011+ movq %r13, %cr2
24012 1:
24013
24014- testl %ebx,%ebx /* swapgs needed? */
24015+ testl $1,%ebx /* swapgs needed? */
24016 jnz nmi_restore
24017 nmi_swapgs:
24018 SWAPGS_UNSAFE_STACK
24019 nmi_restore:
24020+ pax_exit_kernel_nmi
24021 /* Pop the extra iret frame at once */
24022 RESTORE_ALL 6*8
24023+ testb $3, 8(%rsp)
24024+ jnz 1f
24025+ pax_force_retaddr_bts
24026+1:
24027
24028 /* Clear the NMI executing stack variable */
24029 movq $0, 5*8(%rsp)
24030 jmp irq_return
24031 CFI_ENDPROC
24032-END(nmi)
24033+ENDPROC(nmi)
24034
24035 ENTRY(ignore_sysret)
24036 CFI_STARTPROC
24037 mov $-ENOSYS,%eax
24038 sysret
24039 CFI_ENDPROC
24040-END(ignore_sysret)
24041+ENDPROC(ignore_sysret)
24042
24043 /*
24044 * End of kprobes section
24045diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24046index 52819e8..b6d1dbd 100644
24047--- a/arch/x86/kernel/ftrace.c
24048+++ b/arch/x86/kernel/ftrace.c
24049@@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24050 {
24051 unsigned char replaced[MCOUNT_INSN_SIZE];
24052
24053+ ip = ktla_ktva(ip);
24054+
24055 /*
24056 * Note: Due to modules and __init, code can
24057 * disappear and change, we need to protect against faulting
24058@@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24059 unsigned char old[MCOUNT_INSN_SIZE];
24060 int ret;
24061
24062- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24063+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24064
24065 ftrace_update_func = ip;
24066 /* Make sure the breakpoints see the ftrace_update_func update */
24067@@ -306,7 +308,7 @@ static int ftrace_write(unsigned long ip, const char *val, int size)
24068 * kernel identity mapping to modify code.
24069 */
24070 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24071- ip = (unsigned long)__va(__pa_symbol(ip));
24072+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24073
24074 if (probe_kernel_write((void *)ip, val, size))
24075 return -EPERM;
24076@@ -319,7 +321,7 @@ static int add_break(unsigned long ip, const char *old)
24077 unsigned char replaced[MCOUNT_INSN_SIZE];
24078 unsigned char brk = BREAKPOINT_INSTRUCTION;
24079
24080- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24081+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24082 return -EFAULT;
24083
24084 /* Make sure it is what we expect it to be */
24085diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24086index 068054f..c248bcd 100644
24087--- a/arch/x86/kernel/head64.c
24088+++ b/arch/x86/kernel/head64.c
24089@@ -67,12 +67,12 @@ again:
24090 pgd = *pgd_p;
24091
24092 /*
24093- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24094- * critical -- __PAGE_OFFSET would point us back into the dynamic
24095+ * The use of __early_va rather than __va here is critical:
24096+ * __va would point us back into the dynamic
24097 * range and we might end up looping forever...
24098 */
24099 if (pgd)
24100- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24101+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24102 else {
24103 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24104 reset_early_page_tables();
24105@@ -82,13 +82,13 @@ again:
24106 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24107 for (i = 0; i < PTRS_PER_PUD; i++)
24108 pud_p[i] = 0;
24109- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24110+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24111 }
24112 pud_p += pud_index(address);
24113 pud = *pud_p;
24114
24115 if (pud)
24116- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24117+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24118 else {
24119 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24120 reset_early_page_tables();
24121@@ -98,7 +98,7 @@ again:
24122 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24123 for (i = 0; i < PTRS_PER_PMD; i++)
24124 pmd_p[i] = 0;
24125- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24126+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24127 }
24128 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24129 pmd_p[pmd_index(address)] = pmd;
24130@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24131 if (console_loglevel == 10)
24132 early_printk("Kernel alive\n");
24133
24134- clear_page(init_level4_pgt);
24135 /* set init_level4_pgt kernel high mapping*/
24136 init_level4_pgt[511] = early_level4_pgt[511];
24137
24138diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24139index f36bd42..56ee1534 100644
24140--- a/arch/x86/kernel/head_32.S
24141+++ b/arch/x86/kernel/head_32.S
24142@@ -26,6 +26,12 @@
24143 /* Physical address */
24144 #define pa(X) ((X) - __PAGE_OFFSET)
24145
24146+#ifdef CONFIG_PAX_KERNEXEC
24147+#define ta(X) (X)
24148+#else
24149+#define ta(X) ((X) - __PAGE_OFFSET)
24150+#endif
24151+
24152 /*
24153 * References to members of the new_cpu_data structure.
24154 */
24155@@ -55,11 +61,7 @@
24156 * and small than max_low_pfn, otherwise will waste some page table entries
24157 */
24158
24159-#if PTRS_PER_PMD > 1
24160-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24161-#else
24162-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24163-#endif
24164+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24165
24166 /* Number of possible pages in the lowmem region */
24167 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24168@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24169 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24170
24171 /*
24172+ * Real beginning of normal "text" segment
24173+ */
24174+ENTRY(stext)
24175+ENTRY(_stext)
24176+
24177+/*
24178 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24179 * %esi points to the real-mode code as a 32-bit pointer.
24180 * CS and DS must be 4 GB flat segments, but we don't depend on
24181@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24182 * can.
24183 */
24184 __HEAD
24185+
24186+#ifdef CONFIG_PAX_KERNEXEC
24187+ jmp startup_32
24188+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24189+.fill PAGE_SIZE-5,1,0xcc
24190+#endif
24191+
24192 ENTRY(startup_32)
24193 movl pa(stack_start),%ecx
24194
24195@@ -106,6 +121,59 @@ ENTRY(startup_32)
24196 2:
24197 leal -__PAGE_OFFSET(%ecx),%esp
24198
24199+#ifdef CONFIG_SMP
24200+ movl $pa(cpu_gdt_table),%edi
24201+ movl $__per_cpu_load,%eax
24202+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24203+ rorl $16,%eax
24204+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24205+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24206+ movl $__per_cpu_end - 1,%eax
24207+ subl $__per_cpu_start,%eax
24208+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24209+#endif
24210+
24211+#ifdef CONFIG_PAX_MEMORY_UDEREF
24212+ movl $NR_CPUS,%ecx
24213+ movl $pa(cpu_gdt_table),%edi
24214+1:
24215+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24216+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24217+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24218+ addl $PAGE_SIZE_asm,%edi
24219+ loop 1b
24220+#endif
24221+
24222+#ifdef CONFIG_PAX_KERNEXEC
24223+ movl $pa(boot_gdt),%edi
24224+ movl $__LOAD_PHYSICAL_ADDR,%eax
24225+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24226+ rorl $16,%eax
24227+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24228+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24229+ rorl $16,%eax
24230+
24231+ ljmp $(__BOOT_CS),$1f
24232+1:
24233+
24234+ movl $NR_CPUS,%ecx
24235+ movl $pa(cpu_gdt_table),%edi
24236+ addl $__PAGE_OFFSET,%eax
24237+1:
24238+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24239+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24240+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24241+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24242+ rorl $16,%eax
24243+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24244+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24245+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24246+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24247+ rorl $16,%eax
24248+ addl $PAGE_SIZE_asm,%edi
24249+ loop 1b
24250+#endif
24251+
24252 /*
24253 * Clear BSS first so that there are no surprises...
24254 */
24255@@ -201,8 +269,11 @@ ENTRY(startup_32)
24256 movl %eax, pa(max_pfn_mapped)
24257
24258 /* Do early initialization of the fixmap area */
24259- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24260- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24261+#ifdef CONFIG_COMPAT_VDSO
24262+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24263+#else
24264+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24265+#endif
24266 #else /* Not PAE */
24267
24268 page_pde_offset = (__PAGE_OFFSET >> 20);
24269@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24270 movl %eax, pa(max_pfn_mapped)
24271
24272 /* Do early initialization of the fixmap area */
24273- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24274- movl %eax,pa(initial_page_table+0xffc)
24275+#ifdef CONFIG_COMPAT_VDSO
24276+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24277+#else
24278+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24279+#endif
24280 #endif
24281
24282 #ifdef CONFIG_PARAVIRT
24283@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24284 cmpl $num_subarch_entries, %eax
24285 jae bad_subarch
24286
24287- movl pa(subarch_entries)(,%eax,4), %eax
24288- subl $__PAGE_OFFSET, %eax
24289- jmp *%eax
24290+ jmp *pa(subarch_entries)(,%eax,4)
24291
24292 bad_subarch:
24293 WEAK(lguest_entry)
24294@@ -261,10 +333,10 @@ WEAK(xen_entry)
24295 __INITDATA
24296
24297 subarch_entries:
24298- .long default_entry /* normal x86/PC */
24299- .long lguest_entry /* lguest hypervisor */
24300- .long xen_entry /* Xen hypervisor */
24301- .long default_entry /* Moorestown MID */
24302+ .long ta(default_entry) /* normal x86/PC */
24303+ .long ta(lguest_entry) /* lguest hypervisor */
24304+ .long ta(xen_entry) /* Xen hypervisor */
24305+ .long ta(default_entry) /* Moorestown MID */
24306 num_subarch_entries = (. - subarch_entries) / 4
24307 .previous
24308 #else
24309@@ -354,6 +426,7 @@ default_entry:
24310 movl pa(mmu_cr4_features),%eax
24311 movl %eax,%cr4
24312
24313+#ifdef CONFIG_X86_PAE
24314 testb $X86_CR4_PAE, %al # check if PAE is enabled
24315 jz enable_paging
24316
24317@@ -382,6 +455,9 @@ default_entry:
24318 /* Make changes effective */
24319 wrmsr
24320
24321+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24322+#endif
24323+
24324 enable_paging:
24325
24326 /*
24327@@ -449,14 +525,20 @@ is486:
24328 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24329 movl %eax,%ss # after changing gdt.
24330
24331- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24332+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24333 movl %eax,%ds
24334 movl %eax,%es
24335
24336 movl $(__KERNEL_PERCPU), %eax
24337 movl %eax,%fs # set this cpu's percpu
24338
24339+#ifdef CONFIG_CC_STACKPROTECTOR
24340 movl $(__KERNEL_STACK_CANARY),%eax
24341+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24342+ movl $(__USER_DS),%eax
24343+#else
24344+ xorl %eax,%eax
24345+#endif
24346 movl %eax,%gs
24347
24348 xorl %eax,%eax # Clear LDT
24349@@ -512,8 +594,11 @@ setup_once:
24350 * relocation. Manually set base address in stack canary
24351 * segment descriptor.
24352 */
24353- movl $gdt_page,%eax
24354+ movl $cpu_gdt_table,%eax
24355 movl $stack_canary,%ecx
24356+#ifdef CONFIG_SMP
24357+ addl $__per_cpu_load,%ecx
24358+#endif
24359 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24360 shrl $16, %ecx
24361 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24362@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24363 cmpl $2,(%esp) # X86_TRAP_NMI
24364 je is_nmi # Ignore NMI
24365
24366- cmpl $2,%ss:early_recursion_flag
24367+ cmpl $1,%ss:early_recursion_flag
24368 je hlt_loop
24369 incl %ss:early_recursion_flag
24370
24371@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24372 pushl (20+6*4)(%esp) /* trapno */
24373 pushl $fault_msg
24374 call printk
24375-#endif
24376 call dump_stack
24377+#endif
24378 hlt_loop:
24379 hlt
24380 jmp hlt_loop
24381@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24382 /* This is the default interrupt "handler" :-) */
24383 ALIGN
24384 ignore_int:
24385- cld
24386 #ifdef CONFIG_PRINTK
24387+ cmpl $2,%ss:early_recursion_flag
24388+ je hlt_loop
24389+ incl %ss:early_recursion_flag
24390+ cld
24391 pushl %eax
24392 pushl %ecx
24393 pushl %edx
24394@@ -617,9 +705,6 @@ ignore_int:
24395 movl $(__KERNEL_DS),%eax
24396 movl %eax,%ds
24397 movl %eax,%es
24398- cmpl $2,early_recursion_flag
24399- je hlt_loop
24400- incl early_recursion_flag
24401 pushl 16(%esp)
24402 pushl 24(%esp)
24403 pushl 32(%esp)
24404@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24405 /*
24406 * BSS section
24407 */
24408-__PAGE_ALIGNED_BSS
24409- .align PAGE_SIZE
24410 #ifdef CONFIG_X86_PAE
24411+.section .initial_pg_pmd,"a",@progbits
24412 initial_pg_pmd:
24413 .fill 1024*KPMDS,4,0
24414 #else
24415+.section .initial_page_table,"a",@progbits
24416 ENTRY(initial_page_table)
24417 .fill 1024,4,0
24418 #endif
24419+.section .initial_pg_fixmap,"a",@progbits
24420 initial_pg_fixmap:
24421 .fill 1024,4,0
24422+.section .empty_zero_page,"a",@progbits
24423 ENTRY(empty_zero_page)
24424 .fill 4096,1,0
24425+.section .swapper_pg_dir,"a",@progbits
24426 ENTRY(swapper_pg_dir)
24427+#ifdef CONFIG_X86_PAE
24428+ .fill 4,8,0
24429+#else
24430 .fill 1024,4,0
24431+#endif
24432
24433 /*
24434 * This starts the data section.
24435 */
24436 #ifdef CONFIG_X86_PAE
24437-__PAGE_ALIGNED_DATA
24438- /* Page-aligned for the benefit of paravirt? */
24439- .align PAGE_SIZE
24440+.section .initial_page_table,"a",@progbits
24441 ENTRY(initial_page_table)
24442 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24443 # if KPMDS == 3
24444@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24445 # error "Kernel PMDs should be 1, 2 or 3"
24446 # endif
24447 .align PAGE_SIZE /* needs to be page-sized too */
24448+
24449+#ifdef CONFIG_PAX_PER_CPU_PGD
24450+ENTRY(cpu_pgd)
24451+ .rept 2*NR_CPUS
24452+ .fill 4,8,0
24453+ .endr
24454+#endif
24455+
24456 #endif
24457
24458 .data
24459 .balign 4
24460 ENTRY(stack_start)
24461- .long init_thread_union+THREAD_SIZE
24462+ .long init_thread_union+THREAD_SIZE-8
24463
24464 __INITRODATA
24465 int_msg:
24466@@ -727,7 +825,7 @@ fault_msg:
24467 * segment size, and 32-bit linear address value:
24468 */
24469
24470- .data
24471+.section .rodata,"a",@progbits
24472 .globl boot_gdt_descr
24473 .globl idt_descr
24474
24475@@ -736,7 +834,7 @@ fault_msg:
24476 .word 0 # 32 bit align gdt_desc.address
24477 boot_gdt_descr:
24478 .word __BOOT_DS+7
24479- .long boot_gdt - __PAGE_OFFSET
24480+ .long pa(boot_gdt)
24481
24482 .word 0 # 32-bit align idt_desc.address
24483 idt_descr:
24484@@ -747,7 +845,7 @@ idt_descr:
24485 .word 0 # 32 bit align gdt_desc.address
24486 ENTRY(early_gdt_descr)
24487 .word GDT_ENTRIES*8-1
24488- .long gdt_page /* Overwritten for secondary CPUs */
24489+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24490
24491 /*
24492 * The boot_gdt must mirror the equivalent in setup.S and is
24493@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24494 .align L1_CACHE_BYTES
24495 ENTRY(boot_gdt)
24496 .fill GDT_ENTRY_BOOT_CS,8,0
24497- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24498- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24499+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24500+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24501+
24502+ .align PAGE_SIZE_asm
24503+ENTRY(cpu_gdt_table)
24504+ .rept NR_CPUS
24505+ .quad 0x0000000000000000 /* NULL descriptor */
24506+ .quad 0x0000000000000000 /* 0x0b reserved */
24507+ .quad 0x0000000000000000 /* 0x13 reserved */
24508+ .quad 0x0000000000000000 /* 0x1b reserved */
24509+
24510+#ifdef CONFIG_PAX_KERNEXEC
24511+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24512+#else
24513+ .quad 0x0000000000000000 /* 0x20 unused */
24514+#endif
24515+
24516+ .quad 0x0000000000000000 /* 0x28 unused */
24517+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24518+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24519+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24520+ .quad 0x0000000000000000 /* 0x4b reserved */
24521+ .quad 0x0000000000000000 /* 0x53 reserved */
24522+ .quad 0x0000000000000000 /* 0x5b reserved */
24523+
24524+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24525+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24526+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24527+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24528+
24529+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24530+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24531+
24532+ /*
24533+ * Segments used for calling PnP BIOS have byte granularity.
24534+ * The code segments and data segments have fixed 64k limits,
24535+ * the transfer segment sizes are set at run time.
24536+ */
24537+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24538+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24539+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24540+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24541+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24542+
24543+ /*
24544+ * The APM segments have byte granularity and their bases
24545+ * are set at run time. All have 64k limits.
24546+ */
24547+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24548+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24549+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24550+
24551+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
24552+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24553+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24554+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24555+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24556+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24557+
24558+ /* Be sure this is zeroed to avoid false validations in Xen */
24559+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24560+ .endr
24561diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24562index a468c0a..c7dec74 100644
24563--- a/arch/x86/kernel/head_64.S
24564+++ b/arch/x86/kernel/head_64.S
24565@@ -20,6 +20,8 @@
24566 #include <asm/processor-flags.h>
24567 #include <asm/percpu.h>
24568 #include <asm/nops.h>
24569+#include <asm/cpufeature.h>
24570+#include <asm/alternative-asm.h>
24571
24572 #ifdef CONFIG_PARAVIRT
24573 #include <asm/asm-offsets.h>
24574@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24575 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24576 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24577 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24578+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24579+L3_VMALLOC_START = pud_index(VMALLOC_START)
24580+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24581+L3_VMALLOC_END = pud_index(VMALLOC_END)
24582+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24583+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24584
24585 .text
24586 __HEAD
24587@@ -89,11 +97,24 @@ startup_64:
24588 * Fixup the physical addresses in the page table
24589 */
24590 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24591+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24592+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24593+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24594+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24595+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24596
24597- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24598- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24599+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24600+#ifndef CONFIG_XEN
24601+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24602+#endif
24603+
24604+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24605+
24606+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24607+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24608
24609 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24610+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24611
24612 /*
24613 * Set up the identity mapping for the switchover. These
24614@@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
24615 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24616 1:
24617
24618- /* Enable PAE mode and PGE */
24619- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24620+ /* Enable PAE mode and PSE/PGE */
24621+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24622 movq %rcx, %cr4
24623
24624 /* Setup early boot stage 4 level pagetables. */
24625@@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
24626 movl $MSR_EFER, %ecx
24627 rdmsr
24628 btsl $_EFER_SCE, %eax /* Enable System Call */
24629- btl $20,%edi /* No Execute supported? */
24630+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24631 jnc 1f
24632 btsl $_EFER_NX, %eax
24633 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24634+#ifndef CONFIG_EFI
24635+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24636+#endif
24637+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24638+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24639+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24640+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24641+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24642+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24643 1: wrmsr /* Make changes effective */
24644
24645 /* Setup cr0 */
24646@@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
24647 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24648 * address given in m16:64.
24649 */
24650+ pax_set_fptr_mask
24651 movq initial_code(%rip),%rax
24652 pushq $0 # fake return address to stop unwinder
24653 pushq $__KERNEL_CS # set correct cs
24654@@ -313,7 +344,7 @@ ENDPROC(start_cpu0)
24655 .quad INIT_PER_CPU_VAR(irq_stack_union)
24656
24657 GLOBAL(stack_start)
24658- .quad init_thread_union+THREAD_SIZE-8
24659+ .quad init_thread_union+THREAD_SIZE-16
24660 .word 0
24661 __FINITDATA
24662
24663@@ -391,7 +422,7 @@ ENTRY(early_idt_handler)
24664 call dump_stack
24665 #ifdef CONFIG_KALLSYMS
24666 leaq early_idt_ripmsg(%rip),%rdi
24667- movq 40(%rsp),%rsi # %rip again
24668+ movq 88(%rsp),%rsi # %rip again
24669 call __print_symbol
24670 #endif
24671 #endif /* EARLY_PRINTK */
24672@@ -420,6 +451,7 @@ ENDPROC(early_idt_handler)
24673 early_recursion_flag:
24674 .long 0
24675
24676+ .section .rodata,"a",@progbits
24677 #ifdef CONFIG_EARLY_PRINTK
24678 early_idt_msg:
24679 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24680@@ -447,29 +479,52 @@ NEXT_PAGE(early_level4_pgt)
24681 NEXT_PAGE(early_dynamic_pgts)
24682 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24683
24684- .data
24685+ .section .rodata,"a",@progbits
24686
24687-#ifndef CONFIG_XEN
24688 NEXT_PAGE(init_level4_pgt)
24689- .fill 512,8,0
24690-#else
24691-NEXT_PAGE(init_level4_pgt)
24692- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24693 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24694 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24695+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24696+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24697+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24698+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24699+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24700+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24701 .org init_level4_pgt + L4_START_KERNEL*8, 0
24702 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24703 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24704
24705+#ifdef CONFIG_PAX_PER_CPU_PGD
24706+NEXT_PAGE(cpu_pgd)
24707+ .rept 2*NR_CPUS
24708+ .fill 512,8,0
24709+ .endr
24710+#endif
24711+
24712 NEXT_PAGE(level3_ident_pgt)
24713 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24714+#ifdef CONFIG_XEN
24715 .fill 511, 8, 0
24716+#else
24717+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24718+ .fill 510,8,0
24719+#endif
24720+
24721+NEXT_PAGE(level3_vmalloc_start_pgt)
24722+ .fill 512,8,0
24723+
24724+NEXT_PAGE(level3_vmalloc_end_pgt)
24725+ .fill 512,8,0
24726+
24727+NEXT_PAGE(level3_vmemmap_pgt)
24728+ .fill L3_VMEMMAP_START,8,0
24729+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24730+
24731 NEXT_PAGE(level2_ident_pgt)
24732- /* Since I easily can, map the first 1G.
24733+ /* Since I easily can, map the first 2G.
24734 * Don't set NX because code runs from these pages.
24735 */
24736- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24737-#endif
24738+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24739
24740 NEXT_PAGE(level3_kernel_pgt)
24741 .fill L3_START_KERNEL,8,0
24742@@ -477,6 +532,9 @@ NEXT_PAGE(level3_kernel_pgt)
24743 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24744 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24745
24746+NEXT_PAGE(level2_vmemmap_pgt)
24747+ .fill 512,8,0
24748+
24749 NEXT_PAGE(level2_kernel_pgt)
24750 /*
24751 * 512 MB kernel mapping. We spend a full page on this pagetable
24752@@ -494,28 +552,64 @@ NEXT_PAGE(level2_kernel_pgt)
24753 NEXT_PAGE(level2_fixmap_pgt)
24754 .fill 506,8,0
24755 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24756- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24757- .fill 5,8,0
24758+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24759+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24760+ .fill 4,8,0
24761
24762 NEXT_PAGE(level1_fixmap_pgt)
24763 .fill 512,8,0
24764
24765+NEXT_PAGE(level1_vsyscall_pgt)
24766+ .fill 512,8,0
24767+
24768 #undef PMDS
24769
24770- .data
24771+ .align PAGE_SIZE
24772+ENTRY(cpu_gdt_table)
24773+ .rept NR_CPUS
24774+ .quad 0x0000000000000000 /* NULL descriptor */
24775+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24776+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
24777+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
24778+ .quad 0x00cffb000000ffff /* __USER32_CS */
24779+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24780+ .quad 0x00affb000000ffff /* __USER_CS */
24781+
24782+#ifdef CONFIG_PAX_KERNEXEC
24783+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24784+#else
24785+ .quad 0x0 /* unused */
24786+#endif
24787+
24788+ .quad 0,0 /* TSS */
24789+ .quad 0,0 /* LDT */
24790+ .quad 0,0,0 /* three TLS descriptors */
24791+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
24792+ /* asm/segment.h:GDT_ENTRIES must match this */
24793+
24794+#ifdef CONFIG_PAX_MEMORY_UDEREF
24795+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24796+#else
24797+ .quad 0x0 /* unused */
24798+#endif
24799+
24800+ /* zero the remaining page */
24801+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
24802+ .endr
24803+
24804 .align 16
24805 .globl early_gdt_descr
24806 early_gdt_descr:
24807 .word GDT_ENTRIES*8-1
24808 early_gdt_descr_base:
24809- .quad INIT_PER_CPU_VAR(gdt_page)
24810+ .quad cpu_gdt_table
24811
24812 ENTRY(phys_base)
24813 /* This must match the first entry in level2_kernel_pgt */
24814 .quad 0x0000000000000000
24815
24816 #include "../../x86/xen/xen-head.S"
24817-
24818- __PAGE_ALIGNED_BSS
24819+
24820+ .section .rodata,"a",@progbits
24821 NEXT_PAGE(empty_zero_page)
24822 .skip PAGE_SIZE
24823diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
24824index 05fd74f..c3548b1 100644
24825--- a/arch/x86/kernel/i386_ksyms_32.c
24826+++ b/arch/x86/kernel/i386_ksyms_32.c
24827@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
24828 EXPORT_SYMBOL(cmpxchg8b_emu);
24829 #endif
24830
24831+EXPORT_SYMBOL_GPL(cpu_gdt_table);
24832+
24833 /* Networking helper routines. */
24834 EXPORT_SYMBOL(csum_partial_copy_generic);
24835+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
24836+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
24837
24838 EXPORT_SYMBOL(__get_user_1);
24839 EXPORT_SYMBOL(__get_user_2);
24840@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
24841 EXPORT_SYMBOL(___preempt_schedule_context);
24842 #endif
24843 #endif
24844+
24845+#ifdef CONFIG_PAX_KERNEXEC
24846+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
24847+#endif
24848+
24849+#ifdef CONFIG_PAX_PER_CPU_PGD
24850+EXPORT_SYMBOL(cpu_pgd);
24851+#endif
24852diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
24853index d5dd808..b6432cf 100644
24854--- a/arch/x86/kernel/i387.c
24855+++ b/arch/x86/kernel/i387.c
24856@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
24857 static inline bool interrupted_user_mode(void)
24858 {
24859 struct pt_regs *regs = get_irq_regs();
24860- return regs && user_mode_vm(regs);
24861+ return regs && user_mode(regs);
24862 }
24863
24864 /*
24865diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
24866index 2e977b5..5f2c273 100644
24867--- a/arch/x86/kernel/i8259.c
24868+++ b/arch/x86/kernel/i8259.c
24869@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
24870 static void make_8259A_irq(unsigned int irq)
24871 {
24872 disable_irq_nosync(irq);
24873- io_apic_irqs &= ~(1<<irq);
24874+ io_apic_irqs &= ~(1UL<<irq);
24875 irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
24876 i8259A_chip.name);
24877 enable_irq(irq);
24878@@ -209,7 +209,7 @@ spurious_8259A_irq:
24879 "spurious 8259A interrupt: IRQ%d.\n", irq);
24880 spurious_irq_mask |= irqmask;
24881 }
24882- atomic_inc(&irq_err_count);
24883+ atomic_inc_unchecked(&irq_err_count);
24884 /*
24885 * Theoretically we do not have to handle this IRQ,
24886 * but in Linux this does not cause problems and is
24887@@ -332,14 +332,16 @@ static void init_8259A(int auto_eoi)
24888 /* (slave's support for AEOI in flat mode is to be investigated) */
24889 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
24890
24891+ pax_open_kernel();
24892 if (auto_eoi)
24893 /*
24894 * In AEOI mode we just have to mask the interrupt
24895 * when acking.
24896 */
24897- i8259A_chip.irq_mask_ack = disable_8259A_irq;
24898+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
24899 else
24900- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24901+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
24902+ pax_close_kernel();
24903
24904 udelay(100); /* wait for 8259A to initialize */
24905
24906diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
24907index a979b5b..1d6db75 100644
24908--- a/arch/x86/kernel/io_delay.c
24909+++ b/arch/x86/kernel/io_delay.c
24910@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
24911 * Quirk table for systems that misbehave (lock up, etc.) if port
24912 * 0x80 is used:
24913 */
24914-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
24915+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
24916 {
24917 .callback = dmi_io_delay_0xed_port,
24918 .ident = "Compaq Presario V6000",
24919diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
24920index 4ddaf66..49d5c18 100644
24921--- a/arch/x86/kernel/ioport.c
24922+++ b/arch/x86/kernel/ioport.c
24923@@ -6,6 +6,7 @@
24924 #include <linux/sched.h>
24925 #include <linux/kernel.h>
24926 #include <linux/capability.h>
24927+#include <linux/security.h>
24928 #include <linux/errno.h>
24929 #include <linux/types.h>
24930 #include <linux/ioport.h>
24931@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24932 return -EINVAL;
24933 if (turn_on && !capable(CAP_SYS_RAWIO))
24934 return -EPERM;
24935+#ifdef CONFIG_GRKERNSEC_IO
24936+ if (turn_on && grsec_disable_privio) {
24937+ gr_handle_ioperm();
24938+ return -ENODEV;
24939+ }
24940+#endif
24941
24942 /*
24943 * If it's the first ioperm() call in this thread's lifetime, set the
24944@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
24945 * because the ->io_bitmap_max value must match the bitmap
24946 * contents:
24947 */
24948- tss = &per_cpu(init_tss, get_cpu());
24949+ tss = init_tss + get_cpu();
24950
24951 if (turn_on)
24952 bitmap_clear(t->io_bitmap_ptr, from, num);
24953@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
24954 if (level > old) {
24955 if (!capable(CAP_SYS_RAWIO))
24956 return -EPERM;
24957+#ifdef CONFIG_GRKERNSEC_IO
24958+ if (grsec_disable_privio) {
24959+ gr_handle_iopl();
24960+ return -ENODEV;
24961+ }
24962+#endif
24963 }
24964 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
24965 t->iopl = level << 12;
24966diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
24967index 11ccfb0..ec1e46f 100644
24968--- a/arch/x86/kernel/irq.c
24969+++ b/arch/x86/kernel/irq.c
24970@@ -22,7 +22,7 @@
24971 #define CREATE_TRACE_POINTS
24972 #include <asm/trace/irq_vectors.h>
24973
24974-atomic_t irq_err_count;
24975+atomic_unchecked_t irq_err_count;
24976
24977 /* Function pointer for generic interrupt vector handling */
24978 void (*x86_platform_ipi_callback)(void) = NULL;
24979@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
24980 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
24981 seq_printf(p, " Hypervisor callback interrupts\n");
24982 #endif
24983- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
24984+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
24985 #if defined(CONFIG_X86_IO_APIC)
24986- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
24987+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
24988 #endif
24989 return 0;
24990 }
24991@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
24992
24993 u64 arch_irq_stat(void)
24994 {
24995- u64 sum = atomic_read(&irq_err_count);
24996+ u64 sum = atomic_read_unchecked(&irq_err_count);
24997 return sum;
24998 }
24999
25000diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25001index 63ce838..2ea3e06 100644
25002--- a/arch/x86/kernel/irq_32.c
25003+++ b/arch/x86/kernel/irq_32.c
25004@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25005
25006 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25007
25008+extern void gr_handle_kernel_exploit(void);
25009+
25010 int sysctl_panic_on_stackoverflow __read_mostly;
25011
25012 /* Debugging check for stack overflow: is there less than 1KB free? */
25013@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25014 __asm__ __volatile__("andl %%esp,%0" :
25015 "=r" (sp) : "0" (THREAD_SIZE - 1));
25016
25017- return sp < (sizeof(struct thread_info) + STACK_WARN);
25018+ return sp < STACK_WARN;
25019 }
25020
25021 static void print_stack_overflow(void)
25022 {
25023 printk(KERN_WARNING "low stack detected by irq handler\n");
25024 dump_stack();
25025+ gr_handle_kernel_exploit();
25026 if (sysctl_panic_on_stackoverflow)
25027 panic("low stack detected by irq handler - check messages\n");
25028 }
25029@@ -84,10 +87,9 @@ static inline void *current_stack(void)
25030 static inline int
25031 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25032 {
25033- struct irq_stack *curstk, *irqstk;
25034+ struct irq_stack *irqstk;
25035 u32 *isp, *prev_esp, arg1, arg2;
25036
25037- curstk = (struct irq_stack *) current_stack();
25038 irqstk = __this_cpu_read(hardirq_stack);
25039
25040 /*
25041@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25042 * handler) we can't do that and just have to keep using the
25043 * current stack (which is the irq stack already after all)
25044 */
25045- if (unlikely(curstk == irqstk))
25046+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25047 return 0;
25048
25049- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25050+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25051
25052 /* Save the next esp at the bottom of the stack */
25053 prev_esp = (u32 *)irqstk;
25054 *prev_esp = current_stack_pointer;
25055
25056+#ifdef CONFIG_PAX_MEMORY_UDEREF
25057+ __set_fs(MAKE_MM_SEG(0));
25058+#endif
25059+
25060 if (unlikely(overflow))
25061 call_on_stack(print_stack_overflow, isp);
25062
25063@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25064 : "0" (irq), "1" (desc), "2" (isp),
25065 "D" (desc->handle_irq)
25066 : "memory", "cc", "ecx");
25067+
25068+#ifdef CONFIG_PAX_MEMORY_UDEREF
25069+ __set_fs(current_thread_info()->addr_limit);
25070+#endif
25071+
25072 return 1;
25073 }
25074
25075@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25076 */
25077 void irq_ctx_init(int cpu)
25078 {
25079- struct irq_stack *irqstk;
25080-
25081 if (per_cpu(hardirq_stack, cpu))
25082 return;
25083
25084- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25085- THREADINFO_GFP,
25086- THREAD_SIZE_ORDER));
25087- per_cpu(hardirq_stack, cpu) = irqstk;
25088-
25089- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25090- THREADINFO_GFP,
25091- THREAD_SIZE_ORDER));
25092- per_cpu(softirq_stack, cpu) = irqstk;
25093-
25094- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25095- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25096+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25097+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25098 }
25099
25100 void do_softirq_own_stack(void)
25101 {
25102- struct thread_info *curstk;
25103 struct irq_stack *irqstk;
25104 u32 *isp, *prev_esp;
25105
25106- curstk = current_stack();
25107 irqstk = __this_cpu_read(softirq_stack);
25108
25109 /* build the stack frame on the softirq stack */
25110@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25111 prev_esp = (u32 *)irqstk;
25112 *prev_esp = current_stack_pointer;
25113
25114+#ifdef CONFIG_PAX_MEMORY_UDEREF
25115+ __set_fs(MAKE_MM_SEG(0));
25116+#endif
25117+
25118 call_on_stack(__do_softirq, isp);
25119+
25120+#ifdef CONFIG_PAX_MEMORY_UDEREF
25121+ __set_fs(current_thread_info()->addr_limit);
25122+#endif
25123+
25124 }
25125
25126 bool handle_irq(unsigned irq, struct pt_regs *regs)
25127@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25128 if (unlikely(!desc))
25129 return false;
25130
25131- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25132+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25133 if (unlikely(overflow))
25134 print_stack_overflow();
25135 desc->handle_irq(irq, desc);
25136diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25137index 4d1c746..55a22d6 100644
25138--- a/arch/x86/kernel/irq_64.c
25139+++ b/arch/x86/kernel/irq_64.c
25140@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25141 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25142 EXPORT_PER_CPU_SYMBOL(irq_regs);
25143
25144+extern void gr_handle_kernel_exploit(void);
25145+
25146 int sysctl_panic_on_stackoverflow;
25147
25148 /*
25149@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25150 u64 estack_top, estack_bottom;
25151 u64 curbase = (u64)task_stack_page(current);
25152
25153- if (user_mode_vm(regs))
25154+ if (user_mode(regs))
25155 return;
25156
25157 if (regs->sp >= curbase + sizeof(struct thread_info) +
25158@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25159 irq_stack_top, irq_stack_bottom,
25160 estack_top, estack_bottom);
25161
25162+ gr_handle_kernel_exploit();
25163+
25164 if (sysctl_panic_on_stackoverflow)
25165 panic("low stack detected by irq handler - check messages\n");
25166 #endif
25167diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25168index 26d5a55..a01160a 100644
25169--- a/arch/x86/kernel/jump_label.c
25170+++ b/arch/x86/kernel/jump_label.c
25171@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25172 * Jump label is enabled for the first time.
25173 * So we expect a default_nop...
25174 */
25175- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25176+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25177 != 0))
25178 bug_at((void *)entry->code, __LINE__);
25179 } else {
25180@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25181 * ...otherwise expect an ideal_nop. Otherwise
25182 * something went horribly wrong.
25183 */
25184- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25185+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25186 != 0))
25187 bug_at((void *)entry->code, __LINE__);
25188 }
25189@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25190 * are converting the default nop to the ideal nop.
25191 */
25192 if (init) {
25193- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25194+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25195 bug_at((void *)entry->code, __LINE__);
25196 } else {
25197 code.jump = 0xe9;
25198 code.offset = entry->target -
25199 (entry->code + JUMP_LABEL_NOP_SIZE);
25200- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25201+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25202 bug_at((void *)entry->code, __LINE__);
25203 }
25204 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25205diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25206index 7ec1d5f..5a7d130 100644
25207--- a/arch/x86/kernel/kgdb.c
25208+++ b/arch/x86/kernel/kgdb.c
25209@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25210 #ifdef CONFIG_X86_32
25211 switch (regno) {
25212 case GDB_SS:
25213- if (!user_mode_vm(regs))
25214+ if (!user_mode(regs))
25215 *(unsigned long *)mem = __KERNEL_DS;
25216 break;
25217 case GDB_SP:
25218- if (!user_mode_vm(regs))
25219+ if (!user_mode(regs))
25220 *(unsigned long *)mem = kernel_stack_pointer(regs);
25221 break;
25222 case GDB_GS:
25223@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25224 bp->attr.bp_addr = breakinfo[breakno].addr;
25225 bp->attr.bp_len = breakinfo[breakno].len;
25226 bp->attr.bp_type = breakinfo[breakno].type;
25227- info->address = breakinfo[breakno].addr;
25228+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25229+ info->address = ktla_ktva(breakinfo[breakno].addr);
25230+ else
25231+ info->address = breakinfo[breakno].addr;
25232 info->len = breakinfo[breakno].len;
25233 info->type = breakinfo[breakno].type;
25234 val = arch_install_hw_breakpoint(bp);
25235@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25236 case 'k':
25237 /* clear the trace bit */
25238 linux_regs->flags &= ~X86_EFLAGS_TF;
25239- atomic_set(&kgdb_cpu_doing_single_step, -1);
25240+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25241
25242 /* set the trace bit if we're stepping */
25243 if (remcomInBuffer[0] == 's') {
25244 linux_regs->flags |= X86_EFLAGS_TF;
25245- atomic_set(&kgdb_cpu_doing_single_step,
25246+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25247 raw_smp_processor_id());
25248 }
25249
25250@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25251
25252 switch (cmd) {
25253 case DIE_DEBUG:
25254- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25255+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25256 if (user_mode(regs))
25257 return single_step_cont(regs, args);
25258 break;
25259@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25260 #endif /* CONFIG_DEBUG_RODATA */
25261
25262 bpt->type = BP_BREAKPOINT;
25263- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25264+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25265 BREAK_INSTR_SIZE);
25266 if (err)
25267 return err;
25268- err = probe_kernel_write((char *)bpt->bpt_addr,
25269+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25270 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25271 #ifdef CONFIG_DEBUG_RODATA
25272 if (!err)
25273@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25274 return -EBUSY;
25275 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25276 BREAK_INSTR_SIZE);
25277- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25278+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25279 if (err)
25280 return err;
25281 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25282@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25283 if (mutex_is_locked(&text_mutex))
25284 goto knl_write;
25285 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25286- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25287+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25288 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25289 goto knl_write;
25290 return err;
25291 knl_write:
25292 #endif /* CONFIG_DEBUG_RODATA */
25293- return probe_kernel_write((char *)bpt->bpt_addr,
25294+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25295 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25296 }
25297
25298diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25299index 61b17dc..784bfe9 100644
25300--- a/arch/x86/kernel/kprobes/core.c
25301+++ b/arch/x86/kernel/kprobes/core.c
25302@@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
25303 s32 raddr;
25304 } __packed *insn;
25305
25306- insn = (struct __arch_relative_insn *)from;
25307+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25308+
25309+ pax_open_kernel();
25310 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25311 insn->op = op;
25312+ pax_close_kernel();
25313 }
25314
25315 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25316@@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
25317 kprobe_opcode_t opcode;
25318 kprobe_opcode_t *orig_opcodes = opcodes;
25319
25320- if (search_exception_tables((unsigned long)opcodes))
25321+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25322 return 0; /* Page fault may occur on this address. */
25323
25324 retry:
25325@@ -238,9 +241,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25326 * for the first byte, we can recover the original instruction
25327 * from it and kp->opcode.
25328 */
25329- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25330+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25331 buf[0] = kp->opcode;
25332- return (unsigned long)buf;
25333+ return ktva_ktla((unsigned long)buf);
25334 }
25335
25336 /*
25337@@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
25338 /* Another subsystem puts a breakpoint, failed to recover */
25339 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25340 return 0;
25341+ pax_open_kernel();
25342 memcpy(dest, insn.kaddr, insn.length);
25343+ pax_close_kernel();
25344
25345 #ifdef CONFIG_X86_64
25346 if (insn_rip_relative(&insn)) {
25347@@ -359,7 +364,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
25348 return 0;
25349 }
25350 disp = (u8 *) dest + insn_offset_displacement(&insn);
25351+ pax_open_kernel();
25352 *(s32 *) disp = (s32) newdisp;
25353+ pax_close_kernel();
25354 }
25355 #endif
25356 return insn.length;
25357@@ -498,7 +505,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
25358 * nor set current_kprobe, because it doesn't use single
25359 * stepping.
25360 */
25361- regs->ip = (unsigned long)p->ainsn.insn;
25362+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25363 preempt_enable_no_resched();
25364 return;
25365 }
25366@@ -515,9 +522,9 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
25367 regs->flags &= ~X86_EFLAGS_IF;
25368 /* single step inline if the instruction is an int3 */
25369 if (p->opcode == BREAKPOINT_INSTRUCTION)
25370- regs->ip = (unsigned long)p->addr;
25371+ regs->ip = ktla_ktva((unsigned long)p->addr);
25372 else
25373- regs->ip = (unsigned long)p->ainsn.insn;
25374+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25375 }
25376
25377 /*
25378@@ -596,7 +603,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
25379 setup_singlestep(p, regs, kcb, 0);
25380 return 1;
25381 }
25382- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25383+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25384 /*
25385 * The breakpoint instruction was removed right
25386 * after we hit it. Another cpu has removed
25387@@ -642,6 +649,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
25388 " movq %rax, 152(%rsp)\n"
25389 RESTORE_REGS_STRING
25390 " popfq\n"
25391+#ifdef KERNEXEC_PLUGIN
25392+ " btsq $63,(%rsp)\n"
25393+#endif
25394 #else
25395 " pushf\n"
25396 SAVE_REGS_STRING
25397@@ -779,7 +789,7 @@ static void __kprobes
25398 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
25399 {
25400 unsigned long *tos = stack_addr(regs);
25401- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25402+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25403 unsigned long orig_ip = (unsigned long)p->addr;
25404 kprobe_opcode_t *insn = p->ainsn.insn;
25405
25406@@ -959,7 +969,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
25407 struct die_args *args = data;
25408 int ret = NOTIFY_DONE;
25409
25410- if (args->regs && user_mode_vm(args->regs))
25411+ if (args->regs && user_mode(args->regs))
25412 return ret;
25413
25414 switch (val) {
25415diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25416index 898160b..758cde8 100644
25417--- a/arch/x86/kernel/kprobes/opt.c
25418+++ b/arch/x86/kernel/kprobes/opt.c
25419@@ -79,6 +79,7 @@ found:
25420 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25421 static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25422 {
25423+ pax_open_kernel();
25424 #ifdef CONFIG_X86_64
25425 *addr++ = 0x48;
25426 *addr++ = 0xbf;
25427@@ -86,6 +87,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
25428 *addr++ = 0xb8;
25429 #endif
25430 *(unsigned long *)addr = val;
25431+ pax_close_kernel();
25432 }
25433
25434 asm (
25435@@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25436 * Verify if the address gap is in 2GB range, because this uses
25437 * a relative jump.
25438 */
25439- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25440+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25441 if (abs(rel) > 0x7fffffff)
25442 return -ERANGE;
25443
25444@@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25445 op->optinsn.size = ret;
25446
25447 /* Copy arch-dep-instance from template */
25448- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25449+ pax_open_kernel();
25450+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25451+ pax_close_kernel();
25452
25453 /* Set probe information */
25454 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25455
25456 /* Set probe function call */
25457- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25458+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25459
25460 /* Set returning jmp instruction at the tail of out-of-line buffer */
25461- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25462+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25463 (u8 *)op->kp.addr + op->optinsn.size);
25464
25465 flush_icache_range((unsigned long) buf,
25466@@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
25467 WARN_ON(kprobe_disabled(&op->kp));
25468
25469 /* Backup instructions which will be replaced by jump address */
25470- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25471+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25472 RELATIVE_ADDR_SIZE);
25473
25474 insn_buf[0] = RELATIVEJUMP_OPCODE;
25475@@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25476 /* This kprobe is really able to run optimized path. */
25477 op = container_of(p, struct optimized_kprobe, kp);
25478 /* Detour through copied instructions */
25479- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25480+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25481 if (!reenter)
25482 reset_current_kprobe();
25483 preempt_enable_no_resched();
25484diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25485index c2bedae..25e7ab60 100644
25486--- a/arch/x86/kernel/ksysfs.c
25487+++ b/arch/x86/kernel/ksysfs.c
25488@@ -184,7 +184,7 @@ out:
25489
25490 static struct kobj_attribute type_attr = __ATTR_RO(type);
25491
25492-static struct bin_attribute data_attr = {
25493+static bin_attribute_no_const data_attr __read_only = {
25494 .attr = {
25495 .name = "data",
25496 .mode = S_IRUGO,
25497diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25498index dcbbaa1..81ae763 100644
25499--- a/arch/x86/kernel/ldt.c
25500+++ b/arch/x86/kernel/ldt.c
25501@@ -68,13 +68,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25502 if (reload) {
25503 #ifdef CONFIG_SMP
25504 preempt_disable();
25505- load_LDT(pc);
25506+ load_LDT_nolock(pc);
25507 if (!cpumask_equal(mm_cpumask(current->mm),
25508 cpumask_of(smp_processor_id())))
25509 smp_call_function(flush_ldt, current->mm, 1);
25510 preempt_enable();
25511 #else
25512- load_LDT(pc);
25513+ load_LDT_nolock(pc);
25514 #endif
25515 }
25516 if (oldsize) {
25517@@ -96,7 +96,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25518 return err;
25519
25520 for (i = 0; i < old->size; i++)
25521- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25522+ write_ldt_entry(new->ldt, i, old->ldt + i);
25523 return 0;
25524 }
25525
25526@@ -117,6 +117,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25527 retval = copy_ldt(&mm->context, &old_mm->context);
25528 mutex_unlock(&old_mm->context.lock);
25529 }
25530+
25531+ if (tsk == current) {
25532+ mm->context.vdso = 0;
25533+
25534+#ifdef CONFIG_X86_32
25535+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25536+ mm->context.user_cs_base = 0UL;
25537+ mm->context.user_cs_limit = ~0UL;
25538+
25539+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25540+ cpus_clear(mm->context.cpu_user_cs_mask);
25541+#endif
25542+
25543+#endif
25544+#endif
25545+
25546+ }
25547+
25548 return retval;
25549 }
25550
25551@@ -231,6 +249,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25552 }
25553 }
25554
25555+#ifdef CONFIG_PAX_SEGMEXEC
25556+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25557+ error = -EINVAL;
25558+ goto out_unlock;
25559+ }
25560+#endif
25561+
25562 /*
25563 * On x86-64 we do not support 16-bit segments due to
25564 * IRET leaking the high bits of the kernel stack address.
25565diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25566index 1667b1d..16492c5 100644
25567--- a/arch/x86/kernel/machine_kexec_32.c
25568+++ b/arch/x86/kernel/machine_kexec_32.c
25569@@ -25,7 +25,7 @@
25570 #include <asm/cacheflush.h>
25571 #include <asm/debugreg.h>
25572
25573-static void set_idt(void *newidt, __u16 limit)
25574+static void set_idt(struct desc_struct *newidt, __u16 limit)
25575 {
25576 struct desc_ptr curidt;
25577
25578@@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25579 }
25580
25581
25582-static void set_gdt(void *newgdt, __u16 limit)
25583+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25584 {
25585 struct desc_ptr curgdt;
25586
25587@@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25588 }
25589
25590 control_page = page_address(image->control_code_page);
25591- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25592+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25593
25594 relocate_kernel_ptr = control_page;
25595 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25596diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25597index e69f988..da078ea 100644
25598--- a/arch/x86/kernel/module.c
25599+++ b/arch/x86/kernel/module.c
25600@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25601 }
25602 #endif
25603
25604-void *module_alloc(unsigned long size)
25605+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25606 {
25607- if (PAGE_ALIGN(size) > MODULES_LEN)
25608+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25609 return NULL;
25610 return __vmalloc_node_range(size, 1,
25611 MODULES_VADDR + get_module_load_offset(),
25612- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25613- PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25614+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25615+ prot, NUMA_NO_NODE,
25616 __builtin_return_address(0));
25617 }
25618
25619+void *module_alloc(unsigned long size)
25620+{
25621+
25622+#ifdef CONFIG_PAX_KERNEXEC
25623+ return __module_alloc(size, PAGE_KERNEL);
25624+#else
25625+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25626+#endif
25627+
25628+}
25629+
25630+#ifdef CONFIG_PAX_KERNEXEC
25631+#ifdef CONFIG_X86_32
25632+void *module_alloc_exec(unsigned long size)
25633+{
25634+ struct vm_struct *area;
25635+
25636+ if (size == 0)
25637+ return NULL;
25638+
25639+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25640+return area ? area->addr : NULL;
25641+}
25642+EXPORT_SYMBOL(module_alloc_exec);
25643+
25644+void module_free_exec(struct module *mod, void *module_region)
25645+{
25646+ vunmap(module_region);
25647+}
25648+EXPORT_SYMBOL(module_free_exec);
25649+#else
25650+void module_free_exec(struct module *mod, void *module_region)
25651+{
25652+ module_free(mod, module_region);
25653+}
25654+EXPORT_SYMBOL(module_free_exec);
25655+
25656+void *module_alloc_exec(unsigned long size)
25657+{
25658+ return __module_alloc(size, PAGE_KERNEL_RX);
25659+}
25660+EXPORT_SYMBOL(module_alloc_exec);
25661+#endif
25662+#endif
25663+
25664 #ifdef CONFIG_X86_32
25665 int apply_relocate(Elf32_Shdr *sechdrs,
25666 const char *strtab,
25667@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25668 unsigned int i;
25669 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
25670 Elf32_Sym *sym;
25671- uint32_t *location;
25672+ uint32_t *plocation, location;
25673
25674 DEBUGP("Applying relocate section %u to %u\n",
25675 relsec, sechdrs[relsec].sh_info);
25676 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
25677 /* This is where to make the change */
25678- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
25679- + rel[i].r_offset;
25680+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
25681+ location = (uint32_t)plocation;
25682+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
25683+ plocation = ktla_ktva((void *)plocation);
25684 /* This is the symbol it is referring to. Note that all
25685 undefined symbols have been resolved. */
25686 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
25687@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25688 switch (ELF32_R_TYPE(rel[i].r_info)) {
25689 case R_386_32:
25690 /* We add the value into the location given */
25691- *location += sym->st_value;
25692+ pax_open_kernel();
25693+ *plocation += sym->st_value;
25694+ pax_close_kernel();
25695 break;
25696 case R_386_PC32:
25697 /* Add the value, subtract its position */
25698- *location += sym->st_value - (uint32_t)location;
25699+ pax_open_kernel();
25700+ *plocation += sym->st_value - location;
25701+ pax_close_kernel();
25702 break;
25703 default:
25704 pr_err("%s: Unknown relocation: %u\n",
25705@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
25706 case R_X86_64_NONE:
25707 break;
25708 case R_X86_64_64:
25709+ pax_open_kernel();
25710 *(u64 *)loc = val;
25711+ pax_close_kernel();
25712 break;
25713 case R_X86_64_32:
25714+ pax_open_kernel();
25715 *(u32 *)loc = val;
25716+ pax_close_kernel();
25717 if (val != *(u32 *)loc)
25718 goto overflow;
25719 break;
25720 case R_X86_64_32S:
25721+ pax_open_kernel();
25722 *(s32 *)loc = val;
25723+ pax_close_kernel();
25724 if ((s64)val != *(s32 *)loc)
25725 goto overflow;
25726 break;
25727 case R_X86_64_PC32:
25728 val -= (u64)loc;
25729+ pax_open_kernel();
25730 *(u32 *)loc = val;
25731+ pax_close_kernel();
25732+
25733 #if 0
25734 if ((s64)val != *(s32 *)loc)
25735 goto overflow;
25736diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
25737index c9603ac..9f88728 100644
25738--- a/arch/x86/kernel/msr.c
25739+++ b/arch/x86/kernel/msr.c
25740@@ -37,6 +37,7 @@
25741 #include <linux/notifier.h>
25742 #include <linux/uaccess.h>
25743 #include <linux/gfp.h>
25744+#include <linux/grsecurity.h>
25745
25746 #include <asm/processor.h>
25747 #include <asm/msr.h>
25748@@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
25749 int err = 0;
25750 ssize_t bytes = 0;
25751
25752+#ifdef CONFIG_GRKERNSEC_KMEM
25753+ gr_handle_msr_write();
25754+ return -EPERM;
25755+#endif
25756+
25757 if (count % 8)
25758 return -EINVAL; /* Invalid chunk size */
25759
25760@@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
25761 err = -EBADF;
25762 break;
25763 }
25764+#ifdef CONFIG_GRKERNSEC_KMEM
25765+ gr_handle_msr_write();
25766+ return -EPERM;
25767+#endif
25768 if (copy_from_user(&regs, uregs, sizeof regs)) {
25769 err = -EFAULT;
25770 break;
25771@@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
25772 return notifier_from_errno(err);
25773 }
25774
25775-static struct notifier_block __refdata msr_class_cpu_notifier = {
25776+static struct notifier_block msr_class_cpu_notifier = {
25777 .notifier_call = msr_class_cpu_callback,
25778 };
25779
25780diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
25781index b4872b9..5bf0684 100644
25782--- a/arch/x86/kernel/nmi.c
25783+++ b/arch/x86/kernel/nmi.c
25784@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
25785
25786 static void nmi_max_handler(struct irq_work *w)
25787 {
25788- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
25789+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
25790 int remainder_ns, decimal_msecs;
25791- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
25792+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
25793
25794 remainder_ns = do_div(whole_msecs, (1000 * 1000));
25795 decimal_msecs = remainder_ns / 1000;
25796
25797 printk_ratelimited(KERN_INFO
25798 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
25799- a->handler, whole_msecs, decimal_msecs);
25800+ n->action->handler, whole_msecs, decimal_msecs);
25801 }
25802
25803 static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
25804@@ -134,11 +134,11 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
25805 delta = sched_clock() - delta;
25806 trace_nmi_handler(a->handler, (int)delta, thishandled);
25807
25808- if (delta < nmi_longest_ns || delta < a->max_duration)
25809+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
25810 continue;
25811
25812- a->max_duration = delta;
25813- irq_work_queue(&a->irq_work);
25814+ a->work->max_duration = delta;
25815+ irq_work_queue(&a->work->irq_work);
25816 }
25817
25818 rcu_read_unlock();
25819@@ -147,7 +147,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
25820 return handled;
25821 }
25822
25823-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25824+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
25825 {
25826 struct nmi_desc *desc = nmi_to_desc(type);
25827 unsigned long flags;
25828@@ -155,7 +155,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25829 if (!action->handler)
25830 return -EINVAL;
25831
25832- init_irq_work(&action->irq_work, nmi_max_handler);
25833+ action->work->action = action;
25834+ init_irq_work(&action->work->irq_work, nmi_max_handler);
25835
25836 spin_lock_irqsave(&desc->lock, flags);
25837
25838@@ -173,9 +174,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
25839 * event confuses some handlers (kdump uses this flag)
25840 */
25841 if (action->flags & NMI_FLAG_FIRST)
25842- list_add_rcu(&action->list, &desc->head);
25843+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
25844 else
25845- list_add_tail_rcu(&action->list, &desc->head);
25846+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
25847
25848 spin_unlock_irqrestore(&desc->lock, flags);
25849 return 0;
25850@@ -198,7 +199,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
25851 if (!strcmp(n->name, name)) {
25852 WARN(in_nmi(),
25853 "Trying to free NMI (%s) from NMI context!\n", n->name);
25854- list_del_rcu(&n->list);
25855+ pax_list_del_rcu((struct list_head *)&n->list);
25856 break;
25857 }
25858 }
25859@@ -523,6 +524,17 @@ static inline void nmi_nesting_postprocess(void)
25860 dotraplinkage notrace __kprobes void
25861 do_nmi(struct pt_regs *regs, long error_code)
25862 {
25863+
25864+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
25865+ if (!user_mode(regs)) {
25866+ unsigned long cs = regs->cs & 0xFFFF;
25867+ unsigned long ip = ktva_ktla(regs->ip);
25868+
25869+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
25870+ regs->ip = ip;
25871+ }
25872+#endif
25873+
25874 nmi_nesting_preprocess(regs);
25875
25876 nmi_enter();
25877diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
25878index 6d9582e..f746287 100644
25879--- a/arch/x86/kernel/nmi_selftest.c
25880+++ b/arch/x86/kernel/nmi_selftest.c
25881@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
25882 {
25883 /* trap all the unknown NMIs we may generate */
25884 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
25885- __initdata);
25886+ __initconst);
25887 }
25888
25889 static void __init cleanup_nmi_testsuite(void)
25890@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
25891 unsigned long timeout;
25892
25893 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
25894- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
25895+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
25896 nmi_fail = FAILURE;
25897 return;
25898 }
25899diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
25900index bbb6c73..24a58ef 100644
25901--- a/arch/x86/kernel/paravirt-spinlocks.c
25902+++ b/arch/x86/kernel/paravirt-spinlocks.c
25903@@ -8,7 +8,7 @@
25904
25905 #include <asm/paravirt.h>
25906
25907-struct pv_lock_ops pv_lock_ops = {
25908+struct pv_lock_ops pv_lock_ops __read_only = {
25909 #ifdef CONFIG_SMP
25910 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
25911 .unlock_kick = paravirt_nop,
25912diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
25913index 1b10af8..45bfbec 100644
25914--- a/arch/x86/kernel/paravirt.c
25915+++ b/arch/x86/kernel/paravirt.c
25916@@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
25917 {
25918 return x;
25919 }
25920+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25921+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
25922+#endif
25923
25924 void __init default_banner(void)
25925 {
25926@@ -141,16 +144,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
25927
25928 if (opfunc == NULL)
25929 /* If there's no function, patch it with a ud2a (BUG) */
25930- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
25931- else if (opfunc == _paravirt_nop)
25932+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
25933+ else if (opfunc == (void *)_paravirt_nop)
25934 /* If the operation is a nop, then nop the callsite */
25935 ret = paravirt_patch_nop();
25936
25937 /* identity functions just return their single argument */
25938- else if (opfunc == _paravirt_ident_32)
25939+ else if (opfunc == (void *)_paravirt_ident_32)
25940 ret = paravirt_patch_ident_32(insnbuf, len);
25941- else if (opfunc == _paravirt_ident_64)
25942+ else if (opfunc == (void *)_paravirt_ident_64)
25943 ret = paravirt_patch_ident_64(insnbuf, len);
25944+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25945+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
25946+ ret = paravirt_patch_ident_64(insnbuf, len);
25947+#endif
25948
25949 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
25950 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
25951@@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
25952 if (insn_len > len || start == NULL)
25953 insn_len = len;
25954 else
25955- memcpy(insnbuf, start, insn_len);
25956+ memcpy(insnbuf, ktla_ktva(start), insn_len);
25957
25958 return insn_len;
25959 }
25960@@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
25961 return this_cpu_read(paravirt_lazy_mode);
25962 }
25963
25964-struct pv_info pv_info = {
25965+struct pv_info pv_info __read_only = {
25966 .name = "bare hardware",
25967 .paravirt_enabled = 0,
25968 .kernel_rpl = 0,
25969@@ -310,16 +317,16 @@ struct pv_info pv_info = {
25970 #endif
25971 };
25972
25973-struct pv_init_ops pv_init_ops = {
25974+struct pv_init_ops pv_init_ops __read_only = {
25975 .patch = native_patch,
25976 };
25977
25978-struct pv_time_ops pv_time_ops = {
25979+struct pv_time_ops pv_time_ops __read_only = {
25980 .sched_clock = native_sched_clock,
25981 .steal_clock = native_steal_clock,
25982 };
25983
25984-__visible struct pv_irq_ops pv_irq_ops = {
25985+__visible struct pv_irq_ops pv_irq_ops __read_only = {
25986 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
25987 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
25988 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
25989@@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
25990 #endif
25991 };
25992
25993-__visible struct pv_cpu_ops pv_cpu_ops = {
25994+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
25995 .cpuid = native_cpuid,
25996 .get_debugreg = native_get_debugreg,
25997 .set_debugreg = native_set_debugreg,
25998@@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
25999 .end_context_switch = paravirt_nop,
26000 };
26001
26002-struct pv_apic_ops pv_apic_ops = {
26003+struct pv_apic_ops pv_apic_ops __read_only= {
26004 #ifdef CONFIG_X86_LOCAL_APIC
26005 .startup_ipi_hook = paravirt_nop,
26006 #endif
26007 };
26008
26009-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26010+#ifdef CONFIG_X86_32
26011+#ifdef CONFIG_X86_PAE
26012+/* 64-bit pagetable entries */
26013+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26014+#else
26015 /* 32-bit pagetable entries */
26016 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26017+#endif
26018 #else
26019 /* 64-bit pagetable entries */
26020 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26021 #endif
26022
26023-struct pv_mmu_ops pv_mmu_ops = {
26024+struct pv_mmu_ops pv_mmu_ops __read_only = {
26025
26026 .read_cr2 = native_read_cr2,
26027 .write_cr2 = native_write_cr2,
26028@@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26029 .make_pud = PTE_IDENT,
26030
26031 .set_pgd = native_set_pgd,
26032+ .set_pgd_batched = native_set_pgd_batched,
26033 #endif
26034 #endif /* PAGETABLE_LEVELS >= 3 */
26035
26036@@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26037 },
26038
26039 .set_fixmap = native_set_fixmap,
26040+
26041+#ifdef CONFIG_PAX_KERNEXEC
26042+ .pax_open_kernel = native_pax_open_kernel,
26043+ .pax_close_kernel = native_pax_close_kernel,
26044+#endif
26045+
26046 };
26047
26048 EXPORT_SYMBOL_GPL(pv_time_ops);
26049diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26050index 0497f71..7186c0d 100644
26051--- a/arch/x86/kernel/pci-calgary_64.c
26052+++ b/arch/x86/kernel/pci-calgary_64.c
26053@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26054 tce_space = be64_to_cpu(readq(target));
26055 tce_space = tce_space & TAR_SW_BITS;
26056
26057- tce_space = tce_space & (~specified_table_size);
26058+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26059 info->tce_space = (u64 *)__va(tce_space);
26060 }
26061 }
26062diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26063index 35ccf75..7a15747 100644
26064--- a/arch/x86/kernel/pci-iommu_table.c
26065+++ b/arch/x86/kernel/pci-iommu_table.c
26066@@ -2,7 +2,7 @@
26067 #include <asm/iommu_table.h>
26068 #include <linux/string.h>
26069 #include <linux/kallsyms.h>
26070-
26071+#include <linux/sched.h>
26072
26073 #define DEBUG 1
26074
26075diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26076index 6c483ba..d10ce2f 100644
26077--- a/arch/x86/kernel/pci-swiotlb.c
26078+++ b/arch/x86/kernel/pci-swiotlb.c
26079@@ -32,7 +32,7 @@ static void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26080 void *vaddr, dma_addr_t dma_addr,
26081 struct dma_attrs *attrs)
26082 {
26083- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26084+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26085 }
26086
26087 static struct dma_map_ops swiotlb_dma_ops = {
26088diff --git a/arch/x86/kernel/preempt.S b/arch/x86/kernel/preempt.S
26089index ca7f0d5..8996469 100644
26090--- a/arch/x86/kernel/preempt.S
26091+++ b/arch/x86/kernel/preempt.S
26092@@ -3,12 +3,14 @@
26093 #include <asm/dwarf2.h>
26094 #include <asm/asm.h>
26095 #include <asm/calling.h>
26096+#include <asm/alternative-asm.h>
26097
26098 ENTRY(___preempt_schedule)
26099 CFI_STARTPROC
26100 SAVE_ALL
26101 call preempt_schedule
26102 RESTORE_ALL
26103+ pax_force_retaddr
26104 ret
26105 CFI_ENDPROC
26106
26107@@ -19,6 +21,7 @@ ENTRY(___preempt_schedule_context)
26108 SAVE_ALL
26109 call preempt_schedule_context
26110 RESTORE_ALL
26111+ pax_force_retaddr
26112 ret
26113 CFI_ENDPROC
26114
26115diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26116index 4505e2a..ae28b0d 100644
26117--- a/arch/x86/kernel/process.c
26118+++ b/arch/x86/kernel/process.c
26119@@ -36,7 +36,8 @@
26120 * section. Since TSS's are completely CPU-local, we want them
26121 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26122 */
26123-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26124+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26125+EXPORT_SYMBOL(init_tss);
26126
26127 #ifdef CONFIG_X86_64
26128 static DEFINE_PER_CPU(unsigned char, is_idle);
26129@@ -92,7 +93,7 @@ void arch_task_cache_init(void)
26130 task_xstate_cachep =
26131 kmem_cache_create("task_xstate", xstate_size,
26132 __alignof__(union thread_xstate),
26133- SLAB_PANIC | SLAB_NOTRACK, NULL);
26134+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26135 }
26136
26137 /*
26138@@ -105,7 +106,7 @@ void exit_thread(void)
26139 unsigned long *bp = t->io_bitmap_ptr;
26140
26141 if (bp) {
26142- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26143+ struct tss_struct *tss = init_tss + get_cpu();
26144
26145 t->io_bitmap_ptr = NULL;
26146 clear_thread_flag(TIF_IO_BITMAP);
26147@@ -125,6 +126,9 @@ void flush_thread(void)
26148 {
26149 struct task_struct *tsk = current;
26150
26151+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26152+ loadsegment(gs, 0);
26153+#endif
26154 flush_ptrace_hw_breakpoint(tsk);
26155 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26156 drop_init_fpu(tsk);
26157@@ -271,7 +275,7 @@ static void __exit_idle(void)
26158 void exit_idle(void)
26159 {
26160 /* idle loop has pid 0 */
26161- if (current->pid)
26162+ if (task_pid_nr(current))
26163 return;
26164 __exit_idle();
26165 }
26166@@ -324,7 +328,7 @@ bool xen_set_default_idle(void)
26167 return ret;
26168 }
26169 #endif
26170-void stop_this_cpu(void *dummy)
26171+__noreturn void stop_this_cpu(void *dummy)
26172 {
26173 local_irq_disable();
26174 /*
26175@@ -453,16 +457,37 @@ static int __init idle_setup(char *str)
26176 }
26177 early_param("idle", idle_setup);
26178
26179-unsigned long arch_align_stack(unsigned long sp)
26180+#ifdef CONFIG_PAX_RANDKSTACK
26181+void pax_randomize_kstack(struct pt_regs *regs)
26182 {
26183- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26184- sp -= get_random_int() % 8192;
26185- return sp & ~0xf;
26186-}
26187+ struct thread_struct *thread = &current->thread;
26188+ unsigned long time;
26189
26190-unsigned long arch_randomize_brk(struct mm_struct *mm)
26191-{
26192- unsigned long range_end = mm->brk + 0x02000000;
26193- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26194-}
26195+ if (!randomize_va_space)
26196+ return;
26197+
26198+ if (v8086_mode(regs))
26199+ return;
26200
26201+ rdtscl(time);
26202+
26203+ /* P4 seems to return a 0 LSB, ignore it */
26204+#ifdef CONFIG_MPENTIUM4
26205+ time &= 0x3EUL;
26206+ time <<= 2;
26207+#elif defined(CONFIG_X86_64)
26208+ time &= 0xFUL;
26209+ time <<= 4;
26210+#else
26211+ time &= 0x1FUL;
26212+ time <<= 3;
26213+#endif
26214+
26215+ thread->sp0 ^= time;
26216+ load_sp0(init_tss + smp_processor_id(), thread);
26217+
26218+#ifdef CONFIG_X86_64
26219+ this_cpu_write(kernel_stack, thread->sp0);
26220+#endif
26221+}
26222+#endif
26223diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26224index 7bc86bb..0ea06e8 100644
26225--- a/arch/x86/kernel/process_32.c
26226+++ b/arch/x86/kernel/process_32.c
26227@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26228 unsigned long thread_saved_pc(struct task_struct *tsk)
26229 {
26230 return ((unsigned long *)tsk->thread.sp)[3];
26231+//XXX return tsk->thread.eip;
26232 }
26233
26234 void __show_regs(struct pt_regs *regs, int all)
26235@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26236 unsigned long sp;
26237 unsigned short ss, gs;
26238
26239- if (user_mode_vm(regs)) {
26240+ if (user_mode(regs)) {
26241 sp = regs->sp;
26242 ss = regs->ss & 0xffff;
26243- gs = get_user_gs(regs);
26244 } else {
26245 sp = kernel_stack_pointer(regs);
26246 savesegment(ss, ss);
26247- savesegment(gs, gs);
26248 }
26249+ gs = get_user_gs(regs);
26250
26251 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26252 (u16)regs->cs, regs->ip, regs->flags,
26253- smp_processor_id());
26254+ raw_smp_processor_id());
26255 print_symbol("EIP is at %s\n", regs->ip);
26256
26257 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26258@@ -132,20 +132,21 @@ void release_thread(struct task_struct *dead_task)
26259 int copy_thread(unsigned long clone_flags, unsigned long sp,
26260 unsigned long arg, struct task_struct *p)
26261 {
26262- struct pt_regs *childregs = task_pt_regs(p);
26263+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26264 struct task_struct *tsk;
26265 int err;
26266
26267 p->thread.sp = (unsigned long) childregs;
26268 p->thread.sp0 = (unsigned long) (childregs+1);
26269+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26270
26271 if (unlikely(p->flags & PF_KTHREAD)) {
26272 /* kernel thread */
26273 memset(childregs, 0, sizeof(struct pt_regs));
26274 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26275- task_user_gs(p) = __KERNEL_STACK_CANARY;
26276- childregs->ds = __USER_DS;
26277- childregs->es = __USER_DS;
26278+ savesegment(gs, childregs->gs);
26279+ childregs->ds = __KERNEL_DS;
26280+ childregs->es = __KERNEL_DS;
26281 childregs->fs = __KERNEL_PERCPU;
26282 childregs->bx = sp; /* function */
26283 childregs->bp = arg;
26284@@ -252,7 +253,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26285 struct thread_struct *prev = &prev_p->thread,
26286 *next = &next_p->thread;
26287 int cpu = smp_processor_id();
26288- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26289+ struct tss_struct *tss = init_tss + cpu;
26290 fpu_switch_t fpu;
26291
26292 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26293@@ -276,6 +277,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26294 */
26295 lazy_save_gs(prev->gs);
26296
26297+#ifdef CONFIG_PAX_MEMORY_UDEREF
26298+ __set_fs(task_thread_info(next_p)->addr_limit);
26299+#endif
26300+
26301 /*
26302 * Load the per-thread Thread-Local Storage descriptor.
26303 */
26304@@ -314,9 +319,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26305 */
26306 arch_end_context_switch(next_p);
26307
26308- this_cpu_write(kernel_stack,
26309- (unsigned long)task_stack_page(next_p) +
26310- THREAD_SIZE - KERNEL_STACK_OFFSET);
26311+ this_cpu_write(current_task, next_p);
26312+ this_cpu_write(current_tinfo, &next_p->tinfo);
26313+ this_cpu_write(kernel_stack, next->sp0);
26314
26315 /*
26316 * Restore %gs if needed (which is common)
26317@@ -326,8 +331,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26318
26319 switch_fpu_finish(next_p, fpu);
26320
26321- this_cpu_write(current_task, next_p);
26322-
26323 return prev_p;
26324 }
26325
26326@@ -357,4 +360,3 @@ unsigned long get_wchan(struct task_struct *p)
26327 } while (count++ < 16);
26328 return 0;
26329 }
26330-
26331diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26332index 898d077..4c458ff 100644
26333--- a/arch/x86/kernel/process_64.c
26334+++ b/arch/x86/kernel/process_64.c
26335@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26336 struct pt_regs *childregs;
26337 struct task_struct *me = current;
26338
26339- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26340+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26341 childregs = task_pt_regs(p);
26342 p->thread.sp = (unsigned long) childregs;
26343 p->thread.usersp = me->thread.usersp;
26344+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26345 set_tsk_thread_flag(p, TIF_FORK);
26346 p->thread.fpu_counter = 0;
26347 p->thread.io_bitmap_ptr = NULL;
26348@@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26349 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26350 savesegment(es, p->thread.es);
26351 savesegment(ds, p->thread.ds);
26352+ savesegment(ss, p->thread.ss);
26353+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26354 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26355
26356 if (unlikely(p->flags & PF_KTHREAD)) {
26357@@ -280,7 +283,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26358 struct thread_struct *prev = &prev_p->thread;
26359 struct thread_struct *next = &next_p->thread;
26360 int cpu = smp_processor_id();
26361- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26362+ struct tss_struct *tss = init_tss + cpu;
26363 unsigned fsindex, gsindex;
26364 fpu_switch_t fpu;
26365
26366@@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26367 if (unlikely(next->ds | prev->ds))
26368 loadsegment(ds, next->ds);
26369
26370+ savesegment(ss, prev->ss);
26371+ if (unlikely(next->ss != prev->ss))
26372+ loadsegment(ss, next->ss);
26373
26374 /* We must save %fs and %gs before load_TLS() because
26375 * %fs and %gs may be cleared by load_TLS().
26376@@ -362,6 +368,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26377 prev->usersp = this_cpu_read(old_rsp);
26378 this_cpu_write(old_rsp, next->usersp);
26379 this_cpu_write(current_task, next_p);
26380+ this_cpu_write(current_tinfo, &next_p->tinfo);
26381
26382 /*
26383 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26384@@ -371,9 +378,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26385 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26386 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26387
26388- this_cpu_write(kernel_stack,
26389- (unsigned long)task_stack_page(next_p) +
26390- THREAD_SIZE - KERNEL_STACK_OFFSET);
26391+ this_cpu_write(kernel_stack, next->sp0);
26392
26393 /*
26394 * Now maybe reload the debug registers and handle I/O bitmaps
26395@@ -442,12 +447,11 @@ unsigned long get_wchan(struct task_struct *p)
26396 if (!p || p == current || p->state == TASK_RUNNING)
26397 return 0;
26398 stack = (unsigned long)task_stack_page(p);
26399- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26400+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26401 return 0;
26402 fp = *(u64 *)(p->thread.sp);
26403 do {
26404- if (fp < (unsigned long)stack ||
26405- fp >= (unsigned long)stack+THREAD_SIZE)
26406+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26407 return 0;
26408 ip = *(u64 *)(fp+8);
26409 if (!in_sched_functions(ip))
26410diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26411index 678c0ad..2fc2a7b 100644
26412--- a/arch/x86/kernel/ptrace.c
26413+++ b/arch/x86/kernel/ptrace.c
26414@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26415 unsigned long sp = (unsigned long)&regs->sp;
26416 u32 *prev_esp;
26417
26418- if (context == (sp & ~(THREAD_SIZE - 1)))
26419+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26420 return sp;
26421
26422- prev_esp = (u32 *)(context);
26423+ prev_esp = *(u32 **)(context);
26424 if (prev_esp)
26425 return (unsigned long)prev_esp;
26426
26427@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26428 if (child->thread.gs != value)
26429 return do_arch_prctl(child, ARCH_SET_GS, value);
26430 return 0;
26431+
26432+ case offsetof(struct user_regs_struct,ip):
26433+ /*
26434+ * Protect against any attempt to set ip to an
26435+ * impossible address. There are dragons lurking if the
26436+ * address is noncanonical. (This explicitly allows
26437+ * setting ip to TASK_SIZE_MAX, because user code can do
26438+ * that all by itself by running off the end of its
26439+ * address space.
26440+ */
26441+ if (value > TASK_SIZE_MAX)
26442+ return -EIO;
26443+ break;
26444+
26445 #endif
26446 }
26447
26448@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26449 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26450 {
26451 int i;
26452- int dr7 = 0;
26453+ unsigned long dr7 = 0;
26454 struct arch_hw_breakpoint *info;
26455
26456 for (i = 0; i < HBP_NUM; i++) {
26457@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26458 unsigned long addr, unsigned long data)
26459 {
26460 int ret;
26461- unsigned long __user *datap = (unsigned long __user *)data;
26462+ unsigned long __user *datap = (__force unsigned long __user *)data;
26463
26464 switch (request) {
26465 /* read the word at location addr in the USER area. */
26466@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26467 if ((int) addr < 0)
26468 return -EIO;
26469 ret = do_get_thread_area(child, addr,
26470- (struct user_desc __user *)data);
26471+ (__force struct user_desc __user *) data);
26472 break;
26473
26474 case PTRACE_SET_THREAD_AREA:
26475 if ((int) addr < 0)
26476 return -EIO;
26477 ret = do_set_thread_area(child, addr,
26478- (struct user_desc __user *)data, 0);
26479+ (__force struct user_desc __user *) data, 0);
26480 break;
26481 #endif
26482
26483@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26484
26485 #ifdef CONFIG_X86_64
26486
26487-static struct user_regset x86_64_regsets[] __read_mostly = {
26488+static user_regset_no_const x86_64_regsets[] __read_only = {
26489 [REGSET_GENERAL] = {
26490 .core_note_type = NT_PRSTATUS,
26491 .n = sizeof(struct user_regs_struct) / sizeof(long),
26492@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26493 #endif /* CONFIG_X86_64 */
26494
26495 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26496-static struct user_regset x86_32_regsets[] __read_mostly = {
26497+static user_regset_no_const x86_32_regsets[] __read_only = {
26498 [REGSET_GENERAL] = {
26499 .core_note_type = NT_PRSTATUS,
26500 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26501@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26502 */
26503 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26504
26505-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26506+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26507 {
26508 #ifdef CONFIG_X86_64
26509 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26510@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26511 memset(info, 0, sizeof(*info));
26512 info->si_signo = SIGTRAP;
26513 info->si_code = si_code;
26514- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26515+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26516 }
26517
26518 void user_single_step_siginfo(struct task_struct *tsk,
26519@@ -1450,6 +1464,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
26520 # define IS_IA32 0
26521 #endif
26522
26523+#ifdef CONFIG_GRKERNSEC_SETXID
26524+extern void gr_delayed_cred_worker(void);
26525+#endif
26526+
26527 /*
26528 * We must return the syscall number to actually look up in the table.
26529 * This can be -1L to skip running any syscall at all.
26530@@ -1460,6 +1478,11 @@ long syscall_trace_enter(struct pt_regs *regs)
26531
26532 user_exit();
26533
26534+#ifdef CONFIG_GRKERNSEC_SETXID
26535+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26536+ gr_delayed_cred_worker();
26537+#endif
26538+
26539 /*
26540 * If we stepped into a sysenter/syscall insn, it trapped in
26541 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26542@@ -1515,6 +1538,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26543 */
26544 user_exit();
26545
26546+#ifdef CONFIG_GRKERNSEC_SETXID
26547+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26548+ gr_delayed_cred_worker();
26549+#endif
26550+
26551 audit_syscall_exit(regs);
26552
26553 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26554diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26555index 2f355d2..e75ed0a 100644
26556--- a/arch/x86/kernel/pvclock.c
26557+++ b/arch/x86/kernel/pvclock.c
26558@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26559 reset_hung_task_detector();
26560 }
26561
26562-static atomic64_t last_value = ATOMIC64_INIT(0);
26563+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26564
26565 void pvclock_resume(void)
26566 {
26567- atomic64_set(&last_value, 0);
26568+ atomic64_set_unchecked(&last_value, 0);
26569 }
26570
26571 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26572@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26573 * updating at the same time, and one of them could be slightly behind,
26574 * making the assumption that last_value always go forward fail to hold.
26575 */
26576- last = atomic64_read(&last_value);
26577+ last = atomic64_read_unchecked(&last_value);
26578 do {
26579 if (ret < last)
26580 return last;
26581- last = atomic64_cmpxchg(&last_value, last, ret);
26582+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26583 } while (unlikely(last != ret));
26584
26585 return ret;
26586diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26587index 52b1157..c6e67c4 100644
26588--- a/arch/x86/kernel/reboot.c
26589+++ b/arch/x86/kernel/reboot.c
26590@@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26591
26592 void __noreturn machine_real_restart(unsigned int type)
26593 {
26594+
26595+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26596+ struct desc_struct *gdt;
26597+#endif
26598+
26599 local_irq_disable();
26600
26601 /*
26602@@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
26603
26604 /* Jump to the identity-mapped low memory code */
26605 #ifdef CONFIG_X86_32
26606- asm volatile("jmpl *%0" : :
26607+
26608+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26609+ gdt = get_cpu_gdt_table(smp_processor_id());
26610+ pax_open_kernel();
26611+#ifdef CONFIG_PAX_MEMORY_UDEREF
26612+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26613+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26614+ loadsegment(ds, __KERNEL_DS);
26615+ loadsegment(es, __KERNEL_DS);
26616+ loadsegment(ss, __KERNEL_DS);
26617+#endif
26618+#ifdef CONFIG_PAX_KERNEXEC
26619+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26620+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26621+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26622+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26623+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26624+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26625+#endif
26626+ pax_close_kernel();
26627+#endif
26628+
26629+ asm volatile("ljmpl *%0" : :
26630 "rm" (real_mode_header->machine_real_restart_asm),
26631 "a" (type));
26632 #else
26633@@ -486,7 +513,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26634 * This means that this function can never return, it can misbehave
26635 * by not rebooting properly and hanging.
26636 */
26637-static void native_machine_emergency_restart(void)
26638+static void __noreturn native_machine_emergency_restart(void)
26639 {
26640 int i;
26641 int attempt = 0;
26642@@ -610,13 +637,13 @@ void native_machine_shutdown(void)
26643 #endif
26644 }
26645
26646-static void __machine_emergency_restart(int emergency)
26647+static void __noreturn __machine_emergency_restart(int emergency)
26648 {
26649 reboot_emergency = emergency;
26650 machine_ops.emergency_restart();
26651 }
26652
26653-static void native_machine_restart(char *__unused)
26654+static void __noreturn native_machine_restart(char *__unused)
26655 {
26656 pr_notice("machine restart\n");
26657
26658@@ -625,7 +652,7 @@ static void native_machine_restart(char *__unused)
26659 __machine_emergency_restart(0);
26660 }
26661
26662-static void native_machine_halt(void)
26663+static void __noreturn native_machine_halt(void)
26664 {
26665 /* Stop other cpus and apics */
26666 machine_shutdown();
26667@@ -635,7 +662,7 @@ static void native_machine_halt(void)
26668 stop_this_cpu(NULL);
26669 }
26670
26671-static void native_machine_power_off(void)
26672+static void __noreturn native_machine_power_off(void)
26673 {
26674 if (pm_power_off) {
26675 if (!reboot_force)
26676@@ -644,9 +671,10 @@ static void native_machine_power_off(void)
26677 }
26678 /* A fallback in case there is no PM info available */
26679 tboot_shutdown(TB_SHUTDOWN_HALT);
26680+ unreachable();
26681 }
26682
26683-struct machine_ops machine_ops = {
26684+struct machine_ops machine_ops __read_only = {
26685 .power_off = native_machine_power_off,
26686 .shutdown = native_machine_shutdown,
26687 .emergency_restart = native_machine_emergency_restart,
26688diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
26689index c8e41e9..64049ef 100644
26690--- a/arch/x86/kernel/reboot_fixups_32.c
26691+++ b/arch/x86/kernel/reboot_fixups_32.c
26692@@ -57,7 +57,7 @@ struct device_fixup {
26693 unsigned int vendor;
26694 unsigned int device;
26695 void (*reboot_fixup)(struct pci_dev *);
26696-};
26697+} __do_const;
26698
26699 /*
26700 * PCI ids solely used for fixups_table go here
26701diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
26702index 3fd2c69..a444264 100644
26703--- a/arch/x86/kernel/relocate_kernel_64.S
26704+++ b/arch/x86/kernel/relocate_kernel_64.S
26705@@ -96,8 +96,7 @@ relocate_kernel:
26706
26707 /* jump to identity mapped page */
26708 addq $(identity_mapped - relocate_kernel), %r8
26709- pushq %r8
26710- ret
26711+ jmp *%r8
26712
26713 identity_mapped:
26714 /* set return address to 0 if not preserving context */
26715diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
26716index 09c76d2..7f33fc2 100644
26717--- a/arch/x86/kernel/setup.c
26718+++ b/arch/x86/kernel/setup.c
26719@@ -110,6 +110,7 @@
26720 #include <asm/mce.h>
26721 #include <asm/alternative.h>
26722 #include <asm/prom.h>
26723+#include <asm/boot.h>
26724
26725 /*
26726 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
26727@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
26728 #endif
26729
26730
26731-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
26732-__visible unsigned long mmu_cr4_features;
26733+#ifdef CONFIG_X86_64
26734+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
26735+#elif defined(CONFIG_X86_PAE)
26736+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
26737 #else
26738-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
26739+__visible unsigned long mmu_cr4_features __read_only;
26740 #endif
26741
26742+void set_in_cr4(unsigned long mask)
26743+{
26744+ unsigned long cr4 = read_cr4();
26745+
26746+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
26747+ return;
26748+
26749+ pax_open_kernel();
26750+ mmu_cr4_features |= mask;
26751+ pax_close_kernel();
26752+
26753+ if (trampoline_cr4_features)
26754+ *trampoline_cr4_features = mmu_cr4_features;
26755+ cr4 |= mask;
26756+ write_cr4(cr4);
26757+}
26758+EXPORT_SYMBOL(set_in_cr4);
26759+
26760+void clear_in_cr4(unsigned long mask)
26761+{
26762+ unsigned long cr4 = read_cr4();
26763+
26764+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
26765+ return;
26766+
26767+ pax_open_kernel();
26768+ mmu_cr4_features &= ~mask;
26769+ pax_close_kernel();
26770+
26771+ if (trampoline_cr4_features)
26772+ *trampoline_cr4_features = mmu_cr4_features;
26773+ cr4 &= ~mask;
26774+ write_cr4(cr4);
26775+}
26776+EXPORT_SYMBOL(clear_in_cr4);
26777+
26778 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
26779 int bootloader_type, bootloader_version;
26780
26781@@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
26782 * area (640->1Mb) as ram even though it is not.
26783 * take them out.
26784 */
26785- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
26786+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
26787
26788 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
26789 }
26790@@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
26791 /* called before trim_bios_range() to spare extra sanitize */
26792 static void __init e820_add_kernel_range(void)
26793 {
26794- u64 start = __pa_symbol(_text);
26795+ u64 start = __pa_symbol(ktla_ktva(_text));
26796 u64 size = __pa_symbol(_end) - start;
26797
26798 /*
26799@@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
26800
26801 void __init setup_arch(char **cmdline_p)
26802 {
26803+#ifdef CONFIG_X86_32
26804+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
26805+#else
26806 memblock_reserve(__pa_symbol(_text),
26807 (unsigned long)__bss_stop - (unsigned long)_text);
26808+#endif
26809
26810 early_reserve_initrd();
26811
26812@@ -946,14 +989,14 @@ void __init setup_arch(char **cmdline_p)
26813
26814 if (!boot_params.hdr.root_flags)
26815 root_mountflags &= ~MS_RDONLY;
26816- init_mm.start_code = (unsigned long) _text;
26817- init_mm.end_code = (unsigned long) _etext;
26818+ init_mm.start_code = ktla_ktva((unsigned long) _text);
26819+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
26820 init_mm.end_data = (unsigned long) _edata;
26821 init_mm.brk = _brk_end;
26822
26823- code_resource.start = __pa_symbol(_text);
26824- code_resource.end = __pa_symbol(_etext)-1;
26825- data_resource.start = __pa_symbol(_etext);
26826+ code_resource.start = __pa_symbol(ktla_ktva(_text));
26827+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
26828+ data_resource.start = __pa_symbol(_sdata);
26829 data_resource.end = __pa_symbol(_edata)-1;
26830 bss_resource.start = __pa_symbol(__bss_start);
26831 bss_resource.end = __pa_symbol(__bss_stop)-1;
26832diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
26833index 5cdff03..80fa283 100644
26834--- a/arch/x86/kernel/setup_percpu.c
26835+++ b/arch/x86/kernel/setup_percpu.c
26836@@ -21,19 +21,17 @@
26837 #include <asm/cpu.h>
26838 #include <asm/stackprotector.h>
26839
26840-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
26841+#ifdef CONFIG_SMP
26842+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
26843 EXPORT_PER_CPU_SYMBOL(cpu_number);
26844+#endif
26845
26846-#ifdef CONFIG_X86_64
26847 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
26848-#else
26849-#define BOOT_PERCPU_OFFSET 0
26850-#endif
26851
26852 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
26853 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
26854
26855-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
26856+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
26857 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
26858 };
26859 EXPORT_SYMBOL(__per_cpu_offset);
26860@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
26861 {
26862 #ifdef CONFIG_NEED_MULTIPLE_NODES
26863 pg_data_t *last = NULL;
26864- unsigned int cpu;
26865+ int cpu;
26866
26867 for_each_possible_cpu(cpu) {
26868 int node = early_cpu_to_node(cpu);
26869@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
26870 {
26871 #ifdef CONFIG_X86_32
26872 struct desc_struct gdt;
26873+ unsigned long base = per_cpu_offset(cpu);
26874
26875- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
26876- 0x2 | DESCTYPE_S, 0x8);
26877- gdt.s = 1;
26878+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
26879+ 0x83 | DESCTYPE_S, 0xC);
26880 write_gdt_entry(get_cpu_gdt_table(cpu),
26881 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
26882 #endif
26883@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
26884 /* alrighty, percpu areas up and running */
26885 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
26886 for_each_possible_cpu(cpu) {
26887+#ifdef CONFIG_CC_STACKPROTECTOR
26888+#ifdef CONFIG_X86_32
26889+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
26890+#endif
26891+#endif
26892 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
26893 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
26894 per_cpu(cpu_number, cpu) = cpu;
26895@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
26896 */
26897 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
26898 #endif
26899+#ifdef CONFIG_CC_STACKPROTECTOR
26900+#ifdef CONFIG_X86_32
26901+ if (!cpu)
26902+ per_cpu(stack_canary.canary, cpu) = canary;
26903+#endif
26904+#endif
26905 /*
26906 * Up to this point, the boot CPU has been using .init.data
26907 * area. Reload any changed state for the boot CPU.
26908diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
26909index 9e5de68..16c53cb 100644
26910--- a/arch/x86/kernel/signal.c
26911+++ b/arch/x86/kernel/signal.c
26912@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
26913 * Align the stack pointer according to the i386 ABI,
26914 * i.e. so that on function entry ((sp + 4) & 15) == 0.
26915 */
26916- sp = ((sp + 4) & -16ul) - 4;
26917+ sp = ((sp - 12) & -16ul) - 4;
26918 #else /* !CONFIG_X86_32 */
26919 sp = round_down(sp, 16) - 8;
26920 #endif
26921@@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26922 }
26923
26924 if (current->mm->context.vdso)
26925- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26926+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
26927 else
26928- restorer = &frame->retcode;
26929+ restorer = (void __user *)&frame->retcode;
26930 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26931 restorer = ksig->ka.sa.sa_restorer;
26932
26933@@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
26934 * reasons and because gdb uses it as a signature to notice
26935 * signal handler stack frames.
26936 */
26937- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
26938+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
26939
26940 if (err)
26941 return -EFAULT;
26942@@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26943 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
26944
26945 /* Set up to return from userspace. */
26946- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26947+ if (current->mm->context.vdso)
26948+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
26949+ else
26950+ restorer = (void __user *)&frame->retcode;
26951 if (ksig->ka.sa.sa_flags & SA_RESTORER)
26952 restorer = ksig->ka.sa.sa_restorer;
26953 put_user_ex(restorer, &frame->pretcode);
26954@@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
26955 * reasons and because gdb uses it as a signature to notice
26956 * signal handler stack frames.
26957 */
26958- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
26959+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
26960 } put_user_catch(err);
26961
26962 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
26963@@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26964 {
26965 int usig = signr_convert(ksig->sig);
26966 sigset_t *set = sigmask_to_save();
26967- compat_sigset_t *cset = (compat_sigset_t *) set;
26968+ sigset_t sigcopy;
26969+ compat_sigset_t *cset;
26970+
26971+ sigcopy = *set;
26972+
26973+ cset = (compat_sigset_t *) &sigcopy;
26974
26975 /* Set up the stack frame */
26976 if (is_ia32_frame()) {
26977@@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
26978 } else if (is_x32_frame()) {
26979 return x32_setup_rt_frame(ksig, cset, regs);
26980 } else {
26981- return __setup_rt_frame(ksig->sig, ksig, set, regs);
26982+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
26983 }
26984 }
26985
26986diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
26987index be8e1bd..a3d93fa 100644
26988--- a/arch/x86/kernel/smp.c
26989+++ b/arch/x86/kernel/smp.c
26990@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
26991
26992 __setup("nonmi_ipi", nonmi_ipi_setup);
26993
26994-struct smp_ops smp_ops = {
26995+struct smp_ops smp_ops __read_only = {
26996 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
26997 .smp_prepare_cpus = native_smp_prepare_cpus,
26998 .smp_cpus_done = native_smp_cpus_done,
26999diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27000index ae2fd975..c0c8d10 100644
27001--- a/arch/x86/kernel/smpboot.c
27002+++ b/arch/x86/kernel/smpboot.c
27003@@ -230,14 +230,17 @@ static void notrace start_secondary(void *unused)
27004
27005 enable_start_cpu0 = 0;
27006
27007-#ifdef CONFIG_X86_32
27008+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27009+ barrier();
27010+
27011 /* switch away from the initial page table */
27012+#ifdef CONFIG_PAX_PER_CPU_PGD
27013+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27014+#else
27015 load_cr3(swapper_pg_dir);
27016+#endif
27017 __flush_tlb_all();
27018-#endif
27019
27020- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27021- barrier();
27022 /*
27023 * Check TSC synchronization with the BP:
27024 */
27025@@ -757,8 +760,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27026 alternatives_enable_smp();
27027
27028 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27029- (THREAD_SIZE + task_stack_page(idle))) - 1);
27030+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27031 per_cpu(current_task, cpu) = idle;
27032+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27033
27034 #ifdef CONFIG_X86_32
27035 /* Stack for startup_32 can be just as for start_secondary onwards */
27036@@ -767,10 +771,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27037 clear_tsk_thread_flag(idle, TIF_FORK);
27038 initial_gs = per_cpu_offset(cpu);
27039 #endif
27040- per_cpu(kernel_stack, cpu) =
27041- (unsigned long)task_stack_page(idle) -
27042- KERNEL_STACK_OFFSET + THREAD_SIZE;
27043+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27044+ pax_open_kernel();
27045 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27046+ pax_close_kernel();
27047 initial_code = (unsigned long)start_secondary;
27048 stack_start = idle->thread.sp;
27049
27050@@ -916,6 +920,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27051 /* the FPU context is blank, nobody can own it */
27052 __cpu_disable_lazy_restore(cpu);
27053
27054+#ifdef CONFIG_PAX_PER_CPU_PGD
27055+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27056+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27057+ KERNEL_PGD_PTRS);
27058+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27059+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27060+ KERNEL_PGD_PTRS);
27061+#endif
27062+
27063 err = do_boot_cpu(apicid, cpu, tidle);
27064 if (err) {
27065 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27066diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27067index 9b4d51d..5d28b58 100644
27068--- a/arch/x86/kernel/step.c
27069+++ b/arch/x86/kernel/step.c
27070@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27071 struct desc_struct *desc;
27072 unsigned long base;
27073
27074- seg &= ~7UL;
27075+ seg >>= 3;
27076
27077 mutex_lock(&child->mm->context.lock);
27078- if (unlikely((seg >> 3) >= child->mm->context.size))
27079+ if (unlikely(seg >= child->mm->context.size))
27080 addr = -1L; /* bogus selector, access would fault */
27081 else {
27082 desc = child->mm->context.ldt + seg;
27083@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27084 addr += base;
27085 }
27086 mutex_unlock(&child->mm->context.lock);
27087- }
27088+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27089+ addr = ktla_ktva(addr);
27090
27091 return addr;
27092 }
27093@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27094 unsigned char opcode[15];
27095 unsigned long addr = convert_ip_to_linear(child, regs);
27096
27097+ if (addr == -EINVAL)
27098+ return 0;
27099+
27100 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27101 for (i = 0; i < copied; i++) {
27102 switch (opcode[i]) {
27103diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27104new file mode 100644
27105index 0000000..5877189
27106--- /dev/null
27107+++ b/arch/x86/kernel/sys_i386_32.c
27108@@ -0,0 +1,189 @@
27109+/*
27110+ * This file contains various random system calls that
27111+ * have a non-standard calling sequence on the Linux/i386
27112+ * platform.
27113+ */
27114+
27115+#include <linux/errno.h>
27116+#include <linux/sched.h>
27117+#include <linux/mm.h>
27118+#include <linux/fs.h>
27119+#include <linux/smp.h>
27120+#include <linux/sem.h>
27121+#include <linux/msg.h>
27122+#include <linux/shm.h>
27123+#include <linux/stat.h>
27124+#include <linux/syscalls.h>
27125+#include <linux/mman.h>
27126+#include <linux/file.h>
27127+#include <linux/utsname.h>
27128+#include <linux/ipc.h>
27129+#include <linux/elf.h>
27130+
27131+#include <linux/uaccess.h>
27132+#include <linux/unistd.h>
27133+
27134+#include <asm/syscalls.h>
27135+
27136+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27137+{
27138+ unsigned long pax_task_size = TASK_SIZE;
27139+
27140+#ifdef CONFIG_PAX_SEGMEXEC
27141+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27142+ pax_task_size = SEGMEXEC_TASK_SIZE;
27143+#endif
27144+
27145+ if (flags & MAP_FIXED)
27146+ if (len > pax_task_size || addr > pax_task_size - len)
27147+ return -EINVAL;
27148+
27149+ return 0;
27150+}
27151+
27152+/*
27153+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27154+ */
27155+static unsigned long get_align_mask(void)
27156+{
27157+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27158+ return 0;
27159+
27160+ if (!(current->flags & PF_RANDOMIZE))
27161+ return 0;
27162+
27163+ return va_align.mask;
27164+}
27165+
27166+unsigned long
27167+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27168+ unsigned long len, unsigned long pgoff, unsigned long flags)
27169+{
27170+ struct mm_struct *mm = current->mm;
27171+ struct vm_area_struct *vma;
27172+ unsigned long pax_task_size = TASK_SIZE;
27173+ struct vm_unmapped_area_info info;
27174+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27175+
27176+#ifdef CONFIG_PAX_SEGMEXEC
27177+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27178+ pax_task_size = SEGMEXEC_TASK_SIZE;
27179+#endif
27180+
27181+ pax_task_size -= PAGE_SIZE;
27182+
27183+ if (len > pax_task_size)
27184+ return -ENOMEM;
27185+
27186+ if (flags & MAP_FIXED)
27187+ return addr;
27188+
27189+#ifdef CONFIG_PAX_RANDMMAP
27190+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27191+#endif
27192+
27193+ if (addr) {
27194+ addr = PAGE_ALIGN(addr);
27195+ if (pax_task_size - len >= addr) {
27196+ vma = find_vma(mm, addr);
27197+ if (check_heap_stack_gap(vma, addr, len, offset))
27198+ return addr;
27199+ }
27200+ }
27201+
27202+ info.flags = 0;
27203+ info.length = len;
27204+ info.align_mask = filp ? get_align_mask() : 0;
27205+ info.align_offset = pgoff << PAGE_SHIFT;
27206+ info.threadstack_offset = offset;
27207+
27208+#ifdef CONFIG_PAX_PAGEEXEC
27209+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27210+ info.low_limit = 0x00110000UL;
27211+ info.high_limit = mm->start_code;
27212+
27213+#ifdef CONFIG_PAX_RANDMMAP
27214+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27215+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27216+#endif
27217+
27218+ if (info.low_limit < info.high_limit) {
27219+ addr = vm_unmapped_area(&info);
27220+ if (!IS_ERR_VALUE(addr))
27221+ return addr;
27222+ }
27223+ } else
27224+#endif
27225+
27226+ info.low_limit = mm->mmap_base;
27227+ info.high_limit = pax_task_size;
27228+
27229+ return vm_unmapped_area(&info);
27230+}
27231+
27232+unsigned long
27233+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27234+ const unsigned long len, const unsigned long pgoff,
27235+ const unsigned long flags)
27236+{
27237+ struct vm_area_struct *vma;
27238+ struct mm_struct *mm = current->mm;
27239+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27240+ struct vm_unmapped_area_info info;
27241+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27242+
27243+#ifdef CONFIG_PAX_SEGMEXEC
27244+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27245+ pax_task_size = SEGMEXEC_TASK_SIZE;
27246+#endif
27247+
27248+ pax_task_size -= PAGE_SIZE;
27249+
27250+ /* requested length too big for entire address space */
27251+ if (len > pax_task_size)
27252+ return -ENOMEM;
27253+
27254+ if (flags & MAP_FIXED)
27255+ return addr;
27256+
27257+#ifdef CONFIG_PAX_PAGEEXEC
27258+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27259+ goto bottomup;
27260+#endif
27261+
27262+#ifdef CONFIG_PAX_RANDMMAP
27263+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27264+#endif
27265+
27266+ /* requesting a specific address */
27267+ if (addr) {
27268+ addr = PAGE_ALIGN(addr);
27269+ if (pax_task_size - len >= addr) {
27270+ vma = find_vma(mm, addr);
27271+ if (check_heap_stack_gap(vma, addr, len, offset))
27272+ return addr;
27273+ }
27274+ }
27275+
27276+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27277+ info.length = len;
27278+ info.low_limit = PAGE_SIZE;
27279+ info.high_limit = mm->mmap_base;
27280+ info.align_mask = filp ? get_align_mask() : 0;
27281+ info.align_offset = pgoff << PAGE_SHIFT;
27282+ info.threadstack_offset = offset;
27283+
27284+ addr = vm_unmapped_area(&info);
27285+ if (!(addr & ~PAGE_MASK))
27286+ return addr;
27287+ VM_BUG_ON(addr != -ENOMEM);
27288+
27289+bottomup:
27290+ /*
27291+ * A failed mmap() very likely causes application failure,
27292+ * so fall back to the bottom-up function here. This scenario
27293+ * can happen with large stack limits and large mmap()
27294+ * allocations.
27295+ */
27296+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27297+}
27298diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27299index 30277e2..5664a29 100644
27300--- a/arch/x86/kernel/sys_x86_64.c
27301+++ b/arch/x86/kernel/sys_x86_64.c
27302@@ -81,8 +81,8 @@ out:
27303 return error;
27304 }
27305
27306-static void find_start_end(unsigned long flags, unsigned long *begin,
27307- unsigned long *end)
27308+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27309+ unsigned long *begin, unsigned long *end)
27310 {
27311 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27312 unsigned long new_begin;
27313@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27314 *begin = new_begin;
27315 }
27316 } else {
27317- *begin = current->mm->mmap_legacy_base;
27318+ *begin = mm->mmap_legacy_base;
27319 *end = TASK_SIZE;
27320 }
27321 }
27322@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27323 struct vm_area_struct *vma;
27324 struct vm_unmapped_area_info info;
27325 unsigned long begin, end;
27326+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27327
27328 if (flags & MAP_FIXED)
27329 return addr;
27330
27331- find_start_end(flags, &begin, &end);
27332+ find_start_end(mm, flags, &begin, &end);
27333
27334 if (len > end)
27335 return -ENOMEM;
27336
27337+#ifdef CONFIG_PAX_RANDMMAP
27338+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27339+#endif
27340+
27341 if (addr) {
27342 addr = PAGE_ALIGN(addr);
27343 vma = find_vma(mm, addr);
27344- if (end - len >= addr &&
27345- (!vma || addr + len <= vma->vm_start))
27346+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27347 return addr;
27348 }
27349
27350@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27351 info.high_limit = end;
27352 info.align_mask = filp ? get_align_mask() : 0;
27353 info.align_offset = pgoff << PAGE_SHIFT;
27354+ info.threadstack_offset = offset;
27355 return vm_unmapped_area(&info);
27356 }
27357
27358@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27359 struct mm_struct *mm = current->mm;
27360 unsigned long addr = addr0;
27361 struct vm_unmapped_area_info info;
27362+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27363
27364 /* requested length too big for entire address space */
27365 if (len > TASK_SIZE)
27366@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27367 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27368 goto bottomup;
27369
27370+#ifdef CONFIG_PAX_RANDMMAP
27371+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27372+#endif
27373+
27374 /* requesting a specific address */
27375 if (addr) {
27376 addr = PAGE_ALIGN(addr);
27377 vma = find_vma(mm, addr);
27378- if (TASK_SIZE - len >= addr &&
27379- (!vma || addr + len <= vma->vm_start))
27380+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27381 return addr;
27382 }
27383
27384@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27385 info.high_limit = mm->mmap_base;
27386 info.align_mask = filp ? get_align_mask() : 0;
27387 info.align_offset = pgoff << PAGE_SHIFT;
27388+ info.threadstack_offset = offset;
27389 addr = vm_unmapped_area(&info);
27390 if (!(addr & ~PAGE_MASK))
27391 return addr;
27392diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27393index 91a4496..bb87552 100644
27394--- a/arch/x86/kernel/tboot.c
27395+++ b/arch/x86/kernel/tboot.c
27396@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27397
27398 void tboot_shutdown(u32 shutdown_type)
27399 {
27400- void (*shutdown)(void);
27401+ void (* __noreturn shutdown)(void);
27402
27403 if (!tboot_enabled())
27404 return;
27405@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27406
27407 switch_to_tboot_pt();
27408
27409- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27410+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27411 shutdown();
27412
27413 /* should not reach here */
27414@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27415 return -ENODEV;
27416 }
27417
27418-static atomic_t ap_wfs_count;
27419+static atomic_unchecked_t ap_wfs_count;
27420
27421 static int tboot_wait_for_aps(int num_aps)
27422 {
27423@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27424 {
27425 switch (action) {
27426 case CPU_DYING:
27427- atomic_inc(&ap_wfs_count);
27428+ atomic_inc_unchecked(&ap_wfs_count);
27429 if (num_online_cpus() == 1)
27430- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27431+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27432 return NOTIFY_BAD;
27433 break;
27434 }
27435@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27436
27437 tboot_create_trampoline();
27438
27439- atomic_set(&ap_wfs_count, 0);
27440+ atomic_set_unchecked(&ap_wfs_count, 0);
27441 register_hotcpu_notifier(&tboot_cpu_notifier);
27442
27443 #ifdef CONFIG_DEBUG_FS
27444diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27445index bf7ef5c..59d0ac9 100644
27446--- a/arch/x86/kernel/time.c
27447+++ b/arch/x86/kernel/time.c
27448@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27449 {
27450 unsigned long pc = instruction_pointer(regs);
27451
27452- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27453+ if (!user_mode(regs) && in_lock_functions(pc)) {
27454 #ifdef CONFIG_FRAME_POINTER
27455- return *(unsigned long *)(regs->bp + sizeof(long));
27456+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27457 #else
27458 unsigned long *sp =
27459 (unsigned long *)kernel_stack_pointer(regs);
27460@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27461 * or above a saved flags. Eflags has bits 22-31 zero,
27462 * kernel addresses don't.
27463 */
27464+
27465+#ifdef CONFIG_PAX_KERNEXEC
27466+ return ktla_ktva(sp[0]);
27467+#else
27468 if (sp[0] >> 22)
27469 return sp[0];
27470 if (sp[1] >> 22)
27471 return sp[1];
27472 #endif
27473+
27474+#endif
27475 }
27476 return pc;
27477 }
27478diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27479index f7fec09..9991981 100644
27480--- a/arch/x86/kernel/tls.c
27481+++ b/arch/x86/kernel/tls.c
27482@@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27483 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27484 return -EINVAL;
27485
27486+#ifdef CONFIG_PAX_SEGMEXEC
27487+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27488+ return -EINVAL;
27489+#endif
27490+
27491 set_tls_desc(p, idx, &info, 1);
27492
27493 return 0;
27494@@ -200,7 +205,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27495
27496 if (kbuf)
27497 info = kbuf;
27498- else if (__copy_from_user(infobuf, ubuf, count))
27499+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27500 return -EFAULT;
27501 else
27502 info = infobuf;
27503diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27504index 1c113db..287b42e 100644
27505--- a/arch/x86/kernel/tracepoint.c
27506+++ b/arch/x86/kernel/tracepoint.c
27507@@ -9,11 +9,11 @@
27508 #include <linux/atomic.h>
27509
27510 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27511-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27512+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27513 (unsigned long) trace_idt_table };
27514
27515 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27516-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27517+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27518
27519 static int trace_irq_vector_refcount;
27520 static DEFINE_MUTEX(irq_vector_mutex);
27521diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27522index f73b5d4..0adcc9a 100644
27523--- a/arch/x86/kernel/traps.c
27524+++ b/arch/x86/kernel/traps.c
27525@@ -66,7 +66,7 @@
27526 #include <asm/proto.h>
27527
27528 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27529-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27530+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27531 #else
27532 #include <asm/processor-flags.h>
27533 #include <asm/setup.h>
27534@@ -75,7 +75,7 @@ asmlinkage int system_call(void);
27535 #endif
27536
27537 /* Must be page-aligned because the real IDT is used in a fixmap. */
27538-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27539+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27540
27541 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27542 EXPORT_SYMBOL_GPL(used_vectors);
27543@@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27544 }
27545
27546 static int __kprobes
27547-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27548+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27549 struct pt_regs *regs, long error_code)
27550 {
27551 #ifdef CONFIG_X86_32
27552- if (regs->flags & X86_VM_MASK) {
27553+ if (v8086_mode(regs)) {
27554 /*
27555 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27556 * On nmi (interrupt 2), do_trap should not be called.
27557@@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27558 return -1;
27559 }
27560 #endif
27561- if (!user_mode(regs)) {
27562+ if (!user_mode_novm(regs)) {
27563 if (!fixup_exception(regs)) {
27564 tsk->thread.error_code = error_code;
27565 tsk->thread.trap_nr = trapnr;
27566+
27567+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27568+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27569+ str = "PAX: suspicious stack segment fault";
27570+#endif
27571+
27572 die(str, regs, error_code);
27573 }
27574+
27575+#ifdef CONFIG_PAX_REFCOUNT
27576+ if (trapnr == X86_TRAP_OF)
27577+ pax_report_refcount_overflow(regs);
27578+#endif
27579+
27580 return 0;
27581 }
27582
27583@@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27584 }
27585
27586 static void __kprobes
27587-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27588+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27589 long error_code, siginfo_t *info)
27590 {
27591 struct task_struct *tsk = current;
27592@@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27593 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27594 printk_ratelimit()) {
27595 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27596- tsk->comm, tsk->pid, str,
27597+ tsk->comm, task_pid_nr(tsk), str,
27598 regs->ip, regs->sp, error_code);
27599 print_vma_addr(" in ", regs->ip);
27600 pr_cont("\n");
27601@@ -251,6 +263,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27602 tsk->thread.error_code = error_code;
27603 tsk->thread.trap_nr = X86_TRAP_DF;
27604
27605+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27606+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27607+ die("grsec: kernel stack overflow detected", regs, error_code);
27608+#endif
27609+
27610 #ifdef CONFIG_DOUBLEFAULT
27611 df_debug(regs, error_code);
27612 #endif
27613@@ -273,7 +290,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27614 conditional_sti(regs);
27615
27616 #ifdef CONFIG_X86_32
27617- if (regs->flags & X86_VM_MASK) {
27618+ if (v8086_mode(regs)) {
27619 local_irq_enable();
27620 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27621 goto exit;
27622@@ -281,18 +298,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27623 #endif
27624
27625 tsk = current;
27626- if (!user_mode(regs)) {
27627+ if (!user_mode_novm(regs)) {
27628 if (fixup_exception(regs))
27629 goto exit;
27630
27631 tsk->thread.error_code = error_code;
27632 tsk->thread.trap_nr = X86_TRAP_GP;
27633 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27634- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27635+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27636+
27637+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27638+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27639+ die("PAX: suspicious general protection fault", regs, error_code);
27640+ else
27641+#endif
27642+
27643 die("general protection fault", regs, error_code);
27644+ }
27645 goto exit;
27646 }
27647
27648+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27649+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27650+ struct mm_struct *mm = tsk->mm;
27651+ unsigned long limit;
27652+
27653+ down_write(&mm->mmap_sem);
27654+ limit = mm->context.user_cs_limit;
27655+ if (limit < TASK_SIZE) {
27656+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27657+ up_write(&mm->mmap_sem);
27658+ return;
27659+ }
27660+ up_write(&mm->mmap_sem);
27661+ }
27662+#endif
27663+
27664 tsk->thread.error_code = error_code;
27665 tsk->thread.trap_nr = X86_TRAP_GP;
27666
27667@@ -453,7 +494,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
27668 /* It's safe to allow irq's after DR6 has been saved */
27669 preempt_conditional_sti(regs);
27670
27671- if (regs->flags & X86_VM_MASK) {
27672+ if (v8086_mode(regs)) {
27673 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
27674 X86_TRAP_DB);
27675 preempt_conditional_cli(regs);
27676@@ -468,7 +509,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
27677 * We already checked v86 mode above, so we can check for kernel mode
27678 * by just checking the CPL of CS.
27679 */
27680- if ((dr6 & DR_STEP) && !user_mode(regs)) {
27681+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
27682 tsk->thread.debugreg6 &= ~DR_STEP;
27683 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
27684 regs->flags &= ~X86_EFLAGS_TF;
27685@@ -500,7 +541,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
27686 return;
27687 conditional_sti(regs);
27688
27689- if (!user_mode_vm(regs))
27690+ if (!user_mode(regs))
27691 {
27692 if (!fixup_exception(regs)) {
27693 task->thread.error_code = error_code;
27694diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
27695index 57e5ce1..20b0040 100644
27696--- a/arch/x86/kernel/tsc.c
27697+++ b/arch/x86/kernel/tsc.c
27698@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
27699 */
27700 smp_wmb();
27701
27702- ACCESS_ONCE(c2n->head) = data;
27703+ ACCESS_ONCE_RW(c2n->head) = data;
27704 }
27705
27706 /*
27707diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
27708index 2ed8459..7cf329f 100644
27709--- a/arch/x86/kernel/uprobes.c
27710+++ b/arch/x86/kernel/uprobes.c
27711@@ -629,7 +629,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
27712 int ret = NOTIFY_DONE;
27713
27714 /* We are only interested in userspace traps */
27715- if (regs && !user_mode_vm(regs))
27716+ if (regs && !user_mode(regs))
27717 return NOTIFY_DONE;
27718
27719 switch (val) {
27720@@ -719,7 +719,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
27721
27722 if (ncopied != rasize) {
27723 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
27724- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
27725+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
27726
27727 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
27728 }
27729diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
27730index b9242ba..50c5edd 100644
27731--- a/arch/x86/kernel/verify_cpu.S
27732+++ b/arch/x86/kernel/verify_cpu.S
27733@@ -20,6 +20,7 @@
27734 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
27735 * arch/x86/kernel/trampoline_64.S: secondary processor verification
27736 * arch/x86/kernel/head_32.S: processor startup
27737+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
27738 *
27739 * verify_cpu, returns the status of longmode and SSE in register %eax.
27740 * 0: Success 1: Failure
27741diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
27742index e8edcf5..27f9344 100644
27743--- a/arch/x86/kernel/vm86_32.c
27744+++ b/arch/x86/kernel/vm86_32.c
27745@@ -44,6 +44,7 @@
27746 #include <linux/ptrace.h>
27747 #include <linux/audit.h>
27748 #include <linux/stddef.h>
27749+#include <linux/grsecurity.h>
27750
27751 #include <asm/uaccess.h>
27752 #include <asm/io.h>
27753@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
27754 do_exit(SIGSEGV);
27755 }
27756
27757- tss = &per_cpu(init_tss, get_cpu());
27758+ tss = init_tss + get_cpu();
27759 current->thread.sp0 = current->thread.saved_sp0;
27760 current->thread.sysenter_cs = __KERNEL_CS;
27761 load_sp0(tss, &current->thread);
27762@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
27763
27764 if (tsk->thread.saved_sp0)
27765 return -EPERM;
27766+
27767+#ifdef CONFIG_GRKERNSEC_VM86
27768+ if (!capable(CAP_SYS_RAWIO)) {
27769+ gr_handle_vm86();
27770+ return -EPERM;
27771+ }
27772+#endif
27773+
27774 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
27775 offsetof(struct kernel_vm86_struct, vm86plus) -
27776 sizeof(info.regs));
27777@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
27778 int tmp;
27779 struct vm86plus_struct __user *v86;
27780
27781+#ifdef CONFIG_GRKERNSEC_VM86
27782+ if (!capable(CAP_SYS_RAWIO)) {
27783+ gr_handle_vm86();
27784+ return -EPERM;
27785+ }
27786+#endif
27787+
27788 tsk = current;
27789 switch (cmd) {
27790 case VM86_REQUEST_IRQ:
27791@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
27792 tsk->thread.saved_fs = info->regs32->fs;
27793 tsk->thread.saved_gs = get_user_gs(info->regs32);
27794
27795- tss = &per_cpu(init_tss, get_cpu());
27796+ tss = init_tss + get_cpu();
27797 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
27798 if (cpu_has_sep)
27799 tsk->thread.sysenter_cs = 0;
27800@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
27801 goto cannot_handle;
27802 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
27803 goto cannot_handle;
27804- intr_ptr = (unsigned long __user *) (i << 2);
27805+ intr_ptr = (__force unsigned long __user *) (i << 2);
27806 if (get_user(segoffs, intr_ptr))
27807 goto cannot_handle;
27808 if ((segoffs >> 16) == BIOSSEG)
27809diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
27810index 49edf2d..c0d1362 100644
27811--- a/arch/x86/kernel/vmlinux.lds.S
27812+++ b/arch/x86/kernel/vmlinux.lds.S
27813@@ -26,6 +26,13 @@
27814 #include <asm/page_types.h>
27815 #include <asm/cache.h>
27816 #include <asm/boot.h>
27817+#include <asm/segment.h>
27818+
27819+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27820+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
27821+#else
27822+#define __KERNEL_TEXT_OFFSET 0
27823+#endif
27824
27825 #undef i386 /* in case the preprocessor is a 32bit one */
27826
27827@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
27828
27829 PHDRS {
27830 text PT_LOAD FLAGS(5); /* R_E */
27831+#ifdef CONFIG_X86_32
27832+ module PT_LOAD FLAGS(5); /* R_E */
27833+#endif
27834+#ifdef CONFIG_XEN
27835+ rodata PT_LOAD FLAGS(5); /* R_E */
27836+#else
27837+ rodata PT_LOAD FLAGS(4); /* R__ */
27838+#endif
27839 data PT_LOAD FLAGS(6); /* RW_ */
27840-#ifdef CONFIG_X86_64
27841+ init.begin PT_LOAD FLAGS(6); /* RW_ */
27842 #ifdef CONFIG_SMP
27843 percpu PT_LOAD FLAGS(6); /* RW_ */
27844 #endif
27845+ text.init PT_LOAD FLAGS(5); /* R_E */
27846+ text.exit PT_LOAD FLAGS(5); /* R_E */
27847 init PT_LOAD FLAGS(7); /* RWE */
27848-#endif
27849 note PT_NOTE FLAGS(0); /* ___ */
27850 }
27851
27852 SECTIONS
27853 {
27854 #ifdef CONFIG_X86_32
27855- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
27856- phys_startup_32 = startup_32 - LOAD_OFFSET;
27857+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
27858 #else
27859- . = __START_KERNEL;
27860- phys_startup_64 = startup_64 - LOAD_OFFSET;
27861+ . = __START_KERNEL;
27862 #endif
27863
27864 /* Text and read-only data */
27865- .text : AT(ADDR(.text) - LOAD_OFFSET) {
27866- _text = .;
27867+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
27868 /* bootstrapping code */
27869+#ifdef CONFIG_X86_32
27870+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27871+#else
27872+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27873+#endif
27874+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
27875+ _text = .;
27876 HEAD_TEXT
27877 . = ALIGN(8);
27878 _stext = .;
27879@@ -104,13 +124,47 @@ SECTIONS
27880 IRQENTRY_TEXT
27881 *(.fixup)
27882 *(.gnu.warning)
27883- /* End of text section */
27884- _etext = .;
27885 } :text = 0x9090
27886
27887- NOTES :text :note
27888+ . += __KERNEL_TEXT_OFFSET;
27889
27890- EXCEPTION_TABLE(16) :text = 0x9090
27891+#ifdef CONFIG_X86_32
27892+ . = ALIGN(PAGE_SIZE);
27893+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
27894+
27895+#ifdef CONFIG_PAX_KERNEXEC
27896+ MODULES_EXEC_VADDR = .;
27897+ BYTE(0)
27898+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
27899+ . = ALIGN(HPAGE_SIZE) - 1;
27900+ MODULES_EXEC_END = .;
27901+#endif
27902+
27903+ } :module
27904+#endif
27905+
27906+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
27907+ /* End of text section */
27908+ BYTE(0)
27909+ _etext = . - __KERNEL_TEXT_OFFSET;
27910+ }
27911+
27912+#ifdef CONFIG_X86_32
27913+ . = ALIGN(PAGE_SIZE);
27914+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
27915+ . = ALIGN(PAGE_SIZE);
27916+ *(.empty_zero_page)
27917+ *(.initial_pg_fixmap)
27918+ *(.initial_pg_pmd)
27919+ *(.initial_page_table)
27920+ *(.swapper_pg_dir)
27921+ } :rodata
27922+#endif
27923+
27924+ . = ALIGN(PAGE_SIZE);
27925+ NOTES :rodata :note
27926+
27927+ EXCEPTION_TABLE(16) :rodata
27928
27929 #if defined(CONFIG_DEBUG_RODATA)
27930 /* .text should occupy whole number of pages */
27931@@ -122,16 +176,20 @@ SECTIONS
27932
27933 /* Data */
27934 .data : AT(ADDR(.data) - LOAD_OFFSET) {
27935+
27936+#ifdef CONFIG_PAX_KERNEXEC
27937+ . = ALIGN(HPAGE_SIZE);
27938+#else
27939+ . = ALIGN(PAGE_SIZE);
27940+#endif
27941+
27942 /* Start of data section */
27943 _sdata = .;
27944
27945 /* init_task */
27946 INIT_TASK_DATA(THREAD_SIZE)
27947
27948-#ifdef CONFIG_X86_32
27949- /* 32 bit has nosave before _edata */
27950 NOSAVE_DATA
27951-#endif
27952
27953 PAGE_ALIGNED_DATA(PAGE_SIZE)
27954
27955@@ -174,12 +232,19 @@ SECTIONS
27956 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
27957
27958 /* Init code and data - will be freed after init */
27959- . = ALIGN(PAGE_SIZE);
27960 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
27961+ BYTE(0)
27962+
27963+#ifdef CONFIG_PAX_KERNEXEC
27964+ . = ALIGN(HPAGE_SIZE);
27965+#else
27966+ . = ALIGN(PAGE_SIZE);
27967+#endif
27968+
27969 __init_begin = .; /* paired with __init_end */
27970- }
27971+ } :init.begin
27972
27973-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
27974+#ifdef CONFIG_SMP
27975 /*
27976 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
27977 * output PHDR, so the next output section - .init.text - should
27978@@ -188,12 +253,27 @@ SECTIONS
27979 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
27980 #endif
27981
27982- INIT_TEXT_SECTION(PAGE_SIZE)
27983-#ifdef CONFIG_X86_64
27984- :init
27985-#endif
27986+ . = ALIGN(PAGE_SIZE);
27987+ init_begin = .;
27988+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
27989+ VMLINUX_SYMBOL(_sinittext) = .;
27990+ INIT_TEXT
27991+ VMLINUX_SYMBOL(_einittext) = .;
27992+ . = ALIGN(PAGE_SIZE);
27993+ } :text.init
27994
27995- INIT_DATA_SECTION(16)
27996+ /*
27997+ * .exit.text is discard at runtime, not link time, to deal with
27998+ * references from .altinstructions and .eh_frame
27999+ */
28000+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28001+ EXIT_TEXT
28002+ . = ALIGN(16);
28003+ } :text.exit
28004+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28005+
28006+ . = ALIGN(PAGE_SIZE);
28007+ INIT_DATA_SECTION(16) :init
28008
28009 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28010 __x86_cpu_dev_start = .;
28011@@ -264,19 +344,12 @@ SECTIONS
28012 }
28013
28014 . = ALIGN(8);
28015- /*
28016- * .exit.text is discard at runtime, not link time, to deal with
28017- * references from .altinstructions and .eh_frame
28018- */
28019- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28020- EXIT_TEXT
28021- }
28022
28023 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28024 EXIT_DATA
28025 }
28026
28027-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28028+#ifndef CONFIG_SMP
28029 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28030 #endif
28031
28032@@ -295,16 +368,10 @@ SECTIONS
28033 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28034 __smp_locks = .;
28035 *(.smp_locks)
28036- . = ALIGN(PAGE_SIZE);
28037 __smp_locks_end = .;
28038+ . = ALIGN(PAGE_SIZE);
28039 }
28040
28041-#ifdef CONFIG_X86_64
28042- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28043- NOSAVE_DATA
28044- }
28045-#endif
28046-
28047 /* BSS */
28048 . = ALIGN(PAGE_SIZE);
28049 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28050@@ -320,6 +387,7 @@ SECTIONS
28051 __brk_base = .;
28052 . += 64 * 1024; /* 64k alignment slop space */
28053 *(.brk_reservation) /* areas brk users have reserved */
28054+ . = ALIGN(HPAGE_SIZE);
28055 __brk_limit = .;
28056 }
28057
28058@@ -346,13 +414,12 @@ SECTIONS
28059 * for the boot processor.
28060 */
28061 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28062-INIT_PER_CPU(gdt_page);
28063 INIT_PER_CPU(irq_stack_union);
28064
28065 /*
28066 * Build-time check on the image size:
28067 */
28068-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28069+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28070 "kernel image bigger than KERNEL_IMAGE_SIZE");
28071
28072 #ifdef CONFIG_SMP
28073diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28074index 8b3b3eb..9395aa9 100644
28075--- a/arch/x86/kernel/vsyscall_64.c
28076+++ b/arch/x86/kernel/vsyscall_64.c
28077@@ -54,15 +54,13 @@
28078
28079 DEFINE_VVAR(int, vgetcpu_mode);
28080
28081-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28082+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28083
28084 static int __init vsyscall_setup(char *str)
28085 {
28086 if (str) {
28087 if (!strcmp("emulate", str))
28088 vsyscall_mode = EMULATE;
28089- else if (!strcmp("native", str))
28090- vsyscall_mode = NATIVE;
28091 else if (!strcmp("none", str))
28092 vsyscall_mode = NONE;
28093 else
28094@@ -279,8 +277,7 @@ do_ret:
28095 return true;
28096
28097 sigsegv:
28098- force_sig(SIGSEGV, current);
28099- return true;
28100+ do_group_exit(SIGKILL);
28101 }
28102
28103 /*
28104@@ -332,10 +329,7 @@ void __init map_vsyscall(void)
28105 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28106 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
28107
28108- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
28109- vsyscall_mode == NATIVE
28110- ? PAGE_KERNEL_VSYSCALL
28111- : PAGE_KERNEL_VVAR);
28112+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28113 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
28114 (unsigned long)VSYSCALL_START);
28115
28116diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28117index 04068192..4d75aa6 100644
28118--- a/arch/x86/kernel/x8664_ksyms_64.c
28119+++ b/arch/x86/kernel/x8664_ksyms_64.c
28120@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28121 EXPORT_SYMBOL(copy_user_generic_unrolled);
28122 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28123 EXPORT_SYMBOL(__copy_user_nocache);
28124-EXPORT_SYMBOL(_copy_from_user);
28125-EXPORT_SYMBOL(_copy_to_user);
28126
28127 EXPORT_SYMBOL(copy_page);
28128 EXPORT_SYMBOL(clear_page);
28129@@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28130 EXPORT_SYMBOL(___preempt_schedule_context);
28131 #endif
28132 #endif
28133+
28134+#ifdef CONFIG_PAX_PER_CPU_PGD
28135+EXPORT_SYMBOL(cpu_pgd);
28136+#endif
28137diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28138index e48b674..a451dd9 100644
28139--- a/arch/x86/kernel/x86_init.c
28140+++ b/arch/x86/kernel/x86_init.c
28141@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28142 static void default_nmi_init(void) { };
28143 static int default_i8042_detect(void) { return 1; };
28144
28145-struct x86_platform_ops x86_platform = {
28146+struct x86_platform_ops x86_platform __read_only = {
28147 .calibrate_tsc = native_calibrate_tsc,
28148 .get_wallclock = mach_get_cmos_time,
28149 .set_wallclock = mach_set_rtc_mmss,
28150@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28151 EXPORT_SYMBOL_GPL(x86_platform);
28152
28153 #if defined(CONFIG_PCI_MSI)
28154-struct x86_msi_ops x86_msi = {
28155+struct x86_msi_ops x86_msi __read_only = {
28156 .setup_msi_irqs = native_setup_msi_irqs,
28157 .compose_msi_msg = native_compose_msi_msg,
28158 .teardown_msi_irq = native_teardown_msi_irq,
28159@@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28160 }
28161 #endif
28162
28163-struct x86_io_apic_ops x86_io_apic_ops = {
28164+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28165 .init = native_io_apic_init_mappings,
28166 .read = native_io_apic_read,
28167 .write = native_io_apic_write,
28168diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28169index a4b451c..8dfe1ad 100644
28170--- a/arch/x86/kernel/xsave.c
28171+++ b/arch/x86/kernel/xsave.c
28172@@ -164,18 +164,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28173
28174 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28175 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28176- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28177+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28178
28179 if (!use_xsave())
28180 return err;
28181
28182- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28183+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28184
28185 /*
28186 * Read the xstate_bv which we copied (directly from the cpu or
28187 * from the state in task struct) to the user buffers.
28188 */
28189- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28190+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28191
28192 /*
28193 * For legacy compatible, we always set FP/SSE bits in the bit
28194@@ -190,7 +190,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28195 */
28196 xstate_bv |= XSTATE_FPSSE;
28197
28198- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28199+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28200
28201 return err;
28202 }
28203@@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28204 {
28205 int err;
28206
28207+ buf = (struct xsave_struct __user *)____m(buf);
28208 if (use_xsave())
28209 err = xsave_user(buf);
28210 else if (use_fxsr())
28211@@ -311,6 +312,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28212 */
28213 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28214 {
28215+ buf = (void __user *)____m(buf);
28216 if (use_xsave()) {
28217 if ((unsigned long)buf % 64 || fx_only) {
28218 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28219diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28220index f47a104..5ce59a8 100644
28221--- a/arch/x86/kvm/cpuid.c
28222+++ b/arch/x86/kvm/cpuid.c
28223@@ -166,15 +166,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28224 struct kvm_cpuid2 *cpuid,
28225 struct kvm_cpuid_entry2 __user *entries)
28226 {
28227- int r;
28228+ int r, i;
28229
28230 r = -E2BIG;
28231 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28232 goto out;
28233 r = -EFAULT;
28234- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28235- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28236+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28237 goto out;
28238+ for (i = 0; i < cpuid->nent; ++i) {
28239+ struct kvm_cpuid_entry2 cpuid_entry;
28240+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28241+ goto out;
28242+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28243+ }
28244 vcpu->arch.cpuid_nent = cpuid->nent;
28245 kvm_apic_set_version(vcpu);
28246 kvm_x86_ops->cpuid_update(vcpu);
28247@@ -189,15 +194,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28248 struct kvm_cpuid2 *cpuid,
28249 struct kvm_cpuid_entry2 __user *entries)
28250 {
28251- int r;
28252+ int r, i;
28253
28254 r = -E2BIG;
28255 if (cpuid->nent < vcpu->arch.cpuid_nent)
28256 goto out;
28257 r = -EFAULT;
28258- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28259- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28260+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28261 goto out;
28262+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28263+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28264+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28265+ goto out;
28266+ }
28267 return 0;
28268
28269 out:
28270diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28271index 0069118..c28ec0a 100644
28272--- a/arch/x86/kvm/lapic.c
28273+++ b/arch/x86/kvm/lapic.c
28274@@ -55,7 +55,7 @@
28275 #define APIC_BUS_CYCLE_NS 1
28276
28277 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28278-#define apic_debug(fmt, arg...)
28279+#define apic_debug(fmt, arg...) do {} while (0)
28280
28281 #define APIC_LVT_NUM 6
28282 /* 14 is the version for Xeon and Pentium 8.4.8*/
28283diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28284index 123efd3..ad7726e 100644
28285--- a/arch/x86/kvm/paging_tmpl.h
28286+++ b/arch/x86/kvm/paging_tmpl.h
28287@@ -331,7 +331,7 @@ retry_walk:
28288 if (unlikely(kvm_is_error_hva(host_addr)))
28289 goto error;
28290
28291- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28292+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28293 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28294 goto error;
28295 walker->ptep_user[walker->level - 1] = ptep_user;
28296diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28297index 7f4f9c2..67b1db0 100644
28298--- a/arch/x86/kvm/svm.c
28299+++ b/arch/x86/kvm/svm.c
28300@@ -3535,7 +3535,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28301 int cpu = raw_smp_processor_id();
28302
28303 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28304+
28305+ pax_open_kernel();
28306 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28307+ pax_close_kernel();
28308+
28309 load_TR_desc();
28310 }
28311
28312@@ -3936,6 +3940,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28313 #endif
28314 #endif
28315
28316+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28317+ __set_fs(current_thread_info()->addr_limit);
28318+#endif
28319+
28320 reload_tss(vcpu);
28321
28322 local_irq_disable();
28323diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28324index 138ceff..2e584f0 100644
28325--- a/arch/x86/kvm/vmx.c
28326+++ b/arch/x86/kvm/vmx.c
28327@@ -1339,12 +1339,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28328 #endif
28329 }
28330
28331-static void vmcs_clear_bits(unsigned long field, u32 mask)
28332+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28333 {
28334 vmcs_writel(field, vmcs_readl(field) & ~mask);
28335 }
28336
28337-static void vmcs_set_bits(unsigned long field, u32 mask)
28338+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28339 {
28340 vmcs_writel(field, vmcs_readl(field) | mask);
28341 }
28342@@ -1604,7 +1604,11 @@ static void reload_tss(void)
28343 struct desc_struct *descs;
28344
28345 descs = (void *)gdt->address;
28346+
28347+ pax_open_kernel();
28348 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28349+ pax_close_kernel();
28350+
28351 load_TR_desc();
28352 }
28353
28354@@ -1832,6 +1836,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28355 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28356 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28357
28358+#ifdef CONFIG_PAX_PER_CPU_PGD
28359+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28360+#endif
28361+
28362 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28363 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28364 vmx->loaded_vmcs->cpu = cpu;
28365@@ -2121,7 +2129,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28366 * reads and returns guest's timestamp counter "register"
28367 * guest_tsc = host_tsc + tsc_offset -- 21.3
28368 */
28369-static u64 guest_read_tsc(void)
28370+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28371 {
28372 u64 host_tsc, tsc_offset;
28373
28374@@ -3093,8 +3101,11 @@ static __init int hardware_setup(void)
28375 if (!cpu_has_vmx_flexpriority())
28376 flexpriority_enabled = 0;
28377
28378- if (!cpu_has_vmx_tpr_shadow())
28379- kvm_x86_ops->update_cr8_intercept = NULL;
28380+ if (!cpu_has_vmx_tpr_shadow()) {
28381+ pax_open_kernel();
28382+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28383+ pax_close_kernel();
28384+ }
28385
28386 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28387 kvm_disable_largepages();
28388@@ -3105,13 +3116,15 @@ static __init int hardware_setup(void)
28389 if (!cpu_has_vmx_apicv())
28390 enable_apicv = 0;
28391
28392+ pax_open_kernel();
28393 if (enable_apicv)
28394- kvm_x86_ops->update_cr8_intercept = NULL;
28395+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28396 else {
28397- kvm_x86_ops->hwapic_irr_update = NULL;
28398- kvm_x86_ops->deliver_posted_interrupt = NULL;
28399- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28400+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28401+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28402+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28403 }
28404+ pax_close_kernel();
28405
28406 if (nested)
28407 nested_vmx_setup_ctls_msrs();
28408@@ -4235,7 +4248,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28409
28410 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28411 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
28412+
28413+#ifndef CONFIG_PAX_PER_CPU_PGD
28414 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28415+#endif
28416
28417 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
28418 #ifdef CONFIG_X86_64
28419@@ -4257,7 +4273,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28420 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28421 vmx->host_idt_base = dt.address;
28422
28423- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28424+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28425
28426 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28427 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28428@@ -7333,6 +7349,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28429 "jmp 2f \n\t"
28430 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28431 "2: "
28432+
28433+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28434+ "ljmp %[cs],$3f\n\t"
28435+ "3: "
28436+#endif
28437+
28438 /* Save guest registers, load host registers, keep flags */
28439 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28440 "pop %0 \n\t"
28441@@ -7385,6 +7407,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28442 #endif
28443 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28444 [wordsize]"i"(sizeof(ulong))
28445+
28446+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28447+ ,[cs]"i"(__KERNEL_CS)
28448+#endif
28449+
28450 : "cc", "memory"
28451 #ifdef CONFIG_X86_64
28452 , "rax", "rbx", "rdi", "rsi"
28453@@ -7398,7 +7425,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28454 if (debugctlmsr)
28455 update_debugctlmsr(debugctlmsr);
28456
28457-#ifndef CONFIG_X86_64
28458+#ifdef CONFIG_X86_32
28459 /*
28460 * The sysexit path does not restore ds/es, so we must set them to
28461 * a reasonable value ourselves.
28462@@ -7407,8 +7434,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28463 * may be executed in interrupt context, which saves and restore segments
28464 * around it, nullifying its effect.
28465 */
28466- loadsegment(ds, __USER_DS);
28467- loadsegment(es, __USER_DS);
28468+ loadsegment(ds, __KERNEL_DS);
28469+ loadsegment(es, __KERNEL_DS);
28470+ loadsegment(ss, __KERNEL_DS);
28471+
28472+#ifdef CONFIG_PAX_KERNEXEC
28473+ loadsegment(fs, __KERNEL_PERCPU);
28474+#endif
28475+
28476+#ifdef CONFIG_PAX_MEMORY_UDEREF
28477+ __set_fs(current_thread_info()->addr_limit);
28478+#endif
28479+
28480 #endif
28481
28482 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28483diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28484index 20316c6..9b3dddc 100644
28485--- a/arch/x86/kvm/x86.c
28486+++ b/arch/x86/kvm/x86.c
28487@@ -1822,8 +1822,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28488 {
28489 struct kvm *kvm = vcpu->kvm;
28490 int lm = is_long_mode(vcpu);
28491- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28492- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28493+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28494+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28495 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28496 : kvm->arch.xen_hvm_config.blob_size_32;
28497 u32 page_num = data & ~PAGE_MASK;
28498@@ -2738,6 +2738,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28499 if (n < msr_list.nmsrs)
28500 goto out;
28501 r = -EFAULT;
28502+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28503+ goto out;
28504 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28505 num_msrs_to_save * sizeof(u32)))
28506 goto out;
28507@@ -5574,7 +5576,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28508 };
28509 #endif
28510
28511-int kvm_arch_init(void *opaque)
28512+int kvm_arch_init(const void *opaque)
28513 {
28514 int r;
28515 struct kvm_x86_ops *ops = opaque;
28516diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28517index aae9413..d11e829 100644
28518--- a/arch/x86/lguest/boot.c
28519+++ b/arch/x86/lguest/boot.c
28520@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28521 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28522 * Launcher to reboot us.
28523 */
28524-static void lguest_restart(char *reason)
28525+static __noreturn void lguest_restart(char *reason)
28526 {
28527 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28528+ BUG();
28529 }
28530
28531 /*G:050
28532diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28533index 00933d5..3a64af9 100644
28534--- a/arch/x86/lib/atomic64_386_32.S
28535+++ b/arch/x86/lib/atomic64_386_32.S
28536@@ -48,6 +48,10 @@ BEGIN(read)
28537 movl (v), %eax
28538 movl 4(v), %edx
28539 RET_ENDP
28540+BEGIN(read_unchecked)
28541+ movl (v), %eax
28542+ movl 4(v), %edx
28543+RET_ENDP
28544 #undef v
28545
28546 #define v %esi
28547@@ -55,6 +59,10 @@ BEGIN(set)
28548 movl %ebx, (v)
28549 movl %ecx, 4(v)
28550 RET_ENDP
28551+BEGIN(set_unchecked)
28552+ movl %ebx, (v)
28553+ movl %ecx, 4(v)
28554+RET_ENDP
28555 #undef v
28556
28557 #define v %esi
28558@@ -70,6 +78,20 @@ RET_ENDP
28559 BEGIN(add)
28560 addl %eax, (v)
28561 adcl %edx, 4(v)
28562+
28563+#ifdef CONFIG_PAX_REFCOUNT
28564+ jno 0f
28565+ subl %eax, (v)
28566+ sbbl %edx, 4(v)
28567+ int $4
28568+0:
28569+ _ASM_EXTABLE(0b, 0b)
28570+#endif
28571+
28572+RET_ENDP
28573+BEGIN(add_unchecked)
28574+ addl %eax, (v)
28575+ adcl %edx, 4(v)
28576 RET_ENDP
28577 #undef v
28578
28579@@ -77,6 +99,24 @@ RET_ENDP
28580 BEGIN(add_return)
28581 addl (v), %eax
28582 adcl 4(v), %edx
28583+
28584+#ifdef CONFIG_PAX_REFCOUNT
28585+ into
28586+1234:
28587+ _ASM_EXTABLE(1234b, 2f)
28588+#endif
28589+
28590+ movl %eax, (v)
28591+ movl %edx, 4(v)
28592+
28593+#ifdef CONFIG_PAX_REFCOUNT
28594+2:
28595+#endif
28596+
28597+RET_ENDP
28598+BEGIN(add_return_unchecked)
28599+ addl (v), %eax
28600+ adcl 4(v), %edx
28601 movl %eax, (v)
28602 movl %edx, 4(v)
28603 RET_ENDP
28604@@ -86,6 +126,20 @@ RET_ENDP
28605 BEGIN(sub)
28606 subl %eax, (v)
28607 sbbl %edx, 4(v)
28608+
28609+#ifdef CONFIG_PAX_REFCOUNT
28610+ jno 0f
28611+ addl %eax, (v)
28612+ adcl %edx, 4(v)
28613+ int $4
28614+0:
28615+ _ASM_EXTABLE(0b, 0b)
28616+#endif
28617+
28618+RET_ENDP
28619+BEGIN(sub_unchecked)
28620+ subl %eax, (v)
28621+ sbbl %edx, 4(v)
28622 RET_ENDP
28623 #undef v
28624
28625@@ -96,6 +150,27 @@ BEGIN(sub_return)
28626 sbbl $0, %edx
28627 addl (v), %eax
28628 adcl 4(v), %edx
28629+
28630+#ifdef CONFIG_PAX_REFCOUNT
28631+ into
28632+1234:
28633+ _ASM_EXTABLE(1234b, 2f)
28634+#endif
28635+
28636+ movl %eax, (v)
28637+ movl %edx, 4(v)
28638+
28639+#ifdef CONFIG_PAX_REFCOUNT
28640+2:
28641+#endif
28642+
28643+RET_ENDP
28644+BEGIN(sub_return_unchecked)
28645+ negl %edx
28646+ negl %eax
28647+ sbbl $0, %edx
28648+ addl (v), %eax
28649+ adcl 4(v), %edx
28650 movl %eax, (v)
28651 movl %edx, 4(v)
28652 RET_ENDP
28653@@ -105,6 +180,20 @@ RET_ENDP
28654 BEGIN(inc)
28655 addl $1, (v)
28656 adcl $0, 4(v)
28657+
28658+#ifdef CONFIG_PAX_REFCOUNT
28659+ jno 0f
28660+ subl $1, (v)
28661+ sbbl $0, 4(v)
28662+ int $4
28663+0:
28664+ _ASM_EXTABLE(0b, 0b)
28665+#endif
28666+
28667+RET_ENDP
28668+BEGIN(inc_unchecked)
28669+ addl $1, (v)
28670+ adcl $0, 4(v)
28671 RET_ENDP
28672 #undef v
28673
28674@@ -114,6 +203,26 @@ BEGIN(inc_return)
28675 movl 4(v), %edx
28676 addl $1, %eax
28677 adcl $0, %edx
28678+
28679+#ifdef CONFIG_PAX_REFCOUNT
28680+ into
28681+1234:
28682+ _ASM_EXTABLE(1234b, 2f)
28683+#endif
28684+
28685+ movl %eax, (v)
28686+ movl %edx, 4(v)
28687+
28688+#ifdef CONFIG_PAX_REFCOUNT
28689+2:
28690+#endif
28691+
28692+RET_ENDP
28693+BEGIN(inc_return_unchecked)
28694+ movl (v), %eax
28695+ movl 4(v), %edx
28696+ addl $1, %eax
28697+ adcl $0, %edx
28698 movl %eax, (v)
28699 movl %edx, 4(v)
28700 RET_ENDP
28701@@ -123,6 +232,20 @@ RET_ENDP
28702 BEGIN(dec)
28703 subl $1, (v)
28704 sbbl $0, 4(v)
28705+
28706+#ifdef CONFIG_PAX_REFCOUNT
28707+ jno 0f
28708+ addl $1, (v)
28709+ adcl $0, 4(v)
28710+ int $4
28711+0:
28712+ _ASM_EXTABLE(0b, 0b)
28713+#endif
28714+
28715+RET_ENDP
28716+BEGIN(dec_unchecked)
28717+ subl $1, (v)
28718+ sbbl $0, 4(v)
28719 RET_ENDP
28720 #undef v
28721
28722@@ -132,6 +255,26 @@ BEGIN(dec_return)
28723 movl 4(v), %edx
28724 subl $1, %eax
28725 sbbl $0, %edx
28726+
28727+#ifdef CONFIG_PAX_REFCOUNT
28728+ into
28729+1234:
28730+ _ASM_EXTABLE(1234b, 2f)
28731+#endif
28732+
28733+ movl %eax, (v)
28734+ movl %edx, 4(v)
28735+
28736+#ifdef CONFIG_PAX_REFCOUNT
28737+2:
28738+#endif
28739+
28740+RET_ENDP
28741+BEGIN(dec_return_unchecked)
28742+ movl (v), %eax
28743+ movl 4(v), %edx
28744+ subl $1, %eax
28745+ sbbl $0, %edx
28746 movl %eax, (v)
28747 movl %edx, 4(v)
28748 RET_ENDP
28749@@ -143,6 +286,13 @@ BEGIN(add_unless)
28750 adcl %edx, %edi
28751 addl (v), %eax
28752 adcl 4(v), %edx
28753+
28754+#ifdef CONFIG_PAX_REFCOUNT
28755+ into
28756+1234:
28757+ _ASM_EXTABLE(1234b, 2f)
28758+#endif
28759+
28760 cmpl %eax, %ecx
28761 je 3f
28762 1:
28763@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
28764 1:
28765 addl $1, %eax
28766 adcl $0, %edx
28767+
28768+#ifdef CONFIG_PAX_REFCOUNT
28769+ into
28770+1234:
28771+ _ASM_EXTABLE(1234b, 2f)
28772+#endif
28773+
28774 movl %eax, (v)
28775 movl %edx, 4(v)
28776 movl $1, %eax
28777@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
28778 movl 4(v), %edx
28779 subl $1, %eax
28780 sbbl $0, %edx
28781+
28782+#ifdef CONFIG_PAX_REFCOUNT
28783+ into
28784+1234:
28785+ _ASM_EXTABLE(1234b, 1f)
28786+#endif
28787+
28788 js 1f
28789 movl %eax, (v)
28790 movl %edx, 4(v)
28791diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
28792index f5cc9eb..51fa319 100644
28793--- a/arch/x86/lib/atomic64_cx8_32.S
28794+++ b/arch/x86/lib/atomic64_cx8_32.S
28795@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
28796 CFI_STARTPROC
28797
28798 read64 %ecx
28799+ pax_force_retaddr
28800 ret
28801 CFI_ENDPROC
28802 ENDPROC(atomic64_read_cx8)
28803
28804+ENTRY(atomic64_read_unchecked_cx8)
28805+ CFI_STARTPROC
28806+
28807+ read64 %ecx
28808+ pax_force_retaddr
28809+ ret
28810+ CFI_ENDPROC
28811+ENDPROC(atomic64_read_unchecked_cx8)
28812+
28813 ENTRY(atomic64_set_cx8)
28814 CFI_STARTPROC
28815
28816@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
28817 cmpxchg8b (%esi)
28818 jne 1b
28819
28820+ pax_force_retaddr
28821 ret
28822 CFI_ENDPROC
28823 ENDPROC(atomic64_set_cx8)
28824
28825+ENTRY(atomic64_set_unchecked_cx8)
28826+ CFI_STARTPROC
28827+
28828+1:
28829+/* we don't need LOCK_PREFIX since aligned 64-bit writes
28830+ * are atomic on 586 and newer */
28831+ cmpxchg8b (%esi)
28832+ jne 1b
28833+
28834+ pax_force_retaddr
28835+ ret
28836+ CFI_ENDPROC
28837+ENDPROC(atomic64_set_unchecked_cx8)
28838+
28839 ENTRY(atomic64_xchg_cx8)
28840 CFI_STARTPROC
28841
28842@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
28843 cmpxchg8b (%esi)
28844 jne 1b
28845
28846+ pax_force_retaddr
28847 ret
28848 CFI_ENDPROC
28849 ENDPROC(atomic64_xchg_cx8)
28850
28851-.macro addsub_return func ins insc
28852-ENTRY(atomic64_\func\()_return_cx8)
28853+.macro addsub_return func ins insc unchecked=""
28854+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
28855 CFI_STARTPROC
28856 SAVE ebp
28857 SAVE ebx
28858@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
28859 movl %edx, %ecx
28860 \ins\()l %esi, %ebx
28861 \insc\()l %edi, %ecx
28862+
28863+.ifb \unchecked
28864+#ifdef CONFIG_PAX_REFCOUNT
28865+ into
28866+2:
28867+ _ASM_EXTABLE(2b, 3f)
28868+#endif
28869+.endif
28870+
28871 LOCK_PREFIX
28872 cmpxchg8b (%ebp)
28873 jne 1b
28874-
28875-10:
28876 movl %ebx, %eax
28877 movl %ecx, %edx
28878+
28879+.ifb \unchecked
28880+#ifdef CONFIG_PAX_REFCOUNT
28881+3:
28882+#endif
28883+.endif
28884+
28885 RESTORE edi
28886 RESTORE esi
28887 RESTORE ebx
28888 RESTORE ebp
28889+ pax_force_retaddr
28890 ret
28891 CFI_ENDPROC
28892-ENDPROC(atomic64_\func\()_return_cx8)
28893+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28894 .endm
28895
28896 addsub_return add add adc
28897 addsub_return sub sub sbb
28898+addsub_return add add adc _unchecked
28899+addsub_return sub sub sbb _unchecked
28900
28901-.macro incdec_return func ins insc
28902-ENTRY(atomic64_\func\()_return_cx8)
28903+.macro incdec_return func ins insc unchecked=""
28904+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
28905 CFI_STARTPROC
28906 SAVE ebx
28907
28908@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
28909 movl %edx, %ecx
28910 \ins\()l $1, %ebx
28911 \insc\()l $0, %ecx
28912+
28913+.ifb \unchecked
28914+#ifdef CONFIG_PAX_REFCOUNT
28915+ into
28916+2:
28917+ _ASM_EXTABLE(2b, 3f)
28918+#endif
28919+.endif
28920+
28921 LOCK_PREFIX
28922 cmpxchg8b (%esi)
28923 jne 1b
28924
28925-10:
28926 movl %ebx, %eax
28927 movl %ecx, %edx
28928+
28929+.ifb \unchecked
28930+#ifdef CONFIG_PAX_REFCOUNT
28931+3:
28932+#endif
28933+.endif
28934+
28935 RESTORE ebx
28936+ pax_force_retaddr
28937 ret
28938 CFI_ENDPROC
28939-ENDPROC(atomic64_\func\()_return_cx8)
28940+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
28941 .endm
28942
28943 incdec_return inc add adc
28944 incdec_return dec sub sbb
28945+incdec_return inc add adc _unchecked
28946+incdec_return dec sub sbb _unchecked
28947
28948 ENTRY(atomic64_dec_if_positive_cx8)
28949 CFI_STARTPROC
28950@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
28951 movl %edx, %ecx
28952 subl $1, %ebx
28953 sbb $0, %ecx
28954+
28955+#ifdef CONFIG_PAX_REFCOUNT
28956+ into
28957+1234:
28958+ _ASM_EXTABLE(1234b, 2f)
28959+#endif
28960+
28961 js 2f
28962 LOCK_PREFIX
28963 cmpxchg8b (%esi)
28964@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
28965 movl %ebx, %eax
28966 movl %ecx, %edx
28967 RESTORE ebx
28968+ pax_force_retaddr
28969 ret
28970 CFI_ENDPROC
28971 ENDPROC(atomic64_dec_if_positive_cx8)
28972@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
28973 movl %edx, %ecx
28974 addl %ebp, %ebx
28975 adcl %edi, %ecx
28976+
28977+#ifdef CONFIG_PAX_REFCOUNT
28978+ into
28979+1234:
28980+ _ASM_EXTABLE(1234b, 3f)
28981+#endif
28982+
28983 LOCK_PREFIX
28984 cmpxchg8b (%esi)
28985 jne 1b
28986@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
28987 CFI_ADJUST_CFA_OFFSET -8
28988 RESTORE ebx
28989 RESTORE ebp
28990+ pax_force_retaddr
28991 ret
28992 4:
28993 cmpl %edx, 4(%esp)
28994@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
28995 xorl %ecx, %ecx
28996 addl $1, %ebx
28997 adcl %edx, %ecx
28998+
28999+#ifdef CONFIG_PAX_REFCOUNT
29000+ into
29001+1234:
29002+ _ASM_EXTABLE(1234b, 3f)
29003+#endif
29004+
29005 LOCK_PREFIX
29006 cmpxchg8b (%esi)
29007 jne 1b
29008@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29009 movl $1, %eax
29010 3:
29011 RESTORE ebx
29012+ pax_force_retaddr
29013 ret
29014 CFI_ENDPROC
29015 ENDPROC(atomic64_inc_not_zero_cx8)
29016diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29017index e78b8ee..7e173a8 100644
29018--- a/arch/x86/lib/checksum_32.S
29019+++ b/arch/x86/lib/checksum_32.S
29020@@ -29,7 +29,8 @@
29021 #include <asm/dwarf2.h>
29022 #include <asm/errno.h>
29023 #include <asm/asm.h>
29024-
29025+#include <asm/segment.h>
29026+
29027 /*
29028 * computes a partial checksum, e.g. for TCP/UDP fragments
29029 */
29030@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29031
29032 #define ARGBASE 16
29033 #define FP 12
29034-
29035-ENTRY(csum_partial_copy_generic)
29036+
29037+ENTRY(csum_partial_copy_generic_to_user)
29038 CFI_STARTPROC
29039+
29040+#ifdef CONFIG_PAX_MEMORY_UDEREF
29041+ pushl_cfi %gs
29042+ popl_cfi %es
29043+ jmp csum_partial_copy_generic
29044+#endif
29045+
29046+ENTRY(csum_partial_copy_generic_from_user)
29047+
29048+#ifdef CONFIG_PAX_MEMORY_UDEREF
29049+ pushl_cfi %gs
29050+ popl_cfi %ds
29051+#endif
29052+
29053+ENTRY(csum_partial_copy_generic)
29054 subl $4,%esp
29055 CFI_ADJUST_CFA_OFFSET 4
29056 pushl_cfi %edi
29057@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29058 jmp 4f
29059 SRC(1: movw (%esi), %bx )
29060 addl $2, %esi
29061-DST( movw %bx, (%edi) )
29062+DST( movw %bx, %es:(%edi) )
29063 addl $2, %edi
29064 addw %bx, %ax
29065 adcl $0, %eax
29066@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29067 SRC(1: movl (%esi), %ebx )
29068 SRC( movl 4(%esi), %edx )
29069 adcl %ebx, %eax
29070-DST( movl %ebx, (%edi) )
29071+DST( movl %ebx, %es:(%edi) )
29072 adcl %edx, %eax
29073-DST( movl %edx, 4(%edi) )
29074+DST( movl %edx, %es:4(%edi) )
29075
29076 SRC( movl 8(%esi), %ebx )
29077 SRC( movl 12(%esi), %edx )
29078 adcl %ebx, %eax
29079-DST( movl %ebx, 8(%edi) )
29080+DST( movl %ebx, %es:8(%edi) )
29081 adcl %edx, %eax
29082-DST( movl %edx, 12(%edi) )
29083+DST( movl %edx, %es:12(%edi) )
29084
29085 SRC( movl 16(%esi), %ebx )
29086 SRC( movl 20(%esi), %edx )
29087 adcl %ebx, %eax
29088-DST( movl %ebx, 16(%edi) )
29089+DST( movl %ebx, %es:16(%edi) )
29090 adcl %edx, %eax
29091-DST( movl %edx, 20(%edi) )
29092+DST( movl %edx, %es:20(%edi) )
29093
29094 SRC( movl 24(%esi), %ebx )
29095 SRC( movl 28(%esi), %edx )
29096 adcl %ebx, %eax
29097-DST( movl %ebx, 24(%edi) )
29098+DST( movl %ebx, %es:24(%edi) )
29099 adcl %edx, %eax
29100-DST( movl %edx, 28(%edi) )
29101+DST( movl %edx, %es:28(%edi) )
29102
29103 lea 32(%esi), %esi
29104 lea 32(%edi), %edi
29105@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29106 shrl $2, %edx # This clears CF
29107 SRC(3: movl (%esi), %ebx )
29108 adcl %ebx, %eax
29109-DST( movl %ebx, (%edi) )
29110+DST( movl %ebx, %es:(%edi) )
29111 lea 4(%esi), %esi
29112 lea 4(%edi), %edi
29113 dec %edx
29114@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29115 jb 5f
29116 SRC( movw (%esi), %cx )
29117 leal 2(%esi), %esi
29118-DST( movw %cx, (%edi) )
29119+DST( movw %cx, %es:(%edi) )
29120 leal 2(%edi), %edi
29121 je 6f
29122 shll $16,%ecx
29123 SRC(5: movb (%esi), %cl )
29124-DST( movb %cl, (%edi) )
29125+DST( movb %cl, %es:(%edi) )
29126 6: addl %ecx, %eax
29127 adcl $0, %eax
29128 7:
29129@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29130
29131 6001:
29132 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29133- movl $-EFAULT, (%ebx)
29134+ movl $-EFAULT, %ss:(%ebx)
29135
29136 # zero the complete destination - computing the rest
29137 # is too much work
29138@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29139
29140 6002:
29141 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29142- movl $-EFAULT,(%ebx)
29143+ movl $-EFAULT,%ss:(%ebx)
29144 jmp 5000b
29145
29146 .previous
29147
29148+ pushl_cfi %ss
29149+ popl_cfi %ds
29150+ pushl_cfi %ss
29151+ popl_cfi %es
29152 popl_cfi %ebx
29153 CFI_RESTORE ebx
29154 popl_cfi %esi
29155@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29156 popl_cfi %ecx # equivalent to addl $4,%esp
29157 ret
29158 CFI_ENDPROC
29159-ENDPROC(csum_partial_copy_generic)
29160+ENDPROC(csum_partial_copy_generic_to_user)
29161
29162 #else
29163
29164 /* Version for PentiumII/PPro */
29165
29166 #define ROUND1(x) \
29167+ nop; nop; nop; \
29168 SRC(movl x(%esi), %ebx ) ; \
29169 addl %ebx, %eax ; \
29170- DST(movl %ebx, x(%edi) ) ;
29171+ DST(movl %ebx, %es:x(%edi)) ;
29172
29173 #define ROUND(x) \
29174+ nop; nop; nop; \
29175 SRC(movl x(%esi), %ebx ) ; \
29176 adcl %ebx, %eax ; \
29177- DST(movl %ebx, x(%edi) ) ;
29178+ DST(movl %ebx, %es:x(%edi)) ;
29179
29180 #define ARGBASE 12
29181-
29182-ENTRY(csum_partial_copy_generic)
29183+
29184+ENTRY(csum_partial_copy_generic_to_user)
29185 CFI_STARTPROC
29186+
29187+#ifdef CONFIG_PAX_MEMORY_UDEREF
29188+ pushl_cfi %gs
29189+ popl_cfi %es
29190+ jmp csum_partial_copy_generic
29191+#endif
29192+
29193+ENTRY(csum_partial_copy_generic_from_user)
29194+
29195+#ifdef CONFIG_PAX_MEMORY_UDEREF
29196+ pushl_cfi %gs
29197+ popl_cfi %ds
29198+#endif
29199+
29200+ENTRY(csum_partial_copy_generic)
29201 pushl_cfi %ebx
29202 CFI_REL_OFFSET ebx, 0
29203 pushl_cfi %edi
29204@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29205 subl %ebx, %edi
29206 lea -1(%esi),%edx
29207 andl $-32,%edx
29208- lea 3f(%ebx,%ebx), %ebx
29209+ lea 3f(%ebx,%ebx,2), %ebx
29210 testl %esi, %esi
29211 jmp *%ebx
29212 1: addl $64,%esi
29213@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29214 jb 5f
29215 SRC( movw (%esi), %dx )
29216 leal 2(%esi), %esi
29217-DST( movw %dx, (%edi) )
29218+DST( movw %dx, %es:(%edi) )
29219 leal 2(%edi), %edi
29220 je 6f
29221 shll $16,%edx
29222 5:
29223 SRC( movb (%esi), %dl )
29224-DST( movb %dl, (%edi) )
29225+DST( movb %dl, %es:(%edi) )
29226 6: addl %edx, %eax
29227 adcl $0, %eax
29228 7:
29229 .section .fixup, "ax"
29230 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29231- movl $-EFAULT, (%ebx)
29232+ movl $-EFAULT, %ss:(%ebx)
29233 # zero the complete destination (computing the rest is too much work)
29234 movl ARGBASE+8(%esp),%edi # dst
29235 movl ARGBASE+12(%esp),%ecx # len
29236@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29237 rep; stosb
29238 jmp 7b
29239 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29240- movl $-EFAULT, (%ebx)
29241+ movl $-EFAULT, %ss:(%ebx)
29242 jmp 7b
29243 .previous
29244
29245+#ifdef CONFIG_PAX_MEMORY_UDEREF
29246+ pushl_cfi %ss
29247+ popl_cfi %ds
29248+ pushl_cfi %ss
29249+ popl_cfi %es
29250+#endif
29251+
29252 popl_cfi %esi
29253 CFI_RESTORE esi
29254 popl_cfi %edi
29255@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29256 CFI_RESTORE ebx
29257 ret
29258 CFI_ENDPROC
29259-ENDPROC(csum_partial_copy_generic)
29260+ENDPROC(csum_partial_copy_generic_to_user)
29261
29262 #undef ROUND
29263 #undef ROUND1
29264diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29265index f2145cf..cea889d 100644
29266--- a/arch/x86/lib/clear_page_64.S
29267+++ b/arch/x86/lib/clear_page_64.S
29268@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29269 movl $4096/8,%ecx
29270 xorl %eax,%eax
29271 rep stosq
29272+ pax_force_retaddr
29273 ret
29274 CFI_ENDPROC
29275 ENDPROC(clear_page_c)
29276@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29277 movl $4096,%ecx
29278 xorl %eax,%eax
29279 rep stosb
29280+ pax_force_retaddr
29281 ret
29282 CFI_ENDPROC
29283 ENDPROC(clear_page_c_e)
29284@@ -43,6 +45,7 @@ ENTRY(clear_page)
29285 leaq 64(%rdi),%rdi
29286 jnz .Lloop
29287 nop
29288+ pax_force_retaddr
29289 ret
29290 CFI_ENDPROC
29291 .Lclear_page_end:
29292@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29293
29294 #include <asm/cpufeature.h>
29295
29296- .section .altinstr_replacement,"ax"
29297+ .section .altinstr_replacement,"a"
29298 1: .byte 0xeb /* jmp <disp8> */
29299 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29300 2: .byte 0xeb /* jmp <disp8> */
29301diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29302index 1e572c5..2a162cd 100644
29303--- a/arch/x86/lib/cmpxchg16b_emu.S
29304+++ b/arch/x86/lib/cmpxchg16b_emu.S
29305@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
29306
29307 popf
29308 mov $1, %al
29309+ pax_force_retaddr
29310 ret
29311
29312 not_same:
29313 popf
29314 xor %al,%al
29315+ pax_force_retaddr
29316 ret
29317
29318 CFI_ENDPROC
29319diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29320index 176cca6..e0d658e 100644
29321--- a/arch/x86/lib/copy_page_64.S
29322+++ b/arch/x86/lib/copy_page_64.S
29323@@ -9,6 +9,7 @@ copy_page_rep:
29324 CFI_STARTPROC
29325 movl $4096/8, %ecx
29326 rep movsq
29327+ pax_force_retaddr
29328 ret
29329 CFI_ENDPROC
29330 ENDPROC(copy_page_rep)
29331@@ -24,8 +25,8 @@ ENTRY(copy_page)
29332 CFI_ADJUST_CFA_OFFSET 2*8
29333 movq %rbx, (%rsp)
29334 CFI_REL_OFFSET rbx, 0
29335- movq %r12, 1*8(%rsp)
29336- CFI_REL_OFFSET r12, 1*8
29337+ movq %r13, 1*8(%rsp)
29338+ CFI_REL_OFFSET r13, 1*8
29339
29340 movl $(4096/64)-5, %ecx
29341 .p2align 4
29342@@ -38,7 +39,7 @@ ENTRY(copy_page)
29343 movq 0x8*4(%rsi), %r9
29344 movq 0x8*5(%rsi), %r10
29345 movq 0x8*6(%rsi), %r11
29346- movq 0x8*7(%rsi), %r12
29347+ movq 0x8*7(%rsi), %r13
29348
29349 prefetcht0 5*64(%rsi)
29350
29351@@ -49,7 +50,7 @@ ENTRY(copy_page)
29352 movq %r9, 0x8*4(%rdi)
29353 movq %r10, 0x8*5(%rdi)
29354 movq %r11, 0x8*6(%rdi)
29355- movq %r12, 0x8*7(%rdi)
29356+ movq %r13, 0x8*7(%rdi)
29357
29358 leaq 64 (%rsi), %rsi
29359 leaq 64 (%rdi), %rdi
29360@@ -68,7 +69,7 @@ ENTRY(copy_page)
29361 movq 0x8*4(%rsi), %r9
29362 movq 0x8*5(%rsi), %r10
29363 movq 0x8*6(%rsi), %r11
29364- movq 0x8*7(%rsi), %r12
29365+ movq 0x8*7(%rsi), %r13
29366
29367 movq %rax, 0x8*0(%rdi)
29368 movq %rbx, 0x8*1(%rdi)
29369@@ -77,7 +78,7 @@ ENTRY(copy_page)
29370 movq %r9, 0x8*4(%rdi)
29371 movq %r10, 0x8*5(%rdi)
29372 movq %r11, 0x8*6(%rdi)
29373- movq %r12, 0x8*7(%rdi)
29374+ movq %r13, 0x8*7(%rdi)
29375
29376 leaq 64(%rdi), %rdi
29377 leaq 64(%rsi), %rsi
29378@@ -85,10 +86,11 @@ ENTRY(copy_page)
29379
29380 movq (%rsp), %rbx
29381 CFI_RESTORE rbx
29382- movq 1*8(%rsp), %r12
29383- CFI_RESTORE r12
29384+ movq 1*8(%rsp), %r13
29385+ CFI_RESTORE r13
29386 addq $2*8, %rsp
29387 CFI_ADJUST_CFA_OFFSET -2*8
29388+ pax_force_retaddr
29389 ret
29390 .Lcopy_page_end:
29391 CFI_ENDPROC
29392@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29393
29394 #include <asm/cpufeature.h>
29395
29396- .section .altinstr_replacement,"ax"
29397+ .section .altinstr_replacement,"a"
29398 1: .byte 0xeb /* jmp <disp8> */
29399 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29400 2:
29401diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29402index dee945d..a84067b 100644
29403--- a/arch/x86/lib/copy_user_64.S
29404+++ b/arch/x86/lib/copy_user_64.S
29405@@ -18,31 +18,7 @@
29406 #include <asm/alternative-asm.h>
29407 #include <asm/asm.h>
29408 #include <asm/smap.h>
29409-
29410-/*
29411- * By placing feature2 after feature1 in altinstructions section, we logically
29412- * implement:
29413- * If CPU has feature2, jmp to alt2 is used
29414- * else if CPU has feature1, jmp to alt1 is used
29415- * else jmp to orig is used.
29416- */
29417- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29418-0:
29419- .byte 0xe9 /* 32bit jump */
29420- .long \orig-1f /* by default jump to orig */
29421-1:
29422- .section .altinstr_replacement,"ax"
29423-2: .byte 0xe9 /* near jump with 32bit immediate */
29424- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29425-3: .byte 0xe9 /* near jump with 32bit immediate */
29426- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29427- .previous
29428-
29429- .section .altinstructions,"a"
29430- altinstruction_entry 0b,2b,\feature1,5,5
29431- altinstruction_entry 0b,3b,\feature2,5,5
29432- .previous
29433- .endm
29434+#include <asm/pgtable.h>
29435
29436 .macro ALIGN_DESTINATION
29437 #ifdef FIX_ALIGNMENT
29438@@ -70,52 +46,6 @@
29439 #endif
29440 .endm
29441
29442-/* Standard copy_to_user with segment limit checking */
29443-ENTRY(_copy_to_user)
29444- CFI_STARTPROC
29445- GET_THREAD_INFO(%rax)
29446- movq %rdi,%rcx
29447- addq %rdx,%rcx
29448- jc bad_to_user
29449- cmpq TI_addr_limit(%rax),%rcx
29450- ja bad_to_user
29451- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29452- copy_user_generic_unrolled,copy_user_generic_string, \
29453- copy_user_enhanced_fast_string
29454- CFI_ENDPROC
29455-ENDPROC(_copy_to_user)
29456-
29457-/* Standard copy_from_user with segment limit checking */
29458-ENTRY(_copy_from_user)
29459- CFI_STARTPROC
29460- GET_THREAD_INFO(%rax)
29461- movq %rsi,%rcx
29462- addq %rdx,%rcx
29463- jc bad_from_user
29464- cmpq TI_addr_limit(%rax),%rcx
29465- ja bad_from_user
29466- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29467- copy_user_generic_unrolled,copy_user_generic_string, \
29468- copy_user_enhanced_fast_string
29469- CFI_ENDPROC
29470-ENDPROC(_copy_from_user)
29471-
29472- .section .fixup,"ax"
29473- /* must zero dest */
29474-ENTRY(bad_from_user)
29475-bad_from_user:
29476- CFI_STARTPROC
29477- movl %edx,%ecx
29478- xorl %eax,%eax
29479- rep
29480- stosb
29481-bad_to_user:
29482- movl %edx,%eax
29483- ret
29484- CFI_ENDPROC
29485-ENDPROC(bad_from_user)
29486- .previous
29487-
29488 /*
29489 * copy_user_generic_unrolled - memory copy with exception handling.
29490 * This version is for CPUs like P4 that don't have efficient micro
29491@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29492 */
29493 ENTRY(copy_user_generic_unrolled)
29494 CFI_STARTPROC
29495+ ASM_PAX_OPEN_USERLAND
29496 ASM_STAC
29497 cmpl $8,%edx
29498 jb 20f /* less then 8 bytes, go to byte copy loop */
29499@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29500 jnz 21b
29501 23: xor %eax,%eax
29502 ASM_CLAC
29503+ ASM_PAX_CLOSE_USERLAND
29504+ pax_force_retaddr
29505 ret
29506
29507 .section .fixup,"ax"
29508@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29509 */
29510 ENTRY(copy_user_generic_string)
29511 CFI_STARTPROC
29512+ ASM_PAX_OPEN_USERLAND
29513 ASM_STAC
29514 cmpl $8,%edx
29515 jb 2f /* less than 8 bytes, go to byte copy loop */
29516@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29517 movsb
29518 xorl %eax,%eax
29519 ASM_CLAC
29520+ ASM_PAX_CLOSE_USERLAND
29521+ pax_force_retaddr
29522 ret
29523
29524 .section .fixup,"ax"
29525@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29526 */
29527 ENTRY(copy_user_enhanced_fast_string)
29528 CFI_STARTPROC
29529+ ASM_PAX_OPEN_USERLAND
29530 ASM_STAC
29531 movl %edx,%ecx
29532 1: rep
29533 movsb
29534 xorl %eax,%eax
29535 ASM_CLAC
29536+ ASM_PAX_CLOSE_USERLAND
29537+ pax_force_retaddr
29538 ret
29539
29540 .section .fixup,"ax"
29541diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29542index 6a4f43c..c70fb52 100644
29543--- a/arch/x86/lib/copy_user_nocache_64.S
29544+++ b/arch/x86/lib/copy_user_nocache_64.S
29545@@ -8,6 +8,7 @@
29546
29547 #include <linux/linkage.h>
29548 #include <asm/dwarf2.h>
29549+#include <asm/alternative-asm.h>
29550
29551 #define FIX_ALIGNMENT 1
29552
29553@@ -16,6 +17,7 @@
29554 #include <asm/thread_info.h>
29555 #include <asm/asm.h>
29556 #include <asm/smap.h>
29557+#include <asm/pgtable.h>
29558
29559 .macro ALIGN_DESTINATION
29560 #ifdef FIX_ALIGNMENT
29561@@ -49,6 +51,16 @@
29562 */
29563 ENTRY(__copy_user_nocache)
29564 CFI_STARTPROC
29565+
29566+#ifdef CONFIG_PAX_MEMORY_UDEREF
29567+ mov pax_user_shadow_base,%rcx
29568+ cmp %rcx,%rsi
29569+ jae 1f
29570+ add %rcx,%rsi
29571+1:
29572+#endif
29573+
29574+ ASM_PAX_OPEN_USERLAND
29575 ASM_STAC
29576 cmpl $8,%edx
29577 jb 20f /* less then 8 bytes, go to byte copy loop */
29578@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29579 jnz 21b
29580 23: xorl %eax,%eax
29581 ASM_CLAC
29582+ ASM_PAX_CLOSE_USERLAND
29583 sfence
29584+ pax_force_retaddr
29585 ret
29586
29587 .section .fixup,"ax"
29588diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29589index 2419d5f..fe52d0e 100644
29590--- a/arch/x86/lib/csum-copy_64.S
29591+++ b/arch/x86/lib/csum-copy_64.S
29592@@ -9,6 +9,7 @@
29593 #include <asm/dwarf2.h>
29594 #include <asm/errno.h>
29595 #include <asm/asm.h>
29596+#include <asm/alternative-asm.h>
29597
29598 /*
29599 * Checksum copy with exception handling.
29600@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
29601 CFI_ADJUST_CFA_OFFSET 7*8
29602 movq %rbx, 2*8(%rsp)
29603 CFI_REL_OFFSET rbx, 2*8
29604- movq %r12, 3*8(%rsp)
29605- CFI_REL_OFFSET r12, 3*8
29606+ movq %r15, 3*8(%rsp)
29607+ CFI_REL_OFFSET r15, 3*8
29608 movq %r14, 4*8(%rsp)
29609 CFI_REL_OFFSET r14, 4*8
29610 movq %r13, 5*8(%rsp)
29611@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
29612 movl %edx, %ecx
29613
29614 xorl %r9d, %r9d
29615- movq %rcx, %r12
29616+ movq %rcx, %r15
29617
29618- shrq $6, %r12
29619+ shrq $6, %r15
29620 jz .Lhandle_tail /* < 64 */
29621
29622 clc
29623
29624 /* main loop. clear in 64 byte blocks */
29625 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
29626- /* r11: temp3, rdx: temp4, r12 loopcnt */
29627+ /* r11: temp3, rdx: temp4, r15 loopcnt */
29628 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
29629 .p2align 4
29630 .Lloop:
29631@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
29632 adcq %r14, %rax
29633 adcq %r13, %rax
29634
29635- decl %r12d
29636+ decl %r15d
29637
29638 dest
29639 movq %rbx, (%rsi)
29640@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
29641 .Lende:
29642 movq 2*8(%rsp), %rbx
29643 CFI_RESTORE rbx
29644- movq 3*8(%rsp), %r12
29645- CFI_RESTORE r12
29646+ movq 3*8(%rsp), %r15
29647+ CFI_RESTORE r15
29648 movq 4*8(%rsp), %r14
29649 CFI_RESTORE r14
29650 movq 5*8(%rsp), %r13
29651@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
29652 CFI_RESTORE rbp
29653 addq $7*8, %rsp
29654 CFI_ADJUST_CFA_OFFSET -7*8
29655+ pax_force_retaddr
29656 ret
29657 CFI_RESTORE_STATE
29658
29659diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
29660index 7609e0e..b449b98 100644
29661--- a/arch/x86/lib/csum-wrappers_64.c
29662+++ b/arch/x86/lib/csum-wrappers_64.c
29663@@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
29664 len -= 2;
29665 }
29666 }
29667+ pax_open_userland();
29668 stac();
29669- isum = csum_partial_copy_generic((__force const void *)src,
29670+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
29671 dst, len, isum, errp, NULL);
29672 clac();
29673+ pax_close_userland();
29674 if (unlikely(*errp))
29675 goto out_err;
29676
29677@@ -110,10 +112,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
29678 }
29679
29680 *errp = 0;
29681+ pax_open_userland();
29682 stac();
29683- ret = csum_partial_copy_generic(src, (void __force *)dst,
29684+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
29685 len, isum, NULL, errp);
29686 clac();
29687+ pax_close_userland();
29688 return ret;
29689 }
29690 EXPORT_SYMBOL(csum_partial_copy_to_user);
29691diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
29692index a451235..1daa956 100644
29693--- a/arch/x86/lib/getuser.S
29694+++ b/arch/x86/lib/getuser.S
29695@@ -33,17 +33,40 @@
29696 #include <asm/thread_info.h>
29697 #include <asm/asm.h>
29698 #include <asm/smap.h>
29699+#include <asm/segment.h>
29700+#include <asm/pgtable.h>
29701+#include <asm/alternative-asm.h>
29702+
29703+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29704+#define __copyuser_seg gs;
29705+#else
29706+#define __copyuser_seg
29707+#endif
29708
29709 .text
29710 ENTRY(__get_user_1)
29711 CFI_STARTPROC
29712+
29713+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29714 GET_THREAD_INFO(%_ASM_DX)
29715 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29716 jae bad_get_user
29717 ASM_STAC
29718-1: movzbl (%_ASM_AX),%edx
29719+
29720+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29721+ mov pax_user_shadow_base,%_ASM_DX
29722+ cmp %_ASM_DX,%_ASM_AX
29723+ jae 1234f
29724+ add %_ASM_DX,%_ASM_AX
29725+1234:
29726+#endif
29727+
29728+#endif
29729+
29730+1: __copyuser_seg movzbl (%_ASM_AX),%edx
29731 xor %eax,%eax
29732 ASM_CLAC
29733+ pax_force_retaddr
29734 ret
29735 CFI_ENDPROC
29736 ENDPROC(__get_user_1)
29737@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
29738 ENTRY(__get_user_2)
29739 CFI_STARTPROC
29740 add $1,%_ASM_AX
29741+
29742+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29743 jc bad_get_user
29744 GET_THREAD_INFO(%_ASM_DX)
29745 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29746 jae bad_get_user
29747 ASM_STAC
29748-2: movzwl -1(%_ASM_AX),%edx
29749+
29750+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29751+ mov pax_user_shadow_base,%_ASM_DX
29752+ cmp %_ASM_DX,%_ASM_AX
29753+ jae 1234f
29754+ add %_ASM_DX,%_ASM_AX
29755+1234:
29756+#endif
29757+
29758+#endif
29759+
29760+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
29761 xor %eax,%eax
29762 ASM_CLAC
29763+ pax_force_retaddr
29764 ret
29765 CFI_ENDPROC
29766 ENDPROC(__get_user_2)
29767@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
29768 ENTRY(__get_user_4)
29769 CFI_STARTPROC
29770 add $3,%_ASM_AX
29771+
29772+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
29773 jc bad_get_user
29774 GET_THREAD_INFO(%_ASM_DX)
29775 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29776 jae bad_get_user
29777 ASM_STAC
29778-3: movl -3(%_ASM_AX),%edx
29779+
29780+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
29781+ mov pax_user_shadow_base,%_ASM_DX
29782+ cmp %_ASM_DX,%_ASM_AX
29783+ jae 1234f
29784+ add %_ASM_DX,%_ASM_AX
29785+1234:
29786+#endif
29787+
29788+#endif
29789+
29790+3: __copyuser_seg movl -3(%_ASM_AX),%edx
29791 xor %eax,%eax
29792 ASM_CLAC
29793+ pax_force_retaddr
29794 ret
29795 CFI_ENDPROC
29796 ENDPROC(__get_user_4)
29797@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
29798 GET_THREAD_INFO(%_ASM_DX)
29799 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29800 jae bad_get_user
29801+
29802+#ifdef CONFIG_PAX_MEMORY_UDEREF
29803+ mov pax_user_shadow_base,%_ASM_DX
29804+ cmp %_ASM_DX,%_ASM_AX
29805+ jae 1234f
29806+ add %_ASM_DX,%_ASM_AX
29807+1234:
29808+#endif
29809+
29810 ASM_STAC
29811 4: movq -7(%_ASM_AX),%rdx
29812 xor %eax,%eax
29813 ASM_CLAC
29814+ pax_force_retaddr
29815 ret
29816 #else
29817 add $7,%_ASM_AX
29818@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
29819 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
29820 jae bad_get_user_8
29821 ASM_STAC
29822-4: movl -7(%_ASM_AX),%edx
29823-5: movl -3(%_ASM_AX),%ecx
29824+4: __copyuser_seg movl -7(%_ASM_AX),%edx
29825+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
29826 xor %eax,%eax
29827 ASM_CLAC
29828+ pax_force_retaddr
29829 ret
29830 #endif
29831 CFI_ENDPROC
29832@@ -113,6 +175,7 @@ bad_get_user:
29833 xor %edx,%edx
29834 mov $(-EFAULT),%_ASM_AX
29835 ASM_CLAC
29836+ pax_force_retaddr
29837 ret
29838 CFI_ENDPROC
29839 END(bad_get_user)
29840@@ -124,6 +187,7 @@ bad_get_user_8:
29841 xor %ecx,%ecx
29842 mov $(-EFAULT),%_ASM_AX
29843 ASM_CLAC
29844+ pax_force_retaddr
29845 ret
29846 CFI_ENDPROC
29847 END(bad_get_user_8)
29848diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
29849index 54fcffe..7be149e 100644
29850--- a/arch/x86/lib/insn.c
29851+++ b/arch/x86/lib/insn.c
29852@@ -20,8 +20,10 @@
29853
29854 #ifdef __KERNEL__
29855 #include <linux/string.h>
29856+#include <asm/pgtable_types.h>
29857 #else
29858 #include <string.h>
29859+#define ktla_ktva(addr) addr
29860 #endif
29861 #include <asm/inat.h>
29862 #include <asm/insn.h>
29863@@ -53,8 +55,8 @@
29864 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
29865 {
29866 memset(insn, 0, sizeof(*insn));
29867- insn->kaddr = kaddr;
29868- insn->next_byte = kaddr;
29869+ insn->kaddr = ktla_ktva(kaddr);
29870+ insn->next_byte = ktla_ktva(kaddr);
29871 insn->x86_64 = x86_64 ? 1 : 0;
29872 insn->opnd_bytes = 4;
29873 if (x86_64)
29874diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
29875index 05a95e7..326f2fa 100644
29876--- a/arch/x86/lib/iomap_copy_64.S
29877+++ b/arch/x86/lib/iomap_copy_64.S
29878@@ -17,6 +17,7 @@
29879
29880 #include <linux/linkage.h>
29881 #include <asm/dwarf2.h>
29882+#include <asm/alternative-asm.h>
29883
29884 /*
29885 * override generic version in lib/iomap_copy.c
29886@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
29887 CFI_STARTPROC
29888 movl %edx,%ecx
29889 rep movsd
29890+ pax_force_retaddr
29891 ret
29892 CFI_ENDPROC
29893 ENDPROC(__iowrite32_copy)
29894diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
29895index 56313a3..0db417e 100644
29896--- a/arch/x86/lib/memcpy_64.S
29897+++ b/arch/x86/lib/memcpy_64.S
29898@@ -24,7 +24,7 @@
29899 * This gets patched over the unrolled variant (below) via the
29900 * alternative instructions framework:
29901 */
29902- .section .altinstr_replacement, "ax", @progbits
29903+ .section .altinstr_replacement, "a", @progbits
29904 .Lmemcpy_c:
29905 movq %rdi, %rax
29906 movq %rdx, %rcx
29907@@ -33,6 +33,7 @@
29908 rep movsq
29909 movl %edx, %ecx
29910 rep movsb
29911+ pax_force_retaddr
29912 ret
29913 .Lmemcpy_e:
29914 .previous
29915@@ -44,11 +45,12 @@
29916 * This gets patched over the unrolled variant (below) via the
29917 * alternative instructions framework:
29918 */
29919- .section .altinstr_replacement, "ax", @progbits
29920+ .section .altinstr_replacement, "a", @progbits
29921 .Lmemcpy_c_e:
29922 movq %rdi, %rax
29923 movq %rdx, %rcx
29924 rep movsb
29925+ pax_force_retaddr
29926 ret
29927 .Lmemcpy_e_e:
29928 .previous
29929@@ -136,6 +138,7 @@ ENTRY(memcpy)
29930 movq %r9, 1*8(%rdi)
29931 movq %r10, -2*8(%rdi, %rdx)
29932 movq %r11, -1*8(%rdi, %rdx)
29933+ pax_force_retaddr
29934 retq
29935 .p2align 4
29936 .Lless_16bytes:
29937@@ -148,6 +151,7 @@ ENTRY(memcpy)
29938 movq -1*8(%rsi, %rdx), %r9
29939 movq %r8, 0*8(%rdi)
29940 movq %r9, -1*8(%rdi, %rdx)
29941+ pax_force_retaddr
29942 retq
29943 .p2align 4
29944 .Lless_8bytes:
29945@@ -161,6 +165,7 @@ ENTRY(memcpy)
29946 movl -4(%rsi, %rdx), %r8d
29947 movl %ecx, (%rdi)
29948 movl %r8d, -4(%rdi, %rdx)
29949+ pax_force_retaddr
29950 retq
29951 .p2align 4
29952 .Lless_3bytes:
29953@@ -179,6 +184,7 @@ ENTRY(memcpy)
29954 movb %cl, (%rdi)
29955
29956 .Lend:
29957+ pax_force_retaddr
29958 retq
29959 CFI_ENDPROC
29960 ENDPROC(memcpy)
29961diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
29962index 65268a6..dd1de11 100644
29963--- a/arch/x86/lib/memmove_64.S
29964+++ b/arch/x86/lib/memmove_64.S
29965@@ -202,14 +202,16 @@ ENTRY(memmove)
29966 movb (%rsi), %r11b
29967 movb %r11b, (%rdi)
29968 13:
29969+ pax_force_retaddr
29970 retq
29971 CFI_ENDPROC
29972
29973- .section .altinstr_replacement,"ax"
29974+ .section .altinstr_replacement,"a"
29975 .Lmemmove_begin_forward_efs:
29976 /* Forward moving data. */
29977 movq %rdx, %rcx
29978 rep movsb
29979+ pax_force_retaddr
29980 retq
29981 .Lmemmove_end_forward_efs:
29982 .previous
29983diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
29984index 2dcb380..2eb79fe 100644
29985--- a/arch/x86/lib/memset_64.S
29986+++ b/arch/x86/lib/memset_64.S
29987@@ -16,7 +16,7 @@
29988 *
29989 * rax original destination
29990 */
29991- .section .altinstr_replacement, "ax", @progbits
29992+ .section .altinstr_replacement, "a", @progbits
29993 .Lmemset_c:
29994 movq %rdi,%r9
29995 movq %rdx,%rcx
29996@@ -30,6 +30,7 @@
29997 movl %edx,%ecx
29998 rep stosb
29999 movq %r9,%rax
30000+ pax_force_retaddr
30001 ret
30002 .Lmemset_e:
30003 .previous
30004@@ -45,13 +46,14 @@
30005 *
30006 * rax original destination
30007 */
30008- .section .altinstr_replacement, "ax", @progbits
30009+ .section .altinstr_replacement, "a", @progbits
30010 .Lmemset_c_e:
30011 movq %rdi,%r9
30012 movb %sil,%al
30013 movq %rdx,%rcx
30014 rep stosb
30015 movq %r9,%rax
30016+ pax_force_retaddr
30017 ret
30018 .Lmemset_e_e:
30019 .previous
30020@@ -118,6 +120,7 @@ ENTRY(__memset)
30021
30022 .Lende:
30023 movq %r10,%rax
30024+ pax_force_retaddr
30025 ret
30026
30027 CFI_RESTORE_STATE
30028diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30029index c9f2d9b..e7fd2c0 100644
30030--- a/arch/x86/lib/mmx_32.c
30031+++ b/arch/x86/lib/mmx_32.c
30032@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30033 {
30034 void *p;
30035 int i;
30036+ unsigned long cr0;
30037
30038 if (unlikely(in_interrupt()))
30039 return __memcpy(to, from, len);
30040@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30041 kernel_fpu_begin();
30042
30043 __asm__ __volatile__ (
30044- "1: prefetch (%0)\n" /* This set is 28 bytes */
30045- " prefetch 64(%0)\n"
30046- " prefetch 128(%0)\n"
30047- " prefetch 192(%0)\n"
30048- " prefetch 256(%0)\n"
30049+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30050+ " prefetch 64(%1)\n"
30051+ " prefetch 128(%1)\n"
30052+ " prefetch 192(%1)\n"
30053+ " prefetch 256(%1)\n"
30054 "2: \n"
30055 ".section .fixup, \"ax\"\n"
30056- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30057+ "3: \n"
30058+
30059+#ifdef CONFIG_PAX_KERNEXEC
30060+ " movl %%cr0, %0\n"
30061+ " movl %0, %%eax\n"
30062+ " andl $0xFFFEFFFF, %%eax\n"
30063+ " movl %%eax, %%cr0\n"
30064+#endif
30065+
30066+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30067+
30068+#ifdef CONFIG_PAX_KERNEXEC
30069+ " movl %0, %%cr0\n"
30070+#endif
30071+
30072 " jmp 2b\n"
30073 ".previous\n"
30074 _ASM_EXTABLE(1b, 3b)
30075- : : "r" (from));
30076+ : "=&r" (cr0) : "r" (from) : "ax");
30077
30078 for ( ; i > 5; i--) {
30079 __asm__ __volatile__ (
30080- "1: prefetch 320(%0)\n"
30081- "2: movq (%0), %%mm0\n"
30082- " movq 8(%0), %%mm1\n"
30083- " movq 16(%0), %%mm2\n"
30084- " movq 24(%0), %%mm3\n"
30085- " movq %%mm0, (%1)\n"
30086- " movq %%mm1, 8(%1)\n"
30087- " movq %%mm2, 16(%1)\n"
30088- " movq %%mm3, 24(%1)\n"
30089- " movq 32(%0), %%mm0\n"
30090- " movq 40(%0), %%mm1\n"
30091- " movq 48(%0), %%mm2\n"
30092- " movq 56(%0), %%mm3\n"
30093- " movq %%mm0, 32(%1)\n"
30094- " movq %%mm1, 40(%1)\n"
30095- " movq %%mm2, 48(%1)\n"
30096- " movq %%mm3, 56(%1)\n"
30097+ "1: prefetch 320(%1)\n"
30098+ "2: movq (%1), %%mm0\n"
30099+ " movq 8(%1), %%mm1\n"
30100+ " movq 16(%1), %%mm2\n"
30101+ " movq 24(%1), %%mm3\n"
30102+ " movq %%mm0, (%2)\n"
30103+ " movq %%mm1, 8(%2)\n"
30104+ " movq %%mm2, 16(%2)\n"
30105+ " movq %%mm3, 24(%2)\n"
30106+ " movq 32(%1), %%mm0\n"
30107+ " movq 40(%1), %%mm1\n"
30108+ " movq 48(%1), %%mm2\n"
30109+ " movq 56(%1), %%mm3\n"
30110+ " movq %%mm0, 32(%2)\n"
30111+ " movq %%mm1, 40(%2)\n"
30112+ " movq %%mm2, 48(%2)\n"
30113+ " movq %%mm3, 56(%2)\n"
30114 ".section .fixup, \"ax\"\n"
30115- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30116+ "3:\n"
30117+
30118+#ifdef CONFIG_PAX_KERNEXEC
30119+ " movl %%cr0, %0\n"
30120+ " movl %0, %%eax\n"
30121+ " andl $0xFFFEFFFF, %%eax\n"
30122+ " movl %%eax, %%cr0\n"
30123+#endif
30124+
30125+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30126+
30127+#ifdef CONFIG_PAX_KERNEXEC
30128+ " movl %0, %%cr0\n"
30129+#endif
30130+
30131 " jmp 2b\n"
30132 ".previous\n"
30133 _ASM_EXTABLE(1b, 3b)
30134- : : "r" (from), "r" (to) : "memory");
30135+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30136
30137 from += 64;
30138 to += 64;
30139@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30140 static void fast_copy_page(void *to, void *from)
30141 {
30142 int i;
30143+ unsigned long cr0;
30144
30145 kernel_fpu_begin();
30146
30147@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30148 * but that is for later. -AV
30149 */
30150 __asm__ __volatile__(
30151- "1: prefetch (%0)\n"
30152- " prefetch 64(%0)\n"
30153- " prefetch 128(%0)\n"
30154- " prefetch 192(%0)\n"
30155- " prefetch 256(%0)\n"
30156+ "1: prefetch (%1)\n"
30157+ " prefetch 64(%1)\n"
30158+ " prefetch 128(%1)\n"
30159+ " prefetch 192(%1)\n"
30160+ " prefetch 256(%1)\n"
30161 "2: \n"
30162 ".section .fixup, \"ax\"\n"
30163- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30164+ "3: \n"
30165+
30166+#ifdef CONFIG_PAX_KERNEXEC
30167+ " movl %%cr0, %0\n"
30168+ " movl %0, %%eax\n"
30169+ " andl $0xFFFEFFFF, %%eax\n"
30170+ " movl %%eax, %%cr0\n"
30171+#endif
30172+
30173+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30174+
30175+#ifdef CONFIG_PAX_KERNEXEC
30176+ " movl %0, %%cr0\n"
30177+#endif
30178+
30179 " jmp 2b\n"
30180 ".previous\n"
30181- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30182+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30183
30184 for (i = 0; i < (4096-320)/64; i++) {
30185 __asm__ __volatile__ (
30186- "1: prefetch 320(%0)\n"
30187- "2: movq (%0), %%mm0\n"
30188- " movntq %%mm0, (%1)\n"
30189- " movq 8(%0), %%mm1\n"
30190- " movntq %%mm1, 8(%1)\n"
30191- " movq 16(%0), %%mm2\n"
30192- " movntq %%mm2, 16(%1)\n"
30193- " movq 24(%0), %%mm3\n"
30194- " movntq %%mm3, 24(%1)\n"
30195- " movq 32(%0), %%mm4\n"
30196- " movntq %%mm4, 32(%1)\n"
30197- " movq 40(%0), %%mm5\n"
30198- " movntq %%mm5, 40(%1)\n"
30199- " movq 48(%0), %%mm6\n"
30200- " movntq %%mm6, 48(%1)\n"
30201- " movq 56(%0), %%mm7\n"
30202- " movntq %%mm7, 56(%1)\n"
30203+ "1: prefetch 320(%1)\n"
30204+ "2: movq (%1), %%mm0\n"
30205+ " movntq %%mm0, (%2)\n"
30206+ " movq 8(%1), %%mm1\n"
30207+ " movntq %%mm1, 8(%2)\n"
30208+ " movq 16(%1), %%mm2\n"
30209+ " movntq %%mm2, 16(%2)\n"
30210+ " movq 24(%1), %%mm3\n"
30211+ " movntq %%mm3, 24(%2)\n"
30212+ " movq 32(%1), %%mm4\n"
30213+ " movntq %%mm4, 32(%2)\n"
30214+ " movq 40(%1), %%mm5\n"
30215+ " movntq %%mm5, 40(%2)\n"
30216+ " movq 48(%1), %%mm6\n"
30217+ " movntq %%mm6, 48(%2)\n"
30218+ " movq 56(%1), %%mm7\n"
30219+ " movntq %%mm7, 56(%2)\n"
30220 ".section .fixup, \"ax\"\n"
30221- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30222+ "3:\n"
30223+
30224+#ifdef CONFIG_PAX_KERNEXEC
30225+ " movl %%cr0, %0\n"
30226+ " movl %0, %%eax\n"
30227+ " andl $0xFFFEFFFF, %%eax\n"
30228+ " movl %%eax, %%cr0\n"
30229+#endif
30230+
30231+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30232+
30233+#ifdef CONFIG_PAX_KERNEXEC
30234+ " movl %0, %%cr0\n"
30235+#endif
30236+
30237 " jmp 2b\n"
30238 ".previous\n"
30239- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30240+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30241
30242 from += 64;
30243 to += 64;
30244@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30245 static void fast_copy_page(void *to, void *from)
30246 {
30247 int i;
30248+ unsigned long cr0;
30249
30250 kernel_fpu_begin();
30251
30252 __asm__ __volatile__ (
30253- "1: prefetch (%0)\n"
30254- " prefetch 64(%0)\n"
30255- " prefetch 128(%0)\n"
30256- " prefetch 192(%0)\n"
30257- " prefetch 256(%0)\n"
30258+ "1: prefetch (%1)\n"
30259+ " prefetch 64(%1)\n"
30260+ " prefetch 128(%1)\n"
30261+ " prefetch 192(%1)\n"
30262+ " prefetch 256(%1)\n"
30263 "2: \n"
30264 ".section .fixup, \"ax\"\n"
30265- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30266+ "3: \n"
30267+
30268+#ifdef CONFIG_PAX_KERNEXEC
30269+ " movl %%cr0, %0\n"
30270+ " movl %0, %%eax\n"
30271+ " andl $0xFFFEFFFF, %%eax\n"
30272+ " movl %%eax, %%cr0\n"
30273+#endif
30274+
30275+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30276+
30277+#ifdef CONFIG_PAX_KERNEXEC
30278+ " movl %0, %%cr0\n"
30279+#endif
30280+
30281 " jmp 2b\n"
30282 ".previous\n"
30283- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30284+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30285
30286 for (i = 0; i < 4096/64; i++) {
30287 __asm__ __volatile__ (
30288- "1: prefetch 320(%0)\n"
30289- "2: movq (%0), %%mm0\n"
30290- " movq 8(%0), %%mm1\n"
30291- " movq 16(%0), %%mm2\n"
30292- " movq 24(%0), %%mm3\n"
30293- " movq %%mm0, (%1)\n"
30294- " movq %%mm1, 8(%1)\n"
30295- " movq %%mm2, 16(%1)\n"
30296- " movq %%mm3, 24(%1)\n"
30297- " movq 32(%0), %%mm0\n"
30298- " movq 40(%0), %%mm1\n"
30299- " movq 48(%0), %%mm2\n"
30300- " movq 56(%0), %%mm3\n"
30301- " movq %%mm0, 32(%1)\n"
30302- " movq %%mm1, 40(%1)\n"
30303- " movq %%mm2, 48(%1)\n"
30304- " movq %%mm3, 56(%1)\n"
30305+ "1: prefetch 320(%1)\n"
30306+ "2: movq (%1), %%mm0\n"
30307+ " movq 8(%1), %%mm1\n"
30308+ " movq 16(%1), %%mm2\n"
30309+ " movq 24(%1), %%mm3\n"
30310+ " movq %%mm0, (%2)\n"
30311+ " movq %%mm1, 8(%2)\n"
30312+ " movq %%mm2, 16(%2)\n"
30313+ " movq %%mm3, 24(%2)\n"
30314+ " movq 32(%1), %%mm0\n"
30315+ " movq 40(%1), %%mm1\n"
30316+ " movq 48(%1), %%mm2\n"
30317+ " movq 56(%1), %%mm3\n"
30318+ " movq %%mm0, 32(%2)\n"
30319+ " movq %%mm1, 40(%2)\n"
30320+ " movq %%mm2, 48(%2)\n"
30321+ " movq %%mm3, 56(%2)\n"
30322 ".section .fixup, \"ax\"\n"
30323- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30324+ "3:\n"
30325+
30326+#ifdef CONFIG_PAX_KERNEXEC
30327+ " movl %%cr0, %0\n"
30328+ " movl %0, %%eax\n"
30329+ " andl $0xFFFEFFFF, %%eax\n"
30330+ " movl %%eax, %%cr0\n"
30331+#endif
30332+
30333+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30334+
30335+#ifdef CONFIG_PAX_KERNEXEC
30336+ " movl %0, %%cr0\n"
30337+#endif
30338+
30339 " jmp 2b\n"
30340 ".previous\n"
30341 _ASM_EXTABLE(1b, 3b)
30342- : : "r" (from), "r" (to) : "memory");
30343+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30344
30345 from += 64;
30346 to += 64;
30347diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30348index f6d13ee..d789440 100644
30349--- a/arch/x86/lib/msr-reg.S
30350+++ b/arch/x86/lib/msr-reg.S
30351@@ -3,6 +3,7 @@
30352 #include <asm/dwarf2.h>
30353 #include <asm/asm.h>
30354 #include <asm/msr.h>
30355+#include <asm/alternative-asm.h>
30356
30357 #ifdef CONFIG_X86_64
30358 /*
30359@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30360 movl %edi, 28(%r10)
30361 popq_cfi %rbp
30362 popq_cfi %rbx
30363+ pax_force_retaddr
30364 ret
30365 3:
30366 CFI_RESTORE_STATE
30367diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30368index fc6ba17..d4d989d 100644
30369--- a/arch/x86/lib/putuser.S
30370+++ b/arch/x86/lib/putuser.S
30371@@ -16,7 +16,9 @@
30372 #include <asm/errno.h>
30373 #include <asm/asm.h>
30374 #include <asm/smap.h>
30375-
30376+#include <asm/segment.h>
30377+#include <asm/pgtable.h>
30378+#include <asm/alternative-asm.h>
30379
30380 /*
30381 * __put_user_X
30382@@ -30,57 +32,125 @@
30383 * as they get called from within inline assembly.
30384 */
30385
30386-#define ENTER CFI_STARTPROC ; \
30387- GET_THREAD_INFO(%_ASM_BX)
30388-#define EXIT ASM_CLAC ; \
30389- ret ; \
30390+#define ENTER CFI_STARTPROC
30391+#define EXIT ASM_CLAC ; \
30392+ pax_force_retaddr ; \
30393+ ret ; \
30394 CFI_ENDPROC
30395
30396+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30397+#define _DEST %_ASM_CX,%_ASM_BX
30398+#else
30399+#define _DEST %_ASM_CX
30400+#endif
30401+
30402+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30403+#define __copyuser_seg gs;
30404+#else
30405+#define __copyuser_seg
30406+#endif
30407+
30408 .text
30409 ENTRY(__put_user_1)
30410 ENTER
30411+
30412+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30413+ GET_THREAD_INFO(%_ASM_BX)
30414 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30415 jae bad_put_user
30416 ASM_STAC
30417-1: movb %al,(%_ASM_CX)
30418+
30419+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30420+ mov pax_user_shadow_base,%_ASM_BX
30421+ cmp %_ASM_BX,%_ASM_CX
30422+ jb 1234f
30423+ xor %ebx,%ebx
30424+1234:
30425+#endif
30426+
30427+#endif
30428+
30429+1: __copyuser_seg movb %al,(_DEST)
30430 xor %eax,%eax
30431 EXIT
30432 ENDPROC(__put_user_1)
30433
30434 ENTRY(__put_user_2)
30435 ENTER
30436+
30437+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30438+ GET_THREAD_INFO(%_ASM_BX)
30439 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30440 sub $1,%_ASM_BX
30441 cmp %_ASM_BX,%_ASM_CX
30442 jae bad_put_user
30443 ASM_STAC
30444-2: movw %ax,(%_ASM_CX)
30445+
30446+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30447+ mov pax_user_shadow_base,%_ASM_BX
30448+ cmp %_ASM_BX,%_ASM_CX
30449+ jb 1234f
30450+ xor %ebx,%ebx
30451+1234:
30452+#endif
30453+
30454+#endif
30455+
30456+2: __copyuser_seg movw %ax,(_DEST)
30457 xor %eax,%eax
30458 EXIT
30459 ENDPROC(__put_user_2)
30460
30461 ENTRY(__put_user_4)
30462 ENTER
30463+
30464+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30465+ GET_THREAD_INFO(%_ASM_BX)
30466 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30467 sub $3,%_ASM_BX
30468 cmp %_ASM_BX,%_ASM_CX
30469 jae bad_put_user
30470 ASM_STAC
30471-3: movl %eax,(%_ASM_CX)
30472+
30473+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30474+ mov pax_user_shadow_base,%_ASM_BX
30475+ cmp %_ASM_BX,%_ASM_CX
30476+ jb 1234f
30477+ xor %ebx,%ebx
30478+1234:
30479+#endif
30480+
30481+#endif
30482+
30483+3: __copyuser_seg movl %eax,(_DEST)
30484 xor %eax,%eax
30485 EXIT
30486 ENDPROC(__put_user_4)
30487
30488 ENTRY(__put_user_8)
30489 ENTER
30490+
30491+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30492+ GET_THREAD_INFO(%_ASM_BX)
30493 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30494 sub $7,%_ASM_BX
30495 cmp %_ASM_BX,%_ASM_CX
30496 jae bad_put_user
30497 ASM_STAC
30498-4: mov %_ASM_AX,(%_ASM_CX)
30499+
30500+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30501+ mov pax_user_shadow_base,%_ASM_BX
30502+ cmp %_ASM_BX,%_ASM_CX
30503+ jb 1234f
30504+ xor %ebx,%ebx
30505+1234:
30506+#endif
30507+
30508+#endif
30509+
30510+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30511 #ifdef CONFIG_X86_32
30512-5: movl %edx,4(%_ASM_CX)
30513+5: __copyuser_seg movl %edx,4(_DEST)
30514 #endif
30515 xor %eax,%eax
30516 EXIT
30517diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
30518index 1cad221..de671ee 100644
30519--- a/arch/x86/lib/rwlock.S
30520+++ b/arch/x86/lib/rwlock.S
30521@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
30522 FRAME
30523 0: LOCK_PREFIX
30524 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
30525+
30526+#ifdef CONFIG_PAX_REFCOUNT
30527+ jno 1234f
30528+ LOCK_PREFIX
30529+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
30530+ int $4
30531+1234:
30532+ _ASM_EXTABLE(1234b, 1234b)
30533+#endif
30534+
30535 1: rep; nop
30536 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
30537 jne 1b
30538 LOCK_PREFIX
30539 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
30540+
30541+#ifdef CONFIG_PAX_REFCOUNT
30542+ jno 1234f
30543+ LOCK_PREFIX
30544+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
30545+ int $4
30546+1234:
30547+ _ASM_EXTABLE(1234b, 1234b)
30548+#endif
30549+
30550 jnz 0b
30551 ENDFRAME
30552+ pax_force_retaddr
30553 ret
30554 CFI_ENDPROC
30555 END(__write_lock_failed)
30556@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
30557 FRAME
30558 0: LOCK_PREFIX
30559 READ_LOCK_SIZE(inc) (%__lock_ptr)
30560+
30561+#ifdef CONFIG_PAX_REFCOUNT
30562+ jno 1234f
30563+ LOCK_PREFIX
30564+ READ_LOCK_SIZE(dec) (%__lock_ptr)
30565+ int $4
30566+1234:
30567+ _ASM_EXTABLE(1234b, 1234b)
30568+#endif
30569+
30570 1: rep; nop
30571 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
30572 js 1b
30573 LOCK_PREFIX
30574 READ_LOCK_SIZE(dec) (%__lock_ptr)
30575+
30576+#ifdef CONFIG_PAX_REFCOUNT
30577+ jno 1234f
30578+ LOCK_PREFIX
30579+ READ_LOCK_SIZE(inc) (%__lock_ptr)
30580+ int $4
30581+1234:
30582+ _ASM_EXTABLE(1234b, 1234b)
30583+#endif
30584+
30585 js 0b
30586 ENDFRAME
30587+ pax_force_retaddr
30588 ret
30589 CFI_ENDPROC
30590 END(__read_lock_failed)
30591diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30592index 5dff5f0..cadebf4 100644
30593--- a/arch/x86/lib/rwsem.S
30594+++ b/arch/x86/lib/rwsem.S
30595@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30596 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30597 CFI_RESTORE __ASM_REG(dx)
30598 restore_common_regs
30599+ pax_force_retaddr
30600 ret
30601 CFI_ENDPROC
30602 ENDPROC(call_rwsem_down_read_failed)
30603@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30604 movq %rax,%rdi
30605 call rwsem_down_write_failed
30606 restore_common_regs
30607+ pax_force_retaddr
30608 ret
30609 CFI_ENDPROC
30610 ENDPROC(call_rwsem_down_write_failed)
30611@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30612 movq %rax,%rdi
30613 call rwsem_wake
30614 restore_common_regs
30615-1: ret
30616+1: pax_force_retaddr
30617+ ret
30618 CFI_ENDPROC
30619 ENDPROC(call_rwsem_wake)
30620
30621@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30622 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30623 CFI_RESTORE __ASM_REG(dx)
30624 restore_common_regs
30625+ pax_force_retaddr
30626 ret
30627 CFI_ENDPROC
30628 ENDPROC(call_rwsem_downgrade_wake)
30629diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30630index a63efd6..8149fbe 100644
30631--- a/arch/x86/lib/thunk_64.S
30632+++ b/arch/x86/lib/thunk_64.S
30633@@ -8,6 +8,7 @@
30634 #include <linux/linkage.h>
30635 #include <asm/dwarf2.h>
30636 #include <asm/calling.h>
30637+#include <asm/alternative-asm.h>
30638
30639 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30640 .macro THUNK name, func, put_ret_addr_in_rdi=0
30641@@ -15,11 +16,11 @@
30642 \name:
30643 CFI_STARTPROC
30644
30645- /* this one pushes 9 elems, the next one would be %rIP */
30646- SAVE_ARGS
30647+ /* this one pushes 15+1 elems, the next one would be %rIP */
30648+ SAVE_ARGS 8
30649
30650 .if \put_ret_addr_in_rdi
30651- movq_cfi_restore 9*8, rdi
30652+ movq_cfi_restore RIP, rdi
30653 .endif
30654
30655 call \func
30656@@ -38,8 +39,9 @@
30657
30658 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30659 CFI_STARTPROC
30660- SAVE_ARGS
30661+ SAVE_ARGS 8
30662 restore:
30663- RESTORE_ARGS
30664+ RESTORE_ARGS 1,8
30665+ pax_force_retaddr
30666 ret
30667 CFI_ENDPROC
30668diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
30669index e2f5e21..4b22130 100644
30670--- a/arch/x86/lib/usercopy_32.c
30671+++ b/arch/x86/lib/usercopy_32.c
30672@@ -42,11 +42,13 @@ do { \
30673 int __d0; \
30674 might_fault(); \
30675 __asm__ __volatile__( \
30676+ __COPYUSER_SET_ES \
30677 ASM_STAC "\n" \
30678 "0: rep; stosl\n" \
30679 " movl %2,%0\n" \
30680 "1: rep; stosb\n" \
30681 "2: " ASM_CLAC "\n" \
30682+ __COPYUSER_RESTORE_ES \
30683 ".section .fixup,\"ax\"\n" \
30684 "3: lea 0(%2,%0,4),%0\n" \
30685 " jmp 2b\n" \
30686@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
30687
30688 #ifdef CONFIG_X86_INTEL_USERCOPY
30689 static unsigned long
30690-__copy_user_intel(void __user *to, const void *from, unsigned long size)
30691+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
30692 {
30693 int d0, d1;
30694 __asm__ __volatile__(
30695@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30696 " .align 2,0x90\n"
30697 "3: movl 0(%4), %%eax\n"
30698 "4: movl 4(%4), %%edx\n"
30699- "5: movl %%eax, 0(%3)\n"
30700- "6: movl %%edx, 4(%3)\n"
30701+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
30702+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
30703 "7: movl 8(%4), %%eax\n"
30704 "8: movl 12(%4),%%edx\n"
30705- "9: movl %%eax, 8(%3)\n"
30706- "10: movl %%edx, 12(%3)\n"
30707+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
30708+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
30709 "11: movl 16(%4), %%eax\n"
30710 "12: movl 20(%4), %%edx\n"
30711- "13: movl %%eax, 16(%3)\n"
30712- "14: movl %%edx, 20(%3)\n"
30713+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
30714+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
30715 "15: movl 24(%4), %%eax\n"
30716 "16: movl 28(%4), %%edx\n"
30717- "17: movl %%eax, 24(%3)\n"
30718- "18: movl %%edx, 28(%3)\n"
30719+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
30720+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
30721 "19: movl 32(%4), %%eax\n"
30722 "20: movl 36(%4), %%edx\n"
30723- "21: movl %%eax, 32(%3)\n"
30724- "22: movl %%edx, 36(%3)\n"
30725+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
30726+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
30727 "23: movl 40(%4), %%eax\n"
30728 "24: movl 44(%4), %%edx\n"
30729- "25: movl %%eax, 40(%3)\n"
30730- "26: movl %%edx, 44(%3)\n"
30731+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
30732+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
30733 "27: movl 48(%4), %%eax\n"
30734 "28: movl 52(%4), %%edx\n"
30735- "29: movl %%eax, 48(%3)\n"
30736- "30: movl %%edx, 52(%3)\n"
30737+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
30738+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
30739 "31: movl 56(%4), %%eax\n"
30740 "32: movl 60(%4), %%edx\n"
30741- "33: movl %%eax, 56(%3)\n"
30742- "34: movl %%edx, 60(%3)\n"
30743+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
30744+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
30745 " addl $-64, %0\n"
30746 " addl $64, %4\n"
30747 " addl $64, %3\n"
30748@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
30749 " shrl $2, %0\n"
30750 " andl $3, %%eax\n"
30751 " cld\n"
30752+ __COPYUSER_SET_ES
30753 "99: rep; movsl\n"
30754 "36: movl %%eax, %0\n"
30755 "37: rep; movsb\n"
30756 "100:\n"
30757+ __COPYUSER_RESTORE_ES
30758+ ".section .fixup,\"ax\"\n"
30759+ "101: lea 0(%%eax,%0,4),%0\n"
30760+ " jmp 100b\n"
30761+ ".previous\n"
30762+ _ASM_EXTABLE(1b,100b)
30763+ _ASM_EXTABLE(2b,100b)
30764+ _ASM_EXTABLE(3b,100b)
30765+ _ASM_EXTABLE(4b,100b)
30766+ _ASM_EXTABLE(5b,100b)
30767+ _ASM_EXTABLE(6b,100b)
30768+ _ASM_EXTABLE(7b,100b)
30769+ _ASM_EXTABLE(8b,100b)
30770+ _ASM_EXTABLE(9b,100b)
30771+ _ASM_EXTABLE(10b,100b)
30772+ _ASM_EXTABLE(11b,100b)
30773+ _ASM_EXTABLE(12b,100b)
30774+ _ASM_EXTABLE(13b,100b)
30775+ _ASM_EXTABLE(14b,100b)
30776+ _ASM_EXTABLE(15b,100b)
30777+ _ASM_EXTABLE(16b,100b)
30778+ _ASM_EXTABLE(17b,100b)
30779+ _ASM_EXTABLE(18b,100b)
30780+ _ASM_EXTABLE(19b,100b)
30781+ _ASM_EXTABLE(20b,100b)
30782+ _ASM_EXTABLE(21b,100b)
30783+ _ASM_EXTABLE(22b,100b)
30784+ _ASM_EXTABLE(23b,100b)
30785+ _ASM_EXTABLE(24b,100b)
30786+ _ASM_EXTABLE(25b,100b)
30787+ _ASM_EXTABLE(26b,100b)
30788+ _ASM_EXTABLE(27b,100b)
30789+ _ASM_EXTABLE(28b,100b)
30790+ _ASM_EXTABLE(29b,100b)
30791+ _ASM_EXTABLE(30b,100b)
30792+ _ASM_EXTABLE(31b,100b)
30793+ _ASM_EXTABLE(32b,100b)
30794+ _ASM_EXTABLE(33b,100b)
30795+ _ASM_EXTABLE(34b,100b)
30796+ _ASM_EXTABLE(35b,100b)
30797+ _ASM_EXTABLE(36b,100b)
30798+ _ASM_EXTABLE(37b,100b)
30799+ _ASM_EXTABLE(99b,101b)
30800+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
30801+ : "1"(to), "2"(from), "0"(size)
30802+ : "eax", "edx", "memory");
30803+ return size;
30804+}
30805+
30806+static unsigned long
30807+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
30808+{
30809+ int d0, d1;
30810+ __asm__ __volatile__(
30811+ " .align 2,0x90\n"
30812+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
30813+ " cmpl $67, %0\n"
30814+ " jbe 3f\n"
30815+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
30816+ " .align 2,0x90\n"
30817+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
30818+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
30819+ "5: movl %%eax, 0(%3)\n"
30820+ "6: movl %%edx, 4(%3)\n"
30821+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
30822+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
30823+ "9: movl %%eax, 8(%3)\n"
30824+ "10: movl %%edx, 12(%3)\n"
30825+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
30826+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
30827+ "13: movl %%eax, 16(%3)\n"
30828+ "14: movl %%edx, 20(%3)\n"
30829+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
30830+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
30831+ "17: movl %%eax, 24(%3)\n"
30832+ "18: movl %%edx, 28(%3)\n"
30833+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
30834+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
30835+ "21: movl %%eax, 32(%3)\n"
30836+ "22: movl %%edx, 36(%3)\n"
30837+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
30838+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
30839+ "25: movl %%eax, 40(%3)\n"
30840+ "26: movl %%edx, 44(%3)\n"
30841+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
30842+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
30843+ "29: movl %%eax, 48(%3)\n"
30844+ "30: movl %%edx, 52(%3)\n"
30845+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
30846+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
30847+ "33: movl %%eax, 56(%3)\n"
30848+ "34: movl %%edx, 60(%3)\n"
30849+ " addl $-64, %0\n"
30850+ " addl $64, %4\n"
30851+ " addl $64, %3\n"
30852+ " cmpl $63, %0\n"
30853+ " ja 1b\n"
30854+ "35: movl %0, %%eax\n"
30855+ " shrl $2, %0\n"
30856+ " andl $3, %%eax\n"
30857+ " cld\n"
30858+ "99: rep; "__copyuser_seg" movsl\n"
30859+ "36: movl %%eax, %0\n"
30860+ "37: rep; "__copyuser_seg" movsb\n"
30861+ "100:\n"
30862 ".section .fixup,\"ax\"\n"
30863 "101: lea 0(%%eax,%0,4),%0\n"
30864 " jmp 100b\n"
30865@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30866 int d0, d1;
30867 __asm__ __volatile__(
30868 " .align 2,0x90\n"
30869- "0: movl 32(%4), %%eax\n"
30870+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30871 " cmpl $67, %0\n"
30872 " jbe 2f\n"
30873- "1: movl 64(%4), %%eax\n"
30874+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30875 " .align 2,0x90\n"
30876- "2: movl 0(%4), %%eax\n"
30877- "21: movl 4(%4), %%edx\n"
30878+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30879+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30880 " movl %%eax, 0(%3)\n"
30881 " movl %%edx, 4(%3)\n"
30882- "3: movl 8(%4), %%eax\n"
30883- "31: movl 12(%4),%%edx\n"
30884+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30885+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30886 " movl %%eax, 8(%3)\n"
30887 " movl %%edx, 12(%3)\n"
30888- "4: movl 16(%4), %%eax\n"
30889- "41: movl 20(%4), %%edx\n"
30890+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30891+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30892 " movl %%eax, 16(%3)\n"
30893 " movl %%edx, 20(%3)\n"
30894- "10: movl 24(%4), %%eax\n"
30895- "51: movl 28(%4), %%edx\n"
30896+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30897+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30898 " movl %%eax, 24(%3)\n"
30899 " movl %%edx, 28(%3)\n"
30900- "11: movl 32(%4), %%eax\n"
30901- "61: movl 36(%4), %%edx\n"
30902+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30903+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30904 " movl %%eax, 32(%3)\n"
30905 " movl %%edx, 36(%3)\n"
30906- "12: movl 40(%4), %%eax\n"
30907- "71: movl 44(%4), %%edx\n"
30908+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30909+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30910 " movl %%eax, 40(%3)\n"
30911 " movl %%edx, 44(%3)\n"
30912- "13: movl 48(%4), %%eax\n"
30913- "81: movl 52(%4), %%edx\n"
30914+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30915+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30916 " movl %%eax, 48(%3)\n"
30917 " movl %%edx, 52(%3)\n"
30918- "14: movl 56(%4), %%eax\n"
30919- "91: movl 60(%4), %%edx\n"
30920+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30921+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30922 " movl %%eax, 56(%3)\n"
30923 " movl %%edx, 60(%3)\n"
30924 " addl $-64, %0\n"
30925@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
30926 " shrl $2, %0\n"
30927 " andl $3, %%eax\n"
30928 " cld\n"
30929- "6: rep; movsl\n"
30930+ "6: rep; "__copyuser_seg" movsl\n"
30931 " movl %%eax,%0\n"
30932- "7: rep; movsb\n"
30933+ "7: rep; "__copyuser_seg" movsb\n"
30934 "8:\n"
30935 ".section .fixup,\"ax\"\n"
30936 "9: lea 0(%%eax,%0,4),%0\n"
30937@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30938
30939 __asm__ __volatile__(
30940 " .align 2,0x90\n"
30941- "0: movl 32(%4), %%eax\n"
30942+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
30943 " cmpl $67, %0\n"
30944 " jbe 2f\n"
30945- "1: movl 64(%4), %%eax\n"
30946+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
30947 " .align 2,0x90\n"
30948- "2: movl 0(%4), %%eax\n"
30949- "21: movl 4(%4), %%edx\n"
30950+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
30951+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
30952 " movnti %%eax, 0(%3)\n"
30953 " movnti %%edx, 4(%3)\n"
30954- "3: movl 8(%4), %%eax\n"
30955- "31: movl 12(%4),%%edx\n"
30956+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
30957+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
30958 " movnti %%eax, 8(%3)\n"
30959 " movnti %%edx, 12(%3)\n"
30960- "4: movl 16(%4), %%eax\n"
30961- "41: movl 20(%4), %%edx\n"
30962+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
30963+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
30964 " movnti %%eax, 16(%3)\n"
30965 " movnti %%edx, 20(%3)\n"
30966- "10: movl 24(%4), %%eax\n"
30967- "51: movl 28(%4), %%edx\n"
30968+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
30969+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
30970 " movnti %%eax, 24(%3)\n"
30971 " movnti %%edx, 28(%3)\n"
30972- "11: movl 32(%4), %%eax\n"
30973- "61: movl 36(%4), %%edx\n"
30974+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
30975+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
30976 " movnti %%eax, 32(%3)\n"
30977 " movnti %%edx, 36(%3)\n"
30978- "12: movl 40(%4), %%eax\n"
30979- "71: movl 44(%4), %%edx\n"
30980+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
30981+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
30982 " movnti %%eax, 40(%3)\n"
30983 " movnti %%edx, 44(%3)\n"
30984- "13: movl 48(%4), %%eax\n"
30985- "81: movl 52(%4), %%edx\n"
30986+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
30987+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
30988 " movnti %%eax, 48(%3)\n"
30989 " movnti %%edx, 52(%3)\n"
30990- "14: movl 56(%4), %%eax\n"
30991- "91: movl 60(%4), %%edx\n"
30992+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
30993+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
30994 " movnti %%eax, 56(%3)\n"
30995 " movnti %%edx, 60(%3)\n"
30996 " addl $-64, %0\n"
30997@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
30998 " shrl $2, %0\n"
30999 " andl $3, %%eax\n"
31000 " cld\n"
31001- "6: rep; movsl\n"
31002+ "6: rep; "__copyuser_seg" movsl\n"
31003 " movl %%eax,%0\n"
31004- "7: rep; movsb\n"
31005+ "7: rep; "__copyuser_seg" movsb\n"
31006 "8:\n"
31007 ".section .fixup,\"ax\"\n"
31008 "9: lea 0(%%eax,%0,4),%0\n"
31009@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31010
31011 __asm__ __volatile__(
31012 " .align 2,0x90\n"
31013- "0: movl 32(%4), %%eax\n"
31014+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31015 " cmpl $67, %0\n"
31016 " jbe 2f\n"
31017- "1: movl 64(%4), %%eax\n"
31018+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31019 " .align 2,0x90\n"
31020- "2: movl 0(%4), %%eax\n"
31021- "21: movl 4(%4), %%edx\n"
31022+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31023+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31024 " movnti %%eax, 0(%3)\n"
31025 " movnti %%edx, 4(%3)\n"
31026- "3: movl 8(%4), %%eax\n"
31027- "31: movl 12(%4),%%edx\n"
31028+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31029+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31030 " movnti %%eax, 8(%3)\n"
31031 " movnti %%edx, 12(%3)\n"
31032- "4: movl 16(%4), %%eax\n"
31033- "41: movl 20(%4), %%edx\n"
31034+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31035+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31036 " movnti %%eax, 16(%3)\n"
31037 " movnti %%edx, 20(%3)\n"
31038- "10: movl 24(%4), %%eax\n"
31039- "51: movl 28(%4), %%edx\n"
31040+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31041+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31042 " movnti %%eax, 24(%3)\n"
31043 " movnti %%edx, 28(%3)\n"
31044- "11: movl 32(%4), %%eax\n"
31045- "61: movl 36(%4), %%edx\n"
31046+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31047+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31048 " movnti %%eax, 32(%3)\n"
31049 " movnti %%edx, 36(%3)\n"
31050- "12: movl 40(%4), %%eax\n"
31051- "71: movl 44(%4), %%edx\n"
31052+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31053+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31054 " movnti %%eax, 40(%3)\n"
31055 " movnti %%edx, 44(%3)\n"
31056- "13: movl 48(%4), %%eax\n"
31057- "81: movl 52(%4), %%edx\n"
31058+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31059+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31060 " movnti %%eax, 48(%3)\n"
31061 " movnti %%edx, 52(%3)\n"
31062- "14: movl 56(%4), %%eax\n"
31063- "91: movl 60(%4), %%edx\n"
31064+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31065+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31066 " movnti %%eax, 56(%3)\n"
31067 " movnti %%edx, 60(%3)\n"
31068 " addl $-64, %0\n"
31069@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31070 " shrl $2, %0\n"
31071 " andl $3, %%eax\n"
31072 " cld\n"
31073- "6: rep; movsl\n"
31074+ "6: rep; "__copyuser_seg" movsl\n"
31075 " movl %%eax,%0\n"
31076- "7: rep; movsb\n"
31077+ "7: rep; "__copyuser_seg" movsb\n"
31078 "8:\n"
31079 ".section .fixup,\"ax\"\n"
31080 "9: lea 0(%%eax,%0,4),%0\n"
31081@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31082 */
31083 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31084 unsigned long size);
31085-unsigned long __copy_user_intel(void __user *to, const void *from,
31086+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31087+ unsigned long size);
31088+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31089 unsigned long size);
31090 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31091 const void __user *from, unsigned long size);
31092 #endif /* CONFIG_X86_INTEL_USERCOPY */
31093
31094 /* Generic arbitrary sized copy. */
31095-#define __copy_user(to, from, size) \
31096+#define __copy_user(to, from, size, prefix, set, restore) \
31097 do { \
31098 int __d0, __d1, __d2; \
31099 __asm__ __volatile__( \
31100+ set \
31101 " cmp $7,%0\n" \
31102 " jbe 1f\n" \
31103 " movl %1,%0\n" \
31104 " negl %0\n" \
31105 " andl $7,%0\n" \
31106 " subl %0,%3\n" \
31107- "4: rep; movsb\n" \
31108+ "4: rep; "prefix"movsb\n" \
31109 " movl %3,%0\n" \
31110 " shrl $2,%0\n" \
31111 " andl $3,%3\n" \
31112 " .align 2,0x90\n" \
31113- "0: rep; movsl\n" \
31114+ "0: rep; "prefix"movsl\n" \
31115 " movl %3,%0\n" \
31116- "1: rep; movsb\n" \
31117+ "1: rep; "prefix"movsb\n" \
31118 "2:\n" \
31119+ restore \
31120 ".section .fixup,\"ax\"\n" \
31121 "5: addl %3,%0\n" \
31122 " jmp 2b\n" \
31123@@ -538,14 +650,14 @@ do { \
31124 " negl %0\n" \
31125 " andl $7,%0\n" \
31126 " subl %0,%3\n" \
31127- "4: rep; movsb\n" \
31128+ "4: rep; "__copyuser_seg"movsb\n" \
31129 " movl %3,%0\n" \
31130 " shrl $2,%0\n" \
31131 " andl $3,%3\n" \
31132 " .align 2,0x90\n" \
31133- "0: rep; movsl\n" \
31134+ "0: rep; "__copyuser_seg"movsl\n" \
31135 " movl %3,%0\n" \
31136- "1: rep; movsb\n" \
31137+ "1: rep; "__copyuser_seg"movsb\n" \
31138 "2:\n" \
31139 ".section .fixup,\"ax\"\n" \
31140 "5: addl %3,%0\n" \
31141@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31142 {
31143 stac();
31144 if (movsl_is_ok(to, from, n))
31145- __copy_user(to, from, n);
31146+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31147 else
31148- n = __copy_user_intel(to, from, n);
31149+ n = __generic_copy_to_user_intel(to, from, n);
31150 clac();
31151 return n;
31152 }
31153@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31154 {
31155 stac();
31156 if (movsl_is_ok(to, from, n))
31157- __copy_user(to, from, n);
31158+ __copy_user(to, from, n, __copyuser_seg, "", "");
31159 else
31160- n = __copy_user_intel((void __user *)to,
31161- (const void *)from, n);
31162+ n = __generic_copy_from_user_intel(to, from, n);
31163 clac();
31164 return n;
31165 }
31166@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31167 if (n > 64 && cpu_has_xmm2)
31168 n = __copy_user_intel_nocache(to, from, n);
31169 else
31170- __copy_user(to, from, n);
31171+ __copy_user(to, from, n, __copyuser_seg, "", "");
31172 #else
31173- __copy_user(to, from, n);
31174+ __copy_user(to, from, n, __copyuser_seg, "", "");
31175 #endif
31176 clac();
31177 return n;
31178 }
31179 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31180
31181-/**
31182- * copy_to_user: - Copy a block of data into user space.
31183- * @to: Destination address, in user space.
31184- * @from: Source address, in kernel space.
31185- * @n: Number of bytes to copy.
31186- *
31187- * Context: User context only. This function may sleep.
31188- *
31189- * Copy data from kernel space to user space.
31190- *
31191- * Returns number of bytes that could not be copied.
31192- * On success, this will be zero.
31193- */
31194-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31195+#ifdef CONFIG_PAX_MEMORY_UDEREF
31196+void __set_fs(mm_segment_t x)
31197 {
31198- if (access_ok(VERIFY_WRITE, to, n))
31199- n = __copy_to_user(to, from, n);
31200- return n;
31201+ switch (x.seg) {
31202+ case 0:
31203+ loadsegment(gs, 0);
31204+ break;
31205+ case TASK_SIZE_MAX:
31206+ loadsegment(gs, __USER_DS);
31207+ break;
31208+ case -1UL:
31209+ loadsegment(gs, __KERNEL_DS);
31210+ break;
31211+ default:
31212+ BUG();
31213+ }
31214 }
31215-EXPORT_SYMBOL(_copy_to_user);
31216+EXPORT_SYMBOL(__set_fs);
31217
31218-/**
31219- * copy_from_user: - Copy a block of data from user space.
31220- * @to: Destination address, in kernel space.
31221- * @from: Source address, in user space.
31222- * @n: Number of bytes to copy.
31223- *
31224- * Context: User context only. This function may sleep.
31225- *
31226- * Copy data from user space to kernel space.
31227- *
31228- * Returns number of bytes that could not be copied.
31229- * On success, this will be zero.
31230- *
31231- * If some data could not be copied, this function will pad the copied
31232- * data to the requested size using zero bytes.
31233- */
31234-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31235+void set_fs(mm_segment_t x)
31236 {
31237- if (access_ok(VERIFY_READ, from, n))
31238- n = __copy_from_user(to, from, n);
31239- else
31240- memset(to, 0, n);
31241- return n;
31242+ current_thread_info()->addr_limit = x;
31243+ __set_fs(x);
31244 }
31245-EXPORT_SYMBOL(_copy_from_user);
31246+EXPORT_SYMBOL(set_fs);
31247+#endif
31248diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31249index c905e89..01ab928 100644
31250--- a/arch/x86/lib/usercopy_64.c
31251+++ b/arch/x86/lib/usercopy_64.c
31252@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31253 might_fault();
31254 /* no memory constraint because it doesn't change any memory gcc knows
31255 about */
31256+ pax_open_userland();
31257 stac();
31258 asm volatile(
31259 " testq %[size8],%[size8]\n"
31260@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31261 _ASM_EXTABLE(0b,3b)
31262 _ASM_EXTABLE(1b,2b)
31263 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31264- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31265+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31266 [zero] "r" (0UL), [eight] "r" (8UL));
31267 clac();
31268+ pax_close_userland();
31269 return size;
31270 }
31271 EXPORT_SYMBOL(__clear_user);
31272@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31273 }
31274 EXPORT_SYMBOL(clear_user);
31275
31276-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31277+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31278 {
31279- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31280- return copy_user_generic((__force void *)to, (__force void *)from, len);
31281- }
31282- return len;
31283+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31284+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31285+ return len;
31286 }
31287 EXPORT_SYMBOL(copy_in_user);
31288
31289@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31290 * it is not necessary to optimize tail handling.
31291 */
31292 __visible unsigned long
31293-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31294+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31295 {
31296 char c;
31297 unsigned zero_len;
31298
31299+ clac();
31300+ pax_close_userland();
31301 for (; len; --len, to++) {
31302 if (__get_user_nocheck(c, from++, sizeof(char)))
31303 break;
31304@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31305 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31306 if (__put_user_nocheck(c, to++, sizeof(char)))
31307 break;
31308- clac();
31309 return len;
31310 }
31311diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31312index 6a19ad9..1c48f9a 100644
31313--- a/arch/x86/mm/Makefile
31314+++ b/arch/x86/mm/Makefile
31315@@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31316 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31317
31318 obj-$(CONFIG_MEMTEST) += memtest.o
31319+
31320+quote:="
31321+obj-$(CONFIG_X86_64) += uderef_64.o
31322+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31323diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31324index 903ec1e..c4166b2 100644
31325--- a/arch/x86/mm/extable.c
31326+++ b/arch/x86/mm/extable.c
31327@@ -6,12 +6,24 @@
31328 static inline unsigned long
31329 ex_insn_addr(const struct exception_table_entry *x)
31330 {
31331- return (unsigned long)&x->insn + x->insn;
31332+ unsigned long reloc = 0;
31333+
31334+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31335+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31336+#endif
31337+
31338+ return (unsigned long)&x->insn + x->insn + reloc;
31339 }
31340 static inline unsigned long
31341 ex_fixup_addr(const struct exception_table_entry *x)
31342 {
31343- return (unsigned long)&x->fixup + x->fixup;
31344+ unsigned long reloc = 0;
31345+
31346+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31347+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31348+#endif
31349+
31350+ return (unsigned long)&x->fixup + x->fixup + reloc;
31351 }
31352
31353 int fixup_exception(struct pt_regs *regs)
31354@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31355 unsigned long new_ip;
31356
31357 #ifdef CONFIG_PNPBIOS
31358- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31359+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31360 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31361 extern u32 pnp_bios_is_utter_crap;
31362 pnp_bios_is_utter_crap = 1;
31363@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31364 i += 4;
31365 p->fixup -= i;
31366 i += 4;
31367+
31368+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31369+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31370+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31371+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31372+#endif
31373+
31374 }
31375 }
31376
31377diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31378index 8e57229..31cce89 100644
31379--- a/arch/x86/mm/fault.c
31380+++ b/arch/x86/mm/fault.c
31381@@ -14,11 +14,18 @@
31382 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31383 #include <linux/prefetch.h> /* prefetchw */
31384 #include <linux/context_tracking.h> /* exception_enter(), ... */
31385+#include <linux/unistd.h>
31386+#include <linux/compiler.h>
31387
31388 #include <asm/traps.h> /* dotraplinkage, ... */
31389 #include <asm/pgalloc.h> /* pgd_*(), ... */
31390 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31391 #include <asm/fixmap.h> /* VSYSCALL_START */
31392+#include <asm/tlbflush.h>
31393+
31394+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31395+#include <asm/stacktrace.h>
31396+#endif
31397
31398 #define CREATE_TRACE_POINTS
31399 #include <asm/trace/exceptions.h>
31400@@ -59,7 +66,7 @@ static inline int __kprobes kprobes_fault(struct pt_regs *regs)
31401 int ret = 0;
31402
31403 /* kprobe_running() needs smp_processor_id() */
31404- if (kprobes_built_in() && !user_mode_vm(regs)) {
31405+ if (kprobes_built_in() && !user_mode(regs)) {
31406 preempt_disable();
31407 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31408 ret = 1;
31409@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31410 return !instr_lo || (instr_lo>>1) == 1;
31411 case 0x00:
31412 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31413- if (probe_kernel_address(instr, opcode))
31414+ if (user_mode(regs)) {
31415+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31416+ return 0;
31417+ } else if (probe_kernel_address(instr, opcode))
31418 return 0;
31419
31420 *prefetch = (instr_lo == 0xF) &&
31421@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31422 while (instr < max_instr) {
31423 unsigned char opcode;
31424
31425- if (probe_kernel_address(instr, opcode))
31426+ if (user_mode(regs)) {
31427+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31428+ break;
31429+ } else if (probe_kernel_address(instr, opcode))
31430 break;
31431
31432 instr++;
31433@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31434 force_sig_info(si_signo, &info, tsk);
31435 }
31436
31437+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31438+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31439+#endif
31440+
31441+#ifdef CONFIG_PAX_EMUTRAMP
31442+static int pax_handle_fetch_fault(struct pt_regs *regs);
31443+#endif
31444+
31445+#ifdef CONFIG_PAX_PAGEEXEC
31446+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31447+{
31448+ pgd_t *pgd;
31449+ pud_t *pud;
31450+ pmd_t *pmd;
31451+
31452+ pgd = pgd_offset(mm, address);
31453+ if (!pgd_present(*pgd))
31454+ return NULL;
31455+ pud = pud_offset(pgd, address);
31456+ if (!pud_present(*pud))
31457+ return NULL;
31458+ pmd = pmd_offset(pud, address);
31459+ if (!pmd_present(*pmd))
31460+ return NULL;
31461+ return pmd;
31462+}
31463+#endif
31464+
31465 DEFINE_SPINLOCK(pgd_lock);
31466 LIST_HEAD(pgd_list);
31467
31468@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31469 for (address = VMALLOC_START & PMD_MASK;
31470 address >= TASK_SIZE && address < FIXADDR_TOP;
31471 address += PMD_SIZE) {
31472+
31473+#ifdef CONFIG_PAX_PER_CPU_PGD
31474+ unsigned long cpu;
31475+#else
31476 struct page *page;
31477+#endif
31478
31479 spin_lock(&pgd_lock);
31480+
31481+#ifdef CONFIG_PAX_PER_CPU_PGD
31482+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31483+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31484+ pmd_t *ret;
31485+
31486+ ret = vmalloc_sync_one(pgd, address);
31487+ if (!ret)
31488+ break;
31489+ pgd = get_cpu_pgd(cpu, kernel);
31490+#else
31491 list_for_each_entry(page, &pgd_list, lru) {
31492+ pgd_t *pgd;
31493 spinlock_t *pgt_lock;
31494 pmd_t *ret;
31495
31496@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31497 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31498
31499 spin_lock(pgt_lock);
31500- ret = vmalloc_sync_one(page_address(page), address);
31501+ pgd = page_address(page);
31502+#endif
31503+
31504+ ret = vmalloc_sync_one(pgd, address);
31505+
31506+#ifndef CONFIG_PAX_PER_CPU_PGD
31507 spin_unlock(pgt_lock);
31508+#endif
31509
31510 if (!ret)
31511 break;
31512@@ -281,6 +345,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
31513 * an interrupt in the middle of a task switch..
31514 */
31515 pgd_paddr = read_cr3();
31516+
31517+#ifdef CONFIG_PAX_PER_CPU_PGD
31518+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31519+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31520+#endif
31521+
31522 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31523 if (!pmd_k)
31524 return -1;
31525@@ -376,11 +446,25 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
31526 * happen within a race in page table update. In the later
31527 * case just flush:
31528 */
31529- pgd = pgd_offset(current->active_mm, address);
31530+
31531 pgd_ref = pgd_offset_k(address);
31532 if (pgd_none(*pgd_ref))
31533 return -1;
31534
31535+#ifdef CONFIG_PAX_PER_CPU_PGD
31536+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31537+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31538+ if (pgd_none(*pgd)) {
31539+ set_pgd(pgd, *pgd_ref);
31540+ arch_flush_lazy_mmu_mode();
31541+ } else {
31542+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31543+ }
31544+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31545+#else
31546+ pgd = pgd_offset(current->active_mm, address);
31547+#endif
31548+
31549 if (pgd_none(*pgd)) {
31550 set_pgd(pgd, *pgd_ref);
31551 arch_flush_lazy_mmu_mode();
31552@@ -546,7 +630,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31553 static int is_errata100(struct pt_regs *regs, unsigned long address)
31554 {
31555 #ifdef CONFIG_X86_64
31556- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31557+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31558 return 1;
31559 #endif
31560 return 0;
31561@@ -573,7 +657,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31562 }
31563
31564 static const char nx_warning[] = KERN_CRIT
31565-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31566+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31567
31568 static void
31569 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31570@@ -582,7 +666,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31571 if (!oops_may_print())
31572 return;
31573
31574- if (error_code & PF_INSTR) {
31575+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31576 unsigned int level;
31577 pgd_t *pgd;
31578 pte_t *pte;
31579@@ -593,9 +677,21 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31580 pte = lookup_address_in_pgd(pgd, address, &level);
31581
31582 if (pte && pte_present(*pte) && !pte_exec(*pte))
31583- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31584+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31585 }
31586
31587+#ifdef CONFIG_PAX_KERNEXEC
31588+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31589+ if (current->signal->curr_ip)
31590+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31591+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31592+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31593+ else
31594+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31595+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31596+ }
31597+#endif
31598+
31599 printk(KERN_ALERT "BUG: unable to handle kernel ");
31600 if (address < PAGE_SIZE)
31601 printk(KERN_CONT "NULL pointer dereference");
31602@@ -776,6 +872,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31603 return;
31604 }
31605 #endif
31606+
31607+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31608+ if (pax_is_fetch_fault(regs, error_code, address)) {
31609+
31610+#ifdef CONFIG_PAX_EMUTRAMP
31611+ switch (pax_handle_fetch_fault(regs)) {
31612+ case 2:
31613+ return;
31614+ }
31615+#endif
31616+
31617+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31618+ do_group_exit(SIGKILL);
31619+ }
31620+#endif
31621+
31622 /* Kernel addresses are always protection faults: */
31623 if (address >= TASK_SIZE)
31624 error_code |= PF_PROT;
31625@@ -861,7 +973,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31626 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31627 printk(KERN_ERR
31628 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31629- tsk->comm, tsk->pid, address);
31630+ tsk->comm, task_pid_nr(tsk), address);
31631 code = BUS_MCEERR_AR;
31632 }
31633 #endif
31634@@ -915,6 +1027,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31635 return 1;
31636 }
31637
31638+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31639+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31640+{
31641+ pte_t *pte;
31642+ pmd_t *pmd;
31643+ spinlock_t *ptl;
31644+ unsigned char pte_mask;
31645+
31646+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31647+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
31648+ return 0;
31649+
31650+ /* PaX: it's our fault, let's handle it if we can */
31651+
31652+ /* PaX: take a look at read faults before acquiring any locks */
31653+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31654+ /* instruction fetch attempt from a protected page in user mode */
31655+ up_read(&mm->mmap_sem);
31656+
31657+#ifdef CONFIG_PAX_EMUTRAMP
31658+ switch (pax_handle_fetch_fault(regs)) {
31659+ case 2:
31660+ return 1;
31661+ }
31662+#endif
31663+
31664+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31665+ do_group_exit(SIGKILL);
31666+ }
31667+
31668+ pmd = pax_get_pmd(mm, address);
31669+ if (unlikely(!pmd))
31670+ return 0;
31671+
31672+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
31673+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
31674+ pte_unmap_unlock(pte, ptl);
31675+ return 0;
31676+ }
31677+
31678+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
31679+ /* write attempt to a protected page in user mode */
31680+ pte_unmap_unlock(pte, ptl);
31681+ return 0;
31682+ }
31683+
31684+#ifdef CONFIG_SMP
31685+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
31686+#else
31687+ if (likely(address > get_limit(regs->cs)))
31688+#endif
31689+ {
31690+ set_pte(pte, pte_mkread(*pte));
31691+ __flush_tlb_one(address);
31692+ pte_unmap_unlock(pte, ptl);
31693+ up_read(&mm->mmap_sem);
31694+ return 1;
31695+ }
31696+
31697+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
31698+
31699+ /*
31700+ * PaX: fill DTLB with user rights and retry
31701+ */
31702+ __asm__ __volatile__ (
31703+ "orb %2,(%1)\n"
31704+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
31705+/*
31706+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
31707+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
31708+ * page fault when examined during a TLB load attempt. this is true not only
31709+ * for PTEs holding a non-present entry but also present entries that will
31710+ * raise a page fault (such as those set up by PaX, or the copy-on-write
31711+ * mechanism). in effect it means that we do *not* need to flush the TLBs
31712+ * for our target pages since their PTEs are simply not in the TLBs at all.
31713+
31714+ * the best thing in omitting it is that we gain around 15-20% speed in the
31715+ * fast path of the page fault handler and can get rid of tracing since we
31716+ * can no longer flush unintended entries.
31717+ */
31718+ "invlpg (%0)\n"
31719+#endif
31720+ __copyuser_seg"testb $0,(%0)\n"
31721+ "xorb %3,(%1)\n"
31722+ :
31723+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
31724+ : "memory", "cc");
31725+ pte_unmap_unlock(pte, ptl);
31726+ up_read(&mm->mmap_sem);
31727+ return 1;
31728+}
31729+#endif
31730+
31731 /*
31732 * Handle a spurious fault caused by a stale TLB entry.
31733 *
31734@@ -981,6 +1186,9 @@ int show_unhandled_signals = 1;
31735 static inline int
31736 access_error(unsigned long error_code, struct vm_area_struct *vma)
31737 {
31738+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
31739+ return 1;
31740+
31741 if (error_code & PF_WRITE) {
31742 /* write, present and write, not present: */
31743 if (unlikely(!(vma->vm_flags & VM_WRITE)))
31744@@ -1015,7 +1223,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
31745 if (error_code & PF_USER)
31746 return false;
31747
31748- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
31749+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
31750 return false;
31751
31752 return true;
31753@@ -1043,6 +1251,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
31754 tsk = current;
31755 mm = tsk->mm;
31756
31757+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31758+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
31759+ if (!search_exception_tables(regs->ip)) {
31760+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
31761+ bad_area_nosemaphore(regs, error_code, address);
31762+ return;
31763+ }
31764+ if (address < pax_user_shadow_base) {
31765+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
31766+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
31767+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
31768+ } else
31769+ address -= pax_user_shadow_base;
31770+ }
31771+#endif
31772+
31773 /*
31774 * Detect and handle instructions that would cause a page fault for
31775 * both a tracked kernel page and a userspace page.
31776@@ -1120,7 +1344,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
31777 * User-mode registers count as a user access even for any
31778 * potential system fault or CPU buglet:
31779 */
31780- if (user_mode_vm(regs)) {
31781+ if (user_mode(regs)) {
31782 local_irq_enable();
31783 error_code |= PF_USER;
31784 flags |= FAULT_FLAG_USER;
31785@@ -1167,6 +1391,11 @@ retry:
31786 might_sleep();
31787 }
31788
31789+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31790+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
31791+ return;
31792+#endif
31793+
31794 vma = find_vma(mm, address);
31795 if (unlikely(!vma)) {
31796 bad_area(regs, error_code, address);
31797@@ -1178,18 +1407,24 @@ retry:
31798 bad_area(regs, error_code, address);
31799 return;
31800 }
31801- if (error_code & PF_USER) {
31802- /*
31803- * Accessing the stack below %sp is always a bug.
31804- * The large cushion allows instructions like enter
31805- * and pusha to work. ("enter $65535, $31" pushes
31806- * 32 pointers and then decrements %sp by 65535.)
31807- */
31808- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
31809- bad_area(regs, error_code, address);
31810- return;
31811- }
31812+ /*
31813+ * Accessing the stack below %sp is always a bug.
31814+ * The large cushion allows instructions like enter
31815+ * and pusha to work. ("enter $65535, $31" pushes
31816+ * 32 pointers and then decrements %sp by 65535.)
31817+ */
31818+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
31819+ bad_area(regs, error_code, address);
31820+ return;
31821 }
31822+
31823+#ifdef CONFIG_PAX_SEGMEXEC
31824+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
31825+ bad_area(regs, error_code, address);
31826+ return;
31827+ }
31828+#endif
31829+
31830 if (unlikely(expand_stack(vma, address))) {
31831 bad_area(regs, error_code, address);
31832 return;
31833@@ -1301,3 +1536,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
31834 exception_exit(prev_state);
31835 }
31836 #endif /* CONFIG_TRACING */
31837+
31838+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31839+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
31840+{
31841+ struct mm_struct *mm = current->mm;
31842+ unsigned long ip = regs->ip;
31843+
31844+ if (v8086_mode(regs))
31845+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
31846+
31847+#ifdef CONFIG_PAX_PAGEEXEC
31848+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
31849+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
31850+ return true;
31851+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
31852+ return true;
31853+ return false;
31854+ }
31855+#endif
31856+
31857+#ifdef CONFIG_PAX_SEGMEXEC
31858+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
31859+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
31860+ return true;
31861+ return false;
31862+ }
31863+#endif
31864+
31865+ return false;
31866+}
31867+#endif
31868+
31869+#ifdef CONFIG_PAX_EMUTRAMP
31870+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
31871+{
31872+ int err;
31873+
31874+ do { /* PaX: libffi trampoline emulation */
31875+ unsigned char mov, jmp;
31876+ unsigned int addr1, addr2;
31877+
31878+#ifdef CONFIG_X86_64
31879+ if ((regs->ip + 9) >> 32)
31880+ break;
31881+#endif
31882+
31883+ err = get_user(mov, (unsigned char __user *)regs->ip);
31884+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31885+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31886+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31887+
31888+ if (err)
31889+ break;
31890+
31891+ if (mov == 0xB8 && jmp == 0xE9) {
31892+ regs->ax = addr1;
31893+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31894+ return 2;
31895+ }
31896+ } while (0);
31897+
31898+ do { /* PaX: gcc trampoline emulation #1 */
31899+ unsigned char mov1, mov2;
31900+ unsigned short jmp;
31901+ unsigned int addr1, addr2;
31902+
31903+#ifdef CONFIG_X86_64
31904+ if ((regs->ip + 11) >> 32)
31905+ break;
31906+#endif
31907+
31908+ err = get_user(mov1, (unsigned char __user *)regs->ip);
31909+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31910+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
31911+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31912+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
31913+
31914+ if (err)
31915+ break;
31916+
31917+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
31918+ regs->cx = addr1;
31919+ regs->ax = addr2;
31920+ regs->ip = addr2;
31921+ return 2;
31922+ }
31923+ } while (0);
31924+
31925+ do { /* PaX: gcc trampoline emulation #2 */
31926+ unsigned char mov, jmp;
31927+ unsigned int addr1, addr2;
31928+
31929+#ifdef CONFIG_X86_64
31930+ if ((regs->ip + 9) >> 32)
31931+ break;
31932+#endif
31933+
31934+ err = get_user(mov, (unsigned char __user *)regs->ip);
31935+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
31936+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
31937+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
31938+
31939+ if (err)
31940+ break;
31941+
31942+ if (mov == 0xB9 && jmp == 0xE9) {
31943+ regs->cx = addr1;
31944+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
31945+ return 2;
31946+ }
31947+ } while (0);
31948+
31949+ return 1; /* PaX in action */
31950+}
31951+
31952+#ifdef CONFIG_X86_64
31953+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
31954+{
31955+ int err;
31956+
31957+ do { /* PaX: libffi trampoline emulation */
31958+ unsigned short mov1, mov2, jmp1;
31959+ unsigned char stcclc, jmp2;
31960+ unsigned long addr1, addr2;
31961+
31962+ err = get_user(mov1, (unsigned short __user *)regs->ip);
31963+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
31964+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
31965+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
31966+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
31967+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
31968+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
31969+
31970+ if (err)
31971+ break;
31972+
31973+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
31974+ regs->r11 = addr1;
31975+ regs->r10 = addr2;
31976+ if (stcclc == 0xF8)
31977+ regs->flags &= ~X86_EFLAGS_CF;
31978+ else
31979+ regs->flags |= X86_EFLAGS_CF;
31980+ regs->ip = addr1;
31981+ return 2;
31982+ }
31983+ } while (0);
31984+
31985+ do { /* PaX: gcc trampoline emulation #1 */
31986+ unsigned short mov1, mov2, jmp1;
31987+ unsigned char jmp2;
31988+ unsigned int addr1;
31989+ unsigned long addr2;
31990+
31991+ err = get_user(mov1, (unsigned short __user *)regs->ip);
31992+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
31993+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
31994+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
31995+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
31996+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
31997+
31998+ if (err)
31999+ break;
32000+
32001+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32002+ regs->r11 = addr1;
32003+ regs->r10 = addr2;
32004+ regs->ip = addr1;
32005+ return 2;
32006+ }
32007+ } while (0);
32008+
32009+ do { /* PaX: gcc trampoline emulation #2 */
32010+ unsigned short mov1, mov2, jmp1;
32011+ unsigned char jmp2;
32012+ unsigned long addr1, addr2;
32013+
32014+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32015+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32016+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32017+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32018+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32019+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32020+
32021+ if (err)
32022+ break;
32023+
32024+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32025+ regs->r11 = addr1;
32026+ regs->r10 = addr2;
32027+ regs->ip = addr1;
32028+ return 2;
32029+ }
32030+ } while (0);
32031+
32032+ return 1; /* PaX in action */
32033+}
32034+#endif
32035+
32036+/*
32037+ * PaX: decide what to do with offenders (regs->ip = fault address)
32038+ *
32039+ * returns 1 when task should be killed
32040+ * 2 when gcc trampoline was detected
32041+ */
32042+static int pax_handle_fetch_fault(struct pt_regs *regs)
32043+{
32044+ if (v8086_mode(regs))
32045+ return 1;
32046+
32047+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32048+ return 1;
32049+
32050+#ifdef CONFIG_X86_32
32051+ return pax_handle_fetch_fault_32(regs);
32052+#else
32053+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32054+ return pax_handle_fetch_fault_32(regs);
32055+ else
32056+ return pax_handle_fetch_fault_64(regs);
32057+#endif
32058+}
32059+#endif
32060+
32061+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32062+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32063+{
32064+ long i;
32065+
32066+ printk(KERN_ERR "PAX: bytes at PC: ");
32067+ for (i = 0; i < 20; i++) {
32068+ unsigned char c;
32069+ if (get_user(c, (unsigned char __force_user *)pc+i))
32070+ printk(KERN_CONT "?? ");
32071+ else
32072+ printk(KERN_CONT "%02x ", c);
32073+ }
32074+ printk("\n");
32075+
32076+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32077+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32078+ unsigned long c;
32079+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32080+#ifdef CONFIG_X86_32
32081+ printk(KERN_CONT "???????? ");
32082+#else
32083+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32084+ printk(KERN_CONT "???????? ???????? ");
32085+ else
32086+ printk(KERN_CONT "???????????????? ");
32087+#endif
32088+ } else {
32089+#ifdef CONFIG_X86_64
32090+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32091+ printk(KERN_CONT "%08x ", (unsigned int)c);
32092+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32093+ } else
32094+#endif
32095+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32096+ }
32097+ }
32098+ printk("\n");
32099+}
32100+#endif
32101+
32102+/**
32103+ * probe_kernel_write(): safely attempt to write to a location
32104+ * @dst: address to write to
32105+ * @src: pointer to the data that shall be written
32106+ * @size: size of the data chunk
32107+ *
32108+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32109+ * happens, handle that and return -EFAULT.
32110+ */
32111+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32112+{
32113+ long ret;
32114+ mm_segment_t old_fs = get_fs();
32115+
32116+ set_fs(KERNEL_DS);
32117+ pagefault_disable();
32118+ pax_open_kernel();
32119+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32120+ pax_close_kernel();
32121+ pagefault_enable();
32122+ set_fs(old_fs);
32123+
32124+ return ret ? -EFAULT : 0;
32125+}
32126diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32127index 207d9aef..69030980 100644
32128--- a/arch/x86/mm/gup.c
32129+++ b/arch/x86/mm/gup.c
32130@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32131 addr = start;
32132 len = (unsigned long) nr_pages << PAGE_SHIFT;
32133 end = start + len;
32134- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32135+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32136 (void __user *)start, len)))
32137 return 0;
32138
32139@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32140 goto slow_irqon;
32141 #endif
32142
32143+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32144+ (void __user *)start, len)))
32145+ return 0;
32146+
32147 /*
32148 * XXX: batch / limit 'nr', to avoid large irq off latency
32149 * needs some instrumenting to determine the common sizes used by
32150diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32151index 4500142..53a363c 100644
32152--- a/arch/x86/mm/highmem_32.c
32153+++ b/arch/x86/mm/highmem_32.c
32154@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32155 idx = type + KM_TYPE_NR*smp_processor_id();
32156 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32157 BUG_ON(!pte_none(*(kmap_pte-idx)));
32158+
32159+ pax_open_kernel();
32160 set_pte(kmap_pte-idx, mk_pte(page, prot));
32161+ pax_close_kernel();
32162+
32163 arch_flush_lazy_mmu_mode();
32164
32165 return (void *)vaddr;
32166diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32167index 8b977eb..4732c33 100644
32168--- a/arch/x86/mm/hugetlbpage.c
32169+++ b/arch/x86/mm/hugetlbpage.c
32170@@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32171 #ifdef CONFIG_HUGETLB_PAGE
32172 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32173 unsigned long addr, unsigned long len,
32174- unsigned long pgoff, unsigned long flags)
32175+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32176 {
32177 struct hstate *h = hstate_file(file);
32178 struct vm_unmapped_area_info info;
32179-
32180+
32181 info.flags = 0;
32182 info.length = len;
32183 info.low_limit = current->mm->mmap_legacy_base;
32184 info.high_limit = TASK_SIZE;
32185 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32186 info.align_offset = 0;
32187+ info.threadstack_offset = offset;
32188 return vm_unmapped_area(&info);
32189 }
32190
32191 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32192 unsigned long addr0, unsigned long len,
32193- unsigned long pgoff, unsigned long flags)
32194+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32195 {
32196 struct hstate *h = hstate_file(file);
32197 struct vm_unmapped_area_info info;
32198@@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32199 info.high_limit = current->mm->mmap_base;
32200 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32201 info.align_offset = 0;
32202+ info.threadstack_offset = offset;
32203 addr = vm_unmapped_area(&info);
32204
32205 /*
32206@@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32207 VM_BUG_ON(addr != -ENOMEM);
32208 info.flags = 0;
32209 info.low_limit = TASK_UNMAPPED_BASE;
32210+
32211+#ifdef CONFIG_PAX_RANDMMAP
32212+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32213+ info.low_limit += current->mm->delta_mmap;
32214+#endif
32215+
32216 info.high_limit = TASK_SIZE;
32217 addr = vm_unmapped_area(&info);
32218 }
32219@@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32220 struct hstate *h = hstate_file(file);
32221 struct mm_struct *mm = current->mm;
32222 struct vm_area_struct *vma;
32223+ unsigned long pax_task_size = TASK_SIZE;
32224+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32225
32226 if (len & ~huge_page_mask(h))
32227 return -EINVAL;
32228- if (len > TASK_SIZE)
32229+
32230+#ifdef CONFIG_PAX_SEGMEXEC
32231+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32232+ pax_task_size = SEGMEXEC_TASK_SIZE;
32233+#endif
32234+
32235+ pax_task_size -= PAGE_SIZE;
32236+
32237+ if (len > pax_task_size)
32238 return -ENOMEM;
32239
32240 if (flags & MAP_FIXED) {
32241@@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32242 return addr;
32243 }
32244
32245+#ifdef CONFIG_PAX_RANDMMAP
32246+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32247+#endif
32248+
32249 if (addr) {
32250 addr = ALIGN(addr, huge_page_size(h));
32251 vma = find_vma(mm, addr);
32252- if (TASK_SIZE - len >= addr &&
32253- (!vma || addr + len <= vma->vm_start))
32254+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32255 return addr;
32256 }
32257 if (mm->get_unmapped_area == arch_get_unmapped_area)
32258 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32259- pgoff, flags);
32260+ pgoff, flags, offset);
32261 else
32262 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32263- pgoff, flags);
32264+ pgoff, flags, offset);
32265 }
32266 #endif /* CONFIG_HUGETLB_PAGE */
32267
32268diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32269index f971306..e83e0f6 100644
32270--- a/arch/x86/mm/init.c
32271+++ b/arch/x86/mm/init.c
32272@@ -4,6 +4,7 @@
32273 #include <linux/swap.h>
32274 #include <linux/memblock.h>
32275 #include <linux/bootmem.h> /* for max_low_pfn */
32276+#include <linux/tboot.h>
32277
32278 #include <asm/cacheflush.h>
32279 #include <asm/e820.h>
32280@@ -17,6 +18,8 @@
32281 #include <asm/proto.h>
32282 #include <asm/dma.h> /* for MAX_DMA_PFN */
32283 #include <asm/microcode.h>
32284+#include <asm/desc.h>
32285+#include <asm/bios_ebda.h>
32286
32287 #include "mm_internal.h"
32288
32289@@ -563,7 +566,18 @@ void __init init_mem_mapping(void)
32290 early_ioremap_page_table_range_init();
32291 #endif
32292
32293+#ifdef CONFIG_PAX_PER_CPU_PGD
32294+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32295+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32296+ KERNEL_PGD_PTRS);
32297+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32298+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32299+ KERNEL_PGD_PTRS);
32300+ load_cr3(get_cpu_pgd(0, kernel));
32301+#else
32302 load_cr3(swapper_pg_dir);
32303+#endif
32304+
32305 __flush_tlb_all();
32306
32307 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32308@@ -579,10 +593,40 @@ void __init init_mem_mapping(void)
32309 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32310 * mmio resources as well as potential bios/acpi data regions.
32311 */
32312+
32313+#ifdef CONFIG_GRKERNSEC_KMEM
32314+static unsigned int ebda_start __read_only;
32315+static unsigned int ebda_end __read_only;
32316+#endif
32317+
32318 int devmem_is_allowed(unsigned long pagenr)
32319 {
32320- if (pagenr < 256)
32321+#ifdef CONFIG_GRKERNSEC_KMEM
32322+ /* allow BDA */
32323+ if (!pagenr)
32324 return 1;
32325+ /* allow EBDA */
32326+ if (pagenr >= ebda_start && pagenr < ebda_end)
32327+ return 1;
32328+ /* if tboot is in use, allow access to its hardcoded serial log range */
32329+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32330+ return 1;
32331+#else
32332+ if (!pagenr)
32333+ return 1;
32334+#ifdef CONFIG_VM86
32335+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32336+ return 1;
32337+#endif
32338+#endif
32339+
32340+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32341+ return 1;
32342+#ifdef CONFIG_GRKERNSEC_KMEM
32343+ /* throw out everything else below 1MB */
32344+ if (pagenr <= 256)
32345+ return 0;
32346+#endif
32347 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32348 return 0;
32349 if (!page_is_ram(pagenr))
32350@@ -628,8 +672,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32351 #endif
32352 }
32353
32354+#ifdef CONFIG_GRKERNSEC_KMEM
32355+static inline void gr_init_ebda(void)
32356+{
32357+ unsigned int ebda_addr;
32358+ unsigned int ebda_size = 0;
32359+
32360+ ebda_addr = get_bios_ebda();
32361+ if (ebda_addr) {
32362+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32363+ ebda_size <<= 10;
32364+ }
32365+ if (ebda_addr && ebda_size) {
32366+ ebda_start = ebda_addr >> PAGE_SHIFT;
32367+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32368+ } else {
32369+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32370+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32371+ }
32372+}
32373+#else
32374+static inline void gr_init_ebda(void) { }
32375+#endif
32376+
32377 void free_initmem(void)
32378 {
32379+#ifdef CONFIG_PAX_KERNEXEC
32380+#ifdef CONFIG_X86_32
32381+ /* PaX: limit KERNEL_CS to actual size */
32382+ unsigned long addr, limit;
32383+ struct desc_struct d;
32384+ int cpu;
32385+#else
32386+ pgd_t *pgd;
32387+ pud_t *pud;
32388+ pmd_t *pmd;
32389+ unsigned long addr, end;
32390+#endif
32391+#endif
32392+
32393+ gr_init_ebda();
32394+
32395+#ifdef CONFIG_PAX_KERNEXEC
32396+#ifdef CONFIG_X86_32
32397+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32398+ limit = (limit - 1UL) >> PAGE_SHIFT;
32399+
32400+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32401+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32402+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32403+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32404+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32405+ }
32406+
32407+ /* PaX: make KERNEL_CS read-only */
32408+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32409+ if (!paravirt_enabled())
32410+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32411+/*
32412+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32413+ pgd = pgd_offset_k(addr);
32414+ pud = pud_offset(pgd, addr);
32415+ pmd = pmd_offset(pud, addr);
32416+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32417+ }
32418+*/
32419+#ifdef CONFIG_X86_PAE
32420+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32421+/*
32422+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32423+ pgd = pgd_offset_k(addr);
32424+ pud = pud_offset(pgd, addr);
32425+ pmd = pmd_offset(pud, addr);
32426+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32427+ }
32428+*/
32429+#endif
32430+
32431+#ifdef CONFIG_MODULES
32432+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32433+#endif
32434+
32435+#else
32436+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32437+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32438+ pgd = pgd_offset_k(addr);
32439+ pud = pud_offset(pgd, addr);
32440+ pmd = pmd_offset(pud, addr);
32441+ if (!pmd_present(*pmd))
32442+ continue;
32443+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32444+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32445+ else
32446+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32447+ }
32448+
32449+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32450+ end = addr + KERNEL_IMAGE_SIZE;
32451+ for (; addr < end; addr += PMD_SIZE) {
32452+ pgd = pgd_offset_k(addr);
32453+ pud = pud_offset(pgd, addr);
32454+ pmd = pmd_offset(pud, addr);
32455+ if (!pmd_present(*pmd))
32456+ continue;
32457+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32458+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32459+ }
32460+#endif
32461+
32462+ flush_tlb_all();
32463+#endif
32464+
32465 free_init_pages("unused kernel",
32466 (unsigned long)(&__init_begin),
32467 (unsigned long)(&__init_end));
32468diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32469index e395048..cd38278 100644
32470--- a/arch/x86/mm/init_32.c
32471+++ b/arch/x86/mm/init_32.c
32472@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32473 bool __read_mostly __vmalloc_start_set = false;
32474
32475 /*
32476- * Creates a middle page table and puts a pointer to it in the
32477- * given global directory entry. This only returns the gd entry
32478- * in non-PAE compilation mode, since the middle layer is folded.
32479- */
32480-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32481-{
32482- pud_t *pud;
32483- pmd_t *pmd_table;
32484-
32485-#ifdef CONFIG_X86_PAE
32486- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32487- pmd_table = (pmd_t *)alloc_low_page();
32488- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32489- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32490- pud = pud_offset(pgd, 0);
32491- BUG_ON(pmd_table != pmd_offset(pud, 0));
32492-
32493- return pmd_table;
32494- }
32495-#endif
32496- pud = pud_offset(pgd, 0);
32497- pmd_table = pmd_offset(pud, 0);
32498-
32499- return pmd_table;
32500-}
32501-
32502-/*
32503 * Create a page table and place a pointer to it in a middle page
32504 * directory entry:
32505 */
32506@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32507 pte_t *page_table = (pte_t *)alloc_low_page();
32508
32509 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32510+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32511+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32512+#else
32513 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32514+#endif
32515 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32516 }
32517
32518 return pte_offset_kernel(pmd, 0);
32519 }
32520
32521+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32522+{
32523+ pud_t *pud;
32524+ pmd_t *pmd_table;
32525+
32526+ pud = pud_offset(pgd, 0);
32527+ pmd_table = pmd_offset(pud, 0);
32528+
32529+ return pmd_table;
32530+}
32531+
32532 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32533 {
32534 int pgd_idx = pgd_index(vaddr);
32535@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32536 int pgd_idx, pmd_idx;
32537 unsigned long vaddr;
32538 pgd_t *pgd;
32539+ pud_t *pud;
32540 pmd_t *pmd;
32541 pte_t *pte = NULL;
32542 unsigned long count = page_table_range_init_count(start, end);
32543@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32544 pgd = pgd_base + pgd_idx;
32545
32546 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32547- pmd = one_md_table_init(pgd);
32548- pmd = pmd + pmd_index(vaddr);
32549+ pud = pud_offset(pgd, vaddr);
32550+ pmd = pmd_offset(pud, vaddr);
32551+
32552+#ifdef CONFIG_X86_PAE
32553+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32554+#endif
32555+
32556 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32557 pmd++, pmd_idx++) {
32558 pte = page_table_kmap_check(one_page_table_init(pmd),
32559@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32560 }
32561 }
32562
32563-static inline int is_kernel_text(unsigned long addr)
32564+static inline int is_kernel_text(unsigned long start, unsigned long end)
32565 {
32566- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32567- return 1;
32568- return 0;
32569+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32570+ end <= ktla_ktva((unsigned long)_stext)) &&
32571+ (start >= ktla_ktva((unsigned long)_einittext) ||
32572+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32573+
32574+#ifdef CONFIG_ACPI_SLEEP
32575+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32576+#endif
32577+
32578+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32579+ return 0;
32580+ return 1;
32581 }
32582
32583 /*
32584@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32585 unsigned long last_map_addr = end;
32586 unsigned long start_pfn, end_pfn;
32587 pgd_t *pgd_base = swapper_pg_dir;
32588- int pgd_idx, pmd_idx, pte_ofs;
32589+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32590 unsigned long pfn;
32591 pgd_t *pgd;
32592+ pud_t *pud;
32593 pmd_t *pmd;
32594 pte_t *pte;
32595 unsigned pages_2m, pages_4k;
32596@@ -291,8 +295,13 @@ repeat:
32597 pfn = start_pfn;
32598 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32599 pgd = pgd_base + pgd_idx;
32600- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32601- pmd = one_md_table_init(pgd);
32602+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32603+ pud = pud_offset(pgd, 0);
32604+ pmd = pmd_offset(pud, 0);
32605+
32606+#ifdef CONFIG_X86_PAE
32607+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32608+#endif
32609
32610 if (pfn >= end_pfn)
32611 continue;
32612@@ -304,14 +313,13 @@ repeat:
32613 #endif
32614 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32615 pmd++, pmd_idx++) {
32616- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32617+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32618
32619 /*
32620 * Map with big pages if possible, otherwise
32621 * create normal page tables:
32622 */
32623 if (use_pse) {
32624- unsigned int addr2;
32625 pgprot_t prot = PAGE_KERNEL_LARGE;
32626 /*
32627 * first pass will use the same initial
32628@@ -322,11 +330,7 @@ repeat:
32629 _PAGE_PSE);
32630
32631 pfn &= PMD_MASK >> PAGE_SHIFT;
32632- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32633- PAGE_OFFSET + PAGE_SIZE-1;
32634-
32635- if (is_kernel_text(addr) ||
32636- is_kernel_text(addr2))
32637+ if (is_kernel_text(address, address + PMD_SIZE))
32638 prot = PAGE_KERNEL_LARGE_EXEC;
32639
32640 pages_2m++;
32641@@ -343,7 +347,7 @@ repeat:
32642 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32643 pte += pte_ofs;
32644 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32645- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32646+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32647 pgprot_t prot = PAGE_KERNEL;
32648 /*
32649 * first pass will use the same initial
32650@@ -351,7 +355,7 @@ repeat:
32651 */
32652 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32653
32654- if (is_kernel_text(addr))
32655+ if (is_kernel_text(address, address + PAGE_SIZE))
32656 prot = PAGE_KERNEL_EXEC;
32657
32658 pages_4k++;
32659@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
32660
32661 pud = pud_offset(pgd, va);
32662 pmd = pmd_offset(pud, va);
32663- if (!pmd_present(*pmd))
32664+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
32665 break;
32666
32667 /* should not be large page here */
32668@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
32669
32670 static void __init pagetable_init(void)
32671 {
32672- pgd_t *pgd_base = swapper_pg_dir;
32673-
32674- permanent_kmaps_init(pgd_base);
32675+ permanent_kmaps_init(swapper_pg_dir);
32676 }
32677
32678-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
32679+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
32680 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32681
32682 /* user-defined highmem size */
32683@@ -787,10 +789,10 @@ void __init mem_init(void)
32684 ((unsigned long)&__init_end -
32685 (unsigned long)&__init_begin) >> 10,
32686
32687- (unsigned long)&_etext, (unsigned long)&_edata,
32688- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
32689+ (unsigned long)&_sdata, (unsigned long)&_edata,
32690+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
32691
32692- (unsigned long)&_text, (unsigned long)&_etext,
32693+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
32694 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
32695
32696 /*
32697@@ -883,6 +885,7 @@ void set_kernel_text_rw(void)
32698 if (!kernel_set_to_readonly)
32699 return;
32700
32701+ start = ktla_ktva(start);
32702 pr_debug("Set kernel text: %lx - %lx for read write\n",
32703 start, start+size);
32704
32705@@ -897,6 +900,7 @@ void set_kernel_text_ro(void)
32706 if (!kernel_set_to_readonly)
32707 return;
32708
32709+ start = ktla_ktva(start);
32710 pr_debug("Set kernel text: %lx - %lx for read only\n",
32711 start, start+size);
32712
32713@@ -925,6 +929,7 @@ void mark_rodata_ro(void)
32714 unsigned long start = PFN_ALIGN(_text);
32715 unsigned long size = PFN_ALIGN(_etext) - start;
32716
32717+ start = ktla_ktva(start);
32718 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
32719 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
32720 size >> 10);
32721diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
32722index f35c66c..84b95ef 100644
32723--- a/arch/x86/mm/init_64.c
32724+++ b/arch/x86/mm/init_64.c
32725@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
32726 * around without checking the pgd every time.
32727 */
32728
32729-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
32730+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
32731 EXPORT_SYMBOL_GPL(__supported_pte_mask);
32732
32733 int force_personality32;
32734@@ -184,12 +184,29 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32735
32736 for (address = start; address <= end; address += PGDIR_SIZE) {
32737 const pgd_t *pgd_ref = pgd_offset_k(address);
32738+
32739+#ifdef CONFIG_PAX_PER_CPU_PGD
32740+ unsigned long cpu;
32741+#else
32742 struct page *page;
32743+#endif
32744
32745 if (pgd_none(*pgd_ref))
32746 continue;
32747
32748 spin_lock(&pgd_lock);
32749+
32750+#ifdef CONFIG_PAX_PER_CPU_PGD
32751+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32752+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
32753+
32754+ if (pgd_none(*pgd))
32755+ set_pgd(pgd, *pgd_ref);
32756+ else
32757+ BUG_ON(pgd_page_vaddr(*pgd)
32758+ != pgd_page_vaddr(*pgd_ref));
32759+ pgd = pgd_offset_cpu(cpu, kernel, address);
32760+#else
32761 list_for_each_entry(page, &pgd_list, lru) {
32762 pgd_t *pgd;
32763 spinlock_t *pgt_lock;
32764@@ -198,6 +215,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32765 /* the pgt_lock only for Xen */
32766 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32767 spin_lock(pgt_lock);
32768+#endif
32769
32770 if (pgd_none(*pgd))
32771 set_pgd(pgd, *pgd_ref);
32772@@ -205,7 +223,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
32773 BUG_ON(pgd_page_vaddr(*pgd)
32774 != pgd_page_vaddr(*pgd_ref));
32775
32776+#ifndef CONFIG_PAX_PER_CPU_PGD
32777 spin_unlock(pgt_lock);
32778+#endif
32779+
32780 }
32781 spin_unlock(&pgd_lock);
32782 }
32783@@ -238,7 +259,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
32784 {
32785 if (pgd_none(*pgd)) {
32786 pud_t *pud = (pud_t *)spp_getpage();
32787- pgd_populate(&init_mm, pgd, pud);
32788+ pgd_populate_kernel(&init_mm, pgd, pud);
32789 if (pud != pud_offset(pgd, 0))
32790 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
32791 pud, pud_offset(pgd, 0));
32792@@ -250,7 +271,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
32793 {
32794 if (pud_none(*pud)) {
32795 pmd_t *pmd = (pmd_t *) spp_getpage();
32796- pud_populate(&init_mm, pud, pmd);
32797+ pud_populate_kernel(&init_mm, pud, pmd);
32798 if (pmd != pmd_offset(pud, 0))
32799 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
32800 pmd, pmd_offset(pud, 0));
32801@@ -279,7 +300,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
32802 pmd = fill_pmd(pud, vaddr);
32803 pte = fill_pte(pmd, vaddr);
32804
32805+ pax_open_kernel();
32806 set_pte(pte, new_pte);
32807+ pax_close_kernel();
32808
32809 /*
32810 * It's enough to flush this one mapping.
32811@@ -338,14 +361,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
32812 pgd = pgd_offset_k((unsigned long)__va(phys));
32813 if (pgd_none(*pgd)) {
32814 pud = (pud_t *) spp_getpage();
32815- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
32816- _PAGE_USER));
32817+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
32818 }
32819 pud = pud_offset(pgd, (unsigned long)__va(phys));
32820 if (pud_none(*pud)) {
32821 pmd = (pmd_t *) spp_getpage();
32822- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
32823- _PAGE_USER));
32824+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
32825 }
32826 pmd = pmd_offset(pud, phys);
32827 BUG_ON(!pmd_none(*pmd));
32828@@ -586,7 +607,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
32829 prot);
32830
32831 spin_lock(&init_mm.page_table_lock);
32832- pud_populate(&init_mm, pud, pmd);
32833+ pud_populate_kernel(&init_mm, pud, pmd);
32834 spin_unlock(&init_mm.page_table_lock);
32835 }
32836 __flush_tlb_all();
32837@@ -627,7 +648,7 @@ kernel_physical_mapping_init(unsigned long start,
32838 page_size_mask);
32839
32840 spin_lock(&init_mm.page_table_lock);
32841- pgd_populate(&init_mm, pgd, pud);
32842+ pgd_populate_kernel(&init_mm, pgd, pud);
32843 spin_unlock(&init_mm.page_table_lock);
32844 pgd_changed = true;
32845 }
32846@@ -1188,8 +1209,8 @@ int kern_addr_valid(unsigned long addr)
32847 static struct vm_area_struct gate_vma = {
32848 .vm_start = VSYSCALL_START,
32849 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
32850- .vm_page_prot = PAGE_READONLY_EXEC,
32851- .vm_flags = VM_READ | VM_EXEC
32852+ .vm_page_prot = PAGE_READONLY,
32853+ .vm_flags = VM_READ
32854 };
32855
32856 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
32857@@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
32858
32859 const char *arch_vma_name(struct vm_area_struct *vma)
32860 {
32861- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
32862+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
32863 return "[vdso]";
32864 if (vma == &gate_vma)
32865 return "[vsyscall]";
32866diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
32867index 7b179b4..6bd17777 100644
32868--- a/arch/x86/mm/iomap_32.c
32869+++ b/arch/x86/mm/iomap_32.c
32870@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
32871 type = kmap_atomic_idx_push();
32872 idx = type + KM_TYPE_NR * smp_processor_id();
32873 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32874+
32875+ pax_open_kernel();
32876 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
32877+ pax_close_kernel();
32878+
32879 arch_flush_lazy_mmu_mode();
32880
32881 return (void *)vaddr;
32882diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
32883index 597ac15..49841be 100644
32884--- a/arch/x86/mm/ioremap.c
32885+++ b/arch/x86/mm/ioremap.c
32886@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
32887 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
32888 int is_ram = page_is_ram(pfn);
32889
32890- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
32891+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
32892 return NULL;
32893 WARN_ON_ONCE(is_ram);
32894 }
32895@@ -256,7 +256,7 @@ EXPORT_SYMBOL(ioremap_prot);
32896 *
32897 * Caller must ensure there is only one unmapping for the same pointer.
32898 */
32899-void iounmap(volatile void __iomem *addr)
32900+void iounmap(const volatile void __iomem *addr)
32901 {
32902 struct vm_struct *p, *o;
32903
32904@@ -310,6 +310,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32905
32906 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
32907 if (page_is_ram(start >> PAGE_SHIFT))
32908+#ifdef CONFIG_HIGHMEM
32909+ if ((start >> PAGE_SHIFT) < max_low_pfn)
32910+#endif
32911 return __va(phys);
32912
32913 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
32914@@ -322,13 +325,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
32915 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
32916 {
32917 if (page_is_ram(phys >> PAGE_SHIFT))
32918+#ifdef CONFIG_HIGHMEM
32919+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
32920+#endif
32921 return;
32922
32923 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
32924 return;
32925 }
32926
32927-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
32928+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
32929
32930 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
32931 {
32932@@ -358,8 +364,7 @@ void __init early_ioremap_init(void)
32933 early_ioremap_setup();
32934
32935 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
32936- memset(bm_pte, 0, sizeof(bm_pte));
32937- pmd_populate_kernel(&init_mm, pmd, bm_pte);
32938+ pmd_populate_user(&init_mm, pmd, bm_pte);
32939
32940 /*
32941 * The boot-ioremap range spans multiple pmds, for which
32942diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
32943index dd89a13..d77bdcc 100644
32944--- a/arch/x86/mm/kmemcheck/kmemcheck.c
32945+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
32946@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
32947 * memory (e.g. tracked pages)? For now, we need this to avoid
32948 * invoking kmemcheck for PnP BIOS calls.
32949 */
32950- if (regs->flags & X86_VM_MASK)
32951+ if (v8086_mode(regs))
32952 return false;
32953- if (regs->cs != __KERNEL_CS)
32954+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
32955 return false;
32956
32957 pte = kmemcheck_pte_lookup(address);
32958diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
32959index 25e7e13..1964579 100644
32960--- a/arch/x86/mm/mmap.c
32961+++ b/arch/x86/mm/mmap.c
32962@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
32963 * Leave an at least ~128 MB hole with possible stack randomization.
32964 */
32965 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
32966-#define MAX_GAP (TASK_SIZE/6*5)
32967+#define MAX_GAP (pax_task_size/6*5)
32968
32969 static int mmap_is_legacy(void)
32970 {
32971@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
32972 return rnd << PAGE_SHIFT;
32973 }
32974
32975-static unsigned long mmap_base(void)
32976+static unsigned long mmap_base(struct mm_struct *mm)
32977 {
32978 unsigned long gap = rlimit(RLIMIT_STACK);
32979+ unsigned long pax_task_size = TASK_SIZE;
32980+
32981+#ifdef CONFIG_PAX_SEGMEXEC
32982+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32983+ pax_task_size = SEGMEXEC_TASK_SIZE;
32984+#endif
32985
32986 if (gap < MIN_GAP)
32987 gap = MIN_GAP;
32988 else if (gap > MAX_GAP)
32989 gap = MAX_GAP;
32990
32991- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
32992+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
32993 }
32994
32995 /*
32996 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
32997 * does, but not when emulating X86_32
32998 */
32999-static unsigned long mmap_legacy_base(void)
33000+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33001 {
33002- if (mmap_is_ia32())
33003+ if (mmap_is_ia32()) {
33004+
33005+#ifdef CONFIG_PAX_SEGMEXEC
33006+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33007+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33008+ else
33009+#endif
33010+
33011 return TASK_UNMAPPED_BASE;
33012- else
33013+ } else
33014 return TASK_UNMAPPED_BASE + mmap_rnd();
33015 }
33016
33017@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33018 */
33019 void arch_pick_mmap_layout(struct mm_struct *mm)
33020 {
33021- mm->mmap_legacy_base = mmap_legacy_base();
33022- mm->mmap_base = mmap_base();
33023+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33024+ mm->mmap_base = mmap_base(mm);
33025+
33026+#ifdef CONFIG_PAX_RANDMMAP
33027+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33028+ mm->mmap_legacy_base += mm->delta_mmap;
33029+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33030+ }
33031+#endif
33032
33033 if (mmap_is_legacy()) {
33034 mm->mmap_base = mm->mmap_legacy_base;
33035diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33036index 0057a7a..95c7edd 100644
33037--- a/arch/x86/mm/mmio-mod.c
33038+++ b/arch/x86/mm/mmio-mod.c
33039@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33040 break;
33041 default:
33042 {
33043- unsigned char *ip = (unsigned char *)instptr;
33044+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33045 my_trace->opcode = MMIO_UNKNOWN_OP;
33046 my_trace->width = 0;
33047 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33048@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33049 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33050 void __iomem *addr)
33051 {
33052- static atomic_t next_id;
33053+ static atomic_unchecked_t next_id;
33054 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33055 /* These are page-unaligned. */
33056 struct mmiotrace_map map = {
33057@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33058 .private = trace
33059 },
33060 .phys = offset,
33061- .id = atomic_inc_return(&next_id)
33062+ .id = atomic_inc_return_unchecked(&next_id)
33063 };
33064 map.map_id = trace->id;
33065
33066@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33067 ioremap_trace_core(offset, size, addr);
33068 }
33069
33070-static void iounmap_trace_core(volatile void __iomem *addr)
33071+static void iounmap_trace_core(const volatile void __iomem *addr)
33072 {
33073 struct mmiotrace_map map = {
33074 .phys = 0,
33075@@ -328,7 +328,7 @@ not_enabled:
33076 }
33077 }
33078
33079-void mmiotrace_iounmap(volatile void __iomem *addr)
33080+void mmiotrace_iounmap(const volatile void __iomem *addr)
33081 {
33082 might_sleep();
33083 if (is_enabled()) /* recheck and proper locking in *_core() */
33084diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33085index 1d045f9..3a00249 100644
33086--- a/arch/x86/mm/numa.c
33087+++ b/arch/x86/mm/numa.c
33088@@ -478,7 +478,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
33089 return true;
33090 }
33091
33092-static int __init numa_register_memblks(struct numa_meminfo *mi)
33093+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33094 {
33095 unsigned long uninitialized_var(pfn_align);
33096 int i, nid;
33097diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
33098index 461bc82..4e091a3 100644
33099--- a/arch/x86/mm/pageattr-test.c
33100+++ b/arch/x86/mm/pageattr-test.c
33101@@ -35,7 +35,7 @@ enum {
33102
33103 static int pte_testbit(pte_t pte)
33104 {
33105- return pte_flags(pte) & _PAGE_UNUSED1;
33106+ return pte_flags(pte) & _PAGE_CPA_TEST;
33107 }
33108
33109 struct split_state {
33110diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33111index ae242a7..1c7998f 100644
33112--- a/arch/x86/mm/pageattr.c
33113+++ b/arch/x86/mm/pageattr.c
33114@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33115 */
33116 #ifdef CONFIG_PCI_BIOS
33117 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33118- pgprot_val(forbidden) |= _PAGE_NX;
33119+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33120 #endif
33121
33122 /*
33123@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33124 * Does not cover __inittext since that is gone later on. On
33125 * 64bit we do not enforce !NX on the low mapping
33126 */
33127- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33128- pgprot_val(forbidden) |= _PAGE_NX;
33129+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33130+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33131
33132+#ifdef CONFIG_DEBUG_RODATA
33133 /*
33134 * The .rodata section needs to be read-only. Using the pfn
33135 * catches all aliases.
33136@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33137 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33138 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33139 pgprot_val(forbidden) |= _PAGE_RW;
33140+#endif
33141
33142 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33143 /*
33144@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33145 }
33146 #endif
33147
33148+#ifdef CONFIG_PAX_KERNEXEC
33149+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33150+ pgprot_val(forbidden) |= _PAGE_RW;
33151+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33152+ }
33153+#endif
33154+
33155 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33156
33157 return prot;
33158@@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33159 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33160 {
33161 /* change init_mm */
33162+ pax_open_kernel();
33163 set_pte_atomic(kpte, pte);
33164+
33165 #ifdef CONFIG_X86_32
33166 if (!SHARED_KERNEL_PMD) {
33167+
33168+#ifdef CONFIG_PAX_PER_CPU_PGD
33169+ unsigned long cpu;
33170+#else
33171 struct page *page;
33172+#endif
33173
33174+#ifdef CONFIG_PAX_PER_CPU_PGD
33175+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33176+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33177+#else
33178 list_for_each_entry(page, &pgd_list, lru) {
33179- pgd_t *pgd;
33180+ pgd_t *pgd = (pgd_t *)page_address(page);
33181+#endif
33182+
33183 pud_t *pud;
33184 pmd_t *pmd;
33185
33186- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33187+ pgd += pgd_index(address);
33188 pud = pud_offset(pgd, address);
33189 pmd = pmd_offset(pud, address);
33190 set_pte_atomic((pte_t *)pmd, pte);
33191 }
33192 }
33193 #endif
33194+ pax_close_kernel();
33195 }
33196
33197 static int
33198diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33199index 6574388..87e9bef 100644
33200--- a/arch/x86/mm/pat.c
33201+++ b/arch/x86/mm/pat.c
33202@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33203
33204 if (!entry) {
33205 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33206- current->comm, current->pid, start, end - 1);
33207+ current->comm, task_pid_nr(current), start, end - 1);
33208 return -EINVAL;
33209 }
33210
33211@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33212
33213 while (cursor < to) {
33214 if (!devmem_is_allowed(pfn)) {
33215- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33216- current->comm, from, to - 1);
33217+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33218+ current->comm, from, to - 1, cursor);
33219 return 0;
33220 }
33221 cursor += PAGE_SIZE;
33222@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33223 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33224 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33225 "for [mem %#010Lx-%#010Lx]\n",
33226- current->comm, current->pid,
33227+ current->comm, task_pid_nr(current),
33228 cattr_name(flags),
33229 base, (unsigned long long)(base + size-1));
33230 return -EINVAL;
33231@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33232 flags = lookup_memtype(paddr);
33233 if (want_flags != flags) {
33234 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33235- current->comm, current->pid,
33236+ current->comm, task_pid_nr(current),
33237 cattr_name(want_flags),
33238 (unsigned long long)paddr,
33239 (unsigned long long)(paddr + size - 1),
33240@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33241 free_memtype(paddr, paddr + size);
33242 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33243 " for [mem %#010Lx-%#010Lx], got %s\n",
33244- current->comm, current->pid,
33245+ current->comm, task_pid_nr(current),
33246 cattr_name(want_flags),
33247 (unsigned long long)paddr,
33248 (unsigned long long)(paddr + size - 1),
33249diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33250index 415f6c4..d319983 100644
33251--- a/arch/x86/mm/pat_rbtree.c
33252+++ b/arch/x86/mm/pat_rbtree.c
33253@@ -160,7 +160,7 @@ success:
33254
33255 failure:
33256 printk(KERN_INFO "%s:%d conflicting memory types "
33257- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33258+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33259 end, cattr_name(found_type), cattr_name(match->type));
33260 return -EBUSY;
33261 }
33262diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33263index 9f0614d..92ae64a 100644
33264--- a/arch/x86/mm/pf_in.c
33265+++ b/arch/x86/mm/pf_in.c
33266@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33267 int i;
33268 enum reason_type rv = OTHERS;
33269
33270- p = (unsigned char *)ins_addr;
33271+ p = (unsigned char *)ktla_ktva(ins_addr);
33272 p += skip_prefix(p, &prf);
33273 p += get_opcode(p, &opcode);
33274
33275@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33276 struct prefix_bits prf;
33277 int i;
33278
33279- p = (unsigned char *)ins_addr;
33280+ p = (unsigned char *)ktla_ktva(ins_addr);
33281 p += skip_prefix(p, &prf);
33282 p += get_opcode(p, &opcode);
33283
33284@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33285 struct prefix_bits prf;
33286 int i;
33287
33288- p = (unsigned char *)ins_addr;
33289+ p = (unsigned char *)ktla_ktva(ins_addr);
33290 p += skip_prefix(p, &prf);
33291 p += get_opcode(p, &opcode);
33292
33293@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33294 struct prefix_bits prf;
33295 int i;
33296
33297- p = (unsigned char *)ins_addr;
33298+ p = (unsigned char *)ktla_ktva(ins_addr);
33299 p += skip_prefix(p, &prf);
33300 p += get_opcode(p, &opcode);
33301 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33302@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33303 struct prefix_bits prf;
33304 int i;
33305
33306- p = (unsigned char *)ins_addr;
33307+ p = (unsigned char *)ktla_ktva(ins_addr);
33308 p += skip_prefix(p, &prf);
33309 p += get_opcode(p, &opcode);
33310 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33311diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33312index c96314a..433b127 100644
33313--- a/arch/x86/mm/pgtable.c
33314+++ b/arch/x86/mm/pgtable.c
33315@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33316 list_del(&page->lru);
33317 }
33318
33319-#define UNSHARED_PTRS_PER_PGD \
33320- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33321+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33322+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33323
33324+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33325+{
33326+ unsigned int count = USER_PGD_PTRS;
33327
33328+ if (!pax_user_shadow_base)
33329+ return;
33330+
33331+ while (count--)
33332+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33333+}
33334+#endif
33335+
33336+#ifdef CONFIG_PAX_PER_CPU_PGD
33337+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33338+{
33339+ unsigned int count = USER_PGD_PTRS;
33340+
33341+ while (count--) {
33342+ pgd_t pgd;
33343+
33344+#ifdef CONFIG_X86_64
33345+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33346+#else
33347+ pgd = *src++;
33348+#endif
33349+
33350+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33351+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33352+#endif
33353+
33354+ *dst++ = pgd;
33355+ }
33356+
33357+}
33358+#endif
33359+
33360+#ifdef CONFIG_X86_64
33361+#define pxd_t pud_t
33362+#define pyd_t pgd_t
33363+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33364+#define pgtable_pxd_page_ctor(page) true
33365+#define pgtable_pxd_page_dtor(page)
33366+#define pxd_free(mm, pud) pud_free((mm), (pud))
33367+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33368+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33369+#define PYD_SIZE PGDIR_SIZE
33370+#else
33371+#define pxd_t pmd_t
33372+#define pyd_t pud_t
33373+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33374+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33375+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33376+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33377+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33378+#define pyd_offset(mm, address) pud_offset((mm), (address))
33379+#define PYD_SIZE PUD_SIZE
33380+#endif
33381+
33382+#ifdef CONFIG_PAX_PER_CPU_PGD
33383+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33384+static inline void pgd_dtor(pgd_t *pgd) {}
33385+#else
33386 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33387 {
33388 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33389@@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33390 pgd_list_del(pgd);
33391 spin_unlock(&pgd_lock);
33392 }
33393+#endif
33394
33395 /*
33396 * List of all pgd's needed for non-PAE so it can invalidate entries
33397@@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33398 * -- nyc
33399 */
33400
33401-#ifdef CONFIG_X86_PAE
33402+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33403 /*
33404 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33405 * updating the top-level pagetable entries to guarantee the
33406@@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33407 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33408 * and initialize the kernel pmds here.
33409 */
33410-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33411+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33412
33413 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33414 {
33415@@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33416 */
33417 flush_tlb_mm(mm);
33418 }
33419+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33420+#define PREALLOCATED_PXDS USER_PGD_PTRS
33421 #else /* !CONFIG_X86_PAE */
33422
33423 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33424-#define PREALLOCATED_PMDS 0
33425+#define PREALLOCATED_PXDS 0
33426
33427 #endif /* CONFIG_X86_PAE */
33428
33429-static void free_pmds(pmd_t *pmds[])
33430+static void free_pxds(pxd_t *pxds[])
33431 {
33432 int i;
33433
33434- for(i = 0; i < PREALLOCATED_PMDS; i++)
33435- if (pmds[i]) {
33436- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33437- free_page((unsigned long)pmds[i]);
33438+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33439+ if (pxds[i]) {
33440+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33441+ free_page((unsigned long)pxds[i]);
33442 }
33443 }
33444
33445-static int preallocate_pmds(pmd_t *pmds[])
33446+static int preallocate_pxds(pxd_t *pxds[])
33447 {
33448 int i;
33449 bool failed = false;
33450
33451- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33452- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33453- if (!pmd)
33454+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33455+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33456+ if (!pxd)
33457 failed = true;
33458- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33459- free_page((unsigned long)pmd);
33460- pmd = NULL;
33461+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33462+ free_page((unsigned long)pxd);
33463+ pxd = NULL;
33464 failed = true;
33465 }
33466- pmds[i] = pmd;
33467+ pxds[i] = pxd;
33468 }
33469
33470 if (failed) {
33471- free_pmds(pmds);
33472+ free_pxds(pxds);
33473 return -ENOMEM;
33474 }
33475
33476@@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33477 * preallocate which never got a corresponding vma will need to be
33478 * freed manually.
33479 */
33480-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33481+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33482 {
33483 int i;
33484
33485- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33486+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33487 pgd_t pgd = pgdp[i];
33488
33489 if (pgd_val(pgd) != 0) {
33490- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33491+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33492
33493- pgdp[i] = native_make_pgd(0);
33494+ set_pgd(pgdp + i, native_make_pgd(0));
33495
33496- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33497- pmd_free(mm, pmd);
33498+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33499+ pxd_free(mm, pxd);
33500 }
33501 }
33502 }
33503
33504-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33505+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33506 {
33507- pud_t *pud;
33508+ pyd_t *pyd;
33509 int i;
33510
33511- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33512+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33513 return;
33514
33515- pud = pud_offset(pgd, 0);
33516-
33517- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33518- pmd_t *pmd = pmds[i];
33519+#ifdef CONFIG_X86_64
33520+ pyd = pyd_offset(mm, 0L);
33521+#else
33522+ pyd = pyd_offset(pgd, 0L);
33523+#endif
33524
33525+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33526+ pxd_t *pxd = pxds[i];
33527 if (i >= KERNEL_PGD_BOUNDARY)
33528- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33529- sizeof(pmd_t) * PTRS_PER_PMD);
33530+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33531+ sizeof(pxd_t) * PTRS_PER_PMD);
33532
33533- pud_populate(mm, pud, pmd);
33534+ pyd_populate(mm, pyd, pxd);
33535 }
33536 }
33537
33538 pgd_t *pgd_alloc(struct mm_struct *mm)
33539 {
33540 pgd_t *pgd;
33541- pmd_t *pmds[PREALLOCATED_PMDS];
33542+ pxd_t *pxds[PREALLOCATED_PXDS];
33543
33544 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33545
33546@@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33547
33548 mm->pgd = pgd;
33549
33550- if (preallocate_pmds(pmds) != 0)
33551+ if (preallocate_pxds(pxds) != 0)
33552 goto out_free_pgd;
33553
33554 if (paravirt_pgd_alloc(mm) != 0)
33555- goto out_free_pmds;
33556+ goto out_free_pxds;
33557
33558 /*
33559 * Make sure that pre-populating the pmds is atomic with
33560@@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33561 spin_lock(&pgd_lock);
33562
33563 pgd_ctor(mm, pgd);
33564- pgd_prepopulate_pmd(mm, pgd, pmds);
33565+ pgd_prepopulate_pxd(mm, pgd, pxds);
33566
33567 spin_unlock(&pgd_lock);
33568
33569 return pgd;
33570
33571-out_free_pmds:
33572- free_pmds(pmds);
33573+out_free_pxds:
33574+ free_pxds(pxds);
33575 out_free_pgd:
33576 free_page((unsigned long)pgd);
33577 out:
33578@@ -313,7 +380,7 @@ out:
33579
33580 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33581 {
33582- pgd_mop_up_pmds(mm, pgd);
33583+ pgd_mop_up_pxds(mm, pgd);
33584 pgd_dtor(pgd);
33585 paravirt_pgd_free(mm, pgd);
33586 free_page((unsigned long)pgd);
33587diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33588index 4dd8cf6..f9d143e 100644
33589--- a/arch/x86/mm/pgtable_32.c
33590+++ b/arch/x86/mm/pgtable_32.c
33591@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33592 return;
33593 }
33594 pte = pte_offset_kernel(pmd, vaddr);
33595+
33596+ pax_open_kernel();
33597 if (pte_val(pteval))
33598 set_pte_at(&init_mm, vaddr, pte, pteval);
33599 else
33600 pte_clear(&init_mm, vaddr, pte);
33601+ pax_close_kernel();
33602
33603 /*
33604 * It's enough to flush this one mapping.
33605diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33606index e666cbb..61788c45 100644
33607--- a/arch/x86/mm/physaddr.c
33608+++ b/arch/x86/mm/physaddr.c
33609@@ -10,7 +10,7 @@
33610 #ifdef CONFIG_X86_64
33611
33612 #ifdef CONFIG_DEBUG_VIRTUAL
33613-unsigned long __phys_addr(unsigned long x)
33614+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33615 {
33616 unsigned long y = x - __START_KERNEL_map;
33617
33618@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33619 #else
33620
33621 #ifdef CONFIG_DEBUG_VIRTUAL
33622-unsigned long __phys_addr(unsigned long x)
33623+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33624 {
33625 unsigned long phys_addr = x - PAGE_OFFSET;
33626 /* VMALLOC_* aren't constants */
33627diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33628index 90555bf..f5f1828 100644
33629--- a/arch/x86/mm/setup_nx.c
33630+++ b/arch/x86/mm/setup_nx.c
33631@@ -5,8 +5,10 @@
33632 #include <asm/pgtable.h>
33633 #include <asm/proto.h>
33634
33635+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33636 static int disable_nx;
33637
33638+#ifndef CONFIG_PAX_PAGEEXEC
33639 /*
33640 * noexec = on|off
33641 *
33642@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33643 return 0;
33644 }
33645 early_param("noexec", noexec_setup);
33646+#endif
33647+
33648+#endif
33649
33650 void x86_configure_nx(void)
33651 {
33652+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33653 if (cpu_has_nx && !disable_nx)
33654 __supported_pte_mask |= _PAGE_NX;
33655 else
33656+#endif
33657 __supported_pte_mask &= ~_PAGE_NX;
33658 }
33659
33660diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33661index dd8dda1..9e9b0f6 100644
33662--- a/arch/x86/mm/tlb.c
33663+++ b/arch/x86/mm/tlb.c
33664@@ -48,7 +48,11 @@ void leave_mm(int cpu)
33665 BUG();
33666 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33667 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33668+
33669+#ifndef CONFIG_PAX_PER_CPU_PGD
33670 load_cr3(swapper_pg_dir);
33671+#endif
33672+
33673 }
33674 }
33675 EXPORT_SYMBOL_GPL(leave_mm);
33676diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
33677new file mode 100644
33678index 0000000..dace51c
33679--- /dev/null
33680+++ b/arch/x86/mm/uderef_64.c
33681@@ -0,0 +1,37 @@
33682+#include <linux/mm.h>
33683+#include <asm/pgtable.h>
33684+#include <asm/uaccess.h>
33685+
33686+#ifdef CONFIG_PAX_MEMORY_UDEREF
33687+/* PaX: due to the special call convention these functions must
33688+ * - remain leaf functions under all configurations,
33689+ * - never be called directly, only dereferenced from the wrappers.
33690+ */
33691+void __pax_open_userland(void)
33692+{
33693+ unsigned int cpu;
33694+
33695+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
33696+ return;
33697+
33698+ cpu = raw_get_cpu();
33699+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
33700+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
33701+ raw_put_cpu_no_resched();
33702+}
33703+EXPORT_SYMBOL(__pax_open_userland);
33704+
33705+void __pax_close_userland(void)
33706+{
33707+ unsigned int cpu;
33708+
33709+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
33710+ return;
33711+
33712+ cpu = raw_get_cpu();
33713+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
33714+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
33715+ raw_put_cpu_no_resched();
33716+}
33717+EXPORT_SYMBOL(__pax_close_userland);
33718+#endif
33719diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
33720index 0149575..f746de8 100644
33721--- a/arch/x86/net/bpf_jit.S
33722+++ b/arch/x86/net/bpf_jit.S
33723@@ -9,6 +9,7 @@
33724 */
33725 #include <linux/linkage.h>
33726 #include <asm/dwarf2.h>
33727+#include <asm/alternative-asm.h>
33728
33729 /*
33730 * Calling convention :
33731@@ -35,6 +36,7 @@ sk_load_word_positive_offset:
33732 jle bpf_slow_path_word
33733 mov (SKBDATA,%rsi),%eax
33734 bswap %eax /* ntohl() */
33735+ pax_force_retaddr
33736 ret
33737
33738 sk_load_half:
33739@@ -52,6 +54,7 @@ sk_load_half_positive_offset:
33740 jle bpf_slow_path_half
33741 movzwl (SKBDATA,%rsi),%eax
33742 rol $8,%ax # ntohs()
33743+ pax_force_retaddr
33744 ret
33745
33746 sk_load_byte:
33747@@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
33748 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
33749 jle bpf_slow_path_byte
33750 movzbl (SKBDATA,%rsi),%eax
33751+ pax_force_retaddr
33752 ret
33753
33754 /**
33755@@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
33756 movzbl (SKBDATA,%rsi),%ebx
33757 and $15,%bl
33758 shl $2,%bl
33759+ pax_force_retaddr
33760 ret
33761
33762 /* rsi contains offset and can be scratched */
33763@@ -109,6 +114,7 @@ bpf_slow_path_word:
33764 js bpf_error
33765 mov -12(%rbp),%eax
33766 bswap %eax
33767+ pax_force_retaddr
33768 ret
33769
33770 bpf_slow_path_half:
33771@@ -117,12 +123,14 @@ bpf_slow_path_half:
33772 mov -12(%rbp),%ax
33773 rol $8,%ax
33774 movzwl %ax,%eax
33775+ pax_force_retaddr
33776 ret
33777
33778 bpf_slow_path_byte:
33779 bpf_slow_path_common(1)
33780 js bpf_error
33781 movzbl -12(%rbp),%eax
33782+ pax_force_retaddr
33783 ret
33784
33785 bpf_slow_path_byte_msh:
33786@@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
33787 and $15,%al
33788 shl $2,%al
33789 xchg %eax,%ebx
33790+ pax_force_retaddr
33791 ret
33792
33793 #define sk_negative_common(SIZE) \
33794@@ -157,6 +166,7 @@ sk_load_word_negative_offset:
33795 sk_negative_common(4)
33796 mov (%rax), %eax
33797 bswap %eax
33798+ pax_force_retaddr
33799 ret
33800
33801 bpf_slow_path_half_neg:
33802@@ -168,6 +178,7 @@ sk_load_half_negative_offset:
33803 mov (%rax),%ax
33804 rol $8,%ax
33805 movzwl %ax,%eax
33806+ pax_force_retaddr
33807 ret
33808
33809 bpf_slow_path_byte_neg:
33810@@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
33811 .globl sk_load_byte_negative_offset
33812 sk_negative_common(1)
33813 movzbl (%rax), %eax
33814+ pax_force_retaddr
33815 ret
33816
33817 bpf_slow_path_byte_msh_neg:
33818@@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
33819 and $15,%al
33820 shl $2,%al
33821 xchg %eax,%ebx
33822+ pax_force_retaddr
33823 ret
33824
33825 bpf_error:
33826@@ -197,4 +210,5 @@ bpf_error:
33827 xor %eax,%eax
33828 mov -8(%rbp),%rbx
33829 leaveq
33830+ pax_force_retaddr
33831 ret
33832diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
33833index 6d5663a..f1ec380 100644
33834--- a/arch/x86/net/bpf_jit_comp.c
33835+++ b/arch/x86/net/bpf_jit_comp.c
33836@@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
33837 return ptr + len;
33838 }
33839
33840+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33841+#define MAX_INSTR_CODE_SIZE 96
33842+#else
33843+#define MAX_INSTR_CODE_SIZE 64
33844+#endif
33845+
33846 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
33847
33848 #define EMIT1(b1) EMIT(b1, 1)
33849 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
33850 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
33851 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
33852+
33853+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33854+/* original constant will appear in ecx */
33855+#define DILUTE_CONST_SEQUENCE(_off, _key) \
33856+do { \
33857+ /* mov ecx, randkey */ \
33858+ EMIT1(0xb9); \
33859+ EMIT(_key, 4); \
33860+ /* xor ecx, randkey ^ off */ \
33861+ EMIT2(0x81, 0xf1); \
33862+ EMIT((_key) ^ (_off), 4); \
33863+} while (0)
33864+
33865+#define EMIT1_off32(b1, _off) \
33866+do { \
33867+ switch (b1) { \
33868+ case 0x05: /* add eax, imm32 */ \
33869+ case 0x2d: /* sub eax, imm32 */ \
33870+ case 0x25: /* and eax, imm32 */ \
33871+ case 0x0d: /* or eax, imm32 */ \
33872+ case 0xb8: /* mov eax, imm32 */ \
33873+ case 0x35: /* xor eax, imm32 */ \
33874+ case 0x3d: /* cmp eax, imm32 */ \
33875+ case 0xa9: /* test eax, imm32 */ \
33876+ DILUTE_CONST_SEQUENCE(_off, randkey); \
33877+ EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
33878+ break; \
33879+ case 0xbb: /* mov ebx, imm32 */ \
33880+ DILUTE_CONST_SEQUENCE(_off, randkey); \
33881+ /* mov ebx, ecx */ \
33882+ EMIT2(0x89, 0xcb); \
33883+ break; \
33884+ case 0xbe: /* mov esi, imm32 */ \
33885+ DILUTE_CONST_SEQUENCE(_off, randkey); \
33886+ /* mov esi, ecx */ \
33887+ EMIT2(0x89, 0xce); \
33888+ break; \
33889+ case 0xe8: /* call rel imm32, always to known funcs */ \
33890+ EMIT1(b1); \
33891+ EMIT(_off, 4); \
33892+ break; \
33893+ case 0xe9: /* jmp rel imm32 */ \
33894+ EMIT1(b1); \
33895+ EMIT(_off, 4); \
33896+ /* prevent fall-through, we're not called if off = 0 */ \
33897+ EMIT(0xcccccccc, 4); \
33898+ EMIT(0xcccccccc, 4); \
33899+ break; \
33900+ default: \
33901+ BUILD_BUG(); \
33902+ } \
33903+} while (0)
33904+
33905+#define EMIT2_off32(b1, b2, _off) \
33906+do { \
33907+ if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
33908+ EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
33909+ EMIT(randkey, 4); \
33910+ EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
33911+ EMIT((_off) - randkey, 4); \
33912+ } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
33913+ DILUTE_CONST_SEQUENCE(_off, randkey); \
33914+ /* imul eax, ecx */ \
33915+ EMIT3(0x0f, 0xaf, 0xc1); \
33916+ } else { \
33917+ BUILD_BUG(); \
33918+ } \
33919+} while (0)
33920+#else
33921 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
33922+#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
33923+#endif
33924
33925 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
33926 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
33927@@ -91,6 +168,24 @@ do { \
33928 #define X86_JBE 0x76
33929 #define X86_JA 0x77
33930
33931+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
33932+#define APPEND_FLOW_VERIFY() \
33933+do { \
33934+ /* mov ecx, randkey */ \
33935+ EMIT1(0xb9); \
33936+ EMIT(randkey, 4); \
33937+ /* cmp ecx, randkey */ \
33938+ EMIT2(0x81, 0xf9); \
33939+ EMIT(randkey, 4); \
33940+ /* jz after 8 int 3s */ \
33941+ EMIT2(0x74, 0x08); \
33942+ EMIT(0xcccccccc, 4); \
33943+ EMIT(0xcccccccc, 4); \
33944+} while (0)
33945+#else
33946+#define APPEND_FLOW_VERIFY() do { } while (0)
33947+#endif
33948+
33949 #define EMIT_COND_JMP(op, offset) \
33950 do { \
33951 if (is_near(offset)) \
33952@@ -98,6 +193,7 @@ do { \
33953 else { \
33954 EMIT2(0x0f, op + 0x10); \
33955 EMIT(offset, 4); /* jxx .+off32 */ \
33956+ APPEND_FLOW_VERIFY(); \
33957 } \
33958 } while (0)
33959
33960@@ -145,55 +241,54 @@ static int pkt_type_offset(void)
33961 return -1;
33962 }
33963
33964-struct bpf_binary_header {
33965- unsigned int pages;
33966- /* Note : for security reasons, bpf code will follow a randomly
33967- * sized amount of int3 instructions
33968- */
33969- u8 image[];
33970-};
33971-
33972-static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
33973+/* Note : for security reasons, bpf code will follow a randomly
33974+ * sized amount of int3 instructions
33975+ */
33976+static u8 *bpf_alloc_binary(unsigned int proglen,
33977 u8 **image_ptr)
33978 {
33979 unsigned int sz, hole;
33980- struct bpf_binary_header *header;
33981+ u8 *header;
33982
33983 /* Most of BPF filters are really small,
33984 * but if some of them fill a page, allow at least
33985 * 128 extra bytes to insert a random section of int3
33986 */
33987- sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
33988- header = module_alloc(sz);
33989+ sz = round_up(proglen + 128, PAGE_SIZE);
33990+ header = module_alloc_exec(sz);
33991 if (!header)
33992 return NULL;
33993
33994+ pax_open_kernel();
33995 memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
33996+ pax_close_kernel();
33997
33998- header->pages = sz / PAGE_SIZE;
33999- hole = min(sz - (proglen + sizeof(*header)), PAGE_SIZE - sizeof(*header));
34000+ hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
34001
34002 /* insert a random number of int3 instructions before BPF code */
34003- *image_ptr = &header->image[prandom_u32() % hole];
34004+ *image_ptr = &header[prandom_u32() % hole];
34005 return header;
34006 }
34007
34008 void bpf_jit_compile(struct sk_filter *fp)
34009 {
34010- u8 temp[64];
34011+ u8 temp[MAX_INSTR_CODE_SIZE];
34012 u8 *prog;
34013 unsigned int proglen, oldproglen = 0;
34014 int ilen, i;
34015 int t_offset, f_offset;
34016 u8 t_op, f_op, seen = 0, pass;
34017 u8 *image = NULL;
34018- struct bpf_binary_header *header = NULL;
34019+ u8 *header = NULL;
34020 u8 *func;
34021 int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
34022 unsigned int cleanup_addr; /* epilogue code offset */
34023 unsigned int *addrs;
34024 const struct sock_filter *filter = fp->insns;
34025 int flen = fp->len;
34026+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34027+ unsigned int randkey;
34028+#endif
34029
34030 if (!bpf_jit_enable)
34031 return;
34032@@ -203,10 +298,10 @@ void bpf_jit_compile(struct sk_filter *fp)
34033 return;
34034
34035 /* Before first pass, make a rough estimation of addrs[]
34036- * each bpf instruction is translated to less than 64 bytes
34037+ * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
34038 */
34039 for (proglen = 0, i = 0; i < flen; i++) {
34040- proglen += 64;
34041+ proglen += MAX_INSTR_CODE_SIZE;
34042 addrs[i] = proglen;
34043 }
34044 cleanup_addr = proglen; /* epilogue address */
34045@@ -285,6 +380,10 @@ void bpf_jit_compile(struct sk_filter *fp)
34046 for (i = 0; i < flen; i++) {
34047 unsigned int K = filter[i].k;
34048
34049+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34050+ randkey = prandom_u32();
34051+#endif
34052+
34053 switch (filter[i].code) {
34054 case BPF_S_ALU_ADD_X: /* A += X; */
34055 seen |= SEEN_XREG;
34056@@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
34057 case BPF_S_ALU_MUL_K: /* A *= K */
34058 if (is_imm8(K))
34059 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
34060- else {
34061- EMIT2(0x69, 0xc0); /* imul imm32,%eax */
34062- EMIT(K, 4);
34063- }
34064+ else
34065+ EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
34066 break;
34067 case BPF_S_ALU_DIV_X: /* A /= X; */
34068 seen |= SEEN_XREG;
34069@@ -364,7 +461,11 @@ void bpf_jit_compile(struct sk_filter *fp)
34070 break;
34071 }
34072 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
34073+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34074+ DILUTE_CONST_SEQUENCE(K, randkey);
34075+#else
34076 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
34077+#endif
34078 EMIT2(0xf7, 0xf1); /* div %ecx */
34079 EMIT2(0x89, 0xd0); /* mov %edx,%eax */
34080 break;
34081@@ -372,7 +473,11 @@ void bpf_jit_compile(struct sk_filter *fp)
34082 if (K == 1)
34083 break;
34084 EMIT2(0x31, 0xd2); /* xor %edx,%edx */
34085+#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
34086+ DILUTE_CONST_SEQUENCE(K, randkey);
34087+#else
34088 EMIT1(0xb9);EMIT(K, 4); /* mov imm32,%ecx */
34089+#endif
34090 EMIT2(0xf7, 0xf1); /* div %ecx */
34091 break;
34092 case BPF_S_ALU_AND_X:
34093@@ -643,8 +748,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
34094 if (is_imm8(K)) {
34095 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
34096 } else {
34097- EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
34098- EMIT(K, 4);
34099+ EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
34100 }
34101 } else {
34102 EMIT2(0x89,0xde); /* mov %ebx,%esi */
34103@@ -734,10 +838,12 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
34104 if (unlikely(proglen + ilen > oldproglen)) {
34105 pr_err("bpb_jit_compile fatal error\n");
34106 kfree(addrs);
34107- module_free(NULL, header);
34108+ module_free_exec(NULL, image);
34109 return;
34110 }
34111+ pax_open_kernel();
34112 memcpy(image + proglen, temp, ilen);
34113+ pax_close_kernel();
34114 }
34115 proglen += ilen;
34116 addrs[i] = proglen;
34117@@ -770,7 +876,6 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
34118
34119 if (image) {
34120 bpf_flush_icache(header, image + proglen);
34121- set_memory_ro((unsigned long)header, header->pages);
34122 fp->bpf_func = (void *)image;
34123 fp->jited = 1;
34124 }
34125@@ -783,10 +888,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
34126 {
34127 struct sk_filter *fp = container_of(work, struct sk_filter, work);
34128 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34129- struct bpf_binary_header *header = (void *)addr;
34130
34131- set_memory_rw(addr, header->pages);
34132- module_free(NULL, header);
34133+ set_memory_rw(addr, 1);
34134+ module_free_exec(NULL, (void *)addr);
34135 kfree(fp);
34136 }
34137
34138diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34139index 5d04be5..2beeaa2 100644
34140--- a/arch/x86/oprofile/backtrace.c
34141+++ b/arch/x86/oprofile/backtrace.c
34142@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34143 struct stack_frame_ia32 *fp;
34144 unsigned long bytes;
34145
34146- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34147+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34148 if (bytes != 0)
34149 return NULL;
34150
34151- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34152+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34153
34154 oprofile_add_trace(bufhead[0].return_address);
34155
34156@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34157 struct stack_frame bufhead[2];
34158 unsigned long bytes;
34159
34160- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34161+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34162 if (bytes != 0)
34163 return NULL;
34164
34165@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34166 {
34167 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34168
34169- if (!user_mode_vm(regs)) {
34170+ if (!user_mode(regs)) {
34171 unsigned long stack = kernel_stack_pointer(regs);
34172 if (depth)
34173 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34174diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34175index 379e8bd..6386e09 100644
34176--- a/arch/x86/oprofile/nmi_int.c
34177+++ b/arch/x86/oprofile/nmi_int.c
34178@@ -23,6 +23,7 @@
34179 #include <asm/nmi.h>
34180 #include <asm/msr.h>
34181 #include <asm/apic.h>
34182+#include <asm/pgtable.h>
34183
34184 #include "op_counter.h"
34185 #include "op_x86_model.h"
34186@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34187 if (ret)
34188 return ret;
34189
34190- if (!model->num_virt_counters)
34191- model->num_virt_counters = model->num_counters;
34192+ if (!model->num_virt_counters) {
34193+ pax_open_kernel();
34194+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34195+ pax_close_kernel();
34196+ }
34197
34198 mux_init(ops);
34199
34200diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34201index 50d86c0..7985318 100644
34202--- a/arch/x86/oprofile/op_model_amd.c
34203+++ b/arch/x86/oprofile/op_model_amd.c
34204@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34205 num_counters = AMD64_NUM_COUNTERS;
34206 }
34207
34208- op_amd_spec.num_counters = num_counters;
34209- op_amd_spec.num_controls = num_counters;
34210- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34211+ pax_open_kernel();
34212+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34213+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34214+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34215+ pax_close_kernel();
34216
34217 return 0;
34218 }
34219diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34220index d90528e..0127e2b 100644
34221--- a/arch/x86/oprofile/op_model_ppro.c
34222+++ b/arch/x86/oprofile/op_model_ppro.c
34223@@ -19,6 +19,7 @@
34224 #include <asm/msr.h>
34225 #include <asm/apic.h>
34226 #include <asm/nmi.h>
34227+#include <asm/pgtable.h>
34228
34229 #include "op_x86_model.h"
34230 #include "op_counter.h"
34231@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34232
34233 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34234
34235- op_arch_perfmon_spec.num_counters = num_counters;
34236- op_arch_perfmon_spec.num_controls = num_counters;
34237+ pax_open_kernel();
34238+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34239+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34240+ pax_close_kernel();
34241 }
34242
34243 static int arch_perfmon_init(struct oprofile_operations *ignore)
34244diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34245index 71e8a67..6a313bb 100644
34246--- a/arch/x86/oprofile/op_x86_model.h
34247+++ b/arch/x86/oprofile/op_x86_model.h
34248@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34249 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34250 struct op_msrs const * const msrs);
34251 #endif
34252-};
34253+} __do_const;
34254
34255 struct op_counter_config;
34256
34257diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34258index 84b9d67..260e5ff 100644
34259--- a/arch/x86/pci/intel_mid_pci.c
34260+++ b/arch/x86/pci/intel_mid_pci.c
34261@@ -245,7 +245,7 @@ int __init intel_mid_pci_init(void)
34262 pr_info("Intel MID platform detected, using MID PCI ops\n");
34263 pci_mmcfg_late_init();
34264 pcibios_enable_irq = intel_mid_pci_irq_enable;
34265- pci_root_ops = intel_mid_pci_ops;
34266+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34267 pci_soc_mode = 1;
34268 /* Continue with standard init */
34269 return 1;
34270diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34271index 84112f5..6334d60 100644
34272--- a/arch/x86/pci/irq.c
34273+++ b/arch/x86/pci/irq.c
34274@@ -50,7 +50,7 @@ struct irq_router {
34275 struct irq_router_handler {
34276 u16 vendor;
34277 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34278-};
34279+} __do_const;
34280
34281 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34282 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
34283@@ -790,7 +790,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34284 return 0;
34285 }
34286
34287-static __initdata struct irq_router_handler pirq_routers[] = {
34288+static __initconst const struct irq_router_handler pirq_routers[] = {
34289 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34290 { PCI_VENDOR_ID_AL, ali_router_probe },
34291 { PCI_VENDOR_ID_ITE, ite_router_probe },
34292@@ -817,7 +817,7 @@ static struct pci_dev *pirq_router_dev;
34293 static void __init pirq_find_router(struct irq_router *r)
34294 {
34295 struct irq_routing_table *rt = pirq_table;
34296- struct irq_router_handler *h;
34297+ const struct irq_router_handler *h;
34298
34299 #ifdef CONFIG_PCI_BIOS
34300 if (!rt->signature) {
34301@@ -1090,7 +1090,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34302 return 0;
34303 }
34304
34305-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34306+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34307 {
34308 .callback = fix_broken_hp_bios_irq9,
34309 .ident = "HP Pavilion N5400 Series Laptop",
34310diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34311index c77b24a..c979855 100644
34312--- a/arch/x86/pci/pcbios.c
34313+++ b/arch/x86/pci/pcbios.c
34314@@ -79,7 +79,7 @@ union bios32 {
34315 static struct {
34316 unsigned long address;
34317 unsigned short segment;
34318-} bios32_indirect = { 0, __KERNEL_CS };
34319+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
34320
34321 /*
34322 * Returns the entry point for the given service, NULL on error
34323@@ -92,37 +92,80 @@ static unsigned long bios32_service(unsigned long service)
34324 unsigned long length; /* %ecx */
34325 unsigned long entry; /* %edx */
34326 unsigned long flags;
34327+ struct desc_struct d, *gdt;
34328
34329 local_irq_save(flags);
34330- __asm__("lcall *(%%edi); cld"
34331+
34332+ gdt = get_cpu_gdt_table(smp_processor_id());
34333+
34334+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34335+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34336+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34337+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34338+
34339+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34340 : "=a" (return_code),
34341 "=b" (address),
34342 "=c" (length),
34343 "=d" (entry)
34344 : "0" (service),
34345 "1" (0),
34346- "D" (&bios32_indirect));
34347+ "D" (&bios32_indirect),
34348+ "r"(__PCIBIOS_DS)
34349+ : "memory");
34350+
34351+ pax_open_kernel();
34352+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34353+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34354+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34355+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34356+ pax_close_kernel();
34357+
34358 local_irq_restore(flags);
34359
34360 switch (return_code) {
34361- case 0:
34362- return address + entry;
34363- case 0x80: /* Not present */
34364- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34365- return 0;
34366- default: /* Shouldn't happen */
34367- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34368- service, return_code);
34369+ case 0: {
34370+ int cpu;
34371+ unsigned char flags;
34372+
34373+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34374+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34375+ printk(KERN_WARNING "bios32_service: not valid\n");
34376 return 0;
34377+ }
34378+ address = address + PAGE_OFFSET;
34379+ length += 16UL; /* some BIOSs underreport this... */
34380+ flags = 4;
34381+ if (length >= 64*1024*1024) {
34382+ length >>= PAGE_SHIFT;
34383+ flags |= 8;
34384+ }
34385+
34386+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34387+ gdt = get_cpu_gdt_table(cpu);
34388+ pack_descriptor(&d, address, length, 0x9b, flags);
34389+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34390+ pack_descriptor(&d, address, length, 0x93, flags);
34391+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34392+ }
34393+ return entry;
34394+ }
34395+ case 0x80: /* Not present */
34396+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34397+ return 0;
34398+ default: /* Shouldn't happen */
34399+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34400+ service, return_code);
34401+ return 0;
34402 }
34403 }
34404
34405 static struct {
34406 unsigned long address;
34407 unsigned short segment;
34408-} pci_indirect = { 0, __KERNEL_CS };
34409+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34410
34411-static int pci_bios_present;
34412+static int pci_bios_present __read_only;
34413
34414 static int check_pcibios(void)
34415 {
34416@@ -131,11 +174,13 @@ static int check_pcibios(void)
34417 unsigned long flags, pcibios_entry;
34418
34419 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34420- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34421+ pci_indirect.address = pcibios_entry;
34422
34423 local_irq_save(flags);
34424- __asm__(
34425- "lcall *(%%edi); cld\n\t"
34426+ __asm__("movw %w6, %%ds\n\t"
34427+ "lcall *%%ss:(%%edi); cld\n\t"
34428+ "push %%ss\n\t"
34429+ "pop %%ds\n\t"
34430 "jc 1f\n\t"
34431 "xor %%ah, %%ah\n"
34432 "1:"
34433@@ -144,7 +189,8 @@ static int check_pcibios(void)
34434 "=b" (ebx),
34435 "=c" (ecx)
34436 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34437- "D" (&pci_indirect)
34438+ "D" (&pci_indirect),
34439+ "r" (__PCIBIOS_DS)
34440 : "memory");
34441 local_irq_restore(flags);
34442
34443@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34444
34445 switch (len) {
34446 case 1:
34447- __asm__("lcall *(%%esi); cld\n\t"
34448+ __asm__("movw %w6, %%ds\n\t"
34449+ "lcall *%%ss:(%%esi); cld\n\t"
34450+ "push %%ss\n\t"
34451+ "pop %%ds\n\t"
34452 "jc 1f\n\t"
34453 "xor %%ah, %%ah\n"
34454 "1:"
34455@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34456 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34457 "b" (bx),
34458 "D" ((long)reg),
34459- "S" (&pci_indirect));
34460+ "S" (&pci_indirect),
34461+ "r" (__PCIBIOS_DS));
34462 /*
34463 * Zero-extend the result beyond 8 bits, do not trust the
34464 * BIOS having done it:
34465@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34466 *value &= 0xff;
34467 break;
34468 case 2:
34469- __asm__("lcall *(%%esi); cld\n\t"
34470+ __asm__("movw %w6, %%ds\n\t"
34471+ "lcall *%%ss:(%%esi); cld\n\t"
34472+ "push %%ss\n\t"
34473+ "pop %%ds\n\t"
34474 "jc 1f\n\t"
34475 "xor %%ah, %%ah\n"
34476 "1:"
34477@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34478 : "1" (PCIBIOS_READ_CONFIG_WORD),
34479 "b" (bx),
34480 "D" ((long)reg),
34481- "S" (&pci_indirect));
34482+ "S" (&pci_indirect),
34483+ "r" (__PCIBIOS_DS));
34484 /*
34485 * Zero-extend the result beyond 16 bits, do not trust the
34486 * BIOS having done it:
34487@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34488 *value &= 0xffff;
34489 break;
34490 case 4:
34491- __asm__("lcall *(%%esi); cld\n\t"
34492+ __asm__("movw %w6, %%ds\n\t"
34493+ "lcall *%%ss:(%%esi); cld\n\t"
34494+ "push %%ss\n\t"
34495+ "pop %%ds\n\t"
34496 "jc 1f\n\t"
34497 "xor %%ah, %%ah\n"
34498 "1:"
34499@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34500 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34501 "b" (bx),
34502 "D" ((long)reg),
34503- "S" (&pci_indirect));
34504+ "S" (&pci_indirect),
34505+ "r" (__PCIBIOS_DS));
34506 break;
34507 }
34508
34509@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34510
34511 switch (len) {
34512 case 1:
34513- __asm__("lcall *(%%esi); cld\n\t"
34514+ __asm__("movw %w6, %%ds\n\t"
34515+ "lcall *%%ss:(%%esi); cld\n\t"
34516+ "push %%ss\n\t"
34517+ "pop %%ds\n\t"
34518 "jc 1f\n\t"
34519 "xor %%ah, %%ah\n"
34520 "1:"
34521@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34522 "c" (value),
34523 "b" (bx),
34524 "D" ((long)reg),
34525- "S" (&pci_indirect));
34526+ "S" (&pci_indirect),
34527+ "r" (__PCIBIOS_DS));
34528 break;
34529 case 2:
34530- __asm__("lcall *(%%esi); cld\n\t"
34531+ __asm__("movw %w6, %%ds\n\t"
34532+ "lcall *%%ss:(%%esi); cld\n\t"
34533+ "push %%ss\n\t"
34534+ "pop %%ds\n\t"
34535 "jc 1f\n\t"
34536 "xor %%ah, %%ah\n"
34537 "1:"
34538@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34539 "c" (value),
34540 "b" (bx),
34541 "D" ((long)reg),
34542- "S" (&pci_indirect));
34543+ "S" (&pci_indirect),
34544+ "r" (__PCIBIOS_DS));
34545 break;
34546 case 4:
34547- __asm__("lcall *(%%esi); cld\n\t"
34548+ __asm__("movw %w6, %%ds\n\t"
34549+ "lcall *%%ss:(%%esi); cld\n\t"
34550+ "push %%ss\n\t"
34551+ "pop %%ds\n\t"
34552 "jc 1f\n\t"
34553 "xor %%ah, %%ah\n"
34554 "1:"
34555@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34556 "c" (value),
34557 "b" (bx),
34558 "D" ((long)reg),
34559- "S" (&pci_indirect));
34560+ "S" (&pci_indirect),
34561+ "r" (__PCIBIOS_DS));
34562 break;
34563 }
34564
34565@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34566
34567 DBG("PCI: Fetching IRQ routing table... ");
34568 __asm__("push %%es\n\t"
34569+ "movw %w8, %%ds\n\t"
34570 "push %%ds\n\t"
34571 "pop %%es\n\t"
34572- "lcall *(%%esi); cld\n\t"
34573+ "lcall *%%ss:(%%esi); cld\n\t"
34574 "pop %%es\n\t"
34575+ "push %%ss\n\t"
34576+ "pop %%ds\n"
34577 "jc 1f\n\t"
34578 "xor %%ah, %%ah\n"
34579 "1:"
34580@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34581 "1" (0),
34582 "D" ((long) &opt),
34583 "S" (&pci_indirect),
34584- "m" (opt)
34585+ "m" (opt),
34586+ "r" (__PCIBIOS_DS)
34587 : "memory");
34588 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34589 if (ret & 0xff00)
34590@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34591 {
34592 int ret;
34593
34594- __asm__("lcall *(%%esi); cld\n\t"
34595+ __asm__("movw %w5, %%ds\n\t"
34596+ "lcall *%%ss:(%%esi); cld\n\t"
34597+ "push %%ss\n\t"
34598+ "pop %%ds\n"
34599 "jc 1f\n\t"
34600 "xor %%ah, %%ah\n"
34601 "1:"
34602@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34603 : "0" (PCIBIOS_SET_PCI_HW_INT),
34604 "b" ((dev->bus->number << 8) | dev->devfn),
34605 "c" ((irq << 8) | (pin + 10)),
34606- "S" (&pci_indirect));
34607+ "S" (&pci_indirect),
34608+ "r" (__PCIBIOS_DS));
34609 return !(ret & 0xff00);
34610 }
34611 EXPORT_SYMBOL(pcibios_set_irq_routing);
34612diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34613index 9ee3491..872192f 100644
34614--- a/arch/x86/platform/efi/efi_32.c
34615+++ b/arch/x86/platform/efi/efi_32.c
34616@@ -59,11 +59,22 @@ void efi_call_phys_prelog(void)
34617 {
34618 struct desc_ptr gdt_descr;
34619
34620+#ifdef CONFIG_PAX_KERNEXEC
34621+ struct desc_struct d;
34622+#endif
34623+
34624 local_irq_save(efi_rt_eflags);
34625
34626 load_cr3(initial_page_table);
34627 __flush_tlb_all();
34628
34629+#ifdef CONFIG_PAX_KERNEXEC
34630+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34631+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34632+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34633+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34634+#endif
34635+
34636 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34637 gdt_descr.size = GDT_SIZE - 1;
34638 load_gdt(&gdt_descr);
34639@@ -73,11 +84,24 @@ void efi_call_phys_epilog(void)
34640 {
34641 struct desc_ptr gdt_descr;
34642
34643+#ifdef CONFIG_PAX_KERNEXEC
34644+ struct desc_struct d;
34645+
34646+ memset(&d, 0, sizeof d);
34647+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34648+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34649+#endif
34650+
34651 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34652 gdt_descr.size = GDT_SIZE - 1;
34653 load_gdt(&gdt_descr);
34654
34655+#ifdef CONFIG_PAX_PER_CPU_PGD
34656+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34657+#else
34658 load_cr3(swapper_pg_dir);
34659+#endif
34660+
34661 __flush_tlb_all();
34662
34663 local_irq_restore(efi_rt_eflags);
34664diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34665index 290d397..3906bcd 100644
34666--- a/arch/x86/platform/efi/efi_64.c
34667+++ b/arch/x86/platform/efi/efi_64.c
34668@@ -99,6 +99,11 @@ void __init efi_call_phys_prelog(void)
34669 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34670 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34671 }
34672+
34673+#ifdef CONFIG_PAX_PER_CPU_PGD
34674+ load_cr3(swapper_pg_dir);
34675+#endif
34676+
34677 __flush_tlb_all();
34678 }
34679
34680@@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34681 for (pgd = 0; pgd < n_pgds; pgd++)
34682 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34683 kfree(save_pgd);
34684+
34685+#ifdef CONFIG_PAX_PER_CPU_PGD
34686+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34687+#endif
34688+
34689 __flush_tlb_all();
34690 local_irq_restore(efi_flags);
34691 early_code_mapping_set_exec(0);
34692diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34693index fbe66e6..eae5e38 100644
34694--- a/arch/x86/platform/efi/efi_stub_32.S
34695+++ b/arch/x86/platform/efi/efi_stub_32.S
34696@@ -6,7 +6,9 @@
34697 */
34698
34699 #include <linux/linkage.h>
34700+#include <linux/init.h>
34701 #include <asm/page_types.h>
34702+#include <asm/segment.h>
34703
34704 /*
34705 * efi_call_phys(void *, ...) is a function with variable parameters.
34706@@ -20,7 +22,7 @@
34707 * service functions will comply with gcc calling convention, too.
34708 */
34709
34710-.text
34711+__INIT
34712 ENTRY(efi_call_phys)
34713 /*
34714 * 0. The function can only be called in Linux kernel. So CS has been
34715@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34716 * The mapping of lower virtual memory has been created in prelog and
34717 * epilog.
34718 */
34719- movl $1f, %edx
34720- subl $__PAGE_OFFSET, %edx
34721- jmp *%edx
34722+#ifdef CONFIG_PAX_KERNEXEC
34723+ movl $(__KERNEXEC_EFI_DS), %edx
34724+ mov %edx, %ds
34725+ mov %edx, %es
34726+ mov %edx, %ss
34727+ addl $2f,(1f)
34728+ ljmp *(1f)
34729+
34730+__INITDATA
34731+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34732+.previous
34733+
34734+2:
34735+ subl $2b,(1b)
34736+#else
34737+ jmp 1f-__PAGE_OFFSET
34738 1:
34739+#endif
34740
34741 /*
34742 * 2. Now on the top of stack is the return
34743@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34744 * parameter 2, ..., param n. To make things easy, we save the return
34745 * address of efi_call_phys in a global variable.
34746 */
34747- popl %edx
34748- movl %edx, saved_return_addr
34749- /* get the function pointer into ECX*/
34750- popl %ecx
34751- movl %ecx, efi_rt_function_ptr
34752- movl $2f, %edx
34753- subl $__PAGE_OFFSET, %edx
34754- pushl %edx
34755+ popl (saved_return_addr)
34756+ popl (efi_rt_function_ptr)
34757
34758 /*
34759 * 3. Clear PG bit in %CR0.
34760@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34761 /*
34762 * 5. Call the physical function.
34763 */
34764- jmp *%ecx
34765+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34766
34767-2:
34768 /*
34769 * 6. After EFI runtime service returns, control will return to
34770 * following instruction. We'd better readjust stack pointer first.
34771@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34772 movl %cr0, %edx
34773 orl $0x80000000, %edx
34774 movl %edx, %cr0
34775- jmp 1f
34776-1:
34777+
34778 /*
34779 * 8. Now restore the virtual mode from flat mode by
34780 * adding EIP with PAGE_OFFSET.
34781 */
34782- movl $1f, %edx
34783- jmp *%edx
34784+#ifdef CONFIG_PAX_KERNEXEC
34785+ movl $(__KERNEL_DS), %edx
34786+ mov %edx, %ds
34787+ mov %edx, %es
34788+ mov %edx, %ss
34789+ ljmp $(__KERNEL_CS),$1f
34790+#else
34791+ jmp 1f+__PAGE_OFFSET
34792+#endif
34793 1:
34794
34795 /*
34796 * 9. Balance the stack. And because EAX contain the return value,
34797 * we'd better not clobber it.
34798 */
34799- leal efi_rt_function_ptr, %edx
34800- movl (%edx), %ecx
34801- pushl %ecx
34802+ pushl (efi_rt_function_ptr)
34803
34804 /*
34805- * 10. Push the saved return address onto the stack and return.
34806+ * 10. Return to the saved return address.
34807 */
34808- leal saved_return_addr, %edx
34809- movl (%edx), %ecx
34810- pushl %ecx
34811- ret
34812+ jmpl *(saved_return_addr)
34813 ENDPROC(efi_call_phys)
34814 .previous
34815
34816-.data
34817+__INITDATA
34818 saved_return_addr:
34819 .long 0
34820 efi_rt_function_ptr:
34821diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34822index e0984ef..a062dac 100644
34823--- a/arch/x86/platform/efi/efi_stub_64.S
34824+++ b/arch/x86/platform/efi/efi_stub_64.S
34825@@ -11,6 +11,7 @@
34826 #include <asm/msr.h>
34827 #include <asm/processor-flags.h>
34828 #include <asm/page_types.h>
34829+#include <asm/alternative-asm.h>
34830
34831 #define SAVE_XMM \
34832 mov %rsp, %rax; \
34833@@ -81,6 +82,7 @@ ENTRY(efi_call0)
34834 RESTORE_PGT
34835 addq $32, %rsp
34836 RESTORE_XMM
34837+ pax_force_retaddr 0, 1
34838 ret
34839 ENDPROC(efi_call0)
34840
34841@@ -93,6 +95,7 @@ ENTRY(efi_call1)
34842 RESTORE_PGT
34843 addq $32, %rsp
34844 RESTORE_XMM
34845+ pax_force_retaddr 0, 1
34846 ret
34847 ENDPROC(efi_call1)
34848
34849@@ -105,6 +108,7 @@ ENTRY(efi_call2)
34850 RESTORE_PGT
34851 addq $32, %rsp
34852 RESTORE_XMM
34853+ pax_force_retaddr 0, 1
34854 ret
34855 ENDPROC(efi_call2)
34856
34857@@ -118,6 +122,7 @@ ENTRY(efi_call3)
34858 RESTORE_PGT
34859 addq $32, %rsp
34860 RESTORE_XMM
34861+ pax_force_retaddr 0, 1
34862 ret
34863 ENDPROC(efi_call3)
34864
34865@@ -132,6 +137,7 @@ ENTRY(efi_call4)
34866 RESTORE_PGT
34867 addq $32, %rsp
34868 RESTORE_XMM
34869+ pax_force_retaddr 0, 1
34870 ret
34871 ENDPROC(efi_call4)
34872
34873@@ -147,6 +153,7 @@ ENTRY(efi_call5)
34874 RESTORE_PGT
34875 addq $48, %rsp
34876 RESTORE_XMM
34877+ pax_force_retaddr 0, 1
34878 ret
34879 ENDPROC(efi_call5)
34880
34881@@ -165,6 +172,7 @@ ENTRY(efi_call6)
34882 RESTORE_PGT
34883 addq $48, %rsp
34884 RESTORE_XMM
34885+ pax_force_retaddr 0, 1
34886 ret
34887 ENDPROC(efi_call6)
34888
34889diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34890index 1bbedc4..eb795b5 100644
34891--- a/arch/x86/platform/intel-mid/intel-mid.c
34892+++ b/arch/x86/platform/intel-mid/intel-mid.c
34893@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34894 {
34895 };
34896
34897-static void intel_mid_reboot(void)
34898+static void __noreturn intel_mid_reboot(void)
34899 {
34900 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34901+ BUG();
34902 }
34903
34904 static unsigned long __init intel_mid_calibrate_tsc(void)
34905diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34906index d6ee929..3637cb5 100644
34907--- a/arch/x86/platform/olpc/olpc_dt.c
34908+++ b/arch/x86/platform/olpc/olpc_dt.c
34909@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
34910 return res;
34911 }
34912
34913-static struct of_pdt_ops prom_olpc_ops __initdata = {
34914+static struct of_pdt_ops prom_olpc_ops __initconst = {
34915 .nextprop = olpc_dt_nextprop,
34916 .getproplen = olpc_dt_getproplen,
34917 .getproperty = olpc_dt_getproperty,
34918diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
34919index 424f4c9..f2a2988 100644
34920--- a/arch/x86/power/cpu.c
34921+++ b/arch/x86/power/cpu.c
34922@@ -137,11 +137,8 @@ static void do_fpu_end(void)
34923 static void fix_processor_context(void)
34924 {
34925 int cpu = smp_processor_id();
34926- struct tss_struct *t = &per_cpu(init_tss, cpu);
34927-#ifdef CONFIG_X86_64
34928- struct desc_struct *desc = get_cpu_gdt_table(cpu);
34929- tss_desc tss;
34930-#endif
34931+ struct tss_struct *t = init_tss + cpu;
34932+
34933 set_tss_desc(cpu, t); /*
34934 * This just modifies memory; should not be
34935 * necessary. But... This is necessary, because
34936@@ -150,10 +147,6 @@ static void fix_processor_context(void)
34937 */
34938
34939 #ifdef CONFIG_X86_64
34940- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
34941- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
34942- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
34943-
34944 syscall_init(); /* This sets MSR_*STAR and related */
34945 #endif
34946 load_TR_desc(); /* This does ltr */
34947diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
34948index bad628a..a102610 100644
34949--- a/arch/x86/realmode/init.c
34950+++ b/arch/x86/realmode/init.c
34951@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
34952 __va(real_mode_header->trampoline_header);
34953
34954 #ifdef CONFIG_X86_32
34955- trampoline_header->start = __pa_symbol(startup_32_smp);
34956+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
34957+
34958+#ifdef CONFIG_PAX_KERNEXEC
34959+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
34960+#endif
34961+
34962+ trampoline_header->boot_cs = __BOOT_CS;
34963 trampoline_header->gdt_limit = __BOOT_DS + 7;
34964 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
34965 #else
34966@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
34967 *trampoline_cr4_features = read_cr4();
34968
34969 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
34970- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
34971+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
34972 trampoline_pgd[511] = init_level4_pgt[511].pgd;
34973 #endif
34974 }
34975diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
34976index 3497f14..cc73b92 100644
34977--- a/arch/x86/realmode/rm/Makefile
34978+++ b/arch/x86/realmode/rm/Makefile
34979@@ -66,5 +66,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
34980
34981 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
34982 -I$(srctree)/arch/x86/boot
34983+ifdef CONSTIFY_PLUGIN
34984+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
34985+endif
34986 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
34987 GCOV_PROFILE := n
34988diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
34989index a28221d..93c40f1 100644
34990--- a/arch/x86/realmode/rm/header.S
34991+++ b/arch/x86/realmode/rm/header.S
34992@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
34993 #endif
34994 /* APM/BIOS reboot */
34995 .long pa_machine_real_restart_asm
34996-#ifdef CONFIG_X86_64
34997+#ifdef CONFIG_X86_32
34998+ .long __KERNEL_CS
34999+#else
35000 .long __KERNEL32_CS
35001 #endif
35002 END(real_mode_header)
35003diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35004index 48ddd76..c26749f 100644
35005--- a/arch/x86/realmode/rm/trampoline_32.S
35006+++ b/arch/x86/realmode/rm/trampoline_32.S
35007@@ -24,6 +24,12 @@
35008 #include <asm/page_types.h>
35009 #include "realmode.h"
35010
35011+#ifdef CONFIG_PAX_KERNEXEC
35012+#define ta(X) (X)
35013+#else
35014+#define ta(X) (pa_ ## X)
35015+#endif
35016+
35017 .text
35018 .code16
35019
35020@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35021
35022 cli # We should be safe anyway
35023
35024- movl tr_start, %eax # where we need to go
35025-
35026 movl $0xA5A5A5A5, trampoline_status
35027 # write marker for master knows we're running
35028
35029@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35030 movw $1, %dx # protected mode (PE) bit
35031 lmsw %dx # into protected mode
35032
35033- ljmpl $__BOOT_CS, $pa_startup_32
35034+ ljmpl *(trampoline_header)
35035
35036 .section ".text32","ax"
35037 .code32
35038@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35039 .balign 8
35040 GLOBAL(trampoline_header)
35041 tr_start: .space 4
35042- tr_gdt_pad: .space 2
35043+ tr_boot_cs: .space 2
35044 tr_gdt: .space 6
35045 END(trampoline_header)
35046
35047diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35048index dac7b20..72dbaca 100644
35049--- a/arch/x86/realmode/rm/trampoline_64.S
35050+++ b/arch/x86/realmode/rm/trampoline_64.S
35051@@ -93,6 +93,7 @@ ENTRY(startup_32)
35052 movl %edx, %gs
35053
35054 movl pa_tr_cr4, %eax
35055+ andl $~X86_CR4_PCIDE, %eax
35056 movl %eax, %cr4 # Enable PAE mode
35057
35058 # Setup trampoline 4 level pagetables
35059@@ -106,7 +107,7 @@ ENTRY(startup_32)
35060 wrmsr
35061
35062 # Enable paging and in turn activate Long Mode
35063- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35064+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35065 movl %eax, %cr0
35066
35067 /*
35068diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35069index 9e7e147..25a4158 100644
35070--- a/arch/x86/realmode/rm/wakeup_asm.S
35071+++ b/arch/x86/realmode/rm/wakeup_asm.S
35072@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35073 lgdtl pmode_gdt
35074
35075 /* This really couldn't... */
35076- movl pmode_entry, %eax
35077 movl pmode_cr0, %ecx
35078 movl %ecx, %cr0
35079- ljmpl $__KERNEL_CS, $pa_startup_32
35080- /* -> jmp *%eax in trampoline_32.S */
35081+
35082+ ljmpl *pmode_entry
35083 #else
35084 jmp trampoline_start
35085 #endif
35086diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35087index 604a37e..e49702a 100644
35088--- a/arch/x86/tools/Makefile
35089+++ b/arch/x86/tools/Makefile
35090@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35091
35092 $(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
35093
35094-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35095+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35096 hostprogs-y += relocs
35097 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35098 PHONY += relocs
35099diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35100index bbb1d22..e505211 100644
35101--- a/arch/x86/tools/relocs.c
35102+++ b/arch/x86/tools/relocs.c
35103@@ -1,5 +1,7 @@
35104 /* This is included from relocs_32/64.c */
35105
35106+#include "../../../include/generated/autoconf.h"
35107+
35108 #define ElfW(type) _ElfW(ELF_BITS, type)
35109 #define _ElfW(bits, type) __ElfW(bits, type)
35110 #define __ElfW(bits, type) Elf##bits##_##type
35111@@ -11,6 +13,7 @@
35112 #define Elf_Sym ElfW(Sym)
35113
35114 static Elf_Ehdr ehdr;
35115+static Elf_Phdr *phdr;
35116
35117 struct relocs {
35118 uint32_t *offset;
35119@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35120 }
35121 }
35122
35123+static void read_phdrs(FILE *fp)
35124+{
35125+ unsigned int i;
35126+
35127+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35128+ if (!phdr) {
35129+ die("Unable to allocate %d program headers\n",
35130+ ehdr.e_phnum);
35131+ }
35132+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35133+ die("Seek to %d failed: %s\n",
35134+ ehdr.e_phoff, strerror(errno));
35135+ }
35136+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35137+ die("Cannot read ELF program headers: %s\n",
35138+ strerror(errno));
35139+ }
35140+ for(i = 0; i < ehdr.e_phnum; i++) {
35141+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35142+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35143+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35144+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35145+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35146+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35147+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35148+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35149+ }
35150+
35151+}
35152+
35153 static void read_shdrs(FILE *fp)
35154 {
35155- int i;
35156+ unsigned int i;
35157 Elf_Shdr shdr;
35158
35159 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35160@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35161
35162 static void read_strtabs(FILE *fp)
35163 {
35164- int i;
35165+ unsigned int i;
35166 for (i = 0; i < ehdr.e_shnum; i++) {
35167 struct section *sec = &secs[i];
35168 if (sec->shdr.sh_type != SHT_STRTAB) {
35169@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35170
35171 static void read_symtabs(FILE *fp)
35172 {
35173- int i,j;
35174+ unsigned int i,j;
35175 for (i = 0; i < ehdr.e_shnum; i++) {
35176 struct section *sec = &secs[i];
35177 if (sec->shdr.sh_type != SHT_SYMTAB) {
35178@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35179 }
35180
35181
35182-static void read_relocs(FILE *fp)
35183+static void read_relocs(FILE *fp, int use_real_mode)
35184 {
35185- int i,j;
35186+ unsigned int i,j;
35187+ uint32_t base;
35188+
35189 for (i = 0; i < ehdr.e_shnum; i++) {
35190 struct section *sec = &secs[i];
35191 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35192@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35193 die("Cannot read symbol table: %s\n",
35194 strerror(errno));
35195 }
35196+ base = 0;
35197+
35198+#ifdef CONFIG_X86_32
35199+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35200+ if (phdr[j].p_type != PT_LOAD )
35201+ continue;
35202+ 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)
35203+ continue;
35204+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35205+ break;
35206+ }
35207+#endif
35208+
35209 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35210 Elf_Rel *rel = &sec->reltab[j];
35211- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35212+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35213 rel->r_info = elf_xword_to_cpu(rel->r_info);
35214 #if (SHT_REL_TYPE == SHT_RELA)
35215 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35216@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35217
35218 static void print_absolute_symbols(void)
35219 {
35220- int i;
35221+ unsigned int i;
35222 const char *format;
35223
35224 if (ELF_BITS == 64)
35225@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35226 for (i = 0; i < ehdr.e_shnum; i++) {
35227 struct section *sec = &secs[i];
35228 char *sym_strtab;
35229- int j;
35230+ unsigned int j;
35231
35232 if (sec->shdr.sh_type != SHT_SYMTAB) {
35233 continue;
35234@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35235
35236 static void print_absolute_relocs(void)
35237 {
35238- int i, printed = 0;
35239+ unsigned int i, printed = 0;
35240 const char *format;
35241
35242 if (ELF_BITS == 64)
35243@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35244 struct section *sec_applies, *sec_symtab;
35245 char *sym_strtab;
35246 Elf_Sym *sh_symtab;
35247- int j;
35248+ unsigned int j;
35249 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35250 continue;
35251 }
35252@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35253 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35254 Elf_Sym *sym, const char *symname))
35255 {
35256- int i;
35257+ unsigned int i;
35258 /* Walk through the relocations */
35259 for (i = 0; i < ehdr.e_shnum; i++) {
35260 char *sym_strtab;
35261 Elf_Sym *sh_symtab;
35262 struct section *sec_applies, *sec_symtab;
35263- int j;
35264+ unsigned int j;
35265 struct section *sec = &secs[i];
35266
35267 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35268@@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35269 {
35270 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35271 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35272+ char *sym_strtab = sec->link->link->strtab;
35273+
35274+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35275+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35276+ return 0;
35277+
35278+#ifdef CONFIG_PAX_KERNEXEC
35279+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35280+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35281+ return 0;
35282+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35283+ return 0;
35284+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35285+ return 0;
35286+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35287+ return 0;
35288+#endif
35289
35290 switch (r_type) {
35291 case R_386_NONE:
35292@@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35293
35294 static void emit_relocs(int as_text, int use_real_mode)
35295 {
35296- int i;
35297+ unsigned int i;
35298 int (*write_reloc)(uint32_t, FILE *) = write32;
35299 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35300 const char *symname);
35301@@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35302 {
35303 regex_init(use_real_mode);
35304 read_ehdr(fp);
35305+ read_phdrs(fp);
35306 read_shdrs(fp);
35307 read_strtabs(fp);
35308 read_symtabs(fp);
35309- read_relocs(fp);
35310+ read_relocs(fp, use_real_mode);
35311 if (ELF_BITS == 64)
35312 percpu_init();
35313 if (show_absolute_syms) {
35314diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35315index f40281e..92728c9 100644
35316--- a/arch/x86/um/mem_32.c
35317+++ b/arch/x86/um/mem_32.c
35318@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35319 gate_vma.vm_start = FIXADDR_USER_START;
35320 gate_vma.vm_end = FIXADDR_USER_END;
35321 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35322- gate_vma.vm_page_prot = __P101;
35323+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35324
35325 return 0;
35326 }
35327diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35328index 80ffa5b..a33bd15 100644
35329--- a/arch/x86/um/tls_32.c
35330+++ b/arch/x86/um/tls_32.c
35331@@ -260,7 +260,7 @@ out:
35332 if (unlikely(task == current &&
35333 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35334 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35335- "without flushed TLS.", current->pid);
35336+ "without flushed TLS.", task_pid_nr(current));
35337 }
35338
35339 return 0;
35340diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35341index c580d12..0a0ba35 100644
35342--- a/arch/x86/vdso/Makefile
35343+++ b/arch/x86/vdso/Makefile
35344@@ -196,7 +196,7 @@ quiet_cmd_vdso = VDSO $@
35345 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35346 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35347
35348-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35349+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35350 $(LTO_CFLAGS)
35351 GCOV_PROFILE := n
35352
35353diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35354index 310c5f0..766d0a7 100644
35355--- a/arch/x86/vdso/vdso32-setup.c
35356+++ b/arch/x86/vdso/vdso32-setup.c
35357@@ -29,6 +29,7 @@
35358 #include <asm/fixmap.h>
35359 #include <asm/hpet.h>
35360 #include <asm/vvar.h>
35361+#include <asm/mman.h>
35362
35363 #ifdef CONFIG_COMPAT_VDSO
35364 #define VDSO_DEFAULT 0
35365@@ -99,7 +100,7 @@ void syscall32_cpu_init(void)
35366 void enable_sep_cpu(void)
35367 {
35368 int cpu = get_cpu();
35369- struct tss_struct *tss = &per_cpu(init_tss, cpu);
35370+ struct tss_struct *tss = init_tss + cpu;
35371
35372 if (!boot_cpu_has(X86_FEATURE_SEP)) {
35373 put_cpu();
35374@@ -167,7 +168,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35375
35376 down_write(&mm->mmap_sem);
35377
35378- addr = get_unmapped_area(NULL, 0, vdso32_size + VDSO_OFFSET(VDSO_PREV_PAGES), 0, 0);
35379+ addr = get_unmapped_area(NULL, 0, vdso32_size + VDSO_OFFSET(VDSO_PREV_PAGES), 0, MAP_EXECUTABLE);
35380 if (IS_ERR_VALUE(addr)) {
35381 ret = addr;
35382 goto up_fail;
35383@@ -175,7 +176,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35384
35385 addr += VDSO_OFFSET(VDSO_PREV_PAGES);
35386
35387- current->mm->context.vdso = (void *)addr;
35388+ current->mm->context.vdso = addr;
35389
35390 /*
35391 * MAYWRITE to allow gdb to COW and set breakpoints
35392@@ -224,11 +225,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35393 #endif
35394
35395 current_thread_info()->sysenter_return =
35396- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
35397+ (void __force_user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
35398
35399 up_fail:
35400 if (ret)
35401- current->mm->context.vdso = NULL;
35402+ current->mm->context.vdso = 0;
35403
35404 up_write(&mm->mmap_sem);
35405
35406@@ -282,8 +283,14 @@ __initcall(ia32_binfmt_init);
35407
35408 const char *arch_vma_name(struct vm_area_struct *vma)
35409 {
35410- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
35411+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
35412 return "[vdso]";
35413+
35414+#ifdef CONFIG_PAX_SEGMEXEC
35415+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
35416+ return "[vdso]";
35417+#endif
35418+
35419 return NULL;
35420 }
35421
35422diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35423index 1ad1026..1a08abe 100644
35424--- a/arch/x86/vdso/vma.c
35425+++ b/arch/x86/vdso/vma.c
35426@@ -17,8 +17,6 @@
35427 #include <asm/page.h>
35428
35429 #if defined(CONFIG_X86_64)
35430-unsigned int __read_mostly vdso_enabled = 1;
35431-
35432 DECLARE_VDSO_IMAGE(vdso);
35433 extern unsigned short vdso_sync_cpuid;
35434 static unsigned vdso_size;
35435@@ -144,7 +142,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
35436 * unaligned here as a result of stack start randomization.
35437 */
35438 addr = PAGE_ALIGN(addr);
35439- addr = align_vdso_addr(addr);
35440
35441 return addr;
35442 }
35443@@ -157,30 +154,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
35444 unsigned size)
35445 {
35446 struct mm_struct *mm = current->mm;
35447- unsigned long addr;
35448+ unsigned long addr = 0;
35449 int ret;
35450
35451- if (!vdso_enabled)
35452- return 0;
35453-
35454 down_write(&mm->mmap_sem);
35455+
35456+#ifdef CONFIG_PAX_RANDMMAP
35457+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
35458+#endif
35459+
35460 addr = vdso_addr(mm->start_stack, size);
35461+ addr = align_vdso_addr(addr);
35462 addr = get_unmapped_area(NULL, addr, size, 0, 0);
35463 if (IS_ERR_VALUE(addr)) {
35464 ret = addr;
35465 goto up_fail;
35466 }
35467
35468- current->mm->context.vdso = (void *)addr;
35469+ mm->context.vdso = addr;
35470
35471 ret = install_special_mapping(mm, addr, size,
35472 VM_READ|VM_EXEC|
35473 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
35474 pages);
35475- if (ret) {
35476- current->mm->context.vdso = NULL;
35477- goto up_fail;
35478- }
35479+ if (ret)
35480+ mm->context.vdso = 0;
35481
35482 up_fail:
35483 up_write(&mm->mmap_sem);
35484@@ -200,11 +198,4 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35485 vdsox32_size);
35486 }
35487 #endif
35488-
35489-static __init int vdso_setup(char *s)
35490-{
35491- vdso_enabled = simple_strtoul(s, NULL, 0);
35492- return 0;
35493-}
35494-__setup("vdso=", vdso_setup);
35495 #endif
35496diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35497index e88fda8..76ce7ce 100644
35498--- a/arch/x86/xen/Kconfig
35499+++ b/arch/x86/xen/Kconfig
35500@@ -9,6 +9,7 @@ config XEN
35501 select XEN_HAVE_PVMMU
35502 depends on X86_64 || (X86_32 && X86_PAE)
35503 depends on X86_TSC
35504+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35505 help
35506 This is the Linux Xen port. Enabling this will allow the
35507 kernel to boot in a paravirtualized environment under the
35508diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35509index c34bfc4..e599673 100644
35510--- a/arch/x86/xen/enlighten.c
35511+++ b/arch/x86/xen/enlighten.c
35512@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35513
35514 struct shared_info xen_dummy_shared_info;
35515
35516-void *xen_initial_gdt;
35517-
35518 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35519 __read_mostly int xen_have_vector_callback;
35520 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35521@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35522 {
35523 unsigned long va = dtr->address;
35524 unsigned int size = dtr->size + 1;
35525- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35526- unsigned long frames[pages];
35527+ unsigned long frames[65536 / PAGE_SIZE];
35528 int f;
35529
35530 /*
35531@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35532 {
35533 unsigned long va = dtr->address;
35534 unsigned int size = dtr->size + 1;
35535- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35536- unsigned long frames[pages];
35537+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35538 int f;
35539
35540 /*
35541@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35542 * 8-byte entries, or 16 4k pages..
35543 */
35544
35545- BUG_ON(size > 65536);
35546+ BUG_ON(size > GDT_SIZE);
35547 BUG_ON(va & ~PAGE_MASK);
35548
35549 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35550@@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35551 return 0;
35552 }
35553
35554-static void set_xen_basic_apic_ops(void)
35555+static void __init set_xen_basic_apic_ops(void)
35556 {
35557 apic->read = xen_apic_read;
35558 apic->write = xen_apic_write;
35559@@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35560 #endif
35561 };
35562
35563-static void xen_reboot(int reason)
35564+static __noreturn void xen_reboot(int reason)
35565 {
35566 struct sched_shutdown r = { .reason = reason };
35567
35568- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35569- BUG();
35570+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35571+ BUG();
35572 }
35573
35574-static void xen_restart(char *msg)
35575+static __noreturn void xen_restart(char *msg)
35576 {
35577 xen_reboot(SHUTDOWN_reboot);
35578 }
35579
35580-static void xen_emergency_restart(void)
35581+static __noreturn void xen_emergency_restart(void)
35582 {
35583 xen_reboot(SHUTDOWN_reboot);
35584 }
35585
35586-static void xen_machine_halt(void)
35587+static __noreturn void xen_machine_halt(void)
35588 {
35589 xen_reboot(SHUTDOWN_poweroff);
35590 }
35591
35592-static void xen_machine_power_off(void)
35593+static __noreturn void xen_machine_power_off(void)
35594 {
35595 if (pm_power_off)
35596 pm_power_off();
35597@@ -1564,7 +1560,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35598 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35599
35600 /* Work out if we support NX */
35601- x86_configure_nx();
35602+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35603+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35604+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35605+ unsigned l, h;
35606+
35607+ __supported_pte_mask |= _PAGE_NX;
35608+ rdmsr(MSR_EFER, l, h);
35609+ l |= EFER_NX;
35610+ wrmsr(MSR_EFER, l, h);
35611+ }
35612+#endif
35613
35614 /* Get mfn list */
35615 xen_build_dynamic_phys_to_machine();
35616@@ -1592,13 +1598,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35617
35618 machine_ops = xen_machine_ops;
35619
35620- /*
35621- * The only reliable way to retain the initial address of the
35622- * percpu gdt_page is to remember it here, so we can go and
35623- * mark it RW later, when the initial percpu area is freed.
35624- */
35625- xen_initial_gdt = &per_cpu(gdt_page, 0);
35626-
35627 xen_smp_init();
35628
35629 #ifdef CONFIG_ACPI_NUMA
35630diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35631index 86e02ea..e3705ca 100644
35632--- a/arch/x86/xen/mmu.c
35633+++ b/arch/x86/xen/mmu.c
35634@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35635 return val;
35636 }
35637
35638-static pteval_t pte_pfn_to_mfn(pteval_t val)
35639+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35640 {
35641 if (val & _PAGE_PRESENT) {
35642 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35643@@ -1904,6 +1904,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35644 /* L3_k[510] -> level2_kernel_pgt
35645 * L3_i[511] -> level2_fixmap_pgt */
35646 convert_pfn_mfn(level3_kernel_pgt);
35647+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35648+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35649+ convert_pfn_mfn(level3_vmemmap_pgt);
35650 }
35651 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35652 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
35653@@ -1933,8 +1936,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35654 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35655 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35656 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35657+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35658+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35659+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35660 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35661 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35662+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35663 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35664 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35665
35666@@ -2122,6 +2129,7 @@ static void __init xen_post_allocator_init(void)
35667 pv_mmu_ops.set_pud = xen_set_pud;
35668 #if PAGETABLE_LEVELS == 4
35669 pv_mmu_ops.set_pgd = xen_set_pgd;
35670+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35671 #endif
35672
35673 /* This will work as long as patching hasn't happened yet
35674@@ -2200,6 +2208,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35675 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35676 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35677 .set_pgd = xen_set_pgd_hyper,
35678+ .set_pgd_batched = xen_set_pgd_hyper,
35679
35680 .alloc_pud = xen_alloc_pmd_init,
35681 .release_pud = xen_release_pmd_init,
35682diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35683index 7005974..54fb05f 100644
35684--- a/arch/x86/xen/smp.c
35685+++ b/arch/x86/xen/smp.c
35686@@ -283,17 +283,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35687
35688 if (xen_pv_domain()) {
35689 if (!xen_feature(XENFEAT_writable_page_tables))
35690- /* We've switched to the "real" per-cpu gdt, so make
35691- * sure the old memory can be recycled. */
35692- make_lowmem_page_readwrite(xen_initial_gdt);
35693-
35694 #ifdef CONFIG_X86_32
35695 /*
35696 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35697 * expects __USER_DS
35698 */
35699- loadsegment(ds, __USER_DS);
35700- loadsegment(es, __USER_DS);
35701+ loadsegment(ds, __KERNEL_DS);
35702+ loadsegment(es, __KERNEL_DS);
35703 #endif
35704
35705 xen_filter_cpu_maps();
35706@@ -372,7 +368,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35707 #ifdef CONFIG_X86_32
35708 /* Note: PVH is not yet supported on x86_32. */
35709 ctxt->user_regs.fs = __KERNEL_PERCPU;
35710- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35711+ savesegment(gs, ctxt->user_regs.gs);
35712 #endif
35713 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35714
35715@@ -381,8 +377,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35716 if (!xen_feature(XENFEAT_auto_translated_physmap)) {
35717 ctxt->flags = VGCF_IN_KERNEL;
35718 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35719- ctxt->user_regs.ds = __USER_DS;
35720- ctxt->user_regs.es = __USER_DS;
35721+ ctxt->user_regs.ds = __KERNEL_DS;
35722+ ctxt->user_regs.es = __KERNEL_DS;
35723 ctxt->user_regs.ss = __KERNEL_DS;
35724
35725 xen_copy_trap_info(ctxt->trap_ctxt);
35726@@ -437,14 +433,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35727 int rc;
35728
35729 per_cpu(current_task, cpu) = idle;
35730+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
35731 #ifdef CONFIG_X86_32
35732 irq_ctx_init(cpu);
35733 #else
35734 clear_tsk_thread_flag(idle, TIF_FORK);
35735 #endif
35736- per_cpu(kernel_stack, cpu) =
35737- (unsigned long)task_stack_page(idle) -
35738- KERNEL_STACK_OFFSET + THREAD_SIZE;
35739+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35740
35741 xen_setup_runstate_info(cpu);
35742 xen_setup_timer(cpu);
35743@@ -720,7 +715,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35744
35745 void __init xen_smp_init(void)
35746 {
35747- smp_ops = xen_smp_ops;
35748+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35749 xen_fill_possible_map();
35750 }
35751
35752diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35753index fd92a64..1f72641 100644
35754--- a/arch/x86/xen/xen-asm_32.S
35755+++ b/arch/x86/xen/xen-asm_32.S
35756@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35757 pushw %fs
35758 movl $(__KERNEL_PERCPU), %eax
35759 movl %eax, %fs
35760- movl %fs:xen_vcpu, %eax
35761+ mov PER_CPU_VAR(xen_vcpu), %eax
35762 POP_FS
35763 #else
35764 movl %ss:xen_vcpu, %eax
35765diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35766index 485b695..fda3e7c 100644
35767--- a/arch/x86/xen/xen-head.S
35768+++ b/arch/x86/xen/xen-head.S
35769@@ -39,6 +39,17 @@ ENTRY(startup_xen)
35770 #ifdef CONFIG_X86_32
35771 mov %esi,xen_start_info
35772 mov $init_thread_union+THREAD_SIZE,%esp
35773+#ifdef CONFIG_SMP
35774+ movl $cpu_gdt_table,%edi
35775+ movl $__per_cpu_load,%eax
35776+ movw %ax,__KERNEL_PERCPU + 2(%edi)
35777+ rorl $16,%eax
35778+ movb %al,__KERNEL_PERCPU + 4(%edi)
35779+ movb %ah,__KERNEL_PERCPU + 7(%edi)
35780+ movl $__per_cpu_end - 1,%eax
35781+ subl $__per_cpu_start,%eax
35782+ movw %ax,__KERNEL_PERCPU + 0(%edi)
35783+#endif
35784 #else
35785 mov %rsi,xen_start_info
35786 mov $init_thread_union+THREAD_SIZE,%rsp
35787diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35788index 1cb6f4c..9981524 100644
35789--- a/arch/x86/xen/xen-ops.h
35790+++ b/arch/x86/xen/xen-ops.h
35791@@ -10,8 +10,6 @@
35792 extern const char xen_hypervisor_callback[];
35793 extern const char xen_failsafe_callback[];
35794
35795-extern void *xen_initial_gdt;
35796-
35797 struct trap_info;
35798 void xen_copy_trap_info(struct trap_info *traps);
35799
35800diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35801index 525bd3d..ef888b1 100644
35802--- a/arch/xtensa/variants/dc232b/include/variant/core.h
35803+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35804@@ -119,9 +119,9 @@
35805 ----------------------------------------------------------------------*/
35806
35807 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35808-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35809 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35810 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35811+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35812
35813 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35814 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35815diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35816index 2f33760..835e50a 100644
35817--- a/arch/xtensa/variants/fsf/include/variant/core.h
35818+++ b/arch/xtensa/variants/fsf/include/variant/core.h
35819@@ -11,6 +11,7 @@
35820 #ifndef _XTENSA_CORE_H
35821 #define _XTENSA_CORE_H
35822
35823+#include <linux/const.h>
35824
35825 /****************************************************************************
35826 Parameters Useful for Any Code, USER or PRIVILEGED
35827@@ -112,9 +113,9 @@
35828 ----------------------------------------------------------------------*/
35829
35830 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35831-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35832 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35833 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35834+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35835
35836 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35837 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35838diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35839index af00795..2bb8105 100644
35840--- a/arch/xtensa/variants/s6000/include/variant/core.h
35841+++ b/arch/xtensa/variants/s6000/include/variant/core.h
35842@@ -11,6 +11,7 @@
35843 #ifndef _XTENSA_CORE_CONFIGURATION_H
35844 #define _XTENSA_CORE_CONFIGURATION_H
35845
35846+#include <linux/const.h>
35847
35848 /****************************************************************************
35849 Parameters Useful for Any Code, USER or PRIVILEGED
35850@@ -118,9 +119,9 @@
35851 ----------------------------------------------------------------------*/
35852
35853 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35854-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35855 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35856 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35857+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35858
35859 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35860 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35861diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
35862index 1039fb9..d7c0d9a 100644
35863--- a/block/blk-cgroup.c
35864+++ b/block/blk-cgroup.c
35865@@ -825,7 +825,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
35866 static struct cgroup_subsys_state *
35867 blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
35868 {
35869- static atomic64_t id_seq = ATOMIC64_INIT(0);
35870+ static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
35871 struct blkcg *blkcg;
35872
35873 if (!parent_css) {
35874@@ -839,7 +839,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
35875
35876 blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
35877 blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
35878- blkcg->id = atomic64_inc_return(&id_seq); /* root is 0, start from 1 */
35879+ blkcg->id = atomic64_inc_return_unchecked(&id_seq); /* root is 0, start from 1 */
35880 done:
35881 spin_lock_init(&blkcg->lock);
35882 INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
35883diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35884index c11d24e..e915d24 100644
35885--- a/block/blk-iopoll.c
35886+++ b/block/blk-iopoll.c
35887@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
35888 }
35889 EXPORT_SYMBOL(blk_iopoll_complete);
35890
35891-static void blk_iopoll_softirq(struct softirq_action *h)
35892+static __latent_entropy void blk_iopoll_softirq(void)
35893 {
35894 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
35895 int rearm = 0, budget = blk_iopoll_budget;
35896diff --git a/block/blk-map.c b/block/blk-map.c
35897index f7b22bc..ec2ddf4 100644
35898--- a/block/blk-map.c
35899+++ b/block/blk-map.c
35900@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
35901 if (!len || !kbuf)
35902 return -EINVAL;
35903
35904- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
35905+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
35906 if (do_copy)
35907 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
35908 else
35909diff --git a/block/blk-softirq.c b/block/blk-softirq.c
35910index 53b1737..08177d2e 100644
35911--- a/block/blk-softirq.c
35912+++ b/block/blk-softirq.c
35913@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
35914 * Softirq action handler - move entries to local list and loop over them
35915 * while passing them to the queue registered handler.
35916 */
35917-static void blk_done_softirq(struct softirq_action *h)
35918+static __latent_entropy void blk_done_softirq(void)
35919 {
35920 struct list_head *cpu_list, local_list;
35921
35922diff --git a/block/bsg.c b/block/bsg.c
35923index 420a5a9..23834aa 100644
35924--- a/block/bsg.c
35925+++ b/block/bsg.c
35926@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
35927 struct sg_io_v4 *hdr, struct bsg_device *bd,
35928 fmode_t has_write_perm)
35929 {
35930+ unsigned char tmpcmd[sizeof(rq->__cmd)];
35931+ unsigned char *cmdptr;
35932+
35933 if (hdr->request_len > BLK_MAX_CDB) {
35934 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
35935 if (!rq->cmd)
35936 return -ENOMEM;
35937- }
35938+ cmdptr = rq->cmd;
35939+ } else
35940+ cmdptr = tmpcmd;
35941
35942- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
35943+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
35944 hdr->request_len))
35945 return -EFAULT;
35946
35947+ if (cmdptr != rq->cmd)
35948+ memcpy(rq->cmd, cmdptr, hdr->request_len);
35949+
35950 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
35951 if (blk_verify_command(rq->cmd, has_write_perm))
35952 return -EPERM;
35953diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
35954index fbd5a67..f24fd95 100644
35955--- a/block/compat_ioctl.c
35956+++ b/block/compat_ioctl.c
35957@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
35958 cgc = compat_alloc_user_space(sizeof(*cgc));
35959 cgc32 = compat_ptr(arg);
35960
35961- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
35962+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
35963 get_user(data, &cgc32->buffer) ||
35964 put_user(compat_ptr(data), &cgc->buffer) ||
35965 copy_in_user(&cgc->buflen, &cgc32->buflen,
35966@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
35967 err |= __get_user(f->spec1, &uf->spec1);
35968 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
35969 err |= __get_user(name, &uf->name);
35970- f->name = compat_ptr(name);
35971+ f->name = (void __force_kernel *)compat_ptr(name);
35972 if (err) {
35973 err = -EFAULT;
35974 goto out;
35975diff --git a/block/genhd.c b/block/genhd.c
35976index 791f419..89f21c4 100644
35977--- a/block/genhd.c
35978+++ b/block/genhd.c
35979@@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
35980
35981 /*
35982 * Register device numbers dev..(dev+range-1)
35983- * range must be nonzero
35984+ * Noop if @range is zero.
35985 * The hash chain is sorted on range, so that subranges can override.
35986 */
35987 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
35988 struct kobject *(*probe)(dev_t, int *, void *),
35989 int (*lock)(dev_t, void *), void *data)
35990 {
35991- kobj_map(bdev_map, devt, range, module, probe, lock, data);
35992+ if (range)
35993+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
35994 }
35995
35996 EXPORT_SYMBOL(blk_register_region);
35997
35998+/* undo blk_register_region(), noop if @range is zero */
35999 void blk_unregister_region(dev_t devt, unsigned long range)
36000 {
36001- kobj_unmap(bdev_map, devt, range);
36002+ if (range)
36003+ kobj_unmap(bdev_map, devt, range);
36004 }
36005
36006 EXPORT_SYMBOL(blk_unregister_region);
36007diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36008index dc51f46..d5446a8 100644
36009--- a/block/partitions/efi.c
36010+++ b/block/partitions/efi.c
36011@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36012 if (!gpt)
36013 return NULL;
36014
36015+ if (!le32_to_cpu(gpt->num_partition_entries))
36016+ return NULL;
36017+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36018+ if (!pte)
36019+ return NULL;
36020+
36021 count = le32_to_cpu(gpt->num_partition_entries) *
36022 le32_to_cpu(gpt->sizeof_partition_entry);
36023- if (!count)
36024- return NULL;
36025- pte = kmalloc(count, GFP_KERNEL);
36026- if (!pte)
36027- return NULL;
36028-
36029 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36030 (u8 *) pte, count) < count) {
36031 kfree(pte);
36032diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36033index 2648797..92ed21f 100644
36034--- a/block/scsi_ioctl.c
36035+++ b/block/scsi_ioctl.c
36036@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36037 return put_user(0, p);
36038 }
36039
36040-static int sg_get_timeout(struct request_queue *q)
36041+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36042 {
36043 return jiffies_to_clock_t(q->sg_timeout);
36044 }
36045@@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
36046 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36047 struct sg_io_hdr *hdr, fmode_t mode)
36048 {
36049- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36050+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36051+ unsigned char *cmdptr;
36052+
36053+ if (rq->cmd != rq->__cmd)
36054+ cmdptr = rq->cmd;
36055+ else
36056+ cmdptr = tmpcmd;
36057+
36058+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36059 return -EFAULT;
36060+
36061+ if (cmdptr != rq->cmd)
36062+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36063+
36064 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36065 return -EPERM;
36066
36067@@ -417,6 +429,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36068 int err;
36069 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36070 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36071+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36072+ unsigned char *cmdptr;
36073
36074 if (!sic)
36075 return -EINVAL;
36076@@ -450,9 +464,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36077 */
36078 err = -EFAULT;
36079 rq->cmd_len = cmdlen;
36080- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36081+
36082+ if (rq->cmd != rq->__cmd)
36083+ cmdptr = rq->cmd;
36084+ else
36085+ cmdptr = tmpcmd;
36086+
36087+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36088 goto error;
36089
36090+ if (rq->cmd != cmdptr)
36091+ memcpy(rq->cmd, cmdptr, cmdlen);
36092+
36093 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36094 goto error;
36095
36096diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36097index 7bdd61b..afec999 100644
36098--- a/crypto/cryptd.c
36099+++ b/crypto/cryptd.c
36100@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36101
36102 struct cryptd_blkcipher_request_ctx {
36103 crypto_completion_t complete;
36104-};
36105+} __no_const;
36106
36107 struct cryptd_hash_ctx {
36108 struct crypto_shash *child;
36109@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36110
36111 struct cryptd_aead_request_ctx {
36112 crypto_completion_t complete;
36113-};
36114+} __no_const;
36115
36116 static void cryptd_queue_worker(struct work_struct *work);
36117
36118diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36119index 309d345..1632720 100644
36120--- a/crypto/pcrypt.c
36121+++ b/crypto/pcrypt.c
36122@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36123 int ret;
36124
36125 pinst->kobj.kset = pcrypt_kset;
36126- ret = kobject_add(&pinst->kobj, NULL, name);
36127+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36128 if (!ret)
36129 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36130
36131diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36132index 6921c7f..78e1af7 100644
36133--- a/drivers/acpi/acpica/hwxfsleep.c
36134+++ b/drivers/acpi/acpica/hwxfsleep.c
36135@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36136 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36137
36138 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36139- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36140- acpi_hw_extended_sleep},
36141- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36142- acpi_hw_extended_wake_prep},
36143- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36144+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36145+ .extended_function = acpi_hw_extended_sleep},
36146+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36147+ .extended_function = acpi_hw_extended_wake_prep},
36148+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36149+ .extended_function = acpi_hw_extended_wake}
36150 };
36151
36152 /*
36153diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36154index e5bcd91..74f050d 100644
36155--- a/drivers/acpi/apei/apei-internal.h
36156+++ b/drivers/acpi/apei/apei-internal.h
36157@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36158 struct apei_exec_ins_type {
36159 u32 flags;
36160 apei_exec_ins_func_t run;
36161-};
36162+} __do_const;
36163
36164 struct apei_exec_context {
36165 u32 ip;
36166diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36167index dab7cb7..f0d2994 100644
36168--- a/drivers/acpi/apei/ghes.c
36169+++ b/drivers/acpi/apei/ghes.c
36170@@ -500,7 +500,7 @@ static void __ghes_print_estatus(const char *pfx,
36171 const struct acpi_hest_generic *generic,
36172 const struct acpi_generic_status *estatus)
36173 {
36174- static atomic_t seqno;
36175+ static atomic_unchecked_t seqno;
36176 unsigned int curr_seqno;
36177 char pfx_seq[64];
36178
36179@@ -511,7 +511,7 @@ static void __ghes_print_estatus(const char *pfx,
36180 else
36181 pfx = KERN_ERR;
36182 }
36183- curr_seqno = atomic_inc_return(&seqno);
36184+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36185 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36186 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36187 pfx_seq, generic->header.source_id);
36188diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36189index a83e3c6..c3d617f 100644
36190--- a/drivers/acpi/bgrt.c
36191+++ b/drivers/acpi/bgrt.c
36192@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36193 if (!bgrt_image)
36194 return -ENODEV;
36195
36196- bin_attr_image.private = bgrt_image;
36197- bin_attr_image.size = bgrt_image_size;
36198+ pax_open_kernel();
36199+ *(void **)&bin_attr_image.private = bgrt_image;
36200+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36201+ pax_close_kernel();
36202
36203 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36204 if (!bgrt_kobj)
36205diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36206index 3d8413d..95f638c 100644
36207--- a/drivers/acpi/blacklist.c
36208+++ b/drivers/acpi/blacklist.c
36209@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36210 u32 is_critical_error;
36211 };
36212
36213-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36214+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36215
36216 /*
36217 * POLICY: If *anything* doesn't work, put it on the blacklist.
36218@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36219 return 0;
36220 }
36221
36222-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36223+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36224 {
36225 .callback = dmi_disable_osi_vista,
36226 .ident = "Fujitsu Siemens",
36227diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36228index c68e724..e863008 100644
36229--- a/drivers/acpi/custom_method.c
36230+++ b/drivers/acpi/custom_method.c
36231@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36232 struct acpi_table_header table;
36233 acpi_status status;
36234
36235+#ifdef CONFIG_GRKERNSEC_KMEM
36236+ return -EPERM;
36237+#endif
36238+
36239 if (!(*ppos)) {
36240 /* parse the table header to get the table length */
36241 if (count <= sizeof(struct acpi_table_header))
36242diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36243index 3dca36d..abaf070 100644
36244--- a/drivers/acpi/processor_idle.c
36245+++ b/drivers/acpi/processor_idle.c
36246@@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36247 {
36248 int i, count = CPUIDLE_DRIVER_STATE_START;
36249 struct acpi_processor_cx *cx;
36250- struct cpuidle_state *state;
36251+ cpuidle_state_no_const *state;
36252 struct cpuidle_driver *drv = &acpi_idle_driver;
36253
36254 if (!pr->flags.power_setup_done)
36255diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36256index 38cb978..352c761 100644
36257--- a/drivers/acpi/sysfs.c
36258+++ b/drivers/acpi/sysfs.c
36259@@ -423,11 +423,11 @@ static u32 num_counters;
36260 static struct attribute **all_attrs;
36261 static u32 acpi_gpe_count;
36262
36263-static struct attribute_group interrupt_stats_attr_group = {
36264+static attribute_group_no_const interrupt_stats_attr_group = {
36265 .name = "interrupts",
36266 };
36267
36268-static struct kobj_attribute *counter_attrs;
36269+static kobj_attribute_no_const *counter_attrs;
36270
36271 static void delete_gpe_attr_array(void)
36272 {
36273diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36274index b986145..82bddb8 100644
36275--- a/drivers/ata/libahci.c
36276+++ b/drivers/ata/libahci.c
36277@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36278 }
36279 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36280
36281-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36282+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36283 struct ata_taskfile *tf, int is_cmd, u16 flags,
36284 unsigned long timeout_msec)
36285 {
36286diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36287index 18d97d5..be690af 100644
36288--- a/drivers/ata/libata-core.c
36289+++ b/drivers/ata/libata-core.c
36290@@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36291 static void ata_dev_xfermask(struct ata_device *dev);
36292 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36293
36294-atomic_t ata_print_id = ATOMIC_INIT(0);
36295+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36296
36297 struct ata_force_param {
36298 const char *name;
36299@@ -4858,7 +4858,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36300 struct ata_port *ap;
36301 unsigned int tag;
36302
36303- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36304+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36305 ap = qc->ap;
36306
36307 qc->flags = 0;
36308@@ -4874,7 +4874,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36309 struct ata_port *ap;
36310 struct ata_link *link;
36311
36312- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36313+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36314 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36315 ap = qc->ap;
36316 link = qc->dev->link;
36317@@ -5978,6 +5978,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36318 return;
36319
36320 spin_lock(&lock);
36321+ pax_open_kernel();
36322
36323 for (cur = ops->inherits; cur; cur = cur->inherits) {
36324 void **inherit = (void **)cur;
36325@@ -5991,8 +5992,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36326 if (IS_ERR(*pp))
36327 *pp = NULL;
36328
36329- ops->inherits = NULL;
36330+ *(struct ata_port_operations **)&ops->inherits = NULL;
36331
36332+ pax_close_kernel();
36333 spin_unlock(&lock);
36334 }
36335
36336@@ -6185,7 +6187,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36337
36338 /* give ports names and add SCSI hosts */
36339 for (i = 0; i < host->n_ports; i++) {
36340- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36341+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36342 host->ports[i]->local_port_no = i + 1;
36343 }
36344
36345diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36346index ef8567d..8bdbd03 100644
36347--- a/drivers/ata/libata-scsi.c
36348+++ b/drivers/ata/libata-scsi.c
36349@@ -4147,7 +4147,7 @@ int ata_sas_port_init(struct ata_port *ap)
36350
36351 if (rc)
36352 return rc;
36353- ap->print_id = atomic_inc_return(&ata_print_id);
36354+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36355 return 0;
36356 }
36357 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36358diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36359index 45b5ab3..98446b8 100644
36360--- a/drivers/ata/libata.h
36361+++ b/drivers/ata/libata.h
36362@@ -53,7 +53,7 @@ enum {
36363 ATA_DNXFER_QUIET = (1 << 31),
36364 };
36365
36366-extern atomic_t ata_print_id;
36367+extern atomic_unchecked_t ata_print_id;
36368 extern int atapi_passthru16;
36369 extern int libata_fua;
36370 extern int libata_noacpi;
36371diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36372index 4edb1a8..84e1658 100644
36373--- a/drivers/ata/pata_arasan_cf.c
36374+++ b/drivers/ata/pata_arasan_cf.c
36375@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36376 /* Handle platform specific quirks */
36377 if (quirk) {
36378 if (quirk & CF_BROKEN_PIO) {
36379- ap->ops->set_piomode = NULL;
36380+ pax_open_kernel();
36381+ *(void **)&ap->ops->set_piomode = NULL;
36382+ pax_close_kernel();
36383 ap->pio_mask = 0;
36384 }
36385 if (quirk & CF_BROKEN_MWDMA)
36386diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36387index f9b983a..887b9d8 100644
36388--- a/drivers/atm/adummy.c
36389+++ b/drivers/atm/adummy.c
36390@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36391 vcc->pop(vcc, skb);
36392 else
36393 dev_kfree_skb_any(skb);
36394- atomic_inc(&vcc->stats->tx);
36395+ atomic_inc_unchecked(&vcc->stats->tx);
36396
36397 return 0;
36398 }
36399diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36400index f1a9198..f466a4a 100644
36401--- a/drivers/atm/ambassador.c
36402+++ b/drivers/atm/ambassador.c
36403@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36404 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36405
36406 // VC layer stats
36407- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36408+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36409
36410 // free the descriptor
36411 kfree (tx_descr);
36412@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36413 dump_skb ("<<<", vc, skb);
36414
36415 // VC layer stats
36416- atomic_inc(&atm_vcc->stats->rx);
36417+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36418 __net_timestamp(skb);
36419 // end of our responsibility
36420 atm_vcc->push (atm_vcc, skb);
36421@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36422 } else {
36423 PRINTK (KERN_INFO, "dropped over-size frame");
36424 // should we count this?
36425- atomic_inc(&atm_vcc->stats->rx_drop);
36426+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36427 }
36428
36429 } else {
36430@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36431 }
36432
36433 if (check_area (skb->data, skb->len)) {
36434- atomic_inc(&atm_vcc->stats->tx_err);
36435+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36436 return -ENOMEM; // ?
36437 }
36438
36439diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36440index 0e3f8f9..765a7a5 100644
36441--- a/drivers/atm/atmtcp.c
36442+++ b/drivers/atm/atmtcp.c
36443@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36444 if (vcc->pop) vcc->pop(vcc,skb);
36445 else dev_kfree_skb(skb);
36446 if (dev_data) return 0;
36447- atomic_inc(&vcc->stats->tx_err);
36448+ atomic_inc_unchecked(&vcc->stats->tx_err);
36449 return -ENOLINK;
36450 }
36451 size = skb->len+sizeof(struct atmtcp_hdr);
36452@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36453 if (!new_skb) {
36454 if (vcc->pop) vcc->pop(vcc,skb);
36455 else dev_kfree_skb(skb);
36456- atomic_inc(&vcc->stats->tx_err);
36457+ atomic_inc_unchecked(&vcc->stats->tx_err);
36458 return -ENOBUFS;
36459 }
36460 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36461@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36462 if (vcc->pop) vcc->pop(vcc,skb);
36463 else dev_kfree_skb(skb);
36464 out_vcc->push(out_vcc,new_skb);
36465- atomic_inc(&vcc->stats->tx);
36466- atomic_inc(&out_vcc->stats->rx);
36467+ atomic_inc_unchecked(&vcc->stats->tx);
36468+ atomic_inc_unchecked(&out_vcc->stats->rx);
36469 return 0;
36470 }
36471
36472@@ -299,7 +299,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36473 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
36474 read_unlock(&vcc_sklist_lock);
36475 if (!out_vcc) {
36476- atomic_inc(&vcc->stats->tx_err);
36477+ atomic_inc_unchecked(&vcc->stats->tx_err);
36478 goto done;
36479 }
36480 skb_pull(skb,sizeof(struct atmtcp_hdr));
36481@@ -311,8 +311,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36482 __net_timestamp(new_skb);
36483 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36484 out_vcc->push(out_vcc,new_skb);
36485- atomic_inc(&vcc->stats->tx);
36486- atomic_inc(&out_vcc->stats->rx);
36487+ atomic_inc_unchecked(&vcc->stats->tx);
36488+ atomic_inc_unchecked(&out_vcc->stats->rx);
36489 done:
36490 if (vcc->pop) vcc->pop(vcc,skb);
36491 else dev_kfree_skb(skb);
36492diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36493index b1955ba..b179940 100644
36494--- a/drivers/atm/eni.c
36495+++ b/drivers/atm/eni.c
36496@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36497 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36498 vcc->dev->number);
36499 length = 0;
36500- atomic_inc(&vcc->stats->rx_err);
36501+ atomic_inc_unchecked(&vcc->stats->rx_err);
36502 }
36503 else {
36504 length = ATM_CELL_SIZE-1; /* no HEC */
36505@@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36506 size);
36507 }
36508 eff = length = 0;
36509- atomic_inc(&vcc->stats->rx_err);
36510+ atomic_inc_unchecked(&vcc->stats->rx_err);
36511 }
36512 else {
36513 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36514@@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36515 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36516 vcc->dev->number,vcc->vci,length,size << 2,descr);
36517 length = eff = 0;
36518- atomic_inc(&vcc->stats->rx_err);
36519+ atomic_inc_unchecked(&vcc->stats->rx_err);
36520 }
36521 }
36522 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36523@@ -767,7 +767,7 @@ rx_dequeued++;
36524 vcc->push(vcc,skb);
36525 pushed++;
36526 }
36527- atomic_inc(&vcc->stats->rx);
36528+ atomic_inc_unchecked(&vcc->stats->rx);
36529 }
36530 wake_up(&eni_dev->rx_wait);
36531 }
36532@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36533 PCI_DMA_TODEVICE);
36534 if (vcc->pop) vcc->pop(vcc,skb);
36535 else dev_kfree_skb_irq(skb);
36536- atomic_inc(&vcc->stats->tx);
36537+ atomic_inc_unchecked(&vcc->stats->tx);
36538 wake_up(&eni_dev->tx_wait);
36539 dma_complete++;
36540 }
36541diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36542index 82f2ae0..f205c02 100644
36543--- a/drivers/atm/firestream.c
36544+++ b/drivers/atm/firestream.c
36545@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36546 }
36547 }
36548
36549- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36550+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36551
36552 fs_dprintk (FS_DEBUG_TXMEM, "i");
36553 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36554@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36555 #endif
36556 skb_put (skb, qe->p1 & 0xffff);
36557 ATM_SKB(skb)->vcc = atm_vcc;
36558- atomic_inc(&atm_vcc->stats->rx);
36559+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36560 __net_timestamp(skb);
36561 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36562 atm_vcc->push (atm_vcc, skb);
36563@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36564 kfree (pe);
36565 }
36566 if (atm_vcc)
36567- atomic_inc(&atm_vcc->stats->rx_drop);
36568+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36569 break;
36570 case 0x1f: /* Reassembly abort: no buffers. */
36571 /* Silently increment error counter. */
36572 if (atm_vcc)
36573- atomic_inc(&atm_vcc->stats->rx_drop);
36574+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36575 break;
36576 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36577 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36578diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36579index 204814e..cede831 100644
36580--- a/drivers/atm/fore200e.c
36581+++ b/drivers/atm/fore200e.c
36582@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36583 #endif
36584 /* check error condition */
36585 if (*entry->status & STATUS_ERROR)
36586- atomic_inc(&vcc->stats->tx_err);
36587+ atomic_inc_unchecked(&vcc->stats->tx_err);
36588 else
36589- atomic_inc(&vcc->stats->tx);
36590+ atomic_inc_unchecked(&vcc->stats->tx);
36591 }
36592 }
36593
36594@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36595 if (skb == NULL) {
36596 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36597
36598- atomic_inc(&vcc->stats->rx_drop);
36599+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36600 return -ENOMEM;
36601 }
36602
36603@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36604
36605 dev_kfree_skb_any(skb);
36606
36607- atomic_inc(&vcc->stats->rx_drop);
36608+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36609 return -ENOMEM;
36610 }
36611
36612 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36613
36614 vcc->push(vcc, skb);
36615- atomic_inc(&vcc->stats->rx);
36616+ atomic_inc_unchecked(&vcc->stats->rx);
36617
36618 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36619
36620@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36621 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36622 fore200e->atm_dev->number,
36623 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36624- atomic_inc(&vcc->stats->rx_err);
36625+ atomic_inc_unchecked(&vcc->stats->rx_err);
36626 }
36627 }
36628
36629@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36630 goto retry_here;
36631 }
36632
36633- atomic_inc(&vcc->stats->tx_err);
36634+ atomic_inc_unchecked(&vcc->stats->tx_err);
36635
36636 fore200e->tx_sat++;
36637 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36638diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36639index aa6be26..f70a785 100644
36640--- a/drivers/atm/he.c
36641+++ b/drivers/atm/he.c
36642@@ -1690,7 +1690,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36643
36644 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36645 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36646- atomic_inc(&vcc->stats->rx_drop);
36647+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36648 goto return_host_buffers;
36649 }
36650
36651@@ -1717,7 +1717,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36652 RBRQ_LEN_ERR(he_dev->rbrq_head)
36653 ? "LEN_ERR" : "",
36654 vcc->vpi, vcc->vci);
36655- atomic_inc(&vcc->stats->rx_err);
36656+ atomic_inc_unchecked(&vcc->stats->rx_err);
36657 goto return_host_buffers;
36658 }
36659
36660@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36661 vcc->push(vcc, skb);
36662 spin_lock(&he_dev->global_lock);
36663
36664- atomic_inc(&vcc->stats->rx);
36665+ atomic_inc_unchecked(&vcc->stats->rx);
36666
36667 return_host_buffers:
36668 ++pdus_assembled;
36669@@ -2095,7 +2095,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36670 tpd->vcc->pop(tpd->vcc, tpd->skb);
36671 else
36672 dev_kfree_skb_any(tpd->skb);
36673- atomic_inc(&tpd->vcc->stats->tx_err);
36674+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36675 }
36676 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36677 return;
36678@@ -2507,7 +2507,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36679 vcc->pop(vcc, skb);
36680 else
36681 dev_kfree_skb_any(skb);
36682- atomic_inc(&vcc->stats->tx_err);
36683+ atomic_inc_unchecked(&vcc->stats->tx_err);
36684 return -EINVAL;
36685 }
36686
36687@@ -2518,7 +2518,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36688 vcc->pop(vcc, skb);
36689 else
36690 dev_kfree_skb_any(skb);
36691- atomic_inc(&vcc->stats->tx_err);
36692+ atomic_inc_unchecked(&vcc->stats->tx_err);
36693 return -EINVAL;
36694 }
36695 #endif
36696@@ -2530,7 +2530,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36697 vcc->pop(vcc, skb);
36698 else
36699 dev_kfree_skb_any(skb);
36700- atomic_inc(&vcc->stats->tx_err);
36701+ atomic_inc_unchecked(&vcc->stats->tx_err);
36702 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36703 return -ENOMEM;
36704 }
36705@@ -2572,7 +2572,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36706 vcc->pop(vcc, skb);
36707 else
36708 dev_kfree_skb_any(skb);
36709- atomic_inc(&vcc->stats->tx_err);
36710+ atomic_inc_unchecked(&vcc->stats->tx_err);
36711 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36712 return -ENOMEM;
36713 }
36714@@ -2603,7 +2603,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36715 __enqueue_tpd(he_dev, tpd, cid);
36716 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36717
36718- atomic_inc(&vcc->stats->tx);
36719+ atomic_inc_unchecked(&vcc->stats->tx);
36720
36721 return 0;
36722 }
36723diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36724index 1dc0519..1aadaf7 100644
36725--- a/drivers/atm/horizon.c
36726+++ b/drivers/atm/horizon.c
36727@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36728 {
36729 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36730 // VC layer stats
36731- atomic_inc(&vcc->stats->rx);
36732+ atomic_inc_unchecked(&vcc->stats->rx);
36733 __net_timestamp(skb);
36734 // end of our responsibility
36735 vcc->push (vcc, skb);
36736@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36737 dev->tx_iovec = NULL;
36738
36739 // VC layer stats
36740- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36741+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36742
36743 // free the skb
36744 hrz_kfree_skb (skb);
36745diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36746index 1bdf104..9dc44b1 100644
36747--- a/drivers/atm/idt77252.c
36748+++ b/drivers/atm/idt77252.c
36749@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36750 else
36751 dev_kfree_skb(skb);
36752
36753- atomic_inc(&vcc->stats->tx);
36754+ atomic_inc_unchecked(&vcc->stats->tx);
36755 }
36756
36757 atomic_dec(&scq->used);
36758@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36759 if ((sb = dev_alloc_skb(64)) == NULL) {
36760 printk("%s: Can't allocate buffers for aal0.\n",
36761 card->name);
36762- atomic_add(i, &vcc->stats->rx_drop);
36763+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
36764 break;
36765 }
36766 if (!atm_charge(vcc, sb->truesize)) {
36767 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36768 card->name);
36769- atomic_add(i - 1, &vcc->stats->rx_drop);
36770+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36771 dev_kfree_skb(sb);
36772 break;
36773 }
36774@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36775 ATM_SKB(sb)->vcc = vcc;
36776 __net_timestamp(sb);
36777 vcc->push(vcc, sb);
36778- atomic_inc(&vcc->stats->rx);
36779+ atomic_inc_unchecked(&vcc->stats->rx);
36780
36781 cell += ATM_CELL_PAYLOAD;
36782 }
36783@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36784 "(CDC: %08x)\n",
36785 card->name, len, rpp->len, readl(SAR_REG_CDC));
36786 recycle_rx_pool_skb(card, rpp);
36787- atomic_inc(&vcc->stats->rx_err);
36788+ atomic_inc_unchecked(&vcc->stats->rx_err);
36789 return;
36790 }
36791 if (stat & SAR_RSQE_CRC) {
36792 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36793 recycle_rx_pool_skb(card, rpp);
36794- atomic_inc(&vcc->stats->rx_err);
36795+ atomic_inc_unchecked(&vcc->stats->rx_err);
36796 return;
36797 }
36798 if (skb_queue_len(&rpp->queue) > 1) {
36799@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36800 RXPRINTK("%s: Can't alloc RX skb.\n",
36801 card->name);
36802 recycle_rx_pool_skb(card, rpp);
36803- atomic_inc(&vcc->stats->rx_err);
36804+ atomic_inc_unchecked(&vcc->stats->rx_err);
36805 return;
36806 }
36807 if (!atm_charge(vcc, skb->truesize)) {
36808@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36809 __net_timestamp(skb);
36810
36811 vcc->push(vcc, skb);
36812- atomic_inc(&vcc->stats->rx);
36813+ atomic_inc_unchecked(&vcc->stats->rx);
36814
36815 return;
36816 }
36817@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36818 __net_timestamp(skb);
36819
36820 vcc->push(vcc, skb);
36821- atomic_inc(&vcc->stats->rx);
36822+ atomic_inc_unchecked(&vcc->stats->rx);
36823
36824 if (skb->truesize > SAR_FB_SIZE_3)
36825 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36826@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36827 if (vcc->qos.aal != ATM_AAL0) {
36828 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36829 card->name, vpi, vci);
36830- atomic_inc(&vcc->stats->rx_drop);
36831+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36832 goto drop;
36833 }
36834
36835 if ((sb = dev_alloc_skb(64)) == NULL) {
36836 printk("%s: Can't allocate buffers for AAL0.\n",
36837 card->name);
36838- atomic_inc(&vcc->stats->rx_err);
36839+ atomic_inc_unchecked(&vcc->stats->rx_err);
36840 goto drop;
36841 }
36842
36843@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36844 ATM_SKB(sb)->vcc = vcc;
36845 __net_timestamp(sb);
36846 vcc->push(vcc, sb);
36847- atomic_inc(&vcc->stats->rx);
36848+ atomic_inc_unchecked(&vcc->stats->rx);
36849
36850 drop:
36851 skb_pull(queue, 64);
36852@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36853
36854 if (vc == NULL) {
36855 printk("%s: NULL connection in send().\n", card->name);
36856- atomic_inc(&vcc->stats->tx_err);
36857+ atomic_inc_unchecked(&vcc->stats->tx_err);
36858 dev_kfree_skb(skb);
36859 return -EINVAL;
36860 }
36861 if (!test_bit(VCF_TX, &vc->flags)) {
36862 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
36863- atomic_inc(&vcc->stats->tx_err);
36864+ atomic_inc_unchecked(&vcc->stats->tx_err);
36865 dev_kfree_skb(skb);
36866 return -EINVAL;
36867 }
36868@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36869 break;
36870 default:
36871 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
36872- atomic_inc(&vcc->stats->tx_err);
36873+ atomic_inc_unchecked(&vcc->stats->tx_err);
36874 dev_kfree_skb(skb);
36875 return -EINVAL;
36876 }
36877
36878 if (skb_shinfo(skb)->nr_frags != 0) {
36879 printk("%s: No scatter-gather yet.\n", card->name);
36880- atomic_inc(&vcc->stats->tx_err);
36881+ atomic_inc_unchecked(&vcc->stats->tx_err);
36882 dev_kfree_skb(skb);
36883 return -EINVAL;
36884 }
36885@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36886
36887 err = queue_skb(card, vc, skb, oam);
36888 if (err) {
36889- atomic_inc(&vcc->stats->tx_err);
36890+ atomic_inc_unchecked(&vcc->stats->tx_err);
36891 dev_kfree_skb(skb);
36892 return err;
36893 }
36894@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
36895 skb = dev_alloc_skb(64);
36896 if (!skb) {
36897 printk("%s: Out of memory in send_oam().\n", card->name);
36898- atomic_inc(&vcc->stats->tx_err);
36899+ atomic_inc_unchecked(&vcc->stats->tx_err);
36900 return -ENOMEM;
36901 }
36902 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
36903diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
36904index 4217f29..88f547a 100644
36905--- a/drivers/atm/iphase.c
36906+++ b/drivers/atm/iphase.c
36907@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
36908 status = (u_short) (buf_desc_ptr->desc_mode);
36909 if (status & (RX_CER | RX_PTE | RX_OFL))
36910 {
36911- atomic_inc(&vcc->stats->rx_err);
36912+ atomic_inc_unchecked(&vcc->stats->rx_err);
36913 IF_ERR(printk("IA: bad packet, dropping it");)
36914 if (status & RX_CER) {
36915 IF_ERR(printk(" cause: packet CRC error\n");)
36916@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
36917 len = dma_addr - buf_addr;
36918 if (len > iadev->rx_buf_sz) {
36919 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
36920- atomic_inc(&vcc->stats->rx_err);
36921+ atomic_inc_unchecked(&vcc->stats->rx_err);
36922 goto out_free_desc;
36923 }
36924
36925@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36926 ia_vcc = INPH_IA_VCC(vcc);
36927 if (ia_vcc == NULL)
36928 {
36929- atomic_inc(&vcc->stats->rx_err);
36930+ atomic_inc_unchecked(&vcc->stats->rx_err);
36931 atm_return(vcc, skb->truesize);
36932 dev_kfree_skb_any(skb);
36933 goto INCR_DLE;
36934@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36935 if ((length > iadev->rx_buf_sz) || (length >
36936 (skb->len - sizeof(struct cpcs_trailer))))
36937 {
36938- atomic_inc(&vcc->stats->rx_err);
36939+ atomic_inc_unchecked(&vcc->stats->rx_err);
36940 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
36941 length, skb->len);)
36942 atm_return(vcc, skb->truesize);
36943@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
36944
36945 IF_RX(printk("rx_dle_intr: skb push");)
36946 vcc->push(vcc,skb);
36947- atomic_inc(&vcc->stats->rx);
36948+ atomic_inc_unchecked(&vcc->stats->rx);
36949 iadev->rx_pkt_cnt++;
36950 }
36951 INCR_DLE:
36952@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
36953 {
36954 struct k_sonet_stats *stats;
36955 stats = &PRIV(_ia_dev[board])->sonet_stats;
36956- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
36957- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
36958- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
36959- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
36960- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
36961- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
36962- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
36963- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
36964- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
36965+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
36966+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
36967+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
36968+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
36969+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
36970+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
36971+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
36972+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
36973+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
36974 }
36975 ia_cmds.status = 0;
36976 break;
36977@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36978 if ((desc == 0) || (desc > iadev->num_tx_desc))
36979 {
36980 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
36981- atomic_inc(&vcc->stats->tx);
36982+ atomic_inc_unchecked(&vcc->stats->tx);
36983 if (vcc->pop)
36984 vcc->pop(vcc, skb);
36985 else
36986@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
36987 ATM_DESC(skb) = vcc->vci;
36988 skb_queue_tail(&iadev->tx_dma_q, skb);
36989
36990- atomic_inc(&vcc->stats->tx);
36991+ atomic_inc_unchecked(&vcc->stats->tx);
36992 iadev->tx_pkt_cnt++;
36993 /* Increment transaction counter */
36994 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
36995
36996 #if 0
36997 /* add flow control logic */
36998- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
36999+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37000 if (iavcc->vc_desc_cnt > 10) {
37001 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37002 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37003diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37004index fa7d701..1e404c7 100644
37005--- a/drivers/atm/lanai.c
37006+++ b/drivers/atm/lanai.c
37007@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37008 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37009 lanai_endtx(lanai, lvcc);
37010 lanai_free_skb(lvcc->tx.atmvcc, skb);
37011- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37012+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37013 }
37014
37015 /* Try to fill the buffer - don't call unless there is backlog */
37016@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37017 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37018 __net_timestamp(skb);
37019 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37020- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37021+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37022 out:
37023 lvcc->rx.buf.ptr = end;
37024 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37025@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37026 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37027 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37028 lanai->stats.service_rxnotaal5++;
37029- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37030+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37031 return 0;
37032 }
37033 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37034@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37035 int bytes;
37036 read_unlock(&vcc_sklist_lock);
37037 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37038- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37039+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37040 lvcc->stats.x.aal5.service_trash++;
37041 bytes = (SERVICE_GET_END(s) * 16) -
37042 (((unsigned long) lvcc->rx.buf.ptr) -
37043@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37044 }
37045 if (s & SERVICE_STREAM) {
37046 read_unlock(&vcc_sklist_lock);
37047- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37048+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37049 lvcc->stats.x.aal5.service_stream++;
37050 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37051 "PDU on VCI %d!\n", lanai->number, vci);
37052@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37053 return 0;
37054 }
37055 DPRINTK("got rx crc error on vci %d\n", vci);
37056- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37057+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37058 lvcc->stats.x.aal5.service_rxcrc++;
37059 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37060 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37061diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37062index 9988ac9..7c52585 100644
37063--- a/drivers/atm/nicstar.c
37064+++ b/drivers/atm/nicstar.c
37065@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37066 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37067 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37068 card->index);
37069- atomic_inc(&vcc->stats->tx_err);
37070+ atomic_inc_unchecked(&vcc->stats->tx_err);
37071 dev_kfree_skb_any(skb);
37072 return -EINVAL;
37073 }
37074@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37075 if (!vc->tx) {
37076 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37077 card->index);
37078- atomic_inc(&vcc->stats->tx_err);
37079+ atomic_inc_unchecked(&vcc->stats->tx_err);
37080 dev_kfree_skb_any(skb);
37081 return -EINVAL;
37082 }
37083@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37084 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37085 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37086 card->index);
37087- atomic_inc(&vcc->stats->tx_err);
37088+ atomic_inc_unchecked(&vcc->stats->tx_err);
37089 dev_kfree_skb_any(skb);
37090 return -EINVAL;
37091 }
37092
37093 if (skb_shinfo(skb)->nr_frags != 0) {
37094 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37095- atomic_inc(&vcc->stats->tx_err);
37096+ atomic_inc_unchecked(&vcc->stats->tx_err);
37097 dev_kfree_skb_any(skb);
37098 return -EINVAL;
37099 }
37100@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37101 }
37102
37103 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37104- atomic_inc(&vcc->stats->tx_err);
37105+ atomic_inc_unchecked(&vcc->stats->tx_err);
37106 dev_kfree_skb_any(skb);
37107 return -EIO;
37108 }
37109- atomic_inc(&vcc->stats->tx);
37110+ atomic_inc_unchecked(&vcc->stats->tx);
37111
37112 return 0;
37113 }
37114@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37115 printk
37116 ("nicstar%d: Can't allocate buffers for aal0.\n",
37117 card->index);
37118- atomic_add(i, &vcc->stats->rx_drop);
37119+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37120 break;
37121 }
37122 if (!atm_charge(vcc, sb->truesize)) {
37123 RXPRINTK
37124 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37125 card->index);
37126- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37127+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37128 dev_kfree_skb_any(sb);
37129 break;
37130 }
37131@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37132 ATM_SKB(sb)->vcc = vcc;
37133 __net_timestamp(sb);
37134 vcc->push(vcc, sb);
37135- atomic_inc(&vcc->stats->rx);
37136+ atomic_inc_unchecked(&vcc->stats->rx);
37137 cell += ATM_CELL_PAYLOAD;
37138 }
37139
37140@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37141 if (iovb == NULL) {
37142 printk("nicstar%d: Out of iovec buffers.\n",
37143 card->index);
37144- atomic_inc(&vcc->stats->rx_drop);
37145+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37146 recycle_rx_buf(card, skb);
37147 return;
37148 }
37149@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37150 small or large buffer itself. */
37151 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37152 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37153- atomic_inc(&vcc->stats->rx_err);
37154+ atomic_inc_unchecked(&vcc->stats->rx_err);
37155 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37156 NS_MAX_IOVECS);
37157 NS_PRV_IOVCNT(iovb) = 0;
37158@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37159 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37160 card->index);
37161 which_list(card, skb);
37162- atomic_inc(&vcc->stats->rx_err);
37163+ atomic_inc_unchecked(&vcc->stats->rx_err);
37164 recycle_rx_buf(card, skb);
37165 vc->rx_iov = NULL;
37166 recycle_iov_buf(card, iovb);
37167@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37168 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37169 card->index);
37170 which_list(card, skb);
37171- atomic_inc(&vcc->stats->rx_err);
37172+ atomic_inc_unchecked(&vcc->stats->rx_err);
37173 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37174 NS_PRV_IOVCNT(iovb));
37175 vc->rx_iov = NULL;
37176@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37177 printk(" - PDU size mismatch.\n");
37178 else
37179 printk(".\n");
37180- atomic_inc(&vcc->stats->rx_err);
37181+ atomic_inc_unchecked(&vcc->stats->rx_err);
37182 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37183 NS_PRV_IOVCNT(iovb));
37184 vc->rx_iov = NULL;
37185@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37186 /* skb points to a small buffer */
37187 if (!atm_charge(vcc, skb->truesize)) {
37188 push_rxbufs(card, skb);
37189- atomic_inc(&vcc->stats->rx_drop);
37190+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37191 } else {
37192 skb_put(skb, len);
37193 dequeue_sm_buf(card, skb);
37194@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37195 ATM_SKB(skb)->vcc = vcc;
37196 __net_timestamp(skb);
37197 vcc->push(vcc, skb);
37198- atomic_inc(&vcc->stats->rx);
37199+ atomic_inc_unchecked(&vcc->stats->rx);
37200 }
37201 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37202 struct sk_buff *sb;
37203@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37204 if (len <= NS_SMBUFSIZE) {
37205 if (!atm_charge(vcc, sb->truesize)) {
37206 push_rxbufs(card, sb);
37207- atomic_inc(&vcc->stats->rx_drop);
37208+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37209 } else {
37210 skb_put(sb, len);
37211 dequeue_sm_buf(card, sb);
37212@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37213 ATM_SKB(sb)->vcc = vcc;
37214 __net_timestamp(sb);
37215 vcc->push(vcc, sb);
37216- atomic_inc(&vcc->stats->rx);
37217+ atomic_inc_unchecked(&vcc->stats->rx);
37218 }
37219
37220 push_rxbufs(card, skb);
37221@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37222
37223 if (!atm_charge(vcc, skb->truesize)) {
37224 push_rxbufs(card, skb);
37225- atomic_inc(&vcc->stats->rx_drop);
37226+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37227 } else {
37228 dequeue_lg_buf(card, skb);
37229 #ifdef NS_USE_DESTRUCTORS
37230@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37231 ATM_SKB(skb)->vcc = vcc;
37232 __net_timestamp(skb);
37233 vcc->push(vcc, skb);
37234- atomic_inc(&vcc->stats->rx);
37235+ atomic_inc_unchecked(&vcc->stats->rx);
37236 }
37237
37238 push_rxbufs(card, sb);
37239@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37240 printk
37241 ("nicstar%d: Out of huge buffers.\n",
37242 card->index);
37243- atomic_inc(&vcc->stats->rx_drop);
37244+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37245 recycle_iovec_rx_bufs(card,
37246 (struct iovec *)
37247 iovb->data,
37248@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37249 card->hbpool.count++;
37250 } else
37251 dev_kfree_skb_any(hb);
37252- atomic_inc(&vcc->stats->rx_drop);
37253+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37254 } else {
37255 /* Copy the small buffer to the huge buffer */
37256 sb = (struct sk_buff *)iov->iov_base;
37257@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37258 #endif /* NS_USE_DESTRUCTORS */
37259 __net_timestamp(hb);
37260 vcc->push(vcc, hb);
37261- atomic_inc(&vcc->stats->rx);
37262+ atomic_inc_unchecked(&vcc->stats->rx);
37263 }
37264 }
37265
37266diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37267index 943cf0d..37d15d5 100644
37268--- a/drivers/atm/solos-pci.c
37269+++ b/drivers/atm/solos-pci.c
37270@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37271 }
37272 atm_charge(vcc, skb->truesize);
37273 vcc->push(vcc, skb);
37274- atomic_inc(&vcc->stats->rx);
37275+ atomic_inc_unchecked(&vcc->stats->rx);
37276 break;
37277
37278 case PKT_STATUS:
37279@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37280 vcc = SKB_CB(oldskb)->vcc;
37281
37282 if (vcc) {
37283- atomic_inc(&vcc->stats->tx);
37284+ atomic_inc_unchecked(&vcc->stats->tx);
37285 solos_pop(vcc, oldskb);
37286 } else {
37287 dev_kfree_skb_irq(oldskb);
37288diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37289index 0215934..ce9f5b1 100644
37290--- a/drivers/atm/suni.c
37291+++ b/drivers/atm/suni.c
37292@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37293
37294
37295 #define ADD_LIMITED(s,v) \
37296- atomic_add((v),&stats->s); \
37297- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37298+ atomic_add_unchecked((v),&stats->s); \
37299+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37300
37301
37302 static void suni_hz(unsigned long from_timer)
37303diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37304index 5120a96..e2572bd 100644
37305--- a/drivers/atm/uPD98402.c
37306+++ b/drivers/atm/uPD98402.c
37307@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37308 struct sonet_stats tmp;
37309 int error = 0;
37310
37311- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37312+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37313 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37314 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37315 if (zero && !error) {
37316@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37317
37318
37319 #define ADD_LIMITED(s,v) \
37320- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37321- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37322- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37323+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37324+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37325+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37326
37327
37328 static void stat_event(struct atm_dev *dev)
37329@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37330 if (reason & uPD98402_INT_PFM) stat_event(dev);
37331 if (reason & uPD98402_INT_PCO) {
37332 (void) GET(PCOCR); /* clear interrupt cause */
37333- atomic_add(GET(HECCT),
37334+ atomic_add_unchecked(GET(HECCT),
37335 &PRIV(dev)->sonet_stats.uncorr_hcs);
37336 }
37337 if ((reason & uPD98402_INT_RFO) &&
37338@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37339 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37340 uPD98402_INT_LOS),PIMR); /* enable them */
37341 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37342- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37343- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37344- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37345+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37346+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37347+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37348 return 0;
37349 }
37350
37351diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37352index 969c3c2..9b72956 100644
37353--- a/drivers/atm/zatm.c
37354+++ b/drivers/atm/zatm.c
37355@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37356 }
37357 if (!size) {
37358 dev_kfree_skb_irq(skb);
37359- if (vcc) atomic_inc(&vcc->stats->rx_err);
37360+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37361 continue;
37362 }
37363 if (!atm_charge(vcc,skb->truesize)) {
37364@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37365 skb->len = size;
37366 ATM_SKB(skb)->vcc = vcc;
37367 vcc->push(vcc,skb);
37368- atomic_inc(&vcc->stats->rx);
37369+ atomic_inc_unchecked(&vcc->stats->rx);
37370 }
37371 zout(pos & 0xffff,MTA(mbx));
37372 #if 0 /* probably a stupid idea */
37373@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37374 skb_queue_head(&zatm_vcc->backlog,skb);
37375 break;
37376 }
37377- atomic_inc(&vcc->stats->tx);
37378+ atomic_inc_unchecked(&vcc->stats->tx);
37379 wake_up(&zatm_vcc->tx_wait);
37380 }
37381
37382diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37383index 83e910a..b224a73 100644
37384--- a/drivers/base/bus.c
37385+++ b/drivers/base/bus.c
37386@@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37387 return -EINVAL;
37388
37389 mutex_lock(&subsys->p->mutex);
37390- list_add_tail(&sif->node, &subsys->p->interfaces);
37391+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37392 if (sif->add_dev) {
37393 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37394 while ((dev = subsys_dev_iter_next(&iter)))
37395@@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37396 subsys = sif->subsys;
37397
37398 mutex_lock(&subsys->p->mutex);
37399- list_del_init(&sif->node);
37400+ pax_list_del_init((struct list_head *)&sif->node);
37401 if (sif->remove_dev) {
37402 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37403 while ((dev = subsys_dev_iter_next(&iter)))
37404diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37405index 25798db..15f130e 100644
37406--- a/drivers/base/devtmpfs.c
37407+++ b/drivers/base/devtmpfs.c
37408@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37409 if (!thread)
37410 return 0;
37411
37412- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37413+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37414 if (err)
37415 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37416 else
37417@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37418 *err = sys_unshare(CLONE_NEWNS);
37419 if (*err)
37420 goto out;
37421- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37422+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37423 if (*err)
37424 goto out;
37425- sys_chdir("/.."); /* will traverse into overmounted root */
37426- sys_chroot(".");
37427+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37428+ sys_chroot((char __force_user *)".");
37429 complete(&setup_done);
37430 while (1) {
37431 spin_lock(&req_lock);
37432diff --git a/drivers/base/node.c b/drivers/base/node.c
37433index 8f7ed99..700dd0c 100644
37434--- a/drivers/base/node.c
37435+++ b/drivers/base/node.c
37436@@ -624,7 +624,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37437 struct node_attr {
37438 struct device_attribute attr;
37439 enum node_states state;
37440-};
37441+} __do_const;
37442
37443 static ssize_t show_node_state(struct device *dev,
37444 struct device_attribute *attr, char *buf)
37445diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37446index ae098a2..0999830 100644
37447--- a/drivers/base/power/domain.c
37448+++ b/drivers/base/power/domain.c
37449@@ -1821,9 +1821,9 @@ int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td)
37450
37451 if (dev->power.subsys_data->domain_data) {
37452 gpd_data = to_gpd_data(dev->power.subsys_data->domain_data);
37453- gpd_data->ops = (struct gpd_dev_ops){ NULL };
37454+ memset(&gpd_data->ops, 0, sizeof(gpd_data->ops));
37455 if (clear_td)
37456- gpd_data->td = (struct gpd_timing_data){ 0 };
37457+ memset(&gpd_data->td, 0, sizeof(gpd_data->td));
37458
37459 if (--gpd_data->refcount == 0) {
37460 dev->power.subsys_data->domain_data = NULL;
37461@@ -1862,7 +1862,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37462 {
37463 struct cpuidle_driver *cpuidle_drv;
37464 struct gpd_cpu_data *cpu_data;
37465- struct cpuidle_state *idle_state;
37466+ cpuidle_state_no_const *idle_state;
37467 int ret = 0;
37468
37469 if (IS_ERR_OR_NULL(genpd) || state < 0)
37470@@ -1930,7 +1930,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37471 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37472 {
37473 struct gpd_cpu_data *cpu_data;
37474- struct cpuidle_state *idle_state;
37475+ cpuidle_state_no_const *idle_state;
37476 int ret = 0;
37477
37478 if (IS_ERR_OR_NULL(genpd))
37479diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37480index 95b181d1..c4f0e19 100644
37481--- a/drivers/base/power/sysfs.c
37482+++ b/drivers/base/power/sysfs.c
37483@@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37484 return -EIO;
37485 }
37486 }
37487- return sprintf(buf, p);
37488+ return sprintf(buf, "%s", p);
37489 }
37490
37491 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37492diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37493index 2d56f41..8830f19 100644
37494--- a/drivers/base/power/wakeup.c
37495+++ b/drivers/base/power/wakeup.c
37496@@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
37497 * They need to be modified together atomically, so it's better to use one
37498 * atomic variable to hold them both.
37499 */
37500-static atomic_t combined_event_count = ATOMIC_INIT(0);
37501+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37502
37503 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37504 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37505
37506 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37507 {
37508- unsigned int comb = atomic_read(&combined_event_count);
37509+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37510
37511 *cnt = (comb >> IN_PROGRESS_BITS);
37512 *inpr = comb & MAX_IN_PROGRESS;
37513@@ -395,7 +395,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37514 ws->start_prevent_time = ws->last_time;
37515
37516 /* Increment the counter of events in progress. */
37517- cec = atomic_inc_return(&combined_event_count);
37518+ cec = atomic_inc_return_unchecked(&combined_event_count);
37519
37520 trace_wakeup_source_activate(ws->name, cec);
37521 }
37522@@ -521,7 +521,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37523 * Increment the counter of registered wakeup events and decrement the
37524 * couter of wakeup events in progress simultaneously.
37525 */
37526- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37527+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37528 trace_wakeup_source_deactivate(ws->name, cec);
37529
37530 split_counters(&cnt, &inpr);
37531diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37532index e8d11b6..7b1b36f 100644
37533--- a/drivers/base/syscore.c
37534+++ b/drivers/base/syscore.c
37535@@ -21,7 +21,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37536 void register_syscore_ops(struct syscore_ops *ops)
37537 {
37538 mutex_lock(&syscore_ops_lock);
37539- list_add_tail(&ops->node, &syscore_ops_list);
37540+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37541 mutex_unlock(&syscore_ops_lock);
37542 }
37543 EXPORT_SYMBOL_GPL(register_syscore_ops);
37544@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37545 void unregister_syscore_ops(struct syscore_ops *ops)
37546 {
37547 mutex_lock(&syscore_ops_lock);
37548- list_del(&ops->node);
37549+ pax_list_del((struct list_head *)&ops->node);
37550 mutex_unlock(&syscore_ops_lock);
37551 }
37552 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37553diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37554index 73894ca..69f64ef 100644
37555--- a/drivers/block/cciss.c
37556+++ b/drivers/block/cciss.c
37557@@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
37558 while (!list_empty(&h->reqQ)) {
37559 c = list_entry(h->reqQ.next, CommandList_struct, list);
37560 /* can't do anything if fifo is full */
37561- if ((h->access.fifo_full(h))) {
37562+ if ((h->access->fifo_full(h))) {
37563 dev_warn(&h->pdev->dev, "fifo full\n");
37564 break;
37565 }
37566@@ -3021,7 +3021,7 @@ static void start_io(ctlr_info_t *h)
37567 h->Qdepth--;
37568
37569 /* Tell the controller execute command */
37570- h->access.submit_command(h, c);
37571+ h->access->submit_command(h, c);
37572
37573 /* Put job onto the completed Q */
37574 addQ(&h->cmpQ, c);
37575@@ -3447,17 +3447,17 @@ startio:
37576
37577 static inline unsigned long get_next_completion(ctlr_info_t *h)
37578 {
37579- return h->access.command_completed(h);
37580+ return h->access->command_completed(h);
37581 }
37582
37583 static inline int interrupt_pending(ctlr_info_t *h)
37584 {
37585- return h->access.intr_pending(h);
37586+ return h->access->intr_pending(h);
37587 }
37588
37589 static inline long interrupt_not_for_us(ctlr_info_t *h)
37590 {
37591- return ((h->access.intr_pending(h) == 0) ||
37592+ return ((h->access->intr_pending(h) == 0) ||
37593 (h->interrupts_enabled == 0));
37594 }
37595
37596@@ -3490,7 +3490,7 @@ static inline u32 next_command(ctlr_info_t *h)
37597 u32 a;
37598
37599 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37600- return h->access.command_completed(h);
37601+ return h->access->command_completed(h);
37602
37603 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37604 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37605@@ -4047,7 +4047,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37606 trans_support & CFGTBL_Trans_use_short_tags);
37607
37608 /* Change the access methods to the performant access methods */
37609- h->access = SA5_performant_access;
37610+ h->access = &SA5_performant_access;
37611 h->transMethod = CFGTBL_Trans_Performant;
37612
37613 return;
37614@@ -4325,7 +4325,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37615 if (prod_index < 0)
37616 return -ENODEV;
37617 h->product_name = products[prod_index].product_name;
37618- h->access = *(products[prod_index].access);
37619+ h->access = products[prod_index].access;
37620
37621 if (cciss_board_disabled(h)) {
37622 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37623@@ -5057,7 +5057,7 @@ reinit_after_soft_reset:
37624 }
37625
37626 /* make sure the board interrupts are off */
37627- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37628+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37629 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37630 if (rc)
37631 goto clean2;
37632@@ -5107,7 +5107,7 @@ reinit_after_soft_reset:
37633 * fake ones to scoop up any residual completions.
37634 */
37635 spin_lock_irqsave(&h->lock, flags);
37636- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37637+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37638 spin_unlock_irqrestore(&h->lock, flags);
37639 free_irq(h->intr[h->intr_mode], h);
37640 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37641@@ -5127,9 +5127,9 @@ reinit_after_soft_reset:
37642 dev_info(&h->pdev->dev, "Board READY.\n");
37643 dev_info(&h->pdev->dev,
37644 "Waiting for stale completions to drain.\n");
37645- h->access.set_intr_mask(h, CCISS_INTR_ON);
37646+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37647 msleep(10000);
37648- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37649+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37650
37651 rc = controller_reset_failed(h->cfgtable);
37652 if (rc)
37653@@ -5152,7 +5152,7 @@ reinit_after_soft_reset:
37654 cciss_scsi_setup(h);
37655
37656 /* Turn the interrupts on so we can service requests */
37657- h->access.set_intr_mask(h, CCISS_INTR_ON);
37658+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37659
37660 /* Get the firmware version */
37661 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37662@@ -5224,7 +5224,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37663 kfree(flush_buf);
37664 if (return_code != IO_OK)
37665 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37666- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37667+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37668 free_irq(h->intr[h->intr_mode], h);
37669 }
37670
37671diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37672index 7fda30e..2f27946 100644
37673--- a/drivers/block/cciss.h
37674+++ b/drivers/block/cciss.h
37675@@ -101,7 +101,7 @@ struct ctlr_info
37676 /* information about each logical volume */
37677 drive_info_struct *drv[CISS_MAX_LUN];
37678
37679- struct access_method access;
37680+ struct access_method *access;
37681
37682 /* queue and queue Info */
37683 struct list_head reqQ;
37684@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37685 }
37686
37687 static struct access_method SA5_access = {
37688- SA5_submit_command,
37689- SA5_intr_mask,
37690- SA5_fifo_full,
37691- SA5_intr_pending,
37692- SA5_completed,
37693+ .submit_command = SA5_submit_command,
37694+ .set_intr_mask = SA5_intr_mask,
37695+ .fifo_full = SA5_fifo_full,
37696+ .intr_pending = SA5_intr_pending,
37697+ .command_completed = SA5_completed,
37698 };
37699
37700 static struct access_method SA5B_access = {
37701- SA5_submit_command,
37702- SA5B_intr_mask,
37703- SA5_fifo_full,
37704- SA5B_intr_pending,
37705- SA5_completed,
37706+ .submit_command = SA5_submit_command,
37707+ .set_intr_mask = SA5B_intr_mask,
37708+ .fifo_full = SA5_fifo_full,
37709+ .intr_pending = SA5B_intr_pending,
37710+ .command_completed = SA5_completed,
37711 };
37712
37713 static struct access_method SA5_performant_access = {
37714- SA5_submit_command,
37715- SA5_performant_intr_mask,
37716- SA5_fifo_full,
37717- SA5_performant_intr_pending,
37718- SA5_performant_completed,
37719+ .submit_command = SA5_submit_command,
37720+ .set_intr_mask = SA5_performant_intr_mask,
37721+ .fifo_full = SA5_fifo_full,
37722+ .intr_pending = SA5_performant_intr_pending,
37723+ .command_completed = SA5_performant_completed,
37724 };
37725
37726 struct board_type {
37727diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37728index 2b94403..fd6ad1f 100644
37729--- a/drivers/block/cpqarray.c
37730+++ b/drivers/block/cpqarray.c
37731@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37732 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37733 goto Enomem4;
37734 }
37735- hba[i]->access.set_intr_mask(hba[i], 0);
37736+ hba[i]->access->set_intr_mask(hba[i], 0);
37737 if (request_irq(hba[i]->intr, do_ida_intr,
37738 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37739 {
37740@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37741 add_timer(&hba[i]->timer);
37742
37743 /* Enable IRQ now that spinlock and rate limit timer are set up */
37744- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37745+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37746
37747 for(j=0; j<NWD; j++) {
37748 struct gendisk *disk = ida_gendisk[i][j];
37749@@ -694,7 +694,7 @@ DBGINFO(
37750 for(i=0; i<NR_PRODUCTS; i++) {
37751 if (board_id == products[i].board_id) {
37752 c->product_name = products[i].product_name;
37753- c->access = *(products[i].access);
37754+ c->access = products[i].access;
37755 break;
37756 }
37757 }
37758@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37759 hba[ctlr]->intr = intr;
37760 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37761 hba[ctlr]->product_name = products[j].product_name;
37762- hba[ctlr]->access = *(products[j].access);
37763+ hba[ctlr]->access = products[j].access;
37764 hba[ctlr]->ctlr = ctlr;
37765 hba[ctlr]->board_id = board_id;
37766 hba[ctlr]->pci_dev = NULL; /* not PCI */
37767@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37768
37769 while((c = h->reqQ) != NULL) {
37770 /* Can't do anything if we're busy */
37771- if (h->access.fifo_full(h) == 0)
37772+ if (h->access->fifo_full(h) == 0)
37773 return;
37774
37775 /* Get the first entry from the request Q */
37776@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37777 h->Qdepth--;
37778
37779 /* Tell the controller to do our bidding */
37780- h->access.submit_command(h, c);
37781+ h->access->submit_command(h, c);
37782
37783 /* Get onto the completion Q */
37784 addQ(&h->cmpQ, c);
37785@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37786 unsigned long flags;
37787 __u32 a,a1;
37788
37789- istat = h->access.intr_pending(h);
37790+ istat = h->access->intr_pending(h);
37791 /* Is this interrupt for us? */
37792 if (istat == 0)
37793 return IRQ_NONE;
37794@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37795 */
37796 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37797 if (istat & FIFO_NOT_EMPTY) {
37798- while((a = h->access.command_completed(h))) {
37799+ while((a = h->access->command_completed(h))) {
37800 a1 = a; a &= ~3;
37801 if ((c = h->cmpQ) == NULL)
37802 {
37803@@ -1448,11 +1448,11 @@ static int sendcmd(
37804 /*
37805 * Disable interrupt
37806 */
37807- info_p->access.set_intr_mask(info_p, 0);
37808+ info_p->access->set_intr_mask(info_p, 0);
37809 /* Make sure there is room in the command FIFO */
37810 /* Actually it should be completely empty at this time. */
37811 for (i = 200000; i > 0; i--) {
37812- temp = info_p->access.fifo_full(info_p);
37813+ temp = info_p->access->fifo_full(info_p);
37814 if (temp != 0) {
37815 break;
37816 }
37817@@ -1465,7 +1465,7 @@ DBG(
37818 /*
37819 * Send the cmd
37820 */
37821- info_p->access.submit_command(info_p, c);
37822+ info_p->access->submit_command(info_p, c);
37823 complete = pollcomplete(ctlr);
37824
37825 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37826@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37827 * we check the new geometry. Then turn interrupts back on when
37828 * we're done.
37829 */
37830- host->access.set_intr_mask(host, 0);
37831+ host->access->set_intr_mask(host, 0);
37832 getgeometry(ctlr);
37833- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37834+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37835
37836 for(i=0; i<NWD; i++) {
37837 struct gendisk *disk = ida_gendisk[ctlr][i];
37838@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37839 /* Wait (up to 2 seconds) for a command to complete */
37840
37841 for (i = 200000; i > 0; i--) {
37842- done = hba[ctlr]->access.command_completed(hba[ctlr]);
37843+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
37844 if (done == 0) {
37845 udelay(10); /* a short fixed delay */
37846 } else
37847diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37848index be73e9d..7fbf140 100644
37849--- a/drivers/block/cpqarray.h
37850+++ b/drivers/block/cpqarray.h
37851@@ -99,7 +99,7 @@ struct ctlr_info {
37852 drv_info_t drv[NWD];
37853 struct proc_dir_entry *proc;
37854
37855- struct access_method access;
37856+ struct access_method *access;
37857
37858 cmdlist_t *reqQ;
37859 cmdlist_t *cmpQ;
37860diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
37861index e7093d4..b364085 100644
37862--- a/drivers/block/drbd/drbd_int.h
37863+++ b/drivers/block/drbd/drbd_int.h
37864@@ -331,7 +331,7 @@ struct drbd_epoch {
37865 struct drbd_connection *connection;
37866 struct list_head list;
37867 unsigned int barrier_nr;
37868- atomic_t epoch_size; /* increased on every request added. */
37869+ atomic_unchecked_t epoch_size; /* increased on every request added. */
37870 atomic_t active; /* increased on every req. added, and dec on every finished. */
37871 unsigned long flags;
37872 };
37873@@ -787,7 +787,7 @@ struct drbd_device {
37874 unsigned int al_tr_number;
37875 int al_tr_cycle;
37876 wait_queue_head_t seq_wait;
37877- atomic_t packet_seq;
37878+ atomic_unchecked_t packet_seq;
37879 unsigned int peer_seq;
37880 spinlock_t peer_seq_lock;
37881 unsigned int minor;
37882@@ -1361,7 +1361,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
37883 char __user *uoptval;
37884 int err;
37885
37886- uoptval = (char __user __force *)optval;
37887+ uoptval = (char __force_user *)optval;
37888
37889 set_fs(KERNEL_DS);
37890 if (level == SOL_SOCKET)
37891diff --git a/drivers/block/drbd/drbd_interval.c b/drivers/block/drbd/drbd_interval.c
37892index 89c497c..9c736ae 100644
37893--- a/drivers/block/drbd/drbd_interval.c
37894+++ b/drivers/block/drbd/drbd_interval.c
37895@@ -67,9 +67,9 @@ static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new)
37896 }
37897
37898 static const struct rb_augment_callbacks augment_callbacks = {
37899- augment_propagate,
37900- augment_copy,
37901- augment_rotate,
37902+ .propagate = augment_propagate,
37903+ .copy = augment_copy,
37904+ .rotate = augment_rotate,
37905 };
37906
37907 /**
37908diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
37909index 331e5cc..6d657bce 100644
37910--- a/drivers/block/drbd/drbd_main.c
37911+++ b/drivers/block/drbd/drbd_main.c
37912@@ -1322,7 +1322,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
37913 p->sector = sector;
37914 p->block_id = block_id;
37915 p->blksize = blksize;
37916- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
37917+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
37918 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
37919 }
37920
37921@@ -1628,7 +1628,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
37922 return -EIO;
37923 p->sector = cpu_to_be64(req->i.sector);
37924 p->block_id = (unsigned long)req;
37925- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
37926+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
37927 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
37928 if (device->state.conn >= C_SYNC_SOURCE &&
37929 device->state.conn <= C_PAUSED_SYNC_T)
37930@@ -2658,8 +2658,8 @@ void drbd_destroy_connection(struct kref *kref)
37931 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
37932 struct drbd_resource *resource = connection->resource;
37933
37934- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
37935- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
37936+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
37937+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
37938 kfree(connection->current_epoch);
37939
37940 idr_destroy(&connection->peer_devices);
37941diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
37942index 526414b..4eb8184 100644
37943--- a/drivers/block/drbd/drbd_nl.c
37944+++ b/drivers/block/drbd/drbd_nl.c
37945@@ -3505,7 +3505,7 @@ out:
37946
37947 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
37948 {
37949- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
37950+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
37951 struct sk_buff *msg;
37952 struct drbd_genlmsghdr *d_out;
37953 unsigned seq;
37954@@ -3518,7 +3518,7 @@ void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
37955 return;
37956 }
37957
37958- seq = atomic_inc_return(&drbd_genl_seq);
37959+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
37960 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
37961 if (!msg)
37962 goto failed;
37963diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
37964index 68e3992..1aca24a 100644
37965--- a/drivers/block/drbd/drbd_receiver.c
37966+++ b/drivers/block/drbd/drbd_receiver.c
37967@@ -826,7 +826,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
37968 struct drbd_device *device = peer_device->device;
37969 int err;
37970
37971- atomic_set(&device->packet_seq, 0);
37972+ atomic_set_unchecked(&device->packet_seq, 0);
37973 device->peer_seq = 0;
37974
37975 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
37976@@ -1188,7 +1188,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
37977 do {
37978 next_epoch = NULL;
37979
37980- epoch_size = atomic_read(&epoch->epoch_size);
37981+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
37982
37983 switch (ev & ~EV_CLEANUP) {
37984 case EV_PUT:
37985@@ -1228,7 +1228,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
37986 rv = FE_DESTROYED;
37987 } else {
37988 epoch->flags = 0;
37989- atomic_set(&epoch->epoch_size, 0);
37990+ atomic_set_unchecked(&epoch->epoch_size, 0);
37991 /* atomic_set(&epoch->active, 0); is already zero */
37992 if (rv == FE_STILL_LIVE)
37993 rv = FE_RECYCLED;
37994@@ -1456,7 +1456,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
37995 conn_wait_active_ee_empty(connection);
37996 drbd_flush(connection);
37997
37998- if (atomic_read(&connection->current_epoch->epoch_size)) {
37999+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38000 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38001 if (epoch)
38002 break;
38003@@ -1469,11 +1469,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38004 }
38005
38006 epoch->flags = 0;
38007- atomic_set(&epoch->epoch_size, 0);
38008+ atomic_set_unchecked(&epoch->epoch_size, 0);
38009 atomic_set(&epoch->active, 0);
38010
38011 spin_lock(&connection->epoch_lock);
38012- if (atomic_read(&connection->current_epoch->epoch_size)) {
38013+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38014 list_add(&epoch->list, &connection->current_epoch->list);
38015 connection->current_epoch = epoch;
38016 connection->epochs++;
38017@@ -2182,7 +2182,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38018
38019 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38020 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38021- atomic_inc(&connection->current_epoch->epoch_size);
38022+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38023 err2 = drbd_drain_block(peer_device, pi->size);
38024 if (!err)
38025 err = err2;
38026@@ -2216,7 +2216,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38027
38028 spin_lock(&connection->epoch_lock);
38029 peer_req->epoch = connection->current_epoch;
38030- atomic_inc(&peer_req->epoch->epoch_size);
38031+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38032 atomic_inc(&peer_req->epoch->active);
38033 spin_unlock(&connection->epoch_lock);
38034
38035@@ -4396,7 +4396,7 @@ struct data_cmd {
38036 int expect_payload;
38037 size_t pkt_size;
38038 int (*fn)(struct drbd_connection *, struct packet_info *);
38039-};
38040+} __do_const;
38041
38042 static struct data_cmd drbd_cmd_handler[] = {
38043 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38044@@ -4506,7 +4506,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38045 if (!list_empty(&connection->current_epoch->list))
38046 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38047 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38048- atomic_set(&connection->current_epoch->epoch_size, 0);
38049+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38050 connection->send.seen_any_write_yet = false;
38051
38052 drbd_info(connection, "Connection closed\n");
38053@@ -5281,7 +5281,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38054 struct asender_cmd {
38055 size_t pkt_size;
38056 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38057-};
38058+} __do_const;
38059
38060 static struct asender_cmd asender_tbl[] = {
38061 [P_PING] = { 0, got_Ping },
38062diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38063index f70a230..9dc90d5 100644
38064--- a/drivers/block/loop.c
38065+++ b/drivers/block/loop.c
38066@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38067
38068 file_start_write(file);
38069 set_fs(get_ds());
38070- bw = file->f_op->write(file, buf, len, &pos);
38071+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38072 set_fs(old_fs);
38073 file_end_write(file);
38074 if (likely(bw == len))
38075diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
38076index 091b9ea..f5428f8 100644
38077--- a/drivers/block/null_blk.c
38078+++ b/drivers/block/null_blk.c
38079@@ -382,15 +382,25 @@ static int null_init_hctx(struct blk_mq_hw_ctx *hctx, void *data,
38080 return 0;
38081 }
38082
38083-static struct blk_mq_ops null_mq_ops = {
38084- .queue_rq = null_queue_rq,
38085- .map_queue = blk_mq_map_queue,
38086+static struct blk_mq_ops null_mq_single_ops = {
38087+ .queue_rq = null_queue_rq,
38088+ .map_queue = blk_mq_map_queue,
38089 .init_hctx = null_init_hctx,
38090 .complete = null_softirq_done_fn,
38091+ .alloc_hctx = blk_mq_alloc_single_hw_queue,
38092+ .free_hctx = blk_mq_free_single_hw_queue,
38093+};
38094+
38095+static struct blk_mq_ops null_mq_per_node_ops = {
38096+ .queue_rq = null_queue_rq,
38097+ .map_queue = blk_mq_map_queue,
38098+ .init_hctx = null_init_hctx,
38099+ .alloc_hctx = null_alloc_hctx,
38100+ .free_hctx = null_free_hctx,
38101 };
38102
38103 static struct blk_mq_reg null_mq_reg = {
38104- .ops = &null_mq_ops,
38105+ .ops = &null_mq_single_ops,
38106 .queue_depth = 64,
38107 .cmd_size = sizeof(struct nullb_cmd),
38108 .flags = BLK_MQ_F_SHOULD_MERGE,
38109@@ -521,13 +531,8 @@ static int null_add_dev(void)
38110 null_mq_reg.queue_depth = hw_queue_depth;
38111 null_mq_reg.nr_hw_queues = submit_queues;
38112
38113- if (use_per_node_hctx) {
38114- null_mq_reg.ops->alloc_hctx = null_alloc_hctx;
38115- null_mq_reg.ops->free_hctx = null_free_hctx;
38116- } else {
38117- null_mq_reg.ops->alloc_hctx = blk_mq_alloc_single_hw_queue;
38118- null_mq_reg.ops->free_hctx = blk_mq_free_single_hw_queue;
38119- }
38120+ if (use_per_node_hctx)
38121+ null_mq_reg.ops = &null_mq_per_node_ops;
38122
38123 nullb->q = blk_mq_init_queue(&null_mq_reg, nullb);
38124 } else if (queue_mode == NULL_Q_BIO) {
38125diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38126index a2af73d..c0b8f61 100644
38127--- a/drivers/block/pktcdvd.c
38128+++ b/drivers/block/pktcdvd.c
38129@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38130
38131 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38132 {
38133- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38134+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38135 }
38136
38137 /*
38138@@ -1888,7 +1888,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38139 return -EROFS;
38140 }
38141 pd->settings.fp = ti.fp;
38142- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38143+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38144
38145 if (ti.nwa_v) {
38146 pd->nwa = be32_to_cpu(ti.next_writable);
38147diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38148index e5565fb..71be10b4 100644
38149--- a/drivers/block/smart1,2.h
38150+++ b/drivers/block/smart1,2.h
38151@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38152 }
38153
38154 static struct access_method smart4_access = {
38155- smart4_submit_command,
38156- smart4_intr_mask,
38157- smart4_fifo_full,
38158- smart4_intr_pending,
38159- smart4_completed,
38160+ .submit_command = smart4_submit_command,
38161+ .set_intr_mask = smart4_intr_mask,
38162+ .fifo_full = smart4_fifo_full,
38163+ .intr_pending = smart4_intr_pending,
38164+ .command_completed = smart4_completed,
38165 };
38166
38167 /*
38168@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38169 }
38170
38171 static struct access_method smart2_access = {
38172- smart2_submit_command,
38173- smart2_intr_mask,
38174- smart2_fifo_full,
38175- smart2_intr_pending,
38176- smart2_completed,
38177+ .submit_command = smart2_submit_command,
38178+ .set_intr_mask = smart2_intr_mask,
38179+ .fifo_full = smart2_fifo_full,
38180+ .intr_pending = smart2_intr_pending,
38181+ .command_completed = smart2_completed,
38182 };
38183
38184 /*
38185@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38186 }
38187
38188 static struct access_method smart2e_access = {
38189- smart2e_submit_command,
38190- smart2e_intr_mask,
38191- smart2e_fifo_full,
38192- smart2e_intr_pending,
38193- smart2e_completed,
38194+ .submit_command = smart2e_submit_command,
38195+ .set_intr_mask = smart2e_intr_mask,
38196+ .fifo_full = smart2e_fifo_full,
38197+ .intr_pending = smart2e_intr_pending,
38198+ .command_completed = smart2e_completed,
38199 };
38200
38201 /*
38202@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38203 }
38204
38205 static struct access_method smart1_access = {
38206- smart1_submit_command,
38207- smart1_intr_mask,
38208- smart1_fifo_full,
38209- smart1_intr_pending,
38210- smart1_completed,
38211+ .submit_command = smart1_submit_command,
38212+ .set_intr_mask = smart1_intr_mask,
38213+ .fifo_full = smart1_fifo_full,
38214+ .intr_pending = smart1_intr_pending,
38215+ .command_completed = smart1_completed,
38216 };
38217diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38218index f038dba..bb74c08 100644
38219--- a/drivers/bluetooth/btwilink.c
38220+++ b/drivers/bluetooth/btwilink.c
38221@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38222
38223 static int bt_ti_probe(struct platform_device *pdev)
38224 {
38225- static struct ti_st *hst;
38226+ struct ti_st *hst;
38227 struct hci_dev *hdev;
38228 int err;
38229
38230diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38231index 8a3aff7..d7538c2 100644
38232--- a/drivers/cdrom/cdrom.c
38233+++ b/drivers/cdrom/cdrom.c
38234@@ -416,7 +416,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38235 ENSURE(reset, CDC_RESET);
38236 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38237 cdi->mc_flags = 0;
38238- cdo->n_minors = 0;
38239 cdi->options = CDO_USE_FFLAGS;
38240
38241 if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
38242@@ -436,8 +435,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38243 else
38244 cdi->cdda_method = CDDA_OLD;
38245
38246- if (!cdo->generic_packet)
38247- cdo->generic_packet = cdrom_dummy_generic_packet;
38248+ if (!cdo->generic_packet) {
38249+ pax_open_kernel();
38250+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38251+ pax_close_kernel();
38252+ }
38253
38254 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38255 mutex_lock(&cdrom_mutex);
38256@@ -458,7 +460,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38257 if (cdi->exit)
38258 cdi->exit(cdi);
38259
38260- cdi->ops->n_minors--;
38261 cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38262 }
38263
38264@@ -2107,7 +2108,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38265 */
38266 nr = nframes;
38267 do {
38268- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38269+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38270 if (cgc.buffer)
38271 break;
38272
38273@@ -3429,7 +3430,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38274 struct cdrom_device_info *cdi;
38275 int ret;
38276
38277- ret = scnprintf(info + *pos, max_size - *pos, header);
38278+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38279 if (!ret)
38280 return 1;
38281
38282diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38283index 51e75ad..39c4c76 100644
38284--- a/drivers/cdrom/gdrom.c
38285+++ b/drivers/cdrom/gdrom.c
38286@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38287 .audio_ioctl = gdrom_audio_ioctl,
38288 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38289 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38290- .n_minors = 1,
38291 };
38292
38293 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38294diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38295index 6e9f74a..50c7ceae 100644
38296--- a/drivers/char/Kconfig
38297+++ b/drivers/char/Kconfig
38298@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38299
38300 config DEVKMEM
38301 bool "/dev/kmem virtual device support"
38302- default y
38303+ default n
38304+ depends on !GRKERNSEC_KMEM
38305 help
38306 Say Y here if you want to support the /dev/kmem device. The
38307 /dev/kmem device is rarely used, but can be used for certain
38308@@ -577,6 +578,7 @@ config DEVPORT
38309 bool
38310 depends on !M68K
38311 depends on ISA || PCI
38312+ depends on !GRKERNSEC_KMEM
38313 default y
38314
38315 source "drivers/s390/char/Kconfig"
38316diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38317index a48e05b..6bac831 100644
38318--- a/drivers/char/agp/compat_ioctl.c
38319+++ b/drivers/char/agp/compat_ioctl.c
38320@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38321 return -ENOMEM;
38322 }
38323
38324- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38325+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38326 sizeof(*usegment) * ureserve.seg_count)) {
38327 kfree(usegment);
38328 kfree(ksegment);
38329diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38330index b297033..fa217ca 100644
38331--- a/drivers/char/agp/frontend.c
38332+++ b/drivers/char/agp/frontend.c
38333@@ -819,7 +819,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38334 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38335 return -EFAULT;
38336
38337- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38338+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38339 return -EFAULT;
38340
38341 client = agp_find_client_by_pid(reserve.pid);
38342@@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38343 if (segment == NULL)
38344 return -ENOMEM;
38345
38346- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38347+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38348 sizeof(struct agp_segment) * reserve.seg_count)) {
38349 kfree(segment);
38350 return -EFAULT;
38351diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38352index 4f94375..413694e 100644
38353--- a/drivers/char/genrtc.c
38354+++ b/drivers/char/genrtc.c
38355@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38356 switch (cmd) {
38357
38358 case RTC_PLL_GET:
38359+ memset(&pll, 0, sizeof(pll));
38360 if (get_rtc_pll(&pll))
38361 return -EINVAL;
38362 else
38363diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38364index d5d4cd8..22d561d 100644
38365--- a/drivers/char/hpet.c
38366+++ b/drivers/char/hpet.c
38367@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38368 }
38369
38370 static int
38371-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38372+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38373 struct hpet_info *info)
38374 {
38375 struct hpet_timer __iomem *timer;
38376diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c
38377index 86fe45c..c0ea948 100644
38378--- a/drivers/char/hw_random/intel-rng.c
38379+++ b/drivers/char/hw_random/intel-rng.c
38380@@ -314,7 +314,7 @@ PFX "RNG, try using the 'no_fwh_detect' option.\n";
38381
38382 if (no_fwh_detect)
38383 return -ENODEV;
38384- printk(warning);
38385+ printk("%s", warning);
38386 return -EBUSY;
38387 }
38388
38389diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38390index e6db938..835e3a2 100644
38391--- a/drivers/char/ipmi/ipmi_msghandler.c
38392+++ b/drivers/char/ipmi/ipmi_msghandler.c
38393@@ -438,7 +438,7 @@ struct ipmi_smi {
38394 struct proc_dir_entry *proc_dir;
38395 char proc_dir_name[10];
38396
38397- atomic_t stats[IPMI_NUM_STATS];
38398+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38399
38400 /*
38401 * run_to_completion duplicate of smb_info, smi_info
38402@@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38403 static DEFINE_MUTEX(smi_watchers_mutex);
38404
38405 #define ipmi_inc_stat(intf, stat) \
38406- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38407+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38408 #define ipmi_get_stat(intf, stat) \
38409- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38410+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38411
38412 static int is_lan_addr(struct ipmi_addr *addr)
38413 {
38414@@ -2926,7 +2926,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38415 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38416 init_waitqueue_head(&intf->waitq);
38417 for (i = 0; i < IPMI_NUM_STATS; i++)
38418- atomic_set(&intf->stats[i], 0);
38419+ atomic_set_unchecked(&intf->stats[i], 0);
38420
38421 intf->proc_dir = NULL;
38422
38423diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38424index 1c4bb4f..719e873 100644
38425--- a/drivers/char/ipmi/ipmi_si_intf.c
38426+++ b/drivers/char/ipmi/ipmi_si_intf.c
38427@@ -285,7 +285,7 @@ struct smi_info {
38428 unsigned char slave_addr;
38429
38430 /* Counters and things for the proc filesystem. */
38431- atomic_t stats[SI_NUM_STATS];
38432+ atomic_unchecked_t stats[SI_NUM_STATS];
38433
38434 struct task_struct *thread;
38435
38436@@ -294,9 +294,9 @@ struct smi_info {
38437 };
38438
38439 #define smi_inc_stat(smi, stat) \
38440- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38441+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38442 #define smi_get_stat(smi, stat) \
38443- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38444+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38445
38446 #define SI_MAX_PARMS 4
38447
38448@@ -3374,7 +3374,7 @@ static int try_smi_init(struct smi_info *new_smi)
38449 atomic_set(&new_smi->req_events, 0);
38450 new_smi->run_to_completion = false;
38451 for (i = 0; i < SI_NUM_STATS; i++)
38452- atomic_set(&new_smi->stats[i], 0);
38453+ atomic_set_unchecked(&new_smi->stats[i], 0);
38454
38455 new_smi->interrupt_disabled = true;
38456 atomic_set(&new_smi->stop_operation, 0);
38457diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38458index 917403f..dddd899 100644
38459--- a/drivers/char/mem.c
38460+++ b/drivers/char/mem.c
38461@@ -18,6 +18,7 @@
38462 #include <linux/raw.h>
38463 #include <linux/tty.h>
38464 #include <linux/capability.h>
38465+#include <linux/security.h>
38466 #include <linux/ptrace.h>
38467 #include <linux/device.h>
38468 #include <linux/highmem.h>
38469@@ -36,6 +37,10 @@
38470
38471 #define DEVPORT_MINOR 4
38472
38473+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38474+extern const struct file_operations grsec_fops;
38475+#endif
38476+
38477 static inline unsigned long size_inside_page(unsigned long start,
38478 unsigned long size)
38479 {
38480@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38481
38482 while (cursor < to) {
38483 if (!devmem_is_allowed(pfn)) {
38484+#ifdef CONFIG_GRKERNSEC_KMEM
38485+ gr_handle_mem_readwrite(from, to);
38486+#else
38487 printk(KERN_INFO
38488 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38489 current->comm, from, to);
38490+#endif
38491 return 0;
38492 }
38493 cursor += PAGE_SIZE;
38494@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38495 }
38496 return 1;
38497 }
38498+#elif defined(CONFIG_GRKERNSEC_KMEM)
38499+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38500+{
38501+ return 0;
38502+}
38503 #else
38504 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38505 {
38506@@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38507
38508 while (count > 0) {
38509 unsigned long remaining;
38510+ char *temp;
38511
38512 sz = size_inside_page(p, count);
38513
38514@@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38515 if (!ptr)
38516 return -EFAULT;
38517
38518- remaining = copy_to_user(buf, ptr, sz);
38519+#ifdef CONFIG_PAX_USERCOPY
38520+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38521+ if (!temp) {
38522+ unxlate_dev_mem_ptr(p, ptr);
38523+ return -ENOMEM;
38524+ }
38525+ memcpy(temp, ptr, sz);
38526+#else
38527+ temp = ptr;
38528+#endif
38529+
38530+ remaining = copy_to_user(buf, temp, sz);
38531+
38532+#ifdef CONFIG_PAX_USERCOPY
38533+ kfree(temp);
38534+#endif
38535+
38536 unxlate_dev_mem_ptr(p, ptr);
38537 if (remaining)
38538 return -EFAULT;
38539@@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38540 size_t count, loff_t *ppos)
38541 {
38542 unsigned long p = *ppos;
38543- ssize_t low_count, read, sz;
38544+ ssize_t low_count, read, sz, err = 0;
38545 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38546- int err = 0;
38547
38548 read = 0;
38549 if (p < (unsigned long) high_memory) {
38550@@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38551 }
38552 #endif
38553 while (low_count > 0) {
38554+ char *temp;
38555+
38556 sz = size_inside_page(p, low_count);
38557
38558 /*
38559@@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38560 */
38561 kbuf = xlate_dev_kmem_ptr((char *)p);
38562
38563- if (copy_to_user(buf, kbuf, sz))
38564+#ifdef CONFIG_PAX_USERCOPY
38565+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38566+ if (!temp)
38567+ return -ENOMEM;
38568+ memcpy(temp, kbuf, sz);
38569+#else
38570+ temp = kbuf;
38571+#endif
38572+
38573+ err = copy_to_user(buf, temp, sz);
38574+
38575+#ifdef CONFIG_PAX_USERCOPY
38576+ kfree(temp);
38577+#endif
38578+
38579+ if (err)
38580 return -EFAULT;
38581 buf += sz;
38582 p += sz;
38583@@ -827,6 +874,9 @@ static const struct memdev {
38584 #ifdef CONFIG_PRINTK
38585 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38586 #endif
38587+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38588+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38589+#endif
38590 };
38591
38592 static int memory_open(struct inode *inode, struct file *filp)
38593@@ -898,7 +948,7 @@ static int __init chr_dev_init(void)
38594 continue;
38595
38596 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38597- NULL, devlist[minor].name);
38598+ NULL, "%s", devlist[minor].name);
38599 }
38600
38601 return tty_init();
38602diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38603index 9df78e2..01ba9ae 100644
38604--- a/drivers/char/nvram.c
38605+++ b/drivers/char/nvram.c
38606@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38607
38608 spin_unlock_irq(&rtc_lock);
38609
38610- if (copy_to_user(buf, contents, tmp - contents))
38611+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38612 return -EFAULT;
38613
38614 *ppos = i;
38615diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38616index 8320abd..ec48108 100644
38617--- a/drivers/char/pcmcia/synclink_cs.c
38618+++ b/drivers/char/pcmcia/synclink_cs.c
38619@@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38620
38621 if (debug_level >= DEBUG_LEVEL_INFO)
38622 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38623- __FILE__, __LINE__, info->device_name, port->count);
38624+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38625
38626- WARN_ON(!port->count);
38627+ WARN_ON(!atomic_read(&port->count));
38628
38629 if (tty_port_close_start(port, tty, filp) == 0)
38630 goto cleanup;
38631@@ -2365,7 +2365,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38632 cleanup:
38633 if (debug_level >= DEBUG_LEVEL_INFO)
38634 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38635- tty->driver->name, port->count);
38636+ tty->driver->name, atomic_read(&port->count));
38637 }
38638
38639 /* Wait until the transmitter is empty.
38640@@ -2507,7 +2507,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38641
38642 if (debug_level >= DEBUG_LEVEL_INFO)
38643 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38644- __FILE__, __LINE__, tty->driver->name, port->count);
38645+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38646
38647 /* If port is closing, signal caller to try again */
38648 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
38649@@ -2527,11 +2527,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38650 goto cleanup;
38651 }
38652 spin_lock(&port->lock);
38653- port->count++;
38654+ atomic_inc(&port->count);
38655 spin_unlock(&port->lock);
38656 spin_unlock_irqrestore(&info->netlock, flags);
38657
38658- if (port->count == 1) {
38659+ if (atomic_read(&port->count) == 1) {
38660 /* 1st open on this device, init hardware */
38661 retval = startup(info, tty);
38662 if (retval < 0)
38663@@ -3920,7 +3920,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38664 unsigned short new_crctype;
38665
38666 /* return error if TTY interface open */
38667- if (info->port.count)
38668+ if (atomic_read(&info->port.count))
38669 return -EBUSY;
38670
38671 switch (encoding)
38672@@ -4024,7 +4024,7 @@ static int hdlcdev_open(struct net_device *dev)
38673
38674 /* arbitrate between network and tty opens */
38675 spin_lock_irqsave(&info->netlock, flags);
38676- if (info->port.count != 0 || info->netcount != 0) {
38677+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38678 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38679 spin_unlock_irqrestore(&info->netlock, flags);
38680 return -EBUSY;
38681@@ -4114,7 +4114,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38682 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38683
38684 /* return error if TTY interface open */
38685- if (info->port.count)
38686+ if (atomic_read(&info->port.count))
38687 return -EBUSY;
38688
38689 if (cmd != SIOCWANDEV)
38690diff --git a/drivers/char/random.c b/drivers/char/random.c
38691index 2b6e4cd..43d7ae1 100644
38692--- a/drivers/char/random.c
38693+++ b/drivers/char/random.c
38694@@ -270,10 +270,17 @@
38695 /*
38696 * Configuration information
38697 */
38698+#ifdef CONFIG_GRKERNSEC_RANDNET
38699+#define INPUT_POOL_SHIFT 14
38700+#define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
38701+#define OUTPUT_POOL_SHIFT 12
38702+#define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
38703+#else
38704 #define INPUT_POOL_SHIFT 12
38705 #define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5))
38706 #define OUTPUT_POOL_SHIFT 10
38707 #define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5))
38708+#endif
38709 #define SEC_XFER_SIZE 512
38710 #define EXTRACT_SIZE 10
38711
38712@@ -284,9 +291,6 @@
38713 /*
38714 * To allow fractional bits to be tracked, the entropy_count field is
38715 * denominated in units of 1/8th bits.
38716- *
38717- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38718- * credit_entropy_bits() needs to be 64 bits wide.
38719 */
38720 #define ENTROPY_SHIFT 3
38721 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38722@@ -361,12 +365,19 @@ static struct poolinfo {
38723 #define S(x) ilog2(x)+5, (x), (x)*4, (x)*32, (x) << (ENTROPY_SHIFT+5)
38724 int tap1, tap2, tap3, tap4, tap5;
38725 } poolinfo_table[] = {
38726+#ifdef CONFIG_GRKERNSEC_RANDNET
38727+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
38728+ { S(512), 411, 308, 208, 104, 1 },
38729+ /* x^128 + x^104 + x^76 + x^51 + x^25 + x + 1 -- 105 */
38730+ { S(128), 104, 76, 51, 25, 1 },
38731+#else
38732 /* was: x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 */
38733 /* x^128 + x^104 + x^76 + x^51 +x^25 + x + 1 */
38734 { S(128), 104, 76, 51, 25, 1 },
38735 /* was: x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 */
38736 /* x^32 + x^26 + x^19 + x^14 + x^7 + x + 1 */
38737 { S(32), 26, 19, 14, 7, 1 },
38738+#endif
38739 #if 0
38740 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
38741 { S(2048), 1638, 1231, 819, 411, 1 },
38742@@ -433,9 +444,9 @@ struct entropy_store {
38743 };
38744
38745 static void push_to_pool(struct work_struct *work);
38746-static __u32 input_pool_data[INPUT_POOL_WORDS];
38747-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38748-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38749+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38750+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38751+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38752
38753 static struct entropy_store input_pool = {
38754 .poolinfo = &poolinfo_table[0],
38755@@ -524,8 +535,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
38756 input_rotate = (input_rotate + (i ? 7 : 14)) & 31;
38757 }
38758
38759- ACCESS_ONCE(r->input_rotate) = input_rotate;
38760- ACCESS_ONCE(r->add_ptr) = i;
38761+ ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
38762+ ACCESS_ONCE_RW(r->add_ptr) = i;
38763 smp_wmb();
38764
38765 if (out)
38766@@ -632,7 +643,7 @@ retry:
38767 /* The +2 corresponds to the /4 in the denominator */
38768
38769 do {
38770- unsigned int anfrac = min(pnfrac, pool_size/2);
38771+ u64 anfrac = min(pnfrac, pool_size/2);
38772 unsigned int add =
38773 ((pool_size - entropy_count)*anfrac*3) >> s;
38774
38775@@ -1166,7 +1177,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38776
38777 extract_buf(r, tmp);
38778 i = min_t(int, nbytes, EXTRACT_SIZE);
38779- if (copy_to_user(buf, tmp, i)) {
38780+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38781 ret = -EFAULT;
38782 break;
38783 }
38784@@ -1555,7 +1566,7 @@ static char sysctl_bootid[16];
38785 static int proc_do_uuid(struct ctl_table *table, int write,
38786 void __user *buffer, size_t *lenp, loff_t *ppos)
38787 {
38788- struct ctl_table fake_table;
38789+ ctl_table_no_const fake_table;
38790 unsigned char buf[64], tmp_uuid[16], *uuid;
38791
38792 uuid = table->data;
38793@@ -1585,7 +1596,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38794 static int proc_do_entropy(ctl_table *table, int write,
38795 void __user *buffer, size_t *lenp, loff_t *ppos)
38796 {
38797- ctl_table fake_table;
38798+ ctl_table_no_const fake_table;
38799 int entropy_count;
38800
38801 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38802diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38803index 7cc1fe22..b602d6b 100644
38804--- a/drivers/char/sonypi.c
38805+++ b/drivers/char/sonypi.c
38806@@ -54,6 +54,7 @@
38807
38808 #include <asm/uaccess.h>
38809 #include <asm/io.h>
38810+#include <asm/local.h>
38811
38812 #include <linux/sonypi.h>
38813
38814@@ -490,7 +491,7 @@ static struct sonypi_device {
38815 spinlock_t fifo_lock;
38816 wait_queue_head_t fifo_proc_list;
38817 struct fasync_struct *fifo_async;
38818- int open_count;
38819+ local_t open_count;
38820 int model;
38821 struct input_dev *input_jog_dev;
38822 struct input_dev *input_key_dev;
38823@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38824 static int sonypi_misc_release(struct inode *inode, struct file *file)
38825 {
38826 mutex_lock(&sonypi_device.lock);
38827- sonypi_device.open_count--;
38828+ local_dec(&sonypi_device.open_count);
38829 mutex_unlock(&sonypi_device.lock);
38830 return 0;
38831 }
38832@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38833 {
38834 mutex_lock(&sonypi_device.lock);
38835 /* Flush input queue on first open */
38836- if (!sonypi_device.open_count)
38837+ if (!local_read(&sonypi_device.open_count))
38838 kfifo_reset(&sonypi_device.fifo);
38839- sonypi_device.open_count++;
38840+ local_inc(&sonypi_device.open_count);
38841 mutex_unlock(&sonypi_device.lock);
38842
38843 return 0;
38844diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
38845index b9a57fa..5bb9e38 100644
38846--- a/drivers/char/tpm/tpm_acpi.c
38847+++ b/drivers/char/tpm/tpm_acpi.c
38848@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
38849 virt = acpi_os_map_memory(start, len);
38850 if (!virt) {
38851 kfree(log->bios_event_log);
38852+ log->bios_event_log = NULL;
38853 printk("%s: ERROR - Unable to map memory\n", __func__);
38854 return -EIO;
38855 }
38856
38857- memcpy_fromio(log->bios_event_log, virt, len);
38858+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
38859
38860 acpi_os_unmap_memory(virt, len);
38861 return 0;
38862diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
38863index 59f7cb2..bac8b6d 100644
38864--- a/drivers/char/tpm/tpm_eventlog.c
38865+++ b/drivers/char/tpm/tpm_eventlog.c
38866@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
38867 event = addr;
38868
38869 if ((event->event_type == 0 && event->event_size == 0) ||
38870- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
38871+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
38872 return NULL;
38873
38874 return addr;
38875@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
38876 return NULL;
38877
38878 if ((event->event_type == 0 && event->event_size == 0) ||
38879- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
38880+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
38881 return NULL;
38882
38883 (*pos)++;
38884@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
38885 int i;
38886
38887 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
38888- seq_putc(m, data[i]);
38889+ if (!seq_putc(m, data[i]))
38890+ return -EFAULT;
38891
38892 return 0;
38893 }
38894diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
38895index 60aafb8..10c08e0 100644
38896--- a/drivers/char/virtio_console.c
38897+++ b/drivers/char/virtio_console.c
38898@@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
38899 if (to_user) {
38900 ssize_t ret;
38901
38902- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
38903+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
38904 if (ret)
38905 return -EFAULT;
38906 } else {
38907@@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
38908 if (!port_has_data(port) && !port->host_connected)
38909 return 0;
38910
38911- return fill_readbuf(port, ubuf, count, true);
38912+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
38913 }
38914
38915 static int wait_port_writable(struct port *port, bool nonblock)
38916diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
38917index 57a078e..c17cde8 100644
38918--- a/drivers/clk/clk-composite.c
38919+++ b/drivers/clk/clk-composite.c
38920@@ -146,7 +146,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
38921 struct clk *clk;
38922 struct clk_init_data init;
38923 struct clk_composite *composite;
38924- struct clk_ops *clk_composite_ops;
38925+ clk_ops_no_const *clk_composite_ops;
38926
38927 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
38928 if (!composite) {
38929diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
38930index 501d513..fb0ecf9 100644
38931--- a/drivers/clk/socfpga/clk-gate.c
38932+++ b/drivers/clk/socfpga/clk-gate.c
38933@@ -22,6 +22,7 @@
38934 #include <linux/mfd/syscon.h>
38935 #include <linux/of.h>
38936 #include <linux/regmap.h>
38937+#include <asm/pgtable.h>
38938
38939 #include "clk.h"
38940
38941@@ -175,7 +176,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
38942 return 0;
38943 }
38944
38945-static struct clk_ops gateclk_ops = {
38946+static clk_ops_no_const gateclk_ops __read_only = {
38947 .prepare = socfpga_clk_prepare,
38948 .recalc_rate = socfpga_clk_recalc_rate,
38949 .get_parent = socfpga_clk_get_parent,
38950@@ -209,8 +210,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
38951 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
38952 socfpga_clk->hw.bit_idx = clk_gate[1];
38953
38954- gateclk_ops.enable = clk_gate_ops.enable;
38955- gateclk_ops.disable = clk_gate_ops.disable;
38956+ pax_open_kernel();
38957+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
38958+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
38959+ pax_close_kernel();
38960 }
38961
38962 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
38963diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
38964index de6da95..a2e72c0 100644
38965--- a/drivers/clk/socfpga/clk-pll.c
38966+++ b/drivers/clk/socfpga/clk-pll.c
38967@@ -21,6 +21,7 @@
38968 #include <linux/io.h>
38969 #include <linux/of.h>
38970 #include <linux/of_address.h>
38971+#include <asm/pgtable.h>
38972
38973 #include "clk.h"
38974
38975@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
38976 CLK_MGR_PLL_CLK_SRC_MASK;
38977 }
38978
38979-static struct clk_ops clk_pll_ops = {
38980+static struct clk_ops_no_const clk_pll_ops __read_only = {
38981 .recalc_rate = clk_pll_recalc_rate,
38982 .get_parent = clk_pll_get_parent,
38983 };
38984@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
38985 pll_clk->hw.hw.init = &init;
38986
38987 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
38988- clk_pll_ops.enable = clk_gate_ops.enable;
38989- clk_pll_ops.disable = clk_gate_ops.disable;
38990+ pax_open_kernel();
38991+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
38992+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
38993+ pax_close_kernel();
38994
38995 clk = clk_register(NULL, &pll_clk->hw.hw);
38996 if (WARN_ON(IS_ERR(clk))) {
38997diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
38998index 000e4e0..4770351 100644
38999--- a/drivers/cpufreq/acpi-cpufreq.c
39000+++ b/drivers/cpufreq/acpi-cpufreq.c
39001@@ -676,8 +676,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39002 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39003 per_cpu(acfreq_data, cpu) = data;
39004
39005- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39006- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39007+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39008+ pax_open_kernel();
39009+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39010+ pax_close_kernel();
39011+ }
39012
39013 result = acpi_processor_register_performance(data->acpi_data, cpu);
39014 if (result)
39015@@ -810,7 +813,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39016 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39017 break;
39018 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39019- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39020+ pax_open_kernel();
39021+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39022+ pax_close_kernel();
39023 break;
39024 default:
39025 break;
39026@@ -904,8 +909,10 @@ static void __init acpi_cpufreq_boost_init(void)
39027 if (!msrs)
39028 return;
39029
39030- acpi_cpufreq_driver.boost_supported = true;
39031- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39032+ pax_open_kernel();
39033+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39034+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39035+ pax_close_kernel();
39036
39037 cpu_notifier_register_begin();
39038
39039diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39040index 558224c..55e3b57 100644
39041--- a/drivers/cpufreq/cpufreq.c
39042+++ b/drivers/cpufreq/cpufreq.c
39043@@ -2022,7 +2022,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39044 }
39045
39046 mutex_lock(&cpufreq_governor_mutex);
39047- list_del(&governor->governor_list);
39048+ pax_list_del(&governor->governor_list);
39049 mutex_unlock(&cpufreq_governor_mutex);
39050 return;
39051 }
39052@@ -2238,7 +2238,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39053 return NOTIFY_OK;
39054 }
39055
39056-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39057+static struct notifier_block cpufreq_cpu_notifier = {
39058 .notifier_call = cpufreq_cpu_callback,
39059 };
39060
39061@@ -2278,13 +2278,17 @@ int cpufreq_boost_trigger_state(int state)
39062 return 0;
39063
39064 write_lock_irqsave(&cpufreq_driver_lock, flags);
39065- cpufreq_driver->boost_enabled = state;
39066+ pax_open_kernel();
39067+ *(bool *)&cpufreq_driver->boost_enabled = state;
39068+ pax_close_kernel();
39069 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39070
39071 ret = cpufreq_driver->set_boost(state);
39072 if (ret) {
39073 write_lock_irqsave(&cpufreq_driver_lock, flags);
39074- cpufreq_driver->boost_enabled = !state;
39075+ pax_open_kernel();
39076+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39077+ pax_close_kernel();
39078 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39079
39080 pr_err("%s: Cannot %s BOOST\n",
39081@@ -2340,8 +2344,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39082
39083 pr_debug("trying to register driver %s\n", driver_data->name);
39084
39085- if (driver_data->setpolicy)
39086- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39087+ if (driver_data->setpolicy) {
39088+ pax_open_kernel();
39089+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39090+ pax_close_kernel();
39091+ }
39092
39093 write_lock_irqsave(&cpufreq_driver_lock, flags);
39094 if (cpufreq_driver) {
39095@@ -2356,8 +2363,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39096 * Check if driver provides function to enable boost -
39097 * if not, use cpufreq_boost_set_sw as default
39098 */
39099- if (!cpufreq_driver->set_boost)
39100- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39101+ if (!cpufreq_driver->set_boost) {
39102+ pax_open_kernel();
39103+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39104+ pax_close_kernel();
39105+ }
39106
39107 ret = cpufreq_sysfs_create_file(&boost.attr);
39108 if (ret) {
39109diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39110index e1c6433..31203ae 100644
39111--- a/drivers/cpufreq/cpufreq_governor.c
39112+++ b/drivers/cpufreq/cpufreq_governor.c
39113@@ -191,7 +191,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39114 struct dbs_data *dbs_data;
39115 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39116 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39117- struct od_ops *od_ops = NULL;
39118+ const struct od_ops *od_ops = NULL;
39119 struct od_dbs_tuners *od_tuners = NULL;
39120 struct cs_dbs_tuners *cs_tuners = NULL;
39121 struct cpu_dbs_common_info *cpu_cdbs;
39122@@ -257,7 +257,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39123
39124 if ((cdata->governor == GOV_CONSERVATIVE) &&
39125 (!policy->governor->initialized)) {
39126- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39127+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39128
39129 cpufreq_register_notifier(cs_ops->notifier_block,
39130 CPUFREQ_TRANSITION_NOTIFIER);
39131@@ -277,7 +277,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39132
39133 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39134 (policy->governor->initialized == 1)) {
39135- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39136+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39137
39138 cpufreq_unregister_notifier(cs_ops->notifier_block,
39139 CPUFREQ_TRANSITION_NOTIFIER);
39140diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39141index bfb9ae1..e1d3a7e 100644
39142--- a/drivers/cpufreq/cpufreq_governor.h
39143+++ b/drivers/cpufreq/cpufreq_governor.h
39144@@ -205,7 +205,7 @@ struct common_dbs_data {
39145 void (*exit)(struct dbs_data *dbs_data);
39146
39147 /* Governor specific ops, see below */
39148- void *gov_ops;
39149+ const void *gov_ops;
39150 };
39151
39152 /* Governor Per policy data */
39153@@ -225,7 +225,7 @@ struct od_ops {
39154 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39155 unsigned int freq_next, unsigned int relation);
39156 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39157-};
39158+} __no_const;
39159
39160 struct cs_ops {
39161 struct notifier_block *notifier_block;
39162diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39163index 18d4091..434be15 100644
39164--- a/drivers/cpufreq/cpufreq_ondemand.c
39165+++ b/drivers/cpufreq/cpufreq_ondemand.c
39166@@ -521,7 +521,7 @@ static void od_exit(struct dbs_data *dbs_data)
39167
39168 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39169
39170-static struct od_ops od_ops = {
39171+static struct od_ops od_ops __read_only = {
39172 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39173 .powersave_bias_target = generic_powersave_bias_target,
39174 .freq_increase = dbs_freq_increase,
39175@@ -576,14 +576,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39176 (struct cpufreq_policy *, unsigned int, unsigned int),
39177 unsigned int powersave_bias)
39178 {
39179- od_ops.powersave_bias_target = f;
39180+ pax_open_kernel();
39181+ *(void **)&od_ops.powersave_bias_target = f;
39182+ pax_close_kernel();
39183 od_set_powersave_bias(powersave_bias);
39184 }
39185 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39186
39187 void od_unregister_powersave_bias_handler(void)
39188 {
39189- od_ops.powersave_bias_target = generic_powersave_bias_target;
39190+ pax_open_kernel();
39191+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39192+ pax_close_kernel();
39193 od_set_powersave_bias(0);
39194 }
39195 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39196diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39197index db2e45b..72c7d37 100644
39198--- a/drivers/cpufreq/intel_pstate.c
39199+++ b/drivers/cpufreq/intel_pstate.c
39200@@ -125,10 +125,10 @@ struct pstate_funcs {
39201 struct cpu_defaults {
39202 struct pstate_adjust_policy pid_policy;
39203 struct pstate_funcs funcs;
39204-};
39205+} __do_const;
39206
39207 static struct pstate_adjust_policy pid_params;
39208-static struct pstate_funcs pstate_funcs;
39209+static struct pstate_funcs *pstate_funcs;
39210
39211 struct perf_limits {
39212 int no_turbo;
39213@@ -529,7 +529,7 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39214
39215 cpu->pstate.current_pstate = pstate;
39216
39217- pstate_funcs.set(cpu, pstate);
39218+ pstate_funcs->set(cpu, pstate);
39219 }
39220
39221 static inline void intel_pstate_pstate_increase(struct cpudata *cpu, int steps)
39222@@ -551,12 +551,12 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39223 {
39224 sprintf(cpu->name, "Intel 2nd generation core");
39225
39226- cpu->pstate.min_pstate = pstate_funcs.get_min();
39227- cpu->pstate.max_pstate = pstate_funcs.get_max();
39228- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39229+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39230+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39231+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39232
39233- if (pstate_funcs.get_vid)
39234- pstate_funcs.get_vid(cpu);
39235+ if (pstate_funcs->get_vid)
39236+ pstate_funcs->get_vid(cpu);
39237 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39238 }
39239
39240@@ -841,9 +841,9 @@ static int intel_pstate_msrs_not_valid(void)
39241 rdmsrl(MSR_IA32_APERF, aperf);
39242 rdmsrl(MSR_IA32_MPERF, mperf);
39243
39244- if (!pstate_funcs.get_max() ||
39245- !pstate_funcs.get_min() ||
39246- !pstate_funcs.get_turbo())
39247+ if (!pstate_funcs->get_max() ||
39248+ !pstate_funcs->get_min() ||
39249+ !pstate_funcs->get_turbo())
39250 return -ENODEV;
39251
39252 rdmsrl(MSR_IA32_APERF, tmp);
39253@@ -857,7 +857,7 @@ static int intel_pstate_msrs_not_valid(void)
39254 return 0;
39255 }
39256
39257-static void copy_pid_params(struct pstate_adjust_policy *policy)
39258+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39259 {
39260 pid_params.sample_rate_ms = policy->sample_rate_ms;
39261 pid_params.p_gain_pct = policy->p_gain_pct;
39262@@ -869,11 +869,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39263
39264 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39265 {
39266- pstate_funcs.get_max = funcs->get_max;
39267- pstate_funcs.get_min = funcs->get_min;
39268- pstate_funcs.get_turbo = funcs->get_turbo;
39269- pstate_funcs.set = funcs->set;
39270- pstate_funcs.get_vid = funcs->get_vid;
39271+ pstate_funcs = funcs;
39272 }
39273
39274 #if IS_ENABLED(CONFIG_ACPI)
39275diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39276index 529cfd9..0e28fff 100644
39277--- a/drivers/cpufreq/p4-clockmod.c
39278+++ b/drivers/cpufreq/p4-clockmod.c
39279@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39280 case 0x0F: /* Core Duo */
39281 case 0x16: /* Celeron Core */
39282 case 0x1C: /* Atom */
39283- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39284+ pax_open_kernel();
39285+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39286+ pax_close_kernel();
39287 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39288 case 0x0D: /* Pentium M (Dothan) */
39289- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39290+ pax_open_kernel();
39291+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39292+ pax_close_kernel();
39293 /* fall through */
39294 case 0x09: /* Pentium M (Banias) */
39295 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39296@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39297
39298 /* on P-4s, the TSC runs with constant frequency independent whether
39299 * throttling is active or not. */
39300- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39301+ pax_open_kernel();
39302+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39303+ pax_close_kernel();
39304
39305 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39306 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39307diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39308index 9bb42ba..b01b4a2 100644
39309--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39310+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39311@@ -18,14 +18,12 @@
39312 #include <asm/head.h>
39313 #include <asm/timer.h>
39314
39315-static struct cpufreq_driver *cpufreq_us3_driver;
39316-
39317 struct us3_freq_percpu_info {
39318 struct cpufreq_frequency_table table[4];
39319 };
39320
39321 /* Indexed by cpu number. */
39322-static struct us3_freq_percpu_info *us3_freq_table;
39323+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39324
39325 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39326 * in the Safari config register.
39327@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39328
39329 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39330 {
39331- if (cpufreq_us3_driver)
39332- us3_freq_target(policy, 0);
39333+ us3_freq_target(policy, 0);
39334
39335 return 0;
39336 }
39337
39338+static int __init us3_freq_init(void);
39339+static void __exit us3_freq_exit(void);
39340+
39341+static struct cpufreq_driver cpufreq_us3_driver = {
39342+ .init = us3_freq_cpu_init,
39343+ .verify = cpufreq_generic_frequency_table_verify,
39344+ .target_index = us3_freq_target,
39345+ .get = us3_freq_get,
39346+ .exit = us3_freq_cpu_exit,
39347+ .name = "UltraSPARC-III",
39348+
39349+};
39350+
39351 static int __init us3_freq_init(void)
39352 {
39353 unsigned long manuf, impl, ver;
39354- int ret;
39355
39356 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39357 return -ENODEV;
39358@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39359 (impl == CHEETAH_IMPL ||
39360 impl == CHEETAH_PLUS_IMPL ||
39361 impl == JAGUAR_IMPL ||
39362- impl == PANTHER_IMPL)) {
39363- struct cpufreq_driver *driver;
39364-
39365- ret = -ENOMEM;
39366- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39367- if (!driver)
39368- goto err_out;
39369-
39370- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39371- GFP_KERNEL);
39372- if (!us3_freq_table)
39373- goto err_out;
39374-
39375- driver->init = us3_freq_cpu_init;
39376- driver->verify = cpufreq_generic_frequency_table_verify;
39377- driver->target_index = us3_freq_target;
39378- driver->get = us3_freq_get;
39379- driver->exit = us3_freq_cpu_exit;
39380- strcpy(driver->name, "UltraSPARC-III");
39381-
39382- cpufreq_us3_driver = driver;
39383- ret = cpufreq_register_driver(driver);
39384- if (ret)
39385- goto err_out;
39386-
39387- return 0;
39388-
39389-err_out:
39390- if (driver) {
39391- kfree(driver);
39392- cpufreq_us3_driver = NULL;
39393- }
39394- kfree(us3_freq_table);
39395- us3_freq_table = NULL;
39396- return ret;
39397- }
39398+ impl == PANTHER_IMPL))
39399+ return cpufreq_register_driver(&cpufreq_us3_driver);
39400
39401 return -ENODEV;
39402 }
39403
39404 static void __exit us3_freq_exit(void)
39405 {
39406- if (cpufreq_us3_driver) {
39407- cpufreq_unregister_driver(cpufreq_us3_driver);
39408- kfree(cpufreq_us3_driver);
39409- cpufreq_us3_driver = NULL;
39410- kfree(us3_freq_table);
39411- us3_freq_table = NULL;
39412- }
39413+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39414 }
39415
39416 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39417diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39418index 6723f03..3465190 100644
39419--- a/drivers/cpufreq/speedstep-centrino.c
39420+++ b/drivers/cpufreq/speedstep-centrino.c
39421@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39422 !cpu_has(cpu, X86_FEATURE_EST))
39423 return -ENODEV;
39424
39425- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39426- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39427+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39428+ pax_open_kernel();
39429+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39430+ pax_close_kernel();
39431+ }
39432
39433 if (policy->cpu != 0)
39434 return -ENODEV;
39435diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39436index 136d6a2..06e373d 100644
39437--- a/drivers/cpuidle/driver.c
39438+++ b/drivers/cpuidle/driver.c
39439@@ -202,7 +202,7 @@ static int poll_idle(struct cpuidle_device *dev,
39440
39441 static void poll_idle_init(struct cpuidle_driver *drv)
39442 {
39443- struct cpuidle_state *state = &drv->states[0];
39444+ cpuidle_state_no_const *state = &drv->states[0];
39445
39446 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39447 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39448diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39449index ca89412..a7b9c49 100644
39450--- a/drivers/cpuidle/governor.c
39451+++ b/drivers/cpuidle/governor.c
39452@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39453 mutex_lock(&cpuidle_lock);
39454 if (__cpuidle_find_governor(gov->name) == NULL) {
39455 ret = 0;
39456- list_add_tail(&gov->governor_list, &cpuidle_governors);
39457+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39458 if (!cpuidle_curr_governor ||
39459 cpuidle_curr_governor->rating < gov->rating)
39460 cpuidle_switch_governor(gov);
39461diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39462index efe2f17..b8124f9 100644
39463--- a/drivers/cpuidle/sysfs.c
39464+++ b/drivers/cpuidle/sysfs.c
39465@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39466 NULL
39467 };
39468
39469-static struct attribute_group cpuidle_attr_group = {
39470+static attribute_group_no_const cpuidle_attr_group = {
39471 .attrs = cpuidle_default_attrs,
39472 .name = "cpuidle",
39473 };
39474diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39475index 12fea3e..1e28f47 100644
39476--- a/drivers/crypto/hifn_795x.c
39477+++ b/drivers/crypto/hifn_795x.c
39478@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39479 MODULE_PARM_DESC(hifn_pll_ref,
39480 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39481
39482-static atomic_t hifn_dev_number;
39483+static atomic_unchecked_t hifn_dev_number;
39484
39485 #define ACRYPTO_OP_DECRYPT 0
39486 #define ACRYPTO_OP_ENCRYPT 1
39487@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39488 goto err_out_disable_pci_device;
39489
39490 snprintf(name, sizeof(name), "hifn%d",
39491- atomic_inc_return(&hifn_dev_number)-1);
39492+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39493
39494 err = pci_request_regions(pdev, name);
39495 if (err)
39496diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39497index 2042ec3..a9ce67f 100644
39498--- a/drivers/devfreq/devfreq.c
39499+++ b/drivers/devfreq/devfreq.c
39500@@ -616,7 +616,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39501 goto err_out;
39502 }
39503
39504- list_add(&governor->node, &devfreq_governor_list);
39505+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39506
39507 list_for_each_entry(devfreq, &devfreq_list, node) {
39508 int ret = 0;
39509@@ -704,7 +704,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39510 }
39511 }
39512
39513- list_del(&governor->node);
39514+ pax_list_del((struct list_head *)&governor->node);
39515 err_out:
39516 mutex_unlock(&devfreq_list_lock);
39517
39518diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39519index 5239677..1cb71a8 100644
39520--- a/drivers/dma/sh/shdma-base.c
39521+++ b/drivers/dma/sh/shdma-base.c
39522@@ -267,8 +267,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39523 schan->slave_id = -EINVAL;
39524 }
39525
39526- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39527- sdev->desc_size, GFP_KERNEL);
39528+ schan->desc = kcalloc(sdev->desc_size,
39529+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39530 if (!schan->desc) {
39531 ret = -ENOMEM;
39532 goto edescalloc;
39533diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39534index dda7e75..0a4c867 100644
39535--- a/drivers/dma/sh/shdmac.c
39536+++ b/drivers/dma/sh/shdmac.c
39537@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39538 return ret;
39539 }
39540
39541-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39542+static struct notifier_block sh_dmae_nmi_notifier = {
39543 .notifier_call = sh_dmae_nmi_handler,
39544
39545 /* Run before NMI debug handler and KGDB */
39546diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39547index 592af5f..bb1d583 100644
39548--- a/drivers/edac/edac_device.c
39549+++ b/drivers/edac/edac_device.c
39550@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39551 */
39552 int edac_device_alloc_index(void)
39553 {
39554- static atomic_t device_indexes = ATOMIC_INIT(0);
39555+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39556
39557- return atomic_inc_return(&device_indexes) - 1;
39558+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39559 }
39560 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39561
39562diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39563index 01fae82..1dd8289 100644
39564--- a/drivers/edac/edac_mc_sysfs.c
39565+++ b/drivers/edac/edac_mc_sysfs.c
39566@@ -152,7 +152,7 @@ static const char * const edac_caps[] = {
39567 struct dev_ch_attribute {
39568 struct device_attribute attr;
39569 int channel;
39570-};
39571+} __do_const;
39572
39573 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39574 struct dev_ch_attribute dev_attr_legacy_##_name = \
39575@@ -1009,14 +1009,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39576 }
39577
39578 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39579+ pax_open_kernel();
39580 if (mci->get_sdram_scrub_rate) {
39581- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39582- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39583+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39584+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39585 }
39586 if (mci->set_sdram_scrub_rate) {
39587- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39588- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39589+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39590+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39591 }
39592+ pax_close_kernel();
39593 err = device_create_file(&mci->dev,
39594 &dev_attr_sdram_scrub_rate);
39595 if (err) {
39596diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39597index 2cf44b4d..6dd2dc7 100644
39598--- a/drivers/edac/edac_pci.c
39599+++ b/drivers/edac/edac_pci.c
39600@@ -29,7 +29,7 @@
39601
39602 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39603 static LIST_HEAD(edac_pci_list);
39604-static atomic_t pci_indexes = ATOMIC_INIT(0);
39605+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39606
39607 /*
39608 * edac_pci_alloc_ctl_info
39609@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39610 */
39611 int edac_pci_alloc_index(void)
39612 {
39613- return atomic_inc_return(&pci_indexes) - 1;
39614+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
39615 }
39616 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39617
39618diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39619index e8658e4..22746d6 100644
39620--- a/drivers/edac/edac_pci_sysfs.c
39621+++ b/drivers/edac/edac_pci_sysfs.c
39622@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39623 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39624 static int edac_pci_poll_msec = 1000; /* one second workq period */
39625
39626-static atomic_t pci_parity_count = ATOMIC_INIT(0);
39627-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39628+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39629+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39630
39631 static struct kobject *edac_pci_top_main_kobj;
39632 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39633@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39634 void *value;
39635 ssize_t(*show) (void *, char *);
39636 ssize_t(*store) (void *, const char *, size_t);
39637-};
39638+} __do_const;
39639
39640 /* Set of show/store abstract level functions for PCI Parity object */
39641 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39642@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39643 edac_printk(KERN_CRIT, EDAC_PCI,
39644 "Signaled System Error on %s\n",
39645 pci_name(dev));
39646- atomic_inc(&pci_nonparity_count);
39647+ atomic_inc_unchecked(&pci_nonparity_count);
39648 }
39649
39650 if (status & (PCI_STATUS_PARITY)) {
39651@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39652 "Master Data Parity Error on %s\n",
39653 pci_name(dev));
39654
39655- atomic_inc(&pci_parity_count);
39656+ atomic_inc_unchecked(&pci_parity_count);
39657 }
39658
39659 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39660@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39661 "Detected Parity Error on %s\n",
39662 pci_name(dev));
39663
39664- atomic_inc(&pci_parity_count);
39665+ atomic_inc_unchecked(&pci_parity_count);
39666 }
39667 }
39668
39669@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39670 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39671 "Signaled System Error on %s\n",
39672 pci_name(dev));
39673- atomic_inc(&pci_nonparity_count);
39674+ atomic_inc_unchecked(&pci_nonparity_count);
39675 }
39676
39677 if (status & (PCI_STATUS_PARITY)) {
39678@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39679 "Master Data Parity Error on "
39680 "%s\n", pci_name(dev));
39681
39682- atomic_inc(&pci_parity_count);
39683+ atomic_inc_unchecked(&pci_parity_count);
39684 }
39685
39686 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39687@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39688 "Detected Parity Error on %s\n",
39689 pci_name(dev));
39690
39691- atomic_inc(&pci_parity_count);
39692+ atomic_inc_unchecked(&pci_parity_count);
39693 }
39694 }
39695 }
39696@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39697 if (!check_pci_errors)
39698 return;
39699
39700- before_count = atomic_read(&pci_parity_count);
39701+ before_count = atomic_read_unchecked(&pci_parity_count);
39702
39703 /* scan all PCI devices looking for a Parity Error on devices and
39704 * bridges.
39705@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39706 /* Only if operator has selected panic on PCI Error */
39707 if (edac_pci_get_panic_on_pe()) {
39708 /* If the count is different 'after' from 'before' */
39709- if (before_count != atomic_read(&pci_parity_count))
39710+ if (before_count != atomic_read_unchecked(&pci_parity_count))
39711 panic("EDAC: PCI Parity Error");
39712 }
39713 }
39714diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39715index 51b7e3a..aa8a3e8 100644
39716--- a/drivers/edac/mce_amd.h
39717+++ b/drivers/edac/mce_amd.h
39718@@ -77,7 +77,7 @@ struct amd_decoder_ops {
39719 bool (*mc0_mce)(u16, u8);
39720 bool (*mc1_mce)(u16, u8);
39721 bool (*mc2_mce)(u16, u8);
39722-};
39723+} __no_const;
39724
39725 void amd_report_gart_errors(bool);
39726 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39727diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39728index 57ea7f4..af06b76 100644
39729--- a/drivers/firewire/core-card.c
39730+++ b/drivers/firewire/core-card.c
39731@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39732 const struct fw_card_driver *driver,
39733 struct device *device)
39734 {
39735- static atomic_t index = ATOMIC_INIT(-1);
39736+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
39737
39738- card->index = atomic_inc_return(&index);
39739+ card->index = atomic_inc_return_unchecked(&index);
39740 card->driver = driver;
39741 card->device = device;
39742 card->current_tlabel = 0;
39743@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39744
39745 void fw_core_remove_card(struct fw_card *card)
39746 {
39747- struct fw_card_driver dummy_driver = dummy_driver_template;
39748+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
39749
39750 card->driver->update_phy_reg(card, 4,
39751 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39752diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39753index 2c6d5e1..a2cca6b 100644
39754--- a/drivers/firewire/core-device.c
39755+++ b/drivers/firewire/core-device.c
39756@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39757 struct config_rom_attribute {
39758 struct device_attribute attr;
39759 u32 key;
39760-};
39761+} __do_const;
39762
39763 static ssize_t show_immediate(struct device *dev,
39764 struct device_attribute *dattr, char *buf)
39765diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39766index eb6935c..3cc2bfa 100644
39767--- a/drivers/firewire/core-transaction.c
39768+++ b/drivers/firewire/core-transaction.c
39769@@ -38,6 +38,7 @@
39770 #include <linux/timer.h>
39771 #include <linux/types.h>
39772 #include <linux/workqueue.h>
39773+#include <linux/sched.h>
39774
39775 #include <asm/byteorder.h>
39776
39777diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39778index f477308..2795f24 100644
39779--- a/drivers/firewire/core.h
39780+++ b/drivers/firewire/core.h
39781@@ -111,6 +111,7 @@ struct fw_card_driver {
39782
39783 int (*stop_iso)(struct fw_iso_context *ctx);
39784 };
39785+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39786
39787 void fw_card_initialize(struct fw_card *card,
39788 const struct fw_card_driver *driver, struct device *device);
39789diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39790index 586f2f7..3545ad2 100644
39791--- a/drivers/firewire/ohci.c
39792+++ b/drivers/firewire/ohci.c
39793@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
39794 be32_to_cpu(ohci->next_header));
39795 }
39796
39797+#ifndef CONFIG_GRKERNSEC
39798 if (param_remote_dma) {
39799 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39800 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39801 }
39802+#endif
39803
39804 spin_unlock_irq(&ohci->lock);
39805
39806@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39807 unsigned long flags;
39808 int n, ret = 0;
39809
39810+#ifndef CONFIG_GRKERNSEC
39811 if (param_remote_dma)
39812 return 0;
39813+#endif
39814
39815 /*
39816 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39817diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39818index 94a58a0..f5eba42 100644
39819--- a/drivers/firmware/dmi-id.c
39820+++ b/drivers/firmware/dmi-id.c
39821@@ -16,7 +16,7 @@
39822 struct dmi_device_attribute{
39823 struct device_attribute dev_attr;
39824 int field;
39825-};
39826+} __do_const;
39827 #define to_dmi_dev_attr(_dev_attr) \
39828 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
39829
39830diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
39831index 17afc51..0ef90cd 100644
39832--- a/drivers/firmware/dmi_scan.c
39833+++ b/drivers/firmware/dmi_scan.c
39834@@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
39835 if (buf == NULL)
39836 return -1;
39837
39838- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
39839+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
39840
39841 dmi_unmap(buf);
39842 return 0;
39843diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
39844index 1491dd4..aa910db 100644
39845--- a/drivers/firmware/efi/cper.c
39846+++ b/drivers/firmware/efi/cper.c
39847@@ -41,12 +41,12 @@
39848 */
39849 u64 cper_next_record_id(void)
39850 {
39851- static atomic64_t seq;
39852+ static atomic64_unchecked_t seq;
39853
39854- if (!atomic64_read(&seq))
39855- atomic64_set(&seq, ((u64)get_seconds()) << 32);
39856+ if (!atomic64_read_unchecked(&seq))
39857+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
39858
39859- return atomic64_inc_return(&seq);
39860+ return atomic64_inc_return_unchecked(&seq);
39861 }
39862 EXPORT_SYMBOL_GPL(cper_next_record_id);
39863
39864diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
39865index af20f17..4e4e545 100644
39866--- a/drivers/firmware/efi/efi.c
39867+++ b/drivers/firmware/efi/efi.c
39868@@ -120,14 +120,16 @@ static struct attribute_group efi_subsys_attr_group = {
39869 };
39870
39871 static struct efivars generic_efivars;
39872-static struct efivar_operations generic_ops;
39873+static efivar_operations_no_const generic_ops __read_only;
39874
39875 static int generic_ops_register(void)
39876 {
39877- generic_ops.get_variable = efi.get_variable;
39878- generic_ops.set_variable = efi.set_variable;
39879- generic_ops.get_next_variable = efi.get_next_variable;
39880- generic_ops.query_variable_store = efi_query_variable_store;
39881+ pax_open_kernel();
39882+ *(void **)&generic_ops.get_variable = efi.get_variable;
39883+ *(void **)&generic_ops.set_variable = efi.set_variable;
39884+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
39885+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
39886+ pax_close_kernel();
39887
39888 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
39889 }
39890diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
39891index 50ea412..caccd6e9 100644
39892--- a/drivers/firmware/efi/efivars.c
39893+++ b/drivers/firmware/efi/efivars.c
39894@@ -456,7 +456,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
39895 static int
39896 create_efivars_bin_attributes(void)
39897 {
39898- struct bin_attribute *attr;
39899+ bin_attribute_no_const *attr;
39900 int error;
39901
39902 /* new_var */
39903diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
39904index 2f569aa..c95f4fb 100644
39905--- a/drivers/firmware/google/memconsole.c
39906+++ b/drivers/firmware/google/memconsole.c
39907@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
39908 if (!found_memconsole())
39909 return -ENODEV;
39910
39911- memconsole_bin_attr.size = memconsole_length;
39912+ pax_open_kernel();
39913+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
39914+ pax_close_kernel();
39915+
39916 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
39917 }
39918
39919diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
39920index 8765bd6..2e5b147 100644
39921--- a/drivers/gpio/gpio-em.c
39922+++ b/drivers/gpio/gpio-em.c
39923@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
39924 struct em_gio_priv *p;
39925 struct resource *io[2], *irq[2];
39926 struct gpio_chip *gpio_chip;
39927- struct irq_chip *irq_chip;
39928+ irq_chip_no_const *irq_chip;
39929 const char *name = dev_name(&pdev->dev);
39930 int ret;
39931
39932diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
39933index 7030422..42a3fe9 100644
39934--- a/drivers/gpio/gpio-ich.c
39935+++ b/drivers/gpio/gpio-ich.c
39936@@ -94,7 +94,7 @@ struct ichx_desc {
39937 * this option allows driver caching written output values
39938 */
39939 bool use_outlvl_cache;
39940-};
39941+} __do_const;
39942
39943 static struct {
39944 spinlock_t lock;
39945diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
39946index 03c9148..c66e753 100644
39947--- a/drivers/gpio/gpio-rcar.c
39948+++ b/drivers/gpio/gpio-rcar.c
39949@@ -355,7 +355,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
39950 struct gpio_rcar_priv *p;
39951 struct resource *io, *irq;
39952 struct gpio_chip *gpio_chip;
39953- struct irq_chip *irq_chip;
39954+ irq_chip_no_const *irq_chip;
39955 struct device *dev = &pdev->dev;
39956 const char *name = dev_name(dev);
39957 int ret;
39958diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
39959index 66cbcc1..0c5e622 100644
39960--- a/drivers/gpio/gpio-vr41xx.c
39961+++ b/drivers/gpio/gpio-vr41xx.c
39962@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
39963 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
39964 maskl, pendl, maskh, pendh);
39965
39966- atomic_inc(&irq_err_count);
39967+ atomic_inc_unchecked(&irq_err_count);
39968
39969 return -EINVAL;
39970 }
39971diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
39972index d8b7099..8a314a5 100644
39973--- a/drivers/gpu/drm/drm_crtc.c
39974+++ b/drivers/gpu/drm/drm_crtc.c
39975@@ -3500,7 +3500,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
39976 goto done;
39977 }
39978
39979- if (copy_to_user(&enum_ptr[copied].name,
39980+ if (copy_to_user(enum_ptr[copied].name,
39981 &prop_enum->name, DRM_PROP_NAME_LEN)) {
39982 ret = -EFAULT;
39983 goto done;
39984diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
39985old mode 100644
39986new mode 100755
39987index 03711d0..9960928a
39988--- a/drivers/gpu/drm/drm_drv.c
39989+++ b/drivers/gpu/drm/drm_drv.c
39990@@ -233,7 +233,7 @@ module_exit(drm_core_exit);
39991 /**
39992 * Copy and IOCTL return string to user space
39993 */
39994-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
39995+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
39996 {
39997 int len;
39998
39999@@ -342,7 +342,7 @@ long drm_ioctl(struct file *filp,
40000 struct drm_file *file_priv = filp->private_data;
40001 struct drm_device *dev;
40002 const struct drm_ioctl_desc *ioctl = NULL;
40003- drm_ioctl_t *func;
40004+ drm_ioctl_no_const_t func;
40005 unsigned int nr = DRM_IOCTL_NR(cmd);
40006 int retcode = -EINVAL;
40007 char stack_kdata[128];
40008@@ -419,8 +419,9 @@ long drm_ioctl(struct file *filp,
40009 retcode = -EFAULT;
40010 goto err_i1;
40011 }
40012- } else
40013+ } else if (cmd & IOC_OUT) {
40014 memset(kdata, 0, usize);
40015+ }
40016
40017 if (ioctl->flags & DRM_UNLOCKED)
40018 retcode = func(dev, kdata, file_priv);
40019diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40020index e1eba0b..98f69f9 100644
40021--- a/drivers/gpu/drm/drm_fops.c
40022+++ b/drivers/gpu/drm/drm_fops.c
40023@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40024 return PTR_ERR(minor);
40025
40026 dev = minor->dev;
40027- if (!dev->open_count++)
40028+ if (local_inc_return(&dev->open_count) == 1)
40029 need_setup = 1;
40030
40031 /* share address_space across all char-devs of a single device */
40032@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40033 return 0;
40034
40035 err_undo:
40036- dev->open_count--;
40037+ local_dec(&dev->open_count);
40038 drm_minor_release(minor);
40039 return retcode;
40040 }
40041@@ -430,7 +430,7 @@ int drm_release(struct inode *inode, struct file *filp)
40042
40043 mutex_lock(&drm_global_mutex);
40044
40045- DRM_DEBUG("open_count = %d\n", dev->open_count);
40046+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40047
40048 if (dev->driver->preclose)
40049 dev->driver->preclose(dev, file_priv);
40050@@ -439,10 +439,10 @@ int drm_release(struct inode *inode, struct file *filp)
40051 * Begin inline drm_release
40052 */
40053
40054- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40055+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40056 task_pid_nr(current),
40057 (long)old_encode_dev(file_priv->minor->kdev->devt),
40058- dev->open_count);
40059+ local_read(&dev->open_count));
40060
40061 /* Release any auth tokens that might point to this file_priv,
40062 (do that under the drm_global_mutex) */
40063@@ -543,7 +543,7 @@ int drm_release(struct inode *inode, struct file *filp)
40064 * End inline drm_release
40065 */
40066
40067- if (!--dev->open_count) {
40068+ if (local_dec_and_test(&dev->open_count)) {
40069 retcode = drm_lastclose(dev);
40070 if (drm_device_is_unplugged(dev))
40071 drm_put_dev(dev);
40072diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40073index 3d2e91c..d31c4c9 100644
40074--- a/drivers/gpu/drm/drm_global.c
40075+++ b/drivers/gpu/drm/drm_global.c
40076@@ -36,7 +36,7 @@
40077 struct drm_global_item {
40078 struct mutex mutex;
40079 void *object;
40080- int refcount;
40081+ atomic_t refcount;
40082 };
40083
40084 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40085@@ -49,7 +49,7 @@ void drm_global_init(void)
40086 struct drm_global_item *item = &glob[i];
40087 mutex_init(&item->mutex);
40088 item->object = NULL;
40089- item->refcount = 0;
40090+ atomic_set(&item->refcount, 0);
40091 }
40092 }
40093
40094@@ -59,7 +59,7 @@ void drm_global_release(void)
40095 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40096 struct drm_global_item *item = &glob[i];
40097 BUG_ON(item->object != NULL);
40098- BUG_ON(item->refcount != 0);
40099+ BUG_ON(atomic_read(&item->refcount) != 0);
40100 }
40101 }
40102
40103@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40104 struct drm_global_item *item = &glob[ref->global_type];
40105
40106 mutex_lock(&item->mutex);
40107- if (item->refcount == 0) {
40108+ if (atomic_read(&item->refcount) == 0) {
40109 item->object = kzalloc(ref->size, GFP_KERNEL);
40110 if (unlikely(item->object == NULL)) {
40111 ret = -ENOMEM;
40112@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40113 goto out_err;
40114
40115 }
40116- ++item->refcount;
40117+ atomic_inc(&item->refcount);
40118 ref->object = item->object;
40119 mutex_unlock(&item->mutex);
40120 return 0;
40121@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40122 struct drm_global_item *item = &glob[ref->global_type];
40123
40124 mutex_lock(&item->mutex);
40125- BUG_ON(item->refcount == 0);
40126+ BUG_ON(atomic_read(&item->refcount) == 0);
40127 BUG_ON(ref->object != item->object);
40128- if (--item->refcount == 0) {
40129+ if (atomic_dec_and_test(&item->refcount)) {
40130 ref->release(ref);
40131 item->object = NULL;
40132 }
40133diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40134index 7473035..a48b9c5 100644
40135--- a/drivers/gpu/drm/drm_info.c
40136+++ b/drivers/gpu/drm/drm_info.c
40137@@ -75,10 +75,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40138 struct drm_local_map *map;
40139 struct drm_map_list *r_list;
40140
40141- /* Hardcoded from _DRM_FRAME_BUFFER,
40142- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40143- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40144- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40145+ static const char * const types[] = {
40146+ [_DRM_FRAME_BUFFER] = "FB",
40147+ [_DRM_REGISTERS] = "REG",
40148+ [_DRM_SHM] = "SHM",
40149+ [_DRM_AGP] = "AGP",
40150+ [_DRM_SCATTER_GATHER] = "SG",
40151+ [_DRM_CONSISTENT] = "PCI"};
40152 const char *type;
40153 int i;
40154
40155@@ -89,7 +92,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40156 map = r_list->map;
40157 if (!map)
40158 continue;
40159- if (map->type < 0 || map->type > 5)
40160+ if (map->type >= ARRAY_SIZE(types))
40161 type = "??";
40162 else
40163 type = types[map->type];
40164@@ -261,7 +264,11 @@ int drm_vma_info(struct seq_file *m, void *data)
40165 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
40166 vma->vm_flags & VM_LOCKED ? 'l' : '-',
40167 vma->vm_flags & VM_IO ? 'i' : '-',
40168+#ifdef CONFIG_GRKERNSEC_HIDESYM
40169+ 0);
40170+#else
40171 vma->vm_pgoff);
40172+#endif
40173
40174 #if defined(__i386__)
40175 pgprot = pgprot_val(vma->vm_page_prot);
40176diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40177index 2f4c4343..dd12cd2 100644
40178--- a/drivers/gpu/drm/drm_ioc32.c
40179+++ b/drivers/gpu/drm/drm_ioc32.c
40180@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40181 request = compat_alloc_user_space(nbytes);
40182 if (!access_ok(VERIFY_WRITE, request, nbytes))
40183 return -EFAULT;
40184- list = (struct drm_buf_desc *) (request + 1);
40185+ list = (struct drm_buf_desc __user *) (request + 1);
40186
40187 if (__put_user(count, &request->count)
40188 || __put_user(list, &request->list))
40189@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40190 request = compat_alloc_user_space(nbytes);
40191 if (!access_ok(VERIFY_WRITE, request, nbytes))
40192 return -EFAULT;
40193- list = (struct drm_buf_pub *) (request + 1);
40194+ list = (struct drm_buf_pub __user *) (request + 1);
40195
40196 if (__put_user(count, &request->count)
40197 || __put_user(list, &request->list))
40198@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40199 return 0;
40200 }
40201
40202-drm_ioctl_compat_t *drm_compat_ioctls[] = {
40203+drm_ioctl_compat_t drm_compat_ioctls[] = {
40204 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40205 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40206 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40207@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40208 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40209 {
40210 unsigned int nr = DRM_IOCTL_NR(cmd);
40211- drm_ioctl_compat_t *fn;
40212 int ret;
40213
40214 /* Assume that ioctls without an explicit compat routine will just
40215@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40216 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40217 return drm_ioctl(filp, cmd, arg);
40218
40219- fn = drm_compat_ioctls[nr];
40220-
40221- if (fn != NULL)
40222- ret = (*fn) (filp, cmd, arg);
40223+ if (drm_compat_ioctls[nr] != NULL)
40224+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40225 else
40226 ret = drm_ioctl(filp, cmd, arg);
40227
40228diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
40229index 4c24c3a..c903cab 100644
40230--- a/drivers/gpu/drm/drm_stub.c
40231+++ b/drivers/gpu/drm/drm_stub.c
40232@@ -455,7 +455,7 @@ void drm_unplug_dev(struct drm_device *dev)
40233
40234 drm_device_set_unplugged(dev);
40235
40236- if (dev->open_count == 0) {
40237+ if (local_read(&dev->open_count) == 0) {
40238 drm_put_dev(dev);
40239 }
40240 mutex_unlock(&drm_global_mutex);
40241diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
40242index c22c309..ae758c3 100644
40243--- a/drivers/gpu/drm/drm_sysfs.c
40244+++ b/drivers/gpu/drm/drm_sysfs.c
40245@@ -505,7 +505,7 @@ static void drm_sysfs_release(struct device *dev)
40246 */
40247 int drm_sysfs_device_add(struct drm_minor *minor)
40248 {
40249- char *minor_str;
40250+ const char *minor_str;
40251 int r;
40252
40253 if (minor->type == DRM_MINOR_CONTROL)
40254diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40255index d4d16ed..8fb0b51 100644
40256--- a/drivers/gpu/drm/i810/i810_drv.h
40257+++ b/drivers/gpu/drm/i810/i810_drv.h
40258@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
40259 int page_flipping;
40260
40261 wait_queue_head_t irq_queue;
40262- atomic_t irq_received;
40263- atomic_t irq_emitted;
40264+ atomic_unchecked_t irq_received;
40265+ atomic_unchecked_t irq_emitted;
40266
40267 int front_offset;
40268 } drm_i810_private_t;
40269diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40270index eedb023..25076a4 100644
40271--- a/drivers/gpu/drm/i915/i915_dma.c
40272+++ b/drivers/gpu/drm/i915/i915_dma.c
40273@@ -1280,7 +1280,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40274 bool can_switch;
40275
40276 spin_lock(&dev->count_lock);
40277- can_switch = (dev->open_count == 0);
40278+ can_switch = (local_read(&dev->open_count) == 0);
40279 spin_unlock(&dev->count_lock);
40280 return can_switch;
40281 }
40282diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40283index 20fef6c..76c78fb 100644
40284--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40285+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40286@@ -886,9 +886,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40287
40288 static int
40289 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
40290- int count)
40291+ unsigned int count)
40292 {
40293- int i;
40294+ unsigned int i;
40295 unsigned relocs_total = 0;
40296 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40297
40298diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40299index 3c59584..500f2e9 100644
40300--- a/drivers/gpu/drm/i915/i915_ioc32.c
40301+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40302@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40303 (unsigned long)request);
40304 }
40305
40306-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40307+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40308 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40309 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40310 [DRM_I915_GETPARAM] = compat_i915_getparam,
40311@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40312 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40313 {
40314 unsigned int nr = DRM_IOCTL_NR(cmd);
40315- drm_ioctl_compat_t *fn = NULL;
40316 int ret;
40317
40318 if (nr < DRM_COMMAND_BASE)
40319 return drm_compat_ioctl(filp, cmd, arg);
40320
40321- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls))
40322- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40323-
40324- if (fn != NULL)
40325+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
40326+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40327 ret = (*fn) (filp, cmd, arg);
40328- else
40329+ } else
40330 ret = drm_ioctl(filp, cmd, arg);
40331
40332 return ret;
40333diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40334index 5b60e25..eac1625 100644
40335--- a/drivers/gpu/drm/i915/intel_display.c
40336+++ b/drivers/gpu/drm/i915/intel_display.c
40337@@ -11171,13 +11171,13 @@ struct intel_quirk {
40338 int subsystem_vendor;
40339 int subsystem_device;
40340 void (*hook)(struct drm_device *dev);
40341-};
40342+} __do_const;
40343
40344 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40345 struct intel_dmi_quirk {
40346 void (*hook)(struct drm_device *dev);
40347 const struct dmi_system_id (*dmi_id_list)[];
40348-};
40349+} __do_const;
40350
40351 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40352 {
40353@@ -11185,18 +11185,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40354 return 1;
40355 }
40356
40357-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40358+static const struct dmi_system_id intel_dmi_quirks_table[] = {
40359 {
40360- .dmi_id_list = &(const struct dmi_system_id[]) {
40361- {
40362- .callback = intel_dmi_reverse_brightness,
40363- .ident = "NCR Corporation",
40364- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40365- DMI_MATCH(DMI_PRODUCT_NAME, ""),
40366- },
40367- },
40368- { } /* terminating entry */
40369+ .callback = intel_dmi_reverse_brightness,
40370+ .ident = "NCR Corporation",
40371+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40372+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
40373 },
40374+ },
40375+ { } /* terminating entry */
40376+};
40377+
40378+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40379+ {
40380+ .dmi_id_list = &intel_dmi_quirks_table,
40381 .hook = quirk_invert_brightness,
40382 },
40383 };
40384diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40385index fe45321..836fdca 100644
40386--- a/drivers/gpu/drm/mga/mga_drv.h
40387+++ b/drivers/gpu/drm/mga/mga_drv.h
40388@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
40389 u32 clear_cmd;
40390 u32 maccess;
40391
40392- atomic_t vbl_received; /**< Number of vblanks received. */
40393+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40394 wait_queue_head_t fence_queue;
40395- atomic_t last_fence_retired;
40396+ atomic_unchecked_t last_fence_retired;
40397 u32 next_fence_to_post;
40398
40399 unsigned int fb_cpp;
40400diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40401index 86b4bb8..ae237ad 100644
40402--- a/drivers/gpu/drm/mga/mga_ioc32.c
40403+++ b/drivers/gpu/drm/mga/mga_ioc32.c
40404@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40405 return 0;
40406 }
40407
40408-drm_ioctl_compat_t *mga_compat_ioctls[] = {
40409+drm_ioctl_compat_t mga_compat_ioctls[] = {
40410 [DRM_MGA_INIT] = compat_mga_init,
40411 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40412 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40413@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40414 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40415 {
40416 unsigned int nr = DRM_IOCTL_NR(cmd);
40417- drm_ioctl_compat_t *fn = NULL;
40418 int ret;
40419
40420 if (nr < DRM_COMMAND_BASE)
40421 return drm_compat_ioctl(filp, cmd, arg);
40422
40423- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls))
40424- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40425-
40426- if (fn != NULL)
40427+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
40428+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40429 ret = (*fn) (filp, cmd, arg);
40430- else
40431+ } else
40432 ret = drm_ioctl(filp, cmd, arg);
40433
40434 return ret;
40435diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40436index 1b071b8..de8601a 100644
40437--- a/drivers/gpu/drm/mga/mga_irq.c
40438+++ b/drivers/gpu/drm/mga/mga_irq.c
40439@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40440 if (crtc != 0)
40441 return 0;
40442
40443- return atomic_read(&dev_priv->vbl_received);
40444+ return atomic_read_unchecked(&dev_priv->vbl_received);
40445 }
40446
40447
40448@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40449 /* VBLANK interrupt */
40450 if (status & MGA_VLINEPEN) {
40451 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40452- atomic_inc(&dev_priv->vbl_received);
40453+ atomic_inc_unchecked(&dev_priv->vbl_received);
40454 drm_handle_vblank(dev, 0);
40455 handled = 1;
40456 }
40457@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40458 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40459 MGA_WRITE(MGA_PRIMEND, prim_end);
40460
40461- atomic_inc(&dev_priv->last_fence_retired);
40462+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
40463 wake_up(&dev_priv->fence_queue);
40464 handled = 1;
40465 }
40466@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40467 * using fences.
40468 */
40469 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40470- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40471+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40472 - *sequence) <= (1 << 23)));
40473
40474 *sequence = cur_fence;
40475diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40476index 8268a4c..5105708 100644
40477--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40478+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40479@@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40480 struct bit_table {
40481 const char id;
40482 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40483-};
40484+} __no_const;
40485
40486 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40487
40488diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40489index 7efbafa..19f8087 100644
40490--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40491+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40492@@ -97,7 +97,6 @@ struct nouveau_drm {
40493 struct drm_global_reference mem_global_ref;
40494 struct ttm_bo_global_ref bo_global_ref;
40495 struct ttm_bo_device bdev;
40496- atomic_t validate_sequence;
40497 int (*move)(struct nouveau_channel *,
40498 struct ttm_buffer_object *,
40499 struct ttm_mem_reg *, struct ttm_mem_reg *);
40500diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40501index c1a7e5a..38b8539 100644
40502--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40503+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40504@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40505 unsigned long arg)
40506 {
40507 unsigned int nr = DRM_IOCTL_NR(cmd);
40508- drm_ioctl_compat_t *fn = NULL;
40509+ drm_ioctl_compat_t fn = NULL;
40510 int ret;
40511
40512 if (nr < DRM_COMMAND_BASE)
40513diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40514index ab0228f..20b756b 100644
40515--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40516+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40517@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40518 }
40519
40520 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40521- nouveau_vram_manager_init,
40522- nouveau_vram_manager_fini,
40523- nouveau_vram_manager_new,
40524- nouveau_vram_manager_del,
40525- nouveau_vram_manager_debug
40526+ .init = nouveau_vram_manager_init,
40527+ .takedown = nouveau_vram_manager_fini,
40528+ .get_node = nouveau_vram_manager_new,
40529+ .put_node = nouveau_vram_manager_del,
40530+ .debug = nouveau_vram_manager_debug
40531 };
40532
40533 static int
40534@@ -199,11 +199,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40535 }
40536
40537 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40538- nouveau_gart_manager_init,
40539- nouveau_gart_manager_fini,
40540- nouveau_gart_manager_new,
40541- nouveau_gart_manager_del,
40542- nouveau_gart_manager_debug
40543+ .init = nouveau_gart_manager_init,
40544+ .takedown = nouveau_gart_manager_fini,
40545+ .get_node = nouveau_gart_manager_new,
40546+ .put_node = nouveau_gart_manager_del,
40547+ .debug = nouveau_gart_manager_debug
40548 };
40549
40550 #include <core/subdev/vm/nv04.h>
40551@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40552 }
40553
40554 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40555- nv04_gart_manager_init,
40556- nv04_gart_manager_fini,
40557- nv04_gart_manager_new,
40558- nv04_gart_manager_del,
40559- nv04_gart_manager_debug
40560+ .init = nv04_gart_manager_init,
40561+ .takedown = nv04_gart_manager_fini,
40562+ .get_node = nv04_gart_manager_new,
40563+ .put_node = nv04_gart_manager_del,
40564+ .debug = nv04_gart_manager_debug
40565 };
40566
40567 int
40568diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40569index fb84da3..d7ee463 100644
40570--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40571+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40572@@ -67,7 +67,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40573 bool can_switch;
40574
40575 spin_lock(&dev->count_lock);
40576- can_switch = (dev->open_count == 0);
40577+ can_switch = (local_read(&dev->open_count) == 0);
40578 spin_unlock(&dev->count_lock);
40579 return can_switch;
40580 }
40581diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40582index eb89653..613cf71 100644
40583--- a/drivers/gpu/drm/qxl/qxl_cmd.c
40584+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40585@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40586 int ret;
40587
40588 mutex_lock(&qdev->async_io_mutex);
40589- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40590+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40591 if (qdev->last_sent_io_cmd > irq_num) {
40592 if (intr)
40593 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40594- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40595+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40596 else
40597 ret = wait_event_timeout(qdev->io_cmd_event,
40598- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40599+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40600 /* 0 is timeout, just bail the "hw" has gone away */
40601 if (ret <= 0)
40602 goto out;
40603- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40604+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40605 }
40606 outb(val, addr);
40607 qdev->last_sent_io_cmd = irq_num + 1;
40608 if (intr)
40609 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40610- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40611+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40612 else
40613 ret = wait_event_timeout(qdev->io_cmd_event,
40614- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40615+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40616 out:
40617 if (ret > 0)
40618 ret = 0;
40619diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40620index c3c2bbd..bc3c0fb 100644
40621--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40622+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40623@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40624 struct drm_info_node *node = (struct drm_info_node *) m->private;
40625 struct qxl_device *qdev = node->minor->dev->dev_private;
40626
40627- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40628- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40629- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40630- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40631+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40632+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40633+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40634+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40635 seq_printf(m, "%d\n", qdev->irq_received_error);
40636 return 0;
40637 }
40638diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40639index 36ed40b..0397633 100644
40640--- a/drivers/gpu/drm/qxl/qxl_drv.h
40641+++ b/drivers/gpu/drm/qxl/qxl_drv.h
40642@@ -290,10 +290,10 @@ struct qxl_device {
40643 unsigned int last_sent_io_cmd;
40644
40645 /* interrupt handling */
40646- atomic_t irq_received;
40647- atomic_t irq_received_display;
40648- atomic_t irq_received_cursor;
40649- atomic_t irq_received_io_cmd;
40650+ atomic_unchecked_t irq_received;
40651+ atomic_unchecked_t irq_received_display;
40652+ atomic_unchecked_t irq_received_cursor;
40653+ atomic_unchecked_t irq_received_io_cmd;
40654 unsigned irq_received_error;
40655 wait_queue_head_t display_event;
40656 wait_queue_head_t cursor_event;
40657diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40658index 0bb86e6..d41416d 100644
40659--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40660+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40661@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40662
40663 /* TODO copy slow path code from i915 */
40664 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40665- unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)cmd->command, cmd->command_size);
40666+ unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void __force_user *)(unsigned long)cmd->command, cmd->command_size);
40667
40668 {
40669 struct qxl_drawable *draw = fb_cmd;
40670@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40671 struct drm_qxl_reloc reloc;
40672
40673 if (copy_from_user(&reloc,
40674- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40675+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40676 sizeof(reloc))) {
40677 ret = -EFAULT;
40678 goto out_free_bos;
40679@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40680
40681 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40682
40683- struct drm_qxl_command *commands =
40684- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40685+ struct drm_qxl_command __user *commands =
40686+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40687
40688- if (copy_from_user(&user_cmd, &commands[cmd_num],
40689+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40690 sizeof(user_cmd)))
40691 return -EFAULT;
40692
40693diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40694index 28f84b4..fb3e224 100644
40695--- a/drivers/gpu/drm/qxl/qxl_irq.c
40696+++ b/drivers/gpu/drm/qxl/qxl_irq.c
40697@@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40698
40699 pending = xchg(&qdev->ram_header->int_pending, 0);
40700
40701- atomic_inc(&qdev->irq_received);
40702+ atomic_inc_unchecked(&qdev->irq_received);
40703
40704 if (pending & QXL_INTERRUPT_DISPLAY) {
40705- atomic_inc(&qdev->irq_received_display);
40706+ atomic_inc_unchecked(&qdev->irq_received_display);
40707 wake_up_all(&qdev->display_event);
40708 qxl_queue_garbage_collect(qdev, false);
40709 }
40710 if (pending & QXL_INTERRUPT_CURSOR) {
40711- atomic_inc(&qdev->irq_received_cursor);
40712+ atomic_inc_unchecked(&qdev->irq_received_cursor);
40713 wake_up_all(&qdev->cursor_event);
40714 }
40715 if (pending & QXL_INTERRUPT_IO_CMD) {
40716- atomic_inc(&qdev->irq_received_io_cmd);
40717+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40718 wake_up_all(&qdev->io_cmd_event);
40719 }
40720 if (pending & QXL_INTERRUPT_ERROR) {
40721@@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40722 init_waitqueue_head(&qdev->io_cmd_event);
40723 INIT_WORK(&qdev->client_monitors_config_work,
40724 qxl_client_monitors_config_work_func);
40725- atomic_set(&qdev->irq_received, 0);
40726- atomic_set(&qdev->irq_received_display, 0);
40727- atomic_set(&qdev->irq_received_cursor, 0);
40728- atomic_set(&qdev->irq_received_io_cmd, 0);
40729+ atomic_set_unchecked(&qdev->irq_received, 0);
40730+ atomic_set_unchecked(&qdev->irq_received_display, 0);
40731+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40732+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40733 qdev->irq_received_error = 0;
40734 ret = drm_irq_install(qdev->ddev);
40735 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40736diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40737index d52c275..4e6b43d 100644
40738--- a/drivers/gpu/drm/qxl/qxl_ttm.c
40739+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40740@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40741 }
40742 }
40743
40744-static struct vm_operations_struct qxl_ttm_vm_ops;
40745+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40746 static const struct vm_operations_struct *ttm_vm_ops;
40747
40748 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40749@@ -147,8 +147,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40750 return r;
40751 if (unlikely(ttm_vm_ops == NULL)) {
40752 ttm_vm_ops = vma->vm_ops;
40753+ pax_open_kernel();
40754 qxl_ttm_vm_ops = *ttm_vm_ops;
40755 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40756+ pax_close_kernel();
40757 }
40758 vma->vm_ops = &qxl_ttm_vm_ops;
40759 return 0;
40760@@ -561,25 +563,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40761 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40762 {
40763 #if defined(CONFIG_DEBUG_FS)
40764- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40765- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40766- unsigned i;
40767+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40768+ {
40769+ .name = "qxl_mem_mm",
40770+ .show = &qxl_mm_dump_table,
40771+ },
40772+ {
40773+ .name = "qxl_surf_mm",
40774+ .show = &qxl_mm_dump_table,
40775+ }
40776+ };
40777
40778- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40779- if (i == 0)
40780- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40781- else
40782- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40783- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40784- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40785- qxl_mem_types_list[i].driver_features = 0;
40786- if (i == 0)
40787- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40788- else
40789- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40790+ pax_open_kernel();
40791+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40792+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40793+ pax_close_kernel();
40794
40795- }
40796- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40797+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40798 #else
40799 return 0;
40800 #endif
40801diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
40802index 59459fe..be26b31 100644
40803--- a/drivers/gpu/drm/r128/r128_cce.c
40804+++ b/drivers/gpu/drm/r128/r128_cce.c
40805@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
40806
40807 /* GH: Simple idle check.
40808 */
40809- atomic_set(&dev_priv->idle_count, 0);
40810+ atomic_set_unchecked(&dev_priv->idle_count, 0);
40811
40812 /* We don't support anything other than bus-mastering ring mode,
40813 * but the ring can be in either AGP or PCI space for the ring
40814diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
40815index 5bf3f5f..7000661 100644
40816--- a/drivers/gpu/drm/r128/r128_drv.h
40817+++ b/drivers/gpu/drm/r128/r128_drv.h
40818@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
40819 int is_pci;
40820 unsigned long cce_buffers_offset;
40821
40822- atomic_t idle_count;
40823+ atomic_unchecked_t idle_count;
40824
40825 int page_flipping;
40826 int current_page;
40827 u32 crtc_offset;
40828 u32 crtc_offset_cntl;
40829
40830- atomic_t vbl_received;
40831+ atomic_unchecked_t vbl_received;
40832
40833 u32 color_fmt;
40834 unsigned int front_offset;
40835diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
40836index b0d0fd3..a6fbbe4 100644
40837--- a/drivers/gpu/drm/r128/r128_ioc32.c
40838+++ b/drivers/gpu/drm/r128/r128_ioc32.c
40839@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
40840 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
40841 }
40842
40843-drm_ioctl_compat_t *r128_compat_ioctls[] = {
40844+drm_ioctl_compat_t r128_compat_ioctls[] = {
40845 [DRM_R128_INIT] = compat_r128_init,
40846 [DRM_R128_DEPTH] = compat_r128_depth,
40847 [DRM_R128_STIPPLE] = compat_r128_stipple,
40848@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
40849 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40850 {
40851 unsigned int nr = DRM_IOCTL_NR(cmd);
40852- drm_ioctl_compat_t *fn = NULL;
40853 int ret;
40854
40855 if (nr < DRM_COMMAND_BASE)
40856 return drm_compat_ioctl(filp, cmd, arg);
40857
40858- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls))
40859- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40860-
40861- if (fn != NULL)
40862+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
40863+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
40864 ret = (*fn) (filp, cmd, arg);
40865- else
40866+ } else
40867 ret = drm_ioctl(filp, cmd, arg);
40868
40869 return ret;
40870diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
40871index c2ae496..30b5993 100644
40872--- a/drivers/gpu/drm/r128/r128_irq.c
40873+++ b/drivers/gpu/drm/r128/r128_irq.c
40874@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
40875 if (crtc != 0)
40876 return 0;
40877
40878- return atomic_read(&dev_priv->vbl_received);
40879+ return atomic_read_unchecked(&dev_priv->vbl_received);
40880 }
40881
40882 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
40883@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
40884 /* VBLANK interrupt */
40885 if (status & R128_CRTC_VBLANK_INT) {
40886 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
40887- atomic_inc(&dev_priv->vbl_received);
40888+ atomic_inc_unchecked(&dev_priv->vbl_received);
40889 drm_handle_vblank(dev, 0);
40890 return IRQ_HANDLED;
40891 }
40892diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
40893index e806dac..f81d32f 100644
40894--- a/drivers/gpu/drm/r128/r128_state.c
40895+++ b/drivers/gpu/drm/r128/r128_state.c
40896@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
40897
40898 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
40899 {
40900- if (atomic_read(&dev_priv->idle_count) == 0)
40901+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
40902 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
40903 else
40904- atomic_set(&dev_priv->idle_count, 0);
40905+ atomic_set_unchecked(&dev_priv->idle_count, 0);
40906 }
40907
40908 #endif
40909diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
40910index 4a85bb6..aaea819 100644
40911--- a/drivers/gpu/drm/radeon/mkregtable.c
40912+++ b/drivers/gpu/drm/radeon/mkregtable.c
40913@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
40914 regex_t mask_rex;
40915 regmatch_t match[4];
40916 char buf[1024];
40917- size_t end;
40918+ long end;
40919 int len;
40920 int done = 0;
40921 int r;
40922 unsigned o;
40923 struct offset *offset;
40924 char last_reg_s[10];
40925- int last_reg;
40926+ unsigned long last_reg;
40927
40928 if (regcomp
40929 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
40930diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
40931index 2cd144c..a01c95a 100644
40932--- a/drivers/gpu/drm/radeon/radeon_device.c
40933+++ b/drivers/gpu/drm/radeon/radeon_device.c
40934@@ -1129,7 +1129,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
40935 bool can_switch;
40936
40937 spin_lock(&dev->count_lock);
40938- can_switch = (dev->open_count == 0);
40939+ can_switch = (local_read(&dev->open_count) == 0);
40940 spin_unlock(&dev->count_lock);
40941 return can_switch;
40942 }
40943diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
40944index dafd812..1bf20c7 100644
40945--- a/drivers/gpu/drm/radeon/radeon_drv.h
40946+++ b/drivers/gpu/drm/radeon/radeon_drv.h
40947@@ -262,7 +262,7 @@ typedef struct drm_radeon_private {
40948
40949 /* SW interrupt */
40950 wait_queue_head_t swi_queue;
40951- atomic_t swi_emitted;
40952+ atomic_unchecked_t swi_emitted;
40953 int vblank_crtc;
40954 uint32_t irq_enable_reg;
40955 uint32_t r500_disp_irq_reg;
40956diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
40957index bdb0f93..5ff558f 100644
40958--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
40959+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
40960@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
40961 request = compat_alloc_user_space(sizeof(*request));
40962 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
40963 || __put_user(req32.param, &request->param)
40964- || __put_user((void __user *)(unsigned long)req32.value,
40965+ || __put_user((unsigned long)req32.value,
40966 &request->value))
40967 return -EFAULT;
40968
40969@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
40970 #define compat_radeon_cp_setparam NULL
40971 #endif /* X86_64 || IA64 */
40972
40973-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
40974+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
40975 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
40976 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
40977 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
40978@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
40979 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40980 {
40981 unsigned int nr = DRM_IOCTL_NR(cmd);
40982- drm_ioctl_compat_t *fn = NULL;
40983 int ret;
40984
40985 if (nr < DRM_COMMAND_BASE)
40986 return drm_compat_ioctl(filp, cmd, arg);
40987
40988- if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls))
40989- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
40990-
40991- if (fn != NULL)
40992+ if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
40993+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
40994 ret = (*fn) (filp, cmd, arg);
40995- else
40996+ } else
40997 ret = drm_ioctl(filp, cmd, arg);
40998
40999 return ret;
41000diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41001index 244b19b..c19226d 100644
41002--- a/drivers/gpu/drm/radeon/radeon_irq.c
41003+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41004@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41005 unsigned int ret;
41006 RING_LOCALS;
41007
41008- atomic_inc(&dev_priv->swi_emitted);
41009- ret = atomic_read(&dev_priv->swi_emitted);
41010+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41011+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41012
41013 BEGIN_RING(4);
41014 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41015@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41016 drm_radeon_private_t *dev_priv =
41017 (drm_radeon_private_t *) dev->dev_private;
41018
41019- atomic_set(&dev_priv->swi_emitted, 0);
41020+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41021 init_waitqueue_head(&dev_priv->swi_queue);
41022
41023 dev->max_vblank_count = 0x001fffff;
41024diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41025index 956ab7f..fbd36d8 100644
41026--- a/drivers/gpu/drm/radeon/radeon_state.c
41027+++ b/drivers/gpu/drm/radeon/radeon_state.c
41028@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41029 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41030 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41031
41032- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41033+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41034 sarea_priv->nbox * sizeof(depth_boxes[0])))
41035 return -EFAULT;
41036
41037@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41038 {
41039 drm_radeon_private_t *dev_priv = dev->dev_private;
41040 drm_radeon_getparam_t *param = data;
41041- int value;
41042+ int value = 0;
41043
41044 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41045
41046diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41047index c8a8a51..219dacc 100644
41048--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41049+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41050@@ -797,7 +797,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41051 man->size = size >> PAGE_SHIFT;
41052 }
41053
41054-static struct vm_operations_struct radeon_ttm_vm_ops;
41055+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41056 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41057
41058 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41059@@ -838,8 +838,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41060 }
41061 if (unlikely(ttm_vm_ops == NULL)) {
41062 ttm_vm_ops = vma->vm_ops;
41063+ pax_open_kernel();
41064 radeon_ttm_vm_ops = *ttm_vm_ops;
41065 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41066+ pax_close_kernel();
41067 }
41068 vma->vm_ops = &radeon_ttm_vm_ops;
41069 return 0;
41070diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
41071index c11b71d..c8c48aa 100644
41072--- a/drivers/gpu/drm/radeon/radeon_vm.c
41073+++ b/drivers/gpu/drm/radeon/radeon_vm.c
41074@@ -493,7 +493,7 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev,
41075 mutex_unlock(&vm->mutex);
41076
41077 r = radeon_bo_create(rdev, RADEON_VM_PTE_COUNT * 8,
41078- RADEON_GPU_PAGE_SIZE, false,
41079+ RADEON_GPU_PAGE_SIZE, true,
41080 RADEON_GEM_DOMAIN_VRAM, NULL, &pt);
41081 if (r)
41082 return r;
41083@@ -913,7 +913,7 @@ int radeon_vm_init(struct radeon_device *rdev, struct radeon_vm *vm)
41084 return -ENOMEM;
41085 }
41086
41087- r = radeon_bo_create(rdev, pd_size, RADEON_VM_PTB_ALIGN_SIZE, false,
41088+ r = radeon_bo_create(rdev, pd_size, RADEON_VM_PTB_ALIGN_SIZE, true,
41089 RADEON_GEM_DOMAIN_VRAM, NULL,
41090 &vm->page_directory);
41091 if (r)
41092diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41093index edb871d..a275c6ed 100644
41094--- a/drivers/gpu/drm/tegra/dc.c
41095+++ b/drivers/gpu/drm/tegra/dc.c
41096@@ -1057,7 +1057,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41097 }
41098
41099 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41100- dc->debugfs_files[i].data = dc;
41101+ *(void **)&dc->debugfs_files[i].data = dc;
41102
41103 err = drm_debugfs_create_files(dc->debugfs_files,
41104 ARRAY_SIZE(debugfs_files),
41105diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41106index 0e599f0..c9ea7c7 100644
41107--- a/drivers/gpu/drm/tegra/dsi.c
41108+++ b/drivers/gpu/drm/tegra/dsi.c
41109@@ -39,7 +39,7 @@ struct tegra_dsi {
41110 struct clk *clk_lp;
41111 struct clk *clk;
41112
41113- struct drm_info_list *debugfs_files;
41114+ drm_info_list_no_const *debugfs_files;
41115 struct drm_minor *minor;
41116 struct dentry *debugfs;
41117
41118diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41119index 6928015..c9853e7 100644
41120--- a/drivers/gpu/drm/tegra/hdmi.c
41121+++ b/drivers/gpu/drm/tegra/hdmi.c
41122@@ -59,7 +59,7 @@ struct tegra_hdmi {
41123 bool stereo;
41124 bool dvi;
41125
41126- struct drm_info_list *debugfs_files;
41127+ drm_info_list_no_const *debugfs_files;
41128 struct drm_minor *minor;
41129 struct dentry *debugfs;
41130 };
41131diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41132index bd850c9..d9f3573 100644
41133--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41134+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41135@@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41136 }
41137
41138 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41139- ttm_bo_man_init,
41140- ttm_bo_man_takedown,
41141- ttm_bo_man_get_node,
41142- ttm_bo_man_put_node,
41143- ttm_bo_man_debug
41144+ .init = ttm_bo_man_init,
41145+ .takedown = ttm_bo_man_takedown,
41146+ .get_node = ttm_bo_man_get_node,
41147+ .put_node = ttm_bo_man_put_node,
41148+ .debug = ttm_bo_man_debug
41149 };
41150 EXPORT_SYMBOL(ttm_bo_manager_func);
41151diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41152index dbc2def..0a9f710 100644
41153--- a/drivers/gpu/drm/ttm/ttm_memory.c
41154+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41155@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41156 zone->glob = glob;
41157 glob->zone_kernel = zone;
41158 ret = kobject_init_and_add(
41159- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41160+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41161 if (unlikely(ret != 0)) {
41162 kobject_put(&zone->kobj);
41163 return ret;
41164@@ -347,7 +347,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41165 zone->glob = glob;
41166 glob->zone_dma32 = zone;
41167 ret = kobject_init_and_add(
41168- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41169+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41170 if (unlikely(ret != 0)) {
41171 kobject_put(&zone->kobj);
41172 return ret;
41173diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41174index 863bef9..cba15cf 100644
41175--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41176+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41177@@ -391,9 +391,9 @@ out:
41178 static unsigned long
41179 ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41180 {
41181- static atomic_t start_pool = ATOMIC_INIT(0);
41182+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
41183 unsigned i;
41184- unsigned pool_offset = atomic_add_return(1, &start_pool);
41185+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
41186 struct ttm_page_pool *pool;
41187 int shrink_pages = sc->nr_to_scan;
41188 unsigned long freed = 0;
41189diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41190index 3771763..883f206 100644
41191--- a/drivers/gpu/drm/udl/udl_fb.c
41192+++ b/drivers/gpu/drm/udl/udl_fb.c
41193@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41194 fb_deferred_io_cleanup(info);
41195 kfree(info->fbdefio);
41196 info->fbdefio = NULL;
41197- info->fbops->fb_mmap = udl_fb_mmap;
41198 }
41199
41200 pr_warn("released /dev/fb%d user=%d count=%d\n",
41201diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41202index ad02732..144f5ed 100644
41203--- a/drivers/gpu/drm/via/via_drv.h
41204+++ b/drivers/gpu/drm/via/via_drv.h
41205@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
41206 typedef uint32_t maskarray_t[5];
41207
41208 typedef struct drm_via_irq {
41209- atomic_t irq_received;
41210+ atomic_unchecked_t irq_received;
41211 uint32_t pending_mask;
41212 uint32_t enable_mask;
41213 wait_queue_head_t irq_queue;
41214@@ -75,7 +75,7 @@ typedef struct drm_via_private {
41215 struct timeval last_vblank;
41216 int last_vblank_valid;
41217 unsigned usec_per_vblank;
41218- atomic_t vbl_received;
41219+ atomic_unchecked_t vbl_received;
41220 drm_via_state_t hc_state;
41221 char pci_buf[VIA_PCI_BUF_SIZE];
41222 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41223diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41224index 1319433..a993b0c 100644
41225--- a/drivers/gpu/drm/via/via_irq.c
41226+++ b/drivers/gpu/drm/via/via_irq.c
41227@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41228 if (crtc != 0)
41229 return 0;
41230
41231- return atomic_read(&dev_priv->vbl_received);
41232+ return atomic_read_unchecked(&dev_priv->vbl_received);
41233 }
41234
41235 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41236@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41237
41238 status = VIA_READ(VIA_REG_INTERRUPT);
41239 if (status & VIA_IRQ_VBLANK_PENDING) {
41240- atomic_inc(&dev_priv->vbl_received);
41241- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41242+ atomic_inc_unchecked(&dev_priv->vbl_received);
41243+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41244 do_gettimeofday(&cur_vblank);
41245 if (dev_priv->last_vblank_valid) {
41246 dev_priv->usec_per_vblank =
41247@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41248 dev_priv->last_vblank = cur_vblank;
41249 dev_priv->last_vblank_valid = 1;
41250 }
41251- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41252+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41253 DRM_DEBUG("US per vblank is: %u\n",
41254 dev_priv->usec_per_vblank);
41255 }
41256@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41257
41258 for (i = 0; i < dev_priv->num_irqs; ++i) {
41259 if (status & cur_irq->pending_mask) {
41260- atomic_inc(&cur_irq->irq_received);
41261+ atomic_inc_unchecked(&cur_irq->irq_received);
41262 wake_up(&cur_irq->irq_queue);
41263 handled = 1;
41264 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41265@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41266 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41267 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41268 masks[irq][4]));
41269- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41270+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41271 } else {
41272 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41273 (((cur_irq_sequence =
41274- atomic_read(&cur_irq->irq_received)) -
41275+ atomic_read_unchecked(&cur_irq->irq_received)) -
41276 *sequence) <= (1 << 23)));
41277 }
41278 *sequence = cur_irq_sequence;
41279@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41280 }
41281
41282 for (i = 0; i < dev_priv->num_irqs; ++i) {
41283- atomic_set(&cur_irq->irq_received, 0);
41284+ atomic_set_unchecked(&cur_irq->irq_received, 0);
41285 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41286 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41287 init_waitqueue_head(&cur_irq->irq_queue);
41288@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41289 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41290 case VIA_IRQ_RELATIVE:
41291 irqwait->request.sequence +=
41292- atomic_read(&cur_irq->irq_received);
41293+ atomic_read_unchecked(&cur_irq->irq_received);
41294 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41295 case VIA_IRQ_ABSOLUTE:
41296 break;
41297diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41298index 6b252a8..5975dfe 100644
41299--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41300+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41301@@ -437,7 +437,7 @@ struct vmw_private {
41302 * Fencing and IRQs.
41303 */
41304
41305- atomic_t marker_seq;
41306+ atomic_unchecked_t marker_seq;
41307 wait_queue_head_t fence_queue;
41308 wait_queue_head_t fifo_queue;
41309 int fence_queue_waiters; /* Protected by hw_mutex */
41310diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41311index 6ccd993..618d592 100644
41312--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41313+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41314@@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41315 (unsigned int) min,
41316 (unsigned int) fifo->capabilities);
41317
41318- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41319+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41320 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41321 vmw_marker_queue_init(&fifo->marker_queue);
41322 return vmw_fifo_send_fence(dev_priv, &dummy);
41323@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41324 if (reserveable)
41325 iowrite32(bytes, fifo_mem +
41326 SVGA_FIFO_RESERVED);
41327- return fifo_mem + (next_cmd >> 2);
41328+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41329 } else {
41330 need_bounce = true;
41331 }
41332@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41333
41334 fm = vmw_fifo_reserve(dev_priv, bytes);
41335 if (unlikely(fm == NULL)) {
41336- *seqno = atomic_read(&dev_priv->marker_seq);
41337+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41338 ret = -ENOMEM;
41339 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41340 false, 3*HZ);
41341@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41342 }
41343
41344 do {
41345- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41346+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41347 } while (*seqno == 0);
41348
41349 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41350diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41351index b1273e8..9c274fd 100644
41352--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41353+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41354@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41355 }
41356
41357 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41358- vmw_gmrid_man_init,
41359- vmw_gmrid_man_takedown,
41360- vmw_gmrid_man_get_node,
41361- vmw_gmrid_man_put_node,
41362- vmw_gmrid_man_debug
41363+ .init = vmw_gmrid_man_init,
41364+ .takedown = vmw_gmrid_man_takedown,
41365+ .get_node = vmw_gmrid_man_get_node,
41366+ .put_node = vmw_gmrid_man_put_node,
41367+ .debug = vmw_gmrid_man_debug
41368 };
41369diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41370index 37881ec..319065d 100644
41371--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41372+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41373@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41374 int ret;
41375
41376 num_clips = arg->num_clips;
41377- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41378+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41379
41380 if (unlikely(num_clips == 0))
41381 return 0;
41382@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41383 int ret;
41384
41385 num_clips = arg->num_clips;
41386- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41387+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41388
41389 if (unlikely(num_clips == 0))
41390 return 0;
41391diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41392index 0c42376..6febe77 100644
41393--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41394+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41395@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41396 * emitted. Then the fence is stale and signaled.
41397 */
41398
41399- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41400+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41401 > VMW_FENCE_WRAP);
41402
41403 return ret;
41404@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41405
41406 if (fifo_idle)
41407 down_read(&fifo_state->rwsem);
41408- signal_seq = atomic_read(&dev_priv->marker_seq);
41409+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41410 ret = 0;
41411
41412 for (;;) {
41413diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41414index 8a8725c2..afed796 100644
41415--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41416+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41417@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41418 while (!vmw_lag_lt(queue, us)) {
41419 spin_lock(&queue->lock);
41420 if (list_empty(&queue->head))
41421- seqno = atomic_read(&dev_priv->marker_seq);
41422+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41423 else {
41424 marker = list_first_entry(&queue->head,
41425 struct vmw_marker, head);
41426diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41427index ec0ae2d..dc0780b 100644
41428--- a/drivers/gpu/vga/vga_switcheroo.c
41429+++ b/drivers/gpu/vga/vga_switcheroo.c
41430@@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41431
41432 /* this version is for the case where the power switch is separate
41433 to the device being powered down. */
41434-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41435+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41436 {
41437 /* copy over all the bus versions */
41438 if (dev->bus && dev->bus->pm) {
41439@@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41440 return ret;
41441 }
41442
41443-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41444+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41445 {
41446 /* copy over all the bus versions */
41447 if (dev->bus && dev->bus->pm) {
41448diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41449index a5c7927..025a2b4 100644
41450--- a/drivers/hid/hid-core.c
41451+++ b/drivers/hid/hid-core.c
41452@@ -2476,7 +2476,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41453
41454 int hid_add_device(struct hid_device *hdev)
41455 {
41456- static atomic_t id = ATOMIC_INIT(0);
41457+ static atomic_unchecked_t id = ATOMIC_INIT(0);
41458 int ret;
41459
41460 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41461@@ -2518,7 +2518,7 @@ int hid_add_device(struct hid_device *hdev)
41462 /* XXX hack, any other cleaner solution after the driver core
41463 * is converted to allow more than 20 bytes as the device name? */
41464 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41465- hdev->vendor, hdev->product, atomic_inc_return(&id));
41466+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41467
41468 hid_debug_register(hdev, dev_name(&hdev->dev));
41469 ret = device_add(&hdev->dev);
41470diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
41471index c13fb5b..55a3802 100644
41472--- a/drivers/hid/hid-wiimote-debug.c
41473+++ b/drivers/hid/hid-wiimote-debug.c
41474@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
41475 else if (size == 0)
41476 return -EIO;
41477
41478- if (copy_to_user(u, buf, size))
41479+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
41480 return -EFAULT;
41481
41482 *off += size;
41483diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
41484index 0d078c3..cd0962c 100644
41485--- a/drivers/hid/uhid.c
41486+++ b/drivers/hid/uhid.c
41487@@ -47,7 +47,7 @@ struct uhid_device {
41488 struct mutex report_lock;
41489 wait_queue_head_t report_wait;
41490 atomic_t report_done;
41491- atomic_t report_id;
41492+ atomic_unchecked_t report_id;
41493 struct uhid_event report_buf;
41494 };
41495
41496@@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
41497
41498 spin_lock_irqsave(&uhid->qlock, flags);
41499 ev->type = UHID_FEATURE;
41500- ev->u.feature.id = atomic_inc_return(&uhid->report_id);
41501+ ev->u.feature.id = atomic_inc_return_unchecked(&uhid->report_id);
41502 ev->u.feature.rnum = rnum;
41503 ev->u.feature.rtype = report_type;
41504
41505@@ -539,7 +539,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
41506 spin_lock_irqsave(&uhid->qlock, flags);
41507
41508 /* id for old report; drop it silently */
41509- if (atomic_read(&uhid->report_id) != ev->u.feature_answer.id)
41510+ if (atomic_read_unchecked(&uhid->report_id) != ev->u.feature_answer.id)
41511 goto unlock;
41512 if (atomic_read(&uhid->report_done))
41513 goto unlock;
41514diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
41515index 602ca86..10a6573 100644
41516--- a/drivers/hv/channel.c
41517+++ b/drivers/hv/channel.c
41518@@ -365,8 +365,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
41519 int ret = 0;
41520 int t;
41521
41522- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
41523- atomic_inc(&vmbus_connection.next_gpadl_handle);
41524+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
41525+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
41526
41527 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
41528 if (ret)
41529diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
41530index bcb4950..61dba6c 100644
41531--- a/drivers/hv/hv.c
41532+++ b/drivers/hv/hv.c
41533@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
41534 u64 output_address = (output) ? virt_to_phys(output) : 0;
41535 u32 output_address_hi = output_address >> 32;
41536 u32 output_address_lo = output_address & 0xFFFFFFFF;
41537- void *hypercall_page = hv_context.hypercall_page;
41538+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
41539
41540 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
41541 "=a"(hv_status_lo) : "d" (control_hi),
41542@@ -154,7 +154,7 @@ int hv_init(void)
41543 /* See if the hypercall page is already set */
41544 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
41545
41546- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
41547+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
41548
41549 if (!virtaddr)
41550 goto cleanup;
41551diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
41552index 5e90c5d..d8fcefb 100644
41553--- a/drivers/hv/hv_balloon.c
41554+++ b/drivers/hv/hv_balloon.c
41555@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
41556
41557 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
41558 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
41559-static atomic_t trans_id = ATOMIC_INIT(0);
41560+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
41561
41562 static int dm_ring_size = (5 * PAGE_SIZE);
41563
41564@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
41565 pr_info("Memory hot add failed\n");
41566
41567 dm->state = DM_INITIALIZED;
41568- resp.hdr.trans_id = atomic_inc_return(&trans_id);
41569+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41570 vmbus_sendpacket(dm->dev->channel, &resp,
41571 sizeof(struct dm_hot_add_response),
41572 (unsigned long)NULL,
41573@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
41574 memset(&status, 0, sizeof(struct dm_status));
41575 status.hdr.type = DM_STATUS_REPORT;
41576 status.hdr.size = sizeof(struct dm_status);
41577- status.hdr.trans_id = atomic_inc_return(&trans_id);
41578+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41579
41580 /*
41581 * The host expects the guest to report free memory.
41582@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
41583 * send the status. This can happen if we were interrupted
41584 * after we picked our transaction ID.
41585 */
41586- if (status.hdr.trans_id != atomic_read(&trans_id))
41587+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
41588 return;
41589
41590 /*
41591@@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
41592 */
41593
41594 do {
41595- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
41596+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41597 ret = vmbus_sendpacket(dm_device.dev->channel,
41598 bl_resp,
41599 bl_resp->hdr.size,
41600@@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
41601
41602 memset(&resp, 0, sizeof(struct dm_unballoon_response));
41603 resp.hdr.type = DM_UNBALLOON_RESPONSE;
41604- resp.hdr.trans_id = atomic_inc_return(&trans_id);
41605+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41606 resp.hdr.size = sizeof(struct dm_unballoon_response);
41607
41608 vmbus_sendpacket(dm_device.dev->channel, &resp,
41609@@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
41610 memset(&version_req, 0, sizeof(struct dm_version_request));
41611 version_req.hdr.type = DM_VERSION_REQUEST;
41612 version_req.hdr.size = sizeof(struct dm_version_request);
41613- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
41614+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41615 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
41616 version_req.is_last_attempt = 1;
41617
41618@@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
41619 memset(&version_req, 0, sizeof(struct dm_version_request));
41620 version_req.hdr.type = DM_VERSION_REQUEST;
41621 version_req.hdr.size = sizeof(struct dm_version_request);
41622- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
41623+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41624 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
41625 version_req.is_last_attempt = 0;
41626
41627@@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
41628 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
41629 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
41630 cap_msg.hdr.size = sizeof(struct dm_capabilities);
41631- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
41632+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
41633
41634 cap_msg.caps.cap_bits.balloon = 1;
41635 cap_msg.caps.cap_bits.hot_add = 1;
41636diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
41637index 860134d..ea3a79a 100644
41638--- a/drivers/hv/hyperv_vmbus.h
41639+++ b/drivers/hv/hyperv_vmbus.h
41640@@ -602,7 +602,7 @@ enum vmbus_connect_state {
41641 struct vmbus_connection {
41642 enum vmbus_connect_state conn_state;
41643
41644- atomic_t next_gpadl_handle;
41645+ atomic_unchecked_t next_gpadl_handle;
41646
41647 /*
41648 * Represents channel interrupts. Each bit position represents a
41649diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
41650index 8e53a3c..7a64e44 100644
41651--- a/drivers/hv/vmbus_drv.c
41652+++ b/drivers/hv/vmbus_drv.c
41653@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
41654 {
41655 int ret = 0;
41656
41657- static atomic_t device_num = ATOMIC_INIT(0);
41658+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
41659
41660 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
41661- atomic_inc_return(&device_num));
41662+ atomic_inc_return_unchecked(&device_num));
41663
41664 child_device_obj->device.bus = &hv_bus;
41665 child_device_obj->device.parent = &hv_acpi_dev->dev;
41666diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
41667index 579bdf9..75118b5 100644
41668--- a/drivers/hwmon/acpi_power_meter.c
41669+++ b/drivers/hwmon/acpi_power_meter.c
41670@@ -116,7 +116,7 @@ struct sensor_template {
41671 struct device_attribute *devattr,
41672 const char *buf, size_t count);
41673 int index;
41674-};
41675+} __do_const;
41676
41677 /* Averaging interval */
41678 static int update_avg_interval(struct acpi_power_meter_resource *resource)
41679@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
41680 struct sensor_template *attrs)
41681 {
41682 struct device *dev = &resource->acpi_dev->dev;
41683- struct sensor_device_attribute *sensors =
41684+ sensor_device_attribute_no_const *sensors =
41685 &resource->sensors[resource->num_sensors];
41686 int res = 0;
41687
41688diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
41689index 3288f13..71cfb4e 100644
41690--- a/drivers/hwmon/applesmc.c
41691+++ b/drivers/hwmon/applesmc.c
41692@@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
41693 {
41694 struct applesmc_node_group *grp;
41695 struct applesmc_dev_attr *node;
41696- struct attribute *attr;
41697+ attribute_no_const *attr;
41698 int ret, i;
41699
41700 for (grp = groups; grp->format; grp++) {
41701diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
41702index ae208f6..48b6c5b 100644
41703--- a/drivers/hwmon/asus_atk0110.c
41704+++ b/drivers/hwmon/asus_atk0110.c
41705@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
41706 struct atk_sensor_data {
41707 struct list_head list;
41708 struct atk_data *data;
41709- struct device_attribute label_attr;
41710- struct device_attribute input_attr;
41711- struct device_attribute limit1_attr;
41712- struct device_attribute limit2_attr;
41713+ device_attribute_no_const label_attr;
41714+ device_attribute_no_const input_attr;
41715+ device_attribute_no_const limit1_attr;
41716+ device_attribute_no_const limit2_attr;
41717 char label_attr_name[ATTR_NAME_SIZE];
41718 char input_attr_name[ATTR_NAME_SIZE];
41719 char limit1_attr_name[ATTR_NAME_SIZE];
41720@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
41721 static struct device_attribute atk_name_attr =
41722 __ATTR(name, 0444, atk_name_show, NULL);
41723
41724-static void atk_init_attribute(struct device_attribute *attr, char *name,
41725+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
41726 sysfs_show_func show)
41727 {
41728 sysfs_attr_init(&attr->attr);
41729diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
41730index d76f0b7..55ae976 100644
41731--- a/drivers/hwmon/coretemp.c
41732+++ b/drivers/hwmon/coretemp.c
41733@@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
41734 return NOTIFY_OK;
41735 }
41736
41737-static struct notifier_block coretemp_cpu_notifier __refdata = {
41738+static struct notifier_block coretemp_cpu_notifier = {
41739 .notifier_call = coretemp_cpu_callback,
41740 };
41741
41742diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
41743index 632f1dc..57e6a58 100644
41744--- a/drivers/hwmon/ibmaem.c
41745+++ b/drivers/hwmon/ibmaem.c
41746@@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
41747 struct aem_rw_sensor_template *rw)
41748 {
41749 struct device *dev = &data->pdev->dev;
41750- struct sensor_device_attribute *sensors = data->sensors;
41751+ sensor_device_attribute_no_const *sensors = data->sensors;
41752 int err;
41753
41754 /* Set up read-only sensors */
41755diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
41756index 9fbb1b1..efbaa3e 100644
41757--- a/drivers/hwmon/iio_hwmon.c
41758+++ b/drivers/hwmon/iio_hwmon.c
41759@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
41760 {
41761 struct device *dev = &pdev->dev;
41762 struct iio_hwmon_state *st;
41763- struct sensor_device_attribute *a;
41764+ sensor_device_attribute_no_const *a;
41765 int ret, i;
41766 int in_i = 1, temp_i = 1, curr_i = 1;
41767 enum iio_chan_type type;
41768diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
41769index 38d5a63..cf2c2ea 100644
41770--- a/drivers/hwmon/nct6775.c
41771+++ b/drivers/hwmon/nct6775.c
41772@@ -944,10 +944,10 @@ static struct attribute_group *
41773 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
41774 int repeat)
41775 {
41776- struct attribute_group *group;
41777+ attribute_group_no_const *group;
41778 struct sensor_device_attr_u *su;
41779- struct sensor_device_attribute *a;
41780- struct sensor_device_attribute_2 *a2;
41781+ sensor_device_attribute_no_const *a;
41782+ sensor_device_attribute_2_no_const *a2;
41783 struct attribute **attrs;
41784 struct sensor_device_template **t;
41785 int i, count;
41786diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
41787index 291d11f..3f0dbbd 100644
41788--- a/drivers/hwmon/pmbus/pmbus_core.c
41789+++ b/drivers/hwmon/pmbus/pmbus_core.c
41790@@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
41791 return 0;
41792 }
41793
41794-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
41795+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
41796 const char *name,
41797 umode_t mode,
41798 ssize_t (*show)(struct device *dev,
41799@@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
41800 dev_attr->store = store;
41801 }
41802
41803-static void pmbus_attr_init(struct sensor_device_attribute *a,
41804+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
41805 const char *name,
41806 umode_t mode,
41807 ssize_t (*show)(struct device *dev,
41808@@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
41809 u16 reg, u8 mask)
41810 {
41811 struct pmbus_boolean *boolean;
41812- struct sensor_device_attribute *a;
41813+ sensor_device_attribute_no_const *a;
41814
41815 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
41816 if (!boolean)
41817@@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
41818 bool update, bool readonly)
41819 {
41820 struct pmbus_sensor *sensor;
41821- struct device_attribute *a;
41822+ device_attribute_no_const *a;
41823
41824 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
41825 if (!sensor)
41826@@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
41827 const char *lstring, int index)
41828 {
41829 struct pmbus_label *label;
41830- struct device_attribute *a;
41831+ device_attribute_no_const *a;
41832
41833 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
41834 if (!label)
41835diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
41836index 97cd45a..ac54d8b 100644
41837--- a/drivers/hwmon/sht15.c
41838+++ b/drivers/hwmon/sht15.c
41839@@ -169,7 +169,7 @@ struct sht15_data {
41840 int supply_uv;
41841 bool supply_uv_valid;
41842 struct work_struct update_supply_work;
41843- atomic_t interrupt_handled;
41844+ atomic_unchecked_t interrupt_handled;
41845 };
41846
41847 /**
41848@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
41849 ret = gpio_direction_input(data->pdata->gpio_data);
41850 if (ret)
41851 return ret;
41852- atomic_set(&data->interrupt_handled, 0);
41853+ atomic_set_unchecked(&data->interrupt_handled, 0);
41854
41855 enable_irq(gpio_to_irq(data->pdata->gpio_data));
41856 if (gpio_get_value(data->pdata->gpio_data) == 0) {
41857 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
41858 /* Only relevant if the interrupt hasn't occurred. */
41859- if (!atomic_read(&data->interrupt_handled))
41860+ if (!atomic_read_unchecked(&data->interrupt_handled))
41861 schedule_work(&data->read_work);
41862 }
41863 ret = wait_event_timeout(data->wait_queue,
41864@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
41865
41866 /* First disable the interrupt */
41867 disable_irq_nosync(irq);
41868- atomic_inc(&data->interrupt_handled);
41869+ atomic_inc_unchecked(&data->interrupt_handled);
41870 /* Then schedule a reading work struct */
41871 if (data->state != SHT15_READING_NOTHING)
41872 schedule_work(&data->read_work);
41873@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
41874 * If not, then start the interrupt again - care here as could
41875 * have gone low in meantime so verify it hasn't!
41876 */
41877- atomic_set(&data->interrupt_handled, 0);
41878+ atomic_set_unchecked(&data->interrupt_handled, 0);
41879 enable_irq(gpio_to_irq(data->pdata->gpio_data));
41880 /* If still not occurred or another handler was scheduled */
41881 if (gpio_get_value(data->pdata->gpio_data)
41882- || atomic_read(&data->interrupt_handled))
41883+ || atomic_read_unchecked(&data->interrupt_handled))
41884 return;
41885 }
41886
41887diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
41888index 8df43c5..b07b91d 100644
41889--- a/drivers/hwmon/via-cputemp.c
41890+++ b/drivers/hwmon/via-cputemp.c
41891@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
41892 return NOTIFY_OK;
41893 }
41894
41895-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
41896+static struct notifier_block via_cputemp_cpu_notifier = {
41897 .notifier_call = via_cputemp_cpu_callback,
41898 };
41899
41900diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
41901index 41fc683..a39cfea 100644
41902--- a/drivers/i2c/busses/i2c-amd756-s4882.c
41903+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
41904@@ -43,7 +43,7 @@
41905 extern struct i2c_adapter amd756_smbus;
41906
41907 static struct i2c_adapter *s4882_adapter;
41908-static struct i2c_algorithm *s4882_algo;
41909+static i2c_algorithm_no_const *s4882_algo;
41910
41911 /* Wrapper access functions for multiplexed SMBus */
41912 static DEFINE_MUTEX(amd756_lock);
41913diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
41914index 721f7eb..0fd2a09 100644
41915--- a/drivers/i2c/busses/i2c-diolan-u2c.c
41916+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
41917@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
41918 /* usb layer */
41919
41920 /* Send command to device, and get response. */
41921-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
41922+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
41923 {
41924 int ret = 0;
41925 int actual;
41926diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
41927index b170bdf..3c76427 100644
41928--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
41929+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
41930@@ -41,7 +41,7 @@
41931 extern struct i2c_adapter *nforce2_smbus;
41932
41933 static struct i2c_adapter *s4985_adapter;
41934-static struct i2c_algorithm *s4985_algo;
41935+static i2c_algorithm_no_const *s4985_algo;
41936
41937 /* Wrapper access functions for multiplexed SMBus */
41938 static DEFINE_MUTEX(nforce2_lock);
41939diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
41940index 80b47e8..1a6040d9 100644
41941--- a/drivers/i2c/i2c-dev.c
41942+++ b/drivers/i2c/i2c-dev.c
41943@@ -277,7 +277,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
41944 break;
41945 }
41946
41947- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
41948+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
41949 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
41950 if (IS_ERR(rdwr_pa[i].buf)) {
41951 res = PTR_ERR(rdwr_pa[i].buf);
41952diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
41953index 0b510ba..4fbb5085 100644
41954--- a/drivers/ide/ide-cd.c
41955+++ b/drivers/ide/ide-cd.c
41956@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
41957 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
41958 if ((unsigned long)buf & alignment
41959 || blk_rq_bytes(rq) & q->dma_pad_mask
41960- || object_is_on_stack(buf))
41961+ || object_starts_on_stack(buf))
41962 drive->dma = 0;
41963 }
41964 }
41965diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
41966index ede16aec..e423e8a 100644
41967--- a/drivers/iio/industrialio-core.c
41968+++ b/drivers/iio/industrialio-core.c
41969@@ -527,7 +527,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
41970 }
41971
41972 static
41973-int __iio_device_attr_init(struct device_attribute *dev_attr,
41974+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
41975 const char *postfix,
41976 struct iio_chan_spec const *chan,
41977 ssize_t (*readfunc)(struct device *dev,
41978diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
41979index c323917..6ddea8b 100644
41980--- a/drivers/infiniband/core/cm.c
41981+++ b/drivers/infiniband/core/cm.c
41982@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
41983
41984 struct cm_counter_group {
41985 struct kobject obj;
41986- atomic_long_t counter[CM_ATTR_COUNT];
41987+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
41988 };
41989
41990 struct cm_counter_attribute {
41991@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
41992 struct ib_mad_send_buf *msg = NULL;
41993 int ret;
41994
41995- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
41996+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
41997 counter[CM_REQ_COUNTER]);
41998
41999 /* Quick state check to discard duplicate REQs. */
42000@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42001 if (!cm_id_priv)
42002 return;
42003
42004- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42005+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42006 counter[CM_REP_COUNTER]);
42007 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42008 if (ret)
42009@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42010 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42011 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42012 spin_unlock_irq(&cm_id_priv->lock);
42013- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42014+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42015 counter[CM_RTU_COUNTER]);
42016 goto out;
42017 }
42018@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42019 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42020 dreq_msg->local_comm_id);
42021 if (!cm_id_priv) {
42022- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42023+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42024 counter[CM_DREQ_COUNTER]);
42025 cm_issue_drep(work->port, work->mad_recv_wc);
42026 return -EINVAL;
42027@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42028 case IB_CM_MRA_REP_RCVD:
42029 break;
42030 case IB_CM_TIMEWAIT:
42031- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42032+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42033 counter[CM_DREQ_COUNTER]);
42034 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42035 goto unlock;
42036@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42037 cm_free_msg(msg);
42038 goto deref;
42039 case IB_CM_DREQ_RCVD:
42040- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42041+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42042 counter[CM_DREQ_COUNTER]);
42043 goto unlock;
42044 default:
42045@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42046 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42047 cm_id_priv->msg, timeout)) {
42048 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42049- atomic_long_inc(&work->port->
42050+ atomic_long_inc_unchecked(&work->port->
42051 counter_group[CM_RECV_DUPLICATES].
42052 counter[CM_MRA_COUNTER]);
42053 goto out;
42054@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42055 break;
42056 case IB_CM_MRA_REQ_RCVD:
42057 case IB_CM_MRA_REP_RCVD:
42058- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42059+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42060 counter[CM_MRA_COUNTER]);
42061 /* fall through */
42062 default:
42063@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42064 case IB_CM_LAP_IDLE:
42065 break;
42066 case IB_CM_MRA_LAP_SENT:
42067- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42068+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42069 counter[CM_LAP_COUNTER]);
42070 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42071 goto unlock;
42072@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42073 cm_free_msg(msg);
42074 goto deref;
42075 case IB_CM_LAP_RCVD:
42076- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42077+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42078 counter[CM_LAP_COUNTER]);
42079 goto unlock;
42080 default:
42081@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42082 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42083 if (cur_cm_id_priv) {
42084 spin_unlock_irq(&cm.lock);
42085- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42086+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42087 counter[CM_SIDR_REQ_COUNTER]);
42088 goto out; /* Duplicate message. */
42089 }
42090@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42091 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42092 msg->retries = 1;
42093
42094- atomic_long_add(1 + msg->retries,
42095+ atomic_long_add_unchecked(1 + msg->retries,
42096 &port->counter_group[CM_XMIT].counter[attr_index]);
42097 if (msg->retries)
42098- atomic_long_add(msg->retries,
42099+ atomic_long_add_unchecked(msg->retries,
42100 &port->counter_group[CM_XMIT_RETRIES].
42101 counter[attr_index]);
42102
42103@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42104 }
42105
42106 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42107- atomic_long_inc(&port->counter_group[CM_RECV].
42108+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42109 counter[attr_id - CM_ATTR_ID_OFFSET]);
42110
42111 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42112@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42113 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42114
42115 return sprintf(buf, "%ld\n",
42116- atomic_long_read(&group->counter[cm_attr->index]));
42117+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42118 }
42119
42120 static const struct sysfs_ops cm_counter_ops = {
42121diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42122index 9f5ad7c..588cd84 100644
42123--- a/drivers/infiniband/core/fmr_pool.c
42124+++ b/drivers/infiniband/core/fmr_pool.c
42125@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42126
42127 struct task_struct *thread;
42128
42129- atomic_t req_ser;
42130- atomic_t flush_ser;
42131+ atomic_unchecked_t req_ser;
42132+ atomic_unchecked_t flush_ser;
42133
42134 wait_queue_head_t force_wait;
42135 };
42136@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42137 struct ib_fmr_pool *pool = pool_ptr;
42138
42139 do {
42140- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42141+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42142 ib_fmr_batch_release(pool);
42143
42144- atomic_inc(&pool->flush_ser);
42145+ atomic_inc_unchecked(&pool->flush_ser);
42146 wake_up_interruptible(&pool->force_wait);
42147
42148 if (pool->flush_function)
42149@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42150 }
42151
42152 set_current_state(TASK_INTERRUPTIBLE);
42153- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42154+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42155 !kthread_should_stop())
42156 schedule();
42157 __set_current_state(TASK_RUNNING);
42158@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42159 pool->dirty_watermark = params->dirty_watermark;
42160 pool->dirty_len = 0;
42161 spin_lock_init(&pool->pool_lock);
42162- atomic_set(&pool->req_ser, 0);
42163- atomic_set(&pool->flush_ser, 0);
42164+ atomic_set_unchecked(&pool->req_ser, 0);
42165+ atomic_set_unchecked(&pool->flush_ser, 0);
42166 init_waitqueue_head(&pool->force_wait);
42167
42168 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42169@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42170 }
42171 spin_unlock_irq(&pool->pool_lock);
42172
42173- serial = atomic_inc_return(&pool->req_ser);
42174+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42175 wake_up_process(pool->thread);
42176
42177 if (wait_event_interruptible(pool->force_wait,
42178- atomic_read(&pool->flush_ser) - serial >= 0))
42179+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42180 return -EINTR;
42181
42182 return 0;
42183@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42184 } else {
42185 list_add_tail(&fmr->list, &pool->dirty_list);
42186 if (++pool->dirty_len >= pool->dirty_watermark) {
42187- atomic_inc(&pool->req_ser);
42188+ atomic_inc_unchecked(&pool->req_ser);
42189 wake_up_process(pool->thread);
42190 }
42191 }
42192diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42193index ec7a298..8742e59 100644
42194--- a/drivers/infiniband/hw/cxgb4/mem.c
42195+++ b/drivers/infiniband/hw/cxgb4/mem.c
42196@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42197 int err;
42198 struct fw_ri_tpte tpt;
42199 u32 stag_idx;
42200- static atomic_t key;
42201+ static atomic_unchecked_t key;
42202
42203 if (c4iw_fatal_error(rdev))
42204 return -EIO;
42205@@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42206 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42207 rdev->stats.stag.max = rdev->stats.stag.cur;
42208 mutex_unlock(&rdev->stats.lock);
42209- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42210+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42211 }
42212 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42213 __func__, stag_state, type, pdid, stag_idx);
42214diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42215index 79b3dbc..96e5fcc 100644
42216--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42217+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42218@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42219 struct ib_atomic_eth *ateth;
42220 struct ipath_ack_entry *e;
42221 u64 vaddr;
42222- atomic64_t *maddr;
42223+ atomic64_unchecked_t *maddr;
42224 u64 sdata;
42225 u32 rkey;
42226 u8 next;
42227@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42228 IB_ACCESS_REMOTE_ATOMIC)))
42229 goto nack_acc_unlck;
42230 /* Perform atomic OP and save result. */
42231- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42232+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42233 sdata = be64_to_cpu(ateth->swap_data);
42234 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42235 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42236- (u64) atomic64_add_return(sdata, maddr) - sdata :
42237+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42238 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42239 be64_to_cpu(ateth->compare_data),
42240 sdata);
42241diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42242index 1f95bba..9530f87 100644
42243--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42244+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42245@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42246 unsigned long flags;
42247 struct ib_wc wc;
42248 u64 sdata;
42249- atomic64_t *maddr;
42250+ atomic64_unchecked_t *maddr;
42251 enum ib_wc_status send_status;
42252
42253 /*
42254@@ -382,11 +382,11 @@ again:
42255 IB_ACCESS_REMOTE_ATOMIC)))
42256 goto acc_err;
42257 /* Perform atomic OP and save result. */
42258- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42259+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42260 sdata = wqe->wr.wr.atomic.compare_add;
42261 *(u64 *) sqp->s_sge.sge.vaddr =
42262 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42263- (u64) atomic64_add_return(sdata, maddr) - sdata :
42264+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42265 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42266 sdata, wqe->wr.wr.atomic.swap);
42267 goto send_comp;
42268diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42269index fd36ec6..a6a082f 100644
42270--- a/drivers/infiniband/hw/mlx4/mad.c
42271+++ b/drivers/infiniband/hw/mlx4/mad.c
42272@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42273
42274 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42275 {
42276- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42277+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42278 cpu_to_be64(0xff00000000000000LL);
42279 }
42280
42281diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42282index ed327e6..ca1739e0 100644
42283--- a/drivers/infiniband/hw/mlx4/mcg.c
42284+++ b/drivers/infiniband/hw/mlx4/mcg.c
42285@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42286 {
42287 char name[20];
42288
42289- atomic_set(&ctx->tid, 0);
42290+ atomic_set_unchecked(&ctx->tid, 0);
42291 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42292 ctx->mcg_wq = create_singlethread_workqueue(name);
42293 if (!ctx->mcg_wq)
42294diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42295index 66b0b7d..f14836a 100644
42296--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42297+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42298@@ -425,7 +425,7 @@ struct mlx4_ib_demux_ctx {
42299 struct list_head mcg_mgid0_list;
42300 struct workqueue_struct *mcg_wq;
42301 struct mlx4_ib_demux_pv_ctx **tun;
42302- atomic_t tid;
42303+ atomic_unchecked_t tid;
42304 int flushing; /* flushing the work queue */
42305 };
42306
42307diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42308index 9d3e5c1..6f166df 100644
42309--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42310+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42311@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42312 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42313 }
42314
42315-int mthca_QUERY_FW(struct mthca_dev *dev)
42316+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42317 {
42318 struct mthca_mailbox *mailbox;
42319 u32 *outbox;
42320@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42321 CMD_TIME_CLASS_B);
42322 }
42323
42324-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42325+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42326 int num_mtt)
42327 {
42328 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42329@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42330 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42331 }
42332
42333-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42334+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42335 int eq_num)
42336 {
42337 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42338@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42339 CMD_TIME_CLASS_B);
42340 }
42341
42342-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42343+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42344 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42345 void *in_mad, void *response_mad)
42346 {
42347diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42348index ded76c1..0cf0a08 100644
42349--- a/drivers/infiniband/hw/mthca/mthca_main.c
42350+++ b/drivers/infiniband/hw/mthca/mthca_main.c
42351@@ -692,7 +692,7 @@ err_close:
42352 return err;
42353 }
42354
42355-static int mthca_setup_hca(struct mthca_dev *dev)
42356+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42357 {
42358 int err;
42359
42360diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42361index ed9a989..6aa5dc2 100644
42362--- a/drivers/infiniband/hw/mthca/mthca_mr.c
42363+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42364@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42365 * through the bitmaps)
42366 */
42367
42368-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42369+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42370 {
42371 int o;
42372 int m;
42373@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42374 return key;
42375 }
42376
42377-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42378+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42379 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42380 {
42381 struct mthca_mailbox *mailbox;
42382@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
42383 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
42384 }
42385
42386-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42387+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42388 u64 *buffer_list, int buffer_size_shift,
42389 int list_len, u64 iova, u64 total_size,
42390 u32 access, struct mthca_mr *mr)
42391diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
42392index 415f8e1..e34214e 100644
42393--- a/drivers/infiniband/hw/mthca/mthca_provider.c
42394+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
42395@@ -764,7 +764,7 @@ unlock:
42396 return 0;
42397 }
42398
42399-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42400+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42401 {
42402 struct mthca_dev *dev = to_mdev(ibcq->device);
42403 struct mthca_cq *cq = to_mcq(ibcq);
42404diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
42405index 353c7b0..c6ce921 100644
42406--- a/drivers/infiniband/hw/nes/nes.c
42407+++ b/drivers/infiniband/hw/nes/nes.c
42408@@ -98,7 +98,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
42409 LIST_HEAD(nes_adapter_list);
42410 static LIST_HEAD(nes_dev_list);
42411
42412-atomic_t qps_destroyed;
42413+atomic_unchecked_t qps_destroyed;
42414
42415 static unsigned int ee_flsh_adapter;
42416 static unsigned int sysfs_nonidx_addr;
42417@@ -269,7 +269,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
42418 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
42419 struct nes_adapter *nesadapter = nesdev->nesadapter;
42420
42421- atomic_inc(&qps_destroyed);
42422+ atomic_inc_unchecked(&qps_destroyed);
42423
42424 /* Free the control structures */
42425
42426diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
42427index 33cc589..3bd6538 100644
42428--- a/drivers/infiniband/hw/nes/nes.h
42429+++ b/drivers/infiniband/hw/nes/nes.h
42430@@ -177,17 +177,17 @@ extern unsigned int nes_debug_level;
42431 extern unsigned int wqm_quanta;
42432 extern struct list_head nes_adapter_list;
42433
42434-extern atomic_t cm_connects;
42435-extern atomic_t cm_accepts;
42436-extern atomic_t cm_disconnects;
42437-extern atomic_t cm_closes;
42438-extern atomic_t cm_connecteds;
42439-extern atomic_t cm_connect_reqs;
42440-extern atomic_t cm_rejects;
42441-extern atomic_t mod_qp_timouts;
42442-extern atomic_t qps_created;
42443-extern atomic_t qps_destroyed;
42444-extern atomic_t sw_qps_destroyed;
42445+extern atomic_unchecked_t cm_connects;
42446+extern atomic_unchecked_t cm_accepts;
42447+extern atomic_unchecked_t cm_disconnects;
42448+extern atomic_unchecked_t cm_closes;
42449+extern atomic_unchecked_t cm_connecteds;
42450+extern atomic_unchecked_t cm_connect_reqs;
42451+extern atomic_unchecked_t cm_rejects;
42452+extern atomic_unchecked_t mod_qp_timouts;
42453+extern atomic_unchecked_t qps_created;
42454+extern atomic_unchecked_t qps_destroyed;
42455+extern atomic_unchecked_t sw_qps_destroyed;
42456 extern u32 mh_detected;
42457 extern u32 mh_pauses_sent;
42458 extern u32 cm_packets_sent;
42459@@ -196,16 +196,16 @@ extern u32 cm_packets_created;
42460 extern u32 cm_packets_received;
42461 extern u32 cm_packets_dropped;
42462 extern u32 cm_packets_retrans;
42463-extern atomic_t cm_listens_created;
42464-extern atomic_t cm_listens_destroyed;
42465+extern atomic_unchecked_t cm_listens_created;
42466+extern atomic_unchecked_t cm_listens_destroyed;
42467 extern u32 cm_backlog_drops;
42468-extern atomic_t cm_loopbacks;
42469-extern atomic_t cm_nodes_created;
42470-extern atomic_t cm_nodes_destroyed;
42471-extern atomic_t cm_accel_dropped_pkts;
42472-extern atomic_t cm_resets_recvd;
42473-extern atomic_t pau_qps_created;
42474-extern atomic_t pau_qps_destroyed;
42475+extern atomic_unchecked_t cm_loopbacks;
42476+extern atomic_unchecked_t cm_nodes_created;
42477+extern atomic_unchecked_t cm_nodes_destroyed;
42478+extern atomic_unchecked_t cm_accel_dropped_pkts;
42479+extern atomic_unchecked_t cm_resets_recvd;
42480+extern atomic_unchecked_t pau_qps_created;
42481+extern atomic_unchecked_t pau_qps_destroyed;
42482
42483 extern u32 int_mod_timer_init;
42484 extern u32 int_mod_cq_depth_256;
42485diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
42486index dfa9df4..6bf7221 100644
42487--- a/drivers/infiniband/hw/nes/nes_cm.c
42488+++ b/drivers/infiniband/hw/nes/nes_cm.c
42489@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
42490 u32 cm_packets_retrans;
42491 u32 cm_packets_created;
42492 u32 cm_packets_received;
42493-atomic_t cm_listens_created;
42494-atomic_t cm_listens_destroyed;
42495+atomic_unchecked_t cm_listens_created;
42496+atomic_unchecked_t cm_listens_destroyed;
42497 u32 cm_backlog_drops;
42498-atomic_t cm_loopbacks;
42499-atomic_t cm_nodes_created;
42500-atomic_t cm_nodes_destroyed;
42501-atomic_t cm_accel_dropped_pkts;
42502-atomic_t cm_resets_recvd;
42503+atomic_unchecked_t cm_loopbacks;
42504+atomic_unchecked_t cm_nodes_created;
42505+atomic_unchecked_t cm_nodes_destroyed;
42506+atomic_unchecked_t cm_accel_dropped_pkts;
42507+atomic_unchecked_t cm_resets_recvd;
42508
42509 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
42510 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
42511@@ -134,28 +134,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
42512 /* instance of function pointers for client API */
42513 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
42514 static struct nes_cm_ops nes_cm_api = {
42515- mini_cm_accelerated,
42516- mini_cm_listen,
42517- mini_cm_del_listen,
42518- mini_cm_connect,
42519- mini_cm_close,
42520- mini_cm_accept,
42521- mini_cm_reject,
42522- mini_cm_recv_pkt,
42523- mini_cm_dealloc_core,
42524- mini_cm_get,
42525- mini_cm_set
42526+ .accelerated = mini_cm_accelerated,
42527+ .listen = mini_cm_listen,
42528+ .stop_listener = mini_cm_del_listen,
42529+ .connect = mini_cm_connect,
42530+ .close = mini_cm_close,
42531+ .accept = mini_cm_accept,
42532+ .reject = mini_cm_reject,
42533+ .recv_pkt = mini_cm_recv_pkt,
42534+ .destroy_cm_core = mini_cm_dealloc_core,
42535+ .get = mini_cm_get,
42536+ .set = mini_cm_set
42537 };
42538
42539 static struct nes_cm_core *g_cm_core;
42540
42541-atomic_t cm_connects;
42542-atomic_t cm_accepts;
42543-atomic_t cm_disconnects;
42544-atomic_t cm_closes;
42545-atomic_t cm_connecteds;
42546-atomic_t cm_connect_reqs;
42547-atomic_t cm_rejects;
42548+atomic_unchecked_t cm_connects;
42549+atomic_unchecked_t cm_accepts;
42550+atomic_unchecked_t cm_disconnects;
42551+atomic_unchecked_t cm_closes;
42552+atomic_unchecked_t cm_connecteds;
42553+atomic_unchecked_t cm_connect_reqs;
42554+atomic_unchecked_t cm_rejects;
42555
42556 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
42557 {
42558@@ -1319,7 +1319,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
42559 kfree(listener);
42560 listener = NULL;
42561 ret = 0;
42562- atomic_inc(&cm_listens_destroyed);
42563+ atomic_inc_unchecked(&cm_listens_destroyed);
42564 } else {
42565 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
42566 }
42567@@ -1513,7 +1513,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
42568 cm_node->rem_mac);
42569
42570 add_hte_node(cm_core, cm_node);
42571- atomic_inc(&cm_nodes_created);
42572+ atomic_inc_unchecked(&cm_nodes_created);
42573
42574 return cm_node;
42575 }
42576@@ -1571,7 +1571,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
42577 }
42578
42579 atomic_dec(&cm_core->node_cnt);
42580- atomic_inc(&cm_nodes_destroyed);
42581+ atomic_inc_unchecked(&cm_nodes_destroyed);
42582 nesqp = cm_node->nesqp;
42583 if (nesqp) {
42584 nesqp->cm_node = NULL;
42585@@ -1635,7 +1635,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
42586
42587 static void drop_packet(struct sk_buff *skb)
42588 {
42589- atomic_inc(&cm_accel_dropped_pkts);
42590+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
42591 dev_kfree_skb_any(skb);
42592 }
42593
42594@@ -1698,7 +1698,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
42595 {
42596
42597 int reset = 0; /* whether to send reset in case of err.. */
42598- atomic_inc(&cm_resets_recvd);
42599+ atomic_inc_unchecked(&cm_resets_recvd);
42600 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
42601 " refcnt=%d\n", cm_node, cm_node->state,
42602 atomic_read(&cm_node->ref_count));
42603@@ -2339,7 +2339,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
42604 rem_ref_cm_node(cm_node->cm_core, cm_node);
42605 return NULL;
42606 }
42607- atomic_inc(&cm_loopbacks);
42608+ atomic_inc_unchecked(&cm_loopbacks);
42609 loopbackremotenode->loopbackpartner = cm_node;
42610 loopbackremotenode->tcp_cntxt.rcv_wscale =
42611 NES_CM_DEFAULT_RCV_WND_SCALE;
42612@@ -2614,7 +2614,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
42613 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
42614 else {
42615 rem_ref_cm_node(cm_core, cm_node);
42616- atomic_inc(&cm_accel_dropped_pkts);
42617+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
42618 dev_kfree_skb_any(skb);
42619 }
42620 break;
42621@@ -2922,7 +2922,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
42622
42623 if ((cm_id) && (cm_id->event_handler)) {
42624 if (issue_disconn) {
42625- atomic_inc(&cm_disconnects);
42626+ atomic_inc_unchecked(&cm_disconnects);
42627 cm_event.event = IW_CM_EVENT_DISCONNECT;
42628 cm_event.status = disconn_status;
42629 cm_event.local_addr = cm_id->local_addr;
42630@@ -2944,7 +2944,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
42631 }
42632
42633 if (issue_close) {
42634- atomic_inc(&cm_closes);
42635+ atomic_inc_unchecked(&cm_closes);
42636 nes_disconnect(nesqp, 1);
42637
42638 cm_id->provider_data = nesqp;
42639@@ -3082,7 +3082,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
42640
42641 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
42642 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
42643- atomic_inc(&cm_accepts);
42644+ atomic_inc_unchecked(&cm_accepts);
42645
42646 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
42647 netdev_refcnt_read(nesvnic->netdev));
42648@@ -3278,7 +3278,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
42649 struct nes_cm_core *cm_core;
42650 u8 *start_buff;
42651
42652- atomic_inc(&cm_rejects);
42653+ atomic_inc_unchecked(&cm_rejects);
42654 cm_node = (struct nes_cm_node *)cm_id->provider_data;
42655 loopback = cm_node->loopbackpartner;
42656 cm_core = cm_node->cm_core;
42657@@ -3340,7 +3340,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
42658 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
42659 ntohs(laddr->sin_port));
42660
42661- atomic_inc(&cm_connects);
42662+ atomic_inc_unchecked(&cm_connects);
42663 nesqp->active_conn = 1;
42664
42665 /* cache the cm_id in the qp */
42666@@ -3451,7 +3451,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
42667 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
42668 return err;
42669 }
42670- atomic_inc(&cm_listens_created);
42671+ atomic_inc_unchecked(&cm_listens_created);
42672 }
42673
42674 cm_id->add_ref(cm_id);
42675@@ -3558,7 +3558,7 @@ static void cm_event_connected(struct nes_cm_event *event)
42676
42677 if (nesqp->destroyed)
42678 return;
42679- atomic_inc(&cm_connecteds);
42680+ atomic_inc_unchecked(&cm_connecteds);
42681 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
42682 " local port 0x%04X. jiffies = %lu.\n",
42683 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
42684@@ -3741,7 +3741,7 @@ static void cm_event_reset(struct nes_cm_event *event)
42685
42686 cm_id->add_ref(cm_id);
42687 ret = cm_id->event_handler(cm_id, &cm_event);
42688- atomic_inc(&cm_closes);
42689+ atomic_inc_unchecked(&cm_closes);
42690 cm_event.event = IW_CM_EVENT_CLOSE;
42691 cm_event.status = 0;
42692 cm_event.provider_data = cm_id->provider_data;
42693@@ -3781,7 +3781,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
42694 return;
42695 cm_id = cm_node->cm_id;
42696
42697- atomic_inc(&cm_connect_reqs);
42698+ atomic_inc_unchecked(&cm_connect_reqs);
42699 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
42700 cm_node, cm_id, jiffies);
42701
42702@@ -3830,7 +3830,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
42703 return;
42704 cm_id = cm_node->cm_id;
42705
42706- atomic_inc(&cm_connect_reqs);
42707+ atomic_inc_unchecked(&cm_connect_reqs);
42708 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
42709 cm_node, cm_id, jiffies);
42710
42711diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
42712index 4166452..fc952c3 100644
42713--- a/drivers/infiniband/hw/nes/nes_mgt.c
42714+++ b/drivers/infiniband/hw/nes/nes_mgt.c
42715@@ -40,8 +40,8 @@
42716 #include "nes.h"
42717 #include "nes_mgt.h"
42718
42719-atomic_t pau_qps_created;
42720-atomic_t pau_qps_destroyed;
42721+atomic_unchecked_t pau_qps_created;
42722+atomic_unchecked_t pau_qps_destroyed;
42723
42724 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
42725 {
42726@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
42727 {
42728 struct sk_buff *skb;
42729 unsigned long flags;
42730- atomic_inc(&pau_qps_destroyed);
42731+ atomic_inc_unchecked(&pau_qps_destroyed);
42732
42733 /* Free packets that have not yet been forwarded */
42734 /* Lock is acquired by skb_dequeue when removing the skb */
42735@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
42736 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
42737 skb_queue_head_init(&nesqp->pau_list);
42738 spin_lock_init(&nesqp->pau_lock);
42739- atomic_inc(&pau_qps_created);
42740+ atomic_inc_unchecked(&pau_qps_created);
42741 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
42742 }
42743
42744diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
42745index 49eb511..a774366 100644
42746--- a/drivers/infiniband/hw/nes/nes_nic.c
42747+++ b/drivers/infiniband/hw/nes/nes_nic.c
42748@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
42749 target_stat_values[++index] = mh_detected;
42750 target_stat_values[++index] = mh_pauses_sent;
42751 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
42752- target_stat_values[++index] = atomic_read(&cm_connects);
42753- target_stat_values[++index] = atomic_read(&cm_accepts);
42754- target_stat_values[++index] = atomic_read(&cm_disconnects);
42755- target_stat_values[++index] = atomic_read(&cm_connecteds);
42756- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
42757- target_stat_values[++index] = atomic_read(&cm_rejects);
42758- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
42759- target_stat_values[++index] = atomic_read(&qps_created);
42760- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
42761- target_stat_values[++index] = atomic_read(&qps_destroyed);
42762- target_stat_values[++index] = atomic_read(&cm_closes);
42763+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
42764+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
42765+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
42766+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
42767+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
42768+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
42769+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
42770+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
42771+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
42772+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
42773+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
42774 target_stat_values[++index] = cm_packets_sent;
42775 target_stat_values[++index] = cm_packets_bounced;
42776 target_stat_values[++index] = cm_packets_created;
42777 target_stat_values[++index] = cm_packets_received;
42778 target_stat_values[++index] = cm_packets_dropped;
42779 target_stat_values[++index] = cm_packets_retrans;
42780- target_stat_values[++index] = atomic_read(&cm_listens_created);
42781- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
42782+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
42783+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
42784 target_stat_values[++index] = cm_backlog_drops;
42785- target_stat_values[++index] = atomic_read(&cm_loopbacks);
42786- target_stat_values[++index] = atomic_read(&cm_nodes_created);
42787- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
42788- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
42789- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
42790+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
42791+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
42792+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
42793+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
42794+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
42795 target_stat_values[++index] = nesadapter->free_4kpbl;
42796 target_stat_values[++index] = nesadapter->free_256pbl;
42797 target_stat_values[++index] = int_mod_timer_init;
42798 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
42799 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
42800 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
42801- target_stat_values[++index] = atomic_read(&pau_qps_created);
42802- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
42803+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
42804+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
42805 }
42806
42807 /**
42808diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
42809index 218dd35..97ce31d 100644
42810--- a/drivers/infiniband/hw/nes/nes_verbs.c
42811+++ b/drivers/infiniband/hw/nes/nes_verbs.c
42812@@ -46,9 +46,9 @@
42813
42814 #include <rdma/ib_umem.h>
42815
42816-atomic_t mod_qp_timouts;
42817-atomic_t qps_created;
42818-atomic_t sw_qps_destroyed;
42819+atomic_unchecked_t mod_qp_timouts;
42820+atomic_unchecked_t qps_created;
42821+atomic_unchecked_t sw_qps_destroyed;
42822
42823 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
42824
42825@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
42826 if (init_attr->create_flags)
42827 return ERR_PTR(-EINVAL);
42828
42829- atomic_inc(&qps_created);
42830+ atomic_inc_unchecked(&qps_created);
42831 switch (init_attr->qp_type) {
42832 case IB_QPT_RC:
42833 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
42834@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
42835 struct iw_cm_event cm_event;
42836 int ret = 0;
42837
42838- atomic_inc(&sw_qps_destroyed);
42839+ atomic_inc_unchecked(&sw_qps_destroyed);
42840 nesqp->destroyed = 1;
42841
42842 /* Blow away the connection if it exists. */
42843diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
42844index c00ae09..04e91be 100644
42845--- a/drivers/infiniband/hw/qib/qib.h
42846+++ b/drivers/infiniband/hw/qib/qib.h
42847@@ -52,6 +52,7 @@
42848 #include <linux/kref.h>
42849 #include <linux/sched.h>
42850 #include <linux/kthread.h>
42851+#include <linux/slab.h>
42852
42853 #include "qib_common.h"
42854 #include "qib_verbs.h"
42855diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
42856index 24c41ba..102d71f 100644
42857--- a/drivers/input/gameport/gameport.c
42858+++ b/drivers/input/gameport/gameport.c
42859@@ -490,14 +490,14 @@ EXPORT_SYMBOL(gameport_set_phys);
42860 */
42861 static void gameport_init_port(struct gameport *gameport)
42862 {
42863- static atomic_t gameport_no = ATOMIC_INIT(0);
42864+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
42865
42866 __module_get(THIS_MODULE);
42867
42868 mutex_init(&gameport->drv_mutex);
42869 device_initialize(&gameport->dev);
42870 dev_set_name(&gameport->dev, "gameport%lu",
42871- (unsigned long)atomic_inc_return(&gameport_no) - 1);
42872+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
42873 gameport->dev.bus = &gameport_bus;
42874 gameport->dev.release = gameport_release_port;
42875 if (gameport->parent)
42876diff --git a/drivers/input/input.c b/drivers/input/input.c
42877index 1c4c0db..6f7abe3 100644
42878--- a/drivers/input/input.c
42879+++ b/drivers/input/input.c
42880@@ -1772,7 +1772,7 @@ EXPORT_SYMBOL_GPL(input_class);
42881 */
42882 struct input_dev *input_allocate_device(void)
42883 {
42884- static atomic_t input_no = ATOMIC_INIT(0);
42885+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
42886 struct input_dev *dev;
42887
42888 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
42889@@ -1787,7 +1787,7 @@ struct input_dev *input_allocate_device(void)
42890 INIT_LIST_HEAD(&dev->node);
42891
42892 dev_set_name(&dev->dev, "input%ld",
42893- (unsigned long) atomic_inc_return(&input_no) - 1);
42894+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
42895
42896 __module_get(THIS_MODULE);
42897 }
42898diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
42899index 4a95b22..874c182 100644
42900--- a/drivers/input/joystick/sidewinder.c
42901+++ b/drivers/input/joystick/sidewinder.c
42902@@ -30,6 +30,7 @@
42903 #include <linux/kernel.h>
42904 #include <linux/module.h>
42905 #include <linux/slab.h>
42906+#include <linux/sched.h>
42907 #include <linux/input.h>
42908 #include <linux/gameport.h>
42909 #include <linux/jiffies.h>
42910diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
42911index 603fe0d..f63decc 100644
42912--- a/drivers/input/joystick/xpad.c
42913+++ b/drivers/input/joystick/xpad.c
42914@@ -737,7 +737,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
42915
42916 static int xpad_led_probe(struct usb_xpad *xpad)
42917 {
42918- static atomic_t led_seq = ATOMIC_INIT(0);
42919+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
42920 long led_no;
42921 struct xpad_led *led;
42922 struct led_classdev *led_cdev;
42923@@ -750,7 +750,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
42924 if (!led)
42925 return -ENOMEM;
42926
42927- led_no = (long)atomic_inc_return(&led_seq) - 1;
42928+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
42929
42930 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
42931 led->xpad = xpad;
42932diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
42933index 5a73639..d586683 100644
42934--- a/drivers/input/misc/ims-pcu.c
42935+++ b/drivers/input/misc/ims-pcu.c
42936@@ -1850,7 +1850,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
42937
42938 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
42939 {
42940- static atomic_t device_no = ATOMIC_INIT(0);
42941+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
42942
42943 const struct ims_pcu_device_info *info;
42944 int error;
42945@@ -1881,7 +1881,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
42946 }
42947
42948 /* Device appears to be operable, complete initialization */
42949- pcu->device_no = atomic_inc_return(&device_no) - 1;
42950+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
42951
42952 /*
42953 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
42954diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
42955index 2f0b39d..7370f13 100644
42956--- a/drivers/input/mouse/psmouse.h
42957+++ b/drivers/input/mouse/psmouse.h
42958@@ -116,7 +116,7 @@ struct psmouse_attribute {
42959 ssize_t (*set)(struct psmouse *psmouse, void *data,
42960 const char *buf, size_t count);
42961 bool protect;
42962-};
42963+} __do_const;
42964 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
42965
42966 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
42967diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
42968index b604564..3f14ae4 100644
42969--- a/drivers/input/mousedev.c
42970+++ b/drivers/input/mousedev.c
42971@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
42972
42973 spin_unlock_irq(&client->packet_lock);
42974
42975- if (copy_to_user(buffer, data, count))
42976+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
42977 return -EFAULT;
42978
42979 return count;
42980diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
42981index b29134d..394deb0 100644
42982--- a/drivers/input/serio/serio.c
42983+++ b/drivers/input/serio/serio.c
42984@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
42985 */
42986 static void serio_init_port(struct serio *serio)
42987 {
42988- static atomic_t serio_no = ATOMIC_INIT(0);
42989+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
42990
42991 __module_get(THIS_MODULE);
42992
42993@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
42994 mutex_init(&serio->drv_mutex);
42995 device_initialize(&serio->dev);
42996 dev_set_name(&serio->dev, "serio%ld",
42997- (long)atomic_inc_return(&serio_no) - 1);
42998+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
42999 serio->dev.bus = &serio_bus;
43000 serio->dev.release = serio_release_port;
43001 serio->dev.groups = serio_device_attr_groups;
43002diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43003index c9a02fe..0debc75 100644
43004--- a/drivers/input/serio/serio_raw.c
43005+++ b/drivers/input/serio/serio_raw.c
43006@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43007
43008 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43009 {
43010- static atomic_t serio_raw_no = ATOMIC_INIT(0);
43011+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43012 struct serio_raw *serio_raw;
43013 int err;
43014
43015@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43016 }
43017
43018 snprintf(serio_raw->name, sizeof(serio_raw->name),
43019- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43020+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43021 kref_init(&serio_raw->kref);
43022 INIT_LIST_HEAD(&serio_raw->client_list);
43023 init_waitqueue_head(&serio_raw->wait);
43024diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43025index e5555fc..937986d 100644
43026--- a/drivers/iommu/iommu.c
43027+++ b/drivers/iommu/iommu.c
43028@@ -588,7 +588,7 @@ static struct notifier_block iommu_bus_nb = {
43029 static void iommu_bus_init(struct bus_type *bus, struct iommu_ops *ops)
43030 {
43031 bus_register_notifier(bus, &iommu_bus_nb);
43032- bus_for_each_dev(bus, NULL, ops, add_iommu_group);
43033+ bus_for_each_dev(bus, NULL, (void *)ops, add_iommu_group);
43034 }
43035
43036 /**
43037diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43038index 228632c9..edfe331 100644
43039--- a/drivers/iommu/irq_remapping.c
43040+++ b/drivers/iommu/irq_remapping.c
43041@@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43042 void panic_if_irq_remap(const char *msg)
43043 {
43044 if (irq_remapping_enabled)
43045- panic(msg);
43046+ panic("%s", msg);
43047 }
43048
43049 static void ir_ack_apic_edge(struct irq_data *data)
43050@@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43051
43052 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43053 {
43054- chip->irq_print_chip = ir_print_prefix;
43055- chip->irq_ack = ir_ack_apic_edge;
43056- chip->irq_eoi = ir_ack_apic_level;
43057- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43058+ pax_open_kernel();
43059+ *(void **)&chip->irq_print_chip = ir_print_prefix;
43060+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
43061+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
43062+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43063+ pax_close_kernel();
43064 }
43065
43066 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43067diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43068index 57d165e..611997e 100644
43069--- a/drivers/irqchip/irq-gic.c
43070+++ b/drivers/irqchip/irq-gic.c
43071@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43072 * Supported arch specific GIC irq extension.
43073 * Default make them NULL.
43074 */
43075-struct irq_chip gic_arch_extn = {
43076+irq_chip_no_const gic_arch_extn = {
43077 .irq_eoi = NULL,
43078 .irq_mask = NULL,
43079 .irq_unmask = NULL,
43080@@ -336,7 +336,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43081 chained_irq_exit(chip, desc);
43082 }
43083
43084-static struct irq_chip gic_chip = {
43085+static irq_chip_no_const gic_chip __read_only = {
43086 .name = "GIC",
43087 .irq_mask = gic_mask_irq,
43088 .irq_unmask = gic_unmask_irq,
43089diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43090index 8777065..a4a9967 100644
43091--- a/drivers/irqchip/irq-renesas-irqc.c
43092+++ b/drivers/irqchip/irq-renesas-irqc.c
43093@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43094 struct irqc_priv *p;
43095 struct resource *io;
43096 struct resource *irq;
43097- struct irq_chip *irq_chip;
43098+ irq_chip_no_const *irq_chip;
43099 const char *name = dev_name(&pdev->dev);
43100 int ret;
43101 int k;
43102diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43103index ac6f72b..81150f2 100644
43104--- a/drivers/isdn/capi/capi.c
43105+++ b/drivers/isdn/capi/capi.c
43106@@ -81,8 +81,8 @@ struct capiminor {
43107
43108 struct capi20_appl *ap;
43109 u32 ncci;
43110- atomic_t datahandle;
43111- atomic_t msgid;
43112+ atomic_unchecked_t datahandle;
43113+ atomic_unchecked_t msgid;
43114
43115 struct tty_port port;
43116 int ttyinstop;
43117@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43118 capimsg_setu16(s, 2, mp->ap->applid);
43119 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43120 capimsg_setu8 (s, 5, CAPI_RESP);
43121- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43122+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43123 capimsg_setu32(s, 8, mp->ncci);
43124 capimsg_setu16(s, 12, datahandle);
43125 }
43126@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43127 mp->outbytes -= len;
43128 spin_unlock_bh(&mp->outlock);
43129
43130- datahandle = atomic_inc_return(&mp->datahandle);
43131+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43132 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43133 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43134 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43135 capimsg_setu16(skb->data, 2, mp->ap->applid);
43136 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43137 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43138- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43139+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43140 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43141 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43142 capimsg_setu16(skb->data, 16, len); /* Data length */
43143diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43144index c44950d..10ac276 100644
43145--- a/drivers/isdn/gigaset/bas-gigaset.c
43146+++ b/drivers/isdn/gigaset/bas-gigaset.c
43147@@ -2564,22 +2564,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43148
43149
43150 static const struct gigaset_ops gigops = {
43151- gigaset_write_cmd,
43152- gigaset_write_room,
43153- gigaset_chars_in_buffer,
43154- gigaset_brkchars,
43155- gigaset_init_bchannel,
43156- gigaset_close_bchannel,
43157- gigaset_initbcshw,
43158- gigaset_freebcshw,
43159- gigaset_reinitbcshw,
43160- gigaset_initcshw,
43161- gigaset_freecshw,
43162- gigaset_set_modem_ctrl,
43163- gigaset_baud_rate,
43164- gigaset_set_line_ctrl,
43165- gigaset_isoc_send_skb,
43166- gigaset_isoc_input,
43167+ .write_cmd = gigaset_write_cmd,
43168+ .write_room = gigaset_write_room,
43169+ .chars_in_buffer = gigaset_chars_in_buffer,
43170+ .brkchars = gigaset_brkchars,
43171+ .init_bchannel = gigaset_init_bchannel,
43172+ .close_bchannel = gigaset_close_bchannel,
43173+ .initbcshw = gigaset_initbcshw,
43174+ .freebcshw = gigaset_freebcshw,
43175+ .reinitbcshw = gigaset_reinitbcshw,
43176+ .initcshw = gigaset_initcshw,
43177+ .freecshw = gigaset_freecshw,
43178+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43179+ .baud_rate = gigaset_baud_rate,
43180+ .set_line_ctrl = gigaset_set_line_ctrl,
43181+ .send_skb = gigaset_isoc_send_skb,
43182+ .handle_input = gigaset_isoc_input,
43183 };
43184
43185 /* bas_gigaset_init
43186diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43187index 600c79b..3752bab 100644
43188--- a/drivers/isdn/gigaset/interface.c
43189+++ b/drivers/isdn/gigaset/interface.c
43190@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43191 }
43192 tty->driver_data = cs;
43193
43194- ++cs->port.count;
43195+ atomic_inc(&cs->port.count);
43196
43197- if (cs->port.count == 1) {
43198+ if (atomic_read(&cs->port.count) == 1) {
43199 tty_port_tty_set(&cs->port, tty);
43200 cs->port.low_latency = 1;
43201 }
43202@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43203
43204 if (!cs->connected)
43205 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43206- else if (!cs->port.count)
43207+ else if (!atomic_read(&cs->port.count))
43208 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43209- else if (!--cs->port.count)
43210+ else if (!atomic_dec_return(&cs->port.count))
43211 tty_port_tty_set(&cs->port, NULL);
43212
43213 mutex_unlock(&cs->mutex);
43214diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43215index 8c91fd5..14f13ce 100644
43216--- a/drivers/isdn/gigaset/ser-gigaset.c
43217+++ b/drivers/isdn/gigaset/ser-gigaset.c
43218@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43219 }
43220
43221 static const struct gigaset_ops ops = {
43222- gigaset_write_cmd,
43223- gigaset_write_room,
43224- gigaset_chars_in_buffer,
43225- gigaset_brkchars,
43226- gigaset_init_bchannel,
43227- gigaset_close_bchannel,
43228- gigaset_initbcshw,
43229- gigaset_freebcshw,
43230- gigaset_reinitbcshw,
43231- gigaset_initcshw,
43232- gigaset_freecshw,
43233- gigaset_set_modem_ctrl,
43234- gigaset_baud_rate,
43235- gigaset_set_line_ctrl,
43236- gigaset_m10x_send_skb, /* asyncdata.c */
43237- gigaset_m10x_input, /* asyncdata.c */
43238+ .write_cmd = gigaset_write_cmd,
43239+ .write_room = gigaset_write_room,
43240+ .chars_in_buffer = gigaset_chars_in_buffer,
43241+ .brkchars = gigaset_brkchars,
43242+ .init_bchannel = gigaset_init_bchannel,
43243+ .close_bchannel = gigaset_close_bchannel,
43244+ .initbcshw = gigaset_initbcshw,
43245+ .freebcshw = gigaset_freebcshw,
43246+ .reinitbcshw = gigaset_reinitbcshw,
43247+ .initcshw = gigaset_initcshw,
43248+ .freecshw = gigaset_freecshw,
43249+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43250+ .baud_rate = gigaset_baud_rate,
43251+ .set_line_ctrl = gigaset_set_line_ctrl,
43252+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43253+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
43254 };
43255
43256
43257diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43258index d0a41cb..b953e50 100644
43259--- a/drivers/isdn/gigaset/usb-gigaset.c
43260+++ b/drivers/isdn/gigaset/usb-gigaset.c
43261@@ -547,7 +547,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43262 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43263 memcpy(cs->hw.usb->bchars, buf, 6);
43264 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43265- 0, 0, &buf, 6, 2000);
43266+ 0, 0, buf, 6, 2000);
43267 }
43268
43269 static void gigaset_freebcshw(struct bc_state *bcs)
43270@@ -869,22 +869,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43271 }
43272
43273 static const struct gigaset_ops ops = {
43274- gigaset_write_cmd,
43275- gigaset_write_room,
43276- gigaset_chars_in_buffer,
43277- gigaset_brkchars,
43278- gigaset_init_bchannel,
43279- gigaset_close_bchannel,
43280- gigaset_initbcshw,
43281- gigaset_freebcshw,
43282- gigaset_reinitbcshw,
43283- gigaset_initcshw,
43284- gigaset_freecshw,
43285- gigaset_set_modem_ctrl,
43286- gigaset_baud_rate,
43287- gigaset_set_line_ctrl,
43288- gigaset_m10x_send_skb,
43289- gigaset_m10x_input,
43290+ .write_cmd = gigaset_write_cmd,
43291+ .write_room = gigaset_write_room,
43292+ .chars_in_buffer = gigaset_chars_in_buffer,
43293+ .brkchars = gigaset_brkchars,
43294+ .init_bchannel = gigaset_init_bchannel,
43295+ .close_bchannel = gigaset_close_bchannel,
43296+ .initbcshw = gigaset_initbcshw,
43297+ .freebcshw = gigaset_freebcshw,
43298+ .reinitbcshw = gigaset_reinitbcshw,
43299+ .initcshw = gigaset_initcshw,
43300+ .freecshw = gigaset_freecshw,
43301+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43302+ .baud_rate = gigaset_baud_rate,
43303+ .set_line_ctrl = gigaset_set_line_ctrl,
43304+ .send_skb = gigaset_m10x_send_skb,
43305+ .handle_input = gigaset_m10x_input,
43306 };
43307
43308 /*
43309diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43310index 4d9b195..455075c 100644
43311--- a/drivers/isdn/hardware/avm/b1.c
43312+++ b/drivers/isdn/hardware/avm/b1.c
43313@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43314 }
43315 if (left) {
43316 if (t4file->user) {
43317- if (copy_from_user(buf, dp, left))
43318+ if (left > sizeof buf || copy_from_user(buf, dp, left))
43319 return -EFAULT;
43320 } else {
43321 memcpy(buf, dp, left);
43322@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
43323 }
43324 if (left) {
43325 if (config->user) {
43326- if (copy_from_user(buf, dp, left))
43327+ if (left > sizeof buf || copy_from_user(buf, dp, left))
43328 return -EFAULT;
43329 } else {
43330 memcpy(buf, dp, left);
43331diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
43332index 9b856e1..fa03c92 100644
43333--- a/drivers/isdn/i4l/isdn_common.c
43334+++ b/drivers/isdn/i4l/isdn_common.c
43335@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
43336 } else
43337 return -EINVAL;
43338 case IIOCDBGVAR:
43339+ if (!capable(CAP_SYS_RAWIO))
43340+ return -EPERM;
43341 if (arg) {
43342 if (copy_to_user(argp, &dev, sizeof(ulong)))
43343 return -EFAULT;
43344diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
43345index 91d5730..336523e 100644
43346--- a/drivers/isdn/i4l/isdn_concap.c
43347+++ b/drivers/isdn/i4l/isdn_concap.c
43348@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
43349 }
43350
43351 struct concap_device_ops isdn_concap_reliable_dl_dops = {
43352- &isdn_concap_dl_data_req,
43353- &isdn_concap_dl_connect_req,
43354- &isdn_concap_dl_disconn_req
43355+ .data_req = &isdn_concap_dl_data_req,
43356+ .connect_req = &isdn_concap_dl_connect_req,
43357+ .disconn_req = &isdn_concap_dl_disconn_req
43358 };
43359
43360 /* The following should better go into a dedicated source file such that
43361diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
43362index 3c5f249..5fac4d0 100644
43363--- a/drivers/isdn/i4l/isdn_tty.c
43364+++ b/drivers/isdn/i4l/isdn_tty.c
43365@@ -1508,9 +1508,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
43366
43367 #ifdef ISDN_DEBUG_MODEM_OPEN
43368 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
43369- port->count);
43370+ atomic_read(&port->count));
43371 #endif
43372- port->count++;
43373+ atomic_inc(&port->count);
43374 port->tty = tty;
43375 /*
43376 * Start up serial port
43377@@ -1554,7 +1554,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43378 #endif
43379 return;
43380 }
43381- if ((tty->count == 1) && (port->count != 1)) {
43382+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
43383 /*
43384 * Uh, oh. tty->count is 1, which means that the tty
43385 * structure will be freed. Info->count should always
43386@@ -1563,15 +1563,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
43387 * serial port won't be shutdown.
43388 */
43389 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
43390- "info->count is %d\n", port->count);
43391- port->count = 1;
43392+ "info->count is %d\n", atomic_read(&port->count));
43393+ atomic_set(&port->count, 1);
43394 }
43395- if (--port->count < 0) {
43396+ if (atomic_dec_return(&port->count) < 0) {
43397 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
43398- info->line, port->count);
43399- port->count = 0;
43400+ info->line, atomic_read(&port->count));
43401+ atomic_set(&port->count, 0);
43402 }
43403- if (port->count) {
43404+ if (atomic_read(&port->count)) {
43405 #ifdef ISDN_DEBUG_MODEM_OPEN
43406 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
43407 #endif
43408@@ -1625,7 +1625,7 @@ isdn_tty_hangup(struct tty_struct *tty)
43409 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
43410 return;
43411 isdn_tty_shutdown(info);
43412- port->count = 0;
43413+ atomic_set(&port->count, 0);
43414 port->flags &= ~ASYNC_NORMAL_ACTIVE;
43415 port->tty = NULL;
43416 wake_up_interruptible(&port->open_wait);
43417@@ -1970,7 +1970,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
43418 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
43419 modem_info *info = &dev->mdm.info[i];
43420
43421- if (info->port.count == 0)
43422+ if (atomic_read(&info->port.count) == 0)
43423 continue;
43424 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
43425 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
43426diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
43427index e2d4e58..40cd045 100644
43428--- a/drivers/isdn/i4l/isdn_x25iface.c
43429+++ b/drivers/isdn/i4l/isdn_x25iface.c
43430@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
43431
43432
43433 static struct concap_proto_ops ix25_pops = {
43434- &isdn_x25iface_proto_new,
43435- &isdn_x25iface_proto_del,
43436- &isdn_x25iface_proto_restart,
43437- &isdn_x25iface_proto_close,
43438- &isdn_x25iface_xmit,
43439- &isdn_x25iface_receive,
43440- &isdn_x25iface_connect_ind,
43441- &isdn_x25iface_disconn_ind
43442+ .proto_new = &isdn_x25iface_proto_new,
43443+ .proto_del = &isdn_x25iface_proto_del,
43444+ .restart = &isdn_x25iface_proto_restart,
43445+ .close = &isdn_x25iface_proto_close,
43446+ .encap_and_xmit = &isdn_x25iface_xmit,
43447+ .data_ind = &isdn_x25iface_receive,
43448+ .connect_ind = &isdn_x25iface_connect_ind,
43449+ .disconn_ind = &isdn_x25iface_disconn_ind
43450 };
43451
43452 /* error message helper function */
43453diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
43454index 6a7447c..cae33fe 100644
43455--- a/drivers/isdn/icn/icn.c
43456+++ b/drivers/isdn/icn/icn.c
43457@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
43458 if (count > len)
43459 count = len;
43460 if (user) {
43461- if (copy_from_user(msg, buf, count))
43462+ if (count > sizeof msg || copy_from_user(msg, buf, count))
43463 return -EFAULT;
43464 } else
43465 memcpy(msg, buf, count);
43466diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
43467index a4f05c5..1433bc5 100644
43468--- a/drivers/isdn/mISDN/dsp_cmx.c
43469+++ b/drivers/isdn/mISDN/dsp_cmx.c
43470@@ -1628,7 +1628,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
43471 static u16 dsp_count; /* last sample count */
43472 static int dsp_count_valid; /* if we have last sample count */
43473
43474-void
43475+void __intentional_overflow(-1)
43476 dsp_cmx_send(void *arg)
43477 {
43478 struct dsp_conf *conf;
43479diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
43480index f58a354..fbae176 100644
43481--- a/drivers/leds/leds-clevo-mail.c
43482+++ b/drivers/leds/leds-clevo-mail.c
43483@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
43484 * detected as working, but in reality it is not) as low as
43485 * possible.
43486 */
43487-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
43488+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
43489 {
43490 .callback = clevo_mail_led_dmi_callback,
43491 .ident = "Clevo D410J",
43492diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
43493index 2eb3ef6..295891f 100644
43494--- a/drivers/leds/leds-ss4200.c
43495+++ b/drivers/leds/leds-ss4200.c
43496@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
43497 * detected as working, but in reality it is not) as low as
43498 * possible.
43499 */
43500-static struct dmi_system_id nas_led_whitelist[] __initdata = {
43501+static struct dmi_system_id nas_led_whitelist[] __initconst = {
43502 {
43503 .callback = ss4200_led_dmi_callback,
43504 .ident = "Intel SS4200-E",
43505diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
43506index 0bf1e4e..b4bf44e 100644
43507--- a/drivers/lguest/core.c
43508+++ b/drivers/lguest/core.c
43509@@ -97,9 +97,17 @@ static __init int map_switcher(void)
43510 * The end address needs +1 because __get_vm_area allocates an
43511 * extra guard page, so we need space for that.
43512 */
43513+
43514+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
43515+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
43516+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
43517+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
43518+#else
43519 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
43520 VM_ALLOC, switcher_addr, switcher_addr
43521 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
43522+#endif
43523+
43524 if (!switcher_vma) {
43525 err = -ENOMEM;
43526 printk("lguest: could not map switcher pages high\n");
43527@@ -124,7 +132,7 @@ static __init int map_switcher(void)
43528 * Now the Switcher is mapped at the right address, we can't fail!
43529 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
43530 */
43531- memcpy(switcher_vma->addr, start_switcher_text,
43532+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
43533 end_switcher_text - start_switcher_text);
43534
43535 printk(KERN_INFO "lguest: mapped switcher at %p\n",
43536diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
43537index e8b55c3..3514c37 100644
43538--- a/drivers/lguest/page_tables.c
43539+++ b/drivers/lguest/page_tables.c
43540@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
43541 /*:*/
43542
43543 #ifdef CONFIG_X86_PAE
43544-static void release_pmd(pmd_t *spmd)
43545+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
43546 {
43547 /* If the entry's not present, there's nothing to release. */
43548 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
43549diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
43550index 922a1ac..9dd0c2a 100644
43551--- a/drivers/lguest/x86/core.c
43552+++ b/drivers/lguest/x86/core.c
43553@@ -59,7 +59,7 @@ static struct {
43554 /* Offset from where switcher.S was compiled to where we've copied it */
43555 static unsigned long switcher_offset(void)
43556 {
43557- return switcher_addr - (unsigned long)start_switcher_text;
43558+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
43559 }
43560
43561 /* This cpu's struct lguest_pages (after the Switcher text page) */
43562@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
43563 * These copies are pretty cheap, so we do them unconditionally: */
43564 /* Save the current Host top-level page directory.
43565 */
43566+
43567+#ifdef CONFIG_PAX_PER_CPU_PGD
43568+ pages->state.host_cr3 = read_cr3();
43569+#else
43570 pages->state.host_cr3 = __pa(current->mm->pgd);
43571+#endif
43572+
43573 /*
43574 * Set up the Guest's page tables to see this CPU's pages (and no
43575 * other CPU's pages).
43576@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
43577 * compiled-in switcher code and the high-mapped copy we just made.
43578 */
43579 for (i = 0; i < IDT_ENTRIES; i++)
43580- default_idt_entries[i] += switcher_offset();
43581+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
43582
43583 /*
43584 * Set up the Switcher's per-cpu areas.
43585@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
43586 * it will be undisturbed when we switch. To change %cs and jump we
43587 * need this structure to feed to Intel's "lcall" instruction.
43588 */
43589- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
43590+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
43591 lguest_entry.segment = LGUEST_CS;
43592
43593 /*
43594diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
43595index 40634b0..4f5855e 100644
43596--- a/drivers/lguest/x86/switcher_32.S
43597+++ b/drivers/lguest/x86/switcher_32.S
43598@@ -87,6 +87,7 @@
43599 #include <asm/page.h>
43600 #include <asm/segment.h>
43601 #include <asm/lguest.h>
43602+#include <asm/processor-flags.h>
43603
43604 // We mark the start of the code to copy
43605 // It's placed in .text tho it's never run here
43606@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
43607 // Changes type when we load it: damn Intel!
43608 // For after we switch over our page tables
43609 // That entry will be read-only: we'd crash.
43610+
43611+#ifdef CONFIG_PAX_KERNEXEC
43612+ mov %cr0, %edx
43613+ xor $X86_CR0_WP, %edx
43614+ mov %edx, %cr0
43615+#endif
43616+
43617 movl $(GDT_ENTRY_TSS*8), %edx
43618 ltr %dx
43619
43620@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
43621 // Let's clear it again for our return.
43622 // The GDT descriptor of the Host
43623 // Points to the table after two "size" bytes
43624- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
43625+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
43626 // Clear "used" from type field (byte 5, bit 2)
43627- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
43628+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
43629+
43630+#ifdef CONFIG_PAX_KERNEXEC
43631+ mov %cr0, %eax
43632+ xor $X86_CR0_WP, %eax
43633+ mov %eax, %cr0
43634+#endif
43635
43636 // Once our page table's switched, the Guest is live!
43637 // The Host fades as we run this final step.
43638@@ -295,13 +309,12 @@ deliver_to_host:
43639 // I consulted gcc, and it gave
43640 // These instructions, which I gladly credit:
43641 leal (%edx,%ebx,8), %eax
43642- movzwl (%eax),%edx
43643- movl 4(%eax), %eax
43644- xorw %ax, %ax
43645- orl %eax, %edx
43646+ movl 4(%eax), %edx
43647+ movw (%eax), %dx
43648 // Now the address of the handler's in %edx
43649 // We call it now: its "iret" drops us home.
43650- jmp *%edx
43651+ ljmp $__KERNEL_CS, $1f
43652+1: jmp *%edx
43653
43654 // Every interrupt can come to us here
43655 // But we must truly tell each apart.
43656diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
43657index 7ef7461..5a09dac 100644
43658--- a/drivers/md/bcache/closure.h
43659+++ b/drivers/md/bcache/closure.h
43660@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
43661 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
43662 struct workqueue_struct *wq)
43663 {
43664- BUG_ON(object_is_on_stack(cl));
43665+ BUG_ON(object_starts_on_stack(cl));
43666 closure_set_ip(cl);
43667 cl->fn = fn;
43668 cl->wq = wq;
43669diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
43670index 9a8e66a..10cc762 100644
43671--- a/drivers/md/bitmap.c
43672+++ b/drivers/md/bitmap.c
43673@@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
43674 chunk_kb ? "KB" : "B");
43675 if (bitmap->storage.file) {
43676 seq_printf(seq, ", file: ");
43677- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
43678+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
43679 }
43680
43681 seq_printf(seq, "\n");
43682diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
43683index 5152142..623d141 100644
43684--- a/drivers/md/dm-ioctl.c
43685+++ b/drivers/md/dm-ioctl.c
43686@@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
43687 cmd == DM_LIST_VERSIONS_CMD)
43688 return 0;
43689
43690- if ((cmd == DM_DEV_CREATE_CMD)) {
43691+ if (cmd == DM_DEV_CREATE_CMD) {
43692 if (!*param->name) {
43693 DMWARN("name not supplied when creating device");
43694 return -EINVAL;
43695diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
43696index 7dfdb5c..4caada6 100644
43697--- a/drivers/md/dm-raid1.c
43698+++ b/drivers/md/dm-raid1.c
43699@@ -40,7 +40,7 @@ enum dm_raid1_error {
43700
43701 struct mirror {
43702 struct mirror_set *ms;
43703- atomic_t error_count;
43704+ atomic_unchecked_t error_count;
43705 unsigned long error_type;
43706 struct dm_dev *dev;
43707 sector_t offset;
43708@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
43709 struct mirror *m;
43710
43711 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
43712- if (!atomic_read(&m->error_count))
43713+ if (!atomic_read_unchecked(&m->error_count))
43714 return m;
43715
43716 return NULL;
43717@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
43718 * simple way to tell if a device has encountered
43719 * errors.
43720 */
43721- atomic_inc(&m->error_count);
43722+ atomic_inc_unchecked(&m->error_count);
43723
43724 if (test_and_set_bit(error_type, &m->error_type))
43725 return;
43726@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
43727 struct mirror *m = get_default_mirror(ms);
43728
43729 do {
43730- if (likely(!atomic_read(&m->error_count)))
43731+ if (likely(!atomic_read_unchecked(&m->error_count)))
43732 return m;
43733
43734 if (m-- == ms->mirror)
43735@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
43736 {
43737 struct mirror *default_mirror = get_default_mirror(m->ms);
43738
43739- return !atomic_read(&default_mirror->error_count);
43740+ return !atomic_read_unchecked(&default_mirror->error_count);
43741 }
43742
43743 static int mirror_available(struct mirror_set *ms, struct bio *bio)
43744@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
43745 */
43746 if (likely(region_in_sync(ms, region, 1)))
43747 m = choose_mirror(ms, bio->bi_iter.bi_sector);
43748- else if (m && atomic_read(&m->error_count))
43749+ else if (m && atomic_read_unchecked(&m->error_count))
43750 m = NULL;
43751
43752 if (likely(m))
43753@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
43754 }
43755
43756 ms->mirror[mirror].ms = ms;
43757- atomic_set(&(ms->mirror[mirror].error_count), 0);
43758+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
43759 ms->mirror[mirror].error_type = 0;
43760 ms->mirror[mirror].offset = offset;
43761
43762@@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
43763 */
43764 static char device_status_char(struct mirror *m)
43765 {
43766- if (!atomic_read(&(m->error_count)))
43767+ if (!atomic_read_unchecked(&(m->error_count)))
43768 return 'A';
43769
43770 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
43771diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
43772index 28a9012..9c0f6a5 100644
43773--- a/drivers/md/dm-stats.c
43774+++ b/drivers/md/dm-stats.c
43775@@ -382,7 +382,7 @@ do_sync_free:
43776 synchronize_rcu_expedited();
43777 dm_stat_free(&s->rcu_head);
43778 } else {
43779- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
43780+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
43781 call_rcu(&s->rcu_head, dm_stat_free);
43782 }
43783 return 0;
43784@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
43785 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
43786 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
43787 ));
43788- ACCESS_ONCE(last->last_sector) = end_sector;
43789- ACCESS_ONCE(last->last_rw) = bi_rw;
43790+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
43791+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
43792 }
43793
43794 rcu_read_lock();
43795diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
43796index d1600d2..4c3af3a 100644
43797--- a/drivers/md/dm-stripe.c
43798+++ b/drivers/md/dm-stripe.c
43799@@ -21,7 +21,7 @@ struct stripe {
43800 struct dm_dev *dev;
43801 sector_t physical_start;
43802
43803- atomic_t error_count;
43804+ atomic_unchecked_t error_count;
43805 };
43806
43807 struct stripe_c {
43808@@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
43809 kfree(sc);
43810 return r;
43811 }
43812- atomic_set(&(sc->stripe[i].error_count), 0);
43813+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
43814 }
43815
43816 ti->private = sc;
43817@@ -330,7 +330,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
43818 DMEMIT("%d ", sc->stripes);
43819 for (i = 0; i < sc->stripes; i++) {
43820 DMEMIT("%s ", sc->stripe[i].dev->name);
43821- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
43822+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
43823 'D' : 'A';
43824 }
43825 buffer[i] = '\0';
43826@@ -375,8 +375,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
43827 */
43828 for (i = 0; i < sc->stripes; i++)
43829 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
43830- atomic_inc(&(sc->stripe[i].error_count));
43831- if (atomic_read(&(sc->stripe[i].error_count)) <
43832+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
43833+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
43834 DM_IO_ERROR_THRESHOLD)
43835 schedule_work(&sc->trigger_event);
43836 }
43837diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
43838index 50601ec..6d3b9dc 100644
43839--- a/drivers/md/dm-table.c
43840+++ b/drivers/md/dm-table.c
43841@@ -274,7 +274,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
43842 static int open_dev(struct dm_dev_internal *d, dev_t dev,
43843 struct mapped_device *md)
43844 {
43845- static char *_claim_ptr = "I belong to device-mapper";
43846+ static char _claim_ptr[] = "I belong to device-mapper";
43847 struct block_device *bdev;
43848
43849 int r;
43850@@ -342,7 +342,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
43851 if (!dev_size)
43852 return 0;
43853
43854- if ((start >= dev_size) || (start + len > dev_size)) {
43855+ if ((start >= dev_size) || (len > dev_size - start)) {
43856 DMWARN("%s: %s too small for target: "
43857 "start=%llu, len=%llu, dev_size=%llu",
43858 dm_device_name(ti->table->md), bdevname(bdev, b),
43859diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
43860index b086a94..74cb67e 100644
43861--- a/drivers/md/dm-thin-metadata.c
43862+++ b/drivers/md/dm-thin-metadata.c
43863@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
43864 {
43865 pmd->info.tm = pmd->tm;
43866 pmd->info.levels = 2;
43867- pmd->info.value_type.context = pmd->data_sm;
43868+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
43869 pmd->info.value_type.size = sizeof(__le64);
43870 pmd->info.value_type.inc = data_block_inc;
43871 pmd->info.value_type.dec = data_block_dec;
43872@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
43873
43874 pmd->bl_info.tm = pmd->tm;
43875 pmd->bl_info.levels = 1;
43876- pmd->bl_info.value_type.context = pmd->data_sm;
43877+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
43878 pmd->bl_info.value_type.size = sizeof(__le64);
43879 pmd->bl_info.value_type.inc = data_block_inc;
43880 pmd->bl_info.value_type.dec = data_block_dec;
43881diff --git a/drivers/md/dm.c b/drivers/md/dm.c
43882index 455e649..1f214be 100644
43883--- a/drivers/md/dm.c
43884+++ b/drivers/md/dm.c
43885@@ -178,9 +178,9 @@ struct mapped_device {
43886 /*
43887 * Event handling.
43888 */
43889- atomic_t event_nr;
43890+ atomic_unchecked_t event_nr;
43891 wait_queue_head_t eventq;
43892- atomic_t uevent_seq;
43893+ atomic_unchecked_t uevent_seq;
43894 struct list_head uevent_list;
43895 spinlock_t uevent_lock; /* Protect access to uevent_list */
43896
43897@@ -1884,8 +1884,8 @@ static struct mapped_device *alloc_dev(int minor)
43898 spin_lock_init(&md->deferred_lock);
43899 atomic_set(&md->holders, 1);
43900 atomic_set(&md->open_count, 0);
43901- atomic_set(&md->event_nr, 0);
43902- atomic_set(&md->uevent_seq, 0);
43903+ atomic_set_unchecked(&md->event_nr, 0);
43904+ atomic_set_unchecked(&md->uevent_seq, 0);
43905 INIT_LIST_HEAD(&md->uevent_list);
43906 spin_lock_init(&md->uevent_lock);
43907
43908@@ -2039,7 +2039,7 @@ static void event_callback(void *context)
43909
43910 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
43911
43912- atomic_inc(&md->event_nr);
43913+ atomic_inc_unchecked(&md->event_nr);
43914 wake_up(&md->eventq);
43915 }
43916
43917@@ -2732,18 +2732,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
43918
43919 uint32_t dm_next_uevent_seq(struct mapped_device *md)
43920 {
43921- return atomic_add_return(1, &md->uevent_seq);
43922+ return atomic_add_return_unchecked(1, &md->uevent_seq);
43923 }
43924
43925 uint32_t dm_get_event_nr(struct mapped_device *md)
43926 {
43927- return atomic_read(&md->event_nr);
43928+ return atomic_read_unchecked(&md->event_nr);
43929 }
43930
43931 int dm_wait_event(struct mapped_device *md, int event_nr)
43932 {
43933 return wait_event_interruptible(md->eventq,
43934- (event_nr != atomic_read(&md->event_nr)));
43935+ (event_nr != atomic_read_unchecked(&md->event_nr)));
43936 }
43937
43938 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
43939diff --git a/drivers/md/md.c b/drivers/md/md.c
43940index 2382cfc..0d7e551 100644
43941--- a/drivers/md/md.c
43942+++ b/drivers/md/md.c
43943@@ -194,10 +194,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
43944 * start build, activate spare
43945 */
43946 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
43947-static atomic_t md_event_count;
43948+static atomic_unchecked_t md_event_count;
43949 void md_new_event(struct mddev *mddev)
43950 {
43951- atomic_inc(&md_event_count);
43952+ atomic_inc_unchecked(&md_event_count);
43953 wake_up(&md_event_waiters);
43954 }
43955 EXPORT_SYMBOL_GPL(md_new_event);
43956@@ -207,7 +207,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
43957 */
43958 static void md_new_event_inintr(struct mddev *mddev)
43959 {
43960- atomic_inc(&md_event_count);
43961+ atomic_inc_unchecked(&md_event_count);
43962 wake_up(&md_event_waiters);
43963 }
43964
43965@@ -1462,7 +1462,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
43966 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
43967 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
43968 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
43969- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
43970+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
43971
43972 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
43973 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
43974@@ -1713,7 +1713,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
43975 else
43976 sb->resync_offset = cpu_to_le64(0);
43977
43978- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
43979+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
43980
43981 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
43982 sb->size = cpu_to_le64(mddev->dev_sectors);
43983@@ -2725,7 +2725,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
43984 static ssize_t
43985 errors_show(struct md_rdev *rdev, char *page)
43986 {
43987- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
43988+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
43989 }
43990
43991 static ssize_t
43992@@ -2734,7 +2734,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
43993 char *e;
43994 unsigned long n = simple_strtoul(buf, &e, 10);
43995 if (*buf && (*e == 0 || *e == '\n')) {
43996- atomic_set(&rdev->corrected_errors, n);
43997+ atomic_set_unchecked(&rdev->corrected_errors, n);
43998 return len;
43999 }
44000 return -EINVAL;
44001@@ -3183,8 +3183,8 @@ int md_rdev_init(struct md_rdev *rdev)
44002 rdev->sb_loaded = 0;
44003 rdev->bb_page = NULL;
44004 atomic_set(&rdev->nr_pending, 0);
44005- atomic_set(&rdev->read_errors, 0);
44006- atomic_set(&rdev->corrected_errors, 0);
44007+ atomic_set_unchecked(&rdev->read_errors, 0);
44008+ atomic_set_unchecked(&rdev->corrected_errors, 0);
44009
44010 INIT_LIST_HEAD(&rdev->same_set);
44011 init_waitqueue_head(&rdev->blocked_wait);
44012@@ -7058,7 +7058,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44013
44014 spin_unlock(&pers_lock);
44015 seq_printf(seq, "\n");
44016- seq->poll_event = atomic_read(&md_event_count);
44017+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44018 return 0;
44019 }
44020 if (v == (void*)2) {
44021@@ -7161,7 +7161,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44022 return error;
44023
44024 seq = file->private_data;
44025- seq->poll_event = atomic_read(&md_event_count);
44026+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44027 return error;
44028 }
44029
44030@@ -7178,7 +7178,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44031 /* always allow read */
44032 mask = POLLIN | POLLRDNORM;
44033
44034- if (seq->poll_event != atomic_read(&md_event_count))
44035+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44036 mask |= POLLERR | POLLPRI;
44037 return mask;
44038 }
44039@@ -7222,7 +7222,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44040 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44041 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44042 (int)part_stat_read(&disk->part0, sectors[1]) -
44043- atomic_read(&disk->sync_io);
44044+ atomic_read_unchecked(&disk->sync_io);
44045 /* sync IO will cause sync_io to increase before the disk_stats
44046 * as sync_io is counted when a request starts, and
44047 * disk_stats is counted when it completes.
44048diff --git a/drivers/md/md.h b/drivers/md/md.h
44049index a49d991..3582bb7 100644
44050--- a/drivers/md/md.h
44051+++ b/drivers/md/md.h
44052@@ -94,13 +94,13 @@ struct md_rdev {
44053 * only maintained for arrays that
44054 * support hot removal
44055 */
44056- atomic_t read_errors; /* number of consecutive read errors that
44057+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
44058 * we have tried to ignore.
44059 */
44060 struct timespec last_read_error; /* monotonic time since our
44061 * last read error
44062 */
44063- atomic_t corrected_errors; /* number of corrected read errors,
44064+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44065 * for reporting to userspace and storing
44066 * in superblock.
44067 */
44068@@ -449,7 +449,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44069
44070 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44071 {
44072- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44073+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44074 }
44075
44076 struct md_personality
44077diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44078index 786b689..ea8c956 100644
44079--- a/drivers/md/persistent-data/dm-space-map-metadata.c
44080+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44081@@ -679,7 +679,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44082 * Flick into a mode where all blocks get allocated in the new area.
44083 */
44084 smm->begin = old_len;
44085- memcpy(sm, &bootstrap_ops, sizeof(*sm));
44086+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44087
44088 /*
44089 * Extend.
44090@@ -710,7 +710,7 @@ out:
44091 /*
44092 * Switch back to normal behaviour.
44093 */
44094- memcpy(sm, &ops, sizeof(*sm));
44095+ memcpy((void *)sm, &ops, sizeof(*sm));
44096 return r;
44097 }
44098
44099diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44100index 3e6d115..ffecdeb 100644
44101--- a/drivers/md/persistent-data/dm-space-map.h
44102+++ b/drivers/md/persistent-data/dm-space-map.h
44103@@ -71,6 +71,7 @@ struct dm_space_map {
44104 dm_sm_threshold_fn fn,
44105 void *context);
44106 };
44107+typedef struct dm_space_map __no_const dm_space_map_no_const;
44108
44109 /*----------------------------------------------------------------*/
44110
44111diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44112index 56e24c0..e1c8e1f 100644
44113--- a/drivers/md/raid1.c
44114+++ b/drivers/md/raid1.c
44115@@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44116 if (r1_sync_page_io(rdev, sect, s,
44117 bio->bi_io_vec[idx].bv_page,
44118 READ) != 0)
44119- atomic_add(s, &rdev->corrected_errors);
44120+ atomic_add_unchecked(s, &rdev->corrected_errors);
44121 }
44122 sectors -= s;
44123 sect += s;
44124@@ -2165,7 +2165,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44125 test_bit(In_sync, &rdev->flags)) {
44126 if (r1_sync_page_io(rdev, sect, s,
44127 conf->tmppage, READ)) {
44128- atomic_add(s, &rdev->corrected_errors);
44129+ atomic_add_unchecked(s, &rdev->corrected_errors);
44130 printk(KERN_INFO
44131 "md/raid1:%s: read error corrected "
44132 "(%d sectors at %llu on %s)\n",
44133diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44134index cb882aa..9bd076e 100644
44135--- a/drivers/md/raid10.c
44136+++ b/drivers/md/raid10.c
44137@@ -1949,7 +1949,7 @@ static void end_sync_read(struct bio *bio, int error)
44138 /* The write handler will notice the lack of
44139 * R10BIO_Uptodate and record any errors etc
44140 */
44141- atomic_add(r10_bio->sectors,
44142+ atomic_add_unchecked(r10_bio->sectors,
44143 &conf->mirrors[d].rdev->corrected_errors);
44144
44145 /* for reconstruct, we always reschedule after a read.
44146@@ -2307,7 +2307,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44147 {
44148 struct timespec cur_time_mon;
44149 unsigned long hours_since_last;
44150- unsigned int read_errors = atomic_read(&rdev->read_errors);
44151+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44152
44153 ktime_get_ts(&cur_time_mon);
44154
44155@@ -2329,9 +2329,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44156 * overflowing the shift of read_errors by hours_since_last.
44157 */
44158 if (hours_since_last >= 8 * sizeof(read_errors))
44159- atomic_set(&rdev->read_errors, 0);
44160+ atomic_set_unchecked(&rdev->read_errors, 0);
44161 else
44162- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44163+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44164 }
44165
44166 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44167@@ -2385,8 +2385,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44168 return;
44169
44170 check_decay_read_errors(mddev, rdev);
44171- atomic_inc(&rdev->read_errors);
44172- if (atomic_read(&rdev->read_errors) > max_read_errors) {
44173+ atomic_inc_unchecked(&rdev->read_errors);
44174+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44175 char b[BDEVNAME_SIZE];
44176 bdevname(rdev->bdev, b);
44177
44178@@ -2394,7 +2394,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44179 "md/raid10:%s: %s: Raid device exceeded "
44180 "read_error threshold [cur %d:max %d]\n",
44181 mdname(mddev), b,
44182- atomic_read(&rdev->read_errors), max_read_errors);
44183+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44184 printk(KERN_NOTICE
44185 "md/raid10:%s: %s: Failing raid device\n",
44186 mdname(mddev), b);
44187@@ -2549,7 +2549,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44188 sect +
44189 choose_data_offset(r10_bio, rdev)),
44190 bdevname(rdev->bdev, b));
44191- atomic_add(s, &rdev->corrected_errors);
44192+ atomic_add_unchecked(s, &rdev->corrected_errors);
44193 }
44194
44195 rdev_dec_pending(rdev, mddev);
44196diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44197index ad1b9be..b417412 100644
44198--- a/drivers/md/raid5.c
44199+++ b/drivers/md/raid5.c
44200@@ -1702,6 +1702,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44201 return 1;
44202 }
44203
44204+#ifdef CONFIG_GRKERNSEC_HIDESYM
44205+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44206+#endif
44207+
44208 static int grow_stripes(struct r5conf *conf, int num)
44209 {
44210 struct kmem_cache *sc;
44211@@ -1713,7 +1717,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44212 "raid%d-%s", conf->level, mdname(conf->mddev));
44213 else
44214 sprintf(conf->cache_name[0],
44215+#ifdef CONFIG_GRKERNSEC_HIDESYM
44216+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44217+#else
44218 "raid%d-%p", conf->level, conf->mddev);
44219+#endif
44220 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44221
44222 conf->active_name = 0;
44223@@ -1986,21 +1994,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44224 mdname(conf->mddev), STRIPE_SECTORS,
44225 (unsigned long long)s,
44226 bdevname(rdev->bdev, b));
44227- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44228+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44229 clear_bit(R5_ReadError, &sh->dev[i].flags);
44230 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44231 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44232 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44233
44234- if (atomic_read(&rdev->read_errors))
44235- atomic_set(&rdev->read_errors, 0);
44236+ if (atomic_read_unchecked(&rdev->read_errors))
44237+ atomic_set_unchecked(&rdev->read_errors, 0);
44238 } else {
44239 const char *bdn = bdevname(rdev->bdev, b);
44240 int retry = 0;
44241 int set_bad = 0;
44242
44243 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44244- atomic_inc(&rdev->read_errors);
44245+ atomic_inc_unchecked(&rdev->read_errors);
44246 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44247 printk_ratelimited(
44248 KERN_WARNING
44249@@ -2028,7 +2036,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44250 mdname(conf->mddev),
44251 (unsigned long long)s,
44252 bdn);
44253- } else if (atomic_read(&rdev->read_errors)
44254+ } else if (atomic_read_unchecked(&rdev->read_errors)
44255 > conf->max_nr_stripes)
44256 printk(KERN_WARNING
44257 "md/raid:%s: Too many read errors, failing device %s.\n",
44258diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44259index 983db75..ef9248c 100644
44260--- a/drivers/media/dvb-core/dvbdev.c
44261+++ b/drivers/media/dvb-core/dvbdev.c
44262@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44263 const struct dvb_device *template, void *priv, int type)
44264 {
44265 struct dvb_device *dvbdev;
44266- struct file_operations *dvbdevfops;
44267+ file_operations_no_const *dvbdevfops;
44268 struct device *clsdev;
44269 int minor;
44270 int id;
44271diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44272index 539f4db..cdd403b 100644
44273--- a/drivers/media/dvb-frontends/af9033.h
44274+++ b/drivers/media/dvb-frontends/af9033.h
44275@@ -82,7 +82,7 @@ struct af9033_ops {
44276 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44277 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44278 int onoff);
44279-};
44280+} __no_const;
44281
44282
44283 #if IS_ENABLED(CONFIG_DVB_AF9033)
44284diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44285index 9b6c3bb..baeb5c7 100644
44286--- a/drivers/media/dvb-frontends/dib3000.h
44287+++ b/drivers/media/dvb-frontends/dib3000.h
44288@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44289 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44290 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44291 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44292-};
44293+} __no_const;
44294
44295 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44296 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44297diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44298index ed8cb90..5ef7f79 100644
44299--- a/drivers/media/pci/cx88/cx88-video.c
44300+++ b/drivers/media/pci/cx88/cx88-video.c
44301@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44302
44303 /* ------------------------------------------------------------------ */
44304
44305-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44306-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44307-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44308+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44309+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44310+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44311
44312 module_param_array(video_nr, int, NULL, 0444);
44313 module_param_array(vbi_nr, int, NULL, 0444);
44314diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
44315index 802642d..5534900 100644
44316--- a/drivers/media/pci/ivtv/ivtv-driver.c
44317+++ b/drivers/media/pci/ivtv/ivtv-driver.c
44318@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
44319 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
44320
44321 /* ivtv instance counter */
44322-static atomic_t ivtv_instance = ATOMIC_INIT(0);
44323+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
44324
44325 /* Parameter declarations */
44326 static int cardtype[IVTV_MAX_CARDS];
44327diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
44328index 9a726ea..f5e9b52 100644
44329--- a/drivers/media/platform/omap/omap_vout.c
44330+++ b/drivers/media/platform/omap/omap_vout.c
44331@@ -63,7 +63,6 @@ enum omap_vout_channels {
44332 OMAP_VIDEO2,
44333 };
44334
44335-static struct videobuf_queue_ops video_vbq_ops;
44336 /* Variables configurable through module params*/
44337 static u32 video1_numbuffers = 3;
44338 static u32 video2_numbuffers = 3;
44339@@ -1015,6 +1014,12 @@ static int omap_vout_open(struct file *file)
44340 {
44341 struct videobuf_queue *q;
44342 struct omap_vout_device *vout = NULL;
44343+ static struct videobuf_queue_ops video_vbq_ops = {
44344+ .buf_setup = omap_vout_buffer_setup,
44345+ .buf_prepare = omap_vout_buffer_prepare,
44346+ .buf_release = omap_vout_buffer_release,
44347+ .buf_queue = omap_vout_buffer_queue,
44348+ };
44349
44350 vout = video_drvdata(file);
44351 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
44352@@ -1032,10 +1037,6 @@ static int omap_vout_open(struct file *file)
44353 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
44354
44355 q = &vout->vbq;
44356- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
44357- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
44358- video_vbq_ops.buf_release = omap_vout_buffer_release;
44359- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
44360 spin_lock_init(&vout->vbq_lock);
44361
44362 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
44363diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
44364index fb2acc5..a2fcbdc4 100644
44365--- a/drivers/media/platform/s5p-tv/mixer.h
44366+++ b/drivers/media/platform/s5p-tv/mixer.h
44367@@ -156,7 +156,7 @@ struct mxr_layer {
44368 /** layer index (unique identifier) */
44369 int idx;
44370 /** callbacks for layer methods */
44371- struct mxr_layer_ops ops;
44372+ struct mxr_layer_ops *ops;
44373 /** format array */
44374 const struct mxr_format **fmt_array;
44375 /** size of format array */
44376diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44377index 74344c7..a39e70e 100644
44378--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44379+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
44380@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
44381 {
44382 struct mxr_layer *layer;
44383 int ret;
44384- struct mxr_layer_ops ops = {
44385+ static struct mxr_layer_ops ops = {
44386 .release = mxr_graph_layer_release,
44387 .buffer_set = mxr_graph_buffer_set,
44388 .stream_set = mxr_graph_stream_set,
44389diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
44390index b713403..53cb5ad 100644
44391--- a/drivers/media/platform/s5p-tv/mixer_reg.c
44392+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
44393@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
44394 layer->update_buf = next;
44395 }
44396
44397- layer->ops.buffer_set(layer, layer->update_buf);
44398+ layer->ops->buffer_set(layer, layer->update_buf);
44399
44400 if (done && done != layer->shadow_buf)
44401 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
44402diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
44403index a1ce55f..4a3c4d9 100644
44404--- a/drivers/media/platform/s5p-tv/mixer_video.c
44405+++ b/drivers/media/platform/s5p-tv/mixer_video.c
44406@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
44407 layer->geo.src.height = layer->geo.src.full_height;
44408
44409 mxr_geometry_dump(mdev, &layer->geo);
44410- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44411+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44412 mxr_geometry_dump(mdev, &layer->geo);
44413 }
44414
44415@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
44416 layer->geo.dst.full_width = mbus_fmt.width;
44417 layer->geo.dst.full_height = mbus_fmt.height;
44418 layer->geo.dst.field = mbus_fmt.field;
44419- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44420+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
44421
44422 mxr_geometry_dump(mdev, &layer->geo);
44423 }
44424@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
44425 /* set source size to highest accepted value */
44426 geo->src.full_width = max(geo->dst.full_width, pix->width);
44427 geo->src.full_height = max(geo->dst.full_height, pix->height);
44428- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44429+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44430 mxr_geometry_dump(mdev, &layer->geo);
44431 /* set cropping to total visible screen */
44432 geo->src.width = pix->width;
44433@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
44434 geo->src.x_offset = 0;
44435 geo->src.y_offset = 0;
44436 /* assure consistency of geometry */
44437- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
44438+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
44439 mxr_geometry_dump(mdev, &layer->geo);
44440 /* set full size to lowest possible value */
44441 geo->src.full_width = 0;
44442 geo->src.full_height = 0;
44443- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44444+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
44445 mxr_geometry_dump(mdev, &layer->geo);
44446
44447 /* returning results */
44448@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
44449 target->width = s->r.width;
44450 target->height = s->r.height;
44451
44452- layer->ops.fix_geometry(layer, stage, s->flags);
44453+ layer->ops->fix_geometry(layer, stage, s->flags);
44454
44455 /* retrieve update selection rectangle */
44456 res.left = target->x_offset;
44457@@ -950,13 +950,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
44458 mxr_output_get(mdev);
44459
44460 mxr_layer_update_output(layer);
44461- layer->ops.format_set(layer);
44462+ layer->ops->format_set(layer);
44463 /* enabling layer in hardware */
44464 spin_lock_irqsave(&layer->enq_slock, flags);
44465 layer->state = MXR_LAYER_STREAMING;
44466 spin_unlock_irqrestore(&layer->enq_slock, flags);
44467
44468- layer->ops.stream_set(layer, MXR_ENABLE);
44469+ layer->ops->stream_set(layer, MXR_ENABLE);
44470 mxr_streamer_get(mdev);
44471
44472 return 0;
44473@@ -1026,7 +1026,7 @@ static int stop_streaming(struct vb2_queue *vq)
44474 spin_unlock_irqrestore(&layer->enq_slock, flags);
44475
44476 /* disabling layer in hardware */
44477- layer->ops.stream_set(layer, MXR_DISABLE);
44478+ layer->ops->stream_set(layer, MXR_DISABLE);
44479 /* remove one streamer */
44480 mxr_streamer_put(mdev);
44481 /* allow changes in output configuration */
44482@@ -1065,8 +1065,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
44483
44484 void mxr_layer_release(struct mxr_layer *layer)
44485 {
44486- if (layer->ops.release)
44487- layer->ops.release(layer);
44488+ if (layer->ops->release)
44489+ layer->ops->release(layer);
44490 }
44491
44492 void mxr_base_layer_release(struct mxr_layer *layer)
44493@@ -1092,7 +1092,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
44494
44495 layer->mdev = mdev;
44496 layer->idx = idx;
44497- layer->ops = *ops;
44498+ layer->ops = ops;
44499
44500 spin_lock_init(&layer->enq_slock);
44501 INIT_LIST_HEAD(&layer->enq_list);
44502diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44503index c9388c4..ce71ece 100644
44504--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44505+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
44506@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
44507 {
44508 struct mxr_layer *layer;
44509 int ret;
44510- struct mxr_layer_ops ops = {
44511+ static struct mxr_layer_ops ops = {
44512 .release = mxr_vp_layer_release,
44513 .buffer_set = mxr_vp_buffer_set,
44514 .stream_set = mxr_vp_stream_set,
44515diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
44516index 3890f4f..b5c7511 100644
44517--- a/drivers/media/platform/vivi.c
44518+++ b/drivers/media/platform/vivi.c
44519@@ -58,8 +58,8 @@ MODULE_AUTHOR("Mauro Carvalho Chehab, Ted Walther and John Sokol");
44520 MODULE_LICENSE("Dual BSD/GPL");
44521 MODULE_VERSION(VIVI_VERSION);
44522
44523-static unsigned video_nr = -1;
44524-module_param(video_nr, uint, 0644);
44525+static int video_nr = -1;
44526+module_param(video_nr, int, 0644);
44527 MODULE_PARM_DESC(video_nr, "videoX start number, -1 is autodetect");
44528
44529 static unsigned n_devs = 1;
44530diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
44531index d719e59..63f3470 100644
44532--- a/drivers/media/radio/radio-cadet.c
44533+++ b/drivers/media/radio/radio-cadet.c
44534@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
44535 unsigned char readbuf[RDS_BUFFER];
44536 int i = 0;
44537
44538+ if (count > RDS_BUFFER)
44539+ return -EFAULT;
44540 mutex_lock(&dev->lock);
44541 if (dev->rdsstat == 0)
44542 cadet_start_rds(dev);
44543@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
44544 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
44545 mutex_unlock(&dev->lock);
44546
44547- if (i && copy_to_user(data, readbuf, i))
44548- return -EFAULT;
44549+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
44550+ i = -EFAULT;
44551+
44552 return i;
44553 }
44554
44555diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
44556index 5236035..c622c74 100644
44557--- a/drivers/media/radio/radio-maxiradio.c
44558+++ b/drivers/media/radio/radio-maxiradio.c
44559@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
44560 /* TEA5757 pin mappings */
44561 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
44562
44563-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
44564+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
44565
44566 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
44567 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
44568diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
44569index 050b3bb..79f62b9 100644
44570--- a/drivers/media/radio/radio-shark.c
44571+++ b/drivers/media/radio/radio-shark.c
44572@@ -79,7 +79,7 @@ struct shark_device {
44573 u32 last_val;
44574 };
44575
44576-static atomic_t shark_instance = ATOMIC_INIT(0);
44577+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
44578
44579 static void shark_write_val(struct snd_tea575x *tea, u32 val)
44580 {
44581diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
44582index 8654e0d..0608a64 100644
44583--- a/drivers/media/radio/radio-shark2.c
44584+++ b/drivers/media/radio/radio-shark2.c
44585@@ -74,7 +74,7 @@ struct shark_device {
44586 u8 *transfer_buffer;
44587 };
44588
44589-static atomic_t shark_instance = ATOMIC_INIT(0);
44590+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
44591
44592 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
44593 {
44594diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
44595index 2fd9009..278cc1e 100644
44596--- a/drivers/media/radio/radio-si476x.c
44597+++ b/drivers/media/radio/radio-si476x.c
44598@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
44599 struct si476x_radio *radio;
44600 struct v4l2_ctrl *ctrl;
44601
44602- static atomic_t instance = ATOMIC_INIT(0);
44603+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
44604
44605 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
44606 if (!radio)
44607diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
44608index a1c641e..3007da9 100644
44609--- a/drivers/media/usb/dvb-usb/cxusb.c
44610+++ b/drivers/media/usb/dvb-usb/cxusb.c
44611@@ -1112,7 +1112,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
44612
44613 struct dib0700_adapter_state {
44614 int (*set_param_save) (struct dvb_frontend *);
44615-};
44616+} __no_const;
44617
44618 static int dib7070_set_param_override(struct dvb_frontend *fe)
44619 {
44620diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
44621index ae0f56a..ec71784 100644
44622--- a/drivers/media/usb/dvb-usb/dw2102.c
44623+++ b/drivers/media/usb/dvb-usb/dw2102.c
44624@@ -118,7 +118,7 @@ struct su3000_state {
44625
44626 struct s6x0_state {
44627 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
44628-};
44629+} __no_const;
44630
44631 /* debug */
44632 static int dvb_usb_dw2102_debug;
44633diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44634index 7e2411c..cef73ca 100644
44635--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44636+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
44637@@ -328,7 +328,7 @@ struct v4l2_buffer32 {
44638 __u32 reserved;
44639 };
44640
44641-static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44642+static int get_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
44643 enum v4l2_memory memory)
44644 {
44645 void __user *up_pln;
44646@@ -357,7 +357,7 @@ static int get_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44647 return 0;
44648 }
44649
44650-static int put_v4l2_plane32(struct v4l2_plane *up, struct v4l2_plane32 *up32,
44651+static int put_v4l2_plane32(struct v4l2_plane __user *up, struct v4l2_plane32 __user *up32,
44652 enum v4l2_memory memory)
44653 {
44654 if (copy_in_user(up32, up, 2 * sizeof(__u32)) ||
44655@@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
44656 * by passing a very big num_planes value */
44657 uplane = compat_alloc_user_space(num_planes *
44658 sizeof(struct v4l2_plane));
44659- kp->m.planes = uplane;
44660+ kp->m.planes = (struct v4l2_plane __force_kernel *)uplane;
44661
44662 while (--num_planes >= 0) {
44663 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
44664@@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
44665 if (num_planes == 0)
44666 return 0;
44667
44668- uplane = kp->m.planes;
44669+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
44670 if (get_user(p, &up->m.planes))
44671 return -EFAULT;
44672 uplane32 = compat_ptr(p);
44673@@ -552,7 +552,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
44674 get_user(kp->capability, &up->capability) ||
44675 get_user(kp->flags, &up->flags))
44676 return -EFAULT;
44677- kp->base = compat_ptr(tmp);
44678+ kp->base = (void __force_kernel *)compat_ptr(tmp);
44679 get_v4l2_pix_format(&kp->fmt, &up->fmt);
44680 return 0;
44681 }
44682@@ -658,7 +658,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
44683 n * sizeof(struct v4l2_ext_control32)))
44684 return -EFAULT;
44685 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
44686- kp->controls = kcontrols;
44687+ kp->controls = (struct v4l2_ext_control __force_kernel *)kcontrols;
44688 while (--n >= 0) {
44689 if (copy_in_user(kcontrols, ucontrols, sizeof(*ucontrols)))
44690 return -EFAULT;
44691@@ -680,7 +680,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
44692 static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext_controls32 __user *up)
44693 {
44694 struct v4l2_ext_control32 __user *ucontrols;
44695- struct v4l2_ext_control __user *kcontrols = kp->controls;
44696+ struct v4l2_ext_control __user *kcontrols = (struct v4l2_ext_control __force_user *)kp->controls;
44697 int n = kp->count;
44698 compat_caddr_t p;
44699
44700@@ -774,7 +774,7 @@ static int put_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
44701 put_user(kp->start_block, &up->start_block) ||
44702 put_user(kp->blocks, &up->blocks) ||
44703 put_user(tmp, &up->edid) ||
44704- copy_to_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
44705+ copy_to_user(up->reserved, kp->reserved, sizeof(kp->reserved)))
44706 return -EFAULT;
44707 return 0;
44708 }
44709diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
44710index 55c6832..a91c7a6 100644
44711--- a/drivers/media/v4l2-core/v4l2-ctrls.c
44712+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
44713@@ -1431,8 +1431,8 @@ static int validate_new(const struct v4l2_ctrl *ctrl,
44714 return 0;
44715
44716 case V4L2_CTRL_TYPE_STRING:
44717- len = strlen(c->string);
44718- if (len < ctrl->minimum)
44719+ len = strlen_user(c->string);
44720+ if (!len || len < ctrl->minimum)
44721 return -ERANGE;
44722 if ((len - ctrl->minimum) % ctrl->step)
44723 return -ERANGE;
44724diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
44725index 02d1b63..5fd6b16 100644
44726--- a/drivers/media/v4l2-core/v4l2-device.c
44727+++ b/drivers/media/v4l2-core/v4l2-device.c
44728@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
44729 EXPORT_SYMBOL_GPL(v4l2_device_put);
44730
44731 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
44732- atomic_t *instance)
44733+ atomic_unchecked_t *instance)
44734 {
44735- int num = atomic_inc_return(instance) - 1;
44736+ int num = atomic_inc_return_unchecked(instance) - 1;
44737 int len = strlen(basename);
44738
44739 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
44740diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
44741index d9113cc..7de6ccc 100644
44742--- a/drivers/media/v4l2-core/v4l2-ioctl.c
44743+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
44744@@ -2003,7 +2003,8 @@ struct v4l2_ioctl_info {
44745 struct file *file, void *fh, void *p);
44746 } u;
44747 void (*debug)(const void *arg, bool write_only);
44748-};
44749+} __do_const;
44750+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
44751
44752 /* This control needs a priority check */
44753 #define INFO_FL_PRIO (1 << 0)
44754@@ -2186,7 +2187,7 @@ static long __video_do_ioctl(struct file *file,
44755 struct video_device *vfd = video_devdata(file);
44756 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
44757 bool write_only = false;
44758- struct v4l2_ioctl_info default_info;
44759+ v4l2_ioctl_info_no_const default_info;
44760 const struct v4l2_ioctl_info *info;
44761 void *fh = file->private_data;
44762 struct v4l2_fh *vfh = NULL;
44763@@ -2260,7 +2261,7 @@ done:
44764 }
44765
44766 static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44767- void * __user *user_ptr, void ***kernel_ptr)
44768+ void __user **user_ptr, void ***kernel_ptr)
44769 {
44770 int ret = 0;
44771
44772@@ -2276,7 +2277,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44773 ret = -EINVAL;
44774 break;
44775 }
44776- *user_ptr = (void __user *)buf->m.planes;
44777+ *user_ptr = (void __force_user *)buf->m.planes;
44778 *kernel_ptr = (void *)&buf->m.planes;
44779 *array_size = sizeof(struct v4l2_plane) * buf->length;
44780 ret = 1;
44781@@ -2311,7 +2312,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
44782 ret = -EINVAL;
44783 break;
44784 }
44785- *user_ptr = (void __user *)ctrls->controls;
44786+ *user_ptr = (void __force_user *)ctrls->controls;
44787 *kernel_ptr = (void *)&ctrls->controls;
44788 *array_size = sizeof(struct v4l2_ext_control)
44789 * ctrls->count;
44790@@ -2412,7 +2413,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
44791 }
44792
44793 if (has_array_args) {
44794- *kernel_ptr = user_ptr;
44795+ *kernel_ptr = (void __force_kernel *)user_ptr;
44796 if (copy_to_user(user_ptr, mbuf, array_size))
44797 err = -EFAULT;
44798 goto out_array_args;
44799diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
44800index 570b18a..f880314 100644
44801--- a/drivers/message/fusion/mptbase.c
44802+++ b/drivers/message/fusion/mptbase.c
44803@@ -6755,8 +6755,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
44804 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
44805 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
44806
44807+#ifdef CONFIG_GRKERNSEC_HIDESYM
44808+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
44809+#else
44810 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
44811 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
44812+#endif
44813+
44814 /*
44815 * Rounding UP to nearest 4-kB boundary here...
44816 */
44817@@ -6769,7 +6774,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
44818 ioc->facts.GlobalCredits);
44819
44820 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
44821+#ifdef CONFIG_GRKERNSEC_HIDESYM
44822+ NULL, NULL);
44823+#else
44824 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
44825+#endif
44826 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
44827 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
44828 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
44829diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
44830index 00d339c..2ea899d 100644
44831--- a/drivers/message/fusion/mptsas.c
44832+++ b/drivers/message/fusion/mptsas.c
44833@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
44834 return 0;
44835 }
44836
44837+static inline void
44838+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
44839+{
44840+ if (phy_info->port_details) {
44841+ phy_info->port_details->rphy = rphy;
44842+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
44843+ ioc->name, rphy));
44844+ }
44845+
44846+ if (rphy) {
44847+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
44848+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
44849+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
44850+ ioc->name, rphy, rphy->dev.release));
44851+ }
44852+}
44853+
44854 /* no mutex */
44855 static void
44856 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
44857@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
44858 return NULL;
44859 }
44860
44861-static inline void
44862-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
44863-{
44864- if (phy_info->port_details) {
44865- phy_info->port_details->rphy = rphy;
44866- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
44867- ioc->name, rphy));
44868- }
44869-
44870- if (rphy) {
44871- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
44872- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
44873- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
44874- ioc->name, rphy, rphy->dev.release));
44875- }
44876-}
44877-
44878 static inline struct sas_port *
44879 mptsas_get_port(struct mptsas_phyinfo *phy_info)
44880 {
44881diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
44882index 727819c..ad74694 100644
44883--- a/drivers/message/fusion/mptscsih.c
44884+++ b/drivers/message/fusion/mptscsih.c
44885@@ -1271,15 +1271,16 @@ mptscsih_info(struct Scsi_Host *SChost)
44886
44887 h = shost_priv(SChost);
44888
44889- if (h) {
44890- if (h->info_kbuf == NULL)
44891- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
44892- return h->info_kbuf;
44893- h->info_kbuf[0] = '\0';
44894+ if (!h)
44895+ return NULL;
44896
44897- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
44898- h->info_kbuf[size-1] = '\0';
44899- }
44900+ if (h->info_kbuf == NULL)
44901+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
44902+ return h->info_kbuf;
44903+ h->info_kbuf[0] = '\0';
44904+
44905+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
44906+ h->info_kbuf[size-1] = '\0';
44907
44908 return h->info_kbuf;
44909 }
44910diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
44911index b7d87cd..3fb36da 100644
44912--- a/drivers/message/i2o/i2o_proc.c
44913+++ b/drivers/message/i2o/i2o_proc.c
44914@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
44915 "Array Controller Device"
44916 };
44917
44918-static char *chtostr(char *tmp, u8 *chars, int n)
44919-{
44920- tmp[0] = 0;
44921- return strncat(tmp, (char *)chars, n);
44922-}
44923-
44924 static int i2o_report_query_status(struct seq_file *seq, int block_status,
44925 char *group)
44926 {
44927@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
44928 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
44929 {
44930 struct i2o_controller *c = (struct i2o_controller *)seq->private;
44931- static u32 work32[5];
44932- static u8 *work8 = (u8 *) work32;
44933- static u16 *work16 = (u16 *) work32;
44934+ u32 work32[5];
44935+ u8 *work8 = (u8 *) work32;
44936+ u16 *work16 = (u16 *) work32;
44937 int token;
44938 u32 hwcap;
44939
44940@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
44941 } *result;
44942
44943 i2o_exec_execute_ddm_table ddm_table;
44944- char tmp[28 + 1];
44945
44946 result = kmalloc(sizeof(*result), GFP_KERNEL);
44947 if (!result)
44948@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
44949
44950 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
44951 seq_printf(seq, "%-#8x", ddm_table.module_id);
44952- seq_printf(seq, "%-29s",
44953- chtostr(tmp, ddm_table.module_name_version, 28));
44954+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
44955 seq_printf(seq, "%9d ", ddm_table.data_size);
44956 seq_printf(seq, "%8d", ddm_table.code_size);
44957
44958@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
44959
44960 i2o_driver_result_table *result;
44961 i2o_driver_store_table *dst;
44962- char tmp[28 + 1];
44963
44964 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
44965 if (result == NULL)
44966@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
44967
44968 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
44969 seq_printf(seq, "%-#8x", dst->module_id);
44970- seq_printf(seq, "%-29s",
44971- chtostr(tmp, dst->module_name_version, 28));
44972- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
44973+ seq_printf(seq, "%-.28s", dst->module_name_version);
44974+ seq_printf(seq, "%-.8s", dst->date);
44975 seq_printf(seq, "%8d ", dst->module_size);
44976 seq_printf(seq, "%8d ", dst->mpb_size);
44977 seq_printf(seq, "0x%04x", dst->module_flags);
44978@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
44979 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
44980 {
44981 struct i2o_device *d = (struct i2o_device *)seq->private;
44982- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
44983+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
44984 // == (allow) 512d bytes (max)
44985- static u16 *work16 = (u16 *) work32;
44986+ u16 *work16 = (u16 *) work32;
44987 int token;
44988- char tmp[16 + 1];
44989
44990 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
44991
44992@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
44993 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
44994 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
44995 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
44996- seq_printf(seq, "Vendor info : %s\n",
44997- chtostr(tmp, (u8 *) (work32 + 2), 16));
44998- seq_printf(seq, "Product info : %s\n",
44999- chtostr(tmp, (u8 *) (work32 + 6), 16));
45000- seq_printf(seq, "Description : %s\n",
45001- chtostr(tmp, (u8 *) (work32 + 10), 16));
45002- seq_printf(seq, "Product rev. : %s\n",
45003- chtostr(tmp, (u8 *) (work32 + 14), 8));
45004+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
45005+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
45006+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
45007+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
45008
45009 seq_printf(seq, "Serial number : ");
45010 print_serial_number(seq, (u8 *) (work32 + 16),
45011@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
45012 u8 pad[256]; // allow up to 256 byte (max) serial number
45013 } result;
45014
45015- char tmp[24 + 1];
45016-
45017 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
45018
45019 if (token < 0) {
45020@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
45021 }
45022
45023 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
45024- seq_printf(seq, "Module name : %s\n",
45025- chtostr(tmp, result.module_name, 24));
45026- seq_printf(seq, "Module revision : %s\n",
45027- chtostr(tmp, result.module_rev, 8));
45028+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
45029+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
45030
45031 seq_printf(seq, "Serial number : ");
45032 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
45033@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
45034 u8 instance_number[4];
45035 } result;
45036
45037- char tmp[64 + 1];
45038-
45039 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
45040
45041 if (token < 0) {
45042@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
45043 return 0;
45044 }
45045
45046- seq_printf(seq, "Device name : %s\n",
45047- chtostr(tmp, result.device_name, 64));
45048- seq_printf(seq, "Service name : %s\n",
45049- chtostr(tmp, result.service_name, 64));
45050- seq_printf(seq, "Physical name : %s\n",
45051- chtostr(tmp, result.physical_location, 64));
45052- seq_printf(seq, "Instance number : %s\n",
45053- chtostr(tmp, result.instance_number, 4));
45054+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
45055+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
45056+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
45057+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
45058
45059 return 0;
45060 }
45061@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
45062 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
45063 {
45064 struct i2o_device *d = (struct i2o_device *)seq->private;
45065- static u32 work32[12];
45066- static u16 *work16 = (u16 *) work32;
45067- static u8 *work8 = (u8 *) work32;
45068+ u32 work32[12];
45069+ u16 *work16 = (u16 *) work32;
45070+ u8 *work8 = (u8 *) work32;
45071 int token;
45072
45073 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
45074diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
45075index 92752fb..a7494f6 100644
45076--- a/drivers/message/i2o/iop.c
45077+++ b/drivers/message/i2o/iop.c
45078@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
45079
45080 spin_lock_irqsave(&c->context_list_lock, flags);
45081
45082- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
45083- atomic_inc(&c->context_list_counter);
45084+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
45085+ atomic_inc_unchecked(&c->context_list_counter);
45086
45087- entry->context = atomic_read(&c->context_list_counter);
45088+ entry->context = atomic_read_unchecked(&c->context_list_counter);
45089
45090 list_add(&entry->list, &c->context_list);
45091
45092@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
45093
45094 #if BITS_PER_LONG == 64
45095 spin_lock_init(&c->context_list_lock);
45096- atomic_set(&c->context_list_counter, 0);
45097+ atomic_set_unchecked(&c->context_list_counter, 0);
45098 INIT_LIST_HEAD(&c->context_list);
45099 #endif
45100
45101diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
45102index d1a22aa..d0f7bf7 100644
45103--- a/drivers/mfd/ab8500-debugfs.c
45104+++ b/drivers/mfd/ab8500-debugfs.c
45105@@ -100,7 +100,7 @@ static int irq_last;
45106 static u32 *irq_count;
45107 static int num_irqs;
45108
45109-static struct device_attribute **dev_attr;
45110+static device_attribute_no_const **dev_attr;
45111 static char **event_name;
45112
45113 static u8 avg_sample = SAMPLE_16;
45114diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
45115index a83eed5..62a58a9 100644
45116--- a/drivers/mfd/max8925-i2c.c
45117+++ b/drivers/mfd/max8925-i2c.c
45118@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
45119 const struct i2c_device_id *id)
45120 {
45121 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
45122- static struct max8925_chip *chip;
45123+ struct max8925_chip *chip;
45124 struct device_node *node = client->dev.of_node;
45125
45126 if (node && !pdata) {
45127diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
45128index 460a014..21d3061 100644
45129--- a/drivers/mfd/tps65910.c
45130+++ b/drivers/mfd/tps65910.c
45131@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
45132 struct tps65910_platform_data *pdata)
45133 {
45134 int ret = 0;
45135- static struct regmap_irq_chip *tps6591x_irqs_chip;
45136+ struct regmap_irq_chip *tps6591x_irqs_chip;
45137
45138 if (!irq) {
45139 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
45140diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
45141index 596b1f6..5b6ab74 100644
45142--- a/drivers/mfd/twl4030-irq.c
45143+++ b/drivers/mfd/twl4030-irq.c
45144@@ -34,6 +34,7 @@
45145 #include <linux/of.h>
45146 #include <linux/irqdomain.h>
45147 #include <linux/i2c/twl.h>
45148+#include <asm/pgtable.h>
45149
45150 #include "twl-core.h"
45151
45152@@ -725,10 +726,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
45153 * Install an irq handler for each of the SIH modules;
45154 * clone dummy irq_chip since PIH can't *do* anything
45155 */
45156- twl4030_irq_chip = dummy_irq_chip;
45157- twl4030_irq_chip.name = "twl4030";
45158+ pax_open_kernel();
45159+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
45160+ *(const char **)&twl4030_irq_chip.name = "twl4030";
45161
45162- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
45163+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
45164+ pax_close_kernel();
45165
45166 for (i = irq_base; i < irq_end; i++) {
45167 irq_set_chip_and_handler(i, &twl4030_irq_chip,
45168diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
45169index 464419b..64bae8d 100644
45170--- a/drivers/misc/c2port/core.c
45171+++ b/drivers/misc/c2port/core.c
45172@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
45173 goto error_idr_alloc;
45174 c2dev->id = ret;
45175
45176- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
45177+ pax_open_kernel();
45178+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
45179+ pax_close_kernel();
45180
45181 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
45182 "c2port%d", c2dev->id);
45183diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
45184index 3f2b625..945e179 100644
45185--- a/drivers/misc/eeprom/sunxi_sid.c
45186+++ b/drivers/misc/eeprom/sunxi_sid.c
45187@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
45188
45189 platform_set_drvdata(pdev, sid_data);
45190
45191- sid_bin_attr.size = sid_data->keysize;
45192+ pax_open_kernel();
45193+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
45194+ pax_close_kernel();
45195 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
45196 return -ENODEV;
45197
45198diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
45199index 36f5d52..32311c3 100644
45200--- a/drivers/misc/kgdbts.c
45201+++ b/drivers/misc/kgdbts.c
45202@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
45203 char before[BREAK_INSTR_SIZE];
45204 char after[BREAK_INSTR_SIZE];
45205
45206- probe_kernel_read(before, (char *)kgdbts_break_test,
45207+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
45208 BREAK_INSTR_SIZE);
45209 init_simple_test();
45210 ts.tst = plant_and_detach_test;
45211@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
45212 /* Activate test with initial breakpoint */
45213 if (!is_early)
45214 kgdb_breakpoint();
45215- probe_kernel_read(after, (char *)kgdbts_break_test,
45216+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
45217 BREAK_INSTR_SIZE);
45218 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
45219 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
45220diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
45221index 3ef4627..8d00486 100644
45222--- a/drivers/misc/lis3lv02d/lis3lv02d.c
45223+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
45224@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
45225 * the lid is closed. This leads to interrupts as soon as a little move
45226 * is done.
45227 */
45228- atomic_inc(&lis3->count);
45229+ atomic_inc_unchecked(&lis3->count);
45230
45231 wake_up_interruptible(&lis3->misc_wait);
45232 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
45233@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
45234 if (lis3->pm_dev)
45235 pm_runtime_get_sync(lis3->pm_dev);
45236
45237- atomic_set(&lis3->count, 0);
45238+ atomic_set_unchecked(&lis3->count, 0);
45239 return 0;
45240 }
45241
45242@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
45243 add_wait_queue(&lis3->misc_wait, &wait);
45244 while (true) {
45245 set_current_state(TASK_INTERRUPTIBLE);
45246- data = atomic_xchg(&lis3->count, 0);
45247+ data = atomic_xchg_unchecked(&lis3->count, 0);
45248 if (data)
45249 break;
45250
45251@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
45252 struct lis3lv02d, miscdev);
45253
45254 poll_wait(file, &lis3->misc_wait, wait);
45255- if (atomic_read(&lis3->count))
45256+ if (atomic_read_unchecked(&lis3->count))
45257 return POLLIN | POLLRDNORM;
45258 return 0;
45259 }
45260diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
45261index c439c82..1f20f57 100644
45262--- a/drivers/misc/lis3lv02d/lis3lv02d.h
45263+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
45264@@ -297,7 +297,7 @@ struct lis3lv02d {
45265 struct input_polled_dev *idev; /* input device */
45266 struct platform_device *pdev; /* platform device */
45267 struct regulator_bulk_data regulators[2];
45268- atomic_t count; /* interrupt count after last read */
45269+ atomic_unchecked_t count; /* interrupt count after last read */
45270 union axis_conversion ac; /* hw -> logical axis */
45271 int mapped_btns[3];
45272
45273diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
45274index 2f30bad..c4c13d0 100644
45275--- a/drivers/misc/sgi-gru/gruhandles.c
45276+++ b/drivers/misc/sgi-gru/gruhandles.c
45277@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
45278 unsigned long nsec;
45279
45280 nsec = CLKS2NSEC(clks);
45281- atomic_long_inc(&mcs_op_statistics[op].count);
45282- atomic_long_add(nsec, &mcs_op_statistics[op].total);
45283+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
45284+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
45285 if (mcs_op_statistics[op].max < nsec)
45286 mcs_op_statistics[op].max = nsec;
45287 }
45288diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
45289index 4f76359..cdfcb2e 100644
45290--- a/drivers/misc/sgi-gru/gruprocfs.c
45291+++ b/drivers/misc/sgi-gru/gruprocfs.c
45292@@ -32,9 +32,9 @@
45293
45294 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
45295
45296-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
45297+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
45298 {
45299- unsigned long val = atomic_long_read(v);
45300+ unsigned long val = atomic_long_read_unchecked(v);
45301
45302 seq_printf(s, "%16lu %s\n", val, id);
45303 }
45304@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
45305
45306 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
45307 for (op = 0; op < mcsop_last; op++) {
45308- count = atomic_long_read(&mcs_op_statistics[op].count);
45309- total = atomic_long_read(&mcs_op_statistics[op].total);
45310+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
45311+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
45312 max = mcs_op_statistics[op].max;
45313 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
45314 count ? total / count : 0, max);
45315diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
45316index 5c3ce24..4915ccb 100644
45317--- a/drivers/misc/sgi-gru/grutables.h
45318+++ b/drivers/misc/sgi-gru/grutables.h
45319@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
45320 * GRU statistics.
45321 */
45322 struct gru_stats_s {
45323- atomic_long_t vdata_alloc;
45324- atomic_long_t vdata_free;
45325- atomic_long_t gts_alloc;
45326- atomic_long_t gts_free;
45327- atomic_long_t gms_alloc;
45328- atomic_long_t gms_free;
45329- atomic_long_t gts_double_allocate;
45330- atomic_long_t assign_context;
45331- atomic_long_t assign_context_failed;
45332- atomic_long_t free_context;
45333- atomic_long_t load_user_context;
45334- atomic_long_t load_kernel_context;
45335- atomic_long_t lock_kernel_context;
45336- atomic_long_t unlock_kernel_context;
45337- atomic_long_t steal_user_context;
45338- atomic_long_t steal_kernel_context;
45339- atomic_long_t steal_context_failed;
45340- atomic_long_t nopfn;
45341- atomic_long_t asid_new;
45342- atomic_long_t asid_next;
45343- atomic_long_t asid_wrap;
45344- atomic_long_t asid_reuse;
45345- atomic_long_t intr;
45346- atomic_long_t intr_cbr;
45347- atomic_long_t intr_tfh;
45348- atomic_long_t intr_spurious;
45349- atomic_long_t intr_mm_lock_failed;
45350- atomic_long_t call_os;
45351- atomic_long_t call_os_wait_queue;
45352- atomic_long_t user_flush_tlb;
45353- atomic_long_t user_unload_context;
45354- atomic_long_t user_exception;
45355- atomic_long_t set_context_option;
45356- atomic_long_t check_context_retarget_intr;
45357- atomic_long_t check_context_unload;
45358- atomic_long_t tlb_dropin;
45359- atomic_long_t tlb_preload_page;
45360- atomic_long_t tlb_dropin_fail_no_asid;
45361- atomic_long_t tlb_dropin_fail_upm;
45362- atomic_long_t tlb_dropin_fail_invalid;
45363- atomic_long_t tlb_dropin_fail_range_active;
45364- atomic_long_t tlb_dropin_fail_idle;
45365- atomic_long_t tlb_dropin_fail_fmm;
45366- atomic_long_t tlb_dropin_fail_no_exception;
45367- atomic_long_t tfh_stale_on_fault;
45368- atomic_long_t mmu_invalidate_range;
45369- atomic_long_t mmu_invalidate_page;
45370- atomic_long_t flush_tlb;
45371- atomic_long_t flush_tlb_gru;
45372- atomic_long_t flush_tlb_gru_tgh;
45373- atomic_long_t flush_tlb_gru_zero_asid;
45374+ atomic_long_unchecked_t vdata_alloc;
45375+ atomic_long_unchecked_t vdata_free;
45376+ atomic_long_unchecked_t gts_alloc;
45377+ atomic_long_unchecked_t gts_free;
45378+ atomic_long_unchecked_t gms_alloc;
45379+ atomic_long_unchecked_t gms_free;
45380+ atomic_long_unchecked_t gts_double_allocate;
45381+ atomic_long_unchecked_t assign_context;
45382+ atomic_long_unchecked_t assign_context_failed;
45383+ atomic_long_unchecked_t free_context;
45384+ atomic_long_unchecked_t load_user_context;
45385+ atomic_long_unchecked_t load_kernel_context;
45386+ atomic_long_unchecked_t lock_kernel_context;
45387+ atomic_long_unchecked_t unlock_kernel_context;
45388+ atomic_long_unchecked_t steal_user_context;
45389+ atomic_long_unchecked_t steal_kernel_context;
45390+ atomic_long_unchecked_t steal_context_failed;
45391+ atomic_long_unchecked_t nopfn;
45392+ atomic_long_unchecked_t asid_new;
45393+ atomic_long_unchecked_t asid_next;
45394+ atomic_long_unchecked_t asid_wrap;
45395+ atomic_long_unchecked_t asid_reuse;
45396+ atomic_long_unchecked_t intr;
45397+ atomic_long_unchecked_t intr_cbr;
45398+ atomic_long_unchecked_t intr_tfh;
45399+ atomic_long_unchecked_t intr_spurious;
45400+ atomic_long_unchecked_t intr_mm_lock_failed;
45401+ atomic_long_unchecked_t call_os;
45402+ atomic_long_unchecked_t call_os_wait_queue;
45403+ atomic_long_unchecked_t user_flush_tlb;
45404+ atomic_long_unchecked_t user_unload_context;
45405+ atomic_long_unchecked_t user_exception;
45406+ atomic_long_unchecked_t set_context_option;
45407+ atomic_long_unchecked_t check_context_retarget_intr;
45408+ atomic_long_unchecked_t check_context_unload;
45409+ atomic_long_unchecked_t tlb_dropin;
45410+ atomic_long_unchecked_t tlb_preload_page;
45411+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
45412+ atomic_long_unchecked_t tlb_dropin_fail_upm;
45413+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
45414+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
45415+ atomic_long_unchecked_t tlb_dropin_fail_idle;
45416+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
45417+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
45418+ atomic_long_unchecked_t tfh_stale_on_fault;
45419+ atomic_long_unchecked_t mmu_invalidate_range;
45420+ atomic_long_unchecked_t mmu_invalidate_page;
45421+ atomic_long_unchecked_t flush_tlb;
45422+ atomic_long_unchecked_t flush_tlb_gru;
45423+ atomic_long_unchecked_t flush_tlb_gru_tgh;
45424+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
45425
45426- atomic_long_t copy_gpa;
45427- atomic_long_t read_gpa;
45428+ atomic_long_unchecked_t copy_gpa;
45429+ atomic_long_unchecked_t read_gpa;
45430
45431- atomic_long_t mesq_receive;
45432- atomic_long_t mesq_receive_none;
45433- atomic_long_t mesq_send;
45434- atomic_long_t mesq_send_failed;
45435- atomic_long_t mesq_noop;
45436- atomic_long_t mesq_send_unexpected_error;
45437- atomic_long_t mesq_send_lb_overflow;
45438- atomic_long_t mesq_send_qlimit_reached;
45439- atomic_long_t mesq_send_amo_nacked;
45440- atomic_long_t mesq_send_put_nacked;
45441- atomic_long_t mesq_page_overflow;
45442- atomic_long_t mesq_qf_locked;
45443- atomic_long_t mesq_qf_noop_not_full;
45444- atomic_long_t mesq_qf_switch_head_failed;
45445- atomic_long_t mesq_qf_unexpected_error;
45446- atomic_long_t mesq_noop_unexpected_error;
45447- atomic_long_t mesq_noop_lb_overflow;
45448- atomic_long_t mesq_noop_qlimit_reached;
45449- atomic_long_t mesq_noop_amo_nacked;
45450- atomic_long_t mesq_noop_put_nacked;
45451- atomic_long_t mesq_noop_page_overflow;
45452+ atomic_long_unchecked_t mesq_receive;
45453+ atomic_long_unchecked_t mesq_receive_none;
45454+ atomic_long_unchecked_t mesq_send;
45455+ atomic_long_unchecked_t mesq_send_failed;
45456+ atomic_long_unchecked_t mesq_noop;
45457+ atomic_long_unchecked_t mesq_send_unexpected_error;
45458+ atomic_long_unchecked_t mesq_send_lb_overflow;
45459+ atomic_long_unchecked_t mesq_send_qlimit_reached;
45460+ atomic_long_unchecked_t mesq_send_amo_nacked;
45461+ atomic_long_unchecked_t mesq_send_put_nacked;
45462+ atomic_long_unchecked_t mesq_page_overflow;
45463+ atomic_long_unchecked_t mesq_qf_locked;
45464+ atomic_long_unchecked_t mesq_qf_noop_not_full;
45465+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
45466+ atomic_long_unchecked_t mesq_qf_unexpected_error;
45467+ atomic_long_unchecked_t mesq_noop_unexpected_error;
45468+ atomic_long_unchecked_t mesq_noop_lb_overflow;
45469+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
45470+ atomic_long_unchecked_t mesq_noop_amo_nacked;
45471+ atomic_long_unchecked_t mesq_noop_put_nacked;
45472+ atomic_long_unchecked_t mesq_noop_page_overflow;
45473
45474 };
45475
45476@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
45477 tghop_invalidate, mcsop_last};
45478
45479 struct mcs_op_statistic {
45480- atomic_long_t count;
45481- atomic_long_t total;
45482+ atomic_long_unchecked_t count;
45483+ atomic_long_unchecked_t total;
45484 unsigned long max;
45485 };
45486
45487@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
45488
45489 #define STAT(id) do { \
45490 if (gru_options & OPT_STATS) \
45491- atomic_long_inc(&gru_stats.id); \
45492+ atomic_long_inc_unchecked(&gru_stats.id); \
45493 } while (0)
45494
45495 #ifdef CONFIG_SGI_GRU_DEBUG
45496diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
45497index c862cd4..0d176fe 100644
45498--- a/drivers/misc/sgi-xp/xp.h
45499+++ b/drivers/misc/sgi-xp/xp.h
45500@@ -288,7 +288,7 @@ struct xpc_interface {
45501 xpc_notify_func, void *);
45502 void (*received) (short, int, void *);
45503 enum xp_retval (*partid_to_nasids) (short, void *);
45504-};
45505+} __no_const;
45506
45507 extern struct xpc_interface xpc_interface;
45508
45509diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
45510index 01be66d..e3a0c7e 100644
45511--- a/drivers/misc/sgi-xp/xp_main.c
45512+++ b/drivers/misc/sgi-xp/xp_main.c
45513@@ -78,13 +78,13 @@ xpc_notloaded(void)
45514 }
45515
45516 struct xpc_interface xpc_interface = {
45517- (void (*)(int))xpc_notloaded,
45518- (void (*)(int))xpc_notloaded,
45519- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
45520- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
45521+ .connect = (void (*)(int))xpc_notloaded,
45522+ .disconnect = (void (*)(int))xpc_notloaded,
45523+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
45524+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
45525 void *))xpc_notloaded,
45526- (void (*)(short, int, void *))xpc_notloaded,
45527- (enum xp_retval(*)(short, void *))xpc_notloaded
45528+ .received = (void (*)(short, int, void *))xpc_notloaded,
45529+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
45530 };
45531 EXPORT_SYMBOL_GPL(xpc_interface);
45532
45533diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
45534index b94d5f7..7f494c5 100644
45535--- a/drivers/misc/sgi-xp/xpc.h
45536+++ b/drivers/misc/sgi-xp/xpc.h
45537@@ -835,6 +835,7 @@ struct xpc_arch_operations {
45538 void (*received_payload) (struct xpc_channel *, void *);
45539 void (*notify_senders_of_disconnect) (struct xpc_channel *);
45540 };
45541+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
45542
45543 /* struct xpc_partition act_state values (for XPC HB) */
45544
45545@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
45546 /* found in xpc_main.c */
45547 extern struct device *xpc_part;
45548 extern struct device *xpc_chan;
45549-extern struct xpc_arch_operations xpc_arch_ops;
45550+extern xpc_arch_operations_no_const xpc_arch_ops;
45551 extern int xpc_disengage_timelimit;
45552 extern int xpc_disengage_timedout;
45553 extern int xpc_activate_IRQ_rcvd;
45554diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
45555index 82dc574..8539ab2 100644
45556--- a/drivers/misc/sgi-xp/xpc_main.c
45557+++ b/drivers/misc/sgi-xp/xpc_main.c
45558@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
45559 .notifier_call = xpc_system_die,
45560 };
45561
45562-struct xpc_arch_operations xpc_arch_ops;
45563+xpc_arch_operations_no_const xpc_arch_ops;
45564
45565 /*
45566 * Timer function to enforce the timelimit on the partition disengage.
45567@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
45568
45569 if (((die_args->trapnr == X86_TRAP_MF) ||
45570 (die_args->trapnr == X86_TRAP_XF)) &&
45571- !user_mode_vm(die_args->regs))
45572+ !user_mode(die_args->regs))
45573 xpc_die_deactivate();
45574
45575 break;
45576diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
45577index 452782b..0c10e40 100644
45578--- a/drivers/mmc/card/block.c
45579+++ b/drivers/mmc/card/block.c
45580@@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
45581 if (idata->ic.postsleep_min_us)
45582 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
45583
45584- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
45585+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
45586 err = -EFAULT;
45587 goto cmd_rel_host;
45588 }
45589diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
45590index f51b5ba..86614a7 100644
45591--- a/drivers/mmc/core/mmc_ops.c
45592+++ b/drivers/mmc/core/mmc_ops.c
45593@@ -247,7 +247,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
45594 void *data_buf;
45595 int is_on_stack;
45596
45597- is_on_stack = object_is_on_stack(buf);
45598+ is_on_stack = object_starts_on_stack(buf);
45599 if (is_on_stack) {
45600 /*
45601 * dma onto stack is unsafe/nonportable, but callers to this
45602diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
45603index 6834977..824ee1b 100644
45604--- a/drivers/mmc/host/dw_mmc.h
45605+++ b/drivers/mmc/host/dw_mmc.h
45606@@ -259,5 +259,5 @@ struct dw_mci_drv_data {
45607 int (*parse_dt)(struct dw_mci *host);
45608 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
45609 struct dw_mci_tuning_data *tuning_data);
45610-};
45611+} __do_const;
45612 #endif /* _DW_MMC_H_ */
45613diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
45614index 771c60a..12cb615 100644
45615--- a/drivers/mmc/host/mmci.c
45616+++ b/drivers/mmc/host/mmci.c
45617@@ -1570,7 +1570,9 @@ static int mmci_probe(struct amba_device *dev,
45618 mmc->caps2 = plat->capabilities2;
45619
45620 if (variant->busy_detect) {
45621- mmci_ops.card_busy = mmci_card_busy;
45622+ pax_open_kernel();
45623+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
45624+ pax_close_kernel();
45625 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
45626 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
45627 mmc->max_busy_timeout = 0;
45628diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
45629index b841bb7..d82712f5 100644
45630--- a/drivers/mmc/host/sdhci-esdhc-imx.c
45631+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
45632@@ -1031,9 +1031,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
45633 host->mmc->caps |= MMC_CAP_1_8V_DDR;
45634 }
45635
45636- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
45637- sdhci_esdhc_ops.platform_execute_tuning =
45638+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
45639+ pax_open_kernel();
45640+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
45641 esdhc_executing_tuning;
45642+ pax_close_kernel();
45643+ }
45644
45645 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
45646 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
45647diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
45648index d61eb5a..88c0f5d 100644
45649--- a/drivers/mmc/host/sdhci-s3c.c
45650+++ b/drivers/mmc/host/sdhci-s3c.c
45651@@ -657,9 +657,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
45652 * we can use overriding functions instead of default.
45653 */
45654 if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
45655- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
45656- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
45657- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
45658+ pax_open_kernel();
45659+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
45660+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
45661+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
45662+ pax_close_kernel();
45663 }
45664
45665 /* It supports additional host capabilities if needed */
45666diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
45667index 6293855..3415551 100644
45668--- a/drivers/mtd/chips/cfi_cmdset_0020.c
45669+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
45670@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
45671 size_t totlen = 0, thislen;
45672 int ret = 0;
45673 size_t buflen = 0;
45674- static char *buffer;
45675+ char *buffer;
45676
45677 if (!ECCBUF_SIZE) {
45678 /* We should fall back to a general writev implementation.
45679diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
45680index c07cd57..61c4fbd 100644
45681--- a/drivers/mtd/nand/denali.c
45682+++ b/drivers/mtd/nand/denali.c
45683@@ -24,6 +24,7 @@
45684 #include <linux/slab.h>
45685 #include <linux/mtd/mtd.h>
45686 #include <linux/module.h>
45687+#include <linux/slab.h>
45688
45689 #include "denali.h"
45690
45691diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45692index bb77f75..47539b1 100644
45693--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45694+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
45695@@ -370,7 +370,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
45696
45697 /* first try to map the upper buffer directly */
45698 if (virt_addr_valid(this->upper_buf) &&
45699- !object_is_on_stack(this->upper_buf)) {
45700+ !object_starts_on_stack(this->upper_buf)) {
45701 sg_init_one(sgl, this->upper_buf, this->upper_len);
45702 ret = dma_map_sg(this->dev, sgl, 1, dr);
45703 if (ret == 0)
45704diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
45705index 51b9d6a..52af9a7 100644
45706--- a/drivers/mtd/nftlmount.c
45707+++ b/drivers/mtd/nftlmount.c
45708@@ -24,6 +24,7 @@
45709 #include <asm/errno.h>
45710 #include <linux/delay.h>
45711 #include <linux/slab.h>
45712+#include <linux/sched.h>
45713 #include <linux/mtd/mtd.h>
45714 #include <linux/mtd/nand.h>
45715 #include <linux/mtd/nftl.h>
45716diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
45717index cf49c22..971b133 100644
45718--- a/drivers/mtd/sm_ftl.c
45719+++ b/drivers/mtd/sm_ftl.c
45720@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
45721 #define SM_CIS_VENDOR_OFFSET 0x59
45722 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
45723 {
45724- struct attribute_group *attr_group;
45725+ attribute_group_no_const *attr_group;
45726 struct attribute **attributes;
45727 struct sm_sysfs_attribute *vendor_attribute;
45728 char *vendor;
45729diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
45730index f847e16..fc8dbe9 100644
45731--- a/drivers/net/bonding/bond_netlink.c
45732+++ b/drivers/net/bonding/bond_netlink.c
45733@@ -542,7 +542,7 @@ nla_put_failure:
45734 return -EMSGSIZE;
45735 }
45736
45737-struct rtnl_link_ops bond_link_ops __read_mostly = {
45738+struct rtnl_link_ops bond_link_ops = {
45739 .kind = "bond",
45740 .priv_size = sizeof(struct bonding),
45741 .setup = bond_setup,
45742diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
45743index 9e7d95d..d447b88 100644
45744--- a/drivers/net/can/Kconfig
45745+++ b/drivers/net/can/Kconfig
45746@@ -104,7 +104,7 @@ config CAN_JANZ_ICAN3
45747
45748 config CAN_FLEXCAN
45749 tristate "Support for Freescale FLEXCAN based chips"
45750- depends on ARM || PPC
45751+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
45752 ---help---
45753 Say Y here if you want to support for Freescale FlexCAN.
45754
45755diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
45756index 455d4c3..3353ee7 100644
45757--- a/drivers/net/ethernet/8390/ax88796.c
45758+++ b/drivers/net/ethernet/8390/ax88796.c
45759@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
45760 if (ax->plat->reg_offsets)
45761 ei_local->reg_offset = ax->plat->reg_offsets;
45762 else {
45763+ resource_size_t _mem_size = mem_size;
45764+ do_div(_mem_size, 0x18);
45765 ei_local->reg_offset = ax->reg_offsets;
45766 for (ret = 0; ret < 0x18; ret++)
45767- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
45768+ ax->reg_offsets[ret] = _mem_size * ret;
45769 }
45770
45771 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
45772diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
45773index 7330681..7e9e463 100644
45774--- a/drivers/net/ethernet/altera/altera_tse_main.c
45775+++ b/drivers/net/ethernet/altera/altera_tse_main.c
45776@@ -1182,7 +1182,7 @@ static int tse_shutdown(struct net_device *dev)
45777 return 0;
45778 }
45779
45780-static struct net_device_ops altera_tse_netdev_ops = {
45781+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
45782 .ndo_open = tse_open,
45783 .ndo_stop = tse_shutdown,
45784 .ndo_start_xmit = tse_start_xmit,
45785@@ -1439,11 +1439,13 @@ static int altera_tse_probe(struct platform_device *pdev)
45786 ndev->netdev_ops = &altera_tse_netdev_ops;
45787 altera_tse_set_ethtool_ops(ndev);
45788
45789+ pax_open_kernel();
45790 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
45791
45792 if (priv->hash_filter)
45793 altera_tse_netdev_ops.ndo_set_rx_mode =
45794 tse_set_rx_mode_hashfilter;
45795+ pax_close_kernel();
45796
45797 /* Scatter/gather IO is not supported,
45798 * so it is turned off
45799diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45800index 3448cc0..67b2dc4 100644
45801--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45802+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
45803@@ -1058,7 +1058,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
45804 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
45805 {
45806 /* RX_MODE controlling object */
45807- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
45808+ bnx2x_init_rx_mode_obj(bp);
45809
45810 /* multicast configuration controlling object */
45811 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
45812diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45813index 31297266..944cf6e 100644
45814--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45815+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
45816@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
45817 return rc;
45818 }
45819
45820-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
45821- struct bnx2x_rx_mode_obj *o)
45822+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
45823 {
45824 if (CHIP_IS_E1x(bp)) {
45825- o->wait_comp = bnx2x_empty_rx_mode_wait;
45826- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
45827+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
45828+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
45829 } else {
45830- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
45831- o->config_rx_mode = bnx2x_set_rx_mode_e2;
45832+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
45833+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
45834 }
45835 }
45836
45837diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45838index 80f6c79..fb7d12d 100644
45839--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45840+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
45841@@ -1340,8 +1340,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
45842
45843 /********************* RX MODE ****************/
45844
45845-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
45846- struct bnx2x_rx_mode_obj *o);
45847+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
45848
45849 /**
45850 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
45851diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
45852index 04321e5..b51cdc4 100644
45853--- a/drivers/net/ethernet/broadcom/tg3.h
45854+++ b/drivers/net/ethernet/broadcom/tg3.h
45855@@ -150,6 +150,7 @@
45856 #define CHIPREV_ID_5750_A0 0x4000
45857 #define CHIPREV_ID_5750_A1 0x4001
45858 #define CHIPREV_ID_5750_A3 0x4003
45859+#define CHIPREV_ID_5750_C1 0x4201
45860 #define CHIPREV_ID_5750_C2 0x4202
45861 #define CHIPREV_ID_5752_A0_HW 0x5000
45862 #define CHIPREV_ID_5752_A0 0x6000
45863diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
45864index 13f9636..228040f 100644
45865--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
45866+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
45867@@ -1690,10 +1690,10 @@ bna_cb_ioceth_reset(void *arg)
45868 }
45869
45870 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
45871- bna_cb_ioceth_enable,
45872- bna_cb_ioceth_disable,
45873- bna_cb_ioceth_hbfail,
45874- bna_cb_ioceth_reset
45875+ .enable_cbfn = bna_cb_ioceth_enable,
45876+ .disable_cbfn = bna_cb_ioceth_disable,
45877+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
45878+ .reset_cbfn = bna_cb_ioceth_reset
45879 };
45880
45881 static void bna_attr_init(struct bna_ioceth *ioceth)
45882diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
45883index 8cffcdf..aadf043 100644
45884--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
45885+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
45886@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
45887 */
45888 struct l2t_skb_cb {
45889 arp_failure_handler_func arp_failure_handler;
45890-};
45891+} __no_const;
45892
45893 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
45894
45895diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
45896index 24e16e3..bfe6ef2 100644
45897--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
45898+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
45899@@ -2139,7 +2139,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
45900
45901 int i;
45902 struct adapter *ap = netdev2adap(dev);
45903- static const unsigned int *reg_ranges;
45904+ const unsigned int *reg_ranges;
45905 int arr_size = 0, buf_size = 0;
45906
45907 if (is_t4(ap->params.chip)) {
45908diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
45909index c05b66d..ed69872 100644
45910--- a/drivers/net/ethernet/dec/tulip/de4x5.c
45911+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
45912@@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
45913 for (i=0; i<ETH_ALEN; i++) {
45914 tmp.addr[i] = dev->dev_addr[i];
45915 }
45916- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
45917+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
45918 break;
45919
45920 case DE4X5_SET_HWADDR: /* Set the hardware address */
45921@@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
45922 spin_lock_irqsave(&lp->lock, flags);
45923 memcpy(&statbuf, &lp->pktStats, ioc->len);
45924 spin_unlock_irqrestore(&lp->lock, flags);
45925- if (copy_to_user(ioc->data, &statbuf, ioc->len))
45926+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
45927 return -EFAULT;
45928 break;
45929 }
45930diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
45931index dc19bc5..f2d4548 100644
45932--- a/drivers/net/ethernet/emulex/benet/be_main.c
45933+++ b/drivers/net/ethernet/emulex/benet/be_main.c
45934@@ -535,7 +535,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
45935
45936 if (wrapped)
45937 newacc += 65536;
45938- ACCESS_ONCE(*acc) = newacc;
45939+ ACCESS_ONCE_RW(*acc) = newacc;
45940 }
45941
45942 static void populate_erx_stats(struct be_adapter *adapter,
45943diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
45944index 68069ea..c4484f6 100644
45945--- a/drivers/net/ethernet/faraday/ftgmac100.c
45946+++ b/drivers/net/ethernet/faraday/ftgmac100.c
45947@@ -30,6 +30,8 @@
45948 #include <linux/netdevice.h>
45949 #include <linux/phy.h>
45950 #include <linux/platform_device.h>
45951+#include <linux/interrupt.h>
45952+#include <linux/irqreturn.h>
45953 #include <net/ip.h>
45954
45955 #include "ftgmac100.h"
45956diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
45957index 8be5b40..081bc1b 100644
45958--- a/drivers/net/ethernet/faraday/ftmac100.c
45959+++ b/drivers/net/ethernet/faraday/ftmac100.c
45960@@ -31,6 +31,8 @@
45961 #include <linux/module.h>
45962 #include <linux/netdevice.h>
45963 #include <linux/platform_device.h>
45964+#include <linux/interrupt.h>
45965+#include <linux/irqreturn.h>
45966
45967 #include "ftmac100.h"
45968
45969diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
45970index e61e637..9117795 100644
45971--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
45972+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
45973@@ -436,7 +436,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
45974 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
45975
45976 /* Update the base adjustement value. */
45977- ACCESS_ONCE(pf->ptp_base_adj) = incval;
45978+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
45979 smp_mb(); /* Force the above update. */
45980 }
45981
45982diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
45983index 8902ae6..e7bcdce 100644
45984--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
45985+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
45986@@ -771,7 +771,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
45987 }
45988
45989 /* update the base incval used to calculate frequency adjustment */
45990- ACCESS_ONCE(adapter->base_incval) = incval;
45991+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
45992 smp_mb();
45993
45994 /* need lock to prevent incorrect read while modifying cyclecounter */
45995diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
45996index 089b713..28d87ae 100644
45997--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
45998+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
45999@@ -3461,7 +3461,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
46000 struct __vxge_hw_fifo *fifo;
46001 struct vxge_hw_fifo_config *config;
46002 u32 txdl_size, txdl_per_memblock;
46003- struct vxge_hw_mempool_cbs fifo_mp_callback;
46004+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
46005+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
46006+ };
46007+
46008 struct __vxge_hw_virtualpath *vpath;
46009
46010 if ((vp == NULL) || (attr == NULL)) {
46011@@ -3544,8 +3547,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
46012 goto exit;
46013 }
46014
46015- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
46016-
46017 fifo->mempool =
46018 __vxge_hw_mempool_create(vpath->hldev,
46019 fifo->config->memblock_size,
46020diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
46021index ba20c72..f30c0fe 100644
46022--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
46023+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
46024@@ -2176,7 +2176,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
46025 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
46026 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
46027 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
46028- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
46029+ pax_open_kernel();
46030+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
46031+ pax_close_kernel();
46032 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
46033 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
46034 max_tx_rings = QLCNIC_MAX_TX_RINGS;
46035diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
46036index be7d7a6..a8983f8 100644
46037--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
46038+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
46039@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
46040 case QLCNIC_NON_PRIV_FUNC:
46041 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
46042 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
46043- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
46044+ pax_open_kernel();
46045+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
46046+ pax_close_kernel();
46047 break;
46048 case QLCNIC_PRIV_FUNC:
46049 ahw->op_mode = QLCNIC_PRIV_FUNC;
46050 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
46051- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
46052+ pax_open_kernel();
46053+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
46054+ pax_close_kernel();
46055 break;
46056 case QLCNIC_MGMT_FUNC:
46057 ahw->op_mode = QLCNIC_MGMT_FUNC;
46058 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
46059- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
46060+ pax_open_kernel();
46061+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
46062+ pax_close_kernel();
46063 break;
46064 default:
46065 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
46066diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
46067index 37b979b..50f5b95 100644
46068--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
46069+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
46070@@ -1217,7 +1217,7 @@ flash_temp:
46071 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
46072 {
46073 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
46074- static const struct qlcnic_dump_operations *fw_dump_ops;
46075+ const struct qlcnic_dump_operations *fw_dump_ops;
46076 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
46077 u32 entry_offset, dump, no_entries, buf_offset = 0;
46078 int i, k, ops_cnt, ops_index, dump_size = 0;
46079diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
46080index aa1c079..2b1a3e8 100644
46081--- a/drivers/net/ethernet/realtek/r8169.c
46082+++ b/drivers/net/ethernet/realtek/r8169.c
46083@@ -758,22 +758,22 @@ struct rtl8169_private {
46084 struct mdio_ops {
46085 void (*write)(struct rtl8169_private *, int, int);
46086 int (*read)(struct rtl8169_private *, int);
46087- } mdio_ops;
46088+ } __no_const mdio_ops;
46089
46090 struct pll_power_ops {
46091 void (*down)(struct rtl8169_private *);
46092 void (*up)(struct rtl8169_private *);
46093- } pll_power_ops;
46094+ } __no_const pll_power_ops;
46095
46096 struct jumbo_ops {
46097 void (*enable)(struct rtl8169_private *);
46098 void (*disable)(struct rtl8169_private *);
46099- } jumbo_ops;
46100+ } __no_const jumbo_ops;
46101
46102 struct csi_ops {
46103 void (*write)(struct rtl8169_private *, int, int);
46104 u32 (*read)(struct rtl8169_private *, int);
46105- } csi_ops;
46106+ } __no_const csi_ops;
46107
46108 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
46109 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
46110diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
46111index 6b861e3..204ac86 100644
46112--- a/drivers/net/ethernet/sfc/ptp.c
46113+++ b/drivers/net/ethernet/sfc/ptp.c
46114@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
46115 ptp->start.dma_addr);
46116
46117 /* Clear flag that signals MC ready */
46118- ACCESS_ONCE(*start) = 0;
46119+ ACCESS_ONCE_RW(*start) = 0;
46120 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
46121 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
46122 EFX_BUG_ON_PARANOID(rc);
46123diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46124index 50617c5..b13724c 100644
46125--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46126+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
46127@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
46128
46129 writel(value, ioaddr + MMC_CNTRL);
46130
46131- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
46132- MMC_CNTRL, value);
46133+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
46134+// MMC_CNTRL, value);
46135 }
46136
46137 /* To mask all all interrupts.*/
46138diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
46139index d18f711d..5755800 100644
46140--- a/drivers/net/hyperv/hyperv_net.h
46141+++ b/drivers/net/hyperv/hyperv_net.h
46142@@ -101,7 +101,7 @@ struct rndis_device {
46143
46144 enum rndis_device_state state;
46145 bool link_state;
46146- atomic_t new_req_id;
46147+ atomic_unchecked_t new_req_id;
46148
46149 spinlock_t request_lock;
46150 struct list_head req_list;
46151diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
46152index 143a98c..d54fbaa 100644
46153--- a/drivers/net/hyperv/rndis_filter.c
46154+++ b/drivers/net/hyperv/rndis_filter.c
46155@@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
46156 * template
46157 */
46158 set = &rndis_msg->msg.set_req;
46159- set->req_id = atomic_inc_return(&dev->new_req_id);
46160+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
46161
46162 /* Add to the request list */
46163 spin_lock_irqsave(&dev->request_lock, flags);
46164@@ -834,7 +834,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
46165
46166 /* Setup the rndis set */
46167 halt = &request->request_msg.msg.halt_req;
46168- halt->req_id = atomic_inc_return(&dev->new_req_id);
46169+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
46170
46171 /* Ignore return since this msg is optional. */
46172 rndis_filter_send_request(dev, request);
46173diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
46174index 78f18be..1d19c62 100644
46175--- a/drivers/net/ieee802154/fakehard.c
46176+++ b/drivers/net/ieee802154/fakehard.c
46177@@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
46178 phy->transmit_power = 0xbf;
46179
46180 dev->netdev_ops = &fake_ops;
46181- dev->ml_priv = &fake_mlme;
46182+ dev->ml_priv = (void *)&fake_mlme;
46183
46184 priv = netdev_priv(dev);
46185 priv->phy = phy;
46186diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
46187index 7eec598..90b8428 100644
46188--- a/drivers/net/macvlan.c
46189+++ b/drivers/net/macvlan.c
46190@@ -984,13 +984,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
46191 int macvlan_link_register(struct rtnl_link_ops *ops)
46192 {
46193 /* common fields */
46194- ops->priv_size = sizeof(struct macvlan_dev);
46195- ops->validate = macvlan_validate;
46196- ops->maxtype = IFLA_MACVLAN_MAX;
46197- ops->policy = macvlan_policy;
46198- ops->changelink = macvlan_changelink;
46199- ops->get_size = macvlan_get_size;
46200- ops->fill_info = macvlan_fill_info;
46201+ pax_open_kernel();
46202+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
46203+ *(void **)&ops->validate = macvlan_validate;
46204+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
46205+ *(const void **)&ops->policy = macvlan_policy;
46206+ *(void **)&ops->changelink = macvlan_changelink;
46207+ *(void **)&ops->get_size = macvlan_get_size;
46208+ *(void **)&ops->fill_info = macvlan_fill_info;
46209+ pax_close_kernel();
46210
46211 return rtnl_link_register(ops);
46212 };
46213@@ -1044,7 +1046,7 @@ static int macvlan_device_event(struct notifier_block *unused,
46214 return NOTIFY_DONE;
46215 }
46216
46217-static struct notifier_block macvlan_notifier_block __read_mostly = {
46218+static struct notifier_block macvlan_notifier_block = {
46219 .notifier_call = macvlan_device_event,
46220 };
46221
46222diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
46223index 3381c4f..dea5fd5 100644
46224--- a/drivers/net/macvtap.c
46225+++ b/drivers/net/macvtap.c
46226@@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
46227 }
46228
46229 ret = 0;
46230- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
46231+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
46232 put_user(q->flags, &ifr->ifr_flags))
46233 ret = -EFAULT;
46234 macvtap_put_vlan(vlan);
46235@@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
46236 return NOTIFY_DONE;
46237 }
46238
46239-static struct notifier_block macvtap_notifier_block __read_mostly = {
46240+static struct notifier_block macvtap_notifier_block = {
46241 .notifier_call = macvtap_device_event,
46242 };
46243
46244diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
46245index e3923eb..2a0373b 100644
46246--- a/drivers/net/ppp/ppp_generic.c
46247+++ b/drivers/net/ppp/ppp_generic.c
46248@@ -1012,7 +1012,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46249 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
46250 struct ppp_stats stats;
46251 struct ppp_comp_stats cstats;
46252- char *vers;
46253
46254 switch (cmd) {
46255 case SIOCGPPPSTATS:
46256@@ -1034,8 +1033,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
46257 break;
46258
46259 case SIOCGPPPVER:
46260- vers = PPP_VERSION;
46261- if (copy_to_user(addr, vers, strlen(vers) + 1))
46262+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
46263 break;
46264 err = 0;
46265 break;
46266diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
46267index 1252d9c..80e660b 100644
46268--- a/drivers/net/slip/slhc.c
46269+++ b/drivers/net/slip/slhc.c
46270@@ -488,7 +488,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
46271 register struct tcphdr *thp;
46272 register struct iphdr *ip;
46273 register struct cstate *cs;
46274- int len, hdrlen;
46275+ long len, hdrlen;
46276 unsigned char *cp = icp;
46277
46278 /* We've got a compressed packet; read the change byte */
46279diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
46280index ce4989b..b40b328 100644
46281--- a/drivers/net/team/team.c
46282+++ b/drivers/net/team/team.c
46283@@ -2868,7 +2868,7 @@ static int team_device_event(struct notifier_block *unused,
46284 return NOTIFY_DONE;
46285 }
46286
46287-static struct notifier_block team_notifier_block __read_mostly = {
46288+static struct notifier_block team_notifier_block = {
46289 .notifier_call = team_device_event,
46290 };
46291
46292diff --git a/drivers/net/tun.c b/drivers/net/tun.c
46293index ee328ba..c4a0041 100644
46294--- a/drivers/net/tun.c
46295+++ b/drivers/net/tun.c
46296@@ -1876,7 +1876,7 @@ unlock:
46297 }
46298
46299 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
46300- unsigned long arg, int ifreq_len)
46301+ unsigned long arg, size_t ifreq_len)
46302 {
46303 struct tun_file *tfile = file->private_data;
46304 struct tun_struct *tun;
46305@@ -1889,6 +1889,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
46306 unsigned int ifindex;
46307 int ret;
46308
46309+ if (ifreq_len > sizeof ifr)
46310+ return -EFAULT;
46311+
46312 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
46313 if (copy_from_user(&ifr, argp, ifreq_len))
46314 return -EFAULT;
46315diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
46316index 660bd5e..ac59452 100644
46317--- a/drivers/net/usb/hso.c
46318+++ b/drivers/net/usb/hso.c
46319@@ -71,7 +71,7 @@
46320 #include <asm/byteorder.h>
46321 #include <linux/serial_core.h>
46322 #include <linux/serial.h>
46323-
46324+#include <asm/local.h>
46325
46326 #define MOD_AUTHOR "Option Wireless"
46327 #define MOD_DESCRIPTION "USB High Speed Option driver"
46328@@ -1179,7 +1179,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
46329 struct urb *urb;
46330
46331 urb = serial->rx_urb[0];
46332- if (serial->port.count > 0) {
46333+ if (atomic_read(&serial->port.count) > 0) {
46334 count = put_rxbuf_data(urb, serial);
46335 if (count == -1)
46336 return;
46337@@ -1217,7 +1217,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
46338 DUMP1(urb->transfer_buffer, urb->actual_length);
46339
46340 /* Anyone listening? */
46341- if (serial->port.count == 0)
46342+ if (atomic_read(&serial->port.count) == 0)
46343 return;
46344
46345 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
46346@@ -1287,8 +1287,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
46347 tty_port_tty_set(&serial->port, tty);
46348
46349 /* check for port already opened, if not set the termios */
46350- serial->port.count++;
46351- if (serial->port.count == 1) {
46352+ if (atomic_inc_return(&serial->port.count) == 1) {
46353 serial->rx_state = RX_IDLE;
46354 /* Force default termio settings */
46355 _hso_serial_set_termios(tty, NULL);
46356@@ -1300,7 +1299,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
46357 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
46358 if (result) {
46359 hso_stop_serial_device(serial->parent);
46360- serial->port.count--;
46361+ atomic_dec(&serial->port.count);
46362 kref_put(&serial->parent->ref, hso_serial_ref_free);
46363 }
46364 } else {
46365@@ -1337,10 +1336,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
46366
46367 /* reset the rts and dtr */
46368 /* do the actual close */
46369- serial->port.count--;
46370+ atomic_dec(&serial->port.count);
46371
46372- if (serial->port.count <= 0) {
46373- serial->port.count = 0;
46374+ if (atomic_read(&serial->port.count) <= 0) {
46375+ atomic_set(&serial->port.count, 0);
46376 tty_port_tty_set(&serial->port, NULL);
46377 if (!usb_gone)
46378 hso_stop_serial_device(serial->parent);
46379@@ -1416,7 +1415,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
46380
46381 /* the actual setup */
46382 spin_lock_irqsave(&serial->serial_lock, flags);
46383- if (serial->port.count)
46384+ if (atomic_read(&serial->port.count))
46385 _hso_serial_set_termios(tty, old);
46386 else
46387 tty->termios = *old;
46388@@ -1885,7 +1884,7 @@ static void intr_callback(struct urb *urb)
46389 D1("Pending read interrupt on port %d\n", i);
46390 spin_lock(&serial->serial_lock);
46391 if (serial->rx_state == RX_IDLE &&
46392- serial->port.count > 0) {
46393+ atomic_read(&serial->port.count) > 0) {
46394 /* Setup and send a ctrl req read on
46395 * port i */
46396 if (!serial->rx_urb_filled[0]) {
46397@@ -3061,7 +3060,7 @@ static int hso_resume(struct usb_interface *iface)
46398 /* Start all serial ports */
46399 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
46400 if (serial_table[i] && (serial_table[i]->interface == iface)) {
46401- if (dev2ser(serial_table[i])->port.count) {
46402+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
46403 result =
46404 hso_start_serial_device(serial_table[i], GFP_NOIO);
46405 hso_kick_transmit(dev2ser(serial_table[i]));
46406diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
46407index 3fbfb08..2c16265 100644
46408--- a/drivers/net/usb/r8152.c
46409+++ b/drivers/net/usb/r8152.c
46410@@ -567,7 +567,7 @@ struct r8152 {
46411 void (*up)(struct r8152 *);
46412 void (*down)(struct r8152 *);
46413 void (*unload)(struct r8152 *);
46414- } rtl_ops;
46415+ } __no_const rtl_ops;
46416
46417 int intr_interval;
46418 u32 saved_wolopts;
46419diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
46420index a2515887..6d13233 100644
46421--- a/drivers/net/usb/sierra_net.c
46422+++ b/drivers/net/usb/sierra_net.c
46423@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
46424 /* atomic counter partially included in MAC address to make sure 2 devices
46425 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
46426 */
46427-static atomic_t iface_counter = ATOMIC_INIT(0);
46428+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
46429
46430 /*
46431 * SYNC Timer Delay definition used to set the expiry time
46432@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
46433 dev->net->netdev_ops = &sierra_net_device_ops;
46434
46435 /* change MAC addr to include, ifacenum, and to be unique */
46436- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
46437+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
46438 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
46439
46440 /* we will have to manufacture ethernet headers, prepare template */
46441diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
46442index 8a852b5..668a4b6 100644
46443--- a/drivers/net/virtio_net.c
46444+++ b/drivers/net/virtio_net.c
46445@@ -47,7 +47,7 @@ module_param(gso, bool, 0444);
46446 #define RECEIVE_AVG_WEIGHT 64
46447
46448 /* Minimum alignment for mergeable packet buffers. */
46449-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
46450+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
46451
46452 #define VIRTNET_DRIVER_VERSION "1.0.0"
46453
46454diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
46455index 77dcf92..549924a 100644
46456--- a/drivers/net/vxlan.c
46457+++ b/drivers/net/vxlan.c
46458@@ -2839,7 +2839,7 @@ nla_put_failure:
46459 return -EMSGSIZE;
46460 }
46461
46462-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
46463+static struct rtnl_link_ops vxlan_link_ops = {
46464 .kind = "vxlan",
46465 .maxtype = IFLA_VXLAN_MAX,
46466 .policy = vxlan_policy,
46467@@ -2886,7 +2886,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
46468 return NOTIFY_DONE;
46469 }
46470
46471-static struct notifier_block vxlan_notifier_block __read_mostly = {
46472+static struct notifier_block vxlan_notifier_block = {
46473 .notifier_call = vxlan_lowerdev_event,
46474 };
46475
46476diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
46477index 5920c99..ff2e4a5 100644
46478--- a/drivers/net/wan/lmc/lmc_media.c
46479+++ b/drivers/net/wan/lmc/lmc_media.c
46480@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
46481 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
46482
46483 lmc_media_t lmc_ds3_media = {
46484- lmc_ds3_init, /* special media init stuff */
46485- lmc_ds3_default, /* reset to default state */
46486- lmc_ds3_set_status, /* reset status to state provided */
46487- lmc_dummy_set_1, /* set clock source */
46488- lmc_dummy_set2_1, /* set line speed */
46489- lmc_ds3_set_100ft, /* set cable length */
46490- lmc_ds3_set_scram, /* set scrambler */
46491- lmc_ds3_get_link_status, /* get link status */
46492- lmc_dummy_set_1, /* set link status */
46493- lmc_ds3_set_crc_length, /* set CRC length */
46494- lmc_dummy_set_1, /* set T1 or E1 circuit type */
46495- lmc_ds3_watchdog
46496+ .init = lmc_ds3_init, /* special media init stuff */
46497+ .defaults = lmc_ds3_default, /* reset to default state */
46498+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
46499+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
46500+ .set_speed = lmc_dummy_set2_1, /* set line speed */
46501+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
46502+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
46503+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
46504+ .set_link_status = lmc_dummy_set_1, /* set link status */
46505+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
46506+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46507+ .watchdog = lmc_ds3_watchdog
46508 };
46509
46510 lmc_media_t lmc_hssi_media = {
46511- lmc_hssi_init, /* special media init stuff */
46512- lmc_hssi_default, /* reset to default state */
46513- lmc_hssi_set_status, /* reset status to state provided */
46514- lmc_hssi_set_clock, /* set clock source */
46515- lmc_dummy_set2_1, /* set line speed */
46516- lmc_dummy_set_1, /* set cable length */
46517- lmc_dummy_set_1, /* set scrambler */
46518- lmc_hssi_get_link_status, /* get link status */
46519- lmc_hssi_set_link_status, /* set link status */
46520- lmc_hssi_set_crc_length, /* set CRC length */
46521- lmc_dummy_set_1, /* set T1 or E1 circuit type */
46522- lmc_hssi_watchdog
46523+ .init = lmc_hssi_init, /* special media init stuff */
46524+ .defaults = lmc_hssi_default, /* reset to default state */
46525+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
46526+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
46527+ .set_speed = lmc_dummy_set2_1, /* set line speed */
46528+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
46529+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46530+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
46531+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
46532+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
46533+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46534+ .watchdog = lmc_hssi_watchdog
46535 };
46536
46537-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
46538- lmc_ssi_default, /* reset to default state */
46539- lmc_ssi_set_status, /* reset status to state provided */
46540- lmc_ssi_set_clock, /* set clock source */
46541- lmc_ssi_set_speed, /* set line speed */
46542- lmc_dummy_set_1, /* set cable length */
46543- lmc_dummy_set_1, /* set scrambler */
46544- lmc_ssi_get_link_status, /* get link status */
46545- lmc_ssi_set_link_status, /* set link status */
46546- lmc_ssi_set_crc_length, /* set CRC length */
46547- lmc_dummy_set_1, /* set T1 or E1 circuit type */
46548- lmc_ssi_watchdog
46549+lmc_media_t lmc_ssi_media = {
46550+ .init = lmc_ssi_init, /* special media init stuff */
46551+ .defaults = lmc_ssi_default, /* reset to default state */
46552+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
46553+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
46554+ .set_speed = lmc_ssi_set_speed, /* set line speed */
46555+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
46556+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46557+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
46558+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
46559+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
46560+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
46561+ .watchdog = lmc_ssi_watchdog
46562 };
46563
46564 lmc_media_t lmc_t1_media = {
46565- lmc_t1_init, /* special media init stuff */
46566- lmc_t1_default, /* reset to default state */
46567- lmc_t1_set_status, /* reset status to state provided */
46568- lmc_t1_set_clock, /* set clock source */
46569- lmc_dummy_set2_1, /* set line speed */
46570- lmc_dummy_set_1, /* set cable length */
46571- lmc_dummy_set_1, /* set scrambler */
46572- lmc_t1_get_link_status, /* get link status */
46573- lmc_dummy_set_1, /* set link status */
46574- lmc_t1_set_crc_length, /* set CRC length */
46575- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
46576- lmc_t1_watchdog
46577+ .init = lmc_t1_init, /* special media init stuff */
46578+ .defaults = lmc_t1_default, /* reset to default state */
46579+ .set_status = lmc_t1_set_status, /* reset status to state provided */
46580+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
46581+ .set_speed = lmc_dummy_set2_1, /* set line speed */
46582+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
46583+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
46584+ .get_link_status = lmc_t1_get_link_status, /* get link status */
46585+ .set_link_status = lmc_dummy_set_1, /* set link status */
46586+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
46587+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
46588+ .watchdog = lmc_t1_watchdog
46589 };
46590
46591 static void
46592diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
46593index feacc3b..5bac0de 100644
46594--- a/drivers/net/wan/z85230.c
46595+++ b/drivers/net/wan/z85230.c
46596@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
46597
46598 struct z8530_irqhandler z8530_sync =
46599 {
46600- z8530_rx,
46601- z8530_tx,
46602- z8530_status
46603+ .rx = z8530_rx,
46604+ .tx = z8530_tx,
46605+ .status = z8530_status
46606 };
46607
46608 EXPORT_SYMBOL(z8530_sync);
46609@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
46610 }
46611
46612 static struct z8530_irqhandler z8530_dma_sync = {
46613- z8530_dma_rx,
46614- z8530_dma_tx,
46615- z8530_dma_status
46616+ .rx = z8530_dma_rx,
46617+ .tx = z8530_dma_tx,
46618+ .status = z8530_dma_status
46619 };
46620
46621 static struct z8530_irqhandler z8530_txdma_sync = {
46622- z8530_rx,
46623- z8530_dma_tx,
46624- z8530_dma_status
46625+ .rx = z8530_rx,
46626+ .tx = z8530_dma_tx,
46627+ .status = z8530_dma_status
46628 };
46629
46630 /**
46631@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
46632
46633 struct z8530_irqhandler z8530_nop=
46634 {
46635- z8530_rx_clear,
46636- z8530_tx_clear,
46637- z8530_status_clear
46638+ .rx = z8530_rx_clear,
46639+ .tx = z8530_tx_clear,
46640+ .status = z8530_status_clear
46641 };
46642
46643
46644diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
46645index 0b60295..b8bfa5b 100644
46646--- a/drivers/net/wimax/i2400m/rx.c
46647+++ b/drivers/net/wimax/i2400m/rx.c
46648@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
46649 if (i2400m->rx_roq == NULL)
46650 goto error_roq_alloc;
46651
46652- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
46653+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
46654 GFP_KERNEL);
46655 if (rd == NULL) {
46656 result = -ENOMEM;
46657diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
46658index 64747d4..17c4cf3 100644
46659--- a/drivers/net/wireless/airo.c
46660+++ b/drivers/net/wireless/airo.c
46661@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
46662 struct airo_info *ai = dev->ml_priv;
46663 int ridcode;
46664 int enabled;
46665- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
46666+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
46667 unsigned char *iobuf;
46668
46669 /* Only super-user can write RIDs */
46670diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
46671index 99b3bfa..9559372 100644
46672--- a/drivers/net/wireless/at76c50x-usb.c
46673+++ b/drivers/net/wireless/at76c50x-usb.c
46674@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
46675 }
46676
46677 /* Convert timeout from the DFU status to jiffies */
46678-static inline unsigned long at76_get_timeout(struct dfu_status *s)
46679+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
46680 {
46681 return msecs_to_jiffies((s->poll_timeout[2] << 16)
46682 | (s->poll_timeout[1] << 8)
46683diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
46684index 7f1bccd..ca2ffca 100644
46685--- a/drivers/net/wireless/ath/ath10k/htc.c
46686+++ b/drivers/net/wireless/ath/ath10k/htc.c
46687@@ -840,7 +840,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
46688 /* registered target arrival callback from the HIF layer */
46689 int ath10k_htc_init(struct ath10k *ar)
46690 {
46691- struct ath10k_hif_cb htc_callbacks;
46692+ static struct ath10k_hif_cb htc_callbacks = {
46693+ .rx_completion = ath10k_htc_rx_completion_handler,
46694+ .tx_completion = ath10k_htc_tx_completion_handler,
46695+ };
46696 struct ath10k_htc_ep *ep = NULL;
46697 struct ath10k_htc *htc = &ar->htc;
46698
46699@@ -850,8 +853,6 @@ int ath10k_htc_init(struct ath10k *ar)
46700 ath10k_htc_reset_endpoint_states(htc);
46701
46702 /* setup HIF layer callbacks */
46703- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
46704- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
46705 htc->ar = ar;
46706
46707 /* Get HIF default pipe for HTC message exchange */
46708diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
46709index 4716d33..a688310 100644
46710--- a/drivers/net/wireless/ath/ath10k/htc.h
46711+++ b/drivers/net/wireless/ath/ath10k/htc.h
46712@@ -271,13 +271,13 @@ enum ath10k_htc_ep_id {
46713
46714 struct ath10k_htc_ops {
46715 void (*target_send_suspend_complete)(struct ath10k *ar);
46716-};
46717+} __no_const;
46718
46719 struct ath10k_htc_ep_ops {
46720 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
46721 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
46722 void (*ep_tx_credits)(struct ath10k *);
46723-};
46724+} __no_const;
46725
46726 /* service connection information */
46727 struct ath10k_htc_svc_conn_req {
46728diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46729index 741b38d..b7ae41b 100644
46730--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46731+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
46732@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46733 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
46734 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
46735
46736- ACCESS_ONCE(ads->ds_link) = i->link;
46737- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
46738+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
46739+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
46740
46741 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
46742 ctl6 = SM(i->keytype, AR_EncrType);
46743@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46744
46745 if ((i->is_first || i->is_last) &&
46746 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
46747- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
46748+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
46749 | set11nTries(i->rates, 1)
46750 | set11nTries(i->rates, 2)
46751 | set11nTries(i->rates, 3)
46752 | (i->dur_update ? AR_DurUpdateEna : 0)
46753 | SM(0, AR_BurstDur);
46754
46755- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
46756+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
46757 | set11nRate(i->rates, 1)
46758 | set11nRate(i->rates, 2)
46759 | set11nRate(i->rates, 3);
46760 } else {
46761- ACCESS_ONCE(ads->ds_ctl2) = 0;
46762- ACCESS_ONCE(ads->ds_ctl3) = 0;
46763+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
46764+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
46765 }
46766
46767 if (!i->is_first) {
46768- ACCESS_ONCE(ads->ds_ctl0) = 0;
46769- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
46770- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
46771+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
46772+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
46773+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
46774 return;
46775 }
46776
46777@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46778 break;
46779 }
46780
46781- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
46782+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
46783 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
46784 | SM(i->txpower, AR_XmitPower)
46785 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
46786@@ -289,19 +289,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46787 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
46788 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
46789
46790- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
46791- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
46792+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
46793+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
46794
46795 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
46796 return;
46797
46798- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
46799+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
46800 | set11nPktDurRTSCTS(i->rates, 1);
46801
46802- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
46803+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
46804 | set11nPktDurRTSCTS(i->rates, 3);
46805
46806- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
46807+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
46808 | set11nRateFlags(i->rates, 1)
46809 | set11nRateFlags(i->rates, 2)
46810 | set11nRateFlags(i->rates, 3)
46811diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46812index 729ffbf..49f50e3 100644
46813--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46814+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
46815@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46816 (i->qcu << AR_TxQcuNum_S) | desc_len;
46817
46818 checksum += val;
46819- ACCESS_ONCE(ads->info) = val;
46820+ ACCESS_ONCE_RW(ads->info) = val;
46821
46822 checksum += i->link;
46823- ACCESS_ONCE(ads->link) = i->link;
46824+ ACCESS_ONCE_RW(ads->link) = i->link;
46825
46826 checksum += i->buf_addr[0];
46827- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
46828+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
46829 checksum += i->buf_addr[1];
46830- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
46831+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
46832 checksum += i->buf_addr[2];
46833- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
46834+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
46835 checksum += i->buf_addr[3];
46836- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
46837+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
46838
46839 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
46840- ACCESS_ONCE(ads->ctl3) = val;
46841+ ACCESS_ONCE_RW(ads->ctl3) = val;
46842 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
46843- ACCESS_ONCE(ads->ctl5) = val;
46844+ ACCESS_ONCE_RW(ads->ctl5) = val;
46845 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
46846- ACCESS_ONCE(ads->ctl7) = val;
46847+ ACCESS_ONCE_RW(ads->ctl7) = val;
46848 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
46849- ACCESS_ONCE(ads->ctl9) = val;
46850+ ACCESS_ONCE_RW(ads->ctl9) = val;
46851
46852 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
46853- ACCESS_ONCE(ads->ctl10) = checksum;
46854+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
46855
46856 if (i->is_first || i->is_last) {
46857- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
46858+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
46859 | set11nTries(i->rates, 1)
46860 | set11nTries(i->rates, 2)
46861 | set11nTries(i->rates, 3)
46862 | (i->dur_update ? AR_DurUpdateEna : 0)
46863 | SM(0, AR_BurstDur);
46864
46865- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
46866+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
46867 | set11nRate(i->rates, 1)
46868 | set11nRate(i->rates, 2)
46869 | set11nRate(i->rates, 3);
46870 } else {
46871- ACCESS_ONCE(ads->ctl13) = 0;
46872- ACCESS_ONCE(ads->ctl14) = 0;
46873+ ACCESS_ONCE_RW(ads->ctl13) = 0;
46874+ ACCESS_ONCE_RW(ads->ctl14) = 0;
46875 }
46876
46877 ads->ctl20 = 0;
46878@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46879
46880 ctl17 = SM(i->keytype, AR_EncrType);
46881 if (!i->is_first) {
46882- ACCESS_ONCE(ads->ctl11) = 0;
46883- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
46884- ACCESS_ONCE(ads->ctl15) = 0;
46885- ACCESS_ONCE(ads->ctl16) = 0;
46886- ACCESS_ONCE(ads->ctl17) = ctl17;
46887- ACCESS_ONCE(ads->ctl18) = 0;
46888- ACCESS_ONCE(ads->ctl19) = 0;
46889+ ACCESS_ONCE_RW(ads->ctl11) = 0;
46890+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
46891+ ACCESS_ONCE_RW(ads->ctl15) = 0;
46892+ ACCESS_ONCE_RW(ads->ctl16) = 0;
46893+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
46894+ ACCESS_ONCE_RW(ads->ctl18) = 0;
46895+ ACCESS_ONCE_RW(ads->ctl19) = 0;
46896 return;
46897 }
46898
46899- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
46900+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
46901 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
46902 | SM(i->txpower, AR_XmitPower)
46903 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
46904@@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
46905 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
46906 ctl12 |= SM(val, AR_PAPRDChainMask);
46907
46908- ACCESS_ONCE(ads->ctl12) = ctl12;
46909- ACCESS_ONCE(ads->ctl17) = ctl17;
46910+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
46911+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
46912
46913- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
46914+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
46915 | set11nPktDurRTSCTS(i->rates, 1);
46916
46917- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
46918+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
46919 | set11nPktDurRTSCTS(i->rates, 3);
46920
46921- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
46922+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
46923 | set11nRateFlags(i->rates, 1)
46924 | set11nRateFlags(i->rates, 2)
46925 | set11nRateFlags(i->rates, 3)
46926 | SM(i->rtscts_rate, AR_RTSCTSRate);
46927
46928- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
46929+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
46930 }
46931
46932 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
46933diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
46934index 0acd4b5..0591c91 100644
46935--- a/drivers/net/wireless/ath/ath9k/hw.h
46936+++ b/drivers/net/wireless/ath/ath9k/hw.h
46937@@ -629,7 +629,7 @@ struct ath_hw_private_ops {
46938
46939 /* ANI */
46940 void (*ani_cache_ini_regs)(struct ath_hw *ah);
46941-};
46942+} __no_const;
46943
46944 /**
46945 * struct ath_spec_scan - parameters for Atheros spectral scan
46946@@ -706,7 +706,7 @@ struct ath_hw_ops {
46947 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
46948 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
46949 #endif
46950-};
46951+} __no_const;
46952
46953 struct ath_nf_limits {
46954 s16 max;
46955diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
46956index 92190da..f3a4c4c 100644
46957--- a/drivers/net/wireless/b43/phy_lp.c
46958+++ b/drivers/net/wireless/b43/phy_lp.c
46959@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
46960 {
46961 struct ssb_bus *bus = dev->dev->sdev->bus;
46962
46963- static const struct b206x_channel *chandata = NULL;
46964+ const struct b206x_channel *chandata = NULL;
46965 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
46966 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
46967 u16 old_comm15, scale;
46968diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
46969index dc1d20c..f7a4f06 100644
46970--- a/drivers/net/wireless/iwlegacy/3945-mac.c
46971+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
46972@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
46973 */
46974 if (il3945_mod_params.disable_hw_scan) {
46975 D_INFO("Disabling hw_scan\n");
46976- il3945_mac_ops.hw_scan = NULL;
46977+ pax_open_kernel();
46978+ *(void **)&il3945_mac_ops.hw_scan = NULL;
46979+ pax_close_kernel();
46980 }
46981
46982 D_INFO("*** LOAD DRIVER ***\n");
46983diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
46984index d2fe259..0c4c682 100644
46985--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
46986+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
46987@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
46988 {
46989 struct iwl_priv *priv = file->private_data;
46990 char buf[64];
46991- int buf_size;
46992+ size_t buf_size;
46993 u32 offset, len;
46994
46995 memset(buf, 0, sizeof(buf));
46996@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
46997 struct iwl_priv *priv = file->private_data;
46998
46999 char buf[8];
47000- int buf_size;
47001+ size_t buf_size;
47002 u32 reset_flag;
47003
47004 memset(buf, 0, sizeof(buf));
47005@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
47006 {
47007 struct iwl_priv *priv = file->private_data;
47008 char buf[8];
47009- int buf_size;
47010+ size_t buf_size;
47011 int ht40;
47012
47013 memset(buf, 0, sizeof(buf));
47014@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
47015 {
47016 struct iwl_priv *priv = file->private_data;
47017 char buf[8];
47018- int buf_size;
47019+ size_t buf_size;
47020 int value;
47021
47022 memset(buf, 0, sizeof(buf));
47023@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
47024 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
47025 DEBUGFS_READ_FILE_OPS(current_sleep_command);
47026
47027-static const char *fmt_value = " %-30s %10u\n";
47028-static const char *fmt_hex = " %-30s 0x%02X\n";
47029-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
47030-static const char *fmt_header =
47031+static const char fmt_value[] = " %-30s %10u\n";
47032+static const char fmt_hex[] = " %-30s 0x%02X\n";
47033+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
47034+static const char fmt_header[] =
47035 "%-32s current cumulative delta max\n";
47036
47037 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
47038@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
47039 {
47040 struct iwl_priv *priv = file->private_data;
47041 char buf[8];
47042- int buf_size;
47043+ size_t buf_size;
47044 int clear;
47045
47046 memset(buf, 0, sizeof(buf));
47047@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
47048 {
47049 struct iwl_priv *priv = file->private_data;
47050 char buf[8];
47051- int buf_size;
47052+ size_t buf_size;
47053 int trace;
47054
47055 memset(buf, 0, sizeof(buf));
47056@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
47057 {
47058 struct iwl_priv *priv = file->private_data;
47059 char buf[8];
47060- int buf_size;
47061+ size_t buf_size;
47062 int missed;
47063
47064 memset(buf, 0, sizeof(buf));
47065@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
47066
47067 struct iwl_priv *priv = file->private_data;
47068 char buf[8];
47069- int buf_size;
47070+ size_t buf_size;
47071 int plcp;
47072
47073 memset(buf, 0, sizeof(buf));
47074@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
47075
47076 struct iwl_priv *priv = file->private_data;
47077 char buf[8];
47078- int buf_size;
47079+ size_t buf_size;
47080 int flush;
47081
47082 memset(buf, 0, sizeof(buf));
47083@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
47084
47085 struct iwl_priv *priv = file->private_data;
47086 char buf[8];
47087- int buf_size;
47088+ size_t buf_size;
47089 int rts;
47090
47091 if (!priv->cfg->ht_params)
47092@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
47093 {
47094 struct iwl_priv *priv = file->private_data;
47095 char buf[8];
47096- int buf_size;
47097+ size_t buf_size;
47098
47099 memset(buf, 0, sizeof(buf));
47100 buf_size = min(count, sizeof(buf) - 1);
47101@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
47102 struct iwl_priv *priv = file->private_data;
47103 u32 event_log_flag;
47104 char buf[8];
47105- int buf_size;
47106+ size_t buf_size;
47107
47108 /* check that the interface is up */
47109 if (!iwl_is_ready(priv))
47110@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
47111 struct iwl_priv *priv = file->private_data;
47112 char buf[8];
47113 u32 calib_disabled;
47114- int buf_size;
47115+ size_t buf_size;
47116
47117 memset(buf, 0, sizeof(buf));
47118 buf_size = min(count, sizeof(buf) - 1);
47119diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
47120index 6a6df71..eb5c93a 100644
47121--- a/drivers/net/wireless/iwlwifi/dvm/main.c
47122+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
47123@@ -1127,7 +1127,7 @@ static void iwl_option_config(struct iwl_priv *priv)
47124 static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
47125 {
47126 struct iwl_nvm_data *data = priv->nvm_data;
47127- char *debug_msg;
47128+ static const char debug_msg[] = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
47129
47130 if (data->sku_cap_11n_enable &&
47131 !priv->cfg->ht_params) {
47132@@ -1141,7 +1141,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
47133 return -EINVAL;
47134 }
47135
47136- debug_msg = "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n";
47137 IWL_DEBUG_INFO(priv, debug_msg,
47138 data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
47139 data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
47140diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
47141index 2365553..97126d8 100644
47142--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
47143+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
47144@@ -1552,7 +1552,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
47145 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
47146
47147 char buf[8];
47148- int buf_size;
47149+ size_t buf_size;
47150 u32 reset_flag;
47151
47152 memset(buf, 0, sizeof(buf));
47153@@ -1573,7 +1573,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
47154 {
47155 struct iwl_trans *trans = file->private_data;
47156 char buf[8];
47157- int buf_size;
47158+ size_t buf_size;
47159 int csr;
47160
47161 memset(buf, 0, sizeof(buf));
47162diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
47163index 9d7a52f..2729a99 100644
47164--- a/drivers/net/wireless/mac80211_hwsim.c
47165+++ b/drivers/net/wireless/mac80211_hwsim.c
47166@@ -2570,20 +2570,20 @@ static int __init init_mac80211_hwsim(void)
47167 if (channels < 1)
47168 return -EINVAL;
47169
47170- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
47171- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
47172- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
47173- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
47174- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
47175- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
47176- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
47177- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
47178- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
47179- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
47180- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
47181- mac80211_hwsim_assign_vif_chanctx;
47182- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
47183- mac80211_hwsim_unassign_vif_chanctx;
47184+ pax_open_kernel();
47185+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
47186+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
47187+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
47188+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
47189+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
47190+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
47191+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
47192+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
47193+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
47194+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
47195+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
47196+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
47197+ pax_close_kernel();
47198
47199 spin_lock_init(&hwsim_radio_lock);
47200 INIT_LIST_HEAD(&hwsim_radios);
47201diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
47202index 39d22a1..4ec8612 100644
47203--- a/drivers/net/wireless/rndis_wlan.c
47204+++ b/drivers/net/wireless/rndis_wlan.c
47205@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
47206
47207 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
47208
47209- if (rts_threshold < 0 || rts_threshold > 2347)
47210+ if (rts_threshold > 2347)
47211 rts_threshold = 2347;
47212
47213 tmp = cpu_to_le32(rts_threshold);
47214diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
47215index e3b885d..7a7de2f 100644
47216--- a/drivers/net/wireless/rt2x00/rt2x00.h
47217+++ b/drivers/net/wireless/rt2x00/rt2x00.h
47218@@ -375,7 +375,7 @@ struct rt2x00_intf {
47219 * for hardware which doesn't support hardware
47220 * sequence counting.
47221 */
47222- atomic_t seqno;
47223+ atomic_unchecked_t seqno;
47224 };
47225
47226 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
47227diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
47228index 5642ccc..01f03eb 100644
47229--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
47230+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
47231@@ -250,9 +250,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
47232 * sequence counter given by mac80211.
47233 */
47234 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
47235- seqno = atomic_add_return(0x10, &intf->seqno);
47236+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
47237 else
47238- seqno = atomic_read(&intf->seqno);
47239+ seqno = atomic_read_unchecked(&intf->seqno);
47240
47241 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
47242 hdr->seq_ctrl |= cpu_to_le16(seqno);
47243diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
47244index b661f896..ddf7d2b 100644
47245--- a/drivers/net/wireless/ti/wl1251/sdio.c
47246+++ b/drivers/net/wireless/ti/wl1251/sdio.c
47247@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
47248
47249 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
47250
47251- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
47252- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
47253+ pax_open_kernel();
47254+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
47255+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
47256+ pax_close_kernel();
47257
47258 wl1251_info("using dedicated interrupt line");
47259 } else {
47260- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
47261- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
47262+ pax_open_kernel();
47263+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
47264+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
47265+ pax_close_kernel();
47266
47267 wl1251_info("using SDIO interrupt");
47268 }
47269diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
47270index d50dfac..0a6f5be3 100644
47271--- a/drivers/net/wireless/ti/wl12xx/main.c
47272+++ b/drivers/net/wireless/ti/wl12xx/main.c
47273@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
47274 sizeof(wl->conf.mem));
47275
47276 /* read data preparation is only needed by wl127x */
47277- wl->ops->prepare_read = wl127x_prepare_read;
47278+ pax_open_kernel();
47279+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
47280+ pax_close_kernel();
47281
47282 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
47283 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
47284@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
47285 sizeof(wl->conf.mem));
47286
47287 /* read data preparation is only needed by wl127x */
47288- wl->ops->prepare_read = wl127x_prepare_read;
47289+ pax_open_kernel();
47290+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
47291+ pax_close_kernel();
47292
47293 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
47294 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
47295diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
47296index de5b4fa..7996ec6 100644
47297--- a/drivers/net/wireless/ti/wl18xx/main.c
47298+++ b/drivers/net/wireless/ti/wl18xx/main.c
47299@@ -1900,8 +1900,10 @@ static int wl18xx_setup(struct wl1271 *wl)
47300 }
47301
47302 if (!checksum_param) {
47303- wl18xx_ops.set_rx_csum = NULL;
47304- wl18xx_ops.init_vif = NULL;
47305+ pax_open_kernel();
47306+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
47307+ *(void **)&wl18xx_ops.init_vif = NULL;
47308+ pax_close_kernel();
47309 }
47310
47311 /* Enable 11a Band only if we have 5G antennas */
47312diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
47313index a912dc0..a8225ba 100644
47314--- a/drivers/net/wireless/zd1211rw/zd_usb.c
47315+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
47316@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
47317 {
47318 struct zd_usb *usb = urb->context;
47319 struct zd_usb_interrupt *intr = &usb->intr;
47320- int len;
47321+ unsigned int len;
47322 u16 int_num;
47323
47324 ZD_ASSERT(in_interrupt());
47325diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
47326index 683671a..4519fc2 100644
47327--- a/drivers/nfc/nfcwilink.c
47328+++ b/drivers/nfc/nfcwilink.c
47329@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
47330
47331 static int nfcwilink_probe(struct platform_device *pdev)
47332 {
47333- static struct nfcwilink *drv;
47334+ struct nfcwilink *drv;
47335 int rc;
47336 __u32 protocols;
47337
47338diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
47339index d93b2b6..ae50401 100644
47340--- a/drivers/oprofile/buffer_sync.c
47341+++ b/drivers/oprofile/buffer_sync.c
47342@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
47343 if (cookie == NO_COOKIE)
47344 offset = pc;
47345 if (cookie == INVALID_COOKIE) {
47346- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
47347+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
47348 offset = pc;
47349 }
47350 if (cookie != last_cookie) {
47351@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
47352 /* add userspace sample */
47353
47354 if (!mm) {
47355- atomic_inc(&oprofile_stats.sample_lost_no_mm);
47356+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
47357 return 0;
47358 }
47359
47360 cookie = lookup_dcookie(mm, s->eip, &offset);
47361
47362 if (cookie == INVALID_COOKIE) {
47363- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
47364+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
47365 return 0;
47366 }
47367
47368@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
47369 /* ignore backtraces if failed to add a sample */
47370 if (state == sb_bt_start) {
47371 state = sb_bt_ignore;
47372- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
47373+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
47374 }
47375 }
47376 release_mm(mm);
47377diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
47378index c0cc4e7..44d4e54 100644
47379--- a/drivers/oprofile/event_buffer.c
47380+++ b/drivers/oprofile/event_buffer.c
47381@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
47382 }
47383
47384 if (buffer_pos == buffer_size) {
47385- atomic_inc(&oprofile_stats.event_lost_overflow);
47386+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
47387 return;
47388 }
47389
47390diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
47391index ed2c3ec..deda85a 100644
47392--- a/drivers/oprofile/oprof.c
47393+++ b/drivers/oprofile/oprof.c
47394@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
47395 if (oprofile_ops.switch_events())
47396 return;
47397
47398- atomic_inc(&oprofile_stats.multiplex_counter);
47399+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
47400 start_switch_worker();
47401 }
47402
47403diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
47404index ee2cfce..7f8f699 100644
47405--- a/drivers/oprofile/oprofile_files.c
47406+++ b/drivers/oprofile/oprofile_files.c
47407@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
47408
47409 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
47410
47411-static ssize_t timeout_read(struct file *file, char __user *buf,
47412+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
47413 size_t count, loff_t *offset)
47414 {
47415 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
47416diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
47417index 59659ce..6c860a0 100644
47418--- a/drivers/oprofile/oprofile_stats.c
47419+++ b/drivers/oprofile/oprofile_stats.c
47420@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
47421 cpu_buf->sample_invalid_eip = 0;
47422 }
47423
47424- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
47425- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
47426- atomic_set(&oprofile_stats.event_lost_overflow, 0);
47427- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
47428- atomic_set(&oprofile_stats.multiplex_counter, 0);
47429+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
47430+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
47431+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
47432+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
47433+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
47434 }
47435
47436
47437diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
47438index 1fc622b..8c48fc3 100644
47439--- a/drivers/oprofile/oprofile_stats.h
47440+++ b/drivers/oprofile/oprofile_stats.h
47441@@ -13,11 +13,11 @@
47442 #include <linux/atomic.h>
47443
47444 struct oprofile_stat_struct {
47445- atomic_t sample_lost_no_mm;
47446- atomic_t sample_lost_no_mapping;
47447- atomic_t bt_lost_no_mapping;
47448- atomic_t event_lost_overflow;
47449- atomic_t multiplex_counter;
47450+ atomic_unchecked_t sample_lost_no_mm;
47451+ atomic_unchecked_t sample_lost_no_mapping;
47452+ atomic_unchecked_t bt_lost_no_mapping;
47453+ atomic_unchecked_t event_lost_overflow;
47454+ atomic_unchecked_t multiplex_counter;
47455 };
47456
47457 extern struct oprofile_stat_struct oprofile_stats;
47458diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
47459index 3f49345..c750d0b 100644
47460--- a/drivers/oprofile/oprofilefs.c
47461+++ b/drivers/oprofile/oprofilefs.c
47462@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
47463
47464 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
47465 {
47466- atomic_t *val = file->private_data;
47467- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
47468+ atomic_unchecked_t *val = file->private_data;
47469+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
47470 }
47471
47472
47473@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
47474
47475
47476 int oprofilefs_create_ro_atomic(struct dentry *root,
47477- char const *name, atomic_t *val)
47478+ char const *name, atomic_unchecked_t *val)
47479 {
47480 return __oprofilefs_create_file(root, name,
47481 &atomic_ro_fops, 0444, val);
47482diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
47483index 61be1d9..dec05d7 100644
47484--- a/drivers/oprofile/timer_int.c
47485+++ b/drivers/oprofile/timer_int.c
47486@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
47487 return NOTIFY_OK;
47488 }
47489
47490-static struct notifier_block __refdata oprofile_cpu_notifier = {
47491+static struct notifier_block oprofile_cpu_notifier = {
47492 .notifier_call = oprofile_cpu_notify,
47493 };
47494
47495diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
47496index 92ed045..62d39bd7 100644
47497--- a/drivers/parport/procfs.c
47498+++ b/drivers/parport/procfs.c
47499@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
47500
47501 *ppos += len;
47502
47503- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
47504+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
47505 }
47506
47507 #ifdef CONFIG_PARPORT_1284
47508@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
47509
47510 *ppos += len;
47511
47512- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
47513+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
47514 }
47515 #endif /* IEEE1284.3 support. */
47516
47517diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
47518index 8dcccff..35d701d 100644
47519--- a/drivers/pci/hotplug/acpiphp_ibm.c
47520+++ b/drivers/pci/hotplug/acpiphp_ibm.c
47521@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
47522 goto init_cleanup;
47523 }
47524
47525- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
47526+ pax_open_kernel();
47527+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
47528+ pax_close_kernel();
47529 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
47530
47531 return retval;
47532diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
47533index 7536eef..52dc8fa 100644
47534--- a/drivers/pci/hotplug/cpcihp_generic.c
47535+++ b/drivers/pci/hotplug/cpcihp_generic.c
47536@@ -73,7 +73,6 @@ static u16 port;
47537 static unsigned int enum_bit;
47538 static u8 enum_mask;
47539
47540-static struct cpci_hp_controller_ops generic_hpc_ops;
47541 static struct cpci_hp_controller generic_hpc;
47542
47543 static int __init validate_parameters(void)
47544@@ -139,6 +138,10 @@ static int query_enum(void)
47545 return ((value & enum_mask) == enum_mask);
47546 }
47547
47548+static struct cpci_hp_controller_ops generic_hpc_ops = {
47549+ .query_enum = query_enum,
47550+};
47551+
47552 static int __init cpcihp_generic_init(void)
47553 {
47554 int status;
47555@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
47556 pci_dev_put(dev);
47557
47558 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
47559- generic_hpc_ops.query_enum = query_enum;
47560 generic_hpc.ops = &generic_hpc_ops;
47561
47562 status = cpci_hp_register_controller(&generic_hpc);
47563diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
47564index e8c4a7c..7046f5c 100644
47565--- a/drivers/pci/hotplug/cpcihp_zt5550.c
47566+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
47567@@ -59,7 +59,6 @@
47568 /* local variables */
47569 static bool debug;
47570 static bool poll;
47571-static struct cpci_hp_controller_ops zt5550_hpc_ops;
47572 static struct cpci_hp_controller zt5550_hpc;
47573
47574 /* Primary cPCI bus bridge device */
47575@@ -205,6 +204,10 @@ static int zt5550_hc_disable_irq(void)
47576 return 0;
47577 }
47578
47579+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
47580+ .query_enum = zt5550_hc_query_enum,
47581+};
47582+
47583 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
47584 {
47585 int status;
47586@@ -216,16 +219,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
47587 dbg("returned from zt5550_hc_config");
47588
47589 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
47590- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
47591 zt5550_hpc.ops = &zt5550_hpc_ops;
47592 if(!poll) {
47593 zt5550_hpc.irq = hc_dev->irq;
47594 zt5550_hpc.irq_flags = IRQF_SHARED;
47595 zt5550_hpc.dev_id = hc_dev;
47596
47597- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
47598- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
47599- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
47600+ pax_open_kernel();
47601+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
47602+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
47603+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
47604+ pax_open_kernel();
47605 } else {
47606 info("using ENUM# polling mode");
47607 }
47608diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
47609index 76ba8a1..20ca857 100644
47610--- a/drivers/pci/hotplug/cpqphp_nvram.c
47611+++ b/drivers/pci/hotplug/cpqphp_nvram.c
47612@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
47613
47614 void compaq_nvram_init (void __iomem *rom_start)
47615 {
47616+
47617+#ifndef CONFIG_PAX_KERNEXEC
47618 if (rom_start) {
47619 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
47620 }
47621+#endif
47622+
47623 dbg("int15 entry = %p\n", compaq_int15_entry_point);
47624
47625 /* initialize our int15 lock */
47626diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
47627index cfa92a9..29539c5 100644
47628--- a/drivers/pci/hotplug/pci_hotplug_core.c
47629+++ b/drivers/pci/hotplug/pci_hotplug_core.c
47630@@ -441,8 +441,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
47631 return -EINVAL;
47632 }
47633
47634- slot->ops->owner = owner;
47635- slot->ops->mod_name = mod_name;
47636+ pax_open_kernel();
47637+ *(struct module **)&slot->ops->owner = owner;
47638+ *(const char **)&slot->ops->mod_name = mod_name;
47639+ pax_close_kernel();
47640
47641 mutex_lock(&pci_hp_mutex);
47642 /*
47643diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
47644index 0e0a2ff..29dff57 100644
47645--- a/drivers/pci/hotplug/pciehp_core.c
47646+++ b/drivers/pci/hotplug/pciehp_core.c
47647@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
47648 struct slot *slot = ctrl->slot;
47649 struct hotplug_slot *hotplug = NULL;
47650 struct hotplug_slot_info *info = NULL;
47651- struct hotplug_slot_ops *ops = NULL;
47652+ hotplug_slot_ops_no_const *ops = NULL;
47653 char name[SLOT_NAME_SIZE];
47654 int retval = -ENOMEM;
47655
47656diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
47657index fb02fc2..83dc2c3 100644
47658--- a/drivers/pci/msi.c
47659+++ b/drivers/pci/msi.c
47660@@ -524,8 +524,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
47661 {
47662 struct attribute **msi_attrs;
47663 struct attribute *msi_attr;
47664- struct device_attribute *msi_dev_attr;
47665- struct attribute_group *msi_irq_group;
47666+ device_attribute_no_const *msi_dev_attr;
47667+ attribute_group_no_const *msi_irq_group;
47668 const struct attribute_group **msi_irq_groups;
47669 struct msi_desc *entry;
47670 int ret = -ENOMEM;
47671@@ -589,7 +589,7 @@ error_attrs:
47672 count = 0;
47673 msi_attr = msi_attrs[count];
47674 while (msi_attr) {
47675- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
47676+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
47677 kfree(msi_attr->name);
47678 kfree(msi_dev_attr);
47679 ++count;
47680diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
47681index 4e0acef..bd98e31 100644
47682--- a/drivers/pci/pci-sysfs.c
47683+++ b/drivers/pci/pci-sysfs.c
47684@@ -1101,7 +1101,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
47685 {
47686 /* allocate attribute structure, piggyback attribute name */
47687 int name_len = write_combine ? 13 : 10;
47688- struct bin_attribute *res_attr;
47689+ bin_attribute_no_const *res_attr;
47690 int retval;
47691
47692 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
47693@@ -1286,7 +1286,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
47694 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
47695 {
47696 int retval;
47697- struct bin_attribute *attr;
47698+ bin_attribute_no_const *attr;
47699
47700 /* If the device has VPD, try to expose it in sysfs. */
47701 if (dev->vpd) {
47702@@ -1333,7 +1333,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
47703 {
47704 int retval;
47705 int rom_size = 0;
47706- struct bin_attribute *attr;
47707+ bin_attribute_no_const *attr;
47708
47709 if (!sysfs_initialized)
47710 return -EACCES;
47711diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
47712index 6bd0822..35bc2b3 100644
47713--- a/drivers/pci/pci.h
47714+++ b/drivers/pci/pci.h
47715@@ -91,7 +91,7 @@ struct pci_vpd_ops {
47716 struct pci_vpd {
47717 unsigned int len;
47718 const struct pci_vpd_ops *ops;
47719- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
47720+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
47721 };
47722
47723 int pci_vpd_pci22_init(struct pci_dev *dev);
47724diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
47725index e1e7026..d28dd33 100644
47726--- a/drivers/pci/pcie/aspm.c
47727+++ b/drivers/pci/pcie/aspm.c
47728@@ -27,9 +27,9 @@
47729 #define MODULE_PARAM_PREFIX "pcie_aspm."
47730
47731 /* Note: those are not register definitions */
47732-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
47733-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
47734-#define ASPM_STATE_L1 (4) /* L1 state */
47735+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
47736+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
47737+#define ASPM_STATE_L1 (4U) /* L1 state */
47738 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
47739 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
47740
47741diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
47742index ef09f5f..49ac62f 100644
47743--- a/drivers/pci/probe.c
47744+++ b/drivers/pci/probe.c
47745@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
47746 struct pci_bus_region region, inverted_region;
47747 bool bar_too_big = false, bar_disabled = false;
47748
47749- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
47750+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
47751
47752 /* No printks while decoding is disabled! */
47753 if (!dev->mmio_always_on) {
47754diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
47755index 46d1378..30e452b 100644
47756--- a/drivers/pci/proc.c
47757+++ b/drivers/pci/proc.c
47758@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
47759 static int __init pci_proc_init(void)
47760 {
47761 struct pci_dev *dev = NULL;
47762+
47763+#ifdef CONFIG_GRKERNSEC_PROC_ADD
47764+#ifdef CONFIG_GRKERNSEC_PROC_USER
47765+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
47766+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
47767+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
47768+#endif
47769+#else
47770 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
47771+#endif
47772 proc_create("devices", 0, proc_bus_pci_dir,
47773 &proc_bus_pci_dev_operations);
47774 proc_initialized = 1;
47775diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
47776index 7f3aad0..7d604bb 100644
47777--- a/drivers/platform/chrome/chromeos_laptop.c
47778+++ b/drivers/platform/chrome/chromeos_laptop.c
47779@@ -406,7 +406,7 @@ static struct chromeos_laptop cr48 = {
47780 .callback = chromeos_laptop_dmi_matched, \
47781 .driver_data = (void *)&board_
47782
47783-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
47784+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
47785 {
47786 .ident = "Samsung Series 5 550",
47787 .matches = {
47788diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
47789index 541f951..4dfd598 100644
47790--- a/drivers/platform/x86/alienware-wmi.c
47791+++ b/drivers/platform/x86/alienware-wmi.c
47792@@ -132,7 +132,7 @@ struct wmax_led_args {
47793 } __packed;
47794
47795 static struct platform_device *platform_device;
47796-static struct device_attribute *zone_dev_attrs;
47797+static device_attribute_no_const *zone_dev_attrs;
47798 static struct attribute **zone_attrs;
47799 static struct platform_zone *zone_data;
47800
47801@@ -143,7 +143,7 @@ static struct platform_driver platform_driver = {
47802 }
47803 };
47804
47805-static struct attribute_group zone_attribute_group = {
47806+static attribute_group_no_const zone_attribute_group = {
47807 .name = "rgb_zones",
47808 };
47809
47810diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
47811index c5e082f..d6307a0 100644
47812--- a/drivers/platform/x86/asus-wmi.c
47813+++ b/drivers/platform/x86/asus-wmi.c
47814@@ -1595,6 +1595,10 @@ static int show_dsts(struct seq_file *m, void *data)
47815 int err;
47816 u32 retval = -1;
47817
47818+#ifdef CONFIG_GRKERNSEC_KMEM
47819+ return -EPERM;
47820+#endif
47821+
47822 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
47823
47824 if (err < 0)
47825@@ -1611,6 +1615,10 @@ static int show_devs(struct seq_file *m, void *data)
47826 int err;
47827 u32 retval = -1;
47828
47829+#ifdef CONFIG_GRKERNSEC_KMEM
47830+ return -EPERM;
47831+#endif
47832+
47833 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
47834 &retval);
47835
47836@@ -1635,6 +1643,10 @@ static int show_call(struct seq_file *m, void *data)
47837 union acpi_object *obj;
47838 acpi_status status;
47839
47840+#ifdef CONFIG_GRKERNSEC_KMEM
47841+ return -EPERM;
47842+#endif
47843+
47844 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
47845 1, asus->debug.method_id,
47846 &input, &output);
47847diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
47848index 62f8030..c7f2a45 100644
47849--- a/drivers/platform/x86/msi-laptop.c
47850+++ b/drivers/platform/x86/msi-laptop.c
47851@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
47852
47853 if (!quirks->ec_read_only) {
47854 /* allow userland write sysfs file */
47855- dev_attr_bluetooth.store = store_bluetooth;
47856- dev_attr_wlan.store = store_wlan;
47857- dev_attr_threeg.store = store_threeg;
47858- dev_attr_bluetooth.attr.mode |= S_IWUSR;
47859- dev_attr_wlan.attr.mode |= S_IWUSR;
47860- dev_attr_threeg.attr.mode |= S_IWUSR;
47861+ pax_open_kernel();
47862+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
47863+ *(void **)&dev_attr_wlan.store = store_wlan;
47864+ *(void **)&dev_attr_threeg.store = store_threeg;
47865+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
47866+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
47867+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
47868+ pax_close_kernel();
47869 }
47870
47871 /* disable hardware control by fn key */
47872diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
47873index 70222f2..8c8ce66 100644
47874--- a/drivers/platform/x86/msi-wmi.c
47875+++ b/drivers/platform/x86/msi-wmi.c
47876@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
47877 static void msi_wmi_notify(u32 value, void *context)
47878 {
47879 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
47880- static struct key_entry *key;
47881+ struct key_entry *key;
47882 union acpi_object *obj;
47883 acpi_status status;
47884
47885diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
47886index 9c5a074..06c976a 100644
47887--- a/drivers/platform/x86/sony-laptop.c
47888+++ b/drivers/platform/x86/sony-laptop.c
47889@@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
47890 }
47891
47892 /* High speed charging function */
47893-static struct device_attribute *hsc_handle;
47894+static device_attribute_no_const *hsc_handle;
47895
47896 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
47897 struct device_attribute *attr,
47898@@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
47899 }
47900
47901 /* low battery function */
47902-static struct device_attribute *lowbatt_handle;
47903+static device_attribute_no_const *lowbatt_handle;
47904
47905 static ssize_t sony_nc_lowbatt_store(struct device *dev,
47906 struct device_attribute *attr,
47907@@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
47908 }
47909
47910 /* fan speed function */
47911-static struct device_attribute *fan_handle, *hsf_handle;
47912+static device_attribute_no_const *fan_handle, *hsf_handle;
47913
47914 static ssize_t sony_nc_hsfan_store(struct device *dev,
47915 struct device_attribute *attr,
47916@@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
47917 }
47918
47919 /* USB charge function */
47920-static struct device_attribute *uc_handle;
47921+static device_attribute_no_const *uc_handle;
47922
47923 static ssize_t sony_nc_usb_charge_store(struct device *dev,
47924 struct device_attribute *attr,
47925@@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
47926 }
47927
47928 /* Panel ID function */
47929-static struct device_attribute *panel_handle;
47930+static device_attribute_no_const *panel_handle;
47931
47932 static ssize_t sony_nc_panelid_show(struct device *dev,
47933 struct device_attribute *attr, char *buffer)
47934@@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
47935 }
47936
47937 /* smart connect function */
47938-static struct device_attribute *sc_handle;
47939+static device_attribute_no_const *sc_handle;
47940
47941 static ssize_t sony_nc_smart_conn_store(struct device *dev,
47942 struct device_attribute *attr,
47943diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
47944index 15e61c1..40a39c7 100644
47945--- a/drivers/platform/x86/thinkpad_acpi.c
47946+++ b/drivers/platform/x86/thinkpad_acpi.c
47947@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
47948 return 0;
47949 }
47950
47951-void static hotkey_mask_warn_incomplete_mask(void)
47952+static void hotkey_mask_warn_incomplete_mask(void)
47953 {
47954 /* log only what the user can fix... */
47955 const u32 wantedmask = hotkey_driver_mask &
47956@@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
47957 && !tp_features.bright_unkfw)
47958 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
47959 }
47960+}
47961
47962 #undef TPACPI_COMPARE_KEY
47963 #undef TPACPI_MAY_SEND_KEY
47964-}
47965
47966 /*
47967 * Polling driver
47968diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
47969index 438d4c7..ca8a2fb 100644
47970--- a/drivers/pnp/pnpbios/bioscalls.c
47971+++ b/drivers/pnp/pnpbios/bioscalls.c
47972@@ -59,7 +59,7 @@ do { \
47973 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
47974 } while(0)
47975
47976-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
47977+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
47978 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
47979
47980 /*
47981@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
47982
47983 cpu = get_cpu();
47984 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
47985+
47986+ pax_open_kernel();
47987 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
47988+ pax_close_kernel();
47989
47990 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
47991 spin_lock_irqsave(&pnp_bios_lock, flags);
47992@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
47993 :"memory");
47994 spin_unlock_irqrestore(&pnp_bios_lock, flags);
47995
47996+ pax_open_kernel();
47997 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
47998+ pax_close_kernel();
47999+
48000 put_cpu();
48001
48002 /* If we get here and this is set then the PnP BIOS faulted on us. */
48003@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
48004 return status;
48005 }
48006
48007-void pnpbios_calls_init(union pnp_bios_install_struct *header)
48008+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
48009 {
48010 int i;
48011
48012@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
48013 pnp_bios_callpoint.offset = header->fields.pm16offset;
48014 pnp_bios_callpoint.segment = PNP_CS16;
48015
48016+ pax_open_kernel();
48017+
48018 for_each_possible_cpu(i) {
48019 struct desc_struct *gdt = get_cpu_gdt_table(i);
48020 if (!gdt)
48021@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
48022 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
48023 (unsigned long)__va(header->fields.pm16dseg));
48024 }
48025+
48026+ pax_close_kernel();
48027 }
48028diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
48029index 01712cb..782e822 100644
48030--- a/drivers/pnp/resource.c
48031+++ b/drivers/pnp/resource.c
48032@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
48033 return 1;
48034
48035 /* check if the resource is valid */
48036- if (*irq < 0 || *irq > 15)
48037+ if (*irq > 15)
48038 return 0;
48039
48040 /* check if the resource is reserved */
48041@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
48042 return 1;
48043
48044 /* check if the resource is valid */
48045- if (*dma < 0 || *dma == 4 || *dma > 7)
48046+ if (*dma == 4 || *dma > 7)
48047 return 0;
48048
48049 /* check if the resource is reserved */
48050diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
48051index 0c52e2a..3421ab7 100644
48052--- a/drivers/power/pda_power.c
48053+++ b/drivers/power/pda_power.c
48054@@ -37,7 +37,11 @@ static int polling;
48055
48056 #if IS_ENABLED(CONFIG_USB_PHY)
48057 static struct usb_phy *transceiver;
48058-static struct notifier_block otg_nb;
48059+static int otg_handle_notification(struct notifier_block *nb,
48060+ unsigned long event, void *unused);
48061+static struct notifier_block otg_nb = {
48062+ .notifier_call = otg_handle_notification
48063+};
48064 #endif
48065
48066 static struct regulator *ac_draw;
48067@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
48068
48069 #if IS_ENABLED(CONFIG_USB_PHY)
48070 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
48071- otg_nb.notifier_call = otg_handle_notification;
48072 ret = usb_register_notifier(transceiver, &otg_nb);
48073 if (ret) {
48074 dev_err(dev, "failure to register otg notifier\n");
48075diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
48076index cc439fd..8fa30df 100644
48077--- a/drivers/power/power_supply.h
48078+++ b/drivers/power/power_supply.h
48079@@ -16,12 +16,12 @@ struct power_supply;
48080
48081 #ifdef CONFIG_SYSFS
48082
48083-extern void power_supply_init_attrs(struct device_type *dev_type);
48084+extern void power_supply_init_attrs(void);
48085 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
48086
48087 #else
48088
48089-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
48090+static inline void power_supply_init_attrs(void) {}
48091 #define power_supply_uevent NULL
48092
48093 #endif /* CONFIG_SYSFS */
48094diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
48095index 2660664..75fcb04 100644
48096--- a/drivers/power/power_supply_core.c
48097+++ b/drivers/power/power_supply_core.c
48098@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
48099 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
48100 EXPORT_SYMBOL_GPL(power_supply_notifier);
48101
48102-static struct device_type power_supply_dev_type;
48103+extern const struct attribute_group *power_supply_attr_groups[];
48104+static struct device_type power_supply_dev_type = {
48105+ .groups = power_supply_attr_groups,
48106+};
48107
48108 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
48109 struct power_supply *supply)
48110@@ -628,7 +631,7 @@ static int __init power_supply_class_init(void)
48111 return PTR_ERR(power_supply_class);
48112
48113 power_supply_class->dev_uevent = power_supply_uevent;
48114- power_supply_init_attrs(&power_supply_dev_type);
48115+ power_supply_init_attrs();
48116
48117 return 0;
48118 }
48119diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
48120index 44420d1..967126e 100644
48121--- a/drivers/power/power_supply_sysfs.c
48122+++ b/drivers/power/power_supply_sysfs.c
48123@@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
48124 .is_visible = power_supply_attr_is_visible,
48125 };
48126
48127-static const struct attribute_group *power_supply_attr_groups[] = {
48128+const struct attribute_group *power_supply_attr_groups[] = {
48129 &power_supply_attr_group,
48130 NULL,
48131 };
48132
48133-void power_supply_init_attrs(struct device_type *dev_type)
48134+void power_supply_init_attrs(void)
48135 {
48136 int i;
48137
48138- dev_type->groups = power_supply_attr_groups;
48139-
48140 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
48141 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
48142 }
48143diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
48144index 84419af..268ede8 100644
48145--- a/drivers/powercap/powercap_sys.c
48146+++ b/drivers/powercap/powercap_sys.c
48147@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
48148 struct device_attribute name_attr;
48149 };
48150
48151+static ssize_t show_constraint_name(struct device *dev,
48152+ struct device_attribute *dev_attr,
48153+ char *buf);
48154+
48155 static struct powercap_constraint_attr
48156- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
48157+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
48158+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
48159+ .power_limit_attr = {
48160+ .attr = {
48161+ .name = NULL,
48162+ .mode = S_IWUSR | S_IRUGO
48163+ },
48164+ .show = show_constraint_power_limit_uw,
48165+ .store = store_constraint_power_limit_uw
48166+ },
48167+
48168+ .time_window_attr = {
48169+ .attr = {
48170+ .name = NULL,
48171+ .mode = S_IWUSR | S_IRUGO
48172+ },
48173+ .show = show_constraint_time_window_us,
48174+ .store = store_constraint_time_window_us
48175+ },
48176+
48177+ .max_power_attr = {
48178+ .attr = {
48179+ .name = NULL,
48180+ .mode = S_IRUGO
48181+ },
48182+ .show = show_constraint_max_power_uw,
48183+ .store = NULL
48184+ },
48185+
48186+ .min_power_attr = {
48187+ .attr = {
48188+ .name = NULL,
48189+ .mode = S_IRUGO
48190+ },
48191+ .show = show_constraint_min_power_uw,
48192+ .store = NULL
48193+ },
48194+
48195+ .max_time_window_attr = {
48196+ .attr = {
48197+ .name = NULL,
48198+ .mode = S_IRUGO
48199+ },
48200+ .show = show_constraint_max_time_window_us,
48201+ .store = NULL
48202+ },
48203+
48204+ .min_time_window_attr = {
48205+ .attr = {
48206+ .name = NULL,
48207+ .mode = S_IRUGO
48208+ },
48209+ .show = show_constraint_min_time_window_us,
48210+ .store = NULL
48211+ },
48212+
48213+ .name_attr = {
48214+ .attr = {
48215+ .name = NULL,
48216+ .mode = S_IRUGO
48217+ },
48218+ .show = show_constraint_name,
48219+ .store = NULL
48220+ }
48221+ }
48222+};
48223
48224 /* A list of powercap control_types */
48225 static LIST_HEAD(powercap_cntrl_list);
48226@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
48227 }
48228
48229 static int create_constraint_attribute(int id, const char *name,
48230- int mode,
48231- struct device_attribute *dev_attr,
48232- ssize_t (*show)(struct device *,
48233- struct device_attribute *, char *),
48234- ssize_t (*store)(struct device *,
48235- struct device_attribute *,
48236- const char *, size_t)
48237- )
48238+ struct device_attribute *dev_attr)
48239 {
48240+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
48241
48242- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
48243- id, name);
48244- if (!dev_attr->attr.name)
48245+ if (!name)
48246 return -ENOMEM;
48247- dev_attr->attr.mode = mode;
48248- dev_attr->show = show;
48249- dev_attr->store = store;
48250+
48251+ pax_open_kernel();
48252+ *(const char **)&dev_attr->attr.name = name;
48253+ pax_close_kernel();
48254
48255 return 0;
48256 }
48257@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
48258
48259 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
48260 ret = create_constraint_attribute(i, "power_limit_uw",
48261- S_IWUSR | S_IRUGO,
48262- &constraint_attrs[i].power_limit_attr,
48263- show_constraint_power_limit_uw,
48264- store_constraint_power_limit_uw);
48265+ &constraint_attrs[i].power_limit_attr);
48266 if (ret)
48267 goto err_alloc;
48268 ret = create_constraint_attribute(i, "time_window_us",
48269- S_IWUSR | S_IRUGO,
48270- &constraint_attrs[i].time_window_attr,
48271- show_constraint_time_window_us,
48272- store_constraint_time_window_us);
48273+ &constraint_attrs[i].time_window_attr);
48274 if (ret)
48275 goto err_alloc;
48276- ret = create_constraint_attribute(i, "name", S_IRUGO,
48277- &constraint_attrs[i].name_attr,
48278- show_constraint_name,
48279- NULL);
48280+ ret = create_constraint_attribute(i, "name",
48281+ &constraint_attrs[i].name_attr);
48282 if (ret)
48283 goto err_alloc;
48284- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
48285- &constraint_attrs[i].max_power_attr,
48286- show_constraint_max_power_uw,
48287- NULL);
48288+ ret = create_constraint_attribute(i, "max_power_uw",
48289+ &constraint_attrs[i].max_power_attr);
48290 if (ret)
48291 goto err_alloc;
48292- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
48293- &constraint_attrs[i].min_power_attr,
48294- show_constraint_min_power_uw,
48295- NULL);
48296+ ret = create_constraint_attribute(i, "min_power_uw",
48297+ &constraint_attrs[i].min_power_attr);
48298 if (ret)
48299 goto err_alloc;
48300 ret = create_constraint_attribute(i, "max_time_window_us",
48301- S_IRUGO,
48302- &constraint_attrs[i].max_time_window_attr,
48303- show_constraint_max_time_window_us,
48304- NULL);
48305+ &constraint_attrs[i].max_time_window_attr);
48306 if (ret)
48307 goto err_alloc;
48308 ret = create_constraint_attribute(i, "min_time_window_us",
48309- S_IRUGO,
48310- &constraint_attrs[i].min_time_window_attr,
48311- show_constraint_min_time_window_us,
48312- NULL);
48313+ &constraint_attrs[i].min_time_window_attr);
48314 if (ret)
48315 goto err_alloc;
48316
48317@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
48318 power_zone->zone_dev_attrs[count++] =
48319 &dev_attr_max_energy_range_uj.attr;
48320 if (power_zone->ops->get_energy_uj) {
48321+ pax_open_kernel();
48322 if (power_zone->ops->reset_energy_uj)
48323- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
48324+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
48325 else
48326- dev_attr_energy_uj.attr.mode = S_IRUGO;
48327+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
48328+ pax_close_kernel();
48329 power_zone->zone_dev_attrs[count++] =
48330 &dev_attr_energy_uj.attr;
48331 }
48332diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
48333index 9c5d414..c7900ce 100644
48334--- a/drivers/ptp/ptp_private.h
48335+++ b/drivers/ptp/ptp_private.h
48336@@ -51,7 +51,7 @@ struct ptp_clock {
48337 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
48338 wait_queue_head_t tsev_wq;
48339 int defunct; /* tells readers to go away when clock is being removed */
48340- struct device_attribute *pin_dev_attr;
48341+ device_attribute_no_const *pin_dev_attr;
48342 struct attribute **pin_attr;
48343 struct attribute_group pin_attr_group;
48344 };
48345diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
48346index 302e626..12579af 100644
48347--- a/drivers/ptp/ptp_sysfs.c
48348+++ b/drivers/ptp/ptp_sysfs.c
48349@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
48350 goto no_pin_attr;
48351
48352 for (i = 0; i < n_pins; i++) {
48353- struct device_attribute *da = &ptp->pin_dev_attr[i];
48354+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
48355 sysfs_attr_init(&da->attr);
48356 da->attr.name = info->pin_config[i].name;
48357 da->attr.mode = 0644;
48358diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
48359index 9a09f3c..450b523 100644
48360--- a/drivers/regulator/core.c
48361+++ b/drivers/regulator/core.c
48362@@ -3380,7 +3380,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
48363 {
48364 const struct regulation_constraints *constraints = NULL;
48365 const struct regulator_init_data *init_data;
48366- static atomic_t regulator_no = ATOMIC_INIT(0);
48367+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
48368 struct regulator_dev *rdev;
48369 struct device *dev;
48370 int ret, i;
48371@@ -3450,7 +3450,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
48372 rdev->dev.of_node = config->of_node;
48373 rdev->dev.parent = dev;
48374 dev_set_name(&rdev->dev, "regulator.%d",
48375- atomic_inc_return(&regulator_no) - 1);
48376+ atomic_inc_return_unchecked(&regulator_no) - 1);
48377 ret = device_register(&rdev->dev);
48378 if (ret != 0) {
48379 put_device(&rdev->dev);
48380diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
48381index 2fc4111..6aa88ca 100644
48382--- a/drivers/regulator/max8660.c
48383+++ b/drivers/regulator/max8660.c
48384@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
48385 max8660->shadow_regs[MAX8660_OVER1] = 5;
48386 } else {
48387 /* Otherwise devices can be toggled via software */
48388- max8660_dcdc_ops.enable = max8660_dcdc_enable;
48389- max8660_dcdc_ops.disable = max8660_dcdc_disable;
48390+ pax_open_kernel();
48391+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
48392+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
48393+ pax_close_kernel();
48394 }
48395
48396 /*
48397diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
48398index dbedf17..18ff6b7 100644
48399--- a/drivers/regulator/max8973-regulator.c
48400+++ b/drivers/regulator/max8973-regulator.c
48401@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
48402 if (!pdata || !pdata->enable_ext_control) {
48403 max->desc.enable_reg = MAX8973_VOUT;
48404 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
48405- max->ops.enable = regulator_enable_regmap;
48406- max->ops.disable = regulator_disable_regmap;
48407- max->ops.is_enabled = regulator_is_enabled_regmap;
48408+ pax_open_kernel();
48409+ *(void **)&max->ops.enable = regulator_enable_regmap;
48410+ *(void **)&max->ops.disable = regulator_disable_regmap;
48411+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
48412+ pax_close_kernel();
48413 }
48414
48415 if (pdata) {
48416diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
48417index f374fa5..26f0683 100644
48418--- a/drivers/regulator/mc13892-regulator.c
48419+++ b/drivers/regulator/mc13892-regulator.c
48420@@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
48421 }
48422 mc13xxx_unlock(mc13892);
48423
48424- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
48425+ pax_open_kernel();
48426+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
48427 = mc13892_vcam_set_mode;
48428- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
48429+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
48430 = mc13892_vcam_get_mode;
48431+ pax_close_kernel();
48432
48433 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
48434 ARRAY_SIZE(mc13892_regulators));
48435diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
48436index 0963c93..ea29cce 100644
48437--- a/drivers/rtc/rtc-cmos.c
48438+++ b/drivers/rtc/rtc-cmos.c
48439@@ -777,7 +777,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
48440 hpet_rtc_timer_init();
48441
48442 /* export at least the first block of NVRAM */
48443- nvram.size = address_space - NVRAM_OFFSET;
48444+ pax_open_kernel();
48445+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
48446+ pax_close_kernel();
48447 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
48448 if (retval < 0) {
48449 dev_dbg(dev, "can't create nvram file? %d\n", retval);
48450diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
48451index d049393..bb20be0 100644
48452--- a/drivers/rtc/rtc-dev.c
48453+++ b/drivers/rtc/rtc-dev.c
48454@@ -16,6 +16,7 @@
48455 #include <linux/module.h>
48456 #include <linux/rtc.h>
48457 #include <linux/sched.h>
48458+#include <linux/grsecurity.h>
48459 #include "rtc-core.h"
48460
48461 static dev_t rtc_devt;
48462@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
48463 if (copy_from_user(&tm, uarg, sizeof(tm)))
48464 return -EFAULT;
48465
48466+ gr_log_timechange();
48467+
48468 return rtc_set_time(rtc, &tm);
48469
48470 case RTC_PIE_ON:
48471diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
48472index f03d5ba..8325bf6 100644
48473--- a/drivers/rtc/rtc-ds1307.c
48474+++ b/drivers/rtc/rtc-ds1307.c
48475@@ -107,7 +107,7 @@ struct ds1307 {
48476 u8 offset; /* register's offset */
48477 u8 regs[11];
48478 u16 nvram_offset;
48479- struct bin_attribute *nvram;
48480+ bin_attribute_no_const *nvram;
48481 enum ds_type type;
48482 unsigned long flags;
48483 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
48484diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
48485index 11880c1..b823aa4 100644
48486--- a/drivers/rtc/rtc-m48t59.c
48487+++ b/drivers/rtc/rtc-m48t59.c
48488@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
48489 if (IS_ERR(m48t59->rtc))
48490 return PTR_ERR(m48t59->rtc);
48491
48492- m48t59_nvram_attr.size = pdata->offset;
48493+ pax_open_kernel();
48494+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
48495+ pax_close_kernel();
48496
48497 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
48498 if (ret)
48499diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
48500index 14b5f8d..cc9bd26 100644
48501--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
48502+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
48503@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
48504 for (bit = 0; bit < 8; bit++) {
48505
48506 if ((pci_status[i] & (0x1 << bit)) != 0) {
48507- static const char *s;
48508+ const char *s;
48509
48510 s = pci_status_strings[bit];
48511 if (i == 7/*TARG*/ && bit == 3)
48512@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
48513
48514 for (bit = 0; bit < 8; bit++) {
48515
48516- if ((split_status[i] & (0x1 << bit)) != 0) {
48517- static const char *s;
48518-
48519- s = split_status_strings[bit];
48520- printk(s, ahd_name(ahd),
48521+ if ((split_status[i] & (0x1 << bit)) != 0)
48522+ printk(split_status_strings[bit], ahd_name(ahd),
48523 split_status_source[i]);
48524- }
48525
48526 if (i > 1)
48527 continue;
48528
48529- if ((sg_split_status[i] & (0x1 << bit)) != 0) {
48530- static const char *s;
48531-
48532- s = split_status_strings[bit];
48533- printk(s, ahd_name(ahd), "SG");
48534- }
48535+ if ((sg_split_status[i] & (0x1 << bit)) != 0)
48536+ printk(split_status_strings[bit], ahd_name(ahd), "SG");
48537 }
48538 }
48539 /*
48540diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
48541index e693af6..2e525b6 100644
48542--- a/drivers/scsi/bfa/bfa_fcpim.h
48543+++ b/drivers/scsi/bfa/bfa_fcpim.h
48544@@ -36,7 +36,7 @@ struct bfa_iotag_s {
48545
48546 struct bfa_itn_s {
48547 bfa_isr_func_t isr;
48548-};
48549+} __no_const;
48550
48551 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
48552 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
48553diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
48554index a3ab5cc..8143622 100644
48555--- a/drivers/scsi/bfa/bfa_fcs.c
48556+++ b/drivers/scsi/bfa/bfa_fcs.c
48557@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
48558 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
48559
48560 static struct bfa_fcs_mod_s fcs_modules[] = {
48561- { bfa_fcs_port_attach, NULL, NULL },
48562- { bfa_fcs_uf_attach, NULL, NULL },
48563- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
48564- bfa_fcs_fabric_modexit },
48565+ {
48566+ .attach = bfa_fcs_port_attach,
48567+ .modinit = NULL,
48568+ .modexit = NULL
48569+ },
48570+ {
48571+ .attach = bfa_fcs_uf_attach,
48572+ .modinit = NULL,
48573+ .modexit = NULL
48574+ },
48575+ {
48576+ .attach = bfa_fcs_fabric_attach,
48577+ .modinit = bfa_fcs_fabric_modinit,
48578+ .modexit = bfa_fcs_fabric_modexit
48579+ },
48580 };
48581
48582 /*
48583diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
48584index ff75ef8..2dfe00a 100644
48585--- a/drivers/scsi/bfa/bfa_fcs_lport.c
48586+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
48587@@ -89,15 +89,26 @@ static struct {
48588 void (*offline) (struct bfa_fcs_lport_s *port);
48589 } __port_action[] = {
48590 {
48591- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
48592- bfa_fcs_lport_unknown_offline}, {
48593- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
48594- bfa_fcs_lport_fab_offline}, {
48595- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
48596- bfa_fcs_lport_n2n_offline}, {
48597- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
48598- bfa_fcs_lport_loop_offline},
48599- };
48600+ .init = bfa_fcs_lport_unknown_init,
48601+ .online = bfa_fcs_lport_unknown_online,
48602+ .offline = bfa_fcs_lport_unknown_offline
48603+ },
48604+ {
48605+ .init = bfa_fcs_lport_fab_init,
48606+ .online = bfa_fcs_lport_fab_online,
48607+ .offline = bfa_fcs_lport_fab_offline
48608+ },
48609+ {
48610+ .init = bfa_fcs_lport_n2n_init,
48611+ .online = bfa_fcs_lport_n2n_online,
48612+ .offline = bfa_fcs_lport_n2n_offline
48613+ },
48614+ {
48615+ .init = bfa_fcs_lport_loop_init,
48616+ .online = bfa_fcs_lport_loop_online,
48617+ .offline = bfa_fcs_lport_loop_offline
48618+ },
48619+};
48620
48621 /*
48622 * fcs_port_sm FCS logical port state machine
48623diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
48624index 2e28392..9d865b6 100644
48625--- a/drivers/scsi/bfa/bfa_ioc.h
48626+++ b/drivers/scsi/bfa/bfa_ioc.h
48627@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
48628 bfa_ioc_disable_cbfn_t disable_cbfn;
48629 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
48630 bfa_ioc_reset_cbfn_t reset_cbfn;
48631-};
48632+} __no_const;
48633
48634 /*
48635 * IOC event notification mechanism.
48636@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
48637 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
48638 enum bfi_ioc_state fwstate);
48639 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
48640-};
48641+} __no_const;
48642
48643 /*
48644 * Queue element to wait for room in request queue. FIFO order is
48645diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
48646index a14c784..6de6790 100644
48647--- a/drivers/scsi/bfa/bfa_modules.h
48648+++ b/drivers/scsi/bfa/bfa_modules.h
48649@@ -78,12 +78,12 @@ enum {
48650 \
48651 extern struct bfa_module_s hal_mod_ ## __mod; \
48652 struct bfa_module_s hal_mod_ ## __mod = { \
48653- bfa_ ## __mod ## _meminfo, \
48654- bfa_ ## __mod ## _attach, \
48655- bfa_ ## __mod ## _detach, \
48656- bfa_ ## __mod ## _start, \
48657- bfa_ ## __mod ## _stop, \
48658- bfa_ ## __mod ## _iocdisable, \
48659+ .meminfo = bfa_ ## __mod ## _meminfo, \
48660+ .attach = bfa_ ## __mod ## _attach, \
48661+ .detach = bfa_ ## __mod ## _detach, \
48662+ .start = bfa_ ## __mod ## _start, \
48663+ .stop = bfa_ ## __mod ## _stop, \
48664+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
48665 }
48666
48667 #define BFA_CACHELINE_SZ (256)
48668diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
48669index 045c4e1..13de803 100644
48670--- a/drivers/scsi/fcoe/fcoe_sysfs.c
48671+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
48672@@ -33,8 +33,8 @@
48673 */
48674 #include "libfcoe.h"
48675
48676-static atomic_t ctlr_num;
48677-static atomic_t fcf_num;
48678+static atomic_unchecked_t ctlr_num;
48679+static atomic_unchecked_t fcf_num;
48680
48681 /*
48682 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
48683@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
48684 if (!ctlr)
48685 goto out;
48686
48687- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
48688+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
48689 ctlr->f = f;
48690 ctlr->mode = FIP_CONN_TYPE_FABRIC;
48691 INIT_LIST_HEAD(&ctlr->fcfs);
48692@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
48693 fcf->dev.parent = &ctlr->dev;
48694 fcf->dev.bus = &fcoe_bus_type;
48695 fcf->dev.type = &fcoe_fcf_device_type;
48696- fcf->id = atomic_inc_return(&fcf_num) - 1;
48697+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
48698 fcf->state = FCOE_FCF_STATE_UNKNOWN;
48699
48700 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
48701@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
48702 {
48703 int error;
48704
48705- atomic_set(&ctlr_num, 0);
48706- atomic_set(&fcf_num, 0);
48707+ atomic_set_unchecked(&ctlr_num, 0);
48708+ atomic_set_unchecked(&fcf_num, 0);
48709
48710 error = bus_register(&fcoe_bus_type);
48711 if (error)
48712diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
48713index 3cbb57a..95e47a3 100644
48714--- a/drivers/scsi/hosts.c
48715+++ b/drivers/scsi/hosts.c
48716@@ -42,7 +42,7 @@
48717 #include "scsi_logging.h"
48718
48719
48720-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
48721+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
48722
48723
48724 static void scsi_host_cls_release(struct device *dev)
48725@@ -369,7 +369,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
48726 * subtract one because we increment first then return, but we need to
48727 * know what the next host number was before increment
48728 */
48729- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
48730+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
48731 shost->dma_channel = 0xff;
48732
48733 /* These three are default values which can be overridden */
48734diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
48735index fda6cf1..7a6b5d8 100644
48736--- a/drivers/scsi/hpsa.c
48737+++ b/drivers/scsi/hpsa.c
48738@@ -699,10 +699,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
48739 unsigned long flags;
48740
48741 if (h->transMethod & CFGTBL_Trans_io_accel1)
48742- return h->access.command_completed(h, q);
48743+ return h->access->command_completed(h, q);
48744
48745 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
48746- return h->access.command_completed(h, q);
48747+ return h->access->command_completed(h, q);
48748
48749 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
48750 a = rq->head[rq->current_entry];
48751@@ -5460,7 +5460,7 @@ static void start_io(struct ctlr_info *h)
48752 while (!list_empty(&h->reqQ)) {
48753 c = list_entry(h->reqQ.next, struct CommandList, list);
48754 /* can't do anything if fifo is full */
48755- if ((h->access.fifo_full(h))) {
48756+ if ((h->access->fifo_full(h))) {
48757 h->fifo_recently_full = 1;
48758 dev_warn(&h->pdev->dev, "fifo full\n");
48759 break;
48760@@ -5484,7 +5484,7 @@ static void start_io(struct ctlr_info *h)
48761
48762 /* Tell the controller execute command */
48763 spin_unlock_irqrestore(&h->lock, flags);
48764- h->access.submit_command(h, c);
48765+ h->access->submit_command(h, c);
48766 spin_lock_irqsave(&h->lock, flags);
48767 }
48768 spin_unlock_irqrestore(&h->lock, flags);
48769@@ -5492,17 +5492,17 @@ static void start_io(struct ctlr_info *h)
48770
48771 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
48772 {
48773- return h->access.command_completed(h, q);
48774+ return h->access->command_completed(h, q);
48775 }
48776
48777 static inline bool interrupt_pending(struct ctlr_info *h)
48778 {
48779- return h->access.intr_pending(h);
48780+ return h->access->intr_pending(h);
48781 }
48782
48783 static inline long interrupt_not_for_us(struct ctlr_info *h)
48784 {
48785- return (h->access.intr_pending(h) == 0) ||
48786+ return (h->access->intr_pending(h) == 0) ||
48787 (h->interrupts_enabled == 0);
48788 }
48789
48790@@ -6456,7 +6456,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
48791 if (prod_index < 0)
48792 return -ENODEV;
48793 h->product_name = products[prod_index].product_name;
48794- h->access = *(products[prod_index].access);
48795+ h->access = products[prod_index].access;
48796
48797 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
48798 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
48799@@ -6735,7 +6735,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
48800 {
48801 unsigned long flags;
48802
48803- h->access.set_intr_mask(h, HPSA_INTR_OFF);
48804+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
48805 spin_lock_irqsave(&h->lock, flags);
48806 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
48807 spin_unlock_irqrestore(&h->lock, flags);
48808@@ -6963,7 +6963,7 @@ reinit_after_soft_reset:
48809 }
48810
48811 /* make sure the board interrupts are off */
48812- h->access.set_intr_mask(h, HPSA_INTR_OFF);
48813+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
48814
48815 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
48816 goto clean2;
48817@@ -6998,7 +6998,7 @@ reinit_after_soft_reset:
48818 * fake ones to scoop up any residual completions.
48819 */
48820 spin_lock_irqsave(&h->lock, flags);
48821- h->access.set_intr_mask(h, HPSA_INTR_OFF);
48822+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
48823 spin_unlock_irqrestore(&h->lock, flags);
48824 free_irqs(h);
48825 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
48826@@ -7017,9 +7017,9 @@ reinit_after_soft_reset:
48827 dev_info(&h->pdev->dev, "Board READY.\n");
48828 dev_info(&h->pdev->dev,
48829 "Waiting for stale completions to drain.\n");
48830- h->access.set_intr_mask(h, HPSA_INTR_ON);
48831+ h->access->set_intr_mask(h, HPSA_INTR_ON);
48832 msleep(10000);
48833- h->access.set_intr_mask(h, HPSA_INTR_OFF);
48834+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
48835
48836 rc = controller_reset_failed(h->cfgtable);
48837 if (rc)
48838@@ -7045,7 +7045,7 @@ reinit_after_soft_reset:
48839 h->drv_req_rescan = 0;
48840
48841 /* Turn the interrupts on so we can service requests */
48842- h->access.set_intr_mask(h, HPSA_INTR_ON);
48843+ h->access->set_intr_mask(h, HPSA_INTR_ON);
48844
48845 hpsa_hba_inquiry(h);
48846 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
48847@@ -7114,7 +7114,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
48848 * To write all data in the battery backed cache to disks
48849 */
48850 hpsa_flush_cache(h);
48851- h->access.set_intr_mask(h, HPSA_INTR_OFF);
48852+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
48853 hpsa_free_irqs_and_disable_msix(h);
48854 }
48855
48856@@ -7232,7 +7232,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
48857 CFGTBL_Trans_enable_directed_msix |
48858 (trans_support & (CFGTBL_Trans_io_accel1 |
48859 CFGTBL_Trans_io_accel2));
48860- struct access_method access = SA5_performant_access;
48861+ struct access_method *access = &SA5_performant_access;
48862
48863 /* This is a bit complicated. There are 8 registers on
48864 * the controller which we write to to tell it 8 different
48865@@ -7297,12 +7297,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
48866 * enable outbound interrupt coalescing in accelerator mode;
48867 */
48868 if (trans_support & CFGTBL_Trans_io_accel1) {
48869- access = SA5_ioaccel_mode1_access;
48870+ access = &SA5_ioaccel_mode1_access;
48871 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
48872 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
48873 } else {
48874 if (trans_support & CFGTBL_Trans_io_accel2) {
48875- access = SA5_ioaccel_mode2_access;
48876+ access = &SA5_ioaccel_mode2_access;
48877 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
48878 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
48879 }
48880diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
48881index 44235a2..962e91b 100644
48882--- a/drivers/scsi/hpsa.h
48883+++ b/drivers/scsi/hpsa.h
48884@@ -128,7 +128,7 @@ struct ctlr_info {
48885 unsigned int msix_vector;
48886 unsigned int msi_vector;
48887 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
48888- struct access_method access;
48889+ struct access_method *access;
48890 char hba_mode_enabled;
48891
48892 /* queue and queue Info */
48893@@ -541,35 +541,35 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
48894 }
48895
48896 static struct access_method SA5_access = {
48897- SA5_submit_command,
48898- SA5_intr_mask,
48899- SA5_fifo_full,
48900- SA5_intr_pending,
48901- SA5_completed,
48902+ .submit_command = SA5_submit_command,
48903+ .set_intr_mask = SA5_intr_mask,
48904+ .fifo_full = SA5_fifo_full,
48905+ .intr_pending = SA5_intr_pending,
48906+ .command_completed = SA5_completed,
48907 };
48908
48909 static struct access_method SA5_ioaccel_mode1_access = {
48910- SA5_submit_command,
48911- SA5_performant_intr_mask,
48912- SA5_fifo_full,
48913- SA5_ioaccel_mode1_intr_pending,
48914- SA5_ioaccel_mode1_completed,
48915+ .submit_command = SA5_submit_command,
48916+ .set_intr_mask = SA5_performant_intr_mask,
48917+ .fifo_full = SA5_fifo_full,
48918+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
48919+ .command_completed = SA5_ioaccel_mode1_completed,
48920 };
48921
48922 static struct access_method SA5_ioaccel_mode2_access = {
48923- SA5_submit_command_ioaccel2,
48924- SA5_performant_intr_mask,
48925- SA5_fifo_full,
48926- SA5_performant_intr_pending,
48927- SA5_performant_completed,
48928+ .submit_command = SA5_submit_command_ioaccel2,
48929+ .set_intr_mask = SA5_performant_intr_mask,
48930+ .fifo_full = SA5_fifo_full,
48931+ .intr_pending = SA5_performant_intr_pending,
48932+ .command_completed = SA5_performant_completed,
48933 };
48934
48935 static struct access_method SA5_performant_access = {
48936- SA5_submit_command,
48937- SA5_performant_intr_mask,
48938- SA5_fifo_full,
48939- SA5_performant_intr_pending,
48940- SA5_performant_completed,
48941+ .submit_command = SA5_submit_command,
48942+ .set_intr_mask = SA5_performant_intr_mask,
48943+ .fifo_full = SA5_fifo_full,
48944+ .intr_pending = SA5_performant_intr_pending,
48945+ .command_completed = SA5_performant_completed,
48946 };
48947
48948 struct board_type {
48949diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
48950index 1b3a094..068e683 100644
48951--- a/drivers/scsi/libfc/fc_exch.c
48952+++ b/drivers/scsi/libfc/fc_exch.c
48953@@ -101,12 +101,12 @@ struct fc_exch_mgr {
48954 u16 pool_max_index;
48955
48956 struct {
48957- atomic_t no_free_exch;
48958- atomic_t no_free_exch_xid;
48959- atomic_t xid_not_found;
48960- atomic_t xid_busy;
48961- atomic_t seq_not_found;
48962- atomic_t non_bls_resp;
48963+ atomic_unchecked_t no_free_exch;
48964+ atomic_unchecked_t no_free_exch_xid;
48965+ atomic_unchecked_t xid_not_found;
48966+ atomic_unchecked_t xid_busy;
48967+ atomic_unchecked_t seq_not_found;
48968+ atomic_unchecked_t non_bls_resp;
48969 } stats;
48970 };
48971
48972@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
48973 /* allocate memory for exchange */
48974 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
48975 if (!ep) {
48976- atomic_inc(&mp->stats.no_free_exch);
48977+ atomic_inc_unchecked(&mp->stats.no_free_exch);
48978 goto out;
48979 }
48980 memset(ep, 0, sizeof(*ep));
48981@@ -874,7 +874,7 @@ out:
48982 return ep;
48983 err:
48984 spin_unlock_bh(&pool->lock);
48985- atomic_inc(&mp->stats.no_free_exch_xid);
48986+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
48987 mempool_free(ep, mp->ep_pool);
48988 return NULL;
48989 }
48990@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
48991 xid = ntohs(fh->fh_ox_id); /* we originated exch */
48992 ep = fc_exch_find(mp, xid);
48993 if (!ep) {
48994- atomic_inc(&mp->stats.xid_not_found);
48995+ atomic_inc_unchecked(&mp->stats.xid_not_found);
48996 reject = FC_RJT_OX_ID;
48997 goto out;
48998 }
48999@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49000 ep = fc_exch_find(mp, xid);
49001 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
49002 if (ep) {
49003- atomic_inc(&mp->stats.xid_busy);
49004+ atomic_inc_unchecked(&mp->stats.xid_busy);
49005 reject = FC_RJT_RX_ID;
49006 goto rel;
49007 }
49008@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49009 }
49010 xid = ep->xid; /* get our XID */
49011 } else if (!ep) {
49012- atomic_inc(&mp->stats.xid_not_found);
49013+ atomic_inc_unchecked(&mp->stats.xid_not_found);
49014 reject = FC_RJT_RX_ID; /* XID not found */
49015 goto out;
49016 }
49017@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
49018 } else {
49019 sp = &ep->seq;
49020 if (sp->id != fh->fh_seq_id) {
49021- atomic_inc(&mp->stats.seq_not_found);
49022+ atomic_inc_unchecked(&mp->stats.seq_not_found);
49023 if (f_ctl & FC_FC_END_SEQ) {
49024 /*
49025 * Update sequence_id based on incoming last
49026@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
49027
49028 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
49029 if (!ep) {
49030- atomic_inc(&mp->stats.xid_not_found);
49031+ atomic_inc_unchecked(&mp->stats.xid_not_found);
49032 goto out;
49033 }
49034 if (ep->esb_stat & ESB_ST_COMPLETE) {
49035- atomic_inc(&mp->stats.xid_not_found);
49036+ atomic_inc_unchecked(&mp->stats.xid_not_found);
49037 goto rel;
49038 }
49039 if (ep->rxid == FC_XID_UNKNOWN)
49040 ep->rxid = ntohs(fh->fh_rx_id);
49041 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
49042- atomic_inc(&mp->stats.xid_not_found);
49043+ atomic_inc_unchecked(&mp->stats.xid_not_found);
49044 goto rel;
49045 }
49046 if (ep->did != ntoh24(fh->fh_s_id) &&
49047 ep->did != FC_FID_FLOGI) {
49048- atomic_inc(&mp->stats.xid_not_found);
49049+ atomic_inc_unchecked(&mp->stats.xid_not_found);
49050 goto rel;
49051 }
49052 sof = fr_sof(fp);
49053@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
49054 sp->ssb_stat |= SSB_ST_RESP;
49055 sp->id = fh->fh_seq_id;
49056 } else if (sp->id != fh->fh_seq_id) {
49057- atomic_inc(&mp->stats.seq_not_found);
49058+ atomic_inc_unchecked(&mp->stats.seq_not_found);
49059 goto rel;
49060 }
49061
49062@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
49063 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
49064
49065 if (!sp)
49066- atomic_inc(&mp->stats.xid_not_found);
49067+ atomic_inc_unchecked(&mp->stats.xid_not_found);
49068 else
49069- atomic_inc(&mp->stats.non_bls_resp);
49070+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
49071
49072 fc_frame_free(fp);
49073 }
49074@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
49075
49076 list_for_each_entry(ema, &lport->ema_list, ema_list) {
49077 mp = ema->mp;
49078- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
49079+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
49080 st->fc_no_free_exch_xid +=
49081- atomic_read(&mp->stats.no_free_exch_xid);
49082- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
49083- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
49084- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
49085- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
49086+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
49087+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
49088+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
49089+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
49090+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
49091 }
49092 }
49093 EXPORT_SYMBOL(fc_exch_update_stats);
49094diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
49095index 766098a..1c6c971 100644
49096--- a/drivers/scsi/libsas/sas_ata.c
49097+++ b/drivers/scsi/libsas/sas_ata.c
49098@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
49099 .postreset = ata_std_postreset,
49100 .error_handler = ata_std_error_handler,
49101 .post_internal_cmd = sas_ata_post_internal,
49102- .qc_defer = ata_std_qc_defer,
49103+ .qc_defer = ata_std_qc_defer,
49104 .qc_prep = ata_noop_qc_prep,
49105 .qc_issue = sas_ata_qc_issue,
49106 .qc_fill_rtf = sas_ata_qc_fill_rtf,
49107diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
49108index 94a3caf..a118dec 100644
49109--- a/drivers/scsi/lpfc/lpfc.h
49110+++ b/drivers/scsi/lpfc/lpfc.h
49111@@ -430,7 +430,7 @@ struct lpfc_vport {
49112 struct dentry *debug_nodelist;
49113 struct dentry *vport_debugfs_root;
49114 struct lpfc_debugfs_trc *disc_trc;
49115- atomic_t disc_trc_cnt;
49116+ atomic_unchecked_t disc_trc_cnt;
49117 #endif
49118 uint8_t stat_data_enabled;
49119 uint8_t stat_data_blocked;
49120@@ -879,8 +879,8 @@ struct lpfc_hba {
49121 struct timer_list fabric_block_timer;
49122 unsigned long bit_flags;
49123 #define FABRIC_COMANDS_BLOCKED 0
49124- atomic_t num_rsrc_err;
49125- atomic_t num_cmd_success;
49126+ atomic_unchecked_t num_rsrc_err;
49127+ atomic_unchecked_t num_cmd_success;
49128 unsigned long last_rsrc_error_time;
49129 unsigned long last_ramp_down_time;
49130 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
49131@@ -915,7 +915,7 @@ struct lpfc_hba {
49132
49133 struct dentry *debug_slow_ring_trc;
49134 struct lpfc_debugfs_trc *slow_ring_trc;
49135- atomic_t slow_ring_trc_cnt;
49136+ atomic_unchecked_t slow_ring_trc_cnt;
49137 /* iDiag debugfs sub-directory */
49138 struct dentry *idiag_root;
49139 struct dentry *idiag_pci_cfg;
49140diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
49141index 828c08e..e3378e0 100644
49142--- a/drivers/scsi/lpfc/lpfc_debugfs.c
49143+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
49144@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
49145
49146 #include <linux/debugfs.h>
49147
49148-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
49149+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
49150 static unsigned long lpfc_debugfs_start_time = 0L;
49151
49152 /* iDiag */
49153@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
49154 lpfc_debugfs_enable = 0;
49155
49156 len = 0;
49157- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
49158+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
49159 (lpfc_debugfs_max_disc_trc - 1);
49160 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
49161 dtp = vport->disc_trc + i;
49162@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
49163 lpfc_debugfs_enable = 0;
49164
49165 len = 0;
49166- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
49167+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
49168 (lpfc_debugfs_max_slow_ring_trc - 1);
49169 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
49170 dtp = phba->slow_ring_trc + i;
49171@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
49172 !vport || !vport->disc_trc)
49173 return;
49174
49175- index = atomic_inc_return(&vport->disc_trc_cnt) &
49176+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
49177 (lpfc_debugfs_max_disc_trc - 1);
49178 dtp = vport->disc_trc + index;
49179 dtp->fmt = fmt;
49180 dtp->data1 = data1;
49181 dtp->data2 = data2;
49182 dtp->data3 = data3;
49183- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
49184+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
49185 dtp->jif = jiffies;
49186 #endif
49187 return;
49188@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
49189 !phba || !phba->slow_ring_trc)
49190 return;
49191
49192- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
49193+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
49194 (lpfc_debugfs_max_slow_ring_trc - 1);
49195 dtp = phba->slow_ring_trc + index;
49196 dtp->fmt = fmt;
49197 dtp->data1 = data1;
49198 dtp->data2 = data2;
49199 dtp->data3 = data3;
49200- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
49201+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
49202 dtp->jif = jiffies;
49203 #endif
49204 return;
49205@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
49206 "slow_ring buffer\n");
49207 goto debug_failed;
49208 }
49209- atomic_set(&phba->slow_ring_trc_cnt, 0);
49210+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
49211 memset(phba->slow_ring_trc, 0,
49212 (sizeof(struct lpfc_debugfs_trc) *
49213 lpfc_debugfs_max_slow_ring_trc));
49214@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
49215 "buffer\n");
49216 goto debug_failed;
49217 }
49218- atomic_set(&vport->disc_trc_cnt, 0);
49219+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
49220
49221 snprintf(name, sizeof(name), "discovery_trace");
49222 vport->debug_disc_trc =
49223diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
49224index 635eeb3..038aef6 100644
49225--- a/drivers/scsi/lpfc/lpfc_init.c
49226+++ b/drivers/scsi/lpfc/lpfc_init.c
49227@@ -11194,8 +11194,10 @@ lpfc_init(void)
49228 "misc_register returned with status %d", error);
49229
49230 if (lpfc_enable_npiv) {
49231- lpfc_transport_functions.vport_create = lpfc_vport_create;
49232- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
49233+ pax_open_kernel();
49234+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
49235+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
49236+ pax_close_kernel();
49237 }
49238 lpfc_transport_template =
49239 fc_attach_transport(&lpfc_transport_functions);
49240diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
49241index 462453e..c0023a6 100644
49242--- a/drivers/scsi/lpfc/lpfc_scsi.c
49243+++ b/drivers/scsi/lpfc/lpfc_scsi.c
49244@@ -382,7 +382,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
49245 uint32_t evt_posted;
49246
49247 spin_lock_irqsave(&phba->hbalock, flags);
49248- atomic_inc(&phba->num_rsrc_err);
49249+ atomic_inc_unchecked(&phba->num_rsrc_err);
49250 phba->last_rsrc_error_time = jiffies;
49251
49252 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
49253@@ -423,8 +423,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
49254 unsigned long num_rsrc_err, num_cmd_success;
49255 int i;
49256
49257- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
49258- num_cmd_success = atomic_read(&phba->num_cmd_success);
49259+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
49260+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
49261
49262 /*
49263 * The error and success command counters are global per
49264@@ -452,8 +452,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
49265 }
49266 }
49267 lpfc_destroy_vport_work_array(phba, vports);
49268- atomic_set(&phba->num_rsrc_err, 0);
49269- atomic_set(&phba->num_cmd_success, 0);
49270+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
49271+ atomic_set_unchecked(&phba->num_cmd_success, 0);
49272 }
49273
49274 /**
49275diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49276index 6fd7d40..b444223 100644
49277--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49278+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
49279@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
49280 {
49281 struct scsi_device *sdev = to_scsi_device(dev);
49282 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
49283- static struct _raid_device *raid_device;
49284+ struct _raid_device *raid_device;
49285 unsigned long flags;
49286 Mpi2RaidVolPage0_t vol_pg0;
49287 Mpi2ConfigReply_t mpi_reply;
49288@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
49289 {
49290 struct scsi_device *sdev = to_scsi_device(dev);
49291 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
49292- static struct _raid_device *raid_device;
49293+ struct _raid_device *raid_device;
49294 unsigned long flags;
49295 Mpi2RaidVolPage0_t vol_pg0;
49296 Mpi2ConfigReply_t mpi_reply;
49297@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
49298 struct fw_event_work *fw_event)
49299 {
49300 Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
49301- static struct _raid_device *raid_device;
49302+ struct _raid_device *raid_device;
49303 unsigned long flags;
49304 u16 handle;
49305
49306@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
49307 u64 sas_address;
49308 struct _sas_device *sas_device;
49309 struct _sas_node *expander_device;
49310- static struct _raid_device *raid_device;
49311+ struct _raid_device *raid_device;
49312 u8 retry_count;
49313 unsigned long flags;
49314
49315diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
49316index be8ce54..94ed33a 100644
49317--- a/drivers/scsi/pmcraid.c
49318+++ b/drivers/scsi/pmcraid.c
49319@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
49320 res->scsi_dev = scsi_dev;
49321 scsi_dev->hostdata = res;
49322 res->change_detected = 0;
49323- atomic_set(&res->read_failures, 0);
49324- atomic_set(&res->write_failures, 0);
49325+ atomic_set_unchecked(&res->read_failures, 0);
49326+ atomic_set_unchecked(&res->write_failures, 0);
49327 rc = 0;
49328 }
49329 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
49330@@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
49331
49332 /* If this was a SCSI read/write command keep count of errors */
49333 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
49334- atomic_inc(&res->read_failures);
49335+ atomic_inc_unchecked(&res->read_failures);
49336 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
49337- atomic_inc(&res->write_failures);
49338+ atomic_inc_unchecked(&res->write_failures);
49339
49340 if (!RES_IS_GSCSI(res->cfg_entry) &&
49341 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
49342@@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
49343 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
49344 * hrrq_id assigned here in queuecommand
49345 */
49346- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
49347+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
49348 pinstance->num_hrrq;
49349 cmd->cmd_done = pmcraid_io_done;
49350
49351@@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
49352 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
49353 * hrrq_id assigned here in queuecommand
49354 */
49355- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
49356+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
49357 pinstance->num_hrrq;
49358
49359 if (request_size) {
49360@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
49361
49362 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
49363 /* add resources only after host is added into system */
49364- if (!atomic_read(&pinstance->expose_resources))
49365+ if (!atomic_read_unchecked(&pinstance->expose_resources))
49366 return;
49367
49368 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
49369@@ -5322,8 +5322,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
49370 init_waitqueue_head(&pinstance->reset_wait_q);
49371
49372 atomic_set(&pinstance->outstanding_cmds, 0);
49373- atomic_set(&pinstance->last_message_id, 0);
49374- atomic_set(&pinstance->expose_resources, 0);
49375+ atomic_set_unchecked(&pinstance->last_message_id, 0);
49376+ atomic_set_unchecked(&pinstance->expose_resources, 0);
49377
49378 INIT_LIST_HEAD(&pinstance->free_res_q);
49379 INIT_LIST_HEAD(&pinstance->used_res_q);
49380@@ -6036,7 +6036,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
49381 /* Schedule worker thread to handle CCN and take care of adding and
49382 * removing devices to OS
49383 */
49384- atomic_set(&pinstance->expose_resources, 1);
49385+ atomic_set_unchecked(&pinstance->expose_resources, 1);
49386 schedule_work(&pinstance->worker_q);
49387 return rc;
49388
49389diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
49390index e1d150f..6c6df44 100644
49391--- a/drivers/scsi/pmcraid.h
49392+++ b/drivers/scsi/pmcraid.h
49393@@ -748,7 +748,7 @@ struct pmcraid_instance {
49394 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
49395
49396 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
49397- atomic_t last_message_id;
49398+ atomic_unchecked_t last_message_id;
49399
49400 /* configuration table */
49401 struct pmcraid_config_table *cfg_table;
49402@@ -777,7 +777,7 @@ struct pmcraid_instance {
49403 atomic_t outstanding_cmds;
49404
49405 /* should add/delete resources to mid-layer now ?*/
49406- atomic_t expose_resources;
49407+ atomic_unchecked_t expose_resources;
49408
49409
49410
49411@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
49412 struct pmcraid_config_table_entry_ext cfg_entry_ext;
49413 };
49414 struct scsi_device *scsi_dev; /* Link scsi_device structure */
49415- atomic_t read_failures; /* count of failed READ commands */
49416- atomic_t write_failures; /* count of failed WRITE commands */
49417+ atomic_unchecked_t read_failures; /* count of failed READ commands */
49418+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
49419
49420 /* To indicate add/delete/modify during CCN */
49421 u8 change_detected;
49422diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
49423index 07befcf..c0bff13 100644
49424--- a/drivers/scsi/qla2xxx/qla_attr.c
49425+++ b/drivers/scsi/qla2xxx/qla_attr.c
49426@@ -2188,7 +2188,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
49427 return 0;
49428 }
49429
49430-struct fc_function_template qla2xxx_transport_functions = {
49431+fc_function_template_no_const qla2xxx_transport_functions = {
49432
49433 .show_host_node_name = 1,
49434 .show_host_port_name = 1,
49435@@ -2236,7 +2236,7 @@ struct fc_function_template qla2xxx_transport_functions = {
49436 .bsg_timeout = qla24xx_bsg_timeout,
49437 };
49438
49439-struct fc_function_template qla2xxx_transport_vport_functions = {
49440+fc_function_template_no_const qla2xxx_transport_vport_functions = {
49441
49442 .show_host_node_name = 1,
49443 .show_host_port_name = 1,
49444diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
49445index e665e81..16e84e6 100644
49446--- a/drivers/scsi/qla2xxx/qla_gbl.h
49447+++ b/drivers/scsi/qla2xxx/qla_gbl.h
49448@@ -557,8 +557,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
49449 struct device_attribute;
49450 extern struct device_attribute *qla2x00_host_attrs[];
49451 struct fc_function_template;
49452-extern struct fc_function_template qla2xxx_transport_functions;
49453-extern struct fc_function_template qla2xxx_transport_vport_functions;
49454+extern fc_function_template_no_const qla2xxx_transport_functions;
49455+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
49456 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
49457 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
49458 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
49459diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
49460index 19e99cc..b3c0b7b 100644
49461--- a/drivers/scsi/qla2xxx/qla_os.c
49462+++ b/drivers/scsi/qla2xxx/qla_os.c
49463@@ -1493,8 +1493,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
49464 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
49465 /* Ok, a 64bit DMA mask is applicable. */
49466 ha->flags.enable_64bit_addressing = 1;
49467- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
49468- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
49469+ pax_open_kernel();
49470+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
49471+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
49472+ pax_close_kernel();
49473 return;
49474 }
49475 }
49476diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
49477index 73a5022..4e0797c 100644
49478--- a/drivers/scsi/qla4xxx/ql4_def.h
49479+++ b/drivers/scsi/qla4xxx/ql4_def.h
49480@@ -305,7 +305,7 @@ struct ddb_entry {
49481 * (4000 only) */
49482 atomic_t relogin_timer; /* Max Time to wait for
49483 * relogin to complete */
49484- atomic_t relogin_retry_count; /* Num of times relogin has been
49485+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
49486 * retried */
49487 uint32_t default_time2wait; /* Default Min time between
49488 * relogins (+aens) */
49489diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
49490index 459b9f7..2930a68 100644
49491--- a/drivers/scsi/qla4xxx/ql4_os.c
49492+++ b/drivers/scsi/qla4xxx/ql4_os.c
49493@@ -4499,12 +4499,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
49494 */
49495 if (!iscsi_is_session_online(cls_sess)) {
49496 /* Reset retry relogin timer */
49497- atomic_inc(&ddb_entry->relogin_retry_count);
49498+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
49499 DEBUG2(ql4_printk(KERN_INFO, ha,
49500 "%s: index[%d] relogin timed out-retrying"
49501 " relogin (%d), retry (%d)\n", __func__,
49502 ddb_entry->fw_ddb_index,
49503- atomic_read(&ddb_entry->relogin_retry_count),
49504+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
49505 ddb_entry->default_time2wait + 4));
49506 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
49507 atomic_set(&ddb_entry->retry_relogin_timer,
49508@@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
49509
49510 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
49511 atomic_set(&ddb_entry->relogin_timer, 0);
49512- atomic_set(&ddb_entry->relogin_retry_count, 0);
49513+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
49514 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
49515 ddb_entry->default_relogin_timeout =
49516 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
49517diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
49518index 88d46fe..7351be5 100644
49519--- a/drivers/scsi/scsi.c
49520+++ b/drivers/scsi/scsi.c
49521@@ -640,7 +640,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
49522 struct Scsi_Host *host = cmd->device->host;
49523 int rtn = 0;
49524
49525- atomic_inc(&cmd->device->iorequest_cnt);
49526+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
49527
49528 /* check if the device is still usable */
49529 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
49530diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
49531index 9db097a..ca5c291 100644
49532--- a/drivers/scsi/scsi_lib.c
49533+++ b/drivers/scsi/scsi_lib.c
49534@@ -1464,7 +1464,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
49535 shost = sdev->host;
49536 scsi_init_cmd_errh(cmd);
49537 cmd->result = DID_NO_CONNECT << 16;
49538- atomic_inc(&cmd->device->iorequest_cnt);
49539+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
49540
49541 /*
49542 * SCSI request completion path will do scsi_device_unbusy(),
49543@@ -1490,9 +1490,9 @@ static void scsi_softirq_done(struct request *rq)
49544
49545 INIT_LIST_HEAD(&cmd->eh_entry);
49546
49547- atomic_inc(&cmd->device->iodone_cnt);
49548+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
49549 if (cmd->result)
49550- atomic_inc(&cmd->device->ioerr_cnt);
49551+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
49552
49553 disposition = scsi_decide_disposition(cmd);
49554 if (disposition != SUCCESS &&
49555diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
49556index 074e8cc..f612e5c 100644
49557--- a/drivers/scsi/scsi_sysfs.c
49558+++ b/drivers/scsi/scsi_sysfs.c
49559@@ -780,7 +780,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
49560 char *buf) \
49561 { \
49562 struct scsi_device *sdev = to_scsi_device(dev); \
49563- unsigned long long count = atomic_read(&sdev->field); \
49564+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
49565 return snprintf(buf, 20, "0x%llx\n", count); \
49566 } \
49567 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
49568diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
49569index e51add0..1e06a96 100644
49570--- a/drivers/scsi/scsi_tgt_lib.c
49571+++ b/drivers/scsi/scsi_tgt_lib.c
49572@@ -363,7 +363,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
49573 int err;
49574
49575 dprintk("%lx %u\n", uaddr, len);
49576- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
49577+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
49578 if (err) {
49579 /*
49580 * TODO: need to fixup sg_tablesize, max_segment_size,
49581diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
49582index f80908f..22aba76 100644
49583--- a/drivers/scsi/scsi_transport_fc.c
49584+++ b/drivers/scsi/scsi_transport_fc.c
49585@@ -498,7 +498,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
49586 * Netlink Infrastructure
49587 */
49588
49589-static atomic_t fc_event_seq;
49590+static atomic_unchecked_t fc_event_seq;
49591
49592 /**
49593 * fc_get_event_number - Obtain the next sequential FC event number
49594@@ -511,7 +511,7 @@ static atomic_t fc_event_seq;
49595 u32
49596 fc_get_event_number(void)
49597 {
49598- return atomic_add_return(1, &fc_event_seq);
49599+ return atomic_add_return_unchecked(1, &fc_event_seq);
49600 }
49601 EXPORT_SYMBOL(fc_get_event_number);
49602
49603@@ -655,7 +655,7 @@ static __init int fc_transport_init(void)
49604 {
49605 int error;
49606
49607- atomic_set(&fc_event_seq, 0);
49608+ atomic_set_unchecked(&fc_event_seq, 0);
49609
49610 error = transport_class_register(&fc_host_class);
49611 if (error)
49612@@ -845,7 +845,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
49613 char *cp;
49614
49615 *val = simple_strtoul(buf, &cp, 0);
49616- if ((*cp && (*cp != '\n')) || (*val < 0))
49617+ if (*cp && (*cp != '\n'))
49618 return -EINVAL;
49619 /*
49620 * Check for overflow; dev_loss_tmo is u32
49621diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
49622index 0102a2d..cc3f8e9 100644
49623--- a/drivers/scsi/scsi_transport_iscsi.c
49624+++ b/drivers/scsi/scsi_transport_iscsi.c
49625@@ -79,7 +79,7 @@ struct iscsi_internal {
49626 struct transport_container session_cont;
49627 };
49628
49629-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
49630+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
49631 static struct workqueue_struct *iscsi_eh_timer_workq;
49632
49633 static DEFINE_IDA(iscsi_sess_ida);
49634@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
49635 int err;
49636
49637 ihost = shost->shost_data;
49638- session->sid = atomic_add_return(1, &iscsi_session_nr);
49639+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
49640
49641 if (target_id == ISCSI_MAX_TARGET) {
49642 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
49643@@ -4511,7 +4511,7 @@ static __init int iscsi_transport_init(void)
49644 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
49645 ISCSI_TRANSPORT_VERSION);
49646
49647- atomic_set(&iscsi_session_nr, 0);
49648+ atomic_set_unchecked(&iscsi_session_nr, 0);
49649
49650 err = class_register(&iscsi_transport_class);
49651 if (err)
49652diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
49653index 13e8983..d306a68 100644
49654--- a/drivers/scsi/scsi_transport_srp.c
49655+++ b/drivers/scsi/scsi_transport_srp.c
49656@@ -36,7 +36,7 @@
49657 #include "scsi_transport_srp_internal.h"
49658
49659 struct srp_host_attrs {
49660- atomic_t next_port_id;
49661+ atomic_unchecked_t next_port_id;
49662 };
49663 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
49664
49665@@ -101,7 +101,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
49666 struct Scsi_Host *shost = dev_to_shost(dev);
49667 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
49668
49669- atomic_set(&srp_host->next_port_id, 0);
49670+ atomic_set_unchecked(&srp_host->next_port_id, 0);
49671 return 0;
49672 }
49673
49674@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
49675 rport_fast_io_fail_timedout);
49676 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
49677
49678- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
49679+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
49680 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
49681
49682 transport_setup_device(&rport->dev);
49683diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
49684index efcbcd1..aeaf26e 100644
49685--- a/drivers/scsi/sd.c
49686+++ b/drivers/scsi/sd.c
49687@@ -2968,7 +2968,7 @@ static int sd_probe(struct device *dev)
49688 sdkp->disk = gd;
49689 sdkp->index = index;
49690 atomic_set(&sdkp->openers, 0);
49691- atomic_set(&sdkp->device->ioerr_cnt, 0);
49692+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
49693
49694 if (!sdp->request_queue->rq_timeout) {
49695 if (sdp->type != TYPE_MOD)
49696diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
49697index df5e961..df6b97f 100644
49698--- a/drivers/scsi/sg.c
49699+++ b/drivers/scsi/sg.c
49700@@ -1102,7 +1102,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
49701 sdp->disk->disk_name,
49702 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
49703 NULL,
49704- (char *)arg);
49705+ (char __user *)arg);
49706 case BLKTRACESTART:
49707 return blk_trace_startstop(sdp->device->request_queue, 1);
49708 case BLKTRACESTOP:
49709diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
49710index 939edf4..3f50423 100644
49711--- a/drivers/spi/spi.c
49712+++ b/drivers/spi/spi.c
49713@@ -2204,7 +2204,7 @@ int spi_bus_unlock(struct spi_master *master)
49714 EXPORT_SYMBOL_GPL(spi_bus_unlock);
49715
49716 /* portable code must never pass more than 32 bytes */
49717-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
49718+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
49719
49720 static u8 *buf;
49721
49722diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
49723index 2c61783..4d49e4e 100644
49724--- a/drivers/staging/android/timed_output.c
49725+++ b/drivers/staging/android/timed_output.c
49726@@ -25,7 +25,7 @@
49727 #include "timed_output.h"
49728
49729 static struct class *timed_output_class;
49730-static atomic_t device_count;
49731+static atomic_unchecked_t device_count;
49732
49733 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
49734 char *buf)
49735@@ -63,7 +63,7 @@ static int create_timed_output_class(void)
49736 timed_output_class = class_create(THIS_MODULE, "timed_output");
49737 if (IS_ERR(timed_output_class))
49738 return PTR_ERR(timed_output_class);
49739- atomic_set(&device_count, 0);
49740+ atomic_set_unchecked(&device_count, 0);
49741 timed_output_class->dev_groups = timed_output_groups;
49742 }
49743
49744@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
49745 if (ret < 0)
49746 return ret;
49747
49748- tdev->index = atomic_inc_return(&device_count);
49749+ tdev->index = atomic_inc_return_unchecked(&device_count);
49750 tdev->dev = device_create(timed_output_class, NULL,
49751 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
49752 if (IS_ERR(tdev->dev))
49753diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
49754index fe47cd3..19a1bd1 100644
49755--- a/drivers/staging/gdm724x/gdm_tty.c
49756+++ b/drivers/staging/gdm724x/gdm_tty.c
49757@@ -44,7 +44,7 @@
49758 #define gdm_tty_send_control(n, r, v, d, l) (\
49759 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
49760
49761-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
49762+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
49763
49764 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
49765 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
49766diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
49767index c270c9a..94ddf82 100644
49768--- a/drivers/staging/imx-drm/imx-drm-core.c
49769+++ b/drivers/staging/imx-drm/imx-drm-core.c
49770@@ -362,7 +362,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
49771 if (imxdrm->pipes >= MAX_CRTC)
49772 return -EINVAL;
49773
49774- if (imxdrm->drm->open_count)
49775+ if (local_read(&imxdrm->drm->open_count))
49776 return -EBUSY;
49777
49778 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
49779diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
49780index 3f8020c..649fded 100644
49781--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
49782+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
49783@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
49784 return 0;
49785 }
49786
49787-sfw_test_client_ops_t brw_test_client;
49788-void brw_init_test_client(void)
49789-{
49790- brw_test_client.tso_init = brw_client_init;
49791- brw_test_client.tso_fini = brw_client_fini;
49792- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
49793- brw_test_client.tso_done_rpc = brw_client_done_rpc;
49794+sfw_test_client_ops_t brw_test_client = {
49795+ .tso_init = brw_client_init,
49796+ .tso_fini = brw_client_fini,
49797+ .tso_prep_rpc = brw_client_prep_rpc,
49798+ .tso_done_rpc = brw_client_done_rpc,
49799 };
49800
49801 srpc_service_t brw_test_service;
49802diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
49803index 050723a..fa6fdf1 100644
49804--- a/drivers/staging/lustre/lnet/selftest/framework.c
49805+++ b/drivers/staging/lustre/lnet/selftest/framework.c
49806@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
49807
49808 extern sfw_test_client_ops_t ping_test_client;
49809 extern srpc_service_t ping_test_service;
49810-extern void ping_init_test_client(void);
49811 extern void ping_init_test_service(void);
49812
49813 extern sfw_test_client_ops_t brw_test_client;
49814 extern srpc_service_t brw_test_service;
49815-extern void brw_init_test_client(void);
49816 extern void brw_init_test_service(void);
49817
49818
49819@@ -1684,12 +1682,10 @@ sfw_startup (void)
49820 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
49821 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
49822
49823- brw_init_test_client();
49824 brw_init_test_service();
49825 rc = sfw_register_test(&brw_test_service, &brw_test_client);
49826 LASSERT (rc == 0);
49827
49828- ping_init_test_client();
49829 ping_init_test_service();
49830 rc = sfw_register_test(&ping_test_service, &ping_test_client);
49831 LASSERT (rc == 0);
49832diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
49833index 750cac4..e4d751f 100644
49834--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
49835+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
49836@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
49837 return 0;
49838 }
49839
49840-sfw_test_client_ops_t ping_test_client;
49841-void ping_init_test_client(void)
49842-{
49843- ping_test_client.tso_init = ping_client_init;
49844- ping_test_client.tso_fini = ping_client_fini;
49845- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
49846- ping_test_client.tso_done_rpc = ping_client_done_rpc;
49847-}
49848+sfw_test_client_ops_t ping_test_client = {
49849+ .tso_init = ping_client_init,
49850+ .tso_fini = ping_client_fini,
49851+ .tso_prep_rpc = ping_client_prep_rpc,
49852+ .tso_done_rpc = ping_client_done_rpc,
49853+};
49854
49855 srpc_service_t ping_test_service;
49856 void ping_init_test_service(void)
49857diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
49858index 3e25f00..0d59cf5 100644
49859--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
49860+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
49861@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
49862 ldlm_completion_callback lcs_completion;
49863 ldlm_blocking_callback lcs_blocking;
49864 ldlm_glimpse_callback lcs_glimpse;
49865-};
49866+} __no_const;
49867
49868 /* ldlm_lockd.c */
49869 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
49870diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
49871index 72cf3fe..4beac19 100644
49872--- a/drivers/staging/lustre/lustre/include/obd.h
49873+++ b/drivers/staging/lustre/lustre/include/obd.h
49874@@ -1427,7 +1427,7 @@ struct md_ops {
49875 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
49876 * wrapper function in include/linux/obd_class.h.
49877 */
49878-};
49879+} __no_const;
49880
49881 struct lsm_operations {
49882 void (*lsm_free)(struct lov_stripe_md *);
49883diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
49884index 986bf38..eab2558f 100644
49885--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
49886+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
49887@@ -259,7 +259,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
49888 int added = (mode == LCK_NL);
49889 int overlaps = 0;
49890 int splitted = 0;
49891- const struct ldlm_callback_suite null_cbs = { NULL };
49892+ const struct ldlm_callback_suite null_cbs = { };
49893
49894 CDEBUG(D_DLMTRACE, "flags %#llx owner "LPU64" pid %u mode %u start "
49895 LPU64" end "LPU64"\n", *flags,
49896diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
49897index e947b91..f408990 100644
49898--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
49899+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
49900@@ -217,7 +217,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
49901 int LL_PROC_PROTO(proc_console_max_delay_cs)
49902 {
49903 int rc, max_delay_cs;
49904- ctl_table_t dummy = *table;
49905+ ctl_table_no_const dummy = *table;
49906 cfs_duration_t d;
49907
49908 dummy.data = &max_delay_cs;
49909@@ -248,7 +248,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
49910 int LL_PROC_PROTO(proc_console_min_delay_cs)
49911 {
49912 int rc, min_delay_cs;
49913- ctl_table_t dummy = *table;
49914+ ctl_table_no_const dummy = *table;
49915 cfs_duration_t d;
49916
49917 dummy.data = &min_delay_cs;
49918@@ -279,7 +279,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
49919 int LL_PROC_PROTO(proc_console_backoff)
49920 {
49921 int rc, backoff;
49922- ctl_table_t dummy = *table;
49923+ ctl_table_no_const dummy = *table;
49924
49925 dummy.data = &backoff;
49926 dummy.proc_handler = &proc_dointvec;
49927diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
49928index 24ae26d..9d09cab 100644
49929--- a/drivers/staging/lustre/lustre/libcfs/module.c
49930+++ b/drivers/staging/lustre/lustre/libcfs/module.c
49931@@ -313,11 +313,11 @@ out:
49932
49933
49934 struct cfs_psdev_ops libcfs_psdev_ops = {
49935- libcfs_psdev_open,
49936- libcfs_psdev_release,
49937- NULL,
49938- NULL,
49939- libcfs_ioctl
49940+ .p_open = libcfs_psdev_open,
49941+ .p_close = libcfs_psdev_release,
49942+ .p_read = NULL,
49943+ .p_write = NULL,
49944+ .p_ioctl = libcfs_ioctl
49945 };
49946
49947 extern int insert_proc(void);
49948diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
49949index 7fbc18e..f982071 100644
49950--- a/drivers/staging/lustre/lustre/llite/dir.c
49951+++ b/drivers/staging/lustre/lustre/llite/dir.c
49952@@ -660,7 +660,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
49953 int mode;
49954 int err;
49955
49956- mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
49957+ mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
49958 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
49959 strlen(filename), mode, LUSTRE_OPC_MKDIR,
49960 lump);
49961diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
49962index f670469..03b7438 100644
49963--- a/drivers/staging/media/solo6x10/solo6x10-core.c
49964+++ b/drivers/staging/media/solo6x10/solo6x10-core.c
49965@@ -434,7 +434,7 @@ static void solo_device_release(struct device *dev)
49966
49967 static int solo_sysfs_init(struct solo_dev *solo_dev)
49968 {
49969- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
49970+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
49971 struct device *dev = &solo_dev->dev;
49972 const char *driver;
49973 int i;
49974diff --git a/drivers/staging/media/solo6x10/solo6x10-g723.c b/drivers/staging/media/solo6x10/solo6x10-g723.c
49975index 74f037b..5b5bb76 100644
49976--- a/drivers/staging/media/solo6x10/solo6x10-g723.c
49977+++ b/drivers/staging/media/solo6x10/solo6x10-g723.c
49978@@ -355,7 +355,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
49979
49980 int solo_g723_init(struct solo_dev *solo_dev)
49981 {
49982- static struct snd_device_ops ops = { NULL };
49983+ static struct snd_device_ops ops = { };
49984 struct snd_card *card;
49985 struct snd_kcontrol_new kctl;
49986 char name[32];
49987diff --git a/drivers/staging/media/solo6x10/solo6x10-p2m.c b/drivers/staging/media/solo6x10/solo6x10-p2m.c
49988index 7f2f247..d999137 100644
49989--- a/drivers/staging/media/solo6x10/solo6x10-p2m.c
49990+++ b/drivers/staging/media/solo6x10/solo6x10-p2m.c
49991@@ -77,7 +77,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
49992
49993 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
49994 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
49995- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
49996+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
49997 if (p2m_id < 0)
49998 p2m_id = -p2m_id;
49999 }
50000diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
50001index 8964f8b..36eb087 100644
50002--- a/drivers/staging/media/solo6x10/solo6x10.h
50003+++ b/drivers/staging/media/solo6x10/solo6x10.h
50004@@ -237,7 +237,7 @@ struct solo_dev {
50005
50006 /* P2M DMA Engine */
50007 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
50008- atomic_t p2m_count;
50009+ atomic_unchecked_t p2m_count;
50010 int p2m_jiffies;
50011 unsigned int p2m_timeouts;
50012
50013diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
50014index a0f4868..139f1fb 100644
50015--- a/drivers/staging/octeon/ethernet-rx.c
50016+++ b/drivers/staging/octeon/ethernet-rx.c
50017@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
50018 /* Increment RX stats for virtual ports */
50019 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
50020 #ifdef CONFIG_64BIT
50021- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
50022- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
50023+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
50024+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
50025 #else
50026- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
50027- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
50028+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
50029+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
50030 #endif
50031 }
50032 netif_receive_skb(skb);
50033@@ -432,9 +432,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
50034 dev->name);
50035 */
50036 #ifdef CONFIG_64BIT
50037- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
50038+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
50039 #else
50040- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
50041+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
50042 #endif
50043 dev_kfree_skb_irq(skb);
50044 }
50045diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
50046index ff7214a..6dd90f0 100644
50047--- a/drivers/staging/octeon/ethernet.c
50048+++ b/drivers/staging/octeon/ethernet.c
50049@@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
50050 * since the RX tasklet also increments it.
50051 */
50052 #ifdef CONFIG_64BIT
50053- atomic64_add(rx_status.dropped_packets,
50054- (atomic64_t *)&priv->stats.rx_dropped);
50055+ atomic64_add_unchecked(rx_status.dropped_packets,
50056+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
50057 #else
50058- atomic_add(rx_status.dropped_packets,
50059- (atomic_t *)&priv->stats.rx_dropped);
50060+ atomic_add_unchecked(rx_status.dropped_packets,
50061+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
50062 #endif
50063 }
50064
50065diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
50066index c274b34..f84de76 100644
50067--- a/drivers/staging/rtl8188eu/include/hal_intf.h
50068+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
50069@@ -271,7 +271,7 @@ struct hal_ops {
50070 s32 (*c2h_handler)(struct adapter *padapter,
50071 struct c2h_evt_hdr *c2h_evt);
50072 c2h_id_filter c2h_id_filter_ccx;
50073-};
50074+} __no_const;
50075
50076 enum rt_eeprom_type {
50077 EEPROM_93C46,
50078diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
50079index e8790f8..b4a5980 100644
50080--- a/drivers/staging/rtl8188eu/include/rtw_io.h
50081+++ b/drivers/staging/rtl8188eu/include/rtw_io.h
50082@@ -124,7 +124,7 @@ struct _io_ops {
50083 u32 (*_write_scsi)(struct intf_hdl *pintfhdl, u32 cnt, u8 *pmem);
50084 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
50085 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
50086-};
50087+} __no_const;
50088
50089 struct io_req {
50090 struct list_head list;
50091diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
50092index dc23395..cf7e9b1 100644
50093--- a/drivers/staging/rtl8712/rtl871x_io.h
50094+++ b/drivers/staging/rtl8712/rtl871x_io.h
50095@@ -108,7 +108,7 @@ struct _io_ops {
50096 u8 *pmem);
50097 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
50098 u8 *pmem);
50099-};
50100+} __no_const;
50101
50102 struct io_req {
50103 struct list_head list;
50104diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
50105index d183f4b..3f4903d 100644
50106--- a/drivers/staging/rtl8723au/include/hal_intf.h
50107+++ b/drivers/staging/rtl8723au/include/hal_intf.h
50108@@ -251,7 +251,7 @@ struct hal_ops {
50109 void (*hal_reset_security_engine)(struct rtw_adapter *adapter);
50110 s32 (*c2h_handler)(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt);
50111 c2h_id_filter c2h_id_filter_ccx;
50112-};
50113+} __no_const;
50114
50115 enum rt_eeprom_type {
50116 EEPROM_93C46,
50117diff --git a/drivers/staging/rtl8723au/include/rtw_io.h b/drivers/staging/rtl8723au/include/rtw_io.h
50118index 8d39d800..3f21c0c 100644
50119--- a/drivers/staging/rtl8723au/include/rtw_io.h
50120+++ b/drivers/staging/rtl8723au/include/rtw_io.h
50121@@ -130,7 +130,7 @@ struct _io_ops
50122 void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
50123 void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
50124
50125-};
50126+} __no_const;
50127
50128 struct io_req {
50129 struct list_head list;
50130diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
50131index fe6c951..72935ba 100644
50132--- a/drivers/staging/sbe-2t3e3/netdev.c
50133+++ b/drivers/staging/sbe-2t3e3/netdev.c
50134@@ -51,7 +51,7 @@ static int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
50135 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
50136
50137 if (rlen)
50138- if (copy_to_user(data, &resp, rlen))
50139+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
50140 return -EFAULT;
50141
50142 return 0;
50143diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
50144index a863a98..d272795 100644
50145--- a/drivers/staging/usbip/vhci.h
50146+++ b/drivers/staging/usbip/vhci.h
50147@@ -83,7 +83,7 @@ struct vhci_hcd {
50148 unsigned resuming:1;
50149 unsigned long re_timeout;
50150
50151- atomic_t seqnum;
50152+ atomic_unchecked_t seqnum;
50153
50154 /*
50155 * NOTE:
50156diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
50157index 70e1755..de41855 100644
50158--- a/drivers/staging/usbip/vhci_hcd.c
50159+++ b/drivers/staging/usbip/vhci_hcd.c
50160@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
50161
50162 spin_lock(&vdev->priv_lock);
50163
50164- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
50165+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
50166 if (priv->seqnum == 0xffff)
50167 dev_info(&urb->dev->dev, "seqnum max\n");
50168
50169@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
50170 return -ENOMEM;
50171 }
50172
50173- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
50174+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
50175 if (unlink->seqnum == 0xffff)
50176 pr_info("seqnum max\n");
50177
50178@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
50179 vdev->rhport = rhport;
50180 }
50181
50182- atomic_set(&vhci->seqnum, 0);
50183+ atomic_set_unchecked(&vhci->seqnum, 0);
50184 spin_lock_init(&vhci->lock);
50185
50186 hcd->power_budget = 0; /* no limit */
50187diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
50188index d07fcb5..358e1e1 100644
50189--- a/drivers/staging/usbip/vhci_rx.c
50190+++ b/drivers/staging/usbip/vhci_rx.c
50191@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
50192 if (!urb) {
50193 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
50194 pr_info("max seqnum %d\n",
50195- atomic_read(&the_controller->seqnum));
50196+ atomic_read_unchecked(&the_controller->seqnum));
50197 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
50198 return;
50199 }
50200diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
50201index 6eecd53..29317c6 100644
50202--- a/drivers/staging/vt6655/hostap.c
50203+++ b/drivers/staging/vt6655/hostap.c
50204@@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
50205 *
50206 */
50207
50208+static net_device_ops_no_const apdev_netdev_ops;
50209+
50210 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
50211 {
50212 PSDevice apdev_priv;
50213 struct net_device *dev = pDevice->dev;
50214 int ret;
50215- const struct net_device_ops apdev_netdev_ops = {
50216- .ndo_start_xmit = pDevice->tx_80211,
50217- };
50218
50219 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
50220
50221@@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
50222 *apdev_priv = *pDevice;
50223 eth_hw_addr_inherit(pDevice->apdev, dev);
50224
50225+ /* only half broken now */
50226+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
50227 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
50228
50229 pDevice->apdev->type = ARPHRD_IEEE80211;
50230diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
50231index 67ba48b..24e602f 100644
50232--- a/drivers/staging/vt6656/hostap.c
50233+++ b/drivers/staging/vt6656/hostap.c
50234@@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
50235 *
50236 */
50237
50238+static net_device_ops_no_const apdev_netdev_ops;
50239+
50240 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
50241 {
50242 struct vnt_private *apdev_priv;
50243 struct net_device *dev = pDevice->dev;
50244 int ret;
50245- const struct net_device_ops apdev_netdev_ops = {
50246- .ndo_start_xmit = pDevice->tx_80211,
50247- };
50248
50249 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
50250
50251@@ -79,6 +78,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
50252 *apdev_priv = *pDevice;
50253 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
50254
50255+ /* only half broken now */
50256+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
50257 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
50258
50259 pDevice->apdev->type = ARPHRD_IEEE80211;
50260diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
50261index e7e9372..161f530 100644
50262--- a/drivers/target/sbp/sbp_target.c
50263+++ b/drivers/target/sbp/sbp_target.c
50264@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
50265
50266 #define SESSION_MAINTENANCE_INTERVAL HZ
50267
50268-static atomic_t login_id = ATOMIC_INIT(0);
50269+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
50270
50271 static void session_maintenance_work(struct work_struct *);
50272 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
50273@@ -444,7 +444,7 @@ static void sbp_management_request_login(
50274 login->lun = se_lun;
50275 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
50276 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
50277- login->login_id = atomic_inc_return(&login_id);
50278+ login->login_id = atomic_inc_return_unchecked(&login_id);
50279
50280 login->tgt_agt = sbp_target_agent_register(login);
50281 if (IS_ERR(login->tgt_agt)) {
50282diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
50283index 6ea95d2..88607b4 100644
50284--- a/drivers/target/target_core_device.c
50285+++ b/drivers/target/target_core_device.c
50286@@ -1525,7 +1525,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
50287 spin_lock_init(&dev->se_tmr_lock);
50288 spin_lock_init(&dev->qf_cmd_lock);
50289 sema_init(&dev->caw_sem, 1);
50290- atomic_set(&dev->dev_ordered_id, 0);
50291+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
50292 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
50293 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
50294 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
50295diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
50296index 14772e9..42d9f63 100644
50297--- a/drivers/target/target_core_transport.c
50298+++ b/drivers/target/target_core_transport.c
50299@@ -1165,7 +1165,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
50300 * Used to determine when ORDERED commands should go from
50301 * Dormant to Active status.
50302 */
50303- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
50304+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
50305 smp_mb__after_atomic_inc();
50306 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
50307 cmd->se_ordered_id, cmd->sam_task_attr,
50308diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
50309index 04b1be7..5eff86d 100644
50310--- a/drivers/thermal/of-thermal.c
50311+++ b/drivers/thermal/of-thermal.c
50312@@ -30,6 +30,7 @@
50313 #include <linux/err.h>
50314 #include <linux/export.h>
50315 #include <linux/string.h>
50316+#include <linux/mm.h>
50317
50318 #include "thermal_core.h"
50319
50320@@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
50321 tz->get_trend = get_trend;
50322 tz->sensor_data = data;
50323
50324- tzd->ops->get_temp = of_thermal_get_temp;
50325- tzd->ops->get_trend = of_thermal_get_trend;
50326+ pax_open_kernel();
50327+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
50328+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
50329+ pax_close_kernel();
50330 mutex_unlock(&tzd->lock);
50331
50332 return tzd;
50333@@ -461,8 +464,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
50334 return;
50335
50336 mutex_lock(&tzd->lock);
50337- tzd->ops->get_temp = NULL;
50338- tzd->ops->get_trend = NULL;
50339+ pax_open_kernel();
50340+ *(void **)&tzd->ops->get_temp = NULL;
50341+ *(void **)&tzd->ops->get_trend = NULL;
50342+ pax_close_kernel();
50343
50344 tz->get_temp = NULL;
50345 tz->get_trend = NULL;
50346diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
50347index a57bb5a..1f727d33 100644
50348--- a/drivers/tty/cyclades.c
50349+++ b/drivers/tty/cyclades.c
50350@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
50351 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
50352 info->port.count);
50353 #endif
50354- info->port.count++;
50355+ atomic_inc(&info->port.count);
50356 #ifdef CY_DEBUG_COUNT
50357 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
50358- current->pid, info->port.count);
50359+ current->pid, atomic_read(&info->port.count));
50360 #endif
50361
50362 /*
50363@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
50364 for (j = 0; j < cy_card[i].nports; j++) {
50365 info = &cy_card[i].ports[j];
50366
50367- if (info->port.count) {
50368+ if (atomic_read(&info->port.count)) {
50369 /* XXX is the ldisc num worth this? */
50370 struct tty_struct *tty;
50371 struct tty_ldisc *ld;
50372diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
50373index 0ff7fda..dbc7d52 100644
50374--- a/drivers/tty/hvc/hvc_console.c
50375+++ b/drivers/tty/hvc/hvc_console.c
50376@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
50377
50378 spin_lock_irqsave(&hp->port.lock, flags);
50379 /* Check and then increment for fast path open. */
50380- if (hp->port.count++ > 0) {
50381+ if (atomic_inc_return(&hp->port.count) > 1) {
50382 spin_unlock_irqrestore(&hp->port.lock, flags);
50383 hvc_kick();
50384 return 0;
50385@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
50386
50387 spin_lock_irqsave(&hp->port.lock, flags);
50388
50389- if (--hp->port.count == 0) {
50390+ if (atomic_dec_return(&hp->port.count) == 0) {
50391 spin_unlock_irqrestore(&hp->port.lock, flags);
50392 /* We are done with the tty pointer now. */
50393 tty_port_tty_set(&hp->port, NULL);
50394@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
50395 */
50396 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
50397 } else {
50398- if (hp->port.count < 0)
50399+ if (atomic_read(&hp->port.count) < 0)
50400 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
50401- hp->vtermno, hp->port.count);
50402+ hp->vtermno, atomic_read(&hp->port.count));
50403 spin_unlock_irqrestore(&hp->port.lock, flags);
50404 }
50405 }
50406@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
50407 * open->hangup case this can be called after the final close so prevent
50408 * that from happening for now.
50409 */
50410- if (hp->port.count <= 0) {
50411+ if (atomic_read(&hp->port.count) <= 0) {
50412 spin_unlock_irqrestore(&hp->port.lock, flags);
50413 return;
50414 }
50415
50416- hp->port.count = 0;
50417+ atomic_set(&hp->port.count, 0);
50418 spin_unlock_irqrestore(&hp->port.lock, flags);
50419 tty_port_tty_set(&hp->port, NULL);
50420
50421@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
50422 return -EPIPE;
50423
50424 /* FIXME what's this (unprotected) check for? */
50425- if (hp->port.count <= 0)
50426+ if (atomic_read(&hp->port.count) <= 0)
50427 return -EIO;
50428
50429 spin_lock_irqsave(&hp->lock, flags);
50430diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
50431index 81e939e..95ead10 100644
50432--- a/drivers/tty/hvc/hvcs.c
50433+++ b/drivers/tty/hvc/hvcs.c
50434@@ -83,6 +83,7 @@
50435 #include <asm/hvcserver.h>
50436 #include <asm/uaccess.h>
50437 #include <asm/vio.h>
50438+#include <asm/local.h>
50439
50440 /*
50441 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
50442@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
50443
50444 spin_lock_irqsave(&hvcsd->lock, flags);
50445
50446- if (hvcsd->port.count > 0) {
50447+ if (atomic_read(&hvcsd->port.count) > 0) {
50448 spin_unlock_irqrestore(&hvcsd->lock, flags);
50449 printk(KERN_INFO "HVCS: vterm state unchanged. "
50450 "The hvcs device node is still in use.\n");
50451@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
50452 }
50453 }
50454
50455- hvcsd->port.count = 0;
50456+ atomic_set(&hvcsd->port.count, 0);
50457 hvcsd->port.tty = tty;
50458 tty->driver_data = hvcsd;
50459
50460@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
50461 unsigned long flags;
50462
50463 spin_lock_irqsave(&hvcsd->lock, flags);
50464- hvcsd->port.count++;
50465+ atomic_inc(&hvcsd->port.count);
50466 hvcsd->todo_mask |= HVCS_SCHED_READ;
50467 spin_unlock_irqrestore(&hvcsd->lock, flags);
50468
50469@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
50470 hvcsd = tty->driver_data;
50471
50472 spin_lock_irqsave(&hvcsd->lock, flags);
50473- if (--hvcsd->port.count == 0) {
50474+ if (atomic_dec_and_test(&hvcsd->port.count)) {
50475
50476 vio_disable_interrupts(hvcsd->vdev);
50477
50478@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
50479
50480 free_irq(irq, hvcsd);
50481 return;
50482- } else if (hvcsd->port.count < 0) {
50483+ } else if (atomic_read(&hvcsd->port.count) < 0) {
50484 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
50485 " is missmanaged.\n",
50486- hvcsd->vdev->unit_address, hvcsd->port.count);
50487+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
50488 }
50489
50490 spin_unlock_irqrestore(&hvcsd->lock, flags);
50491@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
50492
50493 spin_lock_irqsave(&hvcsd->lock, flags);
50494 /* Preserve this so that we know how many kref refs to put */
50495- temp_open_count = hvcsd->port.count;
50496+ temp_open_count = atomic_read(&hvcsd->port.count);
50497
50498 /*
50499 * Don't kref put inside the spinlock because the destruction
50500@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
50501 tty->driver_data = NULL;
50502 hvcsd->port.tty = NULL;
50503
50504- hvcsd->port.count = 0;
50505+ atomic_set(&hvcsd->port.count, 0);
50506
50507 /* This will drop any buffered data on the floor which is OK in a hangup
50508 * scenario. */
50509@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
50510 * the middle of a write operation? This is a crummy place to do this
50511 * but we want to keep it all in the spinlock.
50512 */
50513- if (hvcsd->port.count <= 0) {
50514+ if (atomic_read(&hvcsd->port.count) <= 0) {
50515 spin_unlock_irqrestore(&hvcsd->lock, flags);
50516 return -ENODEV;
50517 }
50518@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
50519 {
50520 struct hvcs_struct *hvcsd = tty->driver_data;
50521
50522- if (!hvcsd || hvcsd->port.count <= 0)
50523+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
50524 return 0;
50525
50526 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
50527diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
50528index 4190199..06d5bfa 100644
50529--- a/drivers/tty/hvc/hvsi.c
50530+++ b/drivers/tty/hvc/hvsi.c
50531@@ -85,7 +85,7 @@ struct hvsi_struct {
50532 int n_outbuf;
50533 uint32_t vtermno;
50534 uint32_t virq;
50535- atomic_t seqno; /* HVSI packet sequence number */
50536+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
50537 uint16_t mctrl;
50538 uint8_t state; /* HVSI protocol state */
50539 uint8_t flags;
50540@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
50541
50542 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
50543 packet.hdr.len = sizeof(struct hvsi_query_response);
50544- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50545+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50546 packet.verb = VSV_SEND_VERSION_NUMBER;
50547 packet.u.version = HVSI_VERSION;
50548 packet.query_seqno = query_seqno+1;
50549@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
50550
50551 packet.hdr.type = VS_QUERY_PACKET_HEADER;
50552 packet.hdr.len = sizeof(struct hvsi_query);
50553- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50554+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50555 packet.verb = verb;
50556
50557 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
50558@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
50559 int wrote;
50560
50561 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
50562- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50563+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50564 packet.hdr.len = sizeof(struct hvsi_control);
50565 packet.verb = VSV_SET_MODEM_CTL;
50566 packet.mask = HVSI_TSDTR;
50567@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
50568 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
50569
50570 packet.hdr.type = VS_DATA_PACKET_HEADER;
50571- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50572+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50573 packet.hdr.len = count + sizeof(struct hvsi_header);
50574 memcpy(&packet.data, buf, count);
50575
50576@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
50577 struct hvsi_control packet __ALIGNED__;
50578
50579 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
50580- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
50581+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
50582 packet.hdr.len = 6;
50583 packet.verb = VSV_CLOSE_PROTOCOL;
50584
50585@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
50586
50587 tty_port_tty_set(&hp->port, tty);
50588 spin_lock_irqsave(&hp->lock, flags);
50589- hp->port.count++;
50590+ atomic_inc(&hp->port.count);
50591 atomic_set(&hp->seqno, 0);
50592 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
50593 spin_unlock_irqrestore(&hp->lock, flags);
50594@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
50595
50596 spin_lock_irqsave(&hp->lock, flags);
50597
50598- if (--hp->port.count == 0) {
50599+ if (atomic_dec_return(&hp->port.count) == 0) {
50600 tty_port_tty_set(&hp->port, NULL);
50601 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
50602
50603@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
50604
50605 spin_lock_irqsave(&hp->lock, flags);
50606 }
50607- } else if (hp->port.count < 0)
50608+ } else if (atomic_read(&hp->port.count) < 0)
50609 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
50610- hp - hvsi_ports, hp->port.count);
50611+ hp - hvsi_ports, atomic_read(&hp->port.count));
50612
50613 spin_unlock_irqrestore(&hp->lock, flags);
50614 }
50615@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
50616 tty_port_tty_set(&hp->port, NULL);
50617
50618 spin_lock_irqsave(&hp->lock, flags);
50619- hp->port.count = 0;
50620+ atomic_set(&hp->port.count, 0);
50621 hp->n_outbuf = 0;
50622 spin_unlock_irqrestore(&hp->lock, flags);
50623 }
50624diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
50625index 7ae6c29..05c6dba 100644
50626--- a/drivers/tty/hvc/hvsi_lib.c
50627+++ b/drivers/tty/hvc/hvsi_lib.c
50628@@ -8,7 +8,7 @@
50629
50630 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
50631 {
50632- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
50633+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
50634
50635 /* Assumes that always succeeds, works in practice */
50636 return pv->put_chars(pv->termno, (char *)packet, packet->len);
50637@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
50638
50639 /* Reset state */
50640 pv->established = 0;
50641- atomic_set(&pv->seqno, 0);
50642+ atomic_set_unchecked(&pv->seqno, 0);
50643
50644 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
50645
50646diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
50647index 17ee3bf..8d2520d 100644
50648--- a/drivers/tty/ipwireless/tty.c
50649+++ b/drivers/tty/ipwireless/tty.c
50650@@ -28,6 +28,7 @@
50651 #include <linux/tty_driver.h>
50652 #include <linux/tty_flip.h>
50653 #include <linux/uaccess.h>
50654+#include <asm/local.h>
50655
50656 #include "tty.h"
50657 #include "network.h"
50658@@ -98,10 +99,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
50659 mutex_unlock(&tty->ipw_tty_mutex);
50660 return -ENODEV;
50661 }
50662- if (tty->port.count == 0)
50663+ if (atomic_read(&tty->port.count) == 0)
50664 tty->tx_bytes_queued = 0;
50665
50666- tty->port.count++;
50667+ atomic_inc(&tty->port.count);
50668
50669 tty->port.tty = linux_tty;
50670 linux_tty->driver_data = tty;
50671@@ -117,9 +118,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
50672
50673 static void do_ipw_close(struct ipw_tty *tty)
50674 {
50675- tty->port.count--;
50676-
50677- if (tty->port.count == 0) {
50678+ if (atomic_dec_return(&tty->port.count) == 0) {
50679 struct tty_struct *linux_tty = tty->port.tty;
50680
50681 if (linux_tty != NULL) {
50682@@ -140,7 +139,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
50683 return;
50684
50685 mutex_lock(&tty->ipw_tty_mutex);
50686- if (tty->port.count == 0) {
50687+ if (atomic_read(&tty->port.count) == 0) {
50688 mutex_unlock(&tty->ipw_tty_mutex);
50689 return;
50690 }
50691@@ -163,7 +162,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
50692
50693 mutex_lock(&tty->ipw_tty_mutex);
50694
50695- if (!tty->port.count) {
50696+ if (!atomic_read(&tty->port.count)) {
50697 mutex_unlock(&tty->ipw_tty_mutex);
50698 return;
50699 }
50700@@ -202,7 +201,7 @@ static int ipw_write(struct tty_struct *linux_tty,
50701 return -ENODEV;
50702
50703 mutex_lock(&tty->ipw_tty_mutex);
50704- if (!tty->port.count) {
50705+ if (!atomic_read(&tty->port.count)) {
50706 mutex_unlock(&tty->ipw_tty_mutex);
50707 return -EINVAL;
50708 }
50709@@ -242,7 +241,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
50710 if (!tty)
50711 return -ENODEV;
50712
50713- if (!tty->port.count)
50714+ if (!atomic_read(&tty->port.count))
50715 return -EINVAL;
50716
50717 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
50718@@ -284,7 +283,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
50719 if (!tty)
50720 return 0;
50721
50722- if (!tty->port.count)
50723+ if (!atomic_read(&tty->port.count))
50724 return 0;
50725
50726 return tty->tx_bytes_queued;
50727@@ -365,7 +364,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
50728 if (!tty)
50729 return -ENODEV;
50730
50731- if (!tty->port.count)
50732+ if (!atomic_read(&tty->port.count))
50733 return -EINVAL;
50734
50735 return get_control_lines(tty);
50736@@ -381,7 +380,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
50737 if (!tty)
50738 return -ENODEV;
50739
50740- if (!tty->port.count)
50741+ if (!atomic_read(&tty->port.count))
50742 return -EINVAL;
50743
50744 return set_control_lines(tty, set, clear);
50745@@ -395,7 +394,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
50746 if (!tty)
50747 return -ENODEV;
50748
50749- if (!tty->port.count)
50750+ if (!atomic_read(&tty->port.count))
50751 return -EINVAL;
50752
50753 /* FIXME: Exactly how is the tty object locked here .. */
50754@@ -551,7 +550,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
50755 * are gone */
50756 mutex_lock(&ttyj->ipw_tty_mutex);
50757 }
50758- while (ttyj->port.count)
50759+ while (atomic_read(&ttyj->port.count))
50760 do_ipw_close(ttyj);
50761 ipwireless_disassociate_network_ttys(network,
50762 ttyj->channel_idx);
50763diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
50764index 1deaca4..c8582d4 100644
50765--- a/drivers/tty/moxa.c
50766+++ b/drivers/tty/moxa.c
50767@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
50768 }
50769
50770 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
50771- ch->port.count++;
50772+ atomic_inc(&ch->port.count);
50773 tty->driver_data = ch;
50774 tty_port_tty_set(&ch->port, tty);
50775 mutex_lock(&ch->port.mutex);
50776diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
50777index 2ebe47b..3205833 100644
50778--- a/drivers/tty/n_gsm.c
50779+++ b/drivers/tty/n_gsm.c
50780@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
50781 spin_lock_init(&dlci->lock);
50782 mutex_init(&dlci->mutex);
50783 dlci->fifo = &dlci->_fifo;
50784- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
50785+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
50786 kfree(dlci);
50787 return NULL;
50788 }
50789@@ -2954,7 +2954,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
50790 struct gsm_dlci *dlci = tty->driver_data;
50791 struct tty_port *port = &dlci->port;
50792
50793- port->count++;
50794+ atomic_inc(&port->count);
50795 tty_port_tty_set(port, tty);
50796
50797 dlci->modem_rx = 0;
50798diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
50799index fe9d129..477300f 100644
50800--- a/drivers/tty/n_tty.c
50801+++ b/drivers/tty/n_tty.c
50802@@ -115,7 +115,7 @@ struct n_tty_data {
50803 int minimum_to_wake;
50804
50805 /* consumer-published */
50806- size_t read_tail;
50807+ size_t read_tail __intentional_overflow(-1);
50808 size_t line_start;
50809
50810 /* protected by output lock */
50811@@ -2516,6 +2516,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
50812 {
50813 *ops = tty_ldisc_N_TTY;
50814 ops->owner = NULL;
50815- ops->refcount = ops->flags = 0;
50816+ atomic_set(&ops->refcount, 0);
50817+ ops->flags = 0;
50818 }
50819 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
50820diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
50821index 25c9bc7..24077b7 100644
50822--- a/drivers/tty/pty.c
50823+++ b/drivers/tty/pty.c
50824@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
50825 panic("Couldn't register Unix98 pts driver");
50826
50827 /* Now create the /dev/ptmx special device */
50828+ pax_open_kernel();
50829 tty_default_fops(&ptmx_fops);
50830- ptmx_fops.open = ptmx_open;
50831+ *(void **)&ptmx_fops.open = ptmx_open;
50832+ pax_close_kernel();
50833
50834 cdev_init(&ptmx_cdev, &ptmx_fops);
50835 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
50836diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
50837index 383c4c7..d408e21 100644
50838--- a/drivers/tty/rocket.c
50839+++ b/drivers/tty/rocket.c
50840@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
50841 tty->driver_data = info;
50842 tty_port_tty_set(port, tty);
50843
50844- if (port->count++ == 0) {
50845+ if (atomic_inc_return(&port->count) == 1) {
50846 atomic_inc(&rp_num_ports_open);
50847
50848 #ifdef ROCKET_DEBUG_OPEN
50849@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
50850 #endif
50851 }
50852 #ifdef ROCKET_DEBUG_OPEN
50853- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
50854+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
50855 #endif
50856
50857 /*
50858@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
50859 spin_unlock_irqrestore(&info->port.lock, flags);
50860 return;
50861 }
50862- if (info->port.count)
50863+ if (atomic_read(&info->port.count))
50864 atomic_dec(&rp_num_ports_open);
50865 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
50866 spin_unlock_irqrestore(&info->port.lock, flags);
50867diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
50868index 1274499..f541382 100644
50869--- a/drivers/tty/serial/ioc4_serial.c
50870+++ b/drivers/tty/serial/ioc4_serial.c
50871@@ -437,7 +437,7 @@ struct ioc4_soft {
50872 } is_intr_info[MAX_IOC4_INTR_ENTS];
50873
50874 /* Number of entries active in the above array */
50875- atomic_t is_num_intrs;
50876+ atomic_unchecked_t is_num_intrs;
50877 } is_intr_type[IOC4_NUM_INTR_TYPES];
50878
50879 /* is_ir_lock must be held while
50880@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
50881 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
50882 || (type == IOC4_OTHER_INTR_TYPE)));
50883
50884- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
50885+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
50886 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
50887
50888 /* Save off the lower level interrupt handler */
50889@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
50890
50891 soft = arg;
50892 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
50893- num_intrs = (int)atomic_read(
50894+ num_intrs = (int)atomic_read_unchecked(
50895 &soft->is_intr_type[intr_type].is_num_intrs);
50896
50897 this_mir = this_ir = pending_intrs(soft, intr_type);
50898diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
50899index a260cde..6b2b5ce 100644
50900--- a/drivers/tty/serial/kgdboc.c
50901+++ b/drivers/tty/serial/kgdboc.c
50902@@ -24,8 +24,9 @@
50903 #define MAX_CONFIG_LEN 40
50904
50905 static struct kgdb_io kgdboc_io_ops;
50906+static struct kgdb_io kgdboc_io_ops_console;
50907
50908-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
50909+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
50910 static int configured = -1;
50911
50912 static char config[MAX_CONFIG_LEN];
50913@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
50914 kgdboc_unregister_kbd();
50915 if (configured == 1)
50916 kgdb_unregister_io_module(&kgdboc_io_ops);
50917+ else if (configured == 2)
50918+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
50919 }
50920
50921 static int configure_kgdboc(void)
50922@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
50923 int err;
50924 char *cptr = config;
50925 struct console *cons;
50926+ int is_console = 0;
50927
50928 err = kgdboc_option_setup(config);
50929 if (err || !strlen(config) || isspace(config[0]))
50930 goto noconfig;
50931
50932 err = -ENODEV;
50933- kgdboc_io_ops.is_console = 0;
50934 kgdb_tty_driver = NULL;
50935
50936 kgdboc_use_kms = 0;
50937@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
50938 int idx;
50939 if (cons->device && cons->device(cons, &idx) == p &&
50940 idx == tty_line) {
50941- kgdboc_io_ops.is_console = 1;
50942+ is_console = 1;
50943 break;
50944 }
50945 cons = cons->next;
50946@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
50947 kgdb_tty_line = tty_line;
50948
50949 do_register:
50950- err = kgdb_register_io_module(&kgdboc_io_ops);
50951+ if (is_console) {
50952+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
50953+ configured = 2;
50954+ } else {
50955+ err = kgdb_register_io_module(&kgdboc_io_ops);
50956+ configured = 1;
50957+ }
50958 if (err)
50959 goto noconfig;
50960
50961@@ -205,8 +214,6 @@ do_register:
50962 if (err)
50963 goto nmi_con_failed;
50964
50965- configured = 1;
50966-
50967 return 0;
50968
50969 nmi_con_failed:
50970@@ -223,7 +230,7 @@ noconfig:
50971 static int __init init_kgdboc(void)
50972 {
50973 /* Already configured? */
50974- if (configured == 1)
50975+ if (configured >= 1)
50976 return 0;
50977
50978 return configure_kgdboc();
50979@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
50980 if (config[len - 1] == '\n')
50981 config[len - 1] = '\0';
50982
50983- if (configured == 1)
50984+ if (configured >= 1)
50985 cleanup_kgdboc();
50986
50987 /* Go and configure with the new params. */
50988@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
50989 .post_exception = kgdboc_post_exp_handler,
50990 };
50991
50992+static struct kgdb_io kgdboc_io_ops_console = {
50993+ .name = "kgdboc",
50994+ .read_char = kgdboc_get_char,
50995+ .write_char = kgdboc_put_char,
50996+ .pre_exception = kgdboc_pre_exp_handler,
50997+ .post_exception = kgdboc_post_exp_handler,
50998+ .is_console = 1
50999+};
51000+
51001 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
51002 /* This is only available if kgdboc is a built in for early debugging */
51003 static int __init kgdboc_early_init(char *opt)
51004diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
51005index 053b98e..86742e5 100644
51006--- a/drivers/tty/serial/msm_serial.c
51007+++ b/drivers/tty/serial/msm_serial.c
51008@@ -1026,7 +1026,7 @@ static struct uart_driver msm_uart_driver = {
51009 .cons = MSM_CONSOLE,
51010 };
51011
51012-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
51013+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
51014
51015 static const struct of_device_id msm_uartdm_table[] = {
51016 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
51017@@ -1045,7 +1045,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
51018 int irq;
51019
51020 if (pdev->id == -1)
51021- pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
51022+ pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
51023
51024 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
51025 return -ENXIO;
51026diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
51027index 1f5505e..a1a767d 100644
51028--- a/drivers/tty/serial/samsung.c
51029+++ b/drivers/tty/serial/samsung.c
51030@@ -463,11 +463,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
51031 }
51032 }
51033
51034+static int s3c64xx_serial_startup(struct uart_port *port);
51035 static int s3c24xx_serial_startup(struct uart_port *port)
51036 {
51037 struct s3c24xx_uart_port *ourport = to_ourport(port);
51038 int ret;
51039
51040+ /* Startup sequence is different for s3c64xx and higher SoC's */
51041+ if (s3c24xx_serial_has_interrupt_mask(port))
51042+ return s3c64xx_serial_startup(port);
51043+
51044 dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
51045 port->mapbase, port->membase);
51046
51047@@ -1141,10 +1146,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
51048 /* setup info for port */
51049 port->dev = &platdev->dev;
51050
51051- /* Startup sequence is different for s3c64xx and higher SoC's */
51052- if (s3c24xx_serial_has_interrupt_mask(port))
51053- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
51054-
51055 port->uartclk = 1;
51056
51057 if (cfg->uart_flags & UPF_CONS_FLOW) {
51058diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
51059index b68550d..a62d7f8 100644
51060--- a/drivers/tty/serial/serial_core.c
51061+++ b/drivers/tty/serial/serial_core.c
51062@@ -1329,7 +1329,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
51063
51064 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
51065
51066- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
51067+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
51068 return;
51069
51070 /*
51071@@ -1456,7 +1456,7 @@ static void uart_hangup(struct tty_struct *tty)
51072 uart_flush_buffer(tty);
51073 uart_shutdown(tty, state);
51074 spin_lock_irqsave(&port->lock, flags);
51075- port->count = 0;
51076+ atomic_set(&port->count, 0);
51077 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
51078 spin_unlock_irqrestore(&port->lock, flags);
51079 tty_port_tty_set(port, NULL);
51080@@ -1554,7 +1554,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
51081 goto end;
51082 }
51083
51084- port->count++;
51085+ atomic_inc(&port->count);
51086 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
51087 retval = -ENXIO;
51088 goto err_dec_count;
51089@@ -1594,7 +1594,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
51090 end:
51091 return retval;
51092 err_dec_count:
51093- port->count--;
51094+ atomic_inc(&port->count);
51095 mutex_unlock(&port->mutex);
51096 goto end;
51097 }
51098diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
51099index d48e040..0f52764 100644
51100--- a/drivers/tty/synclink.c
51101+++ b/drivers/tty/synclink.c
51102@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
51103
51104 if (debug_level >= DEBUG_LEVEL_INFO)
51105 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
51106- __FILE__,__LINE__, info->device_name, info->port.count);
51107+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
51108
51109 if (tty_port_close_start(&info->port, tty, filp) == 0)
51110 goto cleanup;
51111@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
51112 cleanup:
51113 if (debug_level >= DEBUG_LEVEL_INFO)
51114 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
51115- tty->driver->name, info->port.count);
51116+ tty->driver->name, atomic_read(&info->port.count));
51117
51118 } /* end of mgsl_close() */
51119
51120@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
51121
51122 mgsl_flush_buffer(tty);
51123 shutdown(info);
51124-
51125- info->port.count = 0;
51126+
51127+ atomic_set(&info->port.count, 0);
51128 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51129 info->port.tty = NULL;
51130
51131@@ -3297,12 +3297,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51132
51133 if (debug_level >= DEBUG_LEVEL_INFO)
51134 printk("%s(%d):block_til_ready before block on %s count=%d\n",
51135- __FILE__,__LINE__, tty->driver->name, port->count );
51136+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51137
51138 spin_lock_irqsave(&info->irq_spinlock, flags);
51139 if (!tty_hung_up_p(filp)) {
51140 extra_count = true;
51141- port->count--;
51142+ atomic_dec(&port->count);
51143 }
51144 spin_unlock_irqrestore(&info->irq_spinlock, flags);
51145 port->blocked_open++;
51146@@ -3331,7 +3331,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51147
51148 if (debug_level >= DEBUG_LEVEL_INFO)
51149 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
51150- __FILE__,__LINE__, tty->driver->name, port->count );
51151+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51152
51153 tty_unlock(tty);
51154 schedule();
51155@@ -3343,12 +3343,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
51156
51157 /* FIXME: Racy on hangup during close wait */
51158 if (extra_count)
51159- port->count++;
51160+ atomic_inc(&port->count);
51161 port->blocked_open--;
51162
51163 if (debug_level >= DEBUG_LEVEL_INFO)
51164 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
51165- __FILE__,__LINE__, tty->driver->name, port->count );
51166+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51167
51168 if (!retval)
51169 port->flags |= ASYNC_NORMAL_ACTIVE;
51170@@ -3400,7 +3400,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
51171
51172 if (debug_level >= DEBUG_LEVEL_INFO)
51173 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
51174- __FILE__,__LINE__,tty->driver->name, info->port.count);
51175+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
51176
51177 /* If port is closing, signal caller to try again */
51178 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51179@@ -3419,10 +3419,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
51180 spin_unlock_irqrestore(&info->netlock, flags);
51181 goto cleanup;
51182 }
51183- info->port.count++;
51184+ atomic_inc(&info->port.count);
51185 spin_unlock_irqrestore(&info->netlock, flags);
51186
51187- if (info->port.count == 1) {
51188+ if (atomic_read(&info->port.count) == 1) {
51189 /* 1st open on this device, init hardware */
51190 retval = startup(info);
51191 if (retval < 0)
51192@@ -3446,8 +3446,8 @@ cleanup:
51193 if (retval) {
51194 if (tty->count == 1)
51195 info->port.tty = NULL; /* tty layer will release tty struct */
51196- if(info->port.count)
51197- info->port.count--;
51198+ if (atomic_read(&info->port.count))
51199+ atomic_dec(&info->port.count);
51200 }
51201
51202 return retval;
51203@@ -7665,7 +7665,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51204 unsigned short new_crctype;
51205
51206 /* return error if TTY interface open */
51207- if (info->port.count)
51208+ if (atomic_read(&info->port.count))
51209 return -EBUSY;
51210
51211 switch (encoding)
51212@@ -7760,7 +7760,7 @@ static int hdlcdev_open(struct net_device *dev)
51213
51214 /* arbitrate between network and tty opens */
51215 spin_lock_irqsave(&info->netlock, flags);
51216- if (info->port.count != 0 || info->netcount != 0) {
51217+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51218 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
51219 spin_unlock_irqrestore(&info->netlock, flags);
51220 return -EBUSY;
51221@@ -7846,7 +7846,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51222 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
51223
51224 /* return error if TTY interface open */
51225- if (info->port.count)
51226+ if (atomic_read(&info->port.count))
51227 return -EBUSY;
51228
51229 if (cmd != SIOCWANDEV)
51230diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
51231index c359a91..959fc26 100644
51232--- a/drivers/tty/synclink_gt.c
51233+++ b/drivers/tty/synclink_gt.c
51234@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
51235 tty->driver_data = info;
51236 info->port.tty = tty;
51237
51238- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
51239+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
51240
51241 /* If port is closing, signal caller to try again */
51242 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51243@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
51244 mutex_unlock(&info->port.mutex);
51245 goto cleanup;
51246 }
51247- info->port.count++;
51248+ atomic_inc(&info->port.count);
51249 spin_unlock_irqrestore(&info->netlock, flags);
51250
51251- if (info->port.count == 1) {
51252+ if (atomic_read(&info->port.count) == 1) {
51253 /* 1st open on this device, init hardware */
51254 retval = startup(info);
51255 if (retval < 0) {
51256@@ -715,8 +715,8 @@ cleanup:
51257 if (retval) {
51258 if (tty->count == 1)
51259 info->port.tty = NULL; /* tty layer will release tty struct */
51260- if(info->port.count)
51261- info->port.count--;
51262+ if(atomic_read(&info->port.count))
51263+ atomic_dec(&info->port.count);
51264 }
51265
51266 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
51267@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51268
51269 if (sanity_check(info, tty->name, "close"))
51270 return;
51271- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
51272+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
51273
51274 if (tty_port_close_start(&info->port, tty, filp) == 0)
51275 goto cleanup;
51276@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51277 tty_port_close_end(&info->port, tty);
51278 info->port.tty = NULL;
51279 cleanup:
51280- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
51281+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
51282 }
51283
51284 static void hangup(struct tty_struct *tty)
51285@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
51286 shutdown(info);
51287
51288 spin_lock_irqsave(&info->port.lock, flags);
51289- info->port.count = 0;
51290+ atomic_set(&info->port.count, 0);
51291 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51292 info->port.tty = NULL;
51293 spin_unlock_irqrestore(&info->port.lock, flags);
51294@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51295 unsigned short new_crctype;
51296
51297 /* return error if TTY interface open */
51298- if (info->port.count)
51299+ if (atomic_read(&info->port.count))
51300 return -EBUSY;
51301
51302 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
51303@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
51304
51305 /* arbitrate between network and tty opens */
51306 spin_lock_irqsave(&info->netlock, flags);
51307- if (info->port.count != 0 || info->netcount != 0) {
51308+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51309 DBGINFO(("%s hdlc_open busy\n", dev->name));
51310 spin_unlock_irqrestore(&info->netlock, flags);
51311 return -EBUSY;
51312@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51313 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
51314
51315 /* return error if TTY interface open */
51316- if (info->port.count)
51317+ if (atomic_read(&info->port.count))
51318 return -EBUSY;
51319
51320 if (cmd != SIOCWANDEV)
51321@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
51322 if (port == NULL)
51323 continue;
51324 spin_lock(&port->lock);
51325- if ((port->port.count || port->netcount) &&
51326+ if ((atomic_read(&port->port.count) || port->netcount) &&
51327 port->pending_bh && !port->bh_running &&
51328 !port->bh_requested) {
51329 DBGISR(("%s bh queued\n", port->device_name));
51330@@ -3302,7 +3302,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51331 spin_lock_irqsave(&info->lock, flags);
51332 if (!tty_hung_up_p(filp)) {
51333 extra_count = true;
51334- port->count--;
51335+ atomic_dec(&port->count);
51336 }
51337 spin_unlock_irqrestore(&info->lock, flags);
51338 port->blocked_open++;
51339@@ -3339,7 +3339,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51340 remove_wait_queue(&port->open_wait, &wait);
51341
51342 if (extra_count)
51343- port->count++;
51344+ atomic_inc(&port->count);
51345 port->blocked_open--;
51346
51347 if (!retval)
51348diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
51349index 53ba853..3c30f6d 100644
51350--- a/drivers/tty/synclinkmp.c
51351+++ b/drivers/tty/synclinkmp.c
51352@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
51353
51354 if (debug_level >= DEBUG_LEVEL_INFO)
51355 printk("%s(%d):%s open(), old ref count = %d\n",
51356- __FILE__,__LINE__,tty->driver->name, info->port.count);
51357+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
51358
51359 /* If port is closing, signal caller to try again */
51360 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
51361@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
51362 spin_unlock_irqrestore(&info->netlock, flags);
51363 goto cleanup;
51364 }
51365- info->port.count++;
51366+ atomic_inc(&info->port.count);
51367 spin_unlock_irqrestore(&info->netlock, flags);
51368
51369- if (info->port.count == 1) {
51370+ if (atomic_read(&info->port.count) == 1) {
51371 /* 1st open on this device, init hardware */
51372 retval = startup(info);
51373 if (retval < 0)
51374@@ -796,8 +796,8 @@ cleanup:
51375 if (retval) {
51376 if (tty->count == 1)
51377 info->port.tty = NULL; /* tty layer will release tty struct */
51378- if(info->port.count)
51379- info->port.count--;
51380+ if(atomic_read(&info->port.count))
51381+ atomic_dec(&info->port.count);
51382 }
51383
51384 return retval;
51385@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51386
51387 if (debug_level >= DEBUG_LEVEL_INFO)
51388 printk("%s(%d):%s close() entry, count=%d\n",
51389- __FILE__,__LINE__, info->device_name, info->port.count);
51390+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
51391
51392 if (tty_port_close_start(&info->port, tty, filp) == 0)
51393 goto cleanup;
51394@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
51395 cleanup:
51396 if (debug_level >= DEBUG_LEVEL_INFO)
51397 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
51398- tty->driver->name, info->port.count);
51399+ tty->driver->name, atomic_read(&info->port.count));
51400 }
51401
51402 /* Called by tty_hangup() when a hangup is signaled.
51403@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
51404 shutdown(info);
51405
51406 spin_lock_irqsave(&info->port.lock, flags);
51407- info->port.count = 0;
51408+ atomic_set(&info->port.count, 0);
51409 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
51410 info->port.tty = NULL;
51411 spin_unlock_irqrestore(&info->port.lock, flags);
51412@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
51413 unsigned short new_crctype;
51414
51415 /* return error if TTY interface open */
51416- if (info->port.count)
51417+ if (atomic_read(&info->port.count))
51418 return -EBUSY;
51419
51420 switch (encoding)
51421@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
51422
51423 /* arbitrate between network and tty opens */
51424 spin_lock_irqsave(&info->netlock, flags);
51425- if (info->port.count != 0 || info->netcount != 0) {
51426+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
51427 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
51428 spin_unlock_irqrestore(&info->netlock, flags);
51429 return -EBUSY;
51430@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
51431 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
51432
51433 /* return error if TTY interface open */
51434- if (info->port.count)
51435+ if (atomic_read(&info->port.count))
51436 return -EBUSY;
51437
51438 if (cmd != SIOCWANDEV)
51439@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
51440 * do not request bottom half processing if the
51441 * device is not open in a normal mode.
51442 */
51443- if ( port && (port->port.count || port->netcount) &&
51444+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
51445 port->pending_bh && !port->bh_running &&
51446 !port->bh_requested ) {
51447 if ( debug_level >= DEBUG_LEVEL_ISR )
51448@@ -3319,12 +3319,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51449
51450 if (debug_level >= DEBUG_LEVEL_INFO)
51451 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
51452- __FILE__,__LINE__, tty->driver->name, port->count );
51453+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51454
51455 spin_lock_irqsave(&info->lock, flags);
51456 if (!tty_hung_up_p(filp)) {
51457 extra_count = true;
51458- port->count--;
51459+ atomic_dec(&port->count);
51460 }
51461 spin_unlock_irqrestore(&info->lock, flags);
51462 port->blocked_open++;
51463@@ -3353,7 +3353,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51464
51465 if (debug_level >= DEBUG_LEVEL_INFO)
51466 printk("%s(%d):%s block_til_ready() count=%d\n",
51467- __FILE__,__LINE__, tty->driver->name, port->count );
51468+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51469
51470 tty_unlock(tty);
51471 schedule();
51472@@ -3364,12 +3364,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
51473 remove_wait_queue(&port->open_wait, &wait);
51474
51475 if (extra_count)
51476- port->count++;
51477+ atomic_inc(&port->count);
51478 port->blocked_open--;
51479
51480 if (debug_level >= DEBUG_LEVEL_INFO)
51481 printk("%s(%d):%s block_til_ready() after, count=%d\n",
51482- __FILE__,__LINE__, tty->driver->name, port->count );
51483+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
51484
51485 if (!retval)
51486 port->flags |= ASYNC_NORMAL_ACTIVE;
51487diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
51488index ce396ec..04a37be 100644
51489--- a/drivers/tty/sysrq.c
51490+++ b/drivers/tty/sysrq.c
51491@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
51492 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
51493 size_t count, loff_t *ppos)
51494 {
51495- if (count) {
51496+ if (count && capable(CAP_SYS_ADMIN)) {
51497 char c;
51498
51499 if (get_user(c, buf))
51500diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
51501index 3411071..86f2cf2 100644
51502--- a/drivers/tty/tty_io.c
51503+++ b/drivers/tty/tty_io.c
51504@@ -3475,7 +3475,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
51505
51506 void tty_default_fops(struct file_operations *fops)
51507 {
51508- *fops = tty_fops;
51509+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
51510 }
51511
51512 /*
51513diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
51514index 2d822aa..a566234 100644
51515--- a/drivers/tty/tty_ldisc.c
51516+++ b/drivers/tty/tty_ldisc.c
51517@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
51518 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51519 tty_ldiscs[disc] = new_ldisc;
51520 new_ldisc->num = disc;
51521- new_ldisc->refcount = 0;
51522+ atomic_set(&new_ldisc->refcount, 0);
51523 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
51524
51525 return ret;
51526@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
51527 return -EINVAL;
51528
51529 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51530- if (tty_ldiscs[disc]->refcount)
51531+ if (atomic_read(&tty_ldiscs[disc]->refcount))
51532 ret = -EBUSY;
51533 else
51534 tty_ldiscs[disc] = NULL;
51535@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
51536 if (ldops) {
51537 ret = ERR_PTR(-EAGAIN);
51538 if (try_module_get(ldops->owner)) {
51539- ldops->refcount++;
51540+ atomic_inc(&ldops->refcount);
51541 ret = ldops;
51542 }
51543 }
51544@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
51545 unsigned long flags;
51546
51547 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
51548- ldops->refcount--;
51549+ atomic_dec(&ldops->refcount);
51550 module_put(ldops->owner);
51551 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
51552 }
51553diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
51554index 3f746c8..2f2fcaa 100644
51555--- a/drivers/tty/tty_port.c
51556+++ b/drivers/tty/tty_port.c
51557@@ -235,7 +235,7 @@ void tty_port_hangup(struct tty_port *port)
51558 unsigned long flags;
51559
51560 spin_lock_irqsave(&port->lock, flags);
51561- port->count = 0;
51562+ atomic_set(&port->count, 0);
51563 port->flags &= ~ASYNC_NORMAL_ACTIVE;
51564 tty = port->tty;
51565 if (tty)
51566@@ -393,7 +393,7 @@ int tty_port_block_til_ready(struct tty_port *port,
51567 /* The port lock protects the port counts */
51568 spin_lock_irqsave(&port->lock, flags);
51569 if (!tty_hung_up_p(filp))
51570- port->count--;
51571+ atomic_dec(&port->count);
51572 port->blocked_open++;
51573 spin_unlock_irqrestore(&port->lock, flags);
51574
51575@@ -435,7 +435,7 @@ int tty_port_block_til_ready(struct tty_port *port,
51576 we must not mess that up further */
51577 spin_lock_irqsave(&port->lock, flags);
51578 if (!tty_hung_up_p(filp))
51579- port->count++;
51580+ atomic_inc(&port->count);
51581 port->blocked_open--;
51582 if (retval == 0)
51583 port->flags |= ASYNC_NORMAL_ACTIVE;
51584@@ -469,19 +469,19 @@ int tty_port_close_start(struct tty_port *port,
51585 return 0;
51586 }
51587
51588- if (tty->count == 1 && port->count != 1) {
51589+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
51590 printk(KERN_WARNING
51591 "tty_port_close_start: tty->count = 1 port count = %d.\n",
51592- port->count);
51593- port->count = 1;
51594+ atomic_read(&port->count));
51595+ atomic_set(&port->count, 1);
51596 }
51597- if (--port->count < 0) {
51598+ if (atomic_dec_return(&port->count) < 0) {
51599 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
51600- port->count);
51601- port->count = 0;
51602+ atomic_read(&port->count));
51603+ atomic_set(&port->count, 0);
51604 }
51605
51606- if (port->count) {
51607+ if (atomic_read(&port->count)) {
51608 spin_unlock_irqrestore(&port->lock, flags);
51609 return 0;
51610 }
51611@@ -563,7 +563,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
51612 {
51613 spin_lock_irq(&port->lock);
51614 if (!tty_hung_up_p(filp))
51615- ++port->count;
51616+ atomic_inc(&port->count);
51617 spin_unlock_irq(&port->lock);
51618 tty_port_tty_set(port, tty);
51619
51620diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
51621index d0e3a44..5f8b754 100644
51622--- a/drivers/tty/vt/keyboard.c
51623+++ b/drivers/tty/vt/keyboard.c
51624@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
51625 kbd->kbdmode == VC_OFF) &&
51626 value != KVAL(K_SAK))
51627 return; /* SAK is allowed even in raw mode */
51628+
51629+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
51630+ {
51631+ void *func = fn_handler[value];
51632+ if (func == fn_show_state || func == fn_show_ptregs ||
51633+ func == fn_show_mem)
51634+ return;
51635+ }
51636+#endif
51637+
51638 fn_handler[value](vc);
51639 }
51640
51641@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
51642 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
51643 return -EFAULT;
51644
51645- if (!capable(CAP_SYS_TTY_CONFIG))
51646- perm = 0;
51647-
51648 switch (cmd) {
51649 case KDGKBENT:
51650 /* Ensure another thread doesn't free it under us */
51651@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
51652 spin_unlock_irqrestore(&kbd_event_lock, flags);
51653 return put_user(val, &user_kbe->kb_value);
51654 case KDSKBENT:
51655+ if (!capable(CAP_SYS_TTY_CONFIG))
51656+ perm = 0;
51657+
51658 if (!perm)
51659 return -EPERM;
51660 if (!i && v == K_NOSUCHMAP) {
51661@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
51662 int i, j, k;
51663 int ret;
51664
51665- if (!capable(CAP_SYS_TTY_CONFIG))
51666- perm = 0;
51667-
51668 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
51669 if (!kbs) {
51670 ret = -ENOMEM;
51671@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
51672 kfree(kbs);
51673 return ((p && *p) ? -EOVERFLOW : 0);
51674 case KDSKBSENT:
51675+ if (!capable(CAP_SYS_TTY_CONFIG))
51676+ perm = 0;
51677+
51678 if (!perm) {
51679 ret = -EPERM;
51680 goto reterr;
51681diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
51682index a673e5b..36e5d32 100644
51683--- a/drivers/uio/uio.c
51684+++ b/drivers/uio/uio.c
51685@@ -25,6 +25,7 @@
51686 #include <linux/kobject.h>
51687 #include <linux/cdev.h>
51688 #include <linux/uio_driver.h>
51689+#include <asm/local.h>
51690
51691 #define UIO_MAX_DEVICES (1U << MINORBITS)
51692
51693@@ -32,7 +33,7 @@ struct uio_device {
51694 struct module *owner;
51695 struct device *dev;
51696 int minor;
51697- atomic_t event;
51698+ atomic_unchecked_t event;
51699 struct fasync_struct *async_queue;
51700 wait_queue_head_t wait;
51701 struct uio_info *info;
51702@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
51703 struct device_attribute *attr, char *buf)
51704 {
51705 struct uio_device *idev = dev_get_drvdata(dev);
51706- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
51707+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
51708 }
51709 static DEVICE_ATTR_RO(event);
51710
51711@@ -405,7 +406,7 @@ void uio_event_notify(struct uio_info *info)
51712 {
51713 struct uio_device *idev = info->uio_dev;
51714
51715- atomic_inc(&idev->event);
51716+ atomic_inc_unchecked(&idev->event);
51717 wake_up_interruptible(&idev->wait);
51718 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
51719 }
51720@@ -458,7 +459,7 @@ static int uio_open(struct inode *inode, struct file *filep)
51721 }
51722
51723 listener->dev = idev;
51724- listener->event_count = atomic_read(&idev->event);
51725+ listener->event_count = atomic_read_unchecked(&idev->event);
51726 filep->private_data = listener;
51727
51728 if (idev->info->open) {
51729@@ -509,7 +510,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
51730 return -EIO;
51731
51732 poll_wait(filep, &idev->wait, wait);
51733- if (listener->event_count != atomic_read(&idev->event))
51734+ if (listener->event_count != atomic_read_unchecked(&idev->event))
51735 return POLLIN | POLLRDNORM;
51736 return 0;
51737 }
51738@@ -534,7 +535,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
51739 do {
51740 set_current_state(TASK_INTERRUPTIBLE);
51741
51742- event_count = atomic_read(&idev->event);
51743+ event_count = atomic_read_unchecked(&idev->event);
51744 if (event_count != listener->event_count) {
51745 if (copy_to_user(buf, &event_count, count))
51746 retval = -EFAULT;
51747@@ -591,9 +592,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
51748 static int uio_find_mem_index(struct vm_area_struct *vma)
51749 {
51750 struct uio_device *idev = vma->vm_private_data;
51751+ unsigned long size;
51752
51753 if (vma->vm_pgoff < MAX_UIO_MAPS) {
51754- if (idev->info->mem[vma->vm_pgoff].size == 0)
51755+ size = idev->info->mem[vma->vm_pgoff].size;
51756+ if (size == 0)
51757+ return -1;
51758+ if (vma->vm_end - vma->vm_start > size)
51759 return -1;
51760 return (int)vma->vm_pgoff;
51761 }
51762@@ -825,7 +830,7 @@ int __uio_register_device(struct module *owner,
51763 idev->owner = owner;
51764 idev->info = info;
51765 init_waitqueue_head(&idev->wait);
51766- atomic_set(&idev->event, 0);
51767+ atomic_set_unchecked(&idev->event, 0);
51768
51769 ret = uio_get_minor(idev);
51770 if (ret)
51771diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
51772index 813d4d3..a71934f 100644
51773--- a/drivers/usb/atm/cxacru.c
51774+++ b/drivers/usb/atm/cxacru.c
51775@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
51776 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
51777 if (ret < 2)
51778 return -EINVAL;
51779- if (index < 0 || index > 0x7f)
51780+ if (index > 0x7f)
51781 return -EINVAL;
51782 pos += tmp;
51783
51784diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
51785index dada014..1d0d517 100644
51786--- a/drivers/usb/atm/usbatm.c
51787+++ b/drivers/usb/atm/usbatm.c
51788@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51789 if (printk_ratelimit())
51790 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
51791 __func__, vpi, vci);
51792- atomic_inc(&vcc->stats->rx_err);
51793+ atomic_inc_unchecked(&vcc->stats->rx_err);
51794 return;
51795 }
51796
51797@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51798 if (length > ATM_MAX_AAL5_PDU) {
51799 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
51800 __func__, length, vcc);
51801- atomic_inc(&vcc->stats->rx_err);
51802+ atomic_inc_unchecked(&vcc->stats->rx_err);
51803 goto out;
51804 }
51805
51806@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51807 if (sarb->len < pdu_length) {
51808 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
51809 __func__, pdu_length, sarb->len, vcc);
51810- atomic_inc(&vcc->stats->rx_err);
51811+ atomic_inc_unchecked(&vcc->stats->rx_err);
51812 goto out;
51813 }
51814
51815 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
51816 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
51817 __func__, vcc);
51818- atomic_inc(&vcc->stats->rx_err);
51819+ atomic_inc_unchecked(&vcc->stats->rx_err);
51820 goto out;
51821 }
51822
51823@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51824 if (printk_ratelimit())
51825 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
51826 __func__, length);
51827- atomic_inc(&vcc->stats->rx_drop);
51828+ atomic_inc_unchecked(&vcc->stats->rx_drop);
51829 goto out;
51830 }
51831
51832@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
51833
51834 vcc->push(vcc, skb);
51835
51836- atomic_inc(&vcc->stats->rx);
51837+ atomic_inc_unchecked(&vcc->stats->rx);
51838 out:
51839 skb_trim(sarb, 0);
51840 }
51841@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
51842 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
51843
51844 usbatm_pop(vcc, skb);
51845- atomic_inc(&vcc->stats->tx);
51846+ atomic_inc_unchecked(&vcc->stats->tx);
51847
51848 skb = skb_dequeue(&instance->sndqueue);
51849 }
51850@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
51851 if (!left--)
51852 return sprintf(page,
51853 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
51854- atomic_read(&atm_dev->stats.aal5.tx),
51855- atomic_read(&atm_dev->stats.aal5.tx_err),
51856- atomic_read(&atm_dev->stats.aal5.rx),
51857- atomic_read(&atm_dev->stats.aal5.rx_err),
51858- atomic_read(&atm_dev->stats.aal5.rx_drop));
51859+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
51860+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
51861+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
51862+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
51863+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
51864
51865 if (!left--) {
51866 if (instance->disconnected)
51867diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
51868index 2a3bbdf..91d72cf 100644
51869--- a/drivers/usb/core/devices.c
51870+++ b/drivers/usb/core/devices.c
51871@@ -126,7 +126,7 @@ static const char format_endpt[] =
51872 * time it gets called.
51873 */
51874 static struct device_connect_event {
51875- atomic_t count;
51876+ atomic_unchecked_t count;
51877 wait_queue_head_t wait;
51878 } device_event = {
51879 .count = ATOMIC_INIT(1),
51880@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
51881
51882 void usbfs_conn_disc_event(void)
51883 {
51884- atomic_add(2, &device_event.count);
51885+ atomic_add_unchecked(2, &device_event.count);
51886 wake_up(&device_event.wait);
51887 }
51888
51889@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
51890
51891 poll_wait(file, &device_event.wait, wait);
51892
51893- event_count = atomic_read(&device_event.count);
51894+ event_count = atomic_read_unchecked(&device_event.count);
51895 if (file->f_version != event_count) {
51896 file->f_version = event_count;
51897 return POLLIN | POLLRDNORM;
51898diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
51899index 257876e..4304364 100644
51900--- a/drivers/usb/core/devio.c
51901+++ b/drivers/usb/core/devio.c
51902@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
51903 struct usb_dev_state *ps = file->private_data;
51904 struct usb_device *dev = ps->dev;
51905 ssize_t ret = 0;
51906- unsigned len;
51907+ size_t len;
51908 loff_t pos;
51909 int i;
51910
51911@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
51912 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
51913 struct usb_config_descriptor *config =
51914 (struct usb_config_descriptor *)dev->rawdescriptors[i];
51915- unsigned int length = le16_to_cpu(config->wTotalLength);
51916+ size_t length = le16_to_cpu(config->wTotalLength);
51917
51918 if (*ppos < pos + length) {
51919
51920 /* The descriptor may claim to be longer than it
51921 * really is. Here is the actual allocated length. */
51922- unsigned alloclen =
51923+ size_t alloclen =
51924 le16_to_cpu(dev->config[i].desc.wTotalLength);
51925
51926- len = length - (*ppos - pos);
51927+ len = length + pos - *ppos;
51928 if (len > nbytes)
51929 len = nbytes;
51930
51931 /* Simply don't write (skip over) unallocated parts */
51932 if (alloclen > (*ppos - pos)) {
51933- alloclen -= (*ppos - pos);
51934+ alloclen = alloclen + pos - *ppos;
51935 if (copy_to_user(buf,
51936 dev->rawdescriptors[i] + (*ppos - pos),
51937 min(len, alloclen))) {
51938diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
51939index 9c4e292..b89877f 100644
51940--- a/drivers/usb/core/hcd.c
51941+++ b/drivers/usb/core/hcd.c
51942@@ -1550,7 +1550,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
51943 */
51944 usb_get_urb(urb);
51945 atomic_inc(&urb->use_count);
51946- atomic_inc(&urb->dev->urbnum);
51947+ atomic_inc_unchecked(&urb->dev->urbnum);
51948 usbmon_urb_submit(&hcd->self, urb);
51949
51950 /* NOTE requirements on root-hub callers (usbfs and the hub
51951@@ -1577,7 +1577,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
51952 urb->hcpriv = NULL;
51953 INIT_LIST_HEAD(&urb->urb_list);
51954 atomic_dec(&urb->use_count);
51955- atomic_dec(&urb->dev->urbnum);
51956+ atomic_dec_unchecked(&urb->dev->urbnum);
51957 if (atomic_read(&urb->reject))
51958 wake_up(&usb_kill_urb_queue);
51959 usb_put_urb(urb);
51960diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
51961index 229a73f..ef86f98 100644
51962--- a/drivers/usb/core/hub.c
51963+++ b/drivers/usb/core/hub.c
51964@@ -27,6 +27,7 @@
51965 #include <linux/freezer.h>
51966 #include <linux/random.h>
51967 #include <linux/pm_qos.h>
51968+#include <linux/grsecurity.h>
51969
51970 #include <asm/uaccess.h>
51971 #include <asm/byteorder.h>
51972@@ -4512,6 +4513,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
51973 goto done;
51974 return;
51975 }
51976+
51977+ if (gr_handle_new_usb())
51978+ goto done;
51979+
51980 if (hub_is_superspeed(hub->hdev))
51981 unit_load = 150;
51982 else
51983diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
51984index 0c8a7fc..c45b40a 100644
51985--- a/drivers/usb/core/message.c
51986+++ b/drivers/usb/core/message.c
51987@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
51988 * Return: If successful, the number of bytes transferred. Otherwise, a negative
51989 * error number.
51990 */
51991-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
51992+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
51993 __u8 requesttype, __u16 value, __u16 index, void *data,
51994 __u16 size, int timeout)
51995 {
51996@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
51997 * If successful, 0. Otherwise a negative error number. The number of actual
51998 * bytes transferred will be stored in the @actual_length parameter.
51999 */
52000-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
52001+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
52002 void *data, int len, int *actual_length, int timeout)
52003 {
52004 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
52005@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
52006 * bytes transferred will be stored in the @actual_length parameter.
52007 *
52008 */
52009-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
52010+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
52011 void *data, int len, int *actual_length, int timeout)
52012 {
52013 struct urb *urb;
52014diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
52015index 1236c60..d47a51c 100644
52016--- a/drivers/usb/core/sysfs.c
52017+++ b/drivers/usb/core/sysfs.c
52018@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
52019 struct usb_device *udev;
52020
52021 udev = to_usb_device(dev);
52022- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
52023+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
52024 }
52025 static DEVICE_ATTR_RO(urbnum);
52026
52027diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
52028index 4d11449..f4ccabf 100644
52029--- a/drivers/usb/core/usb.c
52030+++ b/drivers/usb/core/usb.c
52031@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
52032 set_dev_node(&dev->dev, dev_to_node(bus->controller));
52033 dev->state = USB_STATE_ATTACHED;
52034 dev->lpm_disable_count = 1;
52035- atomic_set(&dev->urbnum, 0);
52036+ atomic_set_unchecked(&dev->urbnum, 0);
52037
52038 INIT_LIST_HEAD(&dev->ep0.urb_list);
52039 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
52040diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
52041index 85f398d..d375bbe 100644
52042--- a/drivers/usb/dwc3/gadget.c
52043+++ b/drivers/usb/dwc3/gadget.c
52044@@ -550,8 +550,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
52045 if (!usb_endpoint_xfer_isoc(desc))
52046 return 0;
52047
52048- memset(&trb_link, 0, sizeof(trb_link));
52049-
52050 /* Link TRB for ISOC. The HWO bit is never reset */
52051 trb_st_hw = &dep->trb_pool[0];
52052
52053diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
52054index 8cfc319..4868255 100644
52055--- a/drivers/usb/early/ehci-dbgp.c
52056+++ b/drivers/usb/early/ehci-dbgp.c
52057@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
52058
52059 #ifdef CONFIG_KGDB
52060 static struct kgdb_io kgdbdbgp_io_ops;
52061-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
52062+static struct kgdb_io kgdbdbgp_io_ops_console;
52063+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
52064 #else
52065 #define dbgp_kgdb_mode (0)
52066 #endif
52067@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
52068 .write_char = kgdbdbgp_write_char,
52069 };
52070
52071+static struct kgdb_io kgdbdbgp_io_ops_console = {
52072+ .name = "kgdbdbgp",
52073+ .read_char = kgdbdbgp_read_char,
52074+ .write_char = kgdbdbgp_write_char,
52075+ .is_console = 1
52076+};
52077+
52078 static int kgdbdbgp_wait_time;
52079
52080 static int __init kgdbdbgp_parse_config(char *str)
52081@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
52082 ptr++;
52083 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
52084 }
52085- kgdb_register_io_module(&kgdbdbgp_io_ops);
52086- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
52087+ if (early_dbgp_console.index != -1)
52088+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
52089+ else
52090+ kgdb_register_io_module(&kgdbdbgp_io_ops);
52091
52092 return 0;
52093 }
52094diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c
52095index 2b4c82d..06a8ee6 100644
52096--- a/drivers/usb/gadget/f_uac1.c
52097+++ b/drivers/usb/gadget/f_uac1.c
52098@@ -13,6 +13,7 @@
52099 #include <linux/kernel.h>
52100 #include <linux/device.h>
52101 #include <linux/atomic.h>
52102+#include <linux/module.h>
52103
52104 #include "u_uac1.h"
52105
52106diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
52107index ad0aca8..8ff84865 100644
52108--- a/drivers/usb/gadget/u_serial.c
52109+++ b/drivers/usb/gadget/u_serial.c
52110@@ -733,9 +733,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
52111 spin_lock_irq(&port->port_lock);
52112
52113 /* already open? Great. */
52114- if (port->port.count) {
52115+ if (atomic_read(&port->port.count)) {
52116 status = 0;
52117- port->port.count++;
52118+ atomic_inc(&port->port.count);
52119
52120 /* currently opening/closing? wait ... */
52121 } else if (port->openclose) {
52122@@ -794,7 +794,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
52123 tty->driver_data = port;
52124 port->port.tty = tty;
52125
52126- port->port.count = 1;
52127+ atomic_set(&port->port.count, 1);
52128 port->openclose = false;
52129
52130 /* if connected, start the I/O stream */
52131@@ -836,11 +836,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
52132
52133 spin_lock_irq(&port->port_lock);
52134
52135- if (port->port.count != 1) {
52136- if (port->port.count == 0)
52137+ if (atomic_read(&port->port.count) != 1) {
52138+ if (atomic_read(&port->port.count) == 0)
52139 WARN_ON(1);
52140 else
52141- --port->port.count;
52142+ atomic_dec(&port->port.count);
52143 goto exit;
52144 }
52145
52146@@ -850,7 +850,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
52147 * and sleep if necessary
52148 */
52149 port->openclose = true;
52150- port->port.count = 0;
52151+ atomic_set(&port->port.count, 0);
52152
52153 gser = port->port_usb;
52154 if (gser && gser->disconnect)
52155@@ -1066,7 +1066,7 @@ static int gs_closed(struct gs_port *port)
52156 int cond;
52157
52158 spin_lock_irq(&port->port_lock);
52159- cond = (port->port.count == 0) && !port->openclose;
52160+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
52161 spin_unlock_irq(&port->port_lock);
52162 return cond;
52163 }
52164@@ -1209,7 +1209,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
52165 /* if it's already open, start I/O ... and notify the serial
52166 * protocol about open/close status (connect/disconnect).
52167 */
52168- if (port->port.count) {
52169+ if (atomic_read(&port->port.count)) {
52170 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
52171 gs_start_io(port);
52172 if (gser->connect)
52173@@ -1256,7 +1256,7 @@ void gserial_disconnect(struct gserial *gser)
52174
52175 port->port_usb = NULL;
52176 gser->ioport = NULL;
52177- if (port->port.count > 0 || port->openclose) {
52178+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
52179 wake_up_interruptible(&port->drain_wait);
52180 if (port->port.tty)
52181 tty_hangup(port->port.tty);
52182@@ -1272,7 +1272,7 @@ void gserial_disconnect(struct gserial *gser)
52183
52184 /* finally, free any unused/unusable I/O buffers */
52185 spin_lock_irqsave(&port->port_lock, flags);
52186- if (port->port.count == 0 && !port->openclose)
52187+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
52188 gs_buf_free(&port->port_write_buf);
52189 gs_free_requests(gser->out, &port->read_pool, NULL);
52190 gs_free_requests(gser->out, &port->read_queue, NULL);
52191diff --git a/drivers/usb/gadget/u_uac1.c b/drivers/usb/gadget/u_uac1.c
52192index 7a55fea..cc0ed4f 100644
52193--- a/drivers/usb/gadget/u_uac1.c
52194+++ b/drivers/usb/gadget/u_uac1.c
52195@@ -16,6 +16,7 @@
52196 #include <linux/ctype.h>
52197 #include <linux/random.h>
52198 #include <linux/syscalls.h>
52199+#include <linux/module.h>
52200
52201 #include "u_uac1.h"
52202
52203diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
52204index 7ae0c4d..35521b7 100644
52205--- a/drivers/usb/host/ehci-hub.c
52206+++ b/drivers/usb/host/ehci-hub.c
52207@@ -780,7 +780,7 @@ static struct urb *request_single_step_set_feature_urb(
52208 urb->transfer_flags = URB_DIR_IN;
52209 usb_get_urb(urb);
52210 atomic_inc(&urb->use_count);
52211- atomic_inc(&urb->dev->urbnum);
52212+ atomic_inc_unchecked(&urb->dev->urbnum);
52213 urb->setup_dma = dma_map_single(
52214 hcd->self.controller,
52215 urb->setup_packet,
52216@@ -847,7 +847,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
52217 urb->status = -EINPROGRESS;
52218 usb_get_urb(urb);
52219 atomic_inc(&urb->use_count);
52220- atomic_inc(&urb->dev->urbnum);
52221+ atomic_inc_unchecked(&urb->dev->urbnum);
52222 retval = submit_single_step_set_feature(hcd, urb, 0);
52223 if (!retval && !wait_for_completion_timeout(&done,
52224 msecs_to_jiffies(2000))) {
52225diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
52226index ba6a5d6..f88f7f3 100644
52227--- a/drivers/usb/misc/appledisplay.c
52228+++ b/drivers/usb/misc/appledisplay.c
52229@@ -83,7 +83,7 @@ struct appledisplay {
52230 spinlock_t lock;
52231 };
52232
52233-static atomic_t count_displays = ATOMIC_INIT(0);
52234+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
52235 static struct workqueue_struct *wq;
52236
52237 static void appledisplay_complete(struct urb *urb)
52238@@ -281,7 +281,7 @@ static int appledisplay_probe(struct usb_interface *iface,
52239
52240 /* Register backlight device */
52241 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
52242- atomic_inc_return(&count_displays) - 1);
52243+ atomic_inc_return_unchecked(&count_displays) - 1);
52244 memset(&props, 0, sizeof(struct backlight_properties));
52245 props.type = BACKLIGHT_RAW;
52246 props.max_brightness = 0xff;
52247diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
52248index 8d7fc48..01c4986 100644
52249--- a/drivers/usb/serial/console.c
52250+++ b/drivers/usb/serial/console.c
52251@@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
52252
52253 info->port = port;
52254
52255- ++port->port.count;
52256+ atomic_inc(&port->port.count);
52257 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
52258 if (serial->type->set_termios) {
52259 /*
52260@@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
52261 }
52262 /* Now that any required fake tty operations are completed restore
52263 * the tty port count */
52264- --port->port.count;
52265+ atomic_dec(&port->port.count);
52266 /* The console is special in terms of closing the device so
52267 * indicate this port is now acting as a system console. */
52268 port->port.console = 1;
52269@@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
52270 free_tty:
52271 kfree(tty);
52272 reset_open_count:
52273- port->port.count = 0;
52274+ atomic_set(&port->port.count, 0);
52275 usb_autopm_put_interface(serial->interface);
52276 error_get_interface:
52277 usb_serial_put(serial);
52278@@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
52279 static void usb_console_write(struct console *co,
52280 const char *buf, unsigned count)
52281 {
52282- static struct usbcons_info *info = &usbcons_info;
52283+ struct usbcons_info *info = &usbcons_info;
52284 struct usb_serial_port *port = info->port;
52285 struct usb_serial *serial;
52286 int retval = -ENODEV;
52287diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
52288index 307e339..6aa97cb 100644
52289--- a/drivers/usb/storage/usb.h
52290+++ b/drivers/usb/storage/usb.h
52291@@ -63,7 +63,7 @@ struct us_unusual_dev {
52292 __u8 useProtocol;
52293 __u8 useTransport;
52294 int (*initFunction)(struct us_data *);
52295-};
52296+} __do_const;
52297
52298
52299 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
52300diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
52301index f2a8d29..7bc3fe7 100644
52302--- a/drivers/usb/wusbcore/wa-hc.h
52303+++ b/drivers/usb/wusbcore/wa-hc.h
52304@@ -240,7 +240,7 @@ struct wahc {
52305 spinlock_t xfer_list_lock;
52306 struct work_struct xfer_enqueue_work;
52307 struct work_struct xfer_error_work;
52308- atomic_t xfer_id_count;
52309+ atomic_unchecked_t xfer_id_count;
52310
52311 kernel_ulong_t quirks;
52312 };
52313@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
52314 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
52315 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
52316 wa->dto_in_use = 0;
52317- atomic_set(&wa->xfer_id_count, 1);
52318+ atomic_set_unchecked(&wa->xfer_id_count, 1);
52319 /* init the buf in URBs */
52320 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
52321 usb_init_urb(&(wa->buf_in_urbs[index]));
52322diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
52323index 3e2e4ed..060c9b8 100644
52324--- a/drivers/usb/wusbcore/wa-xfer.c
52325+++ b/drivers/usb/wusbcore/wa-xfer.c
52326@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
52327 */
52328 static void wa_xfer_id_init(struct wa_xfer *xfer)
52329 {
52330- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
52331+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
52332 }
52333
52334 /* Return the xfer's ID. */
52335diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
52336index 512f479..7e041d0 100644
52337--- a/drivers/vfio/vfio.c
52338+++ b/drivers/vfio/vfio.c
52339@@ -487,7 +487,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
52340 return 0;
52341
52342 /* TODO Prevent device auto probing */
52343- WARN("Device %s added to live group %d!\n", dev_name(dev),
52344+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
52345 iommu_group_id(group->iommu_group));
52346
52347 return 0;
52348diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
52349index 5174eba..451e6bc 100644
52350--- a/drivers/vhost/vringh.c
52351+++ b/drivers/vhost/vringh.c
52352@@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
52353 /* Userspace access helpers: in this case, addresses are really userspace. */
52354 static inline int getu16_user(u16 *val, const u16 *p)
52355 {
52356- return get_user(*val, (__force u16 __user *)p);
52357+ return get_user(*val, (u16 __force_user *)p);
52358 }
52359
52360 static inline int putu16_user(u16 *p, u16 val)
52361 {
52362- return put_user(val, (__force u16 __user *)p);
52363+ return put_user(val, (u16 __force_user *)p);
52364 }
52365
52366 static inline int copydesc_user(void *dst, const void *src, size_t len)
52367 {
52368- return copy_from_user(dst, (__force void __user *)src, len) ?
52369+ return copy_from_user(dst, (void __force_user *)src, len) ?
52370 -EFAULT : 0;
52371 }
52372
52373@@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
52374 const struct vring_used_elem *src,
52375 unsigned int num)
52376 {
52377- return copy_to_user((__force void __user *)dst, src,
52378+ return copy_to_user((void __force_user *)dst, src,
52379 sizeof(*dst) * num) ? -EFAULT : 0;
52380 }
52381
52382 static inline int xfer_from_user(void *src, void *dst, size_t len)
52383 {
52384- return copy_from_user(dst, (__force void __user *)src, len) ?
52385+ return copy_from_user(dst, (void __force_user *)src, len) ?
52386 -EFAULT : 0;
52387 }
52388
52389 static inline int xfer_to_user(void *dst, void *src, size_t len)
52390 {
52391- return copy_to_user((__force void __user *)dst, src, len) ?
52392+ return copy_to_user((void __force_user *)dst, src, len) ?
52393 -EFAULT : 0;
52394 }
52395
52396@@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
52397 vrh->last_used_idx = 0;
52398 vrh->vring.num = num;
52399 /* vring expects kernel addresses, but only used via accessors. */
52400- vrh->vring.desc = (__force struct vring_desc *)desc;
52401- vrh->vring.avail = (__force struct vring_avail *)avail;
52402- vrh->vring.used = (__force struct vring_used *)used;
52403+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
52404+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
52405+ vrh->vring.used = (__force_kernel struct vring_used *)used;
52406 return 0;
52407 }
52408 EXPORT_SYMBOL(vringh_init_user);
52409@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
52410
52411 static inline int putu16_kern(u16 *p, u16 val)
52412 {
52413- ACCESS_ONCE(*p) = val;
52414+ ACCESS_ONCE_RW(*p) = val;
52415 return 0;
52416 }
52417
52418diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
52419index 84a110a..96312c3 100644
52420--- a/drivers/video/backlight/kb3886_bl.c
52421+++ b/drivers/video/backlight/kb3886_bl.c
52422@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
52423 static unsigned long kb3886bl_flags;
52424 #define KB3886BL_SUSPENDED 0x01
52425
52426-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
52427+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
52428 {
52429 .ident = "Sahara Touch-iT",
52430 .matches = {
52431diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
52432index 1b0b233..6f34c2c 100644
52433--- a/drivers/video/fbdev/arcfb.c
52434+++ b/drivers/video/fbdev/arcfb.c
52435@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
52436 return -ENOSPC;
52437
52438 err = 0;
52439- if ((count + p) > fbmemlength) {
52440+ if (count > (fbmemlength - p)) {
52441 count = fbmemlength - p;
52442 err = -ENOSPC;
52443 }
52444diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
52445index 52108be..c7c110d 100644
52446--- a/drivers/video/fbdev/aty/aty128fb.c
52447+++ b/drivers/video/fbdev/aty/aty128fb.c
52448@@ -149,7 +149,7 @@ enum {
52449 };
52450
52451 /* Must match above enum */
52452-static char * const r128_family[] = {
52453+static const char * const r128_family[] = {
52454 "AGP",
52455 "PCI",
52456 "PRO AGP",
52457diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
52458index c3d0074..0b9077e 100644
52459--- a/drivers/video/fbdev/aty/atyfb_base.c
52460+++ b/drivers/video/fbdev/aty/atyfb_base.c
52461@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
52462 par->accel_flags = var->accel_flags; /* hack */
52463
52464 if (var->accel_flags) {
52465- info->fbops->fb_sync = atyfb_sync;
52466+ pax_open_kernel();
52467+ *(void **)&info->fbops->fb_sync = atyfb_sync;
52468+ pax_close_kernel();
52469 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52470 } else {
52471- info->fbops->fb_sync = NULL;
52472+ pax_open_kernel();
52473+ *(void **)&info->fbops->fb_sync = NULL;
52474+ pax_close_kernel();
52475 info->flags |= FBINFO_HWACCEL_DISABLED;
52476 }
52477
52478diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
52479index 2fa0317..4983f2a 100644
52480--- a/drivers/video/fbdev/aty/mach64_cursor.c
52481+++ b/drivers/video/fbdev/aty/mach64_cursor.c
52482@@ -8,6 +8,7 @@
52483 #include "../core/fb_draw.h"
52484
52485 #include <asm/io.h>
52486+#include <asm/pgtable.h>
52487
52488 #ifdef __sparc__
52489 #include <asm/fbio.h>
52490@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
52491 info->sprite.buf_align = 16; /* and 64 lines tall. */
52492 info->sprite.flags = FB_PIXMAP_IO;
52493
52494- info->fbops->fb_cursor = atyfb_cursor;
52495+ pax_open_kernel();
52496+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
52497+ pax_close_kernel();
52498
52499 return 0;
52500 }
52501diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
52502index 900aa4e..6d49418 100644
52503--- a/drivers/video/fbdev/core/fb_defio.c
52504+++ b/drivers/video/fbdev/core/fb_defio.c
52505@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
52506
52507 BUG_ON(!fbdefio);
52508 mutex_init(&fbdefio->lock);
52509- info->fbops->fb_mmap = fb_deferred_io_mmap;
52510+ pax_open_kernel();
52511+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
52512+ pax_close_kernel();
52513 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
52514 INIT_LIST_HEAD(&fbdefio->pagelist);
52515 if (fbdefio->delay == 0) /* set a default of 1 s */
52516@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
52517 page->mapping = NULL;
52518 }
52519
52520- info->fbops->fb_mmap = NULL;
52521+ *(void **)&info->fbops->fb_mmap = NULL;
52522 mutex_destroy(&fbdefio->lock);
52523 }
52524 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
52525diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
52526index b6d5008..5bca7bf 100644
52527--- a/drivers/video/fbdev/core/fbmem.c
52528+++ b/drivers/video/fbdev/core/fbmem.c
52529@@ -433,7 +433,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
52530 image->dx += image->width + 8;
52531 }
52532 } else if (rotate == FB_ROTATE_UD) {
52533- for (x = 0; x < num && image->dx >= 0; x++) {
52534+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
52535 info->fbops->fb_imageblit(info, image);
52536 image->dx -= image->width + 8;
52537 }
52538@@ -445,7 +445,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
52539 image->dy += image->height + 8;
52540 }
52541 } else if (rotate == FB_ROTATE_CCW) {
52542- for (x = 0; x < num && image->dy >= 0; x++) {
52543+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
52544 info->fbops->fb_imageblit(info, image);
52545 image->dy -= image->height + 8;
52546 }
52547@@ -1179,7 +1179,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
52548 return -EFAULT;
52549 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
52550 return -EINVAL;
52551- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
52552+ if (con2fb.framebuffer >= FB_MAX)
52553 return -EINVAL;
52554 if (!registered_fb[con2fb.framebuffer])
52555 request_module("fb%d", con2fb.framebuffer);
52556@@ -1300,7 +1300,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
52557 __u32 data;
52558 int err;
52559
52560- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
52561+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
52562
52563 data = (__u32) (unsigned long) fix->smem_start;
52564 err |= put_user(data, &fix32->smem_start);
52565diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
52566index e23392e..8a77540 100644
52567--- a/drivers/video/fbdev/hyperv_fb.c
52568+++ b/drivers/video/fbdev/hyperv_fb.c
52569@@ -235,7 +235,7 @@ static uint screen_fb_size;
52570 static inline int synthvid_send(struct hv_device *hdev,
52571 struct synthvid_msg *msg)
52572 {
52573- static atomic64_t request_id = ATOMIC64_INIT(0);
52574+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
52575 int ret;
52576
52577 msg->pipe_hdr.type = PIPE_MSG_DATA;
52578@@ -243,7 +243,7 @@ static inline int synthvid_send(struct hv_device *hdev,
52579
52580 ret = vmbus_sendpacket(hdev->channel, msg,
52581 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
52582- atomic64_inc_return(&request_id),
52583+ atomic64_inc_return_unchecked(&request_id),
52584 VM_PKT_DATA_INBAND, 0);
52585
52586 if (ret)
52587diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
52588index 7672d2e..b56437f 100644
52589--- a/drivers/video/fbdev/i810/i810_accel.c
52590+++ b/drivers/video/fbdev/i810/i810_accel.c
52591@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
52592 }
52593 }
52594 printk("ringbuffer lockup!!!\n");
52595+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
52596 i810_report_error(mmio);
52597 par->dev_flags |= LOCKUP;
52598 info->pixmap.scan_align = 1;
52599diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
52600index a01147f..5d896f8 100644
52601--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
52602+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
52603@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
52604
52605 #ifdef CONFIG_FB_MATROX_MYSTIQUE
52606 struct matrox_switch matrox_mystique = {
52607- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
52608+ .preinit = MGA1064_preinit,
52609+ .reset = MGA1064_reset,
52610+ .init = MGA1064_init,
52611+ .restore = MGA1064_restore,
52612 };
52613 EXPORT_SYMBOL(matrox_mystique);
52614 #endif
52615
52616 #ifdef CONFIG_FB_MATROX_G
52617 struct matrox_switch matrox_G100 = {
52618- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
52619+ .preinit = MGAG100_preinit,
52620+ .reset = MGAG100_reset,
52621+ .init = MGAG100_init,
52622+ .restore = MGAG100_restore,
52623 };
52624 EXPORT_SYMBOL(matrox_G100);
52625 #endif
52626diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
52627index 195ad7c..09743fc 100644
52628--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
52629+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
52630@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
52631 }
52632
52633 struct matrox_switch matrox_millennium = {
52634- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
52635+ .preinit = Ti3026_preinit,
52636+ .reset = Ti3026_reset,
52637+ .init = Ti3026_init,
52638+ .restore = Ti3026_restore
52639 };
52640 EXPORT_SYMBOL(matrox_millennium);
52641 #endif
52642diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
52643index fe92eed..106e085 100644
52644--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
52645+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
52646@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
52647 struct mb862xxfb_par *par = info->par;
52648
52649 if (info->var.bits_per_pixel == 32) {
52650- info->fbops->fb_fillrect = cfb_fillrect;
52651- info->fbops->fb_copyarea = cfb_copyarea;
52652- info->fbops->fb_imageblit = cfb_imageblit;
52653+ pax_open_kernel();
52654+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52655+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52656+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52657+ pax_close_kernel();
52658 } else {
52659 outreg(disp, GC_L0EM, 3);
52660- info->fbops->fb_fillrect = mb86290fb_fillrect;
52661- info->fbops->fb_copyarea = mb86290fb_copyarea;
52662- info->fbops->fb_imageblit = mb86290fb_imageblit;
52663+ pax_open_kernel();
52664+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
52665+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
52666+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
52667+ pax_close_kernel();
52668 }
52669 outreg(draw, GDC_REG_DRAW_BASE, 0);
52670 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
52671diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
52672index def0412..fed6529 100644
52673--- a/drivers/video/fbdev/nvidia/nvidia.c
52674+++ b/drivers/video/fbdev/nvidia/nvidia.c
52675@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
52676 info->fix.line_length = (info->var.xres_virtual *
52677 info->var.bits_per_pixel) >> 3;
52678 if (info->var.accel_flags) {
52679- info->fbops->fb_imageblit = nvidiafb_imageblit;
52680- info->fbops->fb_fillrect = nvidiafb_fillrect;
52681- info->fbops->fb_copyarea = nvidiafb_copyarea;
52682- info->fbops->fb_sync = nvidiafb_sync;
52683+ pax_open_kernel();
52684+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
52685+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
52686+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
52687+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
52688+ pax_close_kernel();
52689 info->pixmap.scan_align = 4;
52690 info->flags &= ~FBINFO_HWACCEL_DISABLED;
52691 info->flags |= FBINFO_READS_FAST;
52692 NVResetGraphics(info);
52693 } else {
52694- info->fbops->fb_imageblit = cfb_imageblit;
52695- info->fbops->fb_fillrect = cfb_fillrect;
52696- info->fbops->fb_copyarea = cfb_copyarea;
52697- info->fbops->fb_sync = NULL;
52698+ pax_open_kernel();
52699+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
52700+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
52701+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
52702+ *(void **)&info->fbops->fb_sync = NULL;
52703+ pax_close_kernel();
52704 info->pixmap.scan_align = 1;
52705 info->flags |= FBINFO_HWACCEL_DISABLED;
52706 info->flags &= ~FBINFO_READS_FAST;
52707@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
52708 info->pixmap.size = 8 * 1024;
52709 info->pixmap.flags = FB_PIXMAP_SYSTEM;
52710
52711- if (!hwcur)
52712- info->fbops->fb_cursor = NULL;
52713+ if (!hwcur) {
52714+ pax_open_kernel();
52715+ *(void **)&info->fbops->fb_cursor = NULL;
52716+ pax_close_kernel();
52717+ }
52718
52719 info->var.accel_flags = (!noaccel);
52720
52721diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
52722index 2412a0d..294215b 100644
52723--- a/drivers/video/fbdev/omap2/dss/display.c
52724+++ b/drivers/video/fbdev/omap2/dss/display.c
52725@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
52726 if (dssdev->name == NULL)
52727 dssdev->name = dssdev->alias;
52728
52729+ pax_open_kernel();
52730 if (drv && drv->get_resolution == NULL)
52731- drv->get_resolution = omapdss_default_get_resolution;
52732+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
52733 if (drv && drv->get_recommended_bpp == NULL)
52734- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52735+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
52736 if (drv && drv->get_timings == NULL)
52737- drv->get_timings = omapdss_default_get_timings;
52738+ *(void **)&drv->get_timings = omapdss_default_get_timings;
52739+ pax_close_kernel();
52740
52741 mutex_lock(&panel_list_mutex);
52742 list_add_tail(&dssdev->panel_list, &panel_list);
52743diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
52744index 83433cb..71e9b98 100644
52745--- a/drivers/video/fbdev/s1d13xxxfb.c
52746+++ b/drivers/video/fbdev/s1d13xxxfb.c
52747@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
52748
52749 switch(prod_id) {
52750 case S1D13506_PROD_ID: /* activate acceleration */
52751- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52752- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52753+ pax_open_kernel();
52754+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
52755+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
52756+ pax_close_kernel();
52757 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
52758 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
52759 break;
52760diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
52761index 2bcc84a..29dd1ea 100644
52762--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
52763+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
52764@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
52765 }
52766
52767 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
52768- lcdc_sys_write_index,
52769- lcdc_sys_write_data,
52770- lcdc_sys_read_data,
52771+ .write_index = lcdc_sys_write_index,
52772+ .write_data = lcdc_sys_write_data,
52773+ .read_data = lcdc_sys_read_data,
52774 };
52775
52776 static int sh_mobile_lcdc_sginit(struct fb_info *info,
52777diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
52778index d513ed6..90b0de9 100644
52779--- a/drivers/video/fbdev/smscufx.c
52780+++ b/drivers/video/fbdev/smscufx.c
52781@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
52782 fb_deferred_io_cleanup(info);
52783 kfree(info->fbdefio);
52784 info->fbdefio = NULL;
52785- info->fbops->fb_mmap = ufx_ops_mmap;
52786+ pax_open_kernel();
52787+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
52788+ pax_close_kernel();
52789 }
52790
52791 pr_debug("released /dev/fb%d user=%d count=%d",
52792diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
52793index 77b890e..458e666 100644
52794--- a/drivers/video/fbdev/udlfb.c
52795+++ b/drivers/video/fbdev/udlfb.c
52796@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
52797 dlfb_urb_completion(urb);
52798
52799 error:
52800- atomic_add(bytes_sent, &dev->bytes_sent);
52801- atomic_add(bytes_identical, &dev->bytes_identical);
52802- atomic_add(width*height*2, &dev->bytes_rendered);
52803+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52804+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52805+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
52806 end_cycles = get_cycles();
52807- atomic_add(((unsigned int) ((end_cycles - start_cycles)
52808+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52809 >> 10)), /* Kcycles */
52810 &dev->cpu_kcycles_used);
52811
52812@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
52813 dlfb_urb_completion(urb);
52814
52815 error:
52816- atomic_add(bytes_sent, &dev->bytes_sent);
52817- atomic_add(bytes_identical, &dev->bytes_identical);
52818- atomic_add(bytes_rendered, &dev->bytes_rendered);
52819+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
52820+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
52821+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
52822 end_cycles = get_cycles();
52823- atomic_add(((unsigned int) ((end_cycles - start_cycles)
52824+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
52825 >> 10)), /* Kcycles */
52826 &dev->cpu_kcycles_used);
52827 }
52828@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
52829 fb_deferred_io_cleanup(info);
52830 kfree(info->fbdefio);
52831 info->fbdefio = NULL;
52832- info->fbops->fb_mmap = dlfb_ops_mmap;
52833+ pax_open_kernel();
52834+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
52835+ pax_close_kernel();
52836 }
52837
52838 pr_warn("released /dev/fb%d user=%d count=%d\n",
52839@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
52840 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52841 struct dlfb_data *dev = fb_info->par;
52842 return snprintf(buf, PAGE_SIZE, "%u\n",
52843- atomic_read(&dev->bytes_rendered));
52844+ atomic_read_unchecked(&dev->bytes_rendered));
52845 }
52846
52847 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
52848@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
52849 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52850 struct dlfb_data *dev = fb_info->par;
52851 return snprintf(buf, PAGE_SIZE, "%u\n",
52852- atomic_read(&dev->bytes_identical));
52853+ atomic_read_unchecked(&dev->bytes_identical));
52854 }
52855
52856 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
52857@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
52858 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52859 struct dlfb_data *dev = fb_info->par;
52860 return snprintf(buf, PAGE_SIZE, "%u\n",
52861- atomic_read(&dev->bytes_sent));
52862+ atomic_read_unchecked(&dev->bytes_sent));
52863 }
52864
52865 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
52866@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
52867 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52868 struct dlfb_data *dev = fb_info->par;
52869 return snprintf(buf, PAGE_SIZE, "%u\n",
52870- atomic_read(&dev->cpu_kcycles_used));
52871+ atomic_read_unchecked(&dev->cpu_kcycles_used));
52872 }
52873
52874 static ssize_t edid_show(
52875@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
52876 struct fb_info *fb_info = dev_get_drvdata(fbdev);
52877 struct dlfb_data *dev = fb_info->par;
52878
52879- atomic_set(&dev->bytes_rendered, 0);
52880- atomic_set(&dev->bytes_identical, 0);
52881- atomic_set(&dev->bytes_sent, 0);
52882- atomic_set(&dev->cpu_kcycles_used, 0);
52883+ atomic_set_unchecked(&dev->bytes_rendered, 0);
52884+ atomic_set_unchecked(&dev->bytes_identical, 0);
52885+ atomic_set_unchecked(&dev->bytes_sent, 0);
52886+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
52887
52888 return count;
52889 }
52890diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
52891index 509d452..7c9d2de 100644
52892--- a/drivers/video/fbdev/uvesafb.c
52893+++ b/drivers/video/fbdev/uvesafb.c
52894@@ -19,6 +19,7 @@
52895 #include <linux/io.h>
52896 #include <linux/mutex.h>
52897 #include <linux/slab.h>
52898+#include <linux/moduleloader.h>
52899 #include <video/edid.h>
52900 #include <video/uvesafb.h>
52901 #ifdef CONFIG_X86
52902@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
52903 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
52904 par->pmi_setpal = par->ypan = 0;
52905 } else {
52906+
52907+#ifdef CONFIG_PAX_KERNEXEC
52908+#ifdef CONFIG_MODULES
52909+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
52910+#endif
52911+ if (!par->pmi_code) {
52912+ par->pmi_setpal = par->ypan = 0;
52913+ return 0;
52914+ }
52915+#endif
52916+
52917 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
52918 + task->t.regs.edi);
52919+
52920+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
52921+ pax_open_kernel();
52922+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
52923+ pax_close_kernel();
52924+
52925+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
52926+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
52927+#else
52928 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
52929 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
52930+#endif
52931+
52932 printk(KERN_INFO "uvesafb: protected mode interface info at "
52933 "%04x:%04x\n",
52934 (u16)task->t.regs.es, (u16)task->t.regs.edi);
52935@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
52936 par->ypan = ypan;
52937
52938 if (par->pmi_setpal || par->ypan) {
52939+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
52940 if (__supported_pte_mask & _PAGE_NX) {
52941 par->pmi_setpal = par->ypan = 0;
52942 printk(KERN_WARNING "uvesafb: NX protection is active, "
52943 "better not use the PMI.\n");
52944- } else {
52945+ } else
52946+#endif
52947 uvesafb_vbe_getpmi(task, par);
52948- }
52949 }
52950 #else
52951 /* The protected mode interface is not available on non-x86. */
52952@@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
52953 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
52954
52955 /* Disable blanking if the user requested so. */
52956- if (!blank)
52957- info->fbops->fb_blank = NULL;
52958+ if (!blank) {
52959+ pax_open_kernel();
52960+ *(void **)&info->fbops->fb_blank = NULL;
52961+ pax_close_kernel();
52962+ }
52963
52964 /*
52965 * Find out how much IO memory is required for the mode with
52966@@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
52967 info->flags = FBINFO_FLAG_DEFAULT |
52968 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
52969
52970- if (!par->ypan)
52971- info->fbops->fb_pan_display = NULL;
52972+ if (!par->ypan) {
52973+ pax_open_kernel();
52974+ *(void **)&info->fbops->fb_pan_display = NULL;
52975+ pax_close_kernel();
52976+ }
52977 }
52978
52979 static void uvesafb_init_mtrr(struct fb_info *info)
52980@@ -1787,6 +1817,11 @@ out_mode:
52981 out:
52982 kfree(par->vbe_modes);
52983
52984+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
52985+ if (par->pmi_code)
52986+ module_free_exec(NULL, par->pmi_code);
52987+#endif
52988+
52989 framebuffer_release(info);
52990 return err;
52991 }
52992@@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
52993 kfree(par->vbe_state_orig);
52994 kfree(par->vbe_state_saved);
52995
52996+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
52997+ if (par->pmi_code)
52998+ module_free_exec(NULL, par->pmi_code);
52999+#endif
53000+
53001 framebuffer_release(info);
53002 }
53003 return 0;
53004diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
53005index 6170e7f..dd63031 100644
53006--- a/drivers/video/fbdev/vesafb.c
53007+++ b/drivers/video/fbdev/vesafb.c
53008@@ -9,6 +9,7 @@
53009 */
53010
53011 #include <linux/module.h>
53012+#include <linux/moduleloader.h>
53013 #include <linux/kernel.h>
53014 #include <linux/errno.h>
53015 #include <linux/string.h>
53016@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
53017 static int vram_total; /* Set total amount of memory */
53018 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
53019 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
53020-static void (*pmi_start)(void) __read_mostly;
53021-static void (*pmi_pal) (void) __read_mostly;
53022+static void (*pmi_start)(void) __read_only;
53023+static void (*pmi_pal) (void) __read_only;
53024 static int depth __read_mostly;
53025 static int vga_compat __read_mostly;
53026 /* --------------------------------------------------------------------- */
53027@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
53028 unsigned int size_remap;
53029 unsigned int size_total;
53030 char *option = NULL;
53031+ void *pmi_code = NULL;
53032
53033 /* ignore error return of fb_get_options */
53034 fb_get_options("vesafb", &option);
53035@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
53036 size_remap = size_total;
53037 vesafb_fix.smem_len = size_remap;
53038
53039-#ifndef __i386__
53040- screen_info.vesapm_seg = 0;
53041-#endif
53042-
53043 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
53044 printk(KERN_WARNING
53045 "vesafb: cannot reserve video memory at 0x%lx\n",
53046@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
53047 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
53048 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
53049
53050+#ifdef __i386__
53051+
53052+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53053+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
53054+ if (!pmi_code)
53055+#elif !defined(CONFIG_PAX_KERNEXEC)
53056+ if (0)
53057+#endif
53058+
53059+#endif
53060+ screen_info.vesapm_seg = 0;
53061+
53062 if (screen_info.vesapm_seg) {
53063- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
53064- screen_info.vesapm_seg,screen_info.vesapm_off);
53065+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
53066+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
53067 }
53068
53069 if (screen_info.vesapm_seg < 0xc000)
53070@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
53071
53072 if (ypan || pmi_setpal) {
53073 unsigned short *pmi_base;
53074+
53075 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
53076- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
53077- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
53078+
53079+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53080+ pax_open_kernel();
53081+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
53082+#else
53083+ pmi_code = pmi_base;
53084+#endif
53085+
53086+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
53087+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
53088+
53089+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53090+ pmi_start = ktva_ktla(pmi_start);
53091+ pmi_pal = ktva_ktla(pmi_pal);
53092+ pax_close_kernel();
53093+#endif
53094+
53095 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
53096 if (pmi_base[3]) {
53097 printk(KERN_INFO "vesafb: pmi: ports = ");
53098@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
53099 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
53100 (ypan ? FBINFO_HWACCEL_YPAN : 0);
53101
53102- if (!ypan)
53103- info->fbops->fb_pan_display = NULL;
53104+ if (!ypan) {
53105+ pax_open_kernel();
53106+ *(void **)&info->fbops->fb_pan_display = NULL;
53107+ pax_close_kernel();
53108+ }
53109
53110 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
53111 err = -ENOMEM;
53112@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
53113 fb_info(info, "%s frame buffer device\n", info->fix.id);
53114 return 0;
53115 err:
53116+
53117+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
53118+ module_free_exec(NULL, pmi_code);
53119+#endif
53120+
53121 if (info->screen_base)
53122 iounmap(info->screen_base);
53123 framebuffer_release(info);
53124diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
53125index 88714ae..16c2e11 100644
53126--- a/drivers/video/fbdev/via/via_clock.h
53127+++ b/drivers/video/fbdev/via/via_clock.h
53128@@ -56,7 +56,7 @@ struct via_clock {
53129
53130 void (*set_engine_pll_state)(u8 state);
53131 void (*set_engine_pll)(struct via_pll_config config);
53132-};
53133+} __no_const;
53134
53135
53136 static inline u32 get_pll_internal_frequency(u32 ref_freq,
53137diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
53138index 3c14e43..2630570 100644
53139--- a/drivers/video/logo/logo_linux_clut224.ppm
53140+++ b/drivers/video/logo/logo_linux_clut224.ppm
53141@@ -2,1603 +2,1123 @@ P3
53142 # Standard 224-color Linux logo
53143 80 80
53144 255
53145- 0 0 0 0 0 0 0 0 0 0 0 0
53146- 0 0 0 0 0 0 0 0 0 0 0 0
53147- 0 0 0 0 0 0 0 0 0 0 0 0
53148- 0 0 0 0 0 0 0 0 0 0 0 0
53149- 0 0 0 0 0 0 0 0 0 0 0 0
53150- 0 0 0 0 0 0 0 0 0 0 0 0
53151- 0 0 0 0 0 0 0 0 0 0 0 0
53152- 0 0 0 0 0 0 0 0 0 0 0 0
53153- 0 0 0 0 0 0 0 0 0 0 0 0
53154- 6 6 6 6 6 6 10 10 10 10 10 10
53155- 10 10 10 6 6 6 6 6 6 6 6 6
53156- 0 0 0 0 0 0 0 0 0 0 0 0
53157- 0 0 0 0 0 0 0 0 0 0 0 0
53158- 0 0 0 0 0 0 0 0 0 0 0 0
53159- 0 0 0 0 0 0 0 0 0 0 0 0
53160- 0 0 0 0 0 0 0 0 0 0 0 0
53161- 0 0 0 0 0 0 0 0 0 0 0 0
53162- 0 0 0 0 0 0 0 0 0 0 0 0
53163- 0 0 0 0 0 0 0 0 0 0 0 0
53164- 0 0 0 0 0 0 0 0 0 0 0 0
53165- 0 0 0 0 0 0 0 0 0 0 0 0
53166- 0 0 0 0 0 0 0 0 0 0 0 0
53167- 0 0 0 0 0 0 0 0 0 0 0 0
53168- 0 0 0 0 0 0 0 0 0 0 0 0
53169- 0 0 0 0 0 0 0 0 0 0 0 0
53170- 0 0 0 0 0 0 0 0 0 0 0 0
53171- 0 0 0 0 0 0 0 0 0 0 0 0
53172- 0 0 0 0 0 0 0 0 0 0 0 0
53173- 0 0 0 6 6 6 10 10 10 14 14 14
53174- 22 22 22 26 26 26 30 30 30 34 34 34
53175- 30 30 30 30 30 30 26 26 26 18 18 18
53176- 14 14 14 10 10 10 6 6 6 0 0 0
53177- 0 0 0 0 0 0 0 0 0 0 0 0
53178- 0 0 0 0 0 0 0 0 0 0 0 0
53179- 0 0 0 0 0 0 0 0 0 0 0 0
53180- 0 0 0 0 0 0 0 0 0 0 0 0
53181- 0 0 0 0 0 0 0 0 0 0 0 0
53182- 0 0 0 0 0 0 0 0 0 0 0 0
53183- 0 0 0 0 0 0 0 0 0 0 0 0
53184- 0 0 0 0 0 0 0 0 0 0 0 0
53185- 0 0 0 0 0 0 0 0 0 0 0 0
53186- 0 0 0 0 0 1 0 0 1 0 0 0
53187- 0 0 0 0 0 0 0 0 0 0 0 0
53188- 0 0 0 0 0 0 0 0 0 0 0 0
53189- 0 0 0 0 0 0 0 0 0 0 0 0
53190- 0 0 0 0 0 0 0 0 0 0 0 0
53191- 0 0 0 0 0 0 0 0 0 0 0 0
53192- 0 0 0 0 0 0 0 0 0 0 0 0
53193- 6 6 6 14 14 14 26 26 26 42 42 42
53194- 54 54 54 66 66 66 78 78 78 78 78 78
53195- 78 78 78 74 74 74 66 66 66 54 54 54
53196- 42 42 42 26 26 26 18 18 18 10 10 10
53197- 6 6 6 0 0 0 0 0 0 0 0 0
53198- 0 0 0 0 0 0 0 0 0 0 0 0
53199- 0 0 0 0 0 0 0 0 0 0 0 0
53200- 0 0 0 0 0 0 0 0 0 0 0 0
53201- 0 0 0 0 0 0 0 0 0 0 0 0
53202- 0 0 0 0 0 0 0 0 0 0 0 0
53203- 0 0 0 0 0 0 0 0 0 0 0 0
53204- 0 0 0 0 0 0 0 0 0 0 0 0
53205- 0 0 0 0 0 0 0 0 0 0 0 0
53206- 0 0 1 0 0 0 0 0 0 0 0 0
53207- 0 0 0 0 0 0 0 0 0 0 0 0
53208- 0 0 0 0 0 0 0 0 0 0 0 0
53209- 0 0 0 0 0 0 0 0 0 0 0 0
53210- 0 0 0 0 0 0 0 0 0 0 0 0
53211- 0 0 0 0 0 0 0 0 0 0 0 0
53212- 0 0 0 0 0 0 0 0 0 10 10 10
53213- 22 22 22 42 42 42 66 66 66 86 86 86
53214- 66 66 66 38 38 38 38 38 38 22 22 22
53215- 26 26 26 34 34 34 54 54 54 66 66 66
53216- 86 86 86 70 70 70 46 46 46 26 26 26
53217- 14 14 14 6 6 6 0 0 0 0 0 0
53218- 0 0 0 0 0 0 0 0 0 0 0 0
53219- 0 0 0 0 0 0 0 0 0 0 0 0
53220- 0 0 0 0 0 0 0 0 0 0 0 0
53221- 0 0 0 0 0 0 0 0 0 0 0 0
53222- 0 0 0 0 0 0 0 0 0 0 0 0
53223- 0 0 0 0 0 0 0 0 0 0 0 0
53224- 0 0 0 0 0 0 0 0 0 0 0 0
53225- 0 0 0 0 0 0 0 0 0 0 0 0
53226- 0 0 1 0 0 1 0 0 1 0 0 0
53227- 0 0 0 0 0 0 0 0 0 0 0 0
53228- 0 0 0 0 0 0 0 0 0 0 0 0
53229- 0 0 0 0 0 0 0 0 0 0 0 0
53230- 0 0 0 0 0 0 0 0 0 0 0 0
53231- 0 0 0 0 0 0 0 0 0 0 0 0
53232- 0 0 0 0 0 0 10 10 10 26 26 26
53233- 50 50 50 82 82 82 58 58 58 6 6 6
53234- 2 2 6 2 2 6 2 2 6 2 2 6
53235- 2 2 6 2 2 6 2 2 6 2 2 6
53236- 6 6 6 54 54 54 86 86 86 66 66 66
53237- 38 38 38 18 18 18 6 6 6 0 0 0
53238- 0 0 0 0 0 0 0 0 0 0 0 0
53239- 0 0 0 0 0 0 0 0 0 0 0 0
53240- 0 0 0 0 0 0 0 0 0 0 0 0
53241- 0 0 0 0 0 0 0 0 0 0 0 0
53242- 0 0 0 0 0 0 0 0 0 0 0 0
53243- 0 0 0 0 0 0 0 0 0 0 0 0
53244- 0 0 0 0 0 0 0 0 0 0 0 0
53245- 0 0 0 0 0 0 0 0 0 0 0 0
53246- 0 0 0 0 0 0 0 0 0 0 0 0
53247- 0 0 0 0 0 0 0 0 0 0 0 0
53248- 0 0 0 0 0 0 0 0 0 0 0 0
53249- 0 0 0 0 0 0 0 0 0 0 0 0
53250- 0 0 0 0 0 0 0 0 0 0 0 0
53251- 0 0 0 0 0 0 0 0 0 0 0 0
53252- 0 0 0 6 6 6 22 22 22 50 50 50
53253- 78 78 78 34 34 34 2 2 6 2 2 6
53254- 2 2 6 2 2 6 2 2 6 2 2 6
53255- 2 2 6 2 2 6 2 2 6 2 2 6
53256- 2 2 6 2 2 6 6 6 6 70 70 70
53257- 78 78 78 46 46 46 22 22 22 6 6 6
53258- 0 0 0 0 0 0 0 0 0 0 0 0
53259- 0 0 0 0 0 0 0 0 0 0 0 0
53260- 0 0 0 0 0 0 0 0 0 0 0 0
53261- 0 0 0 0 0 0 0 0 0 0 0 0
53262- 0 0 0 0 0 0 0 0 0 0 0 0
53263- 0 0 0 0 0 0 0 0 0 0 0 0
53264- 0 0 0 0 0 0 0 0 0 0 0 0
53265- 0 0 0 0 0 0 0 0 0 0 0 0
53266- 0 0 1 0 0 1 0 0 1 0 0 0
53267- 0 0 0 0 0 0 0 0 0 0 0 0
53268- 0 0 0 0 0 0 0 0 0 0 0 0
53269- 0 0 0 0 0 0 0 0 0 0 0 0
53270- 0 0 0 0 0 0 0 0 0 0 0 0
53271- 0 0 0 0 0 0 0 0 0 0 0 0
53272- 6 6 6 18 18 18 42 42 42 82 82 82
53273- 26 26 26 2 2 6 2 2 6 2 2 6
53274- 2 2 6 2 2 6 2 2 6 2 2 6
53275- 2 2 6 2 2 6 2 2 6 14 14 14
53276- 46 46 46 34 34 34 6 6 6 2 2 6
53277- 42 42 42 78 78 78 42 42 42 18 18 18
53278- 6 6 6 0 0 0 0 0 0 0 0 0
53279- 0 0 0 0 0 0 0 0 0 0 0 0
53280- 0 0 0 0 0 0 0 0 0 0 0 0
53281- 0 0 0 0 0 0 0 0 0 0 0 0
53282- 0 0 0 0 0 0 0 0 0 0 0 0
53283- 0 0 0 0 0 0 0 0 0 0 0 0
53284- 0 0 0 0 0 0 0 0 0 0 0 0
53285- 0 0 0 0 0 0 0 0 0 0 0 0
53286- 0 0 1 0 0 0 0 0 1 0 0 0
53287- 0 0 0 0 0 0 0 0 0 0 0 0
53288- 0 0 0 0 0 0 0 0 0 0 0 0
53289- 0 0 0 0 0 0 0 0 0 0 0 0
53290- 0 0 0 0 0 0 0 0 0 0 0 0
53291- 0 0 0 0 0 0 0 0 0 0 0 0
53292- 10 10 10 30 30 30 66 66 66 58 58 58
53293- 2 2 6 2 2 6 2 2 6 2 2 6
53294- 2 2 6 2 2 6 2 2 6 2 2 6
53295- 2 2 6 2 2 6 2 2 6 26 26 26
53296- 86 86 86 101 101 101 46 46 46 10 10 10
53297- 2 2 6 58 58 58 70 70 70 34 34 34
53298- 10 10 10 0 0 0 0 0 0 0 0 0
53299- 0 0 0 0 0 0 0 0 0 0 0 0
53300- 0 0 0 0 0 0 0 0 0 0 0 0
53301- 0 0 0 0 0 0 0 0 0 0 0 0
53302- 0 0 0 0 0 0 0 0 0 0 0 0
53303- 0 0 0 0 0 0 0 0 0 0 0 0
53304- 0 0 0 0 0 0 0 0 0 0 0 0
53305- 0 0 0 0 0 0 0 0 0 0 0 0
53306- 0 0 1 0 0 1 0 0 1 0 0 0
53307- 0 0 0 0 0 0 0 0 0 0 0 0
53308- 0 0 0 0 0 0 0 0 0 0 0 0
53309- 0 0 0 0 0 0 0 0 0 0 0 0
53310- 0 0 0 0 0 0 0 0 0 0 0 0
53311- 0 0 0 0 0 0 0 0 0 0 0 0
53312- 14 14 14 42 42 42 86 86 86 10 10 10
53313- 2 2 6 2 2 6 2 2 6 2 2 6
53314- 2 2 6 2 2 6 2 2 6 2 2 6
53315- 2 2 6 2 2 6 2 2 6 30 30 30
53316- 94 94 94 94 94 94 58 58 58 26 26 26
53317- 2 2 6 6 6 6 78 78 78 54 54 54
53318- 22 22 22 6 6 6 0 0 0 0 0 0
53319- 0 0 0 0 0 0 0 0 0 0 0 0
53320- 0 0 0 0 0 0 0 0 0 0 0 0
53321- 0 0 0 0 0 0 0 0 0 0 0 0
53322- 0 0 0 0 0 0 0 0 0 0 0 0
53323- 0 0 0 0 0 0 0 0 0 0 0 0
53324- 0 0 0 0 0 0 0 0 0 0 0 0
53325- 0 0 0 0 0 0 0 0 0 0 0 0
53326- 0 0 0 0 0 0 0 0 0 0 0 0
53327- 0 0 0 0 0 0 0 0 0 0 0 0
53328- 0 0 0 0 0 0 0 0 0 0 0 0
53329- 0 0 0 0 0 0 0 0 0 0 0 0
53330- 0 0 0 0 0 0 0 0 0 0 0 0
53331- 0 0 0 0 0 0 0 0 0 6 6 6
53332- 22 22 22 62 62 62 62 62 62 2 2 6
53333- 2 2 6 2 2 6 2 2 6 2 2 6
53334- 2 2 6 2 2 6 2 2 6 2 2 6
53335- 2 2 6 2 2 6 2 2 6 26 26 26
53336- 54 54 54 38 38 38 18 18 18 10 10 10
53337- 2 2 6 2 2 6 34 34 34 82 82 82
53338- 38 38 38 14 14 14 0 0 0 0 0 0
53339- 0 0 0 0 0 0 0 0 0 0 0 0
53340- 0 0 0 0 0 0 0 0 0 0 0 0
53341- 0 0 0 0 0 0 0 0 0 0 0 0
53342- 0 0 0 0 0 0 0 0 0 0 0 0
53343- 0 0 0 0 0 0 0 0 0 0 0 0
53344- 0 0 0 0 0 0 0 0 0 0 0 0
53345- 0 0 0 0 0 0 0 0 0 0 0 0
53346- 0 0 0 0 0 1 0 0 1 0 0 0
53347- 0 0 0 0 0 0 0 0 0 0 0 0
53348- 0 0 0 0 0 0 0 0 0 0 0 0
53349- 0 0 0 0 0 0 0 0 0 0 0 0
53350- 0 0 0 0 0 0 0 0 0 0 0 0
53351- 0 0 0 0 0 0 0 0 0 6 6 6
53352- 30 30 30 78 78 78 30 30 30 2 2 6
53353- 2 2 6 2 2 6 2 2 6 2 2 6
53354- 2 2 6 2 2 6 2 2 6 2 2 6
53355- 2 2 6 2 2 6 2 2 6 10 10 10
53356- 10 10 10 2 2 6 2 2 6 2 2 6
53357- 2 2 6 2 2 6 2 2 6 78 78 78
53358- 50 50 50 18 18 18 6 6 6 0 0 0
53359- 0 0 0 0 0 0 0 0 0 0 0 0
53360- 0 0 0 0 0 0 0 0 0 0 0 0
53361- 0 0 0 0 0 0 0 0 0 0 0 0
53362- 0 0 0 0 0 0 0 0 0 0 0 0
53363- 0 0 0 0 0 0 0 0 0 0 0 0
53364- 0 0 0 0 0 0 0 0 0 0 0 0
53365- 0 0 0 0 0 0 0 0 0 0 0 0
53366- 0 0 1 0 0 0 0 0 0 0 0 0
53367- 0 0 0 0 0 0 0 0 0 0 0 0
53368- 0 0 0 0 0 0 0 0 0 0 0 0
53369- 0 0 0 0 0 0 0 0 0 0 0 0
53370- 0 0 0 0 0 0 0 0 0 0 0 0
53371- 0 0 0 0 0 0 0 0 0 10 10 10
53372- 38 38 38 86 86 86 14 14 14 2 2 6
53373- 2 2 6 2 2 6 2 2 6 2 2 6
53374- 2 2 6 2 2 6 2 2 6 2 2 6
53375- 2 2 6 2 2 6 2 2 6 2 2 6
53376- 2 2 6 2 2 6 2 2 6 2 2 6
53377- 2 2 6 2 2 6 2 2 6 54 54 54
53378- 66 66 66 26 26 26 6 6 6 0 0 0
53379- 0 0 0 0 0 0 0 0 0 0 0 0
53380- 0 0 0 0 0 0 0 0 0 0 0 0
53381- 0 0 0 0 0 0 0 0 0 0 0 0
53382- 0 0 0 0 0 0 0 0 0 0 0 0
53383- 0 0 0 0 0 0 0 0 0 0 0 0
53384- 0 0 0 0 0 0 0 0 0 0 0 0
53385- 0 0 0 0 0 0 0 0 0 0 0 0
53386- 0 0 0 0 0 1 0 0 1 0 0 0
53387- 0 0 0 0 0 0 0 0 0 0 0 0
53388- 0 0 0 0 0 0 0 0 0 0 0 0
53389- 0 0 0 0 0 0 0 0 0 0 0 0
53390- 0 0 0 0 0 0 0 0 0 0 0 0
53391- 0 0 0 0 0 0 0 0 0 14 14 14
53392- 42 42 42 82 82 82 2 2 6 2 2 6
53393- 2 2 6 6 6 6 10 10 10 2 2 6
53394- 2 2 6 2 2 6 2 2 6 2 2 6
53395- 2 2 6 2 2 6 2 2 6 6 6 6
53396- 14 14 14 10 10 10 2 2 6 2 2 6
53397- 2 2 6 2 2 6 2 2 6 18 18 18
53398- 82 82 82 34 34 34 10 10 10 0 0 0
53399- 0 0 0 0 0 0 0 0 0 0 0 0
53400- 0 0 0 0 0 0 0 0 0 0 0 0
53401- 0 0 0 0 0 0 0 0 0 0 0 0
53402- 0 0 0 0 0 0 0 0 0 0 0 0
53403- 0 0 0 0 0 0 0 0 0 0 0 0
53404- 0 0 0 0 0 0 0 0 0 0 0 0
53405- 0 0 0 0 0 0 0 0 0 0 0 0
53406- 0 0 1 0 0 0 0 0 0 0 0 0
53407- 0 0 0 0 0 0 0 0 0 0 0 0
53408- 0 0 0 0 0 0 0 0 0 0 0 0
53409- 0 0 0 0 0 0 0 0 0 0 0 0
53410- 0 0 0 0 0 0 0 0 0 0 0 0
53411- 0 0 0 0 0 0 0 0 0 14 14 14
53412- 46 46 46 86 86 86 2 2 6 2 2 6
53413- 6 6 6 6 6 6 22 22 22 34 34 34
53414- 6 6 6 2 2 6 2 2 6 2 2 6
53415- 2 2 6 2 2 6 18 18 18 34 34 34
53416- 10 10 10 50 50 50 22 22 22 2 2 6
53417- 2 2 6 2 2 6 2 2 6 10 10 10
53418- 86 86 86 42 42 42 14 14 14 0 0 0
53419- 0 0 0 0 0 0 0 0 0 0 0 0
53420- 0 0 0 0 0 0 0 0 0 0 0 0
53421- 0 0 0 0 0 0 0 0 0 0 0 0
53422- 0 0 0 0 0 0 0 0 0 0 0 0
53423- 0 0 0 0 0 0 0 0 0 0 0 0
53424- 0 0 0 0 0 0 0 0 0 0 0 0
53425- 0 0 0 0 0 0 0 0 0 0 0 0
53426- 0 0 1 0 0 1 0 0 1 0 0 0
53427- 0 0 0 0 0 0 0 0 0 0 0 0
53428- 0 0 0 0 0 0 0 0 0 0 0 0
53429- 0 0 0 0 0 0 0 0 0 0 0 0
53430- 0 0 0 0 0 0 0 0 0 0 0 0
53431- 0 0 0 0 0 0 0 0 0 14 14 14
53432- 46 46 46 86 86 86 2 2 6 2 2 6
53433- 38 38 38 116 116 116 94 94 94 22 22 22
53434- 22 22 22 2 2 6 2 2 6 2 2 6
53435- 14 14 14 86 86 86 138 138 138 162 162 162
53436-154 154 154 38 38 38 26 26 26 6 6 6
53437- 2 2 6 2 2 6 2 2 6 2 2 6
53438- 86 86 86 46 46 46 14 14 14 0 0 0
53439- 0 0 0 0 0 0 0 0 0 0 0 0
53440- 0 0 0 0 0 0 0 0 0 0 0 0
53441- 0 0 0 0 0 0 0 0 0 0 0 0
53442- 0 0 0 0 0 0 0 0 0 0 0 0
53443- 0 0 0 0 0 0 0 0 0 0 0 0
53444- 0 0 0 0 0 0 0 0 0 0 0 0
53445- 0 0 0 0 0 0 0 0 0 0 0 0
53446- 0 0 0 0 0 0 0 0 0 0 0 0
53447- 0 0 0 0 0 0 0 0 0 0 0 0
53448- 0 0 0 0 0 0 0 0 0 0 0 0
53449- 0 0 0 0 0 0 0 0 0 0 0 0
53450- 0 0 0 0 0 0 0 0 0 0 0 0
53451- 0 0 0 0 0 0 0 0 0 14 14 14
53452- 46 46 46 86 86 86 2 2 6 14 14 14
53453-134 134 134 198 198 198 195 195 195 116 116 116
53454- 10 10 10 2 2 6 2 2 6 6 6 6
53455-101 98 89 187 187 187 210 210 210 218 218 218
53456-214 214 214 134 134 134 14 14 14 6 6 6
53457- 2 2 6 2 2 6 2 2 6 2 2 6
53458- 86 86 86 50 50 50 18 18 18 6 6 6
53459- 0 0 0 0 0 0 0 0 0 0 0 0
53460- 0 0 0 0 0 0 0 0 0 0 0 0
53461- 0 0 0 0 0 0 0 0 0 0 0 0
53462- 0 0 0 0 0 0 0 0 0 0 0 0
53463- 0 0 0 0 0 0 0 0 0 0 0 0
53464- 0 0 0 0 0 0 0 0 0 0 0 0
53465- 0 0 0 0 0 0 0 0 1 0 0 0
53466- 0 0 1 0 0 1 0 0 1 0 0 0
53467- 0 0 0 0 0 0 0 0 0 0 0 0
53468- 0 0 0 0 0 0 0 0 0 0 0 0
53469- 0 0 0 0 0 0 0 0 0 0 0 0
53470- 0 0 0 0 0 0 0 0 0 0 0 0
53471- 0 0 0 0 0 0 0 0 0 14 14 14
53472- 46 46 46 86 86 86 2 2 6 54 54 54
53473-218 218 218 195 195 195 226 226 226 246 246 246
53474- 58 58 58 2 2 6 2 2 6 30 30 30
53475-210 210 210 253 253 253 174 174 174 123 123 123
53476-221 221 221 234 234 234 74 74 74 2 2 6
53477- 2 2 6 2 2 6 2 2 6 2 2 6
53478- 70 70 70 58 58 58 22 22 22 6 6 6
53479- 0 0 0 0 0 0 0 0 0 0 0 0
53480- 0 0 0 0 0 0 0 0 0 0 0 0
53481- 0 0 0 0 0 0 0 0 0 0 0 0
53482- 0 0 0 0 0 0 0 0 0 0 0 0
53483- 0 0 0 0 0 0 0 0 0 0 0 0
53484- 0 0 0 0 0 0 0 0 0 0 0 0
53485- 0 0 0 0 0 0 0 0 0 0 0 0
53486- 0 0 0 0 0 0 0 0 0 0 0 0
53487- 0 0 0 0 0 0 0 0 0 0 0 0
53488- 0 0 0 0 0 0 0 0 0 0 0 0
53489- 0 0 0 0 0 0 0 0 0 0 0 0
53490- 0 0 0 0 0 0 0 0 0 0 0 0
53491- 0 0 0 0 0 0 0 0 0 14 14 14
53492- 46 46 46 82 82 82 2 2 6 106 106 106
53493-170 170 170 26 26 26 86 86 86 226 226 226
53494-123 123 123 10 10 10 14 14 14 46 46 46
53495-231 231 231 190 190 190 6 6 6 70 70 70
53496- 90 90 90 238 238 238 158 158 158 2 2 6
53497- 2 2 6 2 2 6 2 2 6 2 2 6
53498- 70 70 70 58 58 58 22 22 22 6 6 6
53499- 0 0 0 0 0 0 0 0 0 0 0 0
53500- 0 0 0 0 0 0 0 0 0 0 0 0
53501- 0 0 0 0 0 0 0 0 0 0 0 0
53502- 0 0 0 0 0 0 0 0 0 0 0 0
53503- 0 0 0 0 0 0 0 0 0 0 0 0
53504- 0 0 0 0 0 0 0 0 0 0 0 0
53505- 0 0 0 0 0 0 0 0 1 0 0 0
53506- 0 0 1 0 0 1 0 0 1 0 0 0
53507- 0 0 0 0 0 0 0 0 0 0 0 0
53508- 0 0 0 0 0 0 0 0 0 0 0 0
53509- 0 0 0 0 0 0 0 0 0 0 0 0
53510- 0 0 0 0 0 0 0 0 0 0 0 0
53511- 0 0 0 0 0 0 0 0 0 14 14 14
53512- 42 42 42 86 86 86 6 6 6 116 116 116
53513-106 106 106 6 6 6 70 70 70 149 149 149
53514-128 128 128 18 18 18 38 38 38 54 54 54
53515-221 221 221 106 106 106 2 2 6 14 14 14
53516- 46 46 46 190 190 190 198 198 198 2 2 6
53517- 2 2 6 2 2 6 2 2 6 2 2 6
53518- 74 74 74 62 62 62 22 22 22 6 6 6
53519- 0 0 0 0 0 0 0 0 0 0 0 0
53520- 0 0 0 0 0 0 0 0 0 0 0 0
53521- 0 0 0 0 0 0 0 0 0 0 0 0
53522- 0 0 0 0 0 0 0 0 0 0 0 0
53523- 0 0 0 0 0 0 0 0 0 0 0 0
53524- 0 0 0 0 0 0 0 0 0 0 0 0
53525- 0 0 0 0 0 0 0 0 1 0 0 0
53526- 0 0 1 0 0 0 0 0 1 0 0 0
53527- 0 0 0 0 0 0 0 0 0 0 0 0
53528- 0 0 0 0 0 0 0 0 0 0 0 0
53529- 0 0 0 0 0 0 0 0 0 0 0 0
53530- 0 0 0 0 0 0 0 0 0 0 0 0
53531- 0 0 0 0 0 0 0 0 0 14 14 14
53532- 42 42 42 94 94 94 14 14 14 101 101 101
53533-128 128 128 2 2 6 18 18 18 116 116 116
53534-118 98 46 121 92 8 121 92 8 98 78 10
53535-162 162 162 106 106 106 2 2 6 2 2 6
53536- 2 2 6 195 195 195 195 195 195 6 6 6
53537- 2 2 6 2 2 6 2 2 6 2 2 6
53538- 74 74 74 62 62 62 22 22 22 6 6 6
53539- 0 0 0 0 0 0 0 0 0 0 0 0
53540- 0 0 0 0 0 0 0 0 0 0 0 0
53541- 0 0 0 0 0 0 0 0 0 0 0 0
53542- 0 0 0 0 0 0 0 0 0 0 0 0
53543- 0 0 0 0 0 0 0 0 0 0 0 0
53544- 0 0 0 0 0 0 0 0 0 0 0 0
53545- 0 0 0 0 0 0 0 0 1 0 0 1
53546- 0 0 1 0 0 0 0 0 1 0 0 0
53547- 0 0 0 0 0 0 0 0 0 0 0 0
53548- 0 0 0 0 0 0 0 0 0 0 0 0
53549- 0 0 0 0 0 0 0 0 0 0 0 0
53550- 0 0 0 0 0 0 0 0 0 0 0 0
53551- 0 0 0 0 0 0 0 0 0 10 10 10
53552- 38 38 38 90 90 90 14 14 14 58 58 58
53553-210 210 210 26 26 26 54 38 6 154 114 10
53554-226 170 11 236 186 11 225 175 15 184 144 12
53555-215 174 15 175 146 61 37 26 9 2 2 6
53556- 70 70 70 246 246 246 138 138 138 2 2 6
53557- 2 2 6 2 2 6 2 2 6 2 2 6
53558- 70 70 70 66 66 66 26 26 26 6 6 6
53559- 0 0 0 0 0 0 0 0 0 0 0 0
53560- 0 0 0 0 0 0 0 0 0 0 0 0
53561- 0 0 0 0 0 0 0 0 0 0 0 0
53562- 0 0 0 0 0 0 0 0 0 0 0 0
53563- 0 0 0 0 0 0 0 0 0 0 0 0
53564- 0 0 0 0 0 0 0 0 0 0 0 0
53565- 0 0 0 0 0 0 0 0 0 0 0 0
53566- 0 0 0 0 0 0 0 0 0 0 0 0
53567- 0 0 0 0 0 0 0 0 0 0 0 0
53568- 0 0 0 0 0 0 0 0 0 0 0 0
53569- 0 0 0 0 0 0 0 0 0 0 0 0
53570- 0 0 0 0 0 0 0 0 0 0 0 0
53571- 0 0 0 0 0 0 0 0 0 10 10 10
53572- 38 38 38 86 86 86 14 14 14 10 10 10
53573-195 195 195 188 164 115 192 133 9 225 175 15
53574-239 182 13 234 190 10 232 195 16 232 200 30
53575-245 207 45 241 208 19 232 195 16 184 144 12
53576-218 194 134 211 206 186 42 42 42 2 2 6
53577- 2 2 6 2 2 6 2 2 6 2 2 6
53578- 50 50 50 74 74 74 30 30 30 6 6 6
53579- 0 0 0 0 0 0 0 0 0 0 0 0
53580- 0 0 0 0 0 0 0 0 0 0 0 0
53581- 0 0 0 0 0 0 0 0 0 0 0 0
53582- 0 0 0 0 0 0 0 0 0 0 0 0
53583- 0 0 0 0 0 0 0 0 0 0 0 0
53584- 0 0 0 0 0 0 0 0 0 0 0 0
53585- 0 0 0 0 0 0 0 0 0 0 0 0
53586- 0 0 0 0 0 0 0 0 0 0 0 0
53587- 0 0 0 0 0 0 0 0 0 0 0 0
53588- 0 0 0 0 0 0 0 0 0 0 0 0
53589- 0 0 0 0 0 0 0 0 0 0 0 0
53590- 0 0 0 0 0 0 0 0 0 0 0 0
53591- 0 0 0 0 0 0 0 0 0 10 10 10
53592- 34 34 34 86 86 86 14 14 14 2 2 6
53593-121 87 25 192 133 9 219 162 10 239 182 13
53594-236 186 11 232 195 16 241 208 19 244 214 54
53595-246 218 60 246 218 38 246 215 20 241 208 19
53596-241 208 19 226 184 13 121 87 25 2 2 6
53597- 2 2 6 2 2 6 2 2 6 2 2 6
53598- 50 50 50 82 82 82 34 34 34 10 10 10
53599- 0 0 0 0 0 0 0 0 0 0 0 0
53600- 0 0 0 0 0 0 0 0 0 0 0 0
53601- 0 0 0 0 0 0 0 0 0 0 0 0
53602- 0 0 0 0 0 0 0 0 0 0 0 0
53603- 0 0 0 0 0 0 0 0 0 0 0 0
53604- 0 0 0 0 0 0 0 0 0 0 0 0
53605- 0 0 0 0 0 0 0 0 0 0 0 0
53606- 0 0 0 0 0 0 0 0 0 0 0 0
53607- 0 0 0 0 0 0 0 0 0 0 0 0
53608- 0 0 0 0 0 0 0 0 0 0 0 0
53609- 0 0 0 0 0 0 0 0 0 0 0 0
53610- 0 0 0 0 0 0 0 0 0 0 0 0
53611- 0 0 0 0 0 0 0 0 0 10 10 10
53612- 34 34 34 82 82 82 30 30 30 61 42 6
53613-180 123 7 206 145 10 230 174 11 239 182 13
53614-234 190 10 238 202 15 241 208 19 246 218 74
53615-246 218 38 246 215 20 246 215 20 246 215 20
53616-226 184 13 215 174 15 184 144 12 6 6 6
53617- 2 2 6 2 2 6 2 2 6 2 2 6
53618- 26 26 26 94 94 94 42 42 42 14 14 14
53619- 0 0 0 0 0 0 0 0 0 0 0 0
53620- 0 0 0 0 0 0 0 0 0 0 0 0
53621- 0 0 0 0 0 0 0 0 0 0 0 0
53622- 0 0 0 0 0 0 0 0 0 0 0 0
53623- 0 0 0 0 0 0 0 0 0 0 0 0
53624- 0 0 0 0 0 0 0 0 0 0 0 0
53625- 0 0 0 0 0 0 0 0 0 0 0 0
53626- 0 0 0 0 0 0 0 0 0 0 0 0
53627- 0 0 0 0 0 0 0 0 0 0 0 0
53628- 0 0 0 0 0 0 0 0 0 0 0 0
53629- 0 0 0 0 0 0 0 0 0 0 0 0
53630- 0 0 0 0 0 0 0 0 0 0 0 0
53631- 0 0 0 0 0 0 0 0 0 10 10 10
53632- 30 30 30 78 78 78 50 50 50 104 69 6
53633-192 133 9 216 158 10 236 178 12 236 186 11
53634-232 195 16 241 208 19 244 214 54 245 215 43
53635-246 215 20 246 215 20 241 208 19 198 155 10
53636-200 144 11 216 158 10 156 118 10 2 2 6
53637- 2 2 6 2 2 6 2 2 6 2 2 6
53638- 6 6 6 90 90 90 54 54 54 18 18 18
53639- 6 6 6 0 0 0 0 0 0 0 0 0
53640- 0 0 0 0 0 0 0 0 0 0 0 0
53641- 0 0 0 0 0 0 0 0 0 0 0 0
53642- 0 0 0 0 0 0 0 0 0 0 0 0
53643- 0 0 0 0 0 0 0 0 0 0 0 0
53644- 0 0 0 0 0 0 0 0 0 0 0 0
53645- 0 0 0 0 0 0 0 0 0 0 0 0
53646- 0 0 0 0 0 0 0 0 0 0 0 0
53647- 0 0 0 0 0 0 0 0 0 0 0 0
53648- 0 0 0 0 0 0 0 0 0 0 0 0
53649- 0 0 0 0 0 0 0 0 0 0 0 0
53650- 0 0 0 0 0 0 0 0 0 0 0 0
53651- 0 0 0 0 0 0 0 0 0 10 10 10
53652- 30 30 30 78 78 78 46 46 46 22 22 22
53653-137 92 6 210 162 10 239 182 13 238 190 10
53654-238 202 15 241 208 19 246 215 20 246 215 20
53655-241 208 19 203 166 17 185 133 11 210 150 10
53656-216 158 10 210 150 10 102 78 10 2 2 6
53657- 6 6 6 54 54 54 14 14 14 2 2 6
53658- 2 2 6 62 62 62 74 74 74 30 30 30
53659- 10 10 10 0 0 0 0 0 0 0 0 0
53660- 0 0 0 0 0 0 0 0 0 0 0 0
53661- 0 0 0 0 0 0 0 0 0 0 0 0
53662- 0 0 0 0 0 0 0 0 0 0 0 0
53663- 0 0 0 0 0 0 0 0 0 0 0 0
53664- 0 0 0 0 0 0 0 0 0 0 0 0
53665- 0 0 0 0 0 0 0 0 0 0 0 0
53666- 0 0 0 0 0 0 0 0 0 0 0 0
53667- 0 0 0 0 0 0 0 0 0 0 0 0
53668- 0 0 0 0 0 0 0 0 0 0 0 0
53669- 0 0 0 0 0 0 0 0 0 0 0 0
53670- 0 0 0 0 0 0 0 0 0 0 0 0
53671- 0 0 0 0 0 0 0 0 0 10 10 10
53672- 34 34 34 78 78 78 50 50 50 6 6 6
53673- 94 70 30 139 102 15 190 146 13 226 184 13
53674-232 200 30 232 195 16 215 174 15 190 146 13
53675-168 122 10 192 133 9 210 150 10 213 154 11
53676-202 150 34 182 157 106 101 98 89 2 2 6
53677- 2 2 6 78 78 78 116 116 116 58 58 58
53678- 2 2 6 22 22 22 90 90 90 46 46 46
53679- 18 18 18 6 6 6 0 0 0 0 0 0
53680- 0 0 0 0 0 0 0 0 0 0 0 0
53681- 0 0 0 0 0 0 0 0 0 0 0 0
53682- 0 0 0 0 0 0 0 0 0 0 0 0
53683- 0 0 0 0 0 0 0 0 0 0 0 0
53684- 0 0 0 0 0 0 0 0 0 0 0 0
53685- 0 0 0 0 0 0 0 0 0 0 0 0
53686- 0 0 0 0 0 0 0 0 0 0 0 0
53687- 0 0 0 0 0 0 0 0 0 0 0 0
53688- 0 0 0 0 0 0 0 0 0 0 0 0
53689- 0 0 0 0 0 0 0 0 0 0 0 0
53690- 0 0 0 0 0 0 0 0 0 0 0 0
53691- 0 0 0 0 0 0 0 0 0 10 10 10
53692- 38 38 38 86 86 86 50 50 50 6 6 6
53693-128 128 128 174 154 114 156 107 11 168 122 10
53694-198 155 10 184 144 12 197 138 11 200 144 11
53695-206 145 10 206 145 10 197 138 11 188 164 115
53696-195 195 195 198 198 198 174 174 174 14 14 14
53697- 2 2 6 22 22 22 116 116 116 116 116 116
53698- 22 22 22 2 2 6 74 74 74 70 70 70
53699- 30 30 30 10 10 10 0 0 0 0 0 0
53700- 0 0 0 0 0 0 0 0 0 0 0 0
53701- 0 0 0 0 0 0 0 0 0 0 0 0
53702- 0 0 0 0 0 0 0 0 0 0 0 0
53703- 0 0 0 0 0 0 0 0 0 0 0 0
53704- 0 0 0 0 0 0 0 0 0 0 0 0
53705- 0 0 0 0 0 0 0 0 0 0 0 0
53706- 0 0 0 0 0 0 0 0 0 0 0 0
53707- 0 0 0 0 0 0 0 0 0 0 0 0
53708- 0 0 0 0 0 0 0 0 0 0 0 0
53709- 0 0 0 0 0 0 0 0 0 0 0 0
53710- 0 0 0 0 0 0 0 0 0 0 0 0
53711- 0 0 0 0 0 0 6 6 6 18 18 18
53712- 50 50 50 101 101 101 26 26 26 10 10 10
53713-138 138 138 190 190 190 174 154 114 156 107 11
53714-197 138 11 200 144 11 197 138 11 192 133 9
53715-180 123 7 190 142 34 190 178 144 187 187 187
53716-202 202 202 221 221 221 214 214 214 66 66 66
53717- 2 2 6 2 2 6 50 50 50 62 62 62
53718- 6 6 6 2 2 6 10 10 10 90 90 90
53719- 50 50 50 18 18 18 6 6 6 0 0 0
53720- 0 0 0 0 0 0 0 0 0 0 0 0
53721- 0 0 0 0 0 0 0 0 0 0 0 0
53722- 0 0 0 0 0 0 0 0 0 0 0 0
53723- 0 0 0 0 0 0 0 0 0 0 0 0
53724- 0 0 0 0 0 0 0 0 0 0 0 0
53725- 0 0 0 0 0 0 0 0 0 0 0 0
53726- 0 0 0 0 0 0 0 0 0 0 0 0
53727- 0 0 0 0 0 0 0 0 0 0 0 0
53728- 0 0 0 0 0 0 0 0 0 0 0 0
53729- 0 0 0 0 0 0 0 0 0 0 0 0
53730- 0 0 0 0 0 0 0 0 0 0 0 0
53731- 0 0 0 0 0 0 10 10 10 34 34 34
53732- 74 74 74 74 74 74 2 2 6 6 6 6
53733-144 144 144 198 198 198 190 190 190 178 166 146
53734-154 121 60 156 107 11 156 107 11 168 124 44
53735-174 154 114 187 187 187 190 190 190 210 210 210
53736-246 246 246 253 253 253 253 253 253 182 182 182
53737- 6 6 6 2 2 6 2 2 6 2 2 6
53738- 2 2 6 2 2 6 2 2 6 62 62 62
53739- 74 74 74 34 34 34 14 14 14 0 0 0
53740- 0 0 0 0 0 0 0 0 0 0 0 0
53741- 0 0 0 0 0 0 0 0 0 0 0 0
53742- 0 0 0 0 0 0 0 0 0 0 0 0
53743- 0 0 0 0 0 0 0 0 0 0 0 0
53744- 0 0 0 0 0 0 0 0 0 0 0 0
53745- 0 0 0 0 0 0 0 0 0 0 0 0
53746- 0 0 0 0 0 0 0 0 0 0 0 0
53747- 0 0 0 0 0 0 0 0 0 0 0 0
53748- 0 0 0 0 0 0 0 0 0 0 0 0
53749- 0 0 0 0 0 0 0 0 0 0 0 0
53750- 0 0 0 0 0 0 0 0 0 0 0 0
53751- 0 0 0 10 10 10 22 22 22 54 54 54
53752- 94 94 94 18 18 18 2 2 6 46 46 46
53753-234 234 234 221 221 221 190 190 190 190 190 190
53754-190 190 190 187 187 187 187 187 187 190 190 190
53755-190 190 190 195 195 195 214 214 214 242 242 242
53756-253 253 253 253 253 253 253 253 253 253 253 253
53757- 82 82 82 2 2 6 2 2 6 2 2 6
53758- 2 2 6 2 2 6 2 2 6 14 14 14
53759- 86 86 86 54 54 54 22 22 22 6 6 6
53760- 0 0 0 0 0 0 0 0 0 0 0 0
53761- 0 0 0 0 0 0 0 0 0 0 0 0
53762- 0 0 0 0 0 0 0 0 0 0 0 0
53763- 0 0 0 0 0 0 0 0 0 0 0 0
53764- 0 0 0 0 0 0 0 0 0 0 0 0
53765- 0 0 0 0 0 0 0 0 0 0 0 0
53766- 0 0 0 0 0 0 0 0 0 0 0 0
53767- 0 0 0 0 0 0 0 0 0 0 0 0
53768- 0 0 0 0 0 0 0 0 0 0 0 0
53769- 0 0 0 0 0 0 0 0 0 0 0 0
53770- 0 0 0 0 0 0 0 0 0 0 0 0
53771- 6 6 6 18 18 18 46 46 46 90 90 90
53772- 46 46 46 18 18 18 6 6 6 182 182 182
53773-253 253 253 246 246 246 206 206 206 190 190 190
53774-190 190 190 190 190 190 190 190 190 190 190 190
53775-206 206 206 231 231 231 250 250 250 253 253 253
53776-253 253 253 253 253 253 253 253 253 253 253 253
53777-202 202 202 14 14 14 2 2 6 2 2 6
53778- 2 2 6 2 2 6 2 2 6 2 2 6
53779- 42 42 42 86 86 86 42 42 42 18 18 18
53780- 6 6 6 0 0 0 0 0 0 0 0 0
53781- 0 0 0 0 0 0 0 0 0 0 0 0
53782- 0 0 0 0 0 0 0 0 0 0 0 0
53783- 0 0 0 0 0 0 0 0 0 0 0 0
53784- 0 0 0 0 0 0 0 0 0 0 0 0
53785- 0 0 0 0 0 0 0 0 0 0 0 0
53786- 0 0 0 0 0 0 0 0 0 0 0 0
53787- 0 0 0 0 0 0 0 0 0 0 0 0
53788- 0 0 0 0 0 0 0 0 0 0 0 0
53789- 0 0 0 0 0 0 0 0 0 0 0 0
53790- 0 0 0 0 0 0 0 0 0 6 6 6
53791- 14 14 14 38 38 38 74 74 74 66 66 66
53792- 2 2 6 6 6 6 90 90 90 250 250 250
53793-253 253 253 253 253 253 238 238 238 198 198 198
53794-190 190 190 190 190 190 195 195 195 221 221 221
53795-246 246 246 253 253 253 253 253 253 253 253 253
53796-253 253 253 253 253 253 253 253 253 253 253 253
53797-253 253 253 82 82 82 2 2 6 2 2 6
53798- 2 2 6 2 2 6 2 2 6 2 2 6
53799- 2 2 6 78 78 78 70 70 70 34 34 34
53800- 14 14 14 6 6 6 0 0 0 0 0 0
53801- 0 0 0 0 0 0 0 0 0 0 0 0
53802- 0 0 0 0 0 0 0 0 0 0 0 0
53803- 0 0 0 0 0 0 0 0 0 0 0 0
53804- 0 0 0 0 0 0 0 0 0 0 0 0
53805- 0 0 0 0 0 0 0 0 0 0 0 0
53806- 0 0 0 0 0 0 0 0 0 0 0 0
53807- 0 0 0 0 0 0 0 0 0 0 0 0
53808- 0 0 0 0 0 0 0 0 0 0 0 0
53809- 0 0 0 0 0 0 0 0 0 0 0 0
53810- 0 0 0 0 0 0 0 0 0 14 14 14
53811- 34 34 34 66 66 66 78 78 78 6 6 6
53812- 2 2 6 18 18 18 218 218 218 253 253 253
53813-253 253 253 253 253 253 253 253 253 246 246 246
53814-226 226 226 231 231 231 246 246 246 253 253 253
53815-253 253 253 253 253 253 253 253 253 253 253 253
53816-253 253 253 253 253 253 253 253 253 253 253 253
53817-253 253 253 178 178 178 2 2 6 2 2 6
53818- 2 2 6 2 2 6 2 2 6 2 2 6
53819- 2 2 6 18 18 18 90 90 90 62 62 62
53820- 30 30 30 10 10 10 0 0 0 0 0 0
53821- 0 0 0 0 0 0 0 0 0 0 0 0
53822- 0 0 0 0 0 0 0 0 0 0 0 0
53823- 0 0 0 0 0 0 0 0 0 0 0 0
53824- 0 0 0 0 0 0 0 0 0 0 0 0
53825- 0 0 0 0 0 0 0 0 0 0 0 0
53826- 0 0 0 0 0 0 0 0 0 0 0 0
53827- 0 0 0 0 0 0 0 0 0 0 0 0
53828- 0 0 0 0 0 0 0 0 0 0 0 0
53829- 0 0 0 0 0 0 0 0 0 0 0 0
53830- 0 0 0 0 0 0 10 10 10 26 26 26
53831- 58 58 58 90 90 90 18 18 18 2 2 6
53832- 2 2 6 110 110 110 253 253 253 253 253 253
53833-253 253 253 253 253 253 253 253 253 253 253 253
53834-250 250 250 253 253 253 253 253 253 253 253 253
53835-253 253 253 253 253 253 253 253 253 253 253 253
53836-253 253 253 253 253 253 253 253 253 253 253 253
53837-253 253 253 231 231 231 18 18 18 2 2 6
53838- 2 2 6 2 2 6 2 2 6 2 2 6
53839- 2 2 6 2 2 6 18 18 18 94 94 94
53840- 54 54 54 26 26 26 10 10 10 0 0 0
53841- 0 0 0 0 0 0 0 0 0 0 0 0
53842- 0 0 0 0 0 0 0 0 0 0 0 0
53843- 0 0 0 0 0 0 0 0 0 0 0 0
53844- 0 0 0 0 0 0 0 0 0 0 0 0
53845- 0 0 0 0 0 0 0 0 0 0 0 0
53846- 0 0 0 0 0 0 0 0 0 0 0 0
53847- 0 0 0 0 0 0 0 0 0 0 0 0
53848- 0 0 0 0 0 0 0 0 0 0 0 0
53849- 0 0 0 0 0 0 0 0 0 0 0 0
53850- 0 0 0 6 6 6 22 22 22 50 50 50
53851- 90 90 90 26 26 26 2 2 6 2 2 6
53852- 14 14 14 195 195 195 250 250 250 253 253 253
53853-253 253 253 253 253 253 253 253 253 253 253 253
53854-253 253 253 253 253 253 253 253 253 253 253 253
53855-253 253 253 253 253 253 253 253 253 253 253 253
53856-253 253 253 253 253 253 253 253 253 253 253 253
53857-250 250 250 242 242 242 54 54 54 2 2 6
53858- 2 2 6 2 2 6 2 2 6 2 2 6
53859- 2 2 6 2 2 6 2 2 6 38 38 38
53860- 86 86 86 50 50 50 22 22 22 6 6 6
53861- 0 0 0 0 0 0 0 0 0 0 0 0
53862- 0 0 0 0 0 0 0 0 0 0 0 0
53863- 0 0 0 0 0 0 0 0 0 0 0 0
53864- 0 0 0 0 0 0 0 0 0 0 0 0
53865- 0 0 0 0 0 0 0 0 0 0 0 0
53866- 0 0 0 0 0 0 0 0 0 0 0 0
53867- 0 0 0 0 0 0 0 0 0 0 0 0
53868- 0 0 0 0 0 0 0 0 0 0 0 0
53869- 0 0 0 0 0 0 0 0 0 0 0 0
53870- 6 6 6 14 14 14 38 38 38 82 82 82
53871- 34 34 34 2 2 6 2 2 6 2 2 6
53872- 42 42 42 195 195 195 246 246 246 253 253 253
53873-253 253 253 253 253 253 253 253 253 250 250 250
53874-242 242 242 242 242 242 250 250 250 253 253 253
53875-253 253 253 253 253 253 253 253 253 253 253 253
53876-253 253 253 250 250 250 246 246 246 238 238 238
53877-226 226 226 231 231 231 101 101 101 6 6 6
53878- 2 2 6 2 2 6 2 2 6 2 2 6
53879- 2 2 6 2 2 6 2 2 6 2 2 6
53880- 38 38 38 82 82 82 42 42 42 14 14 14
53881- 6 6 6 0 0 0 0 0 0 0 0 0
53882- 0 0 0 0 0 0 0 0 0 0 0 0
53883- 0 0 0 0 0 0 0 0 0 0 0 0
53884- 0 0 0 0 0 0 0 0 0 0 0 0
53885- 0 0 0 0 0 0 0 0 0 0 0 0
53886- 0 0 0 0 0 0 0 0 0 0 0 0
53887- 0 0 0 0 0 0 0 0 0 0 0 0
53888- 0 0 0 0 0 0 0 0 0 0 0 0
53889- 0 0 0 0 0 0 0 0 0 0 0 0
53890- 10 10 10 26 26 26 62 62 62 66 66 66
53891- 2 2 6 2 2 6 2 2 6 6 6 6
53892- 70 70 70 170 170 170 206 206 206 234 234 234
53893-246 246 246 250 250 250 250 250 250 238 238 238
53894-226 226 226 231 231 231 238 238 238 250 250 250
53895-250 250 250 250 250 250 246 246 246 231 231 231
53896-214 214 214 206 206 206 202 202 202 202 202 202
53897-198 198 198 202 202 202 182 182 182 18 18 18
53898- 2 2 6 2 2 6 2 2 6 2 2 6
53899- 2 2 6 2 2 6 2 2 6 2 2 6
53900- 2 2 6 62 62 62 66 66 66 30 30 30
53901- 10 10 10 0 0 0 0 0 0 0 0 0
53902- 0 0 0 0 0 0 0 0 0 0 0 0
53903- 0 0 0 0 0 0 0 0 0 0 0 0
53904- 0 0 0 0 0 0 0 0 0 0 0 0
53905- 0 0 0 0 0 0 0 0 0 0 0 0
53906- 0 0 0 0 0 0 0 0 0 0 0 0
53907- 0 0 0 0 0 0 0 0 0 0 0 0
53908- 0 0 0 0 0 0 0 0 0 0 0 0
53909- 0 0 0 0 0 0 0 0 0 0 0 0
53910- 14 14 14 42 42 42 82 82 82 18 18 18
53911- 2 2 6 2 2 6 2 2 6 10 10 10
53912- 94 94 94 182 182 182 218 218 218 242 242 242
53913-250 250 250 253 253 253 253 253 253 250 250 250
53914-234 234 234 253 253 253 253 253 253 253 253 253
53915-253 253 253 253 253 253 253 253 253 246 246 246
53916-238 238 238 226 226 226 210 210 210 202 202 202
53917-195 195 195 195 195 195 210 210 210 158 158 158
53918- 6 6 6 14 14 14 50 50 50 14 14 14
53919- 2 2 6 2 2 6 2 2 6 2 2 6
53920- 2 2 6 6 6 6 86 86 86 46 46 46
53921- 18 18 18 6 6 6 0 0 0 0 0 0
53922- 0 0 0 0 0 0 0 0 0 0 0 0
53923- 0 0 0 0 0 0 0 0 0 0 0 0
53924- 0 0 0 0 0 0 0 0 0 0 0 0
53925- 0 0 0 0 0 0 0 0 0 0 0 0
53926- 0 0 0 0 0 0 0 0 0 0 0 0
53927- 0 0 0 0 0 0 0 0 0 0 0 0
53928- 0 0 0 0 0 0 0 0 0 0 0 0
53929- 0 0 0 0 0 0 0 0 0 6 6 6
53930- 22 22 22 54 54 54 70 70 70 2 2 6
53931- 2 2 6 10 10 10 2 2 6 22 22 22
53932-166 166 166 231 231 231 250 250 250 253 253 253
53933-253 253 253 253 253 253 253 253 253 250 250 250
53934-242 242 242 253 253 253 253 253 253 253 253 253
53935-253 253 253 253 253 253 253 253 253 253 253 253
53936-253 253 253 253 253 253 253 253 253 246 246 246
53937-231 231 231 206 206 206 198 198 198 226 226 226
53938- 94 94 94 2 2 6 6 6 6 38 38 38
53939- 30 30 30 2 2 6 2 2 6 2 2 6
53940- 2 2 6 2 2 6 62 62 62 66 66 66
53941- 26 26 26 10 10 10 0 0 0 0 0 0
53942- 0 0 0 0 0 0 0 0 0 0 0 0
53943- 0 0 0 0 0 0 0 0 0 0 0 0
53944- 0 0 0 0 0 0 0 0 0 0 0 0
53945- 0 0 0 0 0 0 0 0 0 0 0 0
53946- 0 0 0 0 0 0 0 0 0 0 0 0
53947- 0 0 0 0 0 0 0 0 0 0 0 0
53948- 0 0 0 0 0 0 0 0 0 0 0 0
53949- 0 0 0 0 0 0 0 0 0 10 10 10
53950- 30 30 30 74 74 74 50 50 50 2 2 6
53951- 26 26 26 26 26 26 2 2 6 106 106 106
53952-238 238 238 253 253 253 253 253 253 253 253 253
53953-253 253 253 253 253 253 253 253 253 253 253 253
53954-253 253 253 253 253 253 253 253 253 253 253 253
53955-253 253 253 253 253 253 253 253 253 253 253 253
53956-253 253 253 253 253 253 253 253 253 253 253 253
53957-253 253 253 246 246 246 218 218 218 202 202 202
53958-210 210 210 14 14 14 2 2 6 2 2 6
53959- 30 30 30 22 22 22 2 2 6 2 2 6
53960- 2 2 6 2 2 6 18 18 18 86 86 86
53961- 42 42 42 14 14 14 0 0 0 0 0 0
53962- 0 0 0 0 0 0 0 0 0 0 0 0
53963- 0 0 0 0 0 0 0 0 0 0 0 0
53964- 0 0 0 0 0 0 0 0 0 0 0 0
53965- 0 0 0 0 0 0 0 0 0 0 0 0
53966- 0 0 0 0 0 0 0 0 0 0 0 0
53967- 0 0 0 0 0 0 0 0 0 0 0 0
53968- 0 0 0 0 0 0 0 0 0 0 0 0
53969- 0 0 0 0 0 0 0 0 0 14 14 14
53970- 42 42 42 90 90 90 22 22 22 2 2 6
53971- 42 42 42 2 2 6 18 18 18 218 218 218
53972-253 253 253 253 253 253 253 253 253 253 253 253
53973-253 253 253 253 253 253 253 253 253 253 253 253
53974-253 253 253 253 253 253 253 253 253 253 253 253
53975-253 253 253 253 253 253 253 253 253 253 253 253
53976-253 253 253 253 253 253 253 253 253 253 253 253
53977-253 253 253 253 253 253 250 250 250 221 221 221
53978-218 218 218 101 101 101 2 2 6 14 14 14
53979- 18 18 18 38 38 38 10 10 10 2 2 6
53980- 2 2 6 2 2 6 2 2 6 78 78 78
53981- 58 58 58 22 22 22 6 6 6 0 0 0
53982- 0 0 0 0 0 0 0 0 0 0 0 0
53983- 0 0 0 0 0 0 0 0 0 0 0 0
53984- 0 0 0 0 0 0 0 0 0 0 0 0
53985- 0 0 0 0 0 0 0 0 0 0 0 0
53986- 0 0 0 0 0 0 0 0 0 0 0 0
53987- 0 0 0 0 0 0 0 0 0 0 0 0
53988- 0 0 0 0 0 0 0 0 0 0 0 0
53989- 0 0 0 0 0 0 6 6 6 18 18 18
53990- 54 54 54 82 82 82 2 2 6 26 26 26
53991- 22 22 22 2 2 6 123 123 123 253 253 253
53992-253 253 253 253 253 253 253 253 253 253 253 253
53993-253 253 253 253 253 253 253 253 253 253 253 253
53994-253 253 253 253 253 253 253 253 253 253 253 253
53995-253 253 253 253 253 253 253 253 253 253 253 253
53996-253 253 253 253 253 253 253 253 253 253 253 253
53997-253 253 253 253 253 253 253 253 253 250 250 250
53998-238 238 238 198 198 198 6 6 6 38 38 38
53999- 58 58 58 26 26 26 38 38 38 2 2 6
54000- 2 2 6 2 2 6 2 2 6 46 46 46
54001- 78 78 78 30 30 30 10 10 10 0 0 0
54002- 0 0 0 0 0 0 0 0 0 0 0 0
54003- 0 0 0 0 0 0 0 0 0 0 0 0
54004- 0 0 0 0 0 0 0 0 0 0 0 0
54005- 0 0 0 0 0 0 0 0 0 0 0 0
54006- 0 0 0 0 0 0 0 0 0 0 0 0
54007- 0 0 0 0 0 0 0 0 0 0 0 0
54008- 0 0 0 0 0 0 0 0 0 0 0 0
54009- 0 0 0 0 0 0 10 10 10 30 30 30
54010- 74 74 74 58 58 58 2 2 6 42 42 42
54011- 2 2 6 22 22 22 231 231 231 253 253 253
54012-253 253 253 253 253 253 253 253 253 253 253 253
54013-253 253 253 253 253 253 253 253 253 250 250 250
54014-253 253 253 253 253 253 253 253 253 253 253 253
54015-253 253 253 253 253 253 253 253 253 253 253 253
54016-253 253 253 253 253 253 253 253 253 253 253 253
54017-253 253 253 253 253 253 253 253 253 253 253 253
54018-253 253 253 246 246 246 46 46 46 38 38 38
54019- 42 42 42 14 14 14 38 38 38 14 14 14
54020- 2 2 6 2 2 6 2 2 6 6 6 6
54021- 86 86 86 46 46 46 14 14 14 0 0 0
54022- 0 0 0 0 0 0 0 0 0 0 0 0
54023- 0 0 0 0 0 0 0 0 0 0 0 0
54024- 0 0 0 0 0 0 0 0 0 0 0 0
54025- 0 0 0 0 0 0 0 0 0 0 0 0
54026- 0 0 0 0 0 0 0 0 0 0 0 0
54027- 0 0 0 0 0 0 0 0 0 0 0 0
54028- 0 0 0 0 0 0 0 0 0 0 0 0
54029- 0 0 0 6 6 6 14 14 14 42 42 42
54030- 90 90 90 18 18 18 18 18 18 26 26 26
54031- 2 2 6 116 116 116 253 253 253 253 253 253
54032-253 253 253 253 253 253 253 253 253 253 253 253
54033-253 253 253 253 253 253 250 250 250 238 238 238
54034-253 253 253 253 253 253 253 253 253 253 253 253
54035-253 253 253 253 253 253 253 253 253 253 253 253
54036-253 253 253 253 253 253 253 253 253 253 253 253
54037-253 253 253 253 253 253 253 253 253 253 253 253
54038-253 253 253 253 253 253 94 94 94 6 6 6
54039- 2 2 6 2 2 6 10 10 10 34 34 34
54040- 2 2 6 2 2 6 2 2 6 2 2 6
54041- 74 74 74 58 58 58 22 22 22 6 6 6
54042- 0 0 0 0 0 0 0 0 0 0 0 0
54043- 0 0 0 0 0 0 0 0 0 0 0 0
54044- 0 0 0 0 0 0 0 0 0 0 0 0
54045- 0 0 0 0 0 0 0 0 0 0 0 0
54046- 0 0 0 0 0 0 0 0 0 0 0 0
54047- 0 0 0 0 0 0 0 0 0 0 0 0
54048- 0 0 0 0 0 0 0 0 0 0 0 0
54049- 0 0 0 10 10 10 26 26 26 66 66 66
54050- 82 82 82 2 2 6 38 38 38 6 6 6
54051- 14 14 14 210 210 210 253 253 253 253 253 253
54052-253 253 253 253 253 253 253 253 253 253 253 253
54053-253 253 253 253 253 253 246 246 246 242 242 242
54054-253 253 253 253 253 253 253 253 253 253 253 253
54055-253 253 253 253 253 253 253 253 253 253 253 253
54056-253 253 253 253 253 253 253 253 253 253 253 253
54057-253 253 253 253 253 253 253 253 253 253 253 253
54058-253 253 253 253 253 253 144 144 144 2 2 6
54059- 2 2 6 2 2 6 2 2 6 46 46 46
54060- 2 2 6 2 2 6 2 2 6 2 2 6
54061- 42 42 42 74 74 74 30 30 30 10 10 10
54062- 0 0 0 0 0 0 0 0 0 0 0 0
54063- 0 0 0 0 0 0 0 0 0 0 0 0
54064- 0 0 0 0 0 0 0 0 0 0 0 0
54065- 0 0 0 0 0 0 0 0 0 0 0 0
54066- 0 0 0 0 0 0 0 0 0 0 0 0
54067- 0 0 0 0 0 0 0 0 0 0 0 0
54068- 0 0 0 0 0 0 0 0 0 0 0 0
54069- 6 6 6 14 14 14 42 42 42 90 90 90
54070- 26 26 26 6 6 6 42 42 42 2 2 6
54071- 74 74 74 250 250 250 253 253 253 253 253 253
54072-253 253 253 253 253 253 253 253 253 253 253 253
54073-253 253 253 253 253 253 242 242 242 242 242 242
54074-253 253 253 253 253 253 253 253 253 253 253 253
54075-253 253 253 253 253 253 253 253 253 253 253 253
54076-253 253 253 253 253 253 253 253 253 253 253 253
54077-253 253 253 253 253 253 253 253 253 253 253 253
54078-253 253 253 253 253 253 182 182 182 2 2 6
54079- 2 2 6 2 2 6 2 2 6 46 46 46
54080- 2 2 6 2 2 6 2 2 6 2 2 6
54081- 10 10 10 86 86 86 38 38 38 10 10 10
54082- 0 0 0 0 0 0 0 0 0 0 0 0
54083- 0 0 0 0 0 0 0 0 0 0 0 0
54084- 0 0 0 0 0 0 0 0 0 0 0 0
54085- 0 0 0 0 0 0 0 0 0 0 0 0
54086- 0 0 0 0 0 0 0 0 0 0 0 0
54087- 0 0 0 0 0 0 0 0 0 0 0 0
54088- 0 0 0 0 0 0 0 0 0 0 0 0
54089- 10 10 10 26 26 26 66 66 66 82 82 82
54090- 2 2 6 22 22 22 18 18 18 2 2 6
54091-149 149 149 253 253 253 253 253 253 253 253 253
54092-253 253 253 253 253 253 253 253 253 253 253 253
54093-253 253 253 253 253 253 234 234 234 242 242 242
54094-253 253 253 253 253 253 253 253 253 253 253 253
54095-253 253 253 253 253 253 253 253 253 253 253 253
54096-253 253 253 253 253 253 253 253 253 253 253 253
54097-253 253 253 253 253 253 253 253 253 253 253 253
54098-253 253 253 253 253 253 206 206 206 2 2 6
54099- 2 2 6 2 2 6 2 2 6 38 38 38
54100- 2 2 6 2 2 6 2 2 6 2 2 6
54101- 6 6 6 86 86 86 46 46 46 14 14 14
54102- 0 0 0 0 0 0 0 0 0 0 0 0
54103- 0 0 0 0 0 0 0 0 0 0 0 0
54104- 0 0 0 0 0 0 0 0 0 0 0 0
54105- 0 0 0 0 0 0 0 0 0 0 0 0
54106- 0 0 0 0 0 0 0 0 0 0 0 0
54107- 0 0 0 0 0 0 0 0 0 0 0 0
54108- 0 0 0 0 0 0 0 0 0 6 6 6
54109- 18 18 18 46 46 46 86 86 86 18 18 18
54110- 2 2 6 34 34 34 10 10 10 6 6 6
54111-210 210 210 253 253 253 253 253 253 253 253 253
54112-253 253 253 253 253 253 253 253 253 253 253 253
54113-253 253 253 253 253 253 234 234 234 242 242 242
54114-253 253 253 253 253 253 253 253 253 253 253 253
54115-253 253 253 253 253 253 253 253 253 253 253 253
54116-253 253 253 253 253 253 253 253 253 253 253 253
54117-253 253 253 253 253 253 253 253 253 253 253 253
54118-253 253 253 253 253 253 221 221 221 6 6 6
54119- 2 2 6 2 2 6 6 6 6 30 30 30
54120- 2 2 6 2 2 6 2 2 6 2 2 6
54121- 2 2 6 82 82 82 54 54 54 18 18 18
54122- 6 6 6 0 0 0 0 0 0 0 0 0
54123- 0 0 0 0 0 0 0 0 0 0 0 0
54124- 0 0 0 0 0 0 0 0 0 0 0 0
54125- 0 0 0 0 0 0 0 0 0 0 0 0
54126- 0 0 0 0 0 0 0 0 0 0 0 0
54127- 0 0 0 0 0 0 0 0 0 0 0 0
54128- 0 0 0 0 0 0 0 0 0 10 10 10
54129- 26 26 26 66 66 66 62 62 62 2 2 6
54130- 2 2 6 38 38 38 10 10 10 26 26 26
54131-238 238 238 253 253 253 253 253 253 253 253 253
54132-253 253 253 253 253 253 253 253 253 253 253 253
54133-253 253 253 253 253 253 231 231 231 238 238 238
54134-253 253 253 253 253 253 253 253 253 253 253 253
54135-253 253 253 253 253 253 253 253 253 253 253 253
54136-253 253 253 253 253 253 253 253 253 253 253 253
54137-253 253 253 253 253 253 253 253 253 253 253 253
54138-253 253 253 253 253 253 231 231 231 6 6 6
54139- 2 2 6 2 2 6 10 10 10 30 30 30
54140- 2 2 6 2 2 6 2 2 6 2 2 6
54141- 2 2 6 66 66 66 58 58 58 22 22 22
54142- 6 6 6 0 0 0 0 0 0 0 0 0
54143- 0 0 0 0 0 0 0 0 0 0 0 0
54144- 0 0 0 0 0 0 0 0 0 0 0 0
54145- 0 0 0 0 0 0 0 0 0 0 0 0
54146- 0 0 0 0 0 0 0 0 0 0 0 0
54147- 0 0 0 0 0 0 0 0 0 0 0 0
54148- 0 0 0 0 0 0 0 0 0 10 10 10
54149- 38 38 38 78 78 78 6 6 6 2 2 6
54150- 2 2 6 46 46 46 14 14 14 42 42 42
54151-246 246 246 253 253 253 253 253 253 253 253 253
54152-253 253 253 253 253 253 253 253 253 253 253 253
54153-253 253 253 253 253 253 231 231 231 242 242 242
54154-253 253 253 253 253 253 253 253 253 253 253 253
54155-253 253 253 253 253 253 253 253 253 253 253 253
54156-253 253 253 253 253 253 253 253 253 253 253 253
54157-253 253 253 253 253 253 253 253 253 253 253 253
54158-253 253 253 253 253 253 234 234 234 10 10 10
54159- 2 2 6 2 2 6 22 22 22 14 14 14
54160- 2 2 6 2 2 6 2 2 6 2 2 6
54161- 2 2 6 66 66 66 62 62 62 22 22 22
54162- 6 6 6 0 0 0 0 0 0 0 0 0
54163- 0 0 0 0 0 0 0 0 0 0 0 0
54164- 0 0 0 0 0 0 0 0 0 0 0 0
54165- 0 0 0 0 0 0 0 0 0 0 0 0
54166- 0 0 0 0 0 0 0 0 0 0 0 0
54167- 0 0 0 0 0 0 0 0 0 0 0 0
54168- 0 0 0 0 0 0 6 6 6 18 18 18
54169- 50 50 50 74 74 74 2 2 6 2 2 6
54170- 14 14 14 70 70 70 34 34 34 62 62 62
54171-250 250 250 253 253 253 253 253 253 253 253 253
54172-253 253 253 253 253 253 253 253 253 253 253 253
54173-253 253 253 253 253 253 231 231 231 246 246 246
54174-253 253 253 253 253 253 253 253 253 253 253 253
54175-253 253 253 253 253 253 253 253 253 253 253 253
54176-253 253 253 253 253 253 253 253 253 253 253 253
54177-253 253 253 253 253 253 253 253 253 253 253 253
54178-253 253 253 253 253 253 234 234 234 14 14 14
54179- 2 2 6 2 2 6 30 30 30 2 2 6
54180- 2 2 6 2 2 6 2 2 6 2 2 6
54181- 2 2 6 66 66 66 62 62 62 22 22 22
54182- 6 6 6 0 0 0 0 0 0 0 0 0
54183- 0 0 0 0 0 0 0 0 0 0 0 0
54184- 0 0 0 0 0 0 0 0 0 0 0 0
54185- 0 0 0 0 0 0 0 0 0 0 0 0
54186- 0 0 0 0 0 0 0 0 0 0 0 0
54187- 0 0 0 0 0 0 0 0 0 0 0 0
54188- 0 0 0 0 0 0 6 6 6 18 18 18
54189- 54 54 54 62 62 62 2 2 6 2 2 6
54190- 2 2 6 30 30 30 46 46 46 70 70 70
54191-250 250 250 253 253 253 253 253 253 253 253 253
54192-253 253 253 253 253 253 253 253 253 253 253 253
54193-253 253 253 253 253 253 231 231 231 246 246 246
54194-253 253 253 253 253 253 253 253 253 253 253 253
54195-253 253 253 253 253 253 253 253 253 253 253 253
54196-253 253 253 253 253 253 253 253 253 253 253 253
54197-253 253 253 253 253 253 253 253 253 253 253 253
54198-253 253 253 253 253 253 226 226 226 10 10 10
54199- 2 2 6 6 6 6 30 30 30 2 2 6
54200- 2 2 6 2 2 6 2 2 6 2 2 6
54201- 2 2 6 66 66 66 58 58 58 22 22 22
54202- 6 6 6 0 0 0 0 0 0 0 0 0
54203- 0 0 0 0 0 0 0 0 0 0 0 0
54204- 0 0 0 0 0 0 0 0 0 0 0 0
54205- 0 0 0 0 0 0 0 0 0 0 0 0
54206- 0 0 0 0 0 0 0 0 0 0 0 0
54207- 0 0 0 0 0 0 0 0 0 0 0 0
54208- 0 0 0 0 0 0 6 6 6 22 22 22
54209- 58 58 58 62 62 62 2 2 6 2 2 6
54210- 2 2 6 2 2 6 30 30 30 78 78 78
54211-250 250 250 253 253 253 253 253 253 253 253 253
54212-253 253 253 253 253 253 253 253 253 253 253 253
54213-253 253 253 253 253 253 231 231 231 246 246 246
54214-253 253 253 253 253 253 253 253 253 253 253 253
54215-253 253 253 253 253 253 253 253 253 253 253 253
54216-253 253 253 253 253 253 253 253 253 253 253 253
54217-253 253 253 253 253 253 253 253 253 253 253 253
54218-253 253 253 253 253 253 206 206 206 2 2 6
54219- 22 22 22 34 34 34 18 14 6 22 22 22
54220- 26 26 26 18 18 18 6 6 6 2 2 6
54221- 2 2 6 82 82 82 54 54 54 18 18 18
54222- 6 6 6 0 0 0 0 0 0 0 0 0
54223- 0 0 0 0 0 0 0 0 0 0 0 0
54224- 0 0 0 0 0 0 0 0 0 0 0 0
54225- 0 0 0 0 0 0 0 0 0 0 0 0
54226- 0 0 0 0 0 0 0 0 0 0 0 0
54227- 0 0 0 0 0 0 0 0 0 0 0 0
54228- 0 0 0 0 0 0 6 6 6 26 26 26
54229- 62 62 62 106 106 106 74 54 14 185 133 11
54230-210 162 10 121 92 8 6 6 6 62 62 62
54231-238 238 238 253 253 253 253 253 253 253 253 253
54232-253 253 253 253 253 253 253 253 253 253 253 253
54233-253 253 253 253 253 253 231 231 231 246 246 246
54234-253 253 253 253 253 253 253 253 253 253 253 253
54235-253 253 253 253 253 253 253 253 253 253 253 253
54236-253 253 253 253 253 253 253 253 253 253 253 253
54237-253 253 253 253 253 253 253 253 253 253 253 253
54238-253 253 253 253 253 253 158 158 158 18 18 18
54239- 14 14 14 2 2 6 2 2 6 2 2 6
54240- 6 6 6 18 18 18 66 66 66 38 38 38
54241- 6 6 6 94 94 94 50 50 50 18 18 18
54242- 6 6 6 0 0 0 0 0 0 0 0 0
54243- 0 0 0 0 0 0 0 0 0 0 0 0
54244- 0 0 0 0 0 0 0 0 0 0 0 0
54245- 0 0 0 0 0 0 0 0 0 0 0 0
54246- 0 0 0 0 0 0 0 0 0 0 0 0
54247- 0 0 0 0 0 0 0 0 0 6 6 6
54248- 10 10 10 10 10 10 18 18 18 38 38 38
54249- 78 78 78 142 134 106 216 158 10 242 186 14
54250-246 190 14 246 190 14 156 118 10 10 10 10
54251- 90 90 90 238 238 238 253 253 253 253 253 253
54252-253 253 253 253 253 253 253 253 253 253 253 253
54253-253 253 253 253 253 253 231 231 231 250 250 250
54254-253 253 253 253 253 253 253 253 253 253 253 253
54255-253 253 253 253 253 253 253 253 253 253 253 253
54256-253 253 253 253 253 253 253 253 253 253 253 253
54257-253 253 253 253 253 253 253 253 253 246 230 190
54258-238 204 91 238 204 91 181 142 44 37 26 9
54259- 2 2 6 2 2 6 2 2 6 2 2 6
54260- 2 2 6 2 2 6 38 38 38 46 46 46
54261- 26 26 26 106 106 106 54 54 54 18 18 18
54262- 6 6 6 0 0 0 0 0 0 0 0 0
54263- 0 0 0 0 0 0 0 0 0 0 0 0
54264- 0 0 0 0 0 0 0 0 0 0 0 0
54265- 0 0 0 0 0 0 0 0 0 0 0 0
54266- 0 0 0 0 0 0 0 0 0 0 0 0
54267- 0 0 0 6 6 6 14 14 14 22 22 22
54268- 30 30 30 38 38 38 50 50 50 70 70 70
54269-106 106 106 190 142 34 226 170 11 242 186 14
54270-246 190 14 246 190 14 246 190 14 154 114 10
54271- 6 6 6 74 74 74 226 226 226 253 253 253
54272-253 253 253 253 253 253 253 253 253 253 253 253
54273-253 253 253 253 253 253 231 231 231 250 250 250
54274-253 253 253 253 253 253 253 253 253 253 253 253
54275-253 253 253 253 253 253 253 253 253 253 253 253
54276-253 253 253 253 253 253 253 253 253 253 253 253
54277-253 253 253 253 253 253 253 253 253 228 184 62
54278-241 196 14 241 208 19 232 195 16 38 30 10
54279- 2 2 6 2 2 6 2 2 6 2 2 6
54280- 2 2 6 6 6 6 30 30 30 26 26 26
54281-203 166 17 154 142 90 66 66 66 26 26 26
54282- 6 6 6 0 0 0 0 0 0 0 0 0
54283- 0 0 0 0 0 0 0 0 0 0 0 0
54284- 0 0 0 0 0 0 0 0 0 0 0 0
54285- 0 0 0 0 0 0 0 0 0 0 0 0
54286- 0 0 0 0 0 0 0 0 0 0 0 0
54287- 6 6 6 18 18 18 38 38 38 58 58 58
54288- 78 78 78 86 86 86 101 101 101 123 123 123
54289-175 146 61 210 150 10 234 174 13 246 186 14
54290-246 190 14 246 190 14 246 190 14 238 190 10
54291-102 78 10 2 2 6 46 46 46 198 198 198
54292-253 253 253 253 253 253 253 253 253 253 253 253
54293-253 253 253 253 253 253 234 234 234 242 242 242
54294-253 253 253 253 253 253 253 253 253 253 253 253
54295-253 253 253 253 253 253 253 253 253 253 253 253
54296-253 253 253 253 253 253 253 253 253 253 253 253
54297-253 253 253 253 253 253 253 253 253 224 178 62
54298-242 186 14 241 196 14 210 166 10 22 18 6
54299- 2 2 6 2 2 6 2 2 6 2 2 6
54300- 2 2 6 2 2 6 6 6 6 121 92 8
54301-238 202 15 232 195 16 82 82 82 34 34 34
54302- 10 10 10 0 0 0 0 0 0 0 0 0
54303- 0 0 0 0 0 0 0 0 0 0 0 0
54304- 0 0 0 0 0 0 0 0 0 0 0 0
54305- 0 0 0 0 0 0 0 0 0 0 0 0
54306- 0 0 0 0 0 0 0 0 0 0 0 0
54307- 14 14 14 38 38 38 70 70 70 154 122 46
54308-190 142 34 200 144 11 197 138 11 197 138 11
54309-213 154 11 226 170 11 242 186 14 246 190 14
54310-246 190 14 246 190 14 246 190 14 246 190 14
54311-225 175 15 46 32 6 2 2 6 22 22 22
54312-158 158 158 250 250 250 253 253 253 253 253 253
54313-253 253 253 253 253 253 253 253 253 253 253 253
54314-253 253 253 253 253 253 253 253 253 253 253 253
54315-253 253 253 253 253 253 253 253 253 253 253 253
54316-253 253 253 253 253 253 253 253 253 253 253 253
54317-253 253 253 250 250 250 242 242 242 224 178 62
54318-239 182 13 236 186 11 213 154 11 46 32 6
54319- 2 2 6 2 2 6 2 2 6 2 2 6
54320- 2 2 6 2 2 6 61 42 6 225 175 15
54321-238 190 10 236 186 11 112 100 78 42 42 42
54322- 14 14 14 0 0 0 0 0 0 0 0 0
54323- 0 0 0 0 0 0 0 0 0 0 0 0
54324- 0 0 0 0 0 0 0 0 0 0 0 0
54325- 0 0 0 0 0 0 0 0 0 0 0 0
54326- 0 0 0 0 0 0 0 0 0 6 6 6
54327- 22 22 22 54 54 54 154 122 46 213 154 11
54328-226 170 11 230 174 11 226 170 11 226 170 11
54329-236 178 12 242 186 14 246 190 14 246 190 14
54330-246 190 14 246 190 14 246 190 14 246 190 14
54331-241 196 14 184 144 12 10 10 10 2 2 6
54332- 6 6 6 116 116 116 242 242 242 253 253 253
54333-253 253 253 253 253 253 253 253 253 253 253 253
54334-253 253 253 253 253 253 253 253 253 253 253 253
54335-253 253 253 253 253 253 253 253 253 253 253 253
54336-253 253 253 253 253 253 253 253 253 253 253 253
54337-253 253 253 231 231 231 198 198 198 214 170 54
54338-236 178 12 236 178 12 210 150 10 137 92 6
54339- 18 14 6 2 2 6 2 2 6 2 2 6
54340- 6 6 6 70 47 6 200 144 11 236 178 12
54341-239 182 13 239 182 13 124 112 88 58 58 58
54342- 22 22 22 6 6 6 0 0 0 0 0 0
54343- 0 0 0 0 0 0 0 0 0 0 0 0
54344- 0 0 0 0 0 0 0 0 0 0 0 0
54345- 0 0 0 0 0 0 0 0 0 0 0 0
54346- 0 0 0 0 0 0 0 0 0 10 10 10
54347- 30 30 30 70 70 70 180 133 36 226 170 11
54348-239 182 13 242 186 14 242 186 14 246 186 14
54349-246 190 14 246 190 14 246 190 14 246 190 14
54350-246 190 14 246 190 14 246 190 14 246 190 14
54351-246 190 14 232 195 16 98 70 6 2 2 6
54352- 2 2 6 2 2 6 66 66 66 221 221 221
54353-253 253 253 253 253 253 253 253 253 253 253 253
54354-253 253 253 253 253 253 253 253 253 253 253 253
54355-253 253 253 253 253 253 253 253 253 253 253 253
54356-253 253 253 253 253 253 253 253 253 253 253 253
54357-253 253 253 206 206 206 198 198 198 214 166 58
54358-230 174 11 230 174 11 216 158 10 192 133 9
54359-163 110 8 116 81 8 102 78 10 116 81 8
54360-167 114 7 197 138 11 226 170 11 239 182 13
54361-242 186 14 242 186 14 162 146 94 78 78 78
54362- 34 34 34 14 14 14 6 6 6 0 0 0
54363- 0 0 0 0 0 0 0 0 0 0 0 0
54364- 0 0 0 0 0 0 0 0 0 0 0 0
54365- 0 0 0 0 0 0 0 0 0 0 0 0
54366- 0 0 0 0 0 0 0 0 0 6 6 6
54367- 30 30 30 78 78 78 190 142 34 226 170 11
54368-239 182 13 246 190 14 246 190 14 246 190 14
54369-246 190 14 246 190 14 246 190 14 246 190 14
54370-246 190 14 246 190 14 246 190 14 246 190 14
54371-246 190 14 241 196 14 203 166 17 22 18 6
54372- 2 2 6 2 2 6 2 2 6 38 38 38
54373-218 218 218 253 253 253 253 253 253 253 253 253
54374-253 253 253 253 253 253 253 253 253 253 253 253
54375-253 253 253 253 253 253 253 253 253 253 253 253
54376-253 253 253 253 253 253 253 253 253 253 253 253
54377-250 250 250 206 206 206 198 198 198 202 162 69
54378-226 170 11 236 178 12 224 166 10 210 150 10
54379-200 144 11 197 138 11 192 133 9 197 138 11
54380-210 150 10 226 170 11 242 186 14 246 190 14
54381-246 190 14 246 186 14 225 175 15 124 112 88
54382- 62 62 62 30 30 30 14 14 14 6 6 6
54383- 0 0 0 0 0 0 0 0 0 0 0 0
54384- 0 0 0 0 0 0 0 0 0 0 0 0
54385- 0 0 0 0 0 0 0 0 0 0 0 0
54386- 0 0 0 0 0 0 0 0 0 10 10 10
54387- 30 30 30 78 78 78 174 135 50 224 166 10
54388-239 182 13 246 190 14 246 190 14 246 190 14
54389-246 190 14 246 190 14 246 190 14 246 190 14
54390-246 190 14 246 190 14 246 190 14 246 190 14
54391-246 190 14 246 190 14 241 196 14 139 102 15
54392- 2 2 6 2 2 6 2 2 6 2 2 6
54393- 78 78 78 250 250 250 253 253 253 253 253 253
54394-253 253 253 253 253 253 253 253 253 253 253 253
54395-253 253 253 253 253 253 253 253 253 253 253 253
54396-253 253 253 253 253 253 253 253 253 253 253 253
54397-250 250 250 214 214 214 198 198 198 190 150 46
54398-219 162 10 236 178 12 234 174 13 224 166 10
54399-216 158 10 213 154 11 213 154 11 216 158 10
54400-226 170 11 239 182 13 246 190 14 246 190 14
54401-246 190 14 246 190 14 242 186 14 206 162 42
54402-101 101 101 58 58 58 30 30 30 14 14 14
54403- 6 6 6 0 0 0 0 0 0 0 0 0
54404- 0 0 0 0 0 0 0 0 0 0 0 0
54405- 0 0 0 0 0 0 0 0 0 0 0 0
54406- 0 0 0 0 0 0 0 0 0 10 10 10
54407- 30 30 30 74 74 74 174 135 50 216 158 10
54408-236 178 12 246 190 14 246 190 14 246 190 14
54409-246 190 14 246 190 14 246 190 14 246 190 14
54410-246 190 14 246 190 14 246 190 14 246 190 14
54411-246 190 14 246 190 14 241 196 14 226 184 13
54412- 61 42 6 2 2 6 2 2 6 2 2 6
54413- 22 22 22 238 238 238 253 253 253 253 253 253
54414-253 253 253 253 253 253 253 253 253 253 253 253
54415-253 253 253 253 253 253 253 253 253 253 253 253
54416-253 253 253 253 253 253 253 253 253 253 253 253
54417-253 253 253 226 226 226 187 187 187 180 133 36
54418-216 158 10 236 178 12 239 182 13 236 178 12
54419-230 174 11 226 170 11 226 170 11 230 174 11
54420-236 178 12 242 186 14 246 190 14 246 190 14
54421-246 190 14 246 190 14 246 186 14 239 182 13
54422-206 162 42 106 106 106 66 66 66 34 34 34
54423- 14 14 14 6 6 6 0 0 0 0 0 0
54424- 0 0 0 0 0 0 0 0 0 0 0 0
54425- 0 0 0 0 0 0 0 0 0 0 0 0
54426- 0 0 0 0 0 0 0 0 0 6 6 6
54427- 26 26 26 70 70 70 163 133 67 213 154 11
54428-236 178 12 246 190 14 246 190 14 246 190 14
54429-246 190 14 246 190 14 246 190 14 246 190 14
54430-246 190 14 246 190 14 246 190 14 246 190 14
54431-246 190 14 246 190 14 246 190 14 241 196 14
54432-190 146 13 18 14 6 2 2 6 2 2 6
54433- 46 46 46 246 246 246 253 253 253 253 253 253
54434-253 253 253 253 253 253 253 253 253 253 253 253
54435-253 253 253 253 253 253 253 253 253 253 253 253
54436-253 253 253 253 253 253 253 253 253 253 253 253
54437-253 253 253 221 221 221 86 86 86 156 107 11
54438-216 158 10 236 178 12 242 186 14 246 186 14
54439-242 186 14 239 182 13 239 182 13 242 186 14
54440-242 186 14 246 186 14 246 190 14 246 190 14
54441-246 190 14 246 190 14 246 190 14 246 190 14
54442-242 186 14 225 175 15 142 122 72 66 66 66
54443- 30 30 30 10 10 10 0 0 0 0 0 0
54444- 0 0 0 0 0 0 0 0 0 0 0 0
54445- 0 0 0 0 0 0 0 0 0 0 0 0
54446- 0 0 0 0 0 0 0 0 0 6 6 6
54447- 26 26 26 70 70 70 163 133 67 210 150 10
54448-236 178 12 246 190 14 246 190 14 246 190 14
54449-246 190 14 246 190 14 246 190 14 246 190 14
54450-246 190 14 246 190 14 246 190 14 246 190 14
54451-246 190 14 246 190 14 246 190 14 246 190 14
54452-232 195 16 121 92 8 34 34 34 106 106 106
54453-221 221 221 253 253 253 253 253 253 253 253 253
54454-253 253 253 253 253 253 253 253 253 253 253 253
54455-253 253 253 253 253 253 253 253 253 253 253 253
54456-253 253 253 253 253 253 253 253 253 253 253 253
54457-242 242 242 82 82 82 18 14 6 163 110 8
54458-216 158 10 236 178 12 242 186 14 246 190 14
54459-246 190 14 246 190 14 246 190 14 246 190 14
54460-246 190 14 246 190 14 246 190 14 246 190 14
54461-246 190 14 246 190 14 246 190 14 246 190 14
54462-246 190 14 246 190 14 242 186 14 163 133 67
54463- 46 46 46 18 18 18 6 6 6 0 0 0
54464- 0 0 0 0 0 0 0 0 0 0 0 0
54465- 0 0 0 0 0 0 0 0 0 0 0 0
54466- 0 0 0 0 0 0 0 0 0 10 10 10
54467- 30 30 30 78 78 78 163 133 67 210 150 10
54468-236 178 12 246 186 14 246 190 14 246 190 14
54469-246 190 14 246 190 14 246 190 14 246 190 14
54470-246 190 14 246 190 14 246 190 14 246 190 14
54471-246 190 14 246 190 14 246 190 14 246 190 14
54472-241 196 14 215 174 15 190 178 144 253 253 253
54473-253 253 253 253 253 253 253 253 253 253 253 253
54474-253 253 253 253 253 253 253 253 253 253 253 253
54475-253 253 253 253 253 253 253 253 253 253 253 253
54476-253 253 253 253 253 253 253 253 253 218 218 218
54477- 58 58 58 2 2 6 22 18 6 167 114 7
54478-216 158 10 236 178 12 246 186 14 246 190 14
54479-246 190 14 246 190 14 246 190 14 246 190 14
54480-246 190 14 246 190 14 246 190 14 246 190 14
54481-246 190 14 246 190 14 246 190 14 246 190 14
54482-246 190 14 246 186 14 242 186 14 190 150 46
54483- 54 54 54 22 22 22 6 6 6 0 0 0
54484- 0 0 0 0 0 0 0 0 0 0 0 0
54485- 0 0 0 0 0 0 0 0 0 0 0 0
54486- 0 0 0 0 0 0 0 0 0 14 14 14
54487- 38 38 38 86 86 86 180 133 36 213 154 11
54488-236 178 12 246 186 14 246 190 14 246 190 14
54489-246 190 14 246 190 14 246 190 14 246 190 14
54490-246 190 14 246 190 14 246 190 14 246 190 14
54491-246 190 14 246 190 14 246 190 14 246 190 14
54492-246 190 14 232 195 16 190 146 13 214 214 214
54493-253 253 253 253 253 253 253 253 253 253 253 253
54494-253 253 253 253 253 253 253 253 253 253 253 253
54495-253 253 253 253 253 253 253 253 253 253 253 253
54496-253 253 253 250 250 250 170 170 170 26 26 26
54497- 2 2 6 2 2 6 37 26 9 163 110 8
54498-219 162 10 239 182 13 246 186 14 246 190 14
54499-246 190 14 246 190 14 246 190 14 246 190 14
54500-246 190 14 246 190 14 246 190 14 246 190 14
54501-246 190 14 246 190 14 246 190 14 246 190 14
54502-246 186 14 236 178 12 224 166 10 142 122 72
54503- 46 46 46 18 18 18 6 6 6 0 0 0
54504- 0 0 0 0 0 0 0 0 0 0 0 0
54505- 0 0 0 0 0 0 0 0 0 0 0 0
54506- 0 0 0 0 0 0 6 6 6 18 18 18
54507- 50 50 50 109 106 95 192 133 9 224 166 10
54508-242 186 14 246 190 14 246 190 14 246 190 14
54509-246 190 14 246 190 14 246 190 14 246 190 14
54510-246 190 14 246 190 14 246 190 14 246 190 14
54511-246 190 14 246 190 14 246 190 14 246 190 14
54512-242 186 14 226 184 13 210 162 10 142 110 46
54513-226 226 226 253 253 253 253 253 253 253 253 253
54514-253 253 253 253 253 253 253 253 253 253 253 253
54515-253 253 253 253 253 253 253 253 253 253 253 253
54516-198 198 198 66 66 66 2 2 6 2 2 6
54517- 2 2 6 2 2 6 50 34 6 156 107 11
54518-219 162 10 239 182 13 246 186 14 246 190 14
54519-246 190 14 246 190 14 246 190 14 246 190 14
54520-246 190 14 246 190 14 246 190 14 246 190 14
54521-246 190 14 246 190 14 246 190 14 242 186 14
54522-234 174 13 213 154 11 154 122 46 66 66 66
54523- 30 30 30 10 10 10 0 0 0 0 0 0
54524- 0 0 0 0 0 0 0 0 0 0 0 0
54525- 0 0 0 0 0 0 0 0 0 0 0 0
54526- 0 0 0 0 0 0 6 6 6 22 22 22
54527- 58 58 58 154 121 60 206 145 10 234 174 13
54528-242 186 14 246 186 14 246 190 14 246 190 14
54529-246 190 14 246 190 14 246 190 14 246 190 14
54530-246 190 14 246 190 14 246 190 14 246 190 14
54531-246 190 14 246 190 14 246 190 14 246 190 14
54532-246 186 14 236 178 12 210 162 10 163 110 8
54533- 61 42 6 138 138 138 218 218 218 250 250 250
54534-253 253 253 253 253 253 253 253 253 250 250 250
54535-242 242 242 210 210 210 144 144 144 66 66 66
54536- 6 6 6 2 2 6 2 2 6 2 2 6
54537- 2 2 6 2 2 6 61 42 6 163 110 8
54538-216 158 10 236 178 12 246 190 14 246 190 14
54539-246 190 14 246 190 14 246 190 14 246 190 14
54540-246 190 14 246 190 14 246 190 14 246 190 14
54541-246 190 14 239 182 13 230 174 11 216 158 10
54542-190 142 34 124 112 88 70 70 70 38 38 38
54543- 18 18 18 6 6 6 0 0 0 0 0 0
54544- 0 0 0 0 0 0 0 0 0 0 0 0
54545- 0 0 0 0 0 0 0 0 0 0 0 0
54546- 0 0 0 0 0 0 6 6 6 22 22 22
54547- 62 62 62 168 124 44 206 145 10 224 166 10
54548-236 178 12 239 182 13 242 186 14 242 186 14
54549-246 186 14 246 190 14 246 190 14 246 190 14
54550-246 190 14 246 190 14 246 190 14 246 190 14
54551-246 190 14 246 190 14 246 190 14 246 190 14
54552-246 190 14 236 178 12 216 158 10 175 118 6
54553- 80 54 7 2 2 6 6 6 6 30 30 30
54554- 54 54 54 62 62 62 50 50 50 38 38 38
54555- 14 14 14 2 2 6 2 2 6 2 2 6
54556- 2 2 6 2 2 6 2 2 6 2 2 6
54557- 2 2 6 6 6 6 80 54 7 167 114 7
54558-213 154 11 236 178 12 246 190 14 246 190 14
54559-246 190 14 246 190 14 246 190 14 246 190 14
54560-246 190 14 242 186 14 239 182 13 239 182 13
54561-230 174 11 210 150 10 174 135 50 124 112 88
54562- 82 82 82 54 54 54 34 34 34 18 18 18
54563- 6 6 6 0 0 0 0 0 0 0 0 0
54564- 0 0 0 0 0 0 0 0 0 0 0 0
54565- 0 0 0 0 0 0 0 0 0 0 0 0
54566- 0 0 0 0 0 0 6 6 6 18 18 18
54567- 50 50 50 158 118 36 192 133 9 200 144 11
54568-216 158 10 219 162 10 224 166 10 226 170 11
54569-230 174 11 236 178 12 239 182 13 239 182 13
54570-242 186 14 246 186 14 246 190 14 246 190 14
54571-246 190 14 246 190 14 246 190 14 246 190 14
54572-246 186 14 230 174 11 210 150 10 163 110 8
54573-104 69 6 10 10 10 2 2 6 2 2 6
54574- 2 2 6 2 2 6 2 2 6 2 2 6
54575- 2 2 6 2 2 6 2 2 6 2 2 6
54576- 2 2 6 2 2 6 2 2 6 2 2 6
54577- 2 2 6 6 6 6 91 60 6 167 114 7
54578-206 145 10 230 174 11 242 186 14 246 190 14
54579-246 190 14 246 190 14 246 186 14 242 186 14
54580-239 182 13 230 174 11 224 166 10 213 154 11
54581-180 133 36 124 112 88 86 86 86 58 58 58
54582- 38 38 38 22 22 22 10 10 10 6 6 6
54583- 0 0 0 0 0 0 0 0 0 0 0 0
54584- 0 0 0 0 0 0 0 0 0 0 0 0
54585- 0 0 0 0 0 0 0 0 0 0 0 0
54586- 0 0 0 0 0 0 0 0 0 14 14 14
54587- 34 34 34 70 70 70 138 110 50 158 118 36
54588-167 114 7 180 123 7 192 133 9 197 138 11
54589-200 144 11 206 145 10 213 154 11 219 162 10
54590-224 166 10 230 174 11 239 182 13 242 186 14
54591-246 186 14 246 186 14 246 186 14 246 186 14
54592-239 182 13 216 158 10 185 133 11 152 99 6
54593-104 69 6 18 14 6 2 2 6 2 2 6
54594- 2 2 6 2 2 6 2 2 6 2 2 6
54595- 2 2 6 2 2 6 2 2 6 2 2 6
54596- 2 2 6 2 2 6 2 2 6 2 2 6
54597- 2 2 6 6 6 6 80 54 7 152 99 6
54598-192 133 9 219 162 10 236 178 12 239 182 13
54599-246 186 14 242 186 14 239 182 13 236 178 12
54600-224 166 10 206 145 10 192 133 9 154 121 60
54601- 94 94 94 62 62 62 42 42 42 22 22 22
54602- 14 14 14 6 6 6 0 0 0 0 0 0
54603- 0 0 0 0 0 0 0 0 0 0 0 0
54604- 0 0 0 0 0 0 0 0 0 0 0 0
54605- 0 0 0 0 0 0 0 0 0 0 0 0
54606- 0 0 0 0 0 0 0 0 0 6 6 6
54607- 18 18 18 34 34 34 58 58 58 78 78 78
54608-101 98 89 124 112 88 142 110 46 156 107 11
54609-163 110 8 167 114 7 175 118 6 180 123 7
54610-185 133 11 197 138 11 210 150 10 219 162 10
54611-226 170 11 236 178 12 236 178 12 234 174 13
54612-219 162 10 197 138 11 163 110 8 130 83 6
54613- 91 60 6 10 10 10 2 2 6 2 2 6
54614- 18 18 18 38 38 38 38 38 38 38 38 38
54615- 38 38 38 38 38 38 38 38 38 38 38 38
54616- 38 38 38 38 38 38 26 26 26 2 2 6
54617- 2 2 6 6 6 6 70 47 6 137 92 6
54618-175 118 6 200 144 11 219 162 10 230 174 11
54619-234 174 13 230 174 11 219 162 10 210 150 10
54620-192 133 9 163 110 8 124 112 88 82 82 82
54621- 50 50 50 30 30 30 14 14 14 6 6 6
54622- 0 0 0 0 0 0 0 0 0 0 0 0
54623- 0 0 0 0 0 0 0 0 0 0 0 0
54624- 0 0 0 0 0 0 0 0 0 0 0 0
54625- 0 0 0 0 0 0 0 0 0 0 0 0
54626- 0 0 0 0 0 0 0 0 0 0 0 0
54627- 6 6 6 14 14 14 22 22 22 34 34 34
54628- 42 42 42 58 58 58 74 74 74 86 86 86
54629-101 98 89 122 102 70 130 98 46 121 87 25
54630-137 92 6 152 99 6 163 110 8 180 123 7
54631-185 133 11 197 138 11 206 145 10 200 144 11
54632-180 123 7 156 107 11 130 83 6 104 69 6
54633- 50 34 6 54 54 54 110 110 110 101 98 89
54634- 86 86 86 82 82 82 78 78 78 78 78 78
54635- 78 78 78 78 78 78 78 78 78 78 78 78
54636- 78 78 78 82 82 82 86 86 86 94 94 94
54637-106 106 106 101 101 101 86 66 34 124 80 6
54638-156 107 11 180 123 7 192 133 9 200 144 11
54639-206 145 10 200 144 11 192 133 9 175 118 6
54640-139 102 15 109 106 95 70 70 70 42 42 42
54641- 22 22 22 10 10 10 0 0 0 0 0 0
54642- 0 0 0 0 0 0 0 0 0 0 0 0
54643- 0 0 0 0 0 0 0 0 0 0 0 0
54644- 0 0 0 0 0 0 0 0 0 0 0 0
54645- 0 0 0 0 0 0 0 0 0 0 0 0
54646- 0 0 0 0 0 0 0 0 0 0 0 0
54647- 0 0 0 0 0 0 6 6 6 10 10 10
54648- 14 14 14 22 22 22 30 30 30 38 38 38
54649- 50 50 50 62 62 62 74 74 74 90 90 90
54650-101 98 89 112 100 78 121 87 25 124 80 6
54651-137 92 6 152 99 6 152 99 6 152 99 6
54652-138 86 6 124 80 6 98 70 6 86 66 30
54653-101 98 89 82 82 82 58 58 58 46 46 46
54654- 38 38 38 34 34 34 34 34 34 34 34 34
54655- 34 34 34 34 34 34 34 34 34 34 34 34
54656- 34 34 34 34 34 34 38 38 38 42 42 42
54657- 54 54 54 82 82 82 94 86 76 91 60 6
54658-134 86 6 156 107 11 167 114 7 175 118 6
54659-175 118 6 167 114 7 152 99 6 121 87 25
54660-101 98 89 62 62 62 34 34 34 18 18 18
54661- 6 6 6 0 0 0 0 0 0 0 0 0
54662- 0 0 0 0 0 0 0 0 0 0 0 0
54663- 0 0 0 0 0 0 0 0 0 0 0 0
54664- 0 0 0 0 0 0 0 0 0 0 0 0
54665- 0 0 0 0 0 0 0 0 0 0 0 0
54666- 0 0 0 0 0 0 0 0 0 0 0 0
54667- 0 0 0 0 0 0 0 0 0 0 0 0
54668- 0 0 0 6 6 6 6 6 6 10 10 10
54669- 18 18 18 22 22 22 30 30 30 42 42 42
54670- 50 50 50 66 66 66 86 86 86 101 98 89
54671-106 86 58 98 70 6 104 69 6 104 69 6
54672-104 69 6 91 60 6 82 62 34 90 90 90
54673- 62 62 62 38 38 38 22 22 22 14 14 14
54674- 10 10 10 10 10 10 10 10 10 10 10 10
54675- 10 10 10 10 10 10 6 6 6 10 10 10
54676- 10 10 10 10 10 10 10 10 10 14 14 14
54677- 22 22 22 42 42 42 70 70 70 89 81 66
54678- 80 54 7 104 69 6 124 80 6 137 92 6
54679-134 86 6 116 81 8 100 82 52 86 86 86
54680- 58 58 58 30 30 30 14 14 14 6 6 6
54681- 0 0 0 0 0 0 0 0 0 0 0 0
54682- 0 0 0 0 0 0 0 0 0 0 0 0
54683- 0 0 0 0 0 0 0 0 0 0 0 0
54684- 0 0 0 0 0 0 0 0 0 0 0 0
54685- 0 0 0 0 0 0 0 0 0 0 0 0
54686- 0 0 0 0 0 0 0 0 0 0 0 0
54687- 0 0 0 0 0 0 0 0 0 0 0 0
54688- 0 0 0 0 0 0 0 0 0 0 0 0
54689- 0 0 0 6 6 6 10 10 10 14 14 14
54690- 18 18 18 26 26 26 38 38 38 54 54 54
54691- 70 70 70 86 86 86 94 86 76 89 81 66
54692- 89 81 66 86 86 86 74 74 74 50 50 50
54693- 30 30 30 14 14 14 6 6 6 0 0 0
54694- 0 0 0 0 0 0 0 0 0 0 0 0
54695- 0 0 0 0 0 0 0 0 0 0 0 0
54696- 0 0 0 0 0 0 0 0 0 0 0 0
54697- 6 6 6 18 18 18 34 34 34 58 58 58
54698- 82 82 82 89 81 66 89 81 66 89 81 66
54699- 94 86 66 94 86 76 74 74 74 50 50 50
54700- 26 26 26 14 14 14 6 6 6 0 0 0
54701- 0 0 0 0 0 0 0 0 0 0 0 0
54702- 0 0 0 0 0 0 0 0 0 0 0 0
54703- 0 0 0 0 0 0 0 0 0 0 0 0
54704- 0 0 0 0 0 0 0 0 0 0 0 0
54705- 0 0 0 0 0 0 0 0 0 0 0 0
54706- 0 0 0 0 0 0 0 0 0 0 0 0
54707- 0 0 0 0 0 0 0 0 0 0 0 0
54708- 0 0 0 0 0 0 0 0 0 0 0 0
54709- 0 0 0 0 0 0 0 0 0 0 0 0
54710- 6 6 6 6 6 6 14 14 14 18 18 18
54711- 30 30 30 38 38 38 46 46 46 54 54 54
54712- 50 50 50 42 42 42 30 30 30 18 18 18
54713- 10 10 10 0 0 0 0 0 0 0 0 0
54714- 0 0 0 0 0 0 0 0 0 0 0 0
54715- 0 0 0 0 0 0 0 0 0 0 0 0
54716- 0 0 0 0 0 0 0 0 0 0 0 0
54717- 0 0 0 6 6 6 14 14 14 26 26 26
54718- 38 38 38 50 50 50 58 58 58 58 58 58
54719- 54 54 54 42 42 42 30 30 30 18 18 18
54720- 10 10 10 0 0 0 0 0 0 0 0 0
54721- 0 0 0 0 0 0 0 0 0 0 0 0
54722- 0 0 0 0 0 0 0 0 0 0 0 0
54723- 0 0 0 0 0 0 0 0 0 0 0 0
54724- 0 0 0 0 0 0 0 0 0 0 0 0
54725- 0 0 0 0 0 0 0 0 0 0 0 0
54726- 0 0 0 0 0 0 0 0 0 0 0 0
54727- 0 0 0 0 0 0 0 0 0 0 0 0
54728- 0 0 0 0 0 0 0 0 0 0 0 0
54729- 0 0 0 0 0 0 0 0 0 0 0 0
54730- 0 0 0 0 0 0 0 0 0 6 6 6
54731- 6 6 6 10 10 10 14 14 14 18 18 18
54732- 18 18 18 14 14 14 10 10 10 6 6 6
54733- 0 0 0 0 0 0 0 0 0 0 0 0
54734- 0 0 0 0 0 0 0 0 0 0 0 0
54735- 0 0 0 0 0 0 0 0 0 0 0 0
54736- 0 0 0 0 0 0 0 0 0 0 0 0
54737- 0 0 0 0 0 0 0 0 0 6 6 6
54738- 14 14 14 18 18 18 22 22 22 22 22 22
54739- 18 18 18 14 14 14 10 10 10 6 6 6
54740- 0 0 0 0 0 0 0 0 0 0 0 0
54741- 0 0 0 0 0 0 0 0 0 0 0 0
54742- 0 0 0 0 0 0 0 0 0 0 0 0
54743- 0 0 0 0 0 0 0 0 0 0 0 0
54744- 0 0 0 0 0 0 0 0 0 0 0 0
54745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54752+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54758+4 4 4 4 4 4
54759+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54766+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54772+4 4 4 4 4 4
54773+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54778+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54786+4 4 4 4 4 4
54787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54800+4 4 4 4 4 4
54801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54814+4 4 4 4 4 4
54815+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54828+4 4 4 4 4 4
54829+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54833+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
54834+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
54835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54838+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
54839+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
54840+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
54841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54842+4 4 4 4 4 4
54843+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54847+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
54848+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
54849+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54852+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
54853+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
54854+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
54855+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54856+4 4 4 4 4 4
54857+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54861+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
54862+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
54863+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
54864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54866+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
54867+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
54868+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
54869+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
54870+4 4 4 4 4 4
54871+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54872+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54873+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54874+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
54875+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
54876+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
54877+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
54878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54879+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
54880+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
54881+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
54882+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
54883+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
54884+4 4 4 4 4 4
54885+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54886+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54887+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54888+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
54889+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
54890+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
54891+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
54892+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
54893+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
54894+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
54895+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
54896+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
54897+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
54898+4 4 4 4 4 4
54899+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54900+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54901+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
54902+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
54903+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
54904+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
54905+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
54906+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
54907+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
54908+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
54909+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
54910+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
54911+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
54912+4 4 4 4 4 4
54913+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54914+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54915+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
54916+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
54917+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
54918+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
54919+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
54920+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
54921+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
54922+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
54923+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
54924+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
54925+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
54926+4 4 4 4 4 4
54927+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54928+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54929+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
54930+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
54931+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
54932+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
54933+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
54934+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
54935+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
54936+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
54937+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
54938+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
54939+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
54940+4 4 4 4 4 4
54941+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54942+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54943+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
54944+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
54945+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
54946+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
54947+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
54948+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
54949+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
54950+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
54951+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
54952+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
54953+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
54954+4 4 4 4 4 4
54955+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54956+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54957+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
54958+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
54959+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
54960+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
54961+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
54962+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
54963+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
54964+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
54965+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
54966+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
54967+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
54968+4 4 4 4 4 4
54969+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54970+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
54971+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
54972+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
54973+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
54974+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
54975+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
54976+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
54977+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
54978+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
54979+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
54980+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
54981+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
54982+4 4 4 4 4 4
54983+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
54984+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
54985+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
54986+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
54987+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
54988+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
54989+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
54990+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
54991+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
54992+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
54993+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
54994+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
54995+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
54996+0 0 0 4 4 4
54997+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
54998+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
54999+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
55000+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
55001+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
55002+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
55003+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
55004+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
55005+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
55006+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
55007+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
55008+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
55009+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
55010+2 0 0 0 0 0
55011+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
55012+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
55013+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
55014+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
55015+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
55016+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
55017+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
55018+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
55019+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
55020+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
55021+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
55022+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
55023+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
55024+37 38 37 0 0 0
55025+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
55026+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
55027+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
55028+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
55029+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
55030+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
55031+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
55032+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
55033+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
55034+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
55035+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
55036+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
55037+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
55038+85 115 134 4 0 0
55039+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
55040+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
55041+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
55042+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
55043+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
55044+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
55045+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
55046+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
55047+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
55048+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
55049+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
55050+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
55051+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
55052+60 73 81 4 0 0
55053+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
55054+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
55055+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
55056+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
55057+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
55058+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
55059+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
55060+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
55061+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
55062+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
55063+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
55064+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
55065+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
55066+16 19 21 4 0 0
55067+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
55068+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
55069+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
55070+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
55071+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
55072+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
55073+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
55074+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
55075+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
55076+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
55077+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
55078+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
55079+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
55080+4 0 0 4 3 3
55081+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
55082+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
55083+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
55084+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
55085+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
55086+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
55087+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
55088+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
55089+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
55090+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
55091+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
55092+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
55093+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
55094+3 2 2 4 4 4
55095+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
55096+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
55097+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
55098+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
55099+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
55100+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
55101+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
55102+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
55103+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
55104+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
55105+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
55106+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
55107+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
55108+4 4 4 4 4 4
55109+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
55110+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
55111+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
55112+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
55113+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
55114+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
55115+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
55116+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
55117+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
55118+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
55119+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
55120+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
55121+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
55122+4 4 4 4 4 4
55123+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
55124+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
55125+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
55126+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
55127+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
55128+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
55129+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
55130+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
55131+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
55132+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
55133+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
55134+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
55135+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
55136+5 5 5 5 5 5
55137+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
55138+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
55139+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
55140+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
55141+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
55142+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55143+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
55144+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
55145+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
55146+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
55147+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
55148+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
55149+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
55150+5 5 5 4 4 4
55151+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
55152+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
55153+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
55154+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
55155+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
55156+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
55157+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
55158+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
55159+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
55160+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
55161+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
55162+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
55163+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55164+4 4 4 4 4 4
55165+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
55166+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
55167+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
55168+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
55169+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
55170+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55171+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55172+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
55173+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
55174+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
55175+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
55176+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
55177+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55178+4 4 4 4 4 4
55179+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
55180+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
55181+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
55182+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
55183+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
55184+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
55185+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
55186+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
55187+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
55188+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
55189+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
55190+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55191+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55192+4 4 4 4 4 4
55193+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
55194+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
55195+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
55196+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
55197+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
55198+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55199+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
55200+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
55201+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
55202+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
55203+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
55204+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55205+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55206+4 4 4 4 4 4
55207+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
55208+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
55209+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
55210+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
55211+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
55212+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
55213+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
55214+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
55215+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
55216+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
55217+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55218+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55219+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55220+4 4 4 4 4 4
55221+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
55222+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
55223+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
55224+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
55225+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
55226+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
55227+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
55228+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
55229+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
55230+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
55231+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
55232+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55233+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55234+4 4 4 4 4 4
55235+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
55236+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
55237+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
55238+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
55239+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
55240+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
55241+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
55242+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
55243+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
55244+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
55245+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
55246+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55247+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55248+4 4 4 4 4 4
55249+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
55250+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
55251+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
55252+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
55253+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
55254+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
55255+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
55256+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
55257+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
55258+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
55259+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55260+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55261+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55262+4 4 4 4 4 4
55263+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
55264+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
55265+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
55266+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
55267+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55268+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
55269+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
55270+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
55271+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
55272+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
55273+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55274+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55275+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55276+4 4 4 4 4 4
55277+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
55278+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
55279+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
55280+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
55281+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55282+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
55283+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
55284+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
55285+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
55286+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
55287+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55288+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55289+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55290+4 4 4 4 4 4
55291+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
55292+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
55293+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
55294+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
55295+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55296+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
55297+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
55298+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
55299+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
55300+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55301+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55302+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55303+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55304+4 4 4 4 4 4
55305+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
55306+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
55307+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
55308+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
55309+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
55310+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
55311+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
55312+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
55313+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55314+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55315+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55316+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55317+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55318+4 4 4 4 4 4
55319+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
55320+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
55321+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
55322+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
55323+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55324+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
55325+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
55326+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
55327+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
55328+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55329+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55330+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55332+4 4 4 4 4 4
55333+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
55334+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
55335+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
55336+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
55337+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
55338+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
55339+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
55340+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
55341+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55342+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55343+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55344+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55346+4 4 4 4 4 4
55347+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
55348+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
55349+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
55350+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
55351+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
55352+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
55353+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
55354+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
55355+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
55356+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55357+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55358+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55360+4 4 4 4 4 4
55361+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
55362+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
55363+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
55364+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
55365+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
55366+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
55367+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
55368+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
55369+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55370+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55371+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55374+4 4 4 4 4 4
55375+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
55376+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
55377+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
55378+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
55379+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
55380+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
55381+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
55382+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
55383+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
55384+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55385+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55388+4 4 4 4 4 4
55389+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
55390+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
55391+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
55392+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
55393+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
55394+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
55395+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
55396+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
55397+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55398+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55399+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55402+4 4 4 4 4 4
55403+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55404+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
55405+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
55406+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
55407+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
55408+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
55409+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
55410+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
55411+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
55412+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55413+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55416+4 4 4 4 4 4
55417+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
55418+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
55419+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
55420+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
55421+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
55422+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
55423+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55424+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
55425+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
55426+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55427+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55430+4 4 4 4 4 4
55431+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55432+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
55433+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
55434+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
55435+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
55436+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
55437+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
55438+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
55439+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
55440+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55441+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55444+4 4 4 4 4 4
55445+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
55446+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
55447+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
55448+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
55449+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
55450+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
55451+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
55452+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
55453+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
55454+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55455+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55458+4 4 4 4 4 4
55459+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55460+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
55461+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
55462+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
55463+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
55464+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
55465+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
55466+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
55467+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
55468+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55469+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55472+4 4 4 4 4 4
55473+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
55474+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
55475+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
55476+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
55477+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
55478+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
55479+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
55480+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
55481+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
55482+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55483+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55486+4 4 4 4 4 4
55487+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
55488+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
55489+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
55490+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
55491+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
55492+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
55493+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
55494+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
55495+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
55496+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
55497+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55500+4 4 4 4 4 4
55501+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
55502+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
55503+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
55504+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
55505+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
55506+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
55507+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
55508+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
55509+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
55510+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
55511+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55514+4 4 4 4 4 4
55515+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
55516+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
55517+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
55518+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
55519+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
55520+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
55521+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
55522+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
55523+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
55524+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
55525+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55528+4 4 4 4 4 4
55529+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
55530+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
55531+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
55532+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
55533+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
55534+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
55535+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55536+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
55537+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
55538+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
55539+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55542+4 4 4 4 4 4
55543+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
55544+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
55545+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
55546+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
55547+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
55548+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
55549+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
55550+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
55551+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
55552+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
55553+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55556+4 4 4 4 4 4
55557+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
55558+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
55559+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
55560+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
55561+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
55562+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
55563+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
55564+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
55565+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
55566+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
55567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55570+4 4 4 4 4 4
55571+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55572+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
55573+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
55574+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
55575+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
55576+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
55577+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
55578+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
55579+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
55580+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
55581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55584+4 4 4 4 4 4
55585+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
55586+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
55587+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
55588+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
55589+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
55590+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
55591+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
55592+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
55593+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
55594+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
55595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55598+4 4 4 4 4 4
55599+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
55600+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
55601+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
55602+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
55603+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
55604+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
55605+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
55606+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
55607+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
55608+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55612+4 4 4 4 4 4
55613+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
55614+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55615+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
55616+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
55617+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
55618+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
55619+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
55620+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
55621+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
55622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55626+4 4 4 4 4 4
55627+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
55628+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
55629+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
55630+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
55631+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
55632+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
55633+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
55634+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
55635+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
55636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55637+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55638+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55640+4 4 4 4 4 4
55641+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
55642+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
55643+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
55644+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
55645+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
55646+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
55647+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
55648+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
55649+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55654+4 4 4 4 4 4
55655+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
55656+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
55657+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
55658+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
55659+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
55660+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
55661+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
55662+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
55663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55668+4 4 4 4 4 4
55669+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
55670+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
55671+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
55672+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
55673+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
55674+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
55675+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
55676+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
55677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55682+4 4 4 4 4 4
55683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55684+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
55685+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55686+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
55687+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
55688+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
55689+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
55690+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
55691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55696+4 4 4 4 4 4
55697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55698+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
55699+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
55700+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
55701+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
55702+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
55703+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
55704+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
55705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55710+4 4 4 4 4 4
55711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55712+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
55713+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
55714+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
55715+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
55716+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
55717+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
55718+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55724+4 4 4 4 4 4
55725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55727+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
55728+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
55729+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
55730+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
55731+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
55732+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
55733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55738+4 4 4 4 4 4
55739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55742+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55743+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
55744+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
55745+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
55746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55752+4 4 4 4 4 4
55753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55756+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
55757+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
55758+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
55759+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
55760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55766+4 4 4 4 4 4
55767+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55770+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
55771+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
55772+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
55773+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
55774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55778+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55780+4 4 4 4 4 4
55781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55784+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
55785+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
55786+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
55787+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
55788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55794+4 4 4 4 4 4
55795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
55799+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
55800+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
55801+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
55802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55808+4 4 4 4 4 4
55809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55813+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
55814+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
55815+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
55816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55822+4 4 4 4 4 4
55823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55827+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
55828+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
55829+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55836+4 4 4 4 4 4
55837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55841+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
55842+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
55843+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55850+4 4 4 4 4 4
55851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55855+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
55856+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
55857+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
55864+4 4 4 4 4 4
55865diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
55866index fef20db..d28b1ab 100644
55867--- a/drivers/xen/xenfs/xenstored.c
55868+++ b/drivers/xen/xenfs/xenstored.c
55869@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
55870 static int xsd_kva_open(struct inode *inode, struct file *file)
55871 {
55872 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
55873+#ifdef CONFIG_GRKERNSEC_HIDESYM
55874+ NULL);
55875+#else
55876 xen_store_interface);
55877+#endif
55878+
55879 if (!file->private_data)
55880 return -ENOMEM;
55881 return 0;
55882diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
55883index c71e886..61d3d44b 100644
55884--- a/fs/9p/vfs_addr.c
55885+++ b/fs/9p/vfs_addr.c
55886@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
55887
55888 retval = v9fs_file_write_internal(inode,
55889 v9inode->writeback_fid,
55890- (__force const char __user *)buffer,
55891+ (const char __force_user *)buffer,
55892 len, &offset, 0);
55893 if (retval > 0)
55894 retval = 0;
55895diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
55896index 53161ec..e261d8a 100644
55897--- a/fs/9p/vfs_inode.c
55898+++ b/fs/9p/vfs_inode.c
55899@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
55900 void
55901 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
55902 {
55903- char *s = nd_get_link(nd);
55904+ const char *s = nd_get_link(nd);
55905
55906 p9_debug(P9_DEBUG_VFS, " %s %s\n",
55907 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
55908diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
55909index 370b24c..ff0be7b 100644
55910--- a/fs/Kconfig.binfmt
55911+++ b/fs/Kconfig.binfmt
55912@@ -103,7 +103,7 @@ config HAVE_AOUT
55913
55914 config BINFMT_AOUT
55915 tristate "Kernel support for a.out and ECOFF binaries"
55916- depends on HAVE_AOUT
55917+ depends on HAVE_AOUT && BROKEN
55918 ---help---
55919 A.out (Assembler.OUTput) is a set of formats for libraries and
55920 executables used in the earliest versions of UNIX. Linux used
55921diff --git a/fs/afs/inode.c b/fs/afs/inode.c
55922index 2946712..f737435 100644
55923--- a/fs/afs/inode.c
55924+++ b/fs/afs/inode.c
55925@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
55926 struct afs_vnode *vnode;
55927 struct super_block *sb;
55928 struct inode *inode;
55929- static atomic_t afs_autocell_ino;
55930+ static atomic_unchecked_t afs_autocell_ino;
55931
55932 _enter("{%x:%u},%*.*s,",
55933 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
55934@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
55935 data.fid.unique = 0;
55936 data.fid.vnode = 0;
55937
55938- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
55939+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
55940 afs_iget5_autocell_test, afs_iget5_set,
55941 &data);
55942 if (!inode) {
55943diff --git a/fs/aio.c b/fs/aio.c
55944index e609e15..c9fcd97 100644
55945--- a/fs/aio.c
55946+++ b/fs/aio.c
55947@@ -380,7 +380,7 @@ static int aio_setup_ring(struct kioctx *ctx)
55948 size += sizeof(struct io_event) * nr_events;
55949
55950 nr_pages = PFN_UP(size);
55951- if (nr_pages < 0)
55952+ if (nr_pages <= 0)
55953 return -EINVAL;
55954
55955 file = aio_private_file(ctx, nr_pages);
55956diff --git a/fs/attr.c b/fs/attr.c
55957index 6530ced..4a827e2 100644
55958--- a/fs/attr.c
55959+++ b/fs/attr.c
55960@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
55961 unsigned long limit;
55962
55963 limit = rlimit(RLIMIT_FSIZE);
55964+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
55965 if (limit != RLIM_INFINITY && offset > limit)
55966 goto out_sig;
55967 if (offset > inode->i_sb->s_maxbytes)
55968diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
55969index 116fd38..c04182da 100644
55970--- a/fs/autofs4/waitq.c
55971+++ b/fs/autofs4/waitq.c
55972@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
55973 {
55974 unsigned long sigpipe, flags;
55975 mm_segment_t fs;
55976- const char *data = (const char *)addr;
55977+ const char __user *data = (const char __force_user *)addr;
55978 ssize_t wr = 0;
55979
55980 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
55981@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
55982 return 1;
55983 }
55984
55985+#ifdef CONFIG_GRKERNSEC_HIDESYM
55986+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
55987+#endif
55988+
55989 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
55990 enum autofs_notify notify)
55991 {
55992@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
55993
55994 /* If this is a direct mount request create a dummy name */
55995 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
55996+#ifdef CONFIG_GRKERNSEC_HIDESYM
55997+ /* this name does get written to userland via autofs4_write() */
55998+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
55999+#else
56000 qstr.len = sprintf(name, "%p", dentry);
56001+#endif
56002 else {
56003 qstr.len = autofs4_getpath(sbi, dentry, &name);
56004 if (!qstr.len) {
56005diff --git a/fs/befs/endian.h b/fs/befs/endian.h
56006index 2722387..56059b5 100644
56007--- a/fs/befs/endian.h
56008+++ b/fs/befs/endian.h
56009@@ -11,7 +11,7 @@
56010
56011 #include <asm/byteorder.h>
56012
56013-static inline u64
56014+static inline u64 __intentional_overflow(-1)
56015 fs64_to_cpu(const struct super_block *sb, fs64 n)
56016 {
56017 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
56018@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
56019 return (__force fs64)cpu_to_be64(n);
56020 }
56021
56022-static inline u32
56023+static inline u32 __intentional_overflow(-1)
56024 fs32_to_cpu(const struct super_block *sb, fs32 n)
56025 {
56026 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
56027@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
56028 return (__force fs32)cpu_to_be32(n);
56029 }
56030
56031-static inline u16
56032+static inline u16 __intentional_overflow(-1)
56033 fs16_to_cpu(const struct super_block *sb, fs16 n)
56034 {
56035 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
56036diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
56037index ca0ba15..0fa3257 100644
56038--- a/fs/binfmt_aout.c
56039+++ b/fs/binfmt_aout.c
56040@@ -16,6 +16,7 @@
56041 #include <linux/string.h>
56042 #include <linux/fs.h>
56043 #include <linux/file.h>
56044+#include <linux/security.h>
56045 #include <linux/stat.h>
56046 #include <linux/fcntl.h>
56047 #include <linux/ptrace.h>
56048@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
56049 #endif
56050 # define START_STACK(u) ((void __user *)u.start_stack)
56051
56052+ memset(&dump, 0, sizeof(dump));
56053+
56054 fs = get_fs();
56055 set_fs(KERNEL_DS);
56056 has_dumped = 1;
56057@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
56058
56059 /* If the size of the dump file exceeds the rlimit, then see what would happen
56060 if we wrote the stack, but not the data area. */
56061+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
56062 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
56063 dump.u_dsize = 0;
56064
56065 /* Make sure we have enough room to write the stack and data areas. */
56066+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
56067 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
56068 dump.u_ssize = 0;
56069
56070@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
56071 rlim = rlimit(RLIMIT_DATA);
56072 if (rlim >= RLIM_INFINITY)
56073 rlim = ~0;
56074+
56075+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
56076 if (ex.a_data + ex.a_bss > rlim)
56077 return -ENOMEM;
56078
56079@@ -264,6 +271,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
56080
56081 install_exec_creds(bprm);
56082
56083+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56084+ current->mm->pax_flags = 0UL;
56085+#endif
56086+
56087+#ifdef CONFIG_PAX_PAGEEXEC
56088+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
56089+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
56090+
56091+#ifdef CONFIG_PAX_EMUTRAMP
56092+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
56093+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
56094+#endif
56095+
56096+#ifdef CONFIG_PAX_MPROTECT
56097+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
56098+ current->mm->pax_flags |= MF_PAX_MPROTECT;
56099+#endif
56100+
56101+ }
56102+#endif
56103+
56104 if (N_MAGIC(ex) == OMAGIC) {
56105 unsigned long text_addr, map_size;
56106 loff_t pos;
56107@@ -321,7 +349,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
56108 }
56109
56110 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
56111- PROT_READ | PROT_WRITE | PROT_EXEC,
56112+ PROT_READ | PROT_WRITE,
56113 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
56114 fd_offset + ex.a_text);
56115 if (error != N_DATADDR(ex)) {
56116diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
56117index aa3cb62..bc53934 100644
56118--- a/fs/binfmt_elf.c
56119+++ b/fs/binfmt_elf.c
56120@@ -34,6 +34,7 @@
56121 #include <linux/utsname.h>
56122 #include <linux/coredump.h>
56123 #include <linux/sched.h>
56124+#include <linux/xattr.h>
56125 #include <asm/uaccess.h>
56126 #include <asm/param.h>
56127 #include <asm/page.h>
56128@@ -47,7 +48,7 @@
56129
56130 static int load_elf_binary(struct linux_binprm *bprm);
56131 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
56132- int, int, unsigned long);
56133+ int, int, unsigned long) __intentional_overflow(-1);
56134
56135 #ifdef CONFIG_USELIB
56136 static int load_elf_library(struct file *);
56137@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
56138 #define elf_core_dump NULL
56139 #endif
56140
56141+#ifdef CONFIG_PAX_MPROTECT
56142+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
56143+#endif
56144+
56145+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56146+static void elf_handle_mmap(struct file *file);
56147+#endif
56148+
56149 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
56150 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
56151 #else
56152@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
56153 .load_binary = load_elf_binary,
56154 .load_shlib = load_elf_library,
56155 .core_dump = elf_core_dump,
56156+
56157+#ifdef CONFIG_PAX_MPROTECT
56158+ .handle_mprotect= elf_handle_mprotect,
56159+#endif
56160+
56161+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
56162+ .handle_mmap = elf_handle_mmap,
56163+#endif
56164+
56165 .min_coredump = ELF_EXEC_PAGESIZE,
56166 };
56167
56168@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
56169
56170 static int set_brk(unsigned long start, unsigned long end)
56171 {
56172+ unsigned long e = end;
56173+
56174 start = ELF_PAGEALIGN(start);
56175 end = ELF_PAGEALIGN(end);
56176 if (end > start) {
56177@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
56178 if (BAD_ADDR(addr))
56179 return addr;
56180 }
56181- current->mm->start_brk = current->mm->brk = end;
56182+ current->mm->start_brk = current->mm->brk = e;
56183 return 0;
56184 }
56185
56186@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56187 elf_addr_t __user *u_rand_bytes;
56188 const char *k_platform = ELF_PLATFORM;
56189 const char *k_base_platform = ELF_BASE_PLATFORM;
56190- unsigned char k_rand_bytes[16];
56191+ u32 k_rand_bytes[4];
56192 int items;
56193 elf_addr_t *elf_info;
56194 int ei_index = 0;
56195 const struct cred *cred = current_cred();
56196 struct vm_area_struct *vma;
56197+ unsigned long saved_auxv[AT_VECTOR_SIZE];
56198
56199 /*
56200 * In some cases (e.g. Hyper-Threading), we want to avoid L1
56201@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56202 * Generate 16 random bytes for userspace PRNG seeding.
56203 */
56204 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
56205- u_rand_bytes = (elf_addr_t __user *)
56206- STACK_ALLOC(p, sizeof(k_rand_bytes));
56207+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
56208+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
56209+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
56210+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
56211+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
56212+ u_rand_bytes = (elf_addr_t __user *) p;
56213 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
56214 return -EFAULT;
56215
56216@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
56217 return -EFAULT;
56218 current->mm->env_end = p;
56219
56220+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
56221+
56222 /* Put the elf_info on the stack in the right place. */
56223 sp = (elf_addr_t __user *)envp + 1;
56224- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
56225+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
56226 return -EFAULT;
56227 return 0;
56228 }
56229@@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
56230 an ELF header */
56231
56232 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56233- struct file *interpreter, unsigned long *interp_map_addr,
56234- unsigned long no_base)
56235+ struct file *interpreter, unsigned long no_base)
56236 {
56237 struct elf_phdr *elf_phdata;
56238 struct elf_phdr *eppnt;
56239- unsigned long load_addr = 0;
56240+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
56241 int load_addr_set = 0;
56242 unsigned long last_bss = 0, elf_bss = 0;
56243- unsigned long error = ~0UL;
56244+ unsigned long error = -EINVAL;
56245 unsigned long total_size;
56246 int retval, i, size;
56247
56248@@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56249 goto out_close;
56250 }
56251
56252+#ifdef CONFIG_PAX_SEGMEXEC
56253+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
56254+ pax_task_size = SEGMEXEC_TASK_SIZE;
56255+#endif
56256+
56257 eppnt = elf_phdata;
56258 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
56259 if (eppnt->p_type == PT_LOAD) {
56260@@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56261 map_addr = elf_map(interpreter, load_addr + vaddr,
56262 eppnt, elf_prot, elf_type, total_size);
56263 total_size = 0;
56264- if (!*interp_map_addr)
56265- *interp_map_addr = map_addr;
56266 error = map_addr;
56267 if (BAD_ADDR(map_addr))
56268 goto out_close;
56269@@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56270 k = load_addr + eppnt->p_vaddr;
56271 if (BAD_ADDR(k) ||
56272 eppnt->p_filesz > eppnt->p_memsz ||
56273- eppnt->p_memsz > TASK_SIZE ||
56274- TASK_SIZE - eppnt->p_memsz < k) {
56275+ eppnt->p_memsz > pax_task_size ||
56276+ pax_task_size - eppnt->p_memsz < k) {
56277 error = -ENOMEM;
56278 goto out_close;
56279 }
56280@@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
56281 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
56282
56283 /* Map the last of the bss segment */
56284- error = vm_brk(elf_bss, last_bss - elf_bss);
56285- if (BAD_ADDR(error))
56286- goto out_close;
56287+ if (last_bss > elf_bss) {
56288+ error = vm_brk(elf_bss, last_bss - elf_bss);
56289+ if (BAD_ADDR(error))
56290+ goto out_close;
56291+ }
56292 }
56293
56294 error = load_addr;
56295@@ -543,6 +574,336 @@ out:
56296 return error;
56297 }
56298
56299+#ifdef CONFIG_PAX_PT_PAX_FLAGS
56300+#ifdef CONFIG_PAX_SOFTMODE
56301+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
56302+{
56303+ unsigned long pax_flags = 0UL;
56304+
56305+#ifdef CONFIG_PAX_PAGEEXEC
56306+ if (elf_phdata->p_flags & PF_PAGEEXEC)
56307+ pax_flags |= MF_PAX_PAGEEXEC;
56308+#endif
56309+
56310+#ifdef CONFIG_PAX_SEGMEXEC
56311+ if (elf_phdata->p_flags & PF_SEGMEXEC)
56312+ pax_flags |= MF_PAX_SEGMEXEC;
56313+#endif
56314+
56315+#ifdef CONFIG_PAX_EMUTRAMP
56316+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
56317+ pax_flags |= MF_PAX_EMUTRAMP;
56318+#endif
56319+
56320+#ifdef CONFIG_PAX_MPROTECT
56321+ if (elf_phdata->p_flags & PF_MPROTECT)
56322+ pax_flags |= MF_PAX_MPROTECT;
56323+#endif
56324+
56325+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56326+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
56327+ pax_flags |= MF_PAX_RANDMMAP;
56328+#endif
56329+
56330+ return pax_flags;
56331+}
56332+#endif
56333+
56334+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
56335+{
56336+ unsigned long pax_flags = 0UL;
56337+
56338+#ifdef CONFIG_PAX_PAGEEXEC
56339+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
56340+ pax_flags |= MF_PAX_PAGEEXEC;
56341+#endif
56342+
56343+#ifdef CONFIG_PAX_SEGMEXEC
56344+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
56345+ pax_flags |= MF_PAX_SEGMEXEC;
56346+#endif
56347+
56348+#ifdef CONFIG_PAX_EMUTRAMP
56349+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
56350+ pax_flags |= MF_PAX_EMUTRAMP;
56351+#endif
56352+
56353+#ifdef CONFIG_PAX_MPROTECT
56354+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
56355+ pax_flags |= MF_PAX_MPROTECT;
56356+#endif
56357+
56358+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56359+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
56360+ pax_flags |= MF_PAX_RANDMMAP;
56361+#endif
56362+
56363+ return pax_flags;
56364+}
56365+#endif
56366+
56367+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
56368+#ifdef CONFIG_PAX_SOFTMODE
56369+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
56370+{
56371+ unsigned long pax_flags = 0UL;
56372+
56373+#ifdef CONFIG_PAX_PAGEEXEC
56374+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
56375+ pax_flags |= MF_PAX_PAGEEXEC;
56376+#endif
56377+
56378+#ifdef CONFIG_PAX_SEGMEXEC
56379+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
56380+ pax_flags |= MF_PAX_SEGMEXEC;
56381+#endif
56382+
56383+#ifdef CONFIG_PAX_EMUTRAMP
56384+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
56385+ pax_flags |= MF_PAX_EMUTRAMP;
56386+#endif
56387+
56388+#ifdef CONFIG_PAX_MPROTECT
56389+ if (pax_flags_softmode & MF_PAX_MPROTECT)
56390+ pax_flags |= MF_PAX_MPROTECT;
56391+#endif
56392+
56393+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56394+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
56395+ pax_flags |= MF_PAX_RANDMMAP;
56396+#endif
56397+
56398+ return pax_flags;
56399+}
56400+#endif
56401+
56402+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
56403+{
56404+ unsigned long pax_flags = 0UL;
56405+
56406+#ifdef CONFIG_PAX_PAGEEXEC
56407+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
56408+ pax_flags |= MF_PAX_PAGEEXEC;
56409+#endif
56410+
56411+#ifdef CONFIG_PAX_SEGMEXEC
56412+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
56413+ pax_flags |= MF_PAX_SEGMEXEC;
56414+#endif
56415+
56416+#ifdef CONFIG_PAX_EMUTRAMP
56417+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
56418+ pax_flags |= MF_PAX_EMUTRAMP;
56419+#endif
56420+
56421+#ifdef CONFIG_PAX_MPROTECT
56422+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
56423+ pax_flags |= MF_PAX_MPROTECT;
56424+#endif
56425+
56426+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
56427+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
56428+ pax_flags |= MF_PAX_RANDMMAP;
56429+#endif
56430+
56431+ return pax_flags;
56432+}
56433+#endif
56434+
56435+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56436+static unsigned long pax_parse_defaults(void)
56437+{
56438+ unsigned long pax_flags = 0UL;
56439+
56440+#ifdef CONFIG_PAX_SOFTMODE
56441+ if (pax_softmode)
56442+ return pax_flags;
56443+#endif
56444+
56445+#ifdef CONFIG_PAX_PAGEEXEC
56446+ pax_flags |= MF_PAX_PAGEEXEC;
56447+#endif
56448+
56449+#ifdef CONFIG_PAX_SEGMEXEC
56450+ pax_flags |= MF_PAX_SEGMEXEC;
56451+#endif
56452+
56453+#ifdef CONFIG_PAX_MPROTECT
56454+ pax_flags |= MF_PAX_MPROTECT;
56455+#endif
56456+
56457+#ifdef CONFIG_PAX_RANDMMAP
56458+ if (randomize_va_space)
56459+ pax_flags |= MF_PAX_RANDMMAP;
56460+#endif
56461+
56462+ return pax_flags;
56463+}
56464+
56465+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
56466+{
56467+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
56468+
56469+#ifdef CONFIG_PAX_EI_PAX
56470+
56471+#ifdef CONFIG_PAX_SOFTMODE
56472+ if (pax_softmode)
56473+ return pax_flags;
56474+#endif
56475+
56476+ pax_flags = 0UL;
56477+
56478+#ifdef CONFIG_PAX_PAGEEXEC
56479+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
56480+ pax_flags |= MF_PAX_PAGEEXEC;
56481+#endif
56482+
56483+#ifdef CONFIG_PAX_SEGMEXEC
56484+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
56485+ pax_flags |= MF_PAX_SEGMEXEC;
56486+#endif
56487+
56488+#ifdef CONFIG_PAX_EMUTRAMP
56489+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
56490+ pax_flags |= MF_PAX_EMUTRAMP;
56491+#endif
56492+
56493+#ifdef CONFIG_PAX_MPROTECT
56494+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
56495+ pax_flags |= MF_PAX_MPROTECT;
56496+#endif
56497+
56498+#ifdef CONFIG_PAX_ASLR
56499+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
56500+ pax_flags |= MF_PAX_RANDMMAP;
56501+#endif
56502+
56503+#endif
56504+
56505+ return pax_flags;
56506+
56507+}
56508+
56509+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
56510+{
56511+
56512+#ifdef CONFIG_PAX_PT_PAX_FLAGS
56513+ unsigned long i;
56514+
56515+ for (i = 0UL; i < elf_ex->e_phnum; i++)
56516+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
56517+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
56518+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
56519+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
56520+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
56521+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
56522+ return PAX_PARSE_FLAGS_FALLBACK;
56523+
56524+#ifdef CONFIG_PAX_SOFTMODE
56525+ if (pax_softmode)
56526+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
56527+ else
56528+#endif
56529+
56530+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
56531+ break;
56532+ }
56533+#endif
56534+
56535+ return PAX_PARSE_FLAGS_FALLBACK;
56536+}
56537+
56538+static unsigned long pax_parse_xattr_pax(struct file * const file)
56539+{
56540+
56541+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
56542+ ssize_t xattr_size, i;
56543+ unsigned char xattr_value[sizeof("pemrs") - 1];
56544+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
56545+
56546+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
56547+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
56548+ return PAX_PARSE_FLAGS_FALLBACK;
56549+
56550+ for (i = 0; i < xattr_size; i++)
56551+ switch (xattr_value[i]) {
56552+ default:
56553+ return PAX_PARSE_FLAGS_FALLBACK;
56554+
56555+#define parse_flag(option1, option2, flag) \
56556+ case option1: \
56557+ if (pax_flags_hardmode & MF_PAX_##flag) \
56558+ return PAX_PARSE_FLAGS_FALLBACK;\
56559+ pax_flags_hardmode |= MF_PAX_##flag; \
56560+ break; \
56561+ case option2: \
56562+ if (pax_flags_softmode & MF_PAX_##flag) \
56563+ return PAX_PARSE_FLAGS_FALLBACK;\
56564+ pax_flags_softmode |= MF_PAX_##flag; \
56565+ break;
56566+
56567+ parse_flag('p', 'P', PAGEEXEC);
56568+ parse_flag('e', 'E', EMUTRAMP);
56569+ parse_flag('m', 'M', MPROTECT);
56570+ parse_flag('r', 'R', RANDMMAP);
56571+ parse_flag('s', 'S', SEGMEXEC);
56572+
56573+#undef parse_flag
56574+ }
56575+
56576+ if (pax_flags_hardmode & pax_flags_softmode)
56577+ return PAX_PARSE_FLAGS_FALLBACK;
56578+
56579+#ifdef CONFIG_PAX_SOFTMODE
56580+ if (pax_softmode)
56581+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
56582+ else
56583+#endif
56584+
56585+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
56586+#else
56587+ return PAX_PARSE_FLAGS_FALLBACK;
56588+#endif
56589+
56590+}
56591+
56592+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
56593+{
56594+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
56595+
56596+ pax_flags = pax_parse_defaults();
56597+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
56598+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
56599+ xattr_pax_flags = pax_parse_xattr_pax(file);
56600+
56601+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
56602+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
56603+ pt_pax_flags != xattr_pax_flags)
56604+ return -EINVAL;
56605+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56606+ pax_flags = xattr_pax_flags;
56607+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56608+ pax_flags = pt_pax_flags;
56609+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
56610+ pax_flags = ei_pax_flags;
56611+
56612+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
56613+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56614+ if ((__supported_pte_mask & _PAGE_NX))
56615+ pax_flags &= ~MF_PAX_SEGMEXEC;
56616+ else
56617+ pax_flags &= ~MF_PAX_PAGEEXEC;
56618+ }
56619+#endif
56620+
56621+ if (0 > pax_check_flags(&pax_flags))
56622+ return -EINVAL;
56623+
56624+ current->mm->pax_flags = pax_flags;
56625+ return 0;
56626+}
56627+#endif
56628+
56629 /*
56630 * These are the functions used to load ELF style executables and shared
56631 * libraries. There is no binary dependent code anywhere else.
56632@@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
56633 {
56634 unsigned int random_variable = 0;
56635
56636+#ifdef CONFIG_PAX_RANDUSTACK
56637+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
56638+ return stack_top - current->mm->delta_stack;
56639+#endif
56640+
56641 if ((current->flags & PF_RANDOMIZE) &&
56642 !(current->personality & ADDR_NO_RANDOMIZE)) {
56643 random_variable = get_random_int() & STACK_RND_MASK;
56644@@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
56645 unsigned long load_addr = 0, load_bias = 0;
56646 int load_addr_set = 0;
56647 char * elf_interpreter = NULL;
56648- unsigned long error;
56649+ unsigned long error = 0;
56650 struct elf_phdr *elf_ppnt, *elf_phdata;
56651 unsigned long elf_bss, elf_brk;
56652 int retval, i;
56653@@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
56654 struct elfhdr elf_ex;
56655 struct elfhdr interp_elf_ex;
56656 } *loc;
56657+ unsigned long pax_task_size;
56658
56659 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
56660 if (!loc) {
56661@@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
56662 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
56663 may depend on the personality. */
56664 SET_PERSONALITY(loc->elf_ex);
56665+
56666+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56667+ current->mm->pax_flags = 0UL;
56668+#endif
56669+
56670+#ifdef CONFIG_PAX_DLRESOLVE
56671+ current->mm->call_dl_resolve = 0UL;
56672+#endif
56673+
56674+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
56675+ current->mm->call_syscall = 0UL;
56676+#endif
56677+
56678+#ifdef CONFIG_PAX_ASLR
56679+ current->mm->delta_mmap = 0UL;
56680+ current->mm->delta_stack = 0UL;
56681+#endif
56682+
56683+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
56684+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
56685+ send_sig(SIGKILL, current, 0);
56686+ goto out_free_dentry;
56687+ }
56688+#endif
56689+
56690+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
56691+ pax_set_initial_flags(bprm);
56692+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
56693+ if (pax_set_initial_flags_func)
56694+ (pax_set_initial_flags_func)(bprm);
56695+#endif
56696+
56697+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
56698+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
56699+ current->mm->context.user_cs_limit = PAGE_SIZE;
56700+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
56701+ }
56702+#endif
56703+
56704+#ifdef CONFIG_PAX_SEGMEXEC
56705+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
56706+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
56707+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
56708+ pax_task_size = SEGMEXEC_TASK_SIZE;
56709+ current->mm->def_flags |= VM_NOHUGEPAGE;
56710+ } else
56711+#endif
56712+
56713+ pax_task_size = TASK_SIZE;
56714+
56715+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
56716+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56717+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
56718+ put_cpu();
56719+ }
56720+#endif
56721+
56722+#ifdef CONFIG_PAX_ASLR
56723+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
56724+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
56725+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
56726+ }
56727+#endif
56728+
56729+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
56730+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
56731+ executable_stack = EXSTACK_DISABLE_X;
56732+ current->personality &= ~READ_IMPLIES_EXEC;
56733+ } else
56734+#endif
56735+
56736 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
56737 current->personality |= READ_IMPLIES_EXEC;
56738
56739@@ -815,6 +1253,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
56740 #else
56741 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
56742 #endif
56743+
56744+#ifdef CONFIG_PAX_RANDMMAP
56745+ /* PaX: randomize base address at the default exe base if requested */
56746+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
56747+#ifdef CONFIG_SPARC64
56748+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
56749+#else
56750+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
56751+#endif
56752+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
56753+ elf_flags |= MAP_FIXED;
56754+ }
56755+#endif
56756+
56757 }
56758
56759 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
56760@@ -847,9 +1299,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
56761 * allowed task size. Note that p_filesz must always be
56762 * <= p_memsz so it is only necessary to check p_memsz.
56763 */
56764- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
56765- elf_ppnt->p_memsz > TASK_SIZE ||
56766- TASK_SIZE - elf_ppnt->p_memsz < k) {
56767+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
56768+ elf_ppnt->p_memsz > pax_task_size ||
56769+ pax_task_size - elf_ppnt->p_memsz < k) {
56770 /* set_brk can never work. Avoid overflows. */
56771 send_sig(SIGKILL, current, 0);
56772 retval = -EINVAL;
56773@@ -888,17 +1340,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
56774 goto out_free_dentry;
56775 }
56776 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
56777- send_sig(SIGSEGV, current, 0);
56778- retval = -EFAULT; /* Nobody gets to see this, but.. */
56779- goto out_free_dentry;
56780+ /*
56781+ * This bss-zeroing can fail if the ELF
56782+ * file specifies odd protections. So
56783+ * we don't check the return value
56784+ */
56785 }
56786
56787+#ifdef CONFIG_PAX_RANDMMAP
56788+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
56789+ unsigned long start, size, flags;
56790+ vm_flags_t vm_flags;
56791+
56792+ start = ELF_PAGEALIGN(elf_brk);
56793+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
56794+ flags = MAP_FIXED | MAP_PRIVATE;
56795+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
56796+
56797+ down_write(&current->mm->mmap_sem);
56798+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
56799+ retval = -ENOMEM;
56800+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
56801+// if (current->personality & ADDR_NO_RANDOMIZE)
56802+// vm_flags |= VM_READ | VM_MAYREAD;
56803+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
56804+ retval = IS_ERR_VALUE(start) ? start : 0;
56805+ }
56806+ up_write(&current->mm->mmap_sem);
56807+ if (retval == 0)
56808+ retval = set_brk(start + size, start + size + PAGE_SIZE);
56809+ if (retval < 0) {
56810+ send_sig(SIGKILL, current, 0);
56811+ goto out_free_dentry;
56812+ }
56813+ }
56814+#endif
56815+
56816 if (elf_interpreter) {
56817- unsigned long interp_map_addr = 0;
56818-
56819 elf_entry = load_elf_interp(&loc->interp_elf_ex,
56820 interpreter,
56821- &interp_map_addr,
56822 load_bias);
56823 if (!IS_ERR((void *)elf_entry)) {
56824 /*
56825@@ -1122,7 +1602,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
56826 * Decide what to dump of a segment, part, all or none.
56827 */
56828 static unsigned long vma_dump_size(struct vm_area_struct *vma,
56829- unsigned long mm_flags)
56830+ unsigned long mm_flags, long signr)
56831 {
56832 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
56833
56834@@ -1160,7 +1640,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
56835 if (vma->vm_file == NULL)
56836 return 0;
56837
56838- if (FILTER(MAPPED_PRIVATE))
56839+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
56840 goto whole;
56841
56842 /*
56843@@ -1367,9 +1847,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
56844 {
56845 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
56846 int i = 0;
56847- do
56848+ do {
56849 i += 2;
56850- while (auxv[i - 2] != AT_NULL);
56851+ } while (auxv[i - 2] != AT_NULL);
56852 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
56853 }
56854
56855@@ -1378,7 +1858,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
56856 {
56857 mm_segment_t old_fs = get_fs();
56858 set_fs(KERNEL_DS);
56859- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
56860+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
56861 set_fs(old_fs);
56862 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
56863 }
56864@@ -2002,14 +2482,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
56865 }
56866
56867 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
56868- unsigned long mm_flags)
56869+ struct coredump_params *cprm)
56870 {
56871 struct vm_area_struct *vma;
56872 size_t size = 0;
56873
56874 for (vma = first_vma(current, gate_vma); vma != NULL;
56875 vma = next_vma(vma, gate_vma))
56876- size += vma_dump_size(vma, mm_flags);
56877+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
56878 return size;
56879 }
56880
56881@@ -2100,7 +2580,7 @@ static int elf_core_dump(struct coredump_params *cprm)
56882
56883 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
56884
56885- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
56886+ offset += elf_core_vma_data_size(gate_vma, cprm);
56887 offset += elf_core_extra_data_size();
56888 e_shoff = offset;
56889
56890@@ -2128,7 +2608,7 @@ static int elf_core_dump(struct coredump_params *cprm)
56891 phdr.p_offset = offset;
56892 phdr.p_vaddr = vma->vm_start;
56893 phdr.p_paddr = 0;
56894- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
56895+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
56896 phdr.p_memsz = vma->vm_end - vma->vm_start;
56897 offset += phdr.p_filesz;
56898 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
56899@@ -2161,7 +2641,7 @@ static int elf_core_dump(struct coredump_params *cprm)
56900 unsigned long addr;
56901 unsigned long end;
56902
56903- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
56904+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
56905
56906 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
56907 struct page *page;
56908@@ -2202,6 +2682,167 @@ out:
56909
56910 #endif /* CONFIG_ELF_CORE */
56911
56912+#ifdef CONFIG_PAX_MPROTECT
56913+/* PaX: non-PIC ELF libraries need relocations on their executable segments
56914+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
56915+ * we'll remove VM_MAYWRITE for good on RELRO segments.
56916+ *
56917+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
56918+ * basis because we want to allow the common case and not the special ones.
56919+ */
56920+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
56921+{
56922+ struct elfhdr elf_h;
56923+ struct elf_phdr elf_p;
56924+ unsigned long i;
56925+ unsigned long oldflags;
56926+ bool is_textrel_rw, is_textrel_rx, is_relro;
56927+
56928+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
56929+ return;
56930+
56931+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
56932+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
56933+
56934+#ifdef CONFIG_PAX_ELFRELOCS
56935+ /* possible TEXTREL */
56936+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
56937+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
56938+#else
56939+ is_textrel_rw = false;
56940+ is_textrel_rx = false;
56941+#endif
56942+
56943+ /* possible RELRO */
56944+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
56945+
56946+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
56947+ return;
56948+
56949+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
56950+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
56951+
56952+#ifdef CONFIG_PAX_ETEXECRELOCS
56953+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
56954+#else
56955+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
56956+#endif
56957+
56958+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
56959+ !elf_check_arch(&elf_h) ||
56960+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
56961+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
56962+ return;
56963+
56964+ for (i = 0UL; i < elf_h.e_phnum; i++) {
56965+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
56966+ return;
56967+ switch (elf_p.p_type) {
56968+ case PT_DYNAMIC:
56969+ if (!is_textrel_rw && !is_textrel_rx)
56970+ continue;
56971+ i = 0UL;
56972+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
56973+ elf_dyn dyn;
56974+
56975+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
56976+ break;
56977+ if (dyn.d_tag == DT_NULL)
56978+ break;
56979+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
56980+ gr_log_textrel(vma);
56981+ if (is_textrel_rw)
56982+ vma->vm_flags |= VM_MAYWRITE;
56983+ else
56984+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
56985+ vma->vm_flags &= ~VM_MAYWRITE;
56986+ break;
56987+ }
56988+ i++;
56989+ }
56990+ is_textrel_rw = false;
56991+ is_textrel_rx = false;
56992+ continue;
56993+
56994+ case PT_GNU_RELRO:
56995+ if (!is_relro)
56996+ continue;
56997+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
56998+ vma->vm_flags &= ~VM_MAYWRITE;
56999+ is_relro = false;
57000+ continue;
57001+
57002+#ifdef CONFIG_PAX_PT_PAX_FLAGS
57003+ case PT_PAX_FLAGS: {
57004+ const char *msg_mprotect = "", *msg_emutramp = "";
57005+ char *buffer_lib, *buffer_exe;
57006+
57007+ if (elf_p.p_flags & PF_NOMPROTECT)
57008+ msg_mprotect = "MPROTECT disabled";
57009+
57010+#ifdef CONFIG_PAX_EMUTRAMP
57011+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
57012+ msg_emutramp = "EMUTRAMP enabled";
57013+#endif
57014+
57015+ if (!msg_mprotect[0] && !msg_emutramp[0])
57016+ continue;
57017+
57018+ if (!printk_ratelimit())
57019+ continue;
57020+
57021+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
57022+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
57023+ if (buffer_lib && buffer_exe) {
57024+ char *path_lib, *path_exe;
57025+
57026+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
57027+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
57028+
57029+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
57030+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
57031+
57032+ }
57033+ free_page((unsigned long)buffer_exe);
57034+ free_page((unsigned long)buffer_lib);
57035+ continue;
57036+ }
57037+#endif
57038+
57039+ }
57040+ }
57041+}
57042+#endif
57043+
57044+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
57045+
57046+extern int grsec_enable_log_rwxmaps;
57047+
57048+static void elf_handle_mmap(struct file *file)
57049+{
57050+ struct elfhdr elf_h;
57051+ struct elf_phdr elf_p;
57052+ unsigned long i;
57053+
57054+ if (!grsec_enable_log_rwxmaps)
57055+ return;
57056+
57057+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
57058+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
57059+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
57060+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
57061+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
57062+ return;
57063+
57064+ for (i = 0UL; i < elf_h.e_phnum; i++) {
57065+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
57066+ return;
57067+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
57068+ gr_log_ptgnustack(file);
57069+ }
57070+}
57071+#endif
57072+
57073 static int __init init_elf_binfmt(void)
57074 {
57075 register_binfmt(&elf_format);
57076diff --git a/fs/bio.c b/fs/bio.c
57077index 6f0362b..26a7496 100644
57078--- a/fs/bio.c
57079+++ b/fs/bio.c
57080@@ -1144,7 +1144,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
57081 /*
57082 * Overflow, abort
57083 */
57084- if (end < start)
57085+ if (end < start || end - start > INT_MAX - nr_pages)
57086 return ERR_PTR(-EINVAL);
57087
57088 nr_pages += end - start;
57089@@ -1278,7 +1278,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
57090 /*
57091 * Overflow, abort
57092 */
57093- if (end < start)
57094+ if (end < start || end - start > INT_MAX - nr_pages)
57095 return ERR_PTR(-EINVAL);
57096
57097 nr_pages += end - start;
57098@@ -1540,7 +1540,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
57099 const int read = bio_data_dir(bio) == READ;
57100 struct bio_map_data *bmd = bio->bi_private;
57101 int i;
57102- char *p = bmd->sgvecs[0].iov_base;
57103+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
57104
57105 bio_for_each_segment_all(bvec, bio, i) {
57106 char *addr = page_address(bvec->bv_page);
57107diff --git a/fs/block_dev.c b/fs/block_dev.c
57108index 552a8d1..d51ccf3 100644
57109--- a/fs/block_dev.c
57110+++ b/fs/block_dev.c
57111@@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
57112 else if (bdev->bd_contains == bdev)
57113 return true; /* is a whole device which isn't held */
57114
57115- else if (whole->bd_holder == bd_may_claim)
57116+ else if (whole->bd_holder == (void *)bd_may_claim)
57117 return true; /* is a partition of a device that is being partitioned */
57118 else if (whole->bd_holder != NULL)
57119 return false; /* is a partition of a held device */
57120diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
57121index 1bcfcdb..e942132 100644
57122--- a/fs/btrfs/ctree.c
57123+++ b/fs/btrfs/ctree.c
57124@@ -1216,9 +1216,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
57125 free_extent_buffer(buf);
57126 add_root_to_dirty_list(root);
57127 } else {
57128- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
57129- parent_start = parent->start;
57130- else
57131+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
57132+ if (parent)
57133+ parent_start = parent->start;
57134+ else
57135+ parent_start = 0;
57136+ } else
57137 parent_start = 0;
57138
57139 WARN_ON(trans->transid != btrfs_header_generation(parent));
57140diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
57141index 33e561a..16df7ae 100644
57142--- a/fs/btrfs/delayed-inode.c
57143+++ b/fs/btrfs/delayed-inode.c
57144@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
57145
57146 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
57147 {
57148- int seq = atomic_inc_return(&delayed_root->items_seq);
57149+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
57150 if ((atomic_dec_return(&delayed_root->items) <
57151 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
57152 waitqueue_active(&delayed_root->wait))
57153@@ -1409,7 +1409,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
57154
57155 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
57156 {
57157- int val = atomic_read(&delayed_root->items_seq);
57158+ int val = atomic_read_unchecked(&delayed_root->items_seq);
57159
57160 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
57161 return 1;
57162@@ -1433,7 +1433,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
57163 int seq;
57164 int ret;
57165
57166- seq = atomic_read(&delayed_root->items_seq);
57167+ seq = atomic_read_unchecked(&delayed_root->items_seq);
57168
57169 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
57170 if (ret)
57171diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
57172index f70119f..ab5894d 100644
57173--- a/fs/btrfs/delayed-inode.h
57174+++ b/fs/btrfs/delayed-inode.h
57175@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
57176 */
57177 struct list_head prepare_list;
57178 atomic_t items; /* for delayed items */
57179- atomic_t items_seq; /* for delayed items */
57180+ atomic_unchecked_t items_seq; /* for delayed items */
57181 int nodes; /* for delayed nodes */
57182 wait_queue_head_t wait;
57183 };
57184@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
57185 struct btrfs_delayed_root *delayed_root)
57186 {
57187 atomic_set(&delayed_root->items, 0);
57188- atomic_set(&delayed_root->items_seq, 0);
57189+ atomic_set_unchecked(&delayed_root->items_seq, 0);
57190 delayed_root->nodes = 0;
57191 spin_lock_init(&delayed_root->lock);
57192 init_waitqueue_head(&delayed_root->wait);
57193diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
57194index 2f6d7b1..f186382 100644
57195--- a/fs/btrfs/ioctl.c
57196+++ b/fs/btrfs/ioctl.c
57197@@ -3575,9 +3575,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
57198 for (i = 0; i < num_types; i++) {
57199 struct btrfs_space_info *tmp;
57200
57201+ /* Don't copy in more than we allocated */
57202 if (!slot_count)
57203 break;
57204
57205+ slot_count--;
57206+
57207 info = NULL;
57208 rcu_read_lock();
57209 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
57210@@ -3599,10 +3602,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
57211 memcpy(dest, &space, sizeof(space));
57212 dest++;
57213 space_args.total_spaces++;
57214- slot_count--;
57215 }
57216- if (!slot_count)
57217- break;
57218 }
57219 up_read(&info->groups_sem);
57220 }
57221diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
57222index 9601d25..2896d6c 100644
57223--- a/fs/btrfs/super.c
57224+++ b/fs/btrfs/super.c
57225@@ -270,7 +270,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
57226 function, line, errstr);
57227 return;
57228 }
57229- ACCESS_ONCE(trans->transaction->aborted) = errno;
57230+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
57231 /* Wake up anybody who may be waiting on this transaction */
57232 wake_up(&root->fs_info->transaction_wait);
57233 wake_up(&root->fs_info->transaction_blocked_wait);
57234diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
57235index 4825cd2..b2fe768 100644
57236--- a/fs/btrfs/sysfs.c
57237+++ b/fs/btrfs/sysfs.c
57238@@ -438,7 +438,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
57239 for (set = 0; set < FEAT_MAX; set++) {
57240 int i;
57241 struct attribute *attrs[2];
57242- struct attribute_group agroup = {
57243+ attribute_group_no_const agroup = {
57244 .name = "features",
57245 .attrs = attrs,
57246 };
57247diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
57248index e2f45fc..b036909 100644
57249--- a/fs/btrfs/tree-log.c
57250+++ b/fs/btrfs/tree-log.c
57251@@ -2533,7 +2533,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57252 blk_finish_plug(&plug);
57253 btrfs_abort_transaction(trans, root, ret);
57254 btrfs_free_logged_extents(log, log_transid);
57255- ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57256+ ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57257 trans->transid;
57258 mutex_unlock(&root->log_mutex);
57259 goto out;
57260@@ -2577,7 +2577,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57261 list_del_init(&root_log_ctx.list);
57262
57263 blk_finish_plug(&plug);
57264- ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57265+ ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57266 trans->transid;
57267 if (ret != -ENOSPC) {
57268 btrfs_abort_transaction(trans, root, ret);
57269@@ -2622,7 +2622,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57270 * now that we've moved on to the tree of log tree roots,
57271 * check the full commit flag again
57272 */
57273- if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
57274+ if (ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) ==
57275 trans->transid) {
57276 blk_finish_plug(&plug);
57277 btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
57278@@ -2637,7 +2637,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57279 EXTENT_DIRTY | EXTENT_NEW);
57280 blk_finish_plug(&plug);
57281 if (ret) {
57282- ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57283+ ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57284 trans->transid;
57285 btrfs_abort_transaction(trans, root, ret);
57286 btrfs_free_logged_extents(log, log_transid);
57287@@ -2667,7 +2667,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
57288 */
57289 ret = write_ctree_super(trans, root->fs_info->tree_root, 1);
57290 if (ret) {
57291- ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
57292+ ACCESS_ONCE_RW(root->fs_info->last_trans_log_full_commit) =
57293 trans->transid;
57294 btrfs_abort_transaction(trans, root, ret);
57295 goto out_wake_log_root;
57296diff --git a/fs/buffer.c b/fs/buffer.c
57297index 9ddb9fc..7aa2487 100644
57298--- a/fs/buffer.c
57299+++ b/fs/buffer.c
57300@@ -3428,7 +3428,7 @@ void __init buffer_init(void)
57301 bh_cachep = kmem_cache_create("buffer_head",
57302 sizeof(struct buffer_head), 0,
57303 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
57304- SLAB_MEM_SPREAD),
57305+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
57306 NULL);
57307
57308 /*
57309diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
57310index 5b99baf..47fffb5 100644
57311--- a/fs/cachefiles/bind.c
57312+++ b/fs/cachefiles/bind.c
57313@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
57314 args);
57315
57316 /* start by checking things over */
57317- ASSERT(cache->fstop_percent >= 0 &&
57318- cache->fstop_percent < cache->fcull_percent &&
57319+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
57320 cache->fcull_percent < cache->frun_percent &&
57321 cache->frun_percent < 100);
57322
57323- ASSERT(cache->bstop_percent >= 0 &&
57324- cache->bstop_percent < cache->bcull_percent &&
57325+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
57326 cache->bcull_percent < cache->brun_percent &&
57327 cache->brun_percent < 100);
57328
57329diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
57330index 0a1467b..6a53245 100644
57331--- a/fs/cachefiles/daemon.c
57332+++ b/fs/cachefiles/daemon.c
57333@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
57334 if (n > buflen)
57335 return -EMSGSIZE;
57336
57337- if (copy_to_user(_buffer, buffer, n) != 0)
57338+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
57339 return -EFAULT;
57340
57341 return n;
57342@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
57343 if (test_bit(CACHEFILES_DEAD, &cache->flags))
57344 return -EIO;
57345
57346- if (datalen < 0 || datalen > PAGE_SIZE - 1)
57347+ if (datalen > PAGE_SIZE - 1)
57348 return -EOPNOTSUPP;
57349
57350 /* drag the command string into the kernel so we can parse it */
57351@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
57352 if (args[0] != '%' || args[1] != '\0')
57353 return -EINVAL;
57354
57355- if (fstop < 0 || fstop >= cache->fcull_percent)
57356+ if (fstop >= cache->fcull_percent)
57357 return cachefiles_daemon_range_error(cache, args);
57358
57359 cache->fstop_percent = fstop;
57360@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
57361 if (args[0] != '%' || args[1] != '\0')
57362 return -EINVAL;
57363
57364- if (bstop < 0 || bstop >= cache->bcull_percent)
57365+ if (bstop >= cache->bcull_percent)
57366 return cachefiles_daemon_range_error(cache, args);
57367
57368 cache->bstop_percent = bstop;
57369diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
57370index 5349473..d6c0b93 100644
57371--- a/fs/cachefiles/internal.h
57372+++ b/fs/cachefiles/internal.h
57373@@ -59,7 +59,7 @@ struct cachefiles_cache {
57374 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
57375 struct rb_root active_nodes; /* active nodes (can't be culled) */
57376 rwlock_t active_lock; /* lock for active_nodes */
57377- atomic_t gravecounter; /* graveyard uniquifier */
57378+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
57379 unsigned frun_percent; /* when to stop culling (% files) */
57380 unsigned fcull_percent; /* when to start culling (% files) */
57381 unsigned fstop_percent; /* when to stop allocating (% files) */
57382@@ -171,19 +171,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
57383 * proc.c
57384 */
57385 #ifdef CONFIG_CACHEFILES_HISTOGRAM
57386-extern atomic_t cachefiles_lookup_histogram[HZ];
57387-extern atomic_t cachefiles_mkdir_histogram[HZ];
57388-extern atomic_t cachefiles_create_histogram[HZ];
57389+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
57390+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
57391+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
57392
57393 extern int __init cachefiles_proc_init(void);
57394 extern void cachefiles_proc_cleanup(void);
57395 static inline
57396-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
57397+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
57398 {
57399 unsigned long jif = jiffies - start_jif;
57400 if (jif >= HZ)
57401 jif = HZ - 1;
57402- atomic_inc(&histogram[jif]);
57403+ atomic_inc_unchecked(&histogram[jif]);
57404 }
57405
57406 #else
57407diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
57408index c0a6817..ea811166 100644
57409--- a/fs/cachefiles/namei.c
57410+++ b/fs/cachefiles/namei.c
57411@@ -317,7 +317,7 @@ try_again:
57412 /* first step is to make up a grave dentry in the graveyard */
57413 sprintf(nbuffer, "%08x%08x",
57414 (uint32_t) get_seconds(),
57415- (uint32_t) atomic_inc_return(&cache->gravecounter));
57416+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
57417
57418 /* do the multiway lock magic */
57419 trap = lock_rename(cache->graveyard, dir);
57420diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
57421index eccd339..4c1d995 100644
57422--- a/fs/cachefiles/proc.c
57423+++ b/fs/cachefiles/proc.c
57424@@ -14,9 +14,9 @@
57425 #include <linux/seq_file.h>
57426 #include "internal.h"
57427
57428-atomic_t cachefiles_lookup_histogram[HZ];
57429-atomic_t cachefiles_mkdir_histogram[HZ];
57430-atomic_t cachefiles_create_histogram[HZ];
57431+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
57432+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
57433+atomic_unchecked_t cachefiles_create_histogram[HZ];
57434
57435 /*
57436 * display the latency histogram
57437@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
57438 return 0;
57439 default:
57440 index = (unsigned long) v - 3;
57441- x = atomic_read(&cachefiles_lookup_histogram[index]);
57442- y = atomic_read(&cachefiles_mkdir_histogram[index]);
57443- z = atomic_read(&cachefiles_create_histogram[index]);
57444+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
57445+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
57446+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
57447 if (x == 0 && y == 0 && z == 0)
57448 return 0;
57449
57450diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
57451index 4b1fb5c..0d2a699 100644
57452--- a/fs/cachefiles/rdwr.c
57453+++ b/fs/cachefiles/rdwr.c
57454@@ -943,7 +943,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
57455 old_fs = get_fs();
57456 set_fs(KERNEL_DS);
57457 ret = file->f_op->write(
57458- file, (const void __user *) data, len, &pos);
57459+ file, (const void __force_user *) data, len, &pos);
57460 set_fs(old_fs);
57461 kunmap(page);
57462 file_end_write(file);
57463diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
57464index c29d6ae..a56c4ae 100644
57465--- a/fs/ceph/dir.c
57466+++ b/fs/ceph/dir.c
57467@@ -250,7 +250,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
57468 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
57469 struct ceph_mds_client *mdsc = fsc->mdsc;
57470 unsigned frag = fpos_frag(ctx->pos);
57471- int off = fpos_off(ctx->pos);
57472+ unsigned int off = fpos_off(ctx->pos);
57473 int err;
57474 u32 ftype;
57475 struct ceph_mds_reply_info_parsed *rinfo;
57476diff --git a/fs/ceph/super.c b/fs/ceph/super.c
57477index 06150fd..192061b 100644
57478--- a/fs/ceph/super.c
57479+++ b/fs/ceph/super.c
57480@@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
57481 /*
57482 * construct our own bdi so we can control readahead, etc.
57483 */
57484-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
57485+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
57486
57487 static int ceph_register_bdi(struct super_block *sb,
57488 struct ceph_fs_client *fsc)
57489@@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
57490 default_backing_dev_info.ra_pages;
57491
57492 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
57493- atomic_long_inc_return(&bdi_seq));
57494+ atomic_long_inc_return_unchecked(&bdi_seq));
57495 if (!err)
57496 sb->s_bdi = &fsc->backing_dev_info;
57497 return err;
57498diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
57499index f3ac415..3d2420c 100644
57500--- a/fs/cifs/cifs_debug.c
57501+++ b/fs/cifs/cifs_debug.c
57502@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
57503
57504 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
57505 #ifdef CONFIG_CIFS_STATS2
57506- atomic_set(&totBufAllocCount, 0);
57507- atomic_set(&totSmBufAllocCount, 0);
57508+ atomic_set_unchecked(&totBufAllocCount, 0);
57509+ atomic_set_unchecked(&totSmBufAllocCount, 0);
57510 #endif /* CONFIG_CIFS_STATS2 */
57511 spin_lock(&cifs_tcp_ses_lock);
57512 list_for_each(tmp1, &cifs_tcp_ses_list) {
57513@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
57514 tcon = list_entry(tmp3,
57515 struct cifs_tcon,
57516 tcon_list);
57517- atomic_set(&tcon->num_smbs_sent, 0);
57518+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
57519 if (server->ops->clear_stats)
57520 server->ops->clear_stats(tcon);
57521 }
57522@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
57523 smBufAllocCount.counter, cifs_min_small);
57524 #ifdef CONFIG_CIFS_STATS2
57525 seq_printf(m, "Total Large %d Small %d Allocations\n",
57526- atomic_read(&totBufAllocCount),
57527- atomic_read(&totSmBufAllocCount));
57528+ atomic_read_unchecked(&totBufAllocCount),
57529+ atomic_read_unchecked(&totSmBufAllocCount));
57530 #endif /* CONFIG_CIFS_STATS2 */
57531
57532 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
57533@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
57534 if (tcon->need_reconnect)
57535 seq_puts(m, "\tDISCONNECTED ");
57536 seq_printf(m, "\nSMBs: %d",
57537- atomic_read(&tcon->num_smbs_sent));
57538+ atomic_read_unchecked(&tcon->num_smbs_sent));
57539 if (server->ops->print_stats)
57540 server->ops->print_stats(m, tcon);
57541 }
57542diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
57543index 5be1f997..fa1015a1 100644
57544--- a/fs/cifs/cifsfs.c
57545+++ b/fs/cifs/cifsfs.c
57546@@ -1068,7 +1068,7 @@ cifs_init_request_bufs(void)
57547 */
57548 cifs_req_cachep = kmem_cache_create("cifs_request",
57549 CIFSMaxBufSize + max_hdr_size, 0,
57550- SLAB_HWCACHE_ALIGN, NULL);
57551+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
57552 if (cifs_req_cachep == NULL)
57553 return -ENOMEM;
57554
57555@@ -1095,7 +1095,7 @@ cifs_init_request_bufs(void)
57556 efficient to alloc 1 per page off the slab compared to 17K (5page)
57557 alloc of large cifs buffers even when page debugging is on */
57558 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
57559- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
57560+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
57561 NULL);
57562 if (cifs_sm_req_cachep == NULL) {
57563 mempool_destroy(cifs_req_poolp);
57564@@ -1180,8 +1180,8 @@ init_cifs(void)
57565 atomic_set(&bufAllocCount, 0);
57566 atomic_set(&smBufAllocCount, 0);
57567 #ifdef CONFIG_CIFS_STATS2
57568- atomic_set(&totBufAllocCount, 0);
57569- atomic_set(&totSmBufAllocCount, 0);
57570+ atomic_set_unchecked(&totBufAllocCount, 0);
57571+ atomic_set_unchecked(&totSmBufAllocCount, 0);
57572 #endif /* CONFIG_CIFS_STATS2 */
57573
57574 atomic_set(&midCount, 0);
57575diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
57576index 30f6e92..e915ba5 100644
57577--- a/fs/cifs/cifsglob.h
57578+++ b/fs/cifs/cifsglob.h
57579@@ -806,35 +806,35 @@ struct cifs_tcon {
57580 __u16 Flags; /* optional support bits */
57581 enum statusEnum tidStatus;
57582 #ifdef CONFIG_CIFS_STATS
57583- atomic_t num_smbs_sent;
57584+ atomic_unchecked_t num_smbs_sent;
57585 union {
57586 struct {
57587- atomic_t num_writes;
57588- atomic_t num_reads;
57589- atomic_t num_flushes;
57590- atomic_t num_oplock_brks;
57591- atomic_t num_opens;
57592- atomic_t num_closes;
57593- atomic_t num_deletes;
57594- atomic_t num_mkdirs;
57595- atomic_t num_posixopens;
57596- atomic_t num_posixmkdirs;
57597- atomic_t num_rmdirs;
57598- atomic_t num_renames;
57599- atomic_t num_t2renames;
57600- atomic_t num_ffirst;
57601- atomic_t num_fnext;
57602- atomic_t num_fclose;
57603- atomic_t num_hardlinks;
57604- atomic_t num_symlinks;
57605- atomic_t num_locks;
57606- atomic_t num_acl_get;
57607- atomic_t num_acl_set;
57608+ atomic_unchecked_t num_writes;
57609+ atomic_unchecked_t num_reads;
57610+ atomic_unchecked_t num_flushes;
57611+ atomic_unchecked_t num_oplock_brks;
57612+ atomic_unchecked_t num_opens;
57613+ atomic_unchecked_t num_closes;
57614+ atomic_unchecked_t num_deletes;
57615+ atomic_unchecked_t num_mkdirs;
57616+ atomic_unchecked_t num_posixopens;
57617+ atomic_unchecked_t num_posixmkdirs;
57618+ atomic_unchecked_t num_rmdirs;
57619+ atomic_unchecked_t num_renames;
57620+ atomic_unchecked_t num_t2renames;
57621+ atomic_unchecked_t num_ffirst;
57622+ atomic_unchecked_t num_fnext;
57623+ atomic_unchecked_t num_fclose;
57624+ atomic_unchecked_t num_hardlinks;
57625+ atomic_unchecked_t num_symlinks;
57626+ atomic_unchecked_t num_locks;
57627+ atomic_unchecked_t num_acl_get;
57628+ atomic_unchecked_t num_acl_set;
57629 } cifs_stats;
57630 #ifdef CONFIG_CIFS_SMB2
57631 struct {
57632- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
57633- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
57634+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
57635+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
57636 } smb2_stats;
57637 #endif /* CONFIG_CIFS_SMB2 */
57638 } stats;
57639@@ -1170,7 +1170,7 @@ convert_delimiter(char *path, char delim)
57640 }
57641
57642 #ifdef CONFIG_CIFS_STATS
57643-#define cifs_stats_inc atomic_inc
57644+#define cifs_stats_inc atomic_inc_unchecked
57645
57646 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
57647 unsigned int bytes)
57648@@ -1536,8 +1536,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
57649 /* Various Debug counters */
57650 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
57651 #ifdef CONFIG_CIFS_STATS2
57652-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
57653-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
57654+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
57655+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
57656 #endif
57657 GLOBAL_EXTERN atomic_t smBufAllocCount;
57658 GLOBAL_EXTERN atomic_t midCount;
57659diff --git a/fs/cifs/file.c b/fs/cifs/file.c
57660index 5ed03e0..e9a3a6c 100644
57661--- a/fs/cifs/file.c
57662+++ b/fs/cifs/file.c
57663@@ -1900,10 +1900,14 @@ static int cifs_writepages(struct address_space *mapping,
57664 index = mapping->writeback_index; /* Start from prev offset */
57665 end = -1;
57666 } else {
57667- index = wbc->range_start >> PAGE_CACHE_SHIFT;
57668- end = wbc->range_end >> PAGE_CACHE_SHIFT;
57669- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
57670+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
57671 range_whole = true;
57672+ index = 0;
57673+ end = ULONG_MAX;
57674+ } else {
57675+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
57676+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
57677+ }
57678 scanned = true;
57679 }
57680 retry:
57681diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
57682index 3b0c62e..f7d090c 100644
57683--- a/fs/cifs/misc.c
57684+++ b/fs/cifs/misc.c
57685@@ -170,7 +170,7 @@ cifs_buf_get(void)
57686 memset(ret_buf, 0, buf_size + 3);
57687 atomic_inc(&bufAllocCount);
57688 #ifdef CONFIG_CIFS_STATS2
57689- atomic_inc(&totBufAllocCount);
57690+ atomic_inc_unchecked(&totBufAllocCount);
57691 #endif /* CONFIG_CIFS_STATS2 */
57692 }
57693
57694@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
57695 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
57696 atomic_inc(&smBufAllocCount);
57697 #ifdef CONFIG_CIFS_STATS2
57698- atomic_inc(&totSmBufAllocCount);
57699+ atomic_inc_unchecked(&totSmBufAllocCount);
57700 #endif /* CONFIG_CIFS_STATS2 */
57701
57702 }
57703diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
57704index d1fdfa8..94558f8 100644
57705--- a/fs/cifs/smb1ops.c
57706+++ b/fs/cifs/smb1ops.c
57707@@ -626,27 +626,27 @@ static void
57708 cifs_clear_stats(struct cifs_tcon *tcon)
57709 {
57710 #ifdef CONFIG_CIFS_STATS
57711- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
57712- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
57713- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
57714- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
57715- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
57716- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
57717- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
57718- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
57719- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
57720- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
57721- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
57722- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
57723- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
57724- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
57725- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
57726- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
57727- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
57728- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
57729- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
57730- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
57731- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
57732+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
57733+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
57734+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
57735+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
57736+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
57737+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
57738+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
57739+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
57740+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
57741+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
57742+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
57743+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
57744+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
57745+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
57746+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
57747+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
57748+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
57749+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
57750+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
57751+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
57752+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
57753 #endif
57754 }
57755
57756@@ -655,36 +655,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
57757 {
57758 #ifdef CONFIG_CIFS_STATS
57759 seq_printf(m, " Oplocks breaks: %d",
57760- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
57761+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
57762 seq_printf(m, "\nReads: %d Bytes: %llu",
57763- atomic_read(&tcon->stats.cifs_stats.num_reads),
57764+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
57765 (long long)(tcon->bytes_read));
57766 seq_printf(m, "\nWrites: %d Bytes: %llu",
57767- atomic_read(&tcon->stats.cifs_stats.num_writes),
57768+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
57769 (long long)(tcon->bytes_written));
57770 seq_printf(m, "\nFlushes: %d",
57771- atomic_read(&tcon->stats.cifs_stats.num_flushes));
57772+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
57773 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
57774- atomic_read(&tcon->stats.cifs_stats.num_locks),
57775- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
57776- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
57777+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
57778+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
57779+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
57780 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
57781- atomic_read(&tcon->stats.cifs_stats.num_opens),
57782- atomic_read(&tcon->stats.cifs_stats.num_closes),
57783- atomic_read(&tcon->stats.cifs_stats.num_deletes));
57784+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
57785+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
57786+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
57787 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
57788- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
57789- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
57790+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
57791+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
57792 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
57793- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
57794- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
57795+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
57796+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
57797 seq_printf(m, "\nRenames: %d T2 Renames %d",
57798- atomic_read(&tcon->stats.cifs_stats.num_renames),
57799- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
57800+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
57801+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
57802 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
57803- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
57804- atomic_read(&tcon->stats.cifs_stats.num_fnext),
57805- atomic_read(&tcon->stats.cifs_stats.num_fclose));
57806+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
57807+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
57808+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
57809 #endif
57810 }
57811
57812diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
57813index 35ddc3e..563e809 100644
57814--- a/fs/cifs/smb2ops.c
57815+++ b/fs/cifs/smb2ops.c
57816@@ -364,8 +364,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
57817 #ifdef CONFIG_CIFS_STATS
57818 int i;
57819 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
57820- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
57821- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
57822+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
57823+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
57824 }
57825 #endif
57826 }
57827@@ -405,65 +405,65 @@ static void
57828 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
57829 {
57830 #ifdef CONFIG_CIFS_STATS
57831- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
57832- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
57833+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
57834+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
57835 seq_printf(m, "\nNegotiates: %d sent %d failed",
57836- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
57837- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
57838+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
57839+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
57840 seq_printf(m, "\nSessionSetups: %d sent %d failed",
57841- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
57842- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
57843+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
57844+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
57845 seq_printf(m, "\nLogoffs: %d sent %d failed",
57846- atomic_read(&sent[SMB2_LOGOFF_HE]),
57847- atomic_read(&failed[SMB2_LOGOFF_HE]));
57848+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
57849+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
57850 seq_printf(m, "\nTreeConnects: %d sent %d failed",
57851- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
57852- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
57853+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
57854+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
57855 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
57856- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
57857- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
57858+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
57859+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
57860 seq_printf(m, "\nCreates: %d sent %d failed",
57861- atomic_read(&sent[SMB2_CREATE_HE]),
57862- atomic_read(&failed[SMB2_CREATE_HE]));
57863+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
57864+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
57865 seq_printf(m, "\nCloses: %d sent %d failed",
57866- atomic_read(&sent[SMB2_CLOSE_HE]),
57867- atomic_read(&failed[SMB2_CLOSE_HE]));
57868+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
57869+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
57870 seq_printf(m, "\nFlushes: %d sent %d failed",
57871- atomic_read(&sent[SMB2_FLUSH_HE]),
57872- atomic_read(&failed[SMB2_FLUSH_HE]));
57873+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
57874+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
57875 seq_printf(m, "\nReads: %d sent %d failed",
57876- atomic_read(&sent[SMB2_READ_HE]),
57877- atomic_read(&failed[SMB2_READ_HE]));
57878+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
57879+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
57880 seq_printf(m, "\nWrites: %d sent %d failed",
57881- atomic_read(&sent[SMB2_WRITE_HE]),
57882- atomic_read(&failed[SMB2_WRITE_HE]));
57883+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
57884+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
57885 seq_printf(m, "\nLocks: %d sent %d failed",
57886- atomic_read(&sent[SMB2_LOCK_HE]),
57887- atomic_read(&failed[SMB2_LOCK_HE]));
57888+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
57889+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
57890 seq_printf(m, "\nIOCTLs: %d sent %d failed",
57891- atomic_read(&sent[SMB2_IOCTL_HE]),
57892- atomic_read(&failed[SMB2_IOCTL_HE]));
57893+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
57894+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
57895 seq_printf(m, "\nCancels: %d sent %d failed",
57896- atomic_read(&sent[SMB2_CANCEL_HE]),
57897- atomic_read(&failed[SMB2_CANCEL_HE]));
57898+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
57899+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
57900 seq_printf(m, "\nEchos: %d sent %d failed",
57901- atomic_read(&sent[SMB2_ECHO_HE]),
57902- atomic_read(&failed[SMB2_ECHO_HE]));
57903+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
57904+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
57905 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
57906- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
57907- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
57908+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
57909+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
57910 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
57911- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
57912- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
57913+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
57914+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
57915 seq_printf(m, "\nQueryInfos: %d sent %d failed",
57916- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
57917- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
57918+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
57919+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
57920 seq_printf(m, "\nSetInfos: %d sent %d failed",
57921- atomic_read(&sent[SMB2_SET_INFO_HE]),
57922- atomic_read(&failed[SMB2_SET_INFO_HE]));
57923+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
57924+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
57925 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
57926- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
57927- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
57928+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
57929+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
57930 #endif
57931 }
57932
57933diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
57934index 1fb6ad2..758e171 100644
57935--- a/fs/cifs/smb2pdu.c
57936+++ b/fs/cifs/smb2pdu.c
57937@@ -2097,8 +2097,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
57938 default:
57939 cifs_dbg(VFS, "info level %u isn't supported\n",
57940 srch_inf->info_level);
57941- rc = -EINVAL;
57942- goto qdir_exit;
57943+ return -EINVAL;
57944 }
57945
57946 req->FileIndex = cpu_to_le32(index);
57947diff --git a/fs/coda/cache.c b/fs/coda/cache.c
57948index 1da168c..8bc7ff6 100644
57949--- a/fs/coda/cache.c
57950+++ b/fs/coda/cache.c
57951@@ -24,7 +24,7 @@
57952 #include "coda_linux.h"
57953 #include "coda_cache.h"
57954
57955-static atomic_t permission_epoch = ATOMIC_INIT(0);
57956+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
57957
57958 /* replace or extend an acl cache hit */
57959 void coda_cache_enter(struct inode *inode, int mask)
57960@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
57961 struct coda_inode_info *cii = ITOC(inode);
57962
57963 spin_lock(&cii->c_lock);
57964- cii->c_cached_epoch = atomic_read(&permission_epoch);
57965+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
57966 if (!uid_eq(cii->c_uid, current_fsuid())) {
57967 cii->c_uid = current_fsuid();
57968 cii->c_cached_perm = mask;
57969@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
57970 {
57971 struct coda_inode_info *cii = ITOC(inode);
57972 spin_lock(&cii->c_lock);
57973- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
57974+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
57975 spin_unlock(&cii->c_lock);
57976 }
57977
57978 /* remove all acl caches */
57979 void coda_cache_clear_all(struct super_block *sb)
57980 {
57981- atomic_inc(&permission_epoch);
57982+ atomic_inc_unchecked(&permission_epoch);
57983 }
57984
57985
57986@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
57987 spin_lock(&cii->c_lock);
57988 hit = (mask & cii->c_cached_perm) == mask &&
57989 uid_eq(cii->c_uid, current_fsuid()) &&
57990- cii->c_cached_epoch == atomic_read(&permission_epoch);
57991+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
57992 spin_unlock(&cii->c_lock);
57993
57994 return hit;
57995diff --git a/fs/compat.c b/fs/compat.c
57996index 66d3d3c..9c10175 100644
57997--- a/fs/compat.c
57998+++ b/fs/compat.c
57999@@ -54,7 +54,7 @@
58000 #include <asm/ioctls.h>
58001 #include "internal.h"
58002
58003-int compat_log = 1;
58004+int compat_log = 0;
58005
58006 int compat_printk(const char *fmt, ...)
58007 {
58008@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
58009
58010 set_fs(KERNEL_DS);
58011 /* The __user pointer cast is valid because of the set_fs() */
58012- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
58013+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
58014 set_fs(oldfs);
58015 /* truncating is ok because it's a user address */
58016 if (!ret)
58017@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
58018 goto out;
58019
58020 ret = -EINVAL;
58021- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
58022+ if (nr_segs > UIO_MAXIOV)
58023 goto out;
58024 if (nr_segs > fast_segs) {
58025 ret = -ENOMEM;
58026@@ -850,6 +850,7 @@ struct compat_old_linux_dirent {
58027 struct compat_readdir_callback {
58028 struct dir_context ctx;
58029 struct compat_old_linux_dirent __user *dirent;
58030+ struct file * file;
58031 int result;
58032 };
58033
58034@@ -867,6 +868,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
58035 buf->result = -EOVERFLOW;
58036 return -EOVERFLOW;
58037 }
58038+
58039+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58040+ return 0;
58041+
58042 buf->result++;
58043 dirent = buf->dirent;
58044 if (!access_ok(VERIFY_WRITE, dirent,
58045@@ -898,6 +903,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
58046 if (!f.file)
58047 return -EBADF;
58048
58049+ buf.file = f.file;
58050 error = iterate_dir(f.file, &buf.ctx);
58051 if (buf.result)
58052 error = buf.result;
58053@@ -917,6 +923,7 @@ struct compat_getdents_callback {
58054 struct dir_context ctx;
58055 struct compat_linux_dirent __user *current_dir;
58056 struct compat_linux_dirent __user *previous;
58057+ struct file * file;
58058 int count;
58059 int error;
58060 };
58061@@ -938,6 +945,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
58062 buf->error = -EOVERFLOW;
58063 return -EOVERFLOW;
58064 }
58065+
58066+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58067+ return 0;
58068+
58069 dirent = buf->previous;
58070 if (dirent) {
58071 if (__put_user(offset, &dirent->d_off))
58072@@ -983,6 +994,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
58073 if (!f.file)
58074 return -EBADF;
58075
58076+ buf.file = f.file;
58077 error = iterate_dir(f.file, &buf.ctx);
58078 if (error >= 0)
58079 error = buf.error;
58080@@ -1003,6 +1015,7 @@ struct compat_getdents_callback64 {
58081 struct dir_context ctx;
58082 struct linux_dirent64 __user *current_dir;
58083 struct linux_dirent64 __user *previous;
58084+ struct file * file;
58085 int count;
58086 int error;
58087 };
58088@@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
58089 buf->error = -EINVAL; /* only used if we fail.. */
58090 if (reclen > buf->count)
58091 return -EINVAL;
58092+
58093+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
58094+ return 0;
58095+
58096 dirent = buf->previous;
58097
58098 if (dirent) {
58099@@ -1068,6 +1085,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
58100 if (!f.file)
58101 return -EBADF;
58102
58103+ buf.file = f.file;
58104 error = iterate_dir(f.file, &buf.ctx);
58105 if (error >= 0)
58106 error = buf.error;
58107diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
58108index 4d24d17..4f8c09e 100644
58109--- a/fs/compat_binfmt_elf.c
58110+++ b/fs/compat_binfmt_elf.c
58111@@ -30,11 +30,13 @@
58112 #undef elf_phdr
58113 #undef elf_shdr
58114 #undef elf_note
58115+#undef elf_dyn
58116 #undef elf_addr_t
58117 #define elfhdr elf32_hdr
58118 #define elf_phdr elf32_phdr
58119 #define elf_shdr elf32_shdr
58120 #define elf_note elf32_note
58121+#define elf_dyn Elf32_Dyn
58122 #define elf_addr_t Elf32_Addr
58123
58124 /*
58125diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
58126index e822890..59374d5 100644
58127--- a/fs/compat_ioctl.c
58128+++ b/fs/compat_ioctl.c
58129@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
58130 return -EFAULT;
58131 if (__get_user(udata, &ss32->iomem_base))
58132 return -EFAULT;
58133- ss.iomem_base = compat_ptr(udata);
58134+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
58135 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
58136 __get_user(ss.port_high, &ss32->port_high))
58137 return -EFAULT;
58138@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
58139 for (i = 0; i < nmsgs; i++) {
58140 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
58141 return -EFAULT;
58142- if (get_user(datap, &umsgs[i].buf) ||
58143- put_user(compat_ptr(datap), &tmsgs[i].buf))
58144+ if (get_user(datap, (u8 __user * __user *)&umsgs[i].buf) ||
58145+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
58146 return -EFAULT;
58147 }
58148 return sys_ioctl(fd, cmd, (unsigned long)tdata);
58149@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
58150 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
58151 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
58152 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
58153- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
58154+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
58155 return -EFAULT;
58156
58157 return ioctl_preallocate(file, p);
58158@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
58159 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
58160 {
58161 unsigned int a, b;
58162- a = *(unsigned int *)p;
58163- b = *(unsigned int *)q;
58164+ a = *(const unsigned int *)p;
58165+ b = *(const unsigned int *)q;
58166 if (a > b)
58167 return 1;
58168 if (a < b)
58169diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
58170index e081acb..911df21 100644
58171--- a/fs/configfs/dir.c
58172+++ b/fs/configfs/dir.c
58173@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
58174 }
58175 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
58176 struct configfs_dirent *next;
58177- const char *name;
58178+ const unsigned char * name;
58179+ char d_name[sizeof(next->s_dentry->d_iname)];
58180 int len;
58181 struct inode *inode = NULL;
58182
58183@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
58184 continue;
58185
58186 name = configfs_get_name(next);
58187- len = strlen(name);
58188+ if (next->s_dentry && name == next->s_dentry->d_iname) {
58189+ len = next->s_dentry->d_name.len;
58190+ memcpy(d_name, name, len);
58191+ name = d_name;
58192+ } else
58193+ len = strlen(name);
58194
58195 /*
58196 * We'll have a dentry and an inode for
58197diff --git a/fs/coredump.c b/fs/coredump.c
58198index 0b2528f..836c55f 100644
58199--- a/fs/coredump.c
58200+++ b/fs/coredump.c
58201@@ -442,8 +442,8 @@ static void wait_for_dump_helpers(struct file *file)
58202 struct pipe_inode_info *pipe = file->private_data;
58203
58204 pipe_lock(pipe);
58205- pipe->readers++;
58206- pipe->writers--;
58207+ atomic_inc(&pipe->readers);
58208+ atomic_dec(&pipe->writers);
58209 wake_up_interruptible_sync(&pipe->wait);
58210 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
58211 pipe_unlock(pipe);
58212@@ -452,11 +452,11 @@ static void wait_for_dump_helpers(struct file *file)
58213 * We actually want wait_event_freezable() but then we need
58214 * to clear TIF_SIGPENDING and improve dump_interrupted().
58215 */
58216- wait_event_interruptible(pipe->wait, pipe->readers == 1);
58217+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
58218
58219 pipe_lock(pipe);
58220- pipe->readers--;
58221- pipe->writers++;
58222+ atomic_dec(&pipe->readers);
58223+ atomic_inc(&pipe->writers);
58224 pipe_unlock(pipe);
58225 }
58226
58227@@ -503,7 +503,9 @@ void do_coredump(const siginfo_t *siginfo)
58228 struct files_struct *displaced;
58229 bool need_nonrelative = false;
58230 bool core_dumped = false;
58231- static atomic_t core_dump_count = ATOMIC_INIT(0);
58232+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
58233+ long signr = siginfo->si_signo;
58234+ int dumpable;
58235 struct coredump_params cprm = {
58236 .siginfo = siginfo,
58237 .regs = signal_pt_regs(),
58238@@ -516,12 +518,17 @@ void do_coredump(const siginfo_t *siginfo)
58239 .mm_flags = mm->flags,
58240 };
58241
58242- audit_core_dumps(siginfo->si_signo);
58243+ audit_core_dumps(signr);
58244+
58245+ dumpable = __get_dumpable(cprm.mm_flags);
58246+
58247+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
58248+ gr_handle_brute_attach(dumpable);
58249
58250 binfmt = mm->binfmt;
58251 if (!binfmt || !binfmt->core_dump)
58252 goto fail;
58253- if (!__get_dumpable(cprm.mm_flags))
58254+ if (!dumpable)
58255 goto fail;
58256
58257 cred = prepare_creds();
58258@@ -540,7 +547,7 @@ void do_coredump(const siginfo_t *siginfo)
58259 need_nonrelative = true;
58260 }
58261
58262- retval = coredump_wait(siginfo->si_signo, &core_state);
58263+ retval = coredump_wait(signr, &core_state);
58264 if (retval < 0)
58265 goto fail_creds;
58266
58267@@ -583,7 +590,7 @@ void do_coredump(const siginfo_t *siginfo)
58268 }
58269 cprm.limit = RLIM_INFINITY;
58270
58271- dump_count = atomic_inc_return(&core_dump_count);
58272+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
58273 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
58274 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
58275 task_tgid_vnr(current), current->comm);
58276@@ -615,6 +622,8 @@ void do_coredump(const siginfo_t *siginfo)
58277 } else {
58278 struct inode *inode;
58279
58280+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
58281+
58282 if (cprm.limit < binfmt->min_coredump)
58283 goto fail_unlock;
58284
58285@@ -673,7 +682,7 @@ close_fail:
58286 filp_close(cprm.file, NULL);
58287 fail_dropcount:
58288 if (ispipe)
58289- atomic_dec(&core_dump_count);
58290+ atomic_dec_unchecked(&core_dump_count);
58291 fail_unlock:
58292 kfree(cn.corename);
58293 coredump_finish(mm, core_dumped);
58294@@ -694,6 +703,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
58295 struct file *file = cprm->file;
58296 loff_t pos = file->f_pos;
58297 ssize_t n;
58298+
58299+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
58300 if (cprm->written + nr > cprm->limit)
58301 return 0;
58302 while (nr) {
58303diff --git a/fs/dcache.c b/fs/dcache.c
58304index e99c6f5..2838bf58 100644
58305--- a/fs/dcache.c
58306+++ b/fs/dcache.c
58307@@ -1445,7 +1445,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
58308 */
58309 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
58310 if (name->len > DNAME_INLINE_LEN-1) {
58311- dname = kmalloc(name->len + 1, GFP_KERNEL);
58312+ dname = kmalloc(round_up(name->len + 1, sizeof(unsigned long)), GFP_KERNEL);
58313 if (!dname) {
58314 kmem_cache_free(dentry_cache, dentry);
58315 return NULL;
58316@@ -3413,7 +3413,8 @@ void __init vfs_caches_init(unsigned long mempages)
58317 mempages -= reserve;
58318
58319 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
58320- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
58321+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
58322+ SLAB_NO_SANITIZE, NULL);
58323
58324 dcache_init();
58325 inode_init();
58326diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
58327index 8c41b52..145b1b9 100644
58328--- a/fs/debugfs/inode.c
58329+++ b/fs/debugfs/inode.c
58330@@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
58331 */
58332 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
58333 {
58334+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
58335+ return __create_file(name, S_IFDIR | S_IRWXU,
58336+#else
58337 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
58338+#endif
58339 parent, NULL, NULL);
58340 }
58341 EXPORT_SYMBOL_GPL(debugfs_create_dir);
58342diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
58343index d4a9431..77f9b2e 100644
58344--- a/fs/ecryptfs/inode.c
58345+++ b/fs/ecryptfs/inode.c
58346@@ -673,7 +673,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
58347 old_fs = get_fs();
58348 set_fs(get_ds());
58349 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
58350- (char __user *)lower_buf,
58351+ (char __force_user *)lower_buf,
58352 PATH_MAX);
58353 set_fs(old_fs);
58354 if (rc < 0)
58355diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
58356index e4141f2..d8263e8 100644
58357--- a/fs/ecryptfs/miscdev.c
58358+++ b/fs/ecryptfs/miscdev.c
58359@@ -304,7 +304,7 @@ check_list:
58360 goto out_unlock_msg_ctx;
58361 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
58362 if (msg_ctx->msg) {
58363- if (copy_to_user(&buf[i], packet_length, packet_length_size))
58364+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
58365 goto out_unlock_msg_ctx;
58366 i += packet_length_size;
58367 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
58368diff --git a/fs/exec.c b/fs/exec.c
58369index 238b7aa..a421d91 100644
58370--- a/fs/exec.c
58371+++ b/fs/exec.c
58372@@ -56,8 +56,20 @@
58373 #include <linux/pipe_fs_i.h>
58374 #include <linux/oom.h>
58375 #include <linux/compat.h>
58376+#include <linux/random.h>
58377+#include <linux/seq_file.h>
58378+#include <linux/coredump.h>
58379+#include <linux/mman.h>
58380+
58381+#ifdef CONFIG_PAX_REFCOUNT
58382+#include <linux/kallsyms.h>
58383+#include <linux/kdebug.h>
58384+#endif
58385+
58386+#include <trace/events/fs.h>
58387
58388 #include <asm/uaccess.h>
58389+#include <asm/sections.h>
58390 #include <asm/mmu_context.h>
58391 #include <asm/tlb.h>
58392
58393@@ -66,19 +78,34 @@
58394
58395 #include <trace/events/sched.h>
58396
58397+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58398+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
58399+{
58400+ 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");
58401+}
58402+#endif
58403+
58404+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
58405+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
58406+EXPORT_SYMBOL(pax_set_initial_flags_func);
58407+#endif
58408+
58409 int suid_dumpable = 0;
58410
58411 static LIST_HEAD(formats);
58412 static DEFINE_RWLOCK(binfmt_lock);
58413
58414+extern int gr_process_kernel_exec_ban(void);
58415+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
58416+
58417 void __register_binfmt(struct linux_binfmt * fmt, int insert)
58418 {
58419 BUG_ON(!fmt);
58420 if (WARN_ON(!fmt->load_binary))
58421 return;
58422 write_lock(&binfmt_lock);
58423- insert ? list_add(&fmt->lh, &formats) :
58424- list_add_tail(&fmt->lh, &formats);
58425+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
58426+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
58427 write_unlock(&binfmt_lock);
58428 }
58429
58430@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
58431 void unregister_binfmt(struct linux_binfmt * fmt)
58432 {
58433 write_lock(&binfmt_lock);
58434- list_del(&fmt->lh);
58435+ pax_list_del((struct list_head *)&fmt->lh);
58436 write_unlock(&binfmt_lock);
58437 }
58438
58439@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
58440 int write)
58441 {
58442 struct page *page;
58443- int ret;
58444
58445-#ifdef CONFIG_STACK_GROWSUP
58446- if (write) {
58447- ret = expand_downwards(bprm->vma, pos);
58448- if (ret < 0)
58449- return NULL;
58450- }
58451-#endif
58452- ret = get_user_pages(current, bprm->mm, pos,
58453- 1, write, 1, &page, NULL);
58454- if (ret <= 0)
58455+ if (0 > expand_downwards(bprm->vma, pos))
58456+ return NULL;
58457+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
58458 return NULL;
58459
58460 if (write) {
58461@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
58462 if (size <= ARG_MAX)
58463 return page;
58464
58465+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58466+ // only allow 512KB for argv+env on suid/sgid binaries
58467+ // to prevent easy ASLR exhaustion
58468+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
58469+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
58470+ (size > (512 * 1024))) {
58471+ put_page(page);
58472+ return NULL;
58473+ }
58474+#endif
58475+
58476 /*
58477 * Limit to 1/4-th the stack size for the argv+env strings.
58478 * This ensures that:
58479@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
58480 vma->vm_end = STACK_TOP_MAX;
58481 vma->vm_start = vma->vm_end - PAGE_SIZE;
58482 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
58483+
58484+#ifdef CONFIG_PAX_SEGMEXEC
58485+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
58486+#endif
58487+
58488 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
58489 INIT_LIST_HEAD(&vma->anon_vma_chain);
58490
58491@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
58492 mm->stack_vm = mm->total_vm = 1;
58493 up_write(&mm->mmap_sem);
58494 bprm->p = vma->vm_end - sizeof(void *);
58495+
58496+#ifdef CONFIG_PAX_RANDUSTACK
58497+ if (randomize_va_space)
58498+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
58499+#endif
58500+
58501 return 0;
58502 err:
58503 up_write(&mm->mmap_sem);
58504@@ -399,7 +440,7 @@ struct user_arg_ptr {
58505 } ptr;
58506 };
58507
58508-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58509+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58510 {
58511 const char __user *native;
58512
58513@@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
58514 compat_uptr_t compat;
58515
58516 if (get_user(compat, argv.ptr.compat + nr))
58517- return ERR_PTR(-EFAULT);
58518+ return (const char __force_user *)ERR_PTR(-EFAULT);
58519
58520 return compat_ptr(compat);
58521 }
58522 #endif
58523
58524 if (get_user(native, argv.ptr.native + nr))
58525- return ERR_PTR(-EFAULT);
58526+ return (const char __force_user *)ERR_PTR(-EFAULT);
58527
58528 return native;
58529 }
58530@@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
58531 if (!p)
58532 break;
58533
58534- if (IS_ERR(p))
58535+ if (IS_ERR((const char __force_kernel *)p))
58536 return -EFAULT;
58537
58538 if (i >= max)
58539@@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
58540
58541 ret = -EFAULT;
58542 str = get_user_arg_ptr(argv, argc);
58543- if (IS_ERR(str))
58544+ if (IS_ERR((const char __force_kernel *)str))
58545 goto out;
58546
58547 len = strnlen_user(str, MAX_ARG_STRLEN);
58548@@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
58549 int r;
58550 mm_segment_t oldfs = get_fs();
58551 struct user_arg_ptr argv = {
58552- .ptr.native = (const char __user *const __user *)__argv,
58553+ .ptr.native = (const char __user * const __force_user *)__argv,
58554 };
58555
58556 set_fs(KERNEL_DS);
58557@@ -586,7 +627,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
58558 unsigned long new_end = old_end - shift;
58559 struct mmu_gather tlb;
58560
58561- BUG_ON(new_start > new_end);
58562+ if (new_start >= new_end || new_start < mmap_min_addr)
58563+ return -ENOMEM;
58564
58565 /*
58566 * ensure there are no vmas between where we want to go
58567@@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
58568 if (vma != find_vma(mm, new_start))
58569 return -EFAULT;
58570
58571+#ifdef CONFIG_PAX_SEGMEXEC
58572+ BUG_ON(pax_find_mirror_vma(vma));
58573+#endif
58574+
58575 /*
58576 * cover the whole range: [new_start, old_end)
58577 */
58578@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
58579 stack_top = arch_align_stack(stack_top);
58580 stack_top = PAGE_ALIGN(stack_top);
58581
58582- if (unlikely(stack_top < mmap_min_addr) ||
58583- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
58584- return -ENOMEM;
58585-
58586 stack_shift = vma->vm_end - stack_top;
58587
58588 bprm->p -= stack_shift;
58589@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
58590 bprm->exec -= stack_shift;
58591
58592 down_write(&mm->mmap_sem);
58593+
58594+ /* Move stack pages down in memory. */
58595+ if (stack_shift) {
58596+ ret = shift_arg_pages(vma, stack_shift);
58597+ if (ret)
58598+ goto out_unlock;
58599+ }
58600+
58601 vm_flags = VM_STACK_FLAGS;
58602
58603+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58604+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58605+ vm_flags &= ~VM_EXEC;
58606+
58607+#ifdef CONFIG_PAX_MPROTECT
58608+ if (mm->pax_flags & MF_PAX_MPROTECT)
58609+ vm_flags &= ~VM_MAYEXEC;
58610+#endif
58611+
58612+ }
58613+#endif
58614+
58615 /*
58616 * Adjust stack execute permissions; explicitly enable for
58617 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
58618@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
58619 goto out_unlock;
58620 BUG_ON(prev != vma);
58621
58622- /* Move stack pages down in memory. */
58623- if (stack_shift) {
58624- ret = shift_arg_pages(vma, stack_shift);
58625- if (ret)
58626- goto out_unlock;
58627- }
58628-
58629 /* mprotect_fixup is overkill to remove the temporary stack flags */
58630 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
58631
58632@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
58633 #endif
58634 current->mm->start_stack = bprm->p;
58635 ret = expand_stack(vma, stack_base);
58636+
58637+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
58638+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
58639+ unsigned long size;
58640+ vm_flags_t vm_flags;
58641+
58642+ size = STACK_TOP - vma->vm_end;
58643+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
58644+
58645+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
58646+
58647+#ifdef CONFIG_X86
58648+ if (!ret) {
58649+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
58650+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
58651+ }
58652+#endif
58653+
58654+ }
58655+#endif
58656+
58657 if (ret)
58658 ret = -EFAULT;
58659
58660@@ -775,6 +851,8 @@ static struct file *do_open_exec(struct filename *name)
58661
58662 fsnotify_open(file);
58663
58664+ trace_open_exec(name->name);
58665+
58666 err = deny_write_access(file);
58667 if (err)
58668 goto exit;
58669@@ -804,7 +882,7 @@ int kernel_read(struct file *file, loff_t offset,
58670 old_fs = get_fs();
58671 set_fs(get_ds());
58672 /* The cast to a user pointer is valid due to the set_fs() */
58673- result = vfs_read(file, (void __user *)addr, count, &pos);
58674+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
58675 set_fs(old_fs);
58676 return result;
58677 }
58678@@ -849,6 +927,7 @@ static int exec_mmap(struct mm_struct *mm)
58679 tsk->mm = mm;
58680 tsk->active_mm = mm;
58681 activate_mm(active_mm, mm);
58682+ populate_stack();
58683 tsk->mm->vmacache_seqnum = 0;
58684 vmacache_flush(tsk);
58685 task_unlock(tsk);
58686@@ -1246,7 +1325,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
58687 }
58688 rcu_read_unlock();
58689
58690- if (p->fs->users > n_fs)
58691+ if (atomic_read(&p->fs->users) > n_fs)
58692 bprm->unsafe |= LSM_UNSAFE_SHARE;
58693 else
58694 p->fs->in_exec = 1;
58695@@ -1422,6 +1501,31 @@ static int exec_binprm(struct linux_binprm *bprm)
58696 return ret;
58697 }
58698
58699+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58700+static DEFINE_PER_CPU(u64, exec_counter);
58701+static int __init init_exec_counters(void)
58702+{
58703+ unsigned int cpu;
58704+
58705+ for_each_possible_cpu(cpu) {
58706+ per_cpu(exec_counter, cpu) = (u64)cpu;
58707+ }
58708+
58709+ return 0;
58710+}
58711+early_initcall(init_exec_counters);
58712+static inline void increment_exec_counter(void)
58713+{
58714+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
58715+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
58716+}
58717+#else
58718+static inline void increment_exec_counter(void) {}
58719+#endif
58720+
58721+extern void gr_handle_exec_args(struct linux_binprm *bprm,
58722+ struct user_arg_ptr argv);
58723+
58724 /*
58725 * sys_execve() executes a new program.
58726 */
58727@@ -1429,6 +1533,11 @@ static int do_execve_common(struct filename *filename,
58728 struct user_arg_ptr argv,
58729 struct user_arg_ptr envp)
58730 {
58731+#ifdef CONFIG_GRKERNSEC
58732+ struct file *old_exec_file;
58733+ struct acl_subject_label *old_acl;
58734+ struct rlimit old_rlim[RLIM_NLIMITS];
58735+#endif
58736 struct linux_binprm *bprm;
58737 struct file *file;
58738 struct files_struct *displaced;
58739@@ -1437,6 +1546,8 @@ static int do_execve_common(struct filename *filename,
58740 if (IS_ERR(filename))
58741 return PTR_ERR(filename);
58742
58743+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
58744+
58745 /*
58746 * We move the actual failure in case of RLIMIT_NPROC excess from
58747 * set*uid() to execve() because too many poorly written programs
58748@@ -1474,11 +1585,21 @@ static int do_execve_common(struct filename *filename,
58749 if (IS_ERR(file))
58750 goto out_unmark;
58751
58752+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
58753+ retval = -EPERM;
58754+ goto out_unmark;
58755+ }
58756+
58757 sched_exec();
58758
58759 bprm->file = file;
58760 bprm->filename = bprm->interp = filename->name;
58761
58762+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
58763+ retval = -EACCES;
58764+ goto out_unmark;
58765+ }
58766+
58767 retval = bprm_mm_init(bprm);
58768 if (retval)
58769 goto out_unmark;
58770@@ -1495,24 +1616,70 @@ static int do_execve_common(struct filename *filename,
58771 if (retval < 0)
58772 goto out;
58773
58774+#ifdef CONFIG_GRKERNSEC
58775+ old_acl = current->acl;
58776+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
58777+ old_exec_file = current->exec_file;
58778+ get_file(file);
58779+ current->exec_file = file;
58780+#endif
58781+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
58782+ /* limit suid stack to 8MB
58783+ * we saved the old limits above and will restore them if this exec fails
58784+ */
58785+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
58786+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
58787+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
58788+#endif
58789+
58790+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
58791+ retval = -EPERM;
58792+ goto out_fail;
58793+ }
58794+
58795+ if (!gr_tpe_allow(file)) {
58796+ retval = -EACCES;
58797+ goto out_fail;
58798+ }
58799+
58800+ if (gr_check_crash_exec(file)) {
58801+ retval = -EACCES;
58802+ goto out_fail;
58803+ }
58804+
58805+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
58806+ bprm->unsafe);
58807+ if (retval < 0)
58808+ goto out_fail;
58809+
58810 retval = copy_strings_kernel(1, &bprm->filename, bprm);
58811 if (retval < 0)
58812- goto out;
58813+ goto out_fail;
58814
58815 bprm->exec = bprm->p;
58816 retval = copy_strings(bprm->envc, envp, bprm);
58817 if (retval < 0)
58818- goto out;
58819+ goto out_fail;
58820
58821 retval = copy_strings(bprm->argc, argv, bprm);
58822 if (retval < 0)
58823- goto out;
58824+ goto out_fail;
58825+
58826+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
58827+
58828+ gr_handle_exec_args(bprm, argv);
58829
58830 retval = exec_binprm(bprm);
58831 if (retval < 0)
58832- goto out;
58833+ goto out_fail;
58834+#ifdef CONFIG_GRKERNSEC
58835+ if (old_exec_file)
58836+ fput(old_exec_file);
58837+#endif
58838
58839 /* execve succeeded */
58840+
58841+ increment_exec_counter();
58842 current->fs->in_exec = 0;
58843 current->in_execve = 0;
58844 acct_update_integrals(current);
58845@@ -1523,6 +1690,14 @@ static int do_execve_common(struct filename *filename,
58846 put_files_struct(displaced);
58847 return retval;
58848
58849+out_fail:
58850+#ifdef CONFIG_GRKERNSEC
58851+ current->acl = old_acl;
58852+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
58853+ fput(current->exec_file);
58854+ current->exec_file = old_exec_file;
58855+#endif
58856+
58857 out:
58858 if (bprm->mm) {
58859 acct_arg_size(bprm, 0);
58860@@ -1614,3 +1789,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
58861 return compat_do_execve(getname(filename), argv, envp);
58862 }
58863 #endif
58864+
58865+int pax_check_flags(unsigned long *flags)
58866+{
58867+ int retval = 0;
58868+
58869+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
58870+ if (*flags & MF_PAX_SEGMEXEC)
58871+ {
58872+ *flags &= ~MF_PAX_SEGMEXEC;
58873+ retval = -EINVAL;
58874+ }
58875+#endif
58876+
58877+ if ((*flags & MF_PAX_PAGEEXEC)
58878+
58879+#ifdef CONFIG_PAX_PAGEEXEC
58880+ && (*flags & MF_PAX_SEGMEXEC)
58881+#endif
58882+
58883+ )
58884+ {
58885+ *flags &= ~MF_PAX_PAGEEXEC;
58886+ retval = -EINVAL;
58887+ }
58888+
58889+ if ((*flags & MF_PAX_MPROTECT)
58890+
58891+#ifdef CONFIG_PAX_MPROTECT
58892+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
58893+#endif
58894+
58895+ )
58896+ {
58897+ *flags &= ~MF_PAX_MPROTECT;
58898+ retval = -EINVAL;
58899+ }
58900+
58901+ if ((*flags & MF_PAX_EMUTRAMP)
58902+
58903+#ifdef CONFIG_PAX_EMUTRAMP
58904+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
58905+#endif
58906+
58907+ )
58908+ {
58909+ *flags &= ~MF_PAX_EMUTRAMP;
58910+ retval = -EINVAL;
58911+ }
58912+
58913+ return retval;
58914+}
58915+
58916+EXPORT_SYMBOL(pax_check_flags);
58917+
58918+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58919+char *pax_get_path(const struct path *path, char *buf, int buflen)
58920+{
58921+ char *pathname = d_path(path, buf, buflen);
58922+
58923+ if (IS_ERR(pathname))
58924+ goto toolong;
58925+
58926+ pathname = mangle_path(buf, pathname, "\t\n\\");
58927+ if (!pathname)
58928+ goto toolong;
58929+
58930+ *pathname = 0;
58931+ return buf;
58932+
58933+toolong:
58934+ return "<path too long>";
58935+}
58936+EXPORT_SYMBOL(pax_get_path);
58937+
58938+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
58939+{
58940+ struct task_struct *tsk = current;
58941+ struct mm_struct *mm = current->mm;
58942+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
58943+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
58944+ char *path_exec = NULL;
58945+ char *path_fault = NULL;
58946+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
58947+ siginfo_t info = { };
58948+
58949+ if (buffer_exec && buffer_fault) {
58950+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
58951+
58952+ down_read(&mm->mmap_sem);
58953+ vma = mm->mmap;
58954+ while (vma && (!vma_exec || !vma_fault)) {
58955+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
58956+ vma_exec = vma;
58957+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
58958+ vma_fault = vma;
58959+ vma = vma->vm_next;
58960+ }
58961+ if (vma_exec)
58962+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
58963+ if (vma_fault) {
58964+ start = vma_fault->vm_start;
58965+ end = vma_fault->vm_end;
58966+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
58967+ if (vma_fault->vm_file)
58968+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
58969+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
58970+ path_fault = "<heap>";
58971+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
58972+ path_fault = "<stack>";
58973+ else
58974+ path_fault = "<anonymous mapping>";
58975+ }
58976+ up_read(&mm->mmap_sem);
58977+ }
58978+ if (tsk->signal->curr_ip)
58979+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
58980+ else
58981+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
58982+ 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),
58983+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
58984+ free_page((unsigned long)buffer_exec);
58985+ free_page((unsigned long)buffer_fault);
58986+ pax_report_insns(regs, pc, sp);
58987+ info.si_signo = SIGKILL;
58988+ info.si_errno = 0;
58989+ info.si_code = SI_KERNEL;
58990+ info.si_pid = 0;
58991+ info.si_uid = 0;
58992+ do_coredump(&info);
58993+}
58994+#endif
58995+
58996+#ifdef CONFIG_PAX_REFCOUNT
58997+void pax_report_refcount_overflow(struct pt_regs *regs)
58998+{
58999+ if (current->signal->curr_ip)
59000+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
59001+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
59002+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
59003+ else
59004+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
59005+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
59006+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
59007+ preempt_disable();
59008+ show_regs(regs);
59009+ preempt_enable();
59010+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
59011+}
59012+#endif
59013+
59014+#ifdef CONFIG_PAX_USERCOPY
59015+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
59016+static noinline int check_stack_object(const void *obj, unsigned long len)
59017+{
59018+ const void * const stack = task_stack_page(current);
59019+ const void * const stackend = stack + THREAD_SIZE;
59020+
59021+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
59022+ const void *frame = NULL;
59023+ const void *oldframe;
59024+#endif
59025+
59026+ if (obj + len < obj)
59027+ return -1;
59028+
59029+ if (obj + len <= stack || stackend <= obj)
59030+ return 0;
59031+
59032+ if (obj < stack || stackend < obj + len)
59033+ return -1;
59034+
59035+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
59036+ oldframe = __builtin_frame_address(1);
59037+ if (oldframe)
59038+ frame = __builtin_frame_address(2);
59039+ /*
59040+ low ----------------------------------------------> high
59041+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
59042+ ^----------------^
59043+ allow copies only within here
59044+ */
59045+ while (stack <= frame && frame < stackend) {
59046+ /* if obj + len extends past the last frame, this
59047+ check won't pass and the next frame will be 0,
59048+ causing us to bail out and correctly report
59049+ the copy as invalid
59050+ */
59051+ if (obj + len <= frame)
59052+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
59053+ oldframe = frame;
59054+ frame = *(const void * const *)frame;
59055+ }
59056+ return -1;
59057+#else
59058+ return 1;
59059+#endif
59060+}
59061+
59062+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
59063+{
59064+ if (current->signal->curr_ip)
59065+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
59066+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
59067+ else
59068+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
59069+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
59070+ dump_stack();
59071+ gr_handle_kernel_exploit();
59072+ do_group_exit(SIGKILL);
59073+}
59074+#endif
59075+
59076+#ifdef CONFIG_PAX_USERCOPY
59077+
59078+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
59079+{
59080+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
59081+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
59082+#ifdef CONFIG_MODULES
59083+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
59084+#else
59085+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
59086+#endif
59087+
59088+#else
59089+ unsigned long textlow = (unsigned long)_stext;
59090+ unsigned long texthigh = (unsigned long)_etext;
59091+
59092+#ifdef CONFIG_X86_64
59093+ /* check against linear mapping as well */
59094+ if (high > (unsigned long)__va(__pa(textlow)) &&
59095+ low < (unsigned long)__va(__pa(texthigh)))
59096+ return true;
59097+#endif
59098+
59099+#endif
59100+
59101+ if (high <= textlow || low >= texthigh)
59102+ return false;
59103+ else
59104+ return true;
59105+}
59106+#endif
59107+
59108+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
59109+{
59110+#ifdef CONFIG_PAX_USERCOPY
59111+ const char *type;
59112+#endif
59113+
59114+#ifndef CONFIG_STACK_GROWSUP
59115+ unsigned long stackstart = (unsigned long)task_stack_page(current);
59116+ unsigned long currentsp = (unsigned long)&stackstart;
59117+ if (unlikely((currentsp < stackstart + 512 ||
59118+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
59119+ BUG();
59120+#endif
59121+
59122+#ifndef CONFIG_PAX_USERCOPY_DEBUG
59123+ if (const_size)
59124+ return;
59125+#endif
59126+
59127+#ifdef CONFIG_PAX_USERCOPY
59128+ if (!n)
59129+ return;
59130+
59131+ type = check_heap_object(ptr, n);
59132+ if (!type) {
59133+ int ret = check_stack_object(ptr, n);
59134+ if (ret == 1 || ret == 2)
59135+ return;
59136+ if (ret == 0) {
59137+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
59138+ type = "<kernel text>";
59139+ else
59140+ return;
59141+ } else
59142+ type = "<process stack>";
59143+ }
59144+
59145+ pax_report_usercopy(ptr, n, to_user, type);
59146+#endif
59147+
59148+}
59149+EXPORT_SYMBOL(__check_object_size);
59150+
59151+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
59152+void pax_track_stack(void)
59153+{
59154+ unsigned long sp = (unsigned long)&sp;
59155+ if (sp < current_thread_info()->lowest_stack &&
59156+ sp > (unsigned long)task_stack_page(current))
59157+ current_thread_info()->lowest_stack = sp;
59158+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
59159+ BUG();
59160+}
59161+EXPORT_SYMBOL(pax_track_stack);
59162+#endif
59163+
59164+#ifdef CONFIG_PAX_SIZE_OVERFLOW
59165+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
59166+{
59167+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
59168+ dump_stack();
59169+ do_group_exit(SIGKILL);
59170+}
59171+EXPORT_SYMBOL(report_size_overflow);
59172+#endif
59173diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
59174index 9f9992b..8b59411 100644
59175--- a/fs/ext2/balloc.c
59176+++ b/fs/ext2/balloc.c
59177@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
59178
59179 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
59180 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
59181- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
59182+ if (free_blocks < root_blocks + 1 &&
59183 !uid_eq(sbi->s_resuid, current_fsuid()) &&
59184 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
59185- !in_group_p (sbi->s_resgid))) {
59186+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
59187 return 0;
59188 }
59189 return 1;
59190diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
59191index 9142614..97484fa 100644
59192--- a/fs/ext2/xattr.c
59193+++ b/fs/ext2/xattr.c
59194@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
59195 struct buffer_head *bh = NULL;
59196 struct ext2_xattr_entry *entry;
59197 char *end;
59198- size_t rest = buffer_size;
59199+ size_t rest = buffer_size, total_size = 0;
59200 int error;
59201
59202 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
59203@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
59204 buffer += size;
59205 }
59206 rest -= size;
59207+ total_size += size;
59208 }
59209 }
59210- error = buffer_size - rest; /* total size */
59211+ error = total_size;
59212
59213 cleanup:
59214 brelse(bh);
59215diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
59216index 158b5d4..2432610 100644
59217--- a/fs/ext3/balloc.c
59218+++ b/fs/ext3/balloc.c
59219@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
59220
59221 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
59222 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
59223- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
59224+ if (free_blocks < root_blocks + 1 &&
59225 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
59226 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
59227- !in_group_p (sbi->s_resgid))) {
59228+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
59229 return 0;
59230 }
59231 return 1;
59232diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
59233index c6874be..f8a6ae8 100644
59234--- a/fs/ext3/xattr.c
59235+++ b/fs/ext3/xattr.c
59236@@ -330,7 +330,7 @@ static int
59237 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
59238 char *buffer, size_t buffer_size)
59239 {
59240- size_t rest = buffer_size;
59241+ size_t rest = buffer_size, total_size = 0;
59242
59243 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
59244 const struct xattr_handler *handler =
59245@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
59246 buffer += size;
59247 }
59248 rest -= size;
59249+ total_size += size;
59250 }
59251 }
59252- return buffer_size - rest;
59253+ return total_size;
59254 }
59255
59256 static int
59257diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
59258index 5c56785..77698a2 100644
59259--- a/fs/ext4/balloc.c
59260+++ b/fs/ext4/balloc.c
59261@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
59262 /* Hm, nope. Are (enough) root reserved clusters available? */
59263 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
59264 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
59265- capable(CAP_SYS_RESOURCE) ||
59266- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
59267+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
59268+ capable_nolog(CAP_SYS_RESOURCE)) {
59269
59270 if (free_clusters >= (nclusters + dirty_clusters +
59271 resv_clusters))
59272diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
59273index f542e48..c0275f5 100644
59274--- a/fs/ext4/ext4.h
59275+++ b/fs/ext4/ext4.h
59276@@ -1274,19 +1274,19 @@ struct ext4_sb_info {
59277 unsigned long s_mb_last_start;
59278
59279 /* stats for buddy allocator */
59280- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
59281- atomic_t s_bal_success; /* we found long enough chunks */
59282- atomic_t s_bal_allocated; /* in blocks */
59283- atomic_t s_bal_ex_scanned; /* total extents scanned */
59284- atomic_t s_bal_goals; /* goal hits */
59285- atomic_t s_bal_breaks; /* too long searches */
59286- atomic_t s_bal_2orders; /* 2^order hits */
59287+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
59288+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
59289+ atomic_unchecked_t s_bal_allocated; /* in blocks */
59290+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
59291+ atomic_unchecked_t s_bal_goals; /* goal hits */
59292+ atomic_unchecked_t s_bal_breaks; /* too long searches */
59293+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
59294 spinlock_t s_bal_lock;
59295 unsigned long s_mb_buddies_generated;
59296 unsigned long long s_mb_generation_time;
59297- atomic_t s_mb_lost_chunks;
59298- atomic_t s_mb_preallocated;
59299- atomic_t s_mb_discarded;
59300+ atomic_unchecked_t s_mb_lost_chunks;
59301+ atomic_unchecked_t s_mb_preallocated;
59302+ atomic_unchecked_t s_mb_discarded;
59303 atomic_t s_lock_busy;
59304
59305 /* locality groups */
59306diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
59307index 594009f..c30cbe2 100644
59308--- a/fs/ext4/indirect.c
59309+++ b/fs/ext4/indirect.c
59310@@ -389,7 +389,13 @@ static int ext4_alloc_branch(handle_t *handle, struct inode *inode,
59311 return 0;
59312 failed:
59313 for (; i >= 0; i--) {
59314- if (i != indirect_blks && branch[i].bh)
59315+ /*
59316+ * We want to ext4_forget() only freshly allocated indirect
59317+ * blocks. Buffer for new_blocks[i-1] is at branch[i].bh and
59318+ * buffer at branch[0].bh is indirect block / inode already
59319+ * existing before ext4_alloc_branch() was called.
59320+ */
59321+ if (i > 0 && i != indirect_blks && branch[i].bh)
59322 ext4_forget(handle, 1, inode, branch[i].bh,
59323 branch[i].bh->b_blocknr);
59324 ext4_free_blocks(handle, inode, NULL, new_blocks[i],
59325@@ -1312,16 +1318,24 @@ static int free_hole_blocks(handle_t *handle, struct inode *inode,
59326 blk = *i_data;
59327 if (level > 0) {
59328 ext4_lblk_t first2;
59329+ ext4_lblk_t count2;
59330+
59331 bh = sb_bread(inode->i_sb, le32_to_cpu(blk));
59332 if (!bh) {
59333 EXT4_ERROR_INODE_BLOCK(inode, le32_to_cpu(blk),
59334 "Read failure");
59335 return -EIO;
59336 }
59337- first2 = (first > offset) ? first - offset : 0;
59338+ if (first > offset) {
59339+ first2 = first - offset;
59340+ count2 = count;
59341+ } else {
59342+ first2 = 0;
59343+ count2 = count - (offset - first);
59344+ }
59345 ret = free_hole_blocks(handle, inode, bh,
59346 (__le32 *)bh->b_data, level - 1,
59347- first2, count - offset,
59348+ first2, count2,
59349 inode->i_sb->s_blocksize >> 2);
59350 if (ret) {
59351 brelse(bh);
59352@@ -1331,8 +1345,8 @@ static int free_hole_blocks(handle_t *handle, struct inode *inode,
59353 if (level == 0 ||
59354 (bh && all_zeroes((__le32 *)bh->b_data,
59355 (__le32 *)bh->b_data + addr_per_block))) {
59356- ext4_free_data(handle, inode, parent_bh, &blk, &blk+1);
59357- *i_data = 0;
59358+ ext4_free_data(handle, inode, parent_bh,
59359+ i_data, i_data + 1);
59360 }
59361 brelse(bh);
59362 bh = NULL;
59363diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
59364index fe4e668..f983538 100644
59365--- a/fs/ext4/mballoc.c
59366+++ b/fs/ext4/mballoc.c
59367@@ -1889,7 +1889,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
59368 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
59369
59370 if (EXT4_SB(sb)->s_mb_stats)
59371- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
59372+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
59373
59374 break;
59375 }
59376@@ -2199,7 +2199,7 @@ repeat:
59377 ac->ac_status = AC_STATUS_CONTINUE;
59378 ac->ac_flags |= EXT4_MB_HINT_FIRST;
59379 cr = 3;
59380- atomic_inc(&sbi->s_mb_lost_chunks);
59381+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
59382 goto repeat;
59383 }
59384 }
59385@@ -2707,25 +2707,25 @@ int ext4_mb_release(struct super_block *sb)
59386 if (sbi->s_mb_stats) {
59387 ext4_msg(sb, KERN_INFO,
59388 "mballoc: %u blocks %u reqs (%u success)",
59389- atomic_read(&sbi->s_bal_allocated),
59390- atomic_read(&sbi->s_bal_reqs),
59391- atomic_read(&sbi->s_bal_success));
59392+ atomic_read_unchecked(&sbi->s_bal_allocated),
59393+ atomic_read_unchecked(&sbi->s_bal_reqs),
59394+ atomic_read_unchecked(&sbi->s_bal_success));
59395 ext4_msg(sb, KERN_INFO,
59396 "mballoc: %u extents scanned, %u goal hits, "
59397 "%u 2^N hits, %u breaks, %u lost",
59398- atomic_read(&sbi->s_bal_ex_scanned),
59399- atomic_read(&sbi->s_bal_goals),
59400- atomic_read(&sbi->s_bal_2orders),
59401- atomic_read(&sbi->s_bal_breaks),
59402- atomic_read(&sbi->s_mb_lost_chunks));
59403+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
59404+ atomic_read_unchecked(&sbi->s_bal_goals),
59405+ atomic_read_unchecked(&sbi->s_bal_2orders),
59406+ atomic_read_unchecked(&sbi->s_bal_breaks),
59407+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
59408 ext4_msg(sb, KERN_INFO,
59409 "mballoc: %lu generated and it took %Lu",
59410 sbi->s_mb_buddies_generated,
59411 sbi->s_mb_generation_time);
59412 ext4_msg(sb, KERN_INFO,
59413 "mballoc: %u preallocated, %u discarded",
59414- atomic_read(&sbi->s_mb_preallocated),
59415- atomic_read(&sbi->s_mb_discarded));
59416+ atomic_read_unchecked(&sbi->s_mb_preallocated),
59417+ atomic_read_unchecked(&sbi->s_mb_discarded));
59418 }
59419
59420 free_percpu(sbi->s_locality_groups);
59421@@ -3179,16 +3179,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
59422 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
59423
59424 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
59425- atomic_inc(&sbi->s_bal_reqs);
59426- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
59427+ atomic_inc_unchecked(&sbi->s_bal_reqs);
59428+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
59429 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
59430- atomic_inc(&sbi->s_bal_success);
59431- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
59432+ atomic_inc_unchecked(&sbi->s_bal_success);
59433+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
59434 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
59435 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
59436- atomic_inc(&sbi->s_bal_goals);
59437+ atomic_inc_unchecked(&sbi->s_bal_goals);
59438 if (ac->ac_found > sbi->s_mb_max_to_scan)
59439- atomic_inc(&sbi->s_bal_breaks);
59440+ atomic_inc_unchecked(&sbi->s_bal_breaks);
59441 }
59442
59443 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
59444@@ -3593,7 +3593,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
59445 trace_ext4_mb_new_inode_pa(ac, pa);
59446
59447 ext4_mb_use_inode_pa(ac, pa);
59448- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
59449+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
59450
59451 ei = EXT4_I(ac->ac_inode);
59452 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
59453@@ -3653,7 +3653,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
59454 trace_ext4_mb_new_group_pa(ac, pa);
59455
59456 ext4_mb_use_group_pa(ac, pa);
59457- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
59458+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
59459
59460 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
59461 lg = ac->ac_lg;
59462@@ -3742,7 +3742,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
59463 * from the bitmap and continue.
59464 */
59465 }
59466- atomic_add(free, &sbi->s_mb_discarded);
59467+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
59468
59469 return err;
59470 }
59471@@ -3760,7 +3760,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
59472 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
59473 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
59474 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
59475- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
59476+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
59477 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
59478
59479 return 0;
59480diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
59481index 04434ad..6404663 100644
59482--- a/fs/ext4/mmp.c
59483+++ b/fs/ext4/mmp.c
59484@@ -113,7 +113,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
59485 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
59486 const char *function, unsigned int line, const char *msg)
59487 {
59488- __ext4_warning(sb, function, line, msg);
59489+ __ext4_warning(sb, function, line, "%s", msg);
59490 __ext4_warning(sb, function, line,
59491 "MMP failure info: last update time: %llu, last update "
59492 "node: %s, last update device: %s\n",
59493diff --git a/fs/ext4/super.c b/fs/ext4/super.c
59494index 6f9e6fa..5431c02 100644
59495--- a/fs/ext4/super.c
59496+++ b/fs/ext4/super.c
59497@@ -1275,7 +1275,7 @@ static ext4_fsblk_t get_sb_block(void **data)
59498 }
59499
59500 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
59501-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
59502+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
59503 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
59504
59505 #ifdef CONFIG_QUOTA
59506@@ -2455,7 +2455,7 @@ struct ext4_attr {
59507 int offset;
59508 int deprecated_val;
59509 } u;
59510-};
59511+} __do_const;
59512
59513 static int parse_strtoull(const char *buf,
59514 unsigned long long max, unsigned long long *value)
59515diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
59516index 4eec399..1d9444c 100644
59517--- a/fs/ext4/xattr.c
59518+++ b/fs/ext4/xattr.c
59519@@ -383,7 +383,7 @@ static int
59520 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
59521 char *buffer, size_t buffer_size)
59522 {
59523- size_t rest = buffer_size;
59524+ size_t rest = buffer_size, total_size = 0;
59525
59526 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
59527 const struct xattr_handler *handler =
59528@@ -400,9 +400,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
59529 buffer += size;
59530 }
59531 rest -= size;
59532+ total_size += size;
59533 }
59534 }
59535- return buffer_size - rest;
59536+ return total_size;
59537 }
59538
59539 static int
59540diff --git a/fs/fcntl.c b/fs/fcntl.c
59541index 72c82f6..a18b263 100644
59542--- a/fs/fcntl.c
59543+++ b/fs/fcntl.c
59544@@ -106,6 +106,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
59545 if (err)
59546 return err;
59547
59548+ if (gr_handle_chroot_fowner(pid, type))
59549+ return -ENOENT;
59550+ if (gr_check_protected_task_fowner(pid, type))
59551+ return -EACCES;
59552+
59553 f_modown(filp, pid, type, force);
59554 return 0;
59555 }
59556diff --git a/fs/fhandle.c b/fs/fhandle.c
59557index 999ff5c..ac037c9 100644
59558--- a/fs/fhandle.c
59559+++ b/fs/fhandle.c
59560@@ -8,6 +8,7 @@
59561 #include <linux/fs_struct.h>
59562 #include <linux/fsnotify.h>
59563 #include <linux/personality.h>
59564+#include <linux/grsecurity.h>
59565 #include <asm/uaccess.h>
59566 #include "internal.h"
59567 #include "mount.h"
59568@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
59569 } else
59570 retval = 0;
59571 /* copy the mount id */
59572- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
59573- sizeof(*mnt_id)) ||
59574+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
59575 copy_to_user(ufh, handle,
59576 sizeof(struct file_handle) + handle_bytes))
59577 retval = -EFAULT;
59578@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
59579 * the directory. Ideally we would like CAP_DAC_SEARCH.
59580 * But we don't have that
59581 */
59582- if (!capable(CAP_DAC_READ_SEARCH)) {
59583+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
59584 retval = -EPERM;
59585 goto out_err;
59586 }
59587diff --git a/fs/file.c b/fs/file.c
59588index 8f294cf..d0f3872 100644
59589--- a/fs/file.c
59590+++ b/fs/file.c
59591@@ -16,6 +16,7 @@
59592 #include <linux/slab.h>
59593 #include <linux/vmalloc.h>
59594 #include <linux/file.h>
59595+#include <linux/security.h>
59596 #include <linux/fdtable.h>
59597 #include <linux/bitops.h>
59598 #include <linux/interrupt.h>
59599@@ -144,7 +145,7 @@ out:
59600 * Return <0 error code on error; 1 on successful completion.
59601 * The files->file_lock should be held on entry, and will be held on exit.
59602 */
59603-static int expand_fdtable(struct files_struct *files, int nr)
59604+static int expand_fdtable(struct files_struct *files, unsigned int nr)
59605 __releases(files->file_lock)
59606 __acquires(files->file_lock)
59607 {
59608@@ -189,7 +190,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
59609 * expanded and execution may have blocked.
59610 * The files->file_lock should be held on entry, and will be held on exit.
59611 */
59612-static int expand_files(struct files_struct *files, int nr)
59613+static int expand_files(struct files_struct *files, unsigned int nr)
59614 {
59615 struct fdtable *fdt;
59616
59617@@ -804,6 +805,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
59618 if (!file)
59619 return __close_fd(files, fd);
59620
59621+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
59622 if (fd >= rlimit(RLIMIT_NOFILE))
59623 return -EBADF;
59624
59625@@ -830,6 +832,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
59626 if (unlikely(oldfd == newfd))
59627 return -EINVAL;
59628
59629+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
59630 if (newfd >= rlimit(RLIMIT_NOFILE))
59631 return -EBADF;
59632
59633@@ -885,6 +888,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
59634 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
59635 {
59636 int err;
59637+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
59638 if (from >= rlimit(RLIMIT_NOFILE))
59639 return -EINVAL;
59640 err = alloc_fd(from, flags);
59641diff --git a/fs/filesystems.c b/fs/filesystems.c
59642index 5797d45..7d7d79a 100644
59643--- a/fs/filesystems.c
59644+++ b/fs/filesystems.c
59645@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
59646 int len = dot ? dot - name : strlen(name);
59647
59648 fs = __get_fs_type(name, len);
59649+#ifdef CONFIG_GRKERNSEC_MODHARDEN
59650+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
59651+#else
59652 if (!fs && (request_module("fs-%.*s", len, name) == 0))
59653+#endif
59654 fs = __get_fs_type(name, len);
59655
59656 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
59657diff --git a/fs/fs_struct.c b/fs/fs_struct.c
59658index 7dca743..543d620 100644
59659--- a/fs/fs_struct.c
59660+++ b/fs/fs_struct.c
59661@@ -4,6 +4,7 @@
59662 #include <linux/path.h>
59663 #include <linux/slab.h>
59664 #include <linux/fs_struct.h>
59665+#include <linux/grsecurity.h>
59666 #include "internal.h"
59667
59668 /*
59669@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
59670 write_seqcount_begin(&fs->seq);
59671 old_root = fs->root;
59672 fs->root = *path;
59673+ gr_set_chroot_entries(current, path);
59674 write_seqcount_end(&fs->seq);
59675 spin_unlock(&fs->lock);
59676 if (old_root.dentry)
59677@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
59678 int hits = 0;
59679 spin_lock(&fs->lock);
59680 write_seqcount_begin(&fs->seq);
59681+ /* this root replacement is only done by pivot_root,
59682+ leave grsec's chroot tagging alone for this task
59683+ so that a pivoted root isn't treated as a chroot
59684+ */
59685 hits += replace_path(&fs->root, old_root, new_root);
59686 hits += replace_path(&fs->pwd, old_root, new_root);
59687 write_seqcount_end(&fs->seq);
59688@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
59689 task_lock(tsk);
59690 spin_lock(&fs->lock);
59691 tsk->fs = NULL;
59692- kill = !--fs->users;
59693+ gr_clear_chroot_entries(tsk);
59694+ kill = !atomic_dec_return(&fs->users);
59695 spin_unlock(&fs->lock);
59696 task_unlock(tsk);
59697 if (kill)
59698@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
59699 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
59700 /* We don't need to lock fs - think why ;-) */
59701 if (fs) {
59702- fs->users = 1;
59703+ atomic_set(&fs->users, 1);
59704 fs->in_exec = 0;
59705 spin_lock_init(&fs->lock);
59706 seqcount_init(&fs->seq);
59707@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
59708 spin_lock(&old->lock);
59709 fs->root = old->root;
59710 path_get(&fs->root);
59711+ /* instead of calling gr_set_chroot_entries here,
59712+ we call it from every caller of this function
59713+ */
59714 fs->pwd = old->pwd;
59715 path_get(&fs->pwd);
59716 spin_unlock(&old->lock);
59717@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
59718
59719 task_lock(current);
59720 spin_lock(&fs->lock);
59721- kill = !--fs->users;
59722+ kill = !atomic_dec_return(&fs->users);
59723 current->fs = new_fs;
59724+ gr_set_chroot_entries(current, &new_fs->root);
59725 spin_unlock(&fs->lock);
59726 task_unlock(current);
59727
59728@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
59729
59730 int current_umask(void)
59731 {
59732- return current->fs->umask;
59733+ return current->fs->umask | gr_acl_umask();
59734 }
59735 EXPORT_SYMBOL(current_umask);
59736
59737 /* to be mentioned only in INIT_TASK */
59738 struct fs_struct init_fs = {
59739- .users = 1,
59740+ .users = ATOMIC_INIT(1),
59741 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
59742 .seq = SEQCNT_ZERO(init_fs.seq),
59743 .umask = 0022,
59744diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
59745index 29d7feb..303644d 100644
59746--- a/fs/fscache/cookie.c
59747+++ b/fs/fscache/cookie.c
59748@@ -19,7 +19,7 @@
59749
59750 struct kmem_cache *fscache_cookie_jar;
59751
59752-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
59753+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
59754
59755 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
59756 static int fscache_alloc_object(struct fscache_cache *cache,
59757@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
59758 parent ? (char *) parent->def->name : "<no-parent>",
59759 def->name, netfs_data, enable);
59760
59761- fscache_stat(&fscache_n_acquires);
59762+ fscache_stat_unchecked(&fscache_n_acquires);
59763
59764 /* if there's no parent cookie, then we don't create one here either */
59765 if (!parent) {
59766- fscache_stat(&fscache_n_acquires_null);
59767+ fscache_stat_unchecked(&fscache_n_acquires_null);
59768 _leave(" [no parent]");
59769 return NULL;
59770 }
59771@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
59772 /* allocate and initialise a cookie */
59773 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
59774 if (!cookie) {
59775- fscache_stat(&fscache_n_acquires_oom);
59776+ fscache_stat_unchecked(&fscache_n_acquires_oom);
59777 _leave(" [ENOMEM]");
59778 return NULL;
59779 }
59780@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
59781
59782 switch (cookie->def->type) {
59783 case FSCACHE_COOKIE_TYPE_INDEX:
59784- fscache_stat(&fscache_n_cookie_index);
59785+ fscache_stat_unchecked(&fscache_n_cookie_index);
59786 break;
59787 case FSCACHE_COOKIE_TYPE_DATAFILE:
59788- fscache_stat(&fscache_n_cookie_data);
59789+ fscache_stat_unchecked(&fscache_n_cookie_data);
59790 break;
59791 default:
59792- fscache_stat(&fscache_n_cookie_special);
59793+ fscache_stat_unchecked(&fscache_n_cookie_special);
59794 break;
59795 }
59796
59797@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
59798 } else {
59799 atomic_dec(&parent->n_children);
59800 __fscache_cookie_put(cookie);
59801- fscache_stat(&fscache_n_acquires_nobufs);
59802+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
59803 _leave(" = NULL");
59804 return NULL;
59805 }
59806@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
59807 }
59808 }
59809
59810- fscache_stat(&fscache_n_acquires_ok);
59811+ fscache_stat_unchecked(&fscache_n_acquires_ok);
59812 _leave(" = %p", cookie);
59813 return cookie;
59814 }
59815@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
59816 cache = fscache_select_cache_for_object(cookie->parent);
59817 if (!cache) {
59818 up_read(&fscache_addremove_sem);
59819- fscache_stat(&fscache_n_acquires_no_cache);
59820+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
59821 _leave(" = -ENOMEDIUM [no cache]");
59822 return -ENOMEDIUM;
59823 }
59824@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
59825 object = cache->ops->alloc_object(cache, cookie);
59826 fscache_stat_d(&fscache_n_cop_alloc_object);
59827 if (IS_ERR(object)) {
59828- fscache_stat(&fscache_n_object_no_alloc);
59829+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
59830 ret = PTR_ERR(object);
59831 goto error;
59832 }
59833
59834- fscache_stat(&fscache_n_object_alloc);
59835+ fscache_stat_unchecked(&fscache_n_object_alloc);
59836
59837- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
59838+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
59839
59840 _debug("ALLOC OBJ%x: %s {%lx}",
59841 object->debug_id, cookie->def->name, object->events);
59842@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
59843
59844 _enter("{%s}", cookie->def->name);
59845
59846- fscache_stat(&fscache_n_invalidates);
59847+ fscache_stat_unchecked(&fscache_n_invalidates);
59848
59849 /* Only permit invalidation of data files. Invalidating an index will
59850 * require the caller to release all its attachments to the tree rooted
59851@@ -477,10 +477,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
59852 {
59853 struct fscache_object *object;
59854
59855- fscache_stat(&fscache_n_updates);
59856+ fscache_stat_unchecked(&fscache_n_updates);
59857
59858 if (!cookie) {
59859- fscache_stat(&fscache_n_updates_null);
59860+ fscache_stat_unchecked(&fscache_n_updates_null);
59861 _leave(" [no cookie]");
59862 return;
59863 }
59864@@ -581,12 +581,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
59865 */
59866 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
59867 {
59868- fscache_stat(&fscache_n_relinquishes);
59869+ fscache_stat_unchecked(&fscache_n_relinquishes);
59870 if (retire)
59871- fscache_stat(&fscache_n_relinquishes_retire);
59872+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
59873
59874 if (!cookie) {
59875- fscache_stat(&fscache_n_relinquishes_null);
59876+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
59877 _leave(" [no cookie]");
59878 return;
59879 }
59880@@ -687,7 +687,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
59881 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
59882 goto inconsistent;
59883
59884- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
59885+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
59886
59887 __fscache_use_cookie(cookie);
59888 if (fscache_submit_op(object, op) < 0)
59889diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
59890index 4226f66..0fb3f45 100644
59891--- a/fs/fscache/internal.h
59892+++ b/fs/fscache/internal.h
59893@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
59894 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
59895 extern int fscache_wait_for_operation_activation(struct fscache_object *,
59896 struct fscache_operation *,
59897- atomic_t *,
59898- atomic_t *,
59899+ atomic_unchecked_t *,
59900+ atomic_unchecked_t *,
59901 void (*)(struct fscache_operation *));
59902 extern void fscache_invalidate_writes(struct fscache_cookie *);
59903
59904@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
59905 * stats.c
59906 */
59907 #ifdef CONFIG_FSCACHE_STATS
59908-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
59909-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
59910+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
59911+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
59912
59913-extern atomic_t fscache_n_op_pend;
59914-extern atomic_t fscache_n_op_run;
59915-extern atomic_t fscache_n_op_enqueue;
59916-extern atomic_t fscache_n_op_deferred_release;
59917-extern atomic_t fscache_n_op_release;
59918-extern atomic_t fscache_n_op_gc;
59919-extern atomic_t fscache_n_op_cancelled;
59920-extern atomic_t fscache_n_op_rejected;
59921+extern atomic_unchecked_t fscache_n_op_pend;
59922+extern atomic_unchecked_t fscache_n_op_run;
59923+extern atomic_unchecked_t fscache_n_op_enqueue;
59924+extern atomic_unchecked_t fscache_n_op_deferred_release;
59925+extern atomic_unchecked_t fscache_n_op_release;
59926+extern atomic_unchecked_t fscache_n_op_gc;
59927+extern atomic_unchecked_t fscache_n_op_cancelled;
59928+extern atomic_unchecked_t fscache_n_op_rejected;
59929
59930-extern atomic_t fscache_n_attr_changed;
59931-extern atomic_t fscache_n_attr_changed_ok;
59932-extern atomic_t fscache_n_attr_changed_nobufs;
59933-extern atomic_t fscache_n_attr_changed_nomem;
59934-extern atomic_t fscache_n_attr_changed_calls;
59935+extern atomic_unchecked_t fscache_n_attr_changed;
59936+extern atomic_unchecked_t fscache_n_attr_changed_ok;
59937+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
59938+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
59939+extern atomic_unchecked_t fscache_n_attr_changed_calls;
59940
59941-extern atomic_t fscache_n_allocs;
59942-extern atomic_t fscache_n_allocs_ok;
59943-extern atomic_t fscache_n_allocs_wait;
59944-extern atomic_t fscache_n_allocs_nobufs;
59945-extern atomic_t fscache_n_allocs_intr;
59946-extern atomic_t fscache_n_allocs_object_dead;
59947-extern atomic_t fscache_n_alloc_ops;
59948-extern atomic_t fscache_n_alloc_op_waits;
59949+extern atomic_unchecked_t fscache_n_allocs;
59950+extern atomic_unchecked_t fscache_n_allocs_ok;
59951+extern atomic_unchecked_t fscache_n_allocs_wait;
59952+extern atomic_unchecked_t fscache_n_allocs_nobufs;
59953+extern atomic_unchecked_t fscache_n_allocs_intr;
59954+extern atomic_unchecked_t fscache_n_allocs_object_dead;
59955+extern atomic_unchecked_t fscache_n_alloc_ops;
59956+extern atomic_unchecked_t fscache_n_alloc_op_waits;
59957
59958-extern atomic_t fscache_n_retrievals;
59959-extern atomic_t fscache_n_retrievals_ok;
59960-extern atomic_t fscache_n_retrievals_wait;
59961-extern atomic_t fscache_n_retrievals_nodata;
59962-extern atomic_t fscache_n_retrievals_nobufs;
59963-extern atomic_t fscache_n_retrievals_intr;
59964-extern atomic_t fscache_n_retrievals_nomem;
59965-extern atomic_t fscache_n_retrievals_object_dead;
59966-extern atomic_t fscache_n_retrieval_ops;
59967-extern atomic_t fscache_n_retrieval_op_waits;
59968+extern atomic_unchecked_t fscache_n_retrievals;
59969+extern atomic_unchecked_t fscache_n_retrievals_ok;
59970+extern atomic_unchecked_t fscache_n_retrievals_wait;
59971+extern atomic_unchecked_t fscache_n_retrievals_nodata;
59972+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
59973+extern atomic_unchecked_t fscache_n_retrievals_intr;
59974+extern atomic_unchecked_t fscache_n_retrievals_nomem;
59975+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
59976+extern atomic_unchecked_t fscache_n_retrieval_ops;
59977+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
59978
59979-extern atomic_t fscache_n_stores;
59980-extern atomic_t fscache_n_stores_ok;
59981-extern atomic_t fscache_n_stores_again;
59982-extern atomic_t fscache_n_stores_nobufs;
59983-extern atomic_t fscache_n_stores_oom;
59984-extern atomic_t fscache_n_store_ops;
59985-extern atomic_t fscache_n_store_calls;
59986-extern atomic_t fscache_n_store_pages;
59987-extern atomic_t fscache_n_store_radix_deletes;
59988-extern atomic_t fscache_n_store_pages_over_limit;
59989+extern atomic_unchecked_t fscache_n_stores;
59990+extern atomic_unchecked_t fscache_n_stores_ok;
59991+extern atomic_unchecked_t fscache_n_stores_again;
59992+extern atomic_unchecked_t fscache_n_stores_nobufs;
59993+extern atomic_unchecked_t fscache_n_stores_oom;
59994+extern atomic_unchecked_t fscache_n_store_ops;
59995+extern atomic_unchecked_t fscache_n_store_calls;
59996+extern atomic_unchecked_t fscache_n_store_pages;
59997+extern atomic_unchecked_t fscache_n_store_radix_deletes;
59998+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
59999
60000-extern atomic_t fscache_n_store_vmscan_not_storing;
60001-extern atomic_t fscache_n_store_vmscan_gone;
60002-extern atomic_t fscache_n_store_vmscan_busy;
60003-extern atomic_t fscache_n_store_vmscan_cancelled;
60004-extern atomic_t fscache_n_store_vmscan_wait;
60005+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
60006+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
60007+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
60008+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
60009+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
60010
60011-extern atomic_t fscache_n_marks;
60012-extern atomic_t fscache_n_uncaches;
60013+extern atomic_unchecked_t fscache_n_marks;
60014+extern atomic_unchecked_t fscache_n_uncaches;
60015
60016-extern atomic_t fscache_n_acquires;
60017-extern atomic_t fscache_n_acquires_null;
60018-extern atomic_t fscache_n_acquires_no_cache;
60019-extern atomic_t fscache_n_acquires_ok;
60020-extern atomic_t fscache_n_acquires_nobufs;
60021-extern atomic_t fscache_n_acquires_oom;
60022+extern atomic_unchecked_t fscache_n_acquires;
60023+extern atomic_unchecked_t fscache_n_acquires_null;
60024+extern atomic_unchecked_t fscache_n_acquires_no_cache;
60025+extern atomic_unchecked_t fscache_n_acquires_ok;
60026+extern atomic_unchecked_t fscache_n_acquires_nobufs;
60027+extern atomic_unchecked_t fscache_n_acquires_oom;
60028
60029-extern atomic_t fscache_n_invalidates;
60030-extern atomic_t fscache_n_invalidates_run;
60031+extern atomic_unchecked_t fscache_n_invalidates;
60032+extern atomic_unchecked_t fscache_n_invalidates_run;
60033
60034-extern atomic_t fscache_n_updates;
60035-extern atomic_t fscache_n_updates_null;
60036-extern atomic_t fscache_n_updates_run;
60037+extern atomic_unchecked_t fscache_n_updates;
60038+extern atomic_unchecked_t fscache_n_updates_null;
60039+extern atomic_unchecked_t fscache_n_updates_run;
60040
60041-extern atomic_t fscache_n_relinquishes;
60042-extern atomic_t fscache_n_relinquishes_null;
60043-extern atomic_t fscache_n_relinquishes_waitcrt;
60044-extern atomic_t fscache_n_relinquishes_retire;
60045+extern atomic_unchecked_t fscache_n_relinquishes;
60046+extern atomic_unchecked_t fscache_n_relinquishes_null;
60047+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
60048+extern atomic_unchecked_t fscache_n_relinquishes_retire;
60049
60050-extern atomic_t fscache_n_cookie_index;
60051-extern atomic_t fscache_n_cookie_data;
60052-extern atomic_t fscache_n_cookie_special;
60053+extern atomic_unchecked_t fscache_n_cookie_index;
60054+extern atomic_unchecked_t fscache_n_cookie_data;
60055+extern atomic_unchecked_t fscache_n_cookie_special;
60056
60057-extern atomic_t fscache_n_object_alloc;
60058-extern atomic_t fscache_n_object_no_alloc;
60059-extern atomic_t fscache_n_object_lookups;
60060-extern atomic_t fscache_n_object_lookups_negative;
60061-extern atomic_t fscache_n_object_lookups_positive;
60062-extern atomic_t fscache_n_object_lookups_timed_out;
60063-extern atomic_t fscache_n_object_created;
60064-extern atomic_t fscache_n_object_avail;
60065-extern atomic_t fscache_n_object_dead;
60066+extern atomic_unchecked_t fscache_n_object_alloc;
60067+extern atomic_unchecked_t fscache_n_object_no_alloc;
60068+extern atomic_unchecked_t fscache_n_object_lookups;
60069+extern atomic_unchecked_t fscache_n_object_lookups_negative;
60070+extern atomic_unchecked_t fscache_n_object_lookups_positive;
60071+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
60072+extern atomic_unchecked_t fscache_n_object_created;
60073+extern atomic_unchecked_t fscache_n_object_avail;
60074+extern atomic_unchecked_t fscache_n_object_dead;
60075
60076-extern atomic_t fscache_n_checkaux_none;
60077-extern atomic_t fscache_n_checkaux_okay;
60078-extern atomic_t fscache_n_checkaux_update;
60079-extern atomic_t fscache_n_checkaux_obsolete;
60080+extern atomic_unchecked_t fscache_n_checkaux_none;
60081+extern atomic_unchecked_t fscache_n_checkaux_okay;
60082+extern atomic_unchecked_t fscache_n_checkaux_update;
60083+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
60084
60085 extern atomic_t fscache_n_cop_alloc_object;
60086 extern atomic_t fscache_n_cop_lookup_object;
60087@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
60088 atomic_inc(stat);
60089 }
60090
60091+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
60092+{
60093+ atomic_inc_unchecked(stat);
60094+}
60095+
60096 static inline void fscache_stat_d(atomic_t *stat)
60097 {
60098 atomic_dec(stat);
60099@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
60100
60101 #define __fscache_stat(stat) (NULL)
60102 #define fscache_stat(stat) do {} while (0)
60103+#define fscache_stat_unchecked(stat) do {} while (0)
60104 #define fscache_stat_d(stat) do {} while (0)
60105 #endif
60106
60107diff --git a/fs/fscache/object.c b/fs/fscache/object.c
60108index d3b4539..ed0c659 100644
60109--- a/fs/fscache/object.c
60110+++ b/fs/fscache/object.c
60111@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
60112 _debug("LOOKUP \"%s\" in \"%s\"",
60113 cookie->def->name, object->cache->tag->name);
60114
60115- fscache_stat(&fscache_n_object_lookups);
60116+ fscache_stat_unchecked(&fscache_n_object_lookups);
60117 fscache_stat(&fscache_n_cop_lookup_object);
60118 ret = object->cache->ops->lookup_object(object);
60119 fscache_stat_d(&fscache_n_cop_lookup_object);
60120@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
60121 if (ret == -ETIMEDOUT) {
60122 /* probably stuck behind another object, so move this one to
60123 * the back of the queue */
60124- fscache_stat(&fscache_n_object_lookups_timed_out);
60125+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
60126 _leave(" [timeout]");
60127 return NO_TRANSIT;
60128 }
60129@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
60130 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
60131
60132 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
60133- fscache_stat(&fscache_n_object_lookups_negative);
60134+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
60135
60136 /* Allow write requests to begin stacking up and read requests to begin
60137 * returning ENODATA.
60138@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
60139 /* if we were still looking up, then we must have a positive lookup
60140 * result, in which case there may be data available */
60141 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
60142- fscache_stat(&fscache_n_object_lookups_positive);
60143+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
60144
60145 /* We do (presumably) have data */
60146 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
60147@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
60148 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
60149 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
60150 } else {
60151- fscache_stat(&fscache_n_object_created);
60152+ fscache_stat_unchecked(&fscache_n_object_created);
60153 }
60154
60155 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
60156@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
60157 fscache_stat_d(&fscache_n_cop_lookup_complete);
60158
60159 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
60160- fscache_stat(&fscache_n_object_avail);
60161+ fscache_stat_unchecked(&fscache_n_object_avail);
60162
60163 _leave("");
60164 return transit_to(JUMPSTART_DEPS);
60165@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
60166
60167 /* this just shifts the object release to the work processor */
60168 fscache_put_object(object);
60169- fscache_stat(&fscache_n_object_dead);
60170+ fscache_stat_unchecked(&fscache_n_object_dead);
60171
60172 _leave("");
60173 return transit_to(OBJECT_DEAD);
60174@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
60175 enum fscache_checkaux result;
60176
60177 if (!object->cookie->def->check_aux) {
60178- fscache_stat(&fscache_n_checkaux_none);
60179+ fscache_stat_unchecked(&fscache_n_checkaux_none);
60180 return FSCACHE_CHECKAUX_OKAY;
60181 }
60182
60183@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
60184 switch (result) {
60185 /* entry okay as is */
60186 case FSCACHE_CHECKAUX_OKAY:
60187- fscache_stat(&fscache_n_checkaux_okay);
60188+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
60189 break;
60190
60191 /* entry requires update */
60192 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
60193- fscache_stat(&fscache_n_checkaux_update);
60194+ fscache_stat_unchecked(&fscache_n_checkaux_update);
60195 break;
60196
60197 /* entry requires deletion */
60198 case FSCACHE_CHECKAUX_OBSOLETE:
60199- fscache_stat(&fscache_n_checkaux_obsolete);
60200+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
60201 break;
60202
60203 default:
60204@@ -992,7 +992,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
60205 {
60206 const struct fscache_state *s;
60207
60208- fscache_stat(&fscache_n_invalidates_run);
60209+ fscache_stat_unchecked(&fscache_n_invalidates_run);
60210 fscache_stat(&fscache_n_cop_invalidate_object);
60211 s = _fscache_invalidate_object(object, event);
60212 fscache_stat_d(&fscache_n_cop_invalidate_object);
60213@@ -1007,7 +1007,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
60214 {
60215 _enter("{OBJ%x},%d", object->debug_id, event);
60216
60217- fscache_stat(&fscache_n_updates_run);
60218+ fscache_stat_unchecked(&fscache_n_updates_run);
60219 fscache_stat(&fscache_n_cop_update_object);
60220 object->cache->ops->update_object(object);
60221 fscache_stat_d(&fscache_n_cop_update_object);
60222diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
60223index 318071a..379938b 100644
60224--- a/fs/fscache/operation.c
60225+++ b/fs/fscache/operation.c
60226@@ -17,7 +17,7 @@
60227 #include <linux/slab.h>
60228 #include "internal.h"
60229
60230-atomic_t fscache_op_debug_id;
60231+atomic_unchecked_t fscache_op_debug_id;
60232 EXPORT_SYMBOL(fscache_op_debug_id);
60233
60234 /**
60235@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
60236 ASSERTCMP(atomic_read(&op->usage), >, 0);
60237 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
60238
60239- fscache_stat(&fscache_n_op_enqueue);
60240+ fscache_stat_unchecked(&fscache_n_op_enqueue);
60241 switch (op->flags & FSCACHE_OP_TYPE) {
60242 case FSCACHE_OP_ASYNC:
60243 _debug("queue async");
60244@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
60245 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
60246 if (op->processor)
60247 fscache_enqueue_operation(op);
60248- fscache_stat(&fscache_n_op_run);
60249+ fscache_stat_unchecked(&fscache_n_op_run);
60250 }
60251
60252 /*
60253@@ -105,11 +105,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
60254 if (object->n_in_progress > 0) {
60255 atomic_inc(&op->usage);
60256 list_add_tail(&op->pend_link, &object->pending_ops);
60257- fscache_stat(&fscache_n_op_pend);
60258+ fscache_stat_unchecked(&fscache_n_op_pend);
60259 } else if (!list_empty(&object->pending_ops)) {
60260 atomic_inc(&op->usage);
60261 list_add_tail(&op->pend_link, &object->pending_ops);
60262- fscache_stat(&fscache_n_op_pend);
60263+ fscache_stat_unchecked(&fscache_n_op_pend);
60264 fscache_start_operations(object);
60265 } else {
60266 ASSERTCMP(object->n_in_progress, ==, 0);
60267@@ -125,7 +125,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
60268 object->n_exclusive++; /* reads and writes must wait */
60269 atomic_inc(&op->usage);
60270 list_add_tail(&op->pend_link, &object->pending_ops);
60271- fscache_stat(&fscache_n_op_pend);
60272+ fscache_stat_unchecked(&fscache_n_op_pend);
60273 ret = 0;
60274 } else {
60275 /* If we're in any other state, there must have been an I/O
60276@@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
60277 if (object->n_exclusive > 0) {
60278 atomic_inc(&op->usage);
60279 list_add_tail(&op->pend_link, &object->pending_ops);
60280- fscache_stat(&fscache_n_op_pend);
60281+ fscache_stat_unchecked(&fscache_n_op_pend);
60282 } else if (!list_empty(&object->pending_ops)) {
60283 atomic_inc(&op->usage);
60284 list_add_tail(&op->pend_link, &object->pending_ops);
60285- fscache_stat(&fscache_n_op_pend);
60286+ fscache_stat_unchecked(&fscache_n_op_pend);
60287 fscache_start_operations(object);
60288 } else {
60289 ASSERTCMP(object->n_exclusive, ==, 0);
60290@@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
60291 object->n_ops++;
60292 atomic_inc(&op->usage);
60293 list_add_tail(&op->pend_link, &object->pending_ops);
60294- fscache_stat(&fscache_n_op_pend);
60295+ fscache_stat_unchecked(&fscache_n_op_pend);
60296 ret = 0;
60297 } else if (fscache_object_is_dying(object)) {
60298- fscache_stat(&fscache_n_op_rejected);
60299+ fscache_stat_unchecked(&fscache_n_op_rejected);
60300 op->state = FSCACHE_OP_ST_CANCELLED;
60301 ret = -ENOBUFS;
60302 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
60303@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
60304 ret = -EBUSY;
60305 if (op->state == FSCACHE_OP_ST_PENDING) {
60306 ASSERT(!list_empty(&op->pend_link));
60307- fscache_stat(&fscache_n_op_cancelled);
60308+ fscache_stat_unchecked(&fscache_n_op_cancelled);
60309 list_del_init(&op->pend_link);
60310 if (do_cancel)
60311 do_cancel(op);
60312@@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
60313 while (!list_empty(&object->pending_ops)) {
60314 op = list_entry(object->pending_ops.next,
60315 struct fscache_operation, pend_link);
60316- fscache_stat(&fscache_n_op_cancelled);
60317+ fscache_stat_unchecked(&fscache_n_op_cancelled);
60318 list_del_init(&op->pend_link);
60319
60320 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
60321@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
60322 op->state, ==, FSCACHE_OP_ST_CANCELLED);
60323 op->state = FSCACHE_OP_ST_DEAD;
60324
60325- fscache_stat(&fscache_n_op_release);
60326+ fscache_stat_unchecked(&fscache_n_op_release);
60327
60328 if (op->release) {
60329 op->release(op);
60330@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
60331 * lock, and defer it otherwise */
60332 if (!spin_trylock(&object->lock)) {
60333 _debug("defer put");
60334- fscache_stat(&fscache_n_op_deferred_release);
60335+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
60336
60337 cache = object->cache;
60338 spin_lock(&cache->op_gc_list_lock);
60339@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
60340
60341 _debug("GC DEFERRED REL OBJ%x OP%x",
60342 object->debug_id, op->debug_id);
60343- fscache_stat(&fscache_n_op_gc);
60344+ fscache_stat_unchecked(&fscache_n_op_gc);
60345
60346 ASSERTCMP(atomic_read(&op->usage), ==, 0);
60347 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
60348diff --git a/fs/fscache/page.c b/fs/fscache/page.c
60349index 7f5c658..6c1e164 100644
60350--- a/fs/fscache/page.c
60351+++ b/fs/fscache/page.c
60352@@ -61,7 +61,7 @@ try_again:
60353 val = radix_tree_lookup(&cookie->stores, page->index);
60354 if (!val) {
60355 rcu_read_unlock();
60356- fscache_stat(&fscache_n_store_vmscan_not_storing);
60357+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
60358 __fscache_uncache_page(cookie, page);
60359 return true;
60360 }
60361@@ -91,11 +91,11 @@ try_again:
60362 spin_unlock(&cookie->stores_lock);
60363
60364 if (xpage) {
60365- fscache_stat(&fscache_n_store_vmscan_cancelled);
60366- fscache_stat(&fscache_n_store_radix_deletes);
60367+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
60368+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
60369 ASSERTCMP(xpage, ==, page);
60370 } else {
60371- fscache_stat(&fscache_n_store_vmscan_gone);
60372+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
60373 }
60374
60375 wake_up_bit(&cookie->flags, 0);
60376@@ -110,11 +110,11 @@ page_busy:
60377 * sleeping on memory allocation, so we may need to impose a timeout
60378 * too. */
60379 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
60380- fscache_stat(&fscache_n_store_vmscan_busy);
60381+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
60382 return false;
60383 }
60384
60385- fscache_stat(&fscache_n_store_vmscan_wait);
60386+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
60387 __fscache_wait_on_page_write(cookie, page);
60388 gfp &= ~__GFP_WAIT;
60389 goto try_again;
60390@@ -140,7 +140,7 @@ static void fscache_end_page_write(struct fscache_object *object,
60391 FSCACHE_COOKIE_STORING_TAG);
60392 if (!radix_tree_tag_get(&cookie->stores, page->index,
60393 FSCACHE_COOKIE_PENDING_TAG)) {
60394- fscache_stat(&fscache_n_store_radix_deletes);
60395+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
60396 xpage = radix_tree_delete(&cookie->stores, page->index);
60397 }
60398 spin_unlock(&cookie->stores_lock);
60399@@ -161,7 +161,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
60400
60401 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
60402
60403- fscache_stat(&fscache_n_attr_changed_calls);
60404+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
60405
60406 if (fscache_object_is_active(object)) {
60407 fscache_stat(&fscache_n_cop_attr_changed);
60408@@ -188,11 +188,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
60409
60410 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60411
60412- fscache_stat(&fscache_n_attr_changed);
60413+ fscache_stat_unchecked(&fscache_n_attr_changed);
60414
60415 op = kzalloc(sizeof(*op), GFP_KERNEL);
60416 if (!op) {
60417- fscache_stat(&fscache_n_attr_changed_nomem);
60418+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
60419 _leave(" = -ENOMEM");
60420 return -ENOMEM;
60421 }
60422@@ -214,7 +214,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
60423 if (fscache_submit_exclusive_op(object, op) < 0)
60424 goto nobufs;
60425 spin_unlock(&cookie->lock);
60426- fscache_stat(&fscache_n_attr_changed_ok);
60427+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
60428 fscache_put_operation(op);
60429 _leave(" = 0");
60430 return 0;
60431@@ -225,7 +225,7 @@ nobufs:
60432 kfree(op);
60433 if (wake_cookie)
60434 __fscache_wake_unused_cookie(cookie);
60435- fscache_stat(&fscache_n_attr_changed_nobufs);
60436+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
60437 _leave(" = %d", -ENOBUFS);
60438 return -ENOBUFS;
60439 }
60440@@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
60441 /* allocate a retrieval operation and attempt to submit it */
60442 op = kzalloc(sizeof(*op), GFP_NOIO);
60443 if (!op) {
60444- fscache_stat(&fscache_n_retrievals_nomem);
60445+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60446 return NULL;
60447 }
60448
60449@@ -294,13 +294,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
60450 return 0;
60451 }
60452
60453- fscache_stat(&fscache_n_retrievals_wait);
60454+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
60455
60456 jif = jiffies;
60457 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
60458 fscache_wait_bit_interruptible,
60459 TASK_INTERRUPTIBLE) != 0) {
60460- fscache_stat(&fscache_n_retrievals_intr);
60461+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
60462 _leave(" = -ERESTARTSYS");
60463 return -ERESTARTSYS;
60464 }
60465@@ -329,8 +329,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
60466 */
60467 int fscache_wait_for_operation_activation(struct fscache_object *object,
60468 struct fscache_operation *op,
60469- atomic_t *stat_op_waits,
60470- atomic_t *stat_object_dead,
60471+ atomic_unchecked_t *stat_op_waits,
60472+ atomic_unchecked_t *stat_object_dead,
60473 void (*do_cancel)(struct fscache_operation *))
60474 {
60475 int ret;
60476@@ -340,7 +340,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
60477
60478 _debug(">>> WT");
60479 if (stat_op_waits)
60480- fscache_stat(stat_op_waits);
60481+ fscache_stat_unchecked(stat_op_waits);
60482 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
60483 fscache_wait_bit_interruptible,
60484 TASK_INTERRUPTIBLE) != 0) {
60485@@ -358,7 +358,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
60486 check_if_dead:
60487 if (op->state == FSCACHE_OP_ST_CANCELLED) {
60488 if (stat_object_dead)
60489- fscache_stat(stat_object_dead);
60490+ fscache_stat_unchecked(stat_object_dead);
60491 _leave(" = -ENOBUFS [cancelled]");
60492 return -ENOBUFS;
60493 }
60494@@ -366,7 +366,7 @@ check_if_dead:
60495 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
60496 fscache_cancel_op(op, do_cancel);
60497 if (stat_object_dead)
60498- fscache_stat(stat_object_dead);
60499+ fscache_stat_unchecked(stat_object_dead);
60500 return -ENOBUFS;
60501 }
60502 return 0;
60503@@ -394,7 +394,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60504
60505 _enter("%p,%p,,,", cookie, page);
60506
60507- fscache_stat(&fscache_n_retrievals);
60508+ fscache_stat_unchecked(&fscache_n_retrievals);
60509
60510 if (hlist_empty(&cookie->backing_objects))
60511 goto nobufs;
60512@@ -436,7 +436,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60513 goto nobufs_unlock_dec;
60514 spin_unlock(&cookie->lock);
60515
60516- fscache_stat(&fscache_n_retrieval_ops);
60517+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
60518
60519 /* pin the netfs read context in case we need to do the actual netfs
60520 * read because we've encountered a cache read failure */
60521@@ -467,15 +467,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
60522
60523 error:
60524 if (ret == -ENOMEM)
60525- fscache_stat(&fscache_n_retrievals_nomem);
60526+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60527 else if (ret == -ERESTARTSYS)
60528- fscache_stat(&fscache_n_retrievals_intr);
60529+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
60530 else if (ret == -ENODATA)
60531- fscache_stat(&fscache_n_retrievals_nodata);
60532+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
60533 else if (ret < 0)
60534- fscache_stat(&fscache_n_retrievals_nobufs);
60535+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60536 else
60537- fscache_stat(&fscache_n_retrievals_ok);
60538+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
60539
60540 fscache_put_retrieval(op);
60541 _leave(" = %d", ret);
60542@@ -490,7 +490,7 @@ nobufs_unlock:
60543 __fscache_wake_unused_cookie(cookie);
60544 kfree(op);
60545 nobufs:
60546- fscache_stat(&fscache_n_retrievals_nobufs);
60547+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60548 _leave(" = -ENOBUFS");
60549 return -ENOBUFS;
60550 }
60551@@ -529,7 +529,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60552
60553 _enter("%p,,%d,,,", cookie, *nr_pages);
60554
60555- fscache_stat(&fscache_n_retrievals);
60556+ fscache_stat_unchecked(&fscache_n_retrievals);
60557
60558 if (hlist_empty(&cookie->backing_objects))
60559 goto nobufs;
60560@@ -567,7 +567,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60561 goto nobufs_unlock_dec;
60562 spin_unlock(&cookie->lock);
60563
60564- fscache_stat(&fscache_n_retrieval_ops);
60565+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
60566
60567 /* pin the netfs read context in case we need to do the actual netfs
60568 * read because we've encountered a cache read failure */
60569@@ -598,15 +598,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
60570
60571 error:
60572 if (ret == -ENOMEM)
60573- fscache_stat(&fscache_n_retrievals_nomem);
60574+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
60575 else if (ret == -ERESTARTSYS)
60576- fscache_stat(&fscache_n_retrievals_intr);
60577+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
60578 else if (ret == -ENODATA)
60579- fscache_stat(&fscache_n_retrievals_nodata);
60580+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
60581 else if (ret < 0)
60582- fscache_stat(&fscache_n_retrievals_nobufs);
60583+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60584 else
60585- fscache_stat(&fscache_n_retrievals_ok);
60586+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
60587
60588 fscache_put_retrieval(op);
60589 _leave(" = %d", ret);
60590@@ -621,7 +621,7 @@ nobufs_unlock:
60591 if (wake_cookie)
60592 __fscache_wake_unused_cookie(cookie);
60593 nobufs:
60594- fscache_stat(&fscache_n_retrievals_nobufs);
60595+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
60596 _leave(" = -ENOBUFS");
60597 return -ENOBUFS;
60598 }
60599@@ -646,7 +646,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60600
60601 _enter("%p,%p,,,", cookie, page);
60602
60603- fscache_stat(&fscache_n_allocs);
60604+ fscache_stat_unchecked(&fscache_n_allocs);
60605
60606 if (hlist_empty(&cookie->backing_objects))
60607 goto nobufs;
60608@@ -680,7 +680,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60609 goto nobufs_unlock_dec;
60610 spin_unlock(&cookie->lock);
60611
60612- fscache_stat(&fscache_n_alloc_ops);
60613+ fscache_stat_unchecked(&fscache_n_alloc_ops);
60614
60615 ret = fscache_wait_for_operation_activation(
60616 object, &op->op,
60617@@ -697,11 +697,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
60618
60619 error:
60620 if (ret == -ERESTARTSYS)
60621- fscache_stat(&fscache_n_allocs_intr);
60622+ fscache_stat_unchecked(&fscache_n_allocs_intr);
60623 else if (ret < 0)
60624- fscache_stat(&fscache_n_allocs_nobufs);
60625+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
60626 else
60627- fscache_stat(&fscache_n_allocs_ok);
60628+ fscache_stat_unchecked(&fscache_n_allocs_ok);
60629
60630 fscache_put_retrieval(op);
60631 _leave(" = %d", ret);
60632@@ -715,7 +715,7 @@ nobufs_unlock:
60633 if (wake_cookie)
60634 __fscache_wake_unused_cookie(cookie);
60635 nobufs:
60636- fscache_stat(&fscache_n_allocs_nobufs);
60637+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
60638 _leave(" = -ENOBUFS");
60639 return -ENOBUFS;
60640 }
60641@@ -791,7 +791,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60642
60643 spin_lock(&cookie->stores_lock);
60644
60645- fscache_stat(&fscache_n_store_calls);
60646+ fscache_stat_unchecked(&fscache_n_store_calls);
60647
60648 /* find a page to store */
60649 page = NULL;
60650@@ -802,7 +802,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60651 page = results[0];
60652 _debug("gang %d [%lx]", n, page->index);
60653 if (page->index > op->store_limit) {
60654- fscache_stat(&fscache_n_store_pages_over_limit);
60655+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
60656 goto superseded;
60657 }
60658
60659@@ -814,7 +814,7 @@ static void fscache_write_op(struct fscache_operation *_op)
60660 spin_unlock(&cookie->stores_lock);
60661 spin_unlock(&object->lock);
60662
60663- fscache_stat(&fscache_n_store_pages);
60664+ fscache_stat_unchecked(&fscache_n_store_pages);
60665 fscache_stat(&fscache_n_cop_write_page);
60666 ret = object->cache->ops->write_page(op, page);
60667 fscache_stat_d(&fscache_n_cop_write_page);
60668@@ -918,7 +918,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60669 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60670 ASSERT(PageFsCache(page));
60671
60672- fscache_stat(&fscache_n_stores);
60673+ fscache_stat_unchecked(&fscache_n_stores);
60674
60675 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
60676 _leave(" = -ENOBUFS [invalidating]");
60677@@ -977,7 +977,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60678 spin_unlock(&cookie->stores_lock);
60679 spin_unlock(&object->lock);
60680
60681- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
60682+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
60683 op->store_limit = object->store_limit;
60684
60685 __fscache_use_cookie(cookie);
60686@@ -986,8 +986,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60687
60688 spin_unlock(&cookie->lock);
60689 radix_tree_preload_end();
60690- fscache_stat(&fscache_n_store_ops);
60691- fscache_stat(&fscache_n_stores_ok);
60692+ fscache_stat_unchecked(&fscache_n_store_ops);
60693+ fscache_stat_unchecked(&fscache_n_stores_ok);
60694
60695 /* the work queue now carries its own ref on the object */
60696 fscache_put_operation(&op->op);
60697@@ -995,14 +995,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
60698 return 0;
60699
60700 already_queued:
60701- fscache_stat(&fscache_n_stores_again);
60702+ fscache_stat_unchecked(&fscache_n_stores_again);
60703 already_pending:
60704 spin_unlock(&cookie->stores_lock);
60705 spin_unlock(&object->lock);
60706 spin_unlock(&cookie->lock);
60707 radix_tree_preload_end();
60708 kfree(op);
60709- fscache_stat(&fscache_n_stores_ok);
60710+ fscache_stat_unchecked(&fscache_n_stores_ok);
60711 _leave(" = 0");
60712 return 0;
60713
60714@@ -1024,14 +1024,14 @@ nobufs:
60715 kfree(op);
60716 if (wake_cookie)
60717 __fscache_wake_unused_cookie(cookie);
60718- fscache_stat(&fscache_n_stores_nobufs);
60719+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
60720 _leave(" = -ENOBUFS");
60721 return -ENOBUFS;
60722
60723 nomem_free:
60724 kfree(op);
60725 nomem:
60726- fscache_stat(&fscache_n_stores_oom);
60727+ fscache_stat_unchecked(&fscache_n_stores_oom);
60728 _leave(" = -ENOMEM");
60729 return -ENOMEM;
60730 }
60731@@ -1049,7 +1049,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
60732 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
60733 ASSERTCMP(page, !=, NULL);
60734
60735- fscache_stat(&fscache_n_uncaches);
60736+ fscache_stat_unchecked(&fscache_n_uncaches);
60737
60738 /* cache withdrawal may beat us to it */
60739 if (!PageFsCache(page))
60740@@ -1100,7 +1100,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
60741 struct fscache_cookie *cookie = op->op.object->cookie;
60742
60743 #ifdef CONFIG_FSCACHE_STATS
60744- atomic_inc(&fscache_n_marks);
60745+ atomic_inc_unchecked(&fscache_n_marks);
60746 #endif
60747
60748 _debug("- mark %p{%lx}", page, page->index);
60749diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
60750index 40d13c7..ddf52b9 100644
60751--- a/fs/fscache/stats.c
60752+++ b/fs/fscache/stats.c
60753@@ -18,99 +18,99 @@
60754 /*
60755 * operation counters
60756 */
60757-atomic_t fscache_n_op_pend;
60758-atomic_t fscache_n_op_run;
60759-atomic_t fscache_n_op_enqueue;
60760-atomic_t fscache_n_op_requeue;
60761-atomic_t fscache_n_op_deferred_release;
60762-atomic_t fscache_n_op_release;
60763-atomic_t fscache_n_op_gc;
60764-atomic_t fscache_n_op_cancelled;
60765-atomic_t fscache_n_op_rejected;
60766+atomic_unchecked_t fscache_n_op_pend;
60767+atomic_unchecked_t fscache_n_op_run;
60768+atomic_unchecked_t fscache_n_op_enqueue;
60769+atomic_unchecked_t fscache_n_op_requeue;
60770+atomic_unchecked_t fscache_n_op_deferred_release;
60771+atomic_unchecked_t fscache_n_op_release;
60772+atomic_unchecked_t fscache_n_op_gc;
60773+atomic_unchecked_t fscache_n_op_cancelled;
60774+atomic_unchecked_t fscache_n_op_rejected;
60775
60776-atomic_t fscache_n_attr_changed;
60777-atomic_t fscache_n_attr_changed_ok;
60778-atomic_t fscache_n_attr_changed_nobufs;
60779-atomic_t fscache_n_attr_changed_nomem;
60780-atomic_t fscache_n_attr_changed_calls;
60781+atomic_unchecked_t fscache_n_attr_changed;
60782+atomic_unchecked_t fscache_n_attr_changed_ok;
60783+atomic_unchecked_t fscache_n_attr_changed_nobufs;
60784+atomic_unchecked_t fscache_n_attr_changed_nomem;
60785+atomic_unchecked_t fscache_n_attr_changed_calls;
60786
60787-atomic_t fscache_n_allocs;
60788-atomic_t fscache_n_allocs_ok;
60789-atomic_t fscache_n_allocs_wait;
60790-atomic_t fscache_n_allocs_nobufs;
60791-atomic_t fscache_n_allocs_intr;
60792-atomic_t fscache_n_allocs_object_dead;
60793-atomic_t fscache_n_alloc_ops;
60794-atomic_t fscache_n_alloc_op_waits;
60795+atomic_unchecked_t fscache_n_allocs;
60796+atomic_unchecked_t fscache_n_allocs_ok;
60797+atomic_unchecked_t fscache_n_allocs_wait;
60798+atomic_unchecked_t fscache_n_allocs_nobufs;
60799+atomic_unchecked_t fscache_n_allocs_intr;
60800+atomic_unchecked_t fscache_n_allocs_object_dead;
60801+atomic_unchecked_t fscache_n_alloc_ops;
60802+atomic_unchecked_t fscache_n_alloc_op_waits;
60803
60804-atomic_t fscache_n_retrievals;
60805-atomic_t fscache_n_retrievals_ok;
60806-atomic_t fscache_n_retrievals_wait;
60807-atomic_t fscache_n_retrievals_nodata;
60808-atomic_t fscache_n_retrievals_nobufs;
60809-atomic_t fscache_n_retrievals_intr;
60810-atomic_t fscache_n_retrievals_nomem;
60811-atomic_t fscache_n_retrievals_object_dead;
60812-atomic_t fscache_n_retrieval_ops;
60813-atomic_t fscache_n_retrieval_op_waits;
60814+atomic_unchecked_t fscache_n_retrievals;
60815+atomic_unchecked_t fscache_n_retrievals_ok;
60816+atomic_unchecked_t fscache_n_retrievals_wait;
60817+atomic_unchecked_t fscache_n_retrievals_nodata;
60818+atomic_unchecked_t fscache_n_retrievals_nobufs;
60819+atomic_unchecked_t fscache_n_retrievals_intr;
60820+atomic_unchecked_t fscache_n_retrievals_nomem;
60821+atomic_unchecked_t fscache_n_retrievals_object_dead;
60822+atomic_unchecked_t fscache_n_retrieval_ops;
60823+atomic_unchecked_t fscache_n_retrieval_op_waits;
60824
60825-atomic_t fscache_n_stores;
60826-atomic_t fscache_n_stores_ok;
60827-atomic_t fscache_n_stores_again;
60828-atomic_t fscache_n_stores_nobufs;
60829-atomic_t fscache_n_stores_oom;
60830-atomic_t fscache_n_store_ops;
60831-atomic_t fscache_n_store_calls;
60832-atomic_t fscache_n_store_pages;
60833-atomic_t fscache_n_store_radix_deletes;
60834-atomic_t fscache_n_store_pages_over_limit;
60835+atomic_unchecked_t fscache_n_stores;
60836+atomic_unchecked_t fscache_n_stores_ok;
60837+atomic_unchecked_t fscache_n_stores_again;
60838+atomic_unchecked_t fscache_n_stores_nobufs;
60839+atomic_unchecked_t fscache_n_stores_oom;
60840+atomic_unchecked_t fscache_n_store_ops;
60841+atomic_unchecked_t fscache_n_store_calls;
60842+atomic_unchecked_t fscache_n_store_pages;
60843+atomic_unchecked_t fscache_n_store_radix_deletes;
60844+atomic_unchecked_t fscache_n_store_pages_over_limit;
60845
60846-atomic_t fscache_n_store_vmscan_not_storing;
60847-atomic_t fscache_n_store_vmscan_gone;
60848-atomic_t fscache_n_store_vmscan_busy;
60849-atomic_t fscache_n_store_vmscan_cancelled;
60850-atomic_t fscache_n_store_vmscan_wait;
60851+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
60852+atomic_unchecked_t fscache_n_store_vmscan_gone;
60853+atomic_unchecked_t fscache_n_store_vmscan_busy;
60854+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
60855+atomic_unchecked_t fscache_n_store_vmscan_wait;
60856
60857-atomic_t fscache_n_marks;
60858-atomic_t fscache_n_uncaches;
60859+atomic_unchecked_t fscache_n_marks;
60860+atomic_unchecked_t fscache_n_uncaches;
60861
60862-atomic_t fscache_n_acquires;
60863-atomic_t fscache_n_acquires_null;
60864-atomic_t fscache_n_acquires_no_cache;
60865-atomic_t fscache_n_acquires_ok;
60866-atomic_t fscache_n_acquires_nobufs;
60867-atomic_t fscache_n_acquires_oom;
60868+atomic_unchecked_t fscache_n_acquires;
60869+atomic_unchecked_t fscache_n_acquires_null;
60870+atomic_unchecked_t fscache_n_acquires_no_cache;
60871+atomic_unchecked_t fscache_n_acquires_ok;
60872+atomic_unchecked_t fscache_n_acquires_nobufs;
60873+atomic_unchecked_t fscache_n_acquires_oom;
60874
60875-atomic_t fscache_n_invalidates;
60876-atomic_t fscache_n_invalidates_run;
60877+atomic_unchecked_t fscache_n_invalidates;
60878+atomic_unchecked_t fscache_n_invalidates_run;
60879
60880-atomic_t fscache_n_updates;
60881-atomic_t fscache_n_updates_null;
60882-atomic_t fscache_n_updates_run;
60883+atomic_unchecked_t fscache_n_updates;
60884+atomic_unchecked_t fscache_n_updates_null;
60885+atomic_unchecked_t fscache_n_updates_run;
60886
60887-atomic_t fscache_n_relinquishes;
60888-atomic_t fscache_n_relinquishes_null;
60889-atomic_t fscache_n_relinquishes_waitcrt;
60890-atomic_t fscache_n_relinquishes_retire;
60891+atomic_unchecked_t fscache_n_relinquishes;
60892+atomic_unchecked_t fscache_n_relinquishes_null;
60893+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
60894+atomic_unchecked_t fscache_n_relinquishes_retire;
60895
60896-atomic_t fscache_n_cookie_index;
60897-atomic_t fscache_n_cookie_data;
60898-atomic_t fscache_n_cookie_special;
60899+atomic_unchecked_t fscache_n_cookie_index;
60900+atomic_unchecked_t fscache_n_cookie_data;
60901+atomic_unchecked_t fscache_n_cookie_special;
60902
60903-atomic_t fscache_n_object_alloc;
60904-atomic_t fscache_n_object_no_alloc;
60905-atomic_t fscache_n_object_lookups;
60906-atomic_t fscache_n_object_lookups_negative;
60907-atomic_t fscache_n_object_lookups_positive;
60908-atomic_t fscache_n_object_lookups_timed_out;
60909-atomic_t fscache_n_object_created;
60910-atomic_t fscache_n_object_avail;
60911-atomic_t fscache_n_object_dead;
60912+atomic_unchecked_t fscache_n_object_alloc;
60913+atomic_unchecked_t fscache_n_object_no_alloc;
60914+atomic_unchecked_t fscache_n_object_lookups;
60915+atomic_unchecked_t fscache_n_object_lookups_negative;
60916+atomic_unchecked_t fscache_n_object_lookups_positive;
60917+atomic_unchecked_t fscache_n_object_lookups_timed_out;
60918+atomic_unchecked_t fscache_n_object_created;
60919+atomic_unchecked_t fscache_n_object_avail;
60920+atomic_unchecked_t fscache_n_object_dead;
60921
60922-atomic_t fscache_n_checkaux_none;
60923-atomic_t fscache_n_checkaux_okay;
60924-atomic_t fscache_n_checkaux_update;
60925-atomic_t fscache_n_checkaux_obsolete;
60926+atomic_unchecked_t fscache_n_checkaux_none;
60927+atomic_unchecked_t fscache_n_checkaux_okay;
60928+atomic_unchecked_t fscache_n_checkaux_update;
60929+atomic_unchecked_t fscache_n_checkaux_obsolete;
60930
60931 atomic_t fscache_n_cop_alloc_object;
60932 atomic_t fscache_n_cop_lookup_object;
60933@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
60934 seq_puts(m, "FS-Cache statistics\n");
60935
60936 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
60937- atomic_read(&fscache_n_cookie_index),
60938- atomic_read(&fscache_n_cookie_data),
60939- atomic_read(&fscache_n_cookie_special));
60940+ atomic_read_unchecked(&fscache_n_cookie_index),
60941+ atomic_read_unchecked(&fscache_n_cookie_data),
60942+ atomic_read_unchecked(&fscache_n_cookie_special));
60943
60944 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
60945- atomic_read(&fscache_n_object_alloc),
60946- atomic_read(&fscache_n_object_no_alloc),
60947- atomic_read(&fscache_n_object_avail),
60948- atomic_read(&fscache_n_object_dead));
60949+ atomic_read_unchecked(&fscache_n_object_alloc),
60950+ atomic_read_unchecked(&fscache_n_object_no_alloc),
60951+ atomic_read_unchecked(&fscache_n_object_avail),
60952+ atomic_read_unchecked(&fscache_n_object_dead));
60953 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
60954- atomic_read(&fscache_n_checkaux_none),
60955- atomic_read(&fscache_n_checkaux_okay),
60956- atomic_read(&fscache_n_checkaux_update),
60957- atomic_read(&fscache_n_checkaux_obsolete));
60958+ atomic_read_unchecked(&fscache_n_checkaux_none),
60959+ atomic_read_unchecked(&fscache_n_checkaux_okay),
60960+ atomic_read_unchecked(&fscache_n_checkaux_update),
60961+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
60962
60963 seq_printf(m, "Pages : mrk=%u unc=%u\n",
60964- atomic_read(&fscache_n_marks),
60965- atomic_read(&fscache_n_uncaches));
60966+ atomic_read_unchecked(&fscache_n_marks),
60967+ atomic_read_unchecked(&fscache_n_uncaches));
60968
60969 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
60970 " oom=%u\n",
60971- atomic_read(&fscache_n_acquires),
60972- atomic_read(&fscache_n_acquires_null),
60973- atomic_read(&fscache_n_acquires_no_cache),
60974- atomic_read(&fscache_n_acquires_ok),
60975- atomic_read(&fscache_n_acquires_nobufs),
60976- atomic_read(&fscache_n_acquires_oom));
60977+ atomic_read_unchecked(&fscache_n_acquires),
60978+ atomic_read_unchecked(&fscache_n_acquires_null),
60979+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
60980+ atomic_read_unchecked(&fscache_n_acquires_ok),
60981+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
60982+ atomic_read_unchecked(&fscache_n_acquires_oom));
60983
60984 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
60985- atomic_read(&fscache_n_object_lookups),
60986- atomic_read(&fscache_n_object_lookups_negative),
60987- atomic_read(&fscache_n_object_lookups_positive),
60988- atomic_read(&fscache_n_object_created),
60989- atomic_read(&fscache_n_object_lookups_timed_out));
60990+ atomic_read_unchecked(&fscache_n_object_lookups),
60991+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
60992+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
60993+ atomic_read_unchecked(&fscache_n_object_created),
60994+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
60995
60996 seq_printf(m, "Invals : n=%u run=%u\n",
60997- atomic_read(&fscache_n_invalidates),
60998- atomic_read(&fscache_n_invalidates_run));
60999+ atomic_read_unchecked(&fscache_n_invalidates),
61000+ atomic_read_unchecked(&fscache_n_invalidates_run));
61001
61002 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
61003- atomic_read(&fscache_n_updates),
61004- atomic_read(&fscache_n_updates_null),
61005- atomic_read(&fscache_n_updates_run));
61006+ atomic_read_unchecked(&fscache_n_updates),
61007+ atomic_read_unchecked(&fscache_n_updates_null),
61008+ atomic_read_unchecked(&fscache_n_updates_run));
61009
61010 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
61011- atomic_read(&fscache_n_relinquishes),
61012- atomic_read(&fscache_n_relinquishes_null),
61013- atomic_read(&fscache_n_relinquishes_waitcrt),
61014- atomic_read(&fscache_n_relinquishes_retire));
61015+ atomic_read_unchecked(&fscache_n_relinquishes),
61016+ atomic_read_unchecked(&fscache_n_relinquishes_null),
61017+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
61018+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
61019
61020 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
61021- atomic_read(&fscache_n_attr_changed),
61022- atomic_read(&fscache_n_attr_changed_ok),
61023- atomic_read(&fscache_n_attr_changed_nobufs),
61024- atomic_read(&fscache_n_attr_changed_nomem),
61025- atomic_read(&fscache_n_attr_changed_calls));
61026+ atomic_read_unchecked(&fscache_n_attr_changed),
61027+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
61028+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
61029+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
61030+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
61031
61032 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
61033- atomic_read(&fscache_n_allocs),
61034- atomic_read(&fscache_n_allocs_ok),
61035- atomic_read(&fscache_n_allocs_wait),
61036- atomic_read(&fscache_n_allocs_nobufs),
61037- atomic_read(&fscache_n_allocs_intr));
61038+ atomic_read_unchecked(&fscache_n_allocs),
61039+ atomic_read_unchecked(&fscache_n_allocs_ok),
61040+ atomic_read_unchecked(&fscache_n_allocs_wait),
61041+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
61042+ atomic_read_unchecked(&fscache_n_allocs_intr));
61043 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
61044- atomic_read(&fscache_n_alloc_ops),
61045- atomic_read(&fscache_n_alloc_op_waits),
61046- atomic_read(&fscache_n_allocs_object_dead));
61047+ atomic_read_unchecked(&fscache_n_alloc_ops),
61048+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
61049+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
61050
61051 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
61052 " int=%u oom=%u\n",
61053- atomic_read(&fscache_n_retrievals),
61054- atomic_read(&fscache_n_retrievals_ok),
61055- atomic_read(&fscache_n_retrievals_wait),
61056- atomic_read(&fscache_n_retrievals_nodata),
61057- atomic_read(&fscache_n_retrievals_nobufs),
61058- atomic_read(&fscache_n_retrievals_intr),
61059- atomic_read(&fscache_n_retrievals_nomem));
61060+ atomic_read_unchecked(&fscache_n_retrievals),
61061+ atomic_read_unchecked(&fscache_n_retrievals_ok),
61062+ atomic_read_unchecked(&fscache_n_retrievals_wait),
61063+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
61064+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
61065+ atomic_read_unchecked(&fscache_n_retrievals_intr),
61066+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
61067 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
61068- atomic_read(&fscache_n_retrieval_ops),
61069- atomic_read(&fscache_n_retrieval_op_waits),
61070- atomic_read(&fscache_n_retrievals_object_dead));
61071+ atomic_read_unchecked(&fscache_n_retrieval_ops),
61072+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
61073+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
61074
61075 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
61076- atomic_read(&fscache_n_stores),
61077- atomic_read(&fscache_n_stores_ok),
61078- atomic_read(&fscache_n_stores_again),
61079- atomic_read(&fscache_n_stores_nobufs),
61080- atomic_read(&fscache_n_stores_oom));
61081+ atomic_read_unchecked(&fscache_n_stores),
61082+ atomic_read_unchecked(&fscache_n_stores_ok),
61083+ atomic_read_unchecked(&fscache_n_stores_again),
61084+ atomic_read_unchecked(&fscache_n_stores_nobufs),
61085+ atomic_read_unchecked(&fscache_n_stores_oom));
61086 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
61087- atomic_read(&fscache_n_store_ops),
61088- atomic_read(&fscache_n_store_calls),
61089- atomic_read(&fscache_n_store_pages),
61090- atomic_read(&fscache_n_store_radix_deletes),
61091- atomic_read(&fscache_n_store_pages_over_limit));
61092+ atomic_read_unchecked(&fscache_n_store_ops),
61093+ atomic_read_unchecked(&fscache_n_store_calls),
61094+ atomic_read_unchecked(&fscache_n_store_pages),
61095+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
61096+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
61097
61098 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
61099- atomic_read(&fscache_n_store_vmscan_not_storing),
61100- atomic_read(&fscache_n_store_vmscan_gone),
61101- atomic_read(&fscache_n_store_vmscan_busy),
61102- atomic_read(&fscache_n_store_vmscan_cancelled),
61103- atomic_read(&fscache_n_store_vmscan_wait));
61104+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
61105+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
61106+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
61107+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
61108+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
61109
61110 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
61111- atomic_read(&fscache_n_op_pend),
61112- atomic_read(&fscache_n_op_run),
61113- atomic_read(&fscache_n_op_enqueue),
61114- atomic_read(&fscache_n_op_cancelled),
61115- atomic_read(&fscache_n_op_rejected));
61116+ atomic_read_unchecked(&fscache_n_op_pend),
61117+ atomic_read_unchecked(&fscache_n_op_run),
61118+ atomic_read_unchecked(&fscache_n_op_enqueue),
61119+ atomic_read_unchecked(&fscache_n_op_cancelled),
61120+ atomic_read_unchecked(&fscache_n_op_rejected));
61121 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
61122- atomic_read(&fscache_n_op_deferred_release),
61123- atomic_read(&fscache_n_op_release),
61124- atomic_read(&fscache_n_op_gc));
61125+ atomic_read_unchecked(&fscache_n_op_deferred_release),
61126+ atomic_read_unchecked(&fscache_n_op_release),
61127+ atomic_read_unchecked(&fscache_n_op_gc));
61128
61129 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
61130 atomic_read(&fscache_n_cop_alloc_object),
61131diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
61132index 13b691a..1ffca5ae 100644
61133--- a/fs/fuse/cuse.c
61134+++ b/fs/fuse/cuse.c
61135@@ -607,10 +607,12 @@ static int __init cuse_init(void)
61136 INIT_LIST_HEAD(&cuse_conntbl[i]);
61137
61138 /* inherit and extend fuse_dev_operations */
61139- cuse_channel_fops = fuse_dev_operations;
61140- cuse_channel_fops.owner = THIS_MODULE;
61141- cuse_channel_fops.open = cuse_channel_open;
61142- cuse_channel_fops.release = cuse_channel_release;
61143+ pax_open_kernel();
61144+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
61145+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
61146+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
61147+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
61148+ pax_close_kernel();
61149
61150 cuse_class = class_create(THIS_MODULE, "cuse");
61151 if (IS_ERR(cuse_class))
61152diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
61153index aac71ce..fcd6a1b 100644
61154--- a/fs/fuse/dev.c
61155+++ b/fs/fuse/dev.c
61156@@ -1323,7 +1323,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
61157 ret = 0;
61158 pipe_lock(pipe);
61159
61160- if (!pipe->readers) {
61161+ if (!atomic_read(&pipe->readers)) {
61162 send_sig(SIGPIPE, current, 0);
61163 if (!ret)
61164 ret = -EPIPE;
61165@@ -1352,7 +1352,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
61166 page_nr++;
61167 ret += buf->len;
61168
61169- if (pipe->files)
61170+ if (atomic_read(&pipe->files))
61171 do_wakeup = 1;
61172 }
61173
61174diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
61175index 4219835..3473b7e 100644
61176--- a/fs/fuse/dir.c
61177+++ b/fs/fuse/dir.c
61178@@ -1478,7 +1478,7 @@ static char *read_link(struct dentry *dentry)
61179 return link;
61180 }
61181
61182-static void free_link(char *link)
61183+static void free_link(const char *link)
61184 {
61185 if (!IS_ERR(link))
61186 free_page((unsigned long) link);
61187diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
61188index 9c470fd..aae410e 100644
61189--- a/fs/hostfs/hostfs_kern.c
61190+++ b/fs/hostfs/hostfs_kern.c
61191@@ -898,7 +898,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
61192
61193 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
61194 {
61195- char *s = nd_get_link(nd);
61196+ const char *s = nd_get_link(nd);
61197 if (!IS_ERR(s))
61198 __putname(s);
61199 }
61200diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
61201index e19d4c0..8a357a9 100644
61202--- a/fs/hugetlbfs/inode.c
61203+++ b/fs/hugetlbfs/inode.c
61204@@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
61205 struct mm_struct *mm = current->mm;
61206 struct vm_area_struct *vma;
61207 struct hstate *h = hstate_file(file);
61208+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
61209 struct vm_unmapped_area_info info;
61210
61211 if (len & ~huge_page_mask(h))
61212@@ -165,17 +166,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
61213 return addr;
61214 }
61215
61216+#ifdef CONFIG_PAX_RANDMMAP
61217+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
61218+#endif
61219+
61220 if (addr) {
61221 addr = ALIGN(addr, huge_page_size(h));
61222 vma = find_vma(mm, addr);
61223- if (TASK_SIZE - len >= addr &&
61224- (!vma || addr + len <= vma->vm_start))
61225+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
61226 return addr;
61227 }
61228
61229 info.flags = 0;
61230 info.length = len;
61231 info.low_limit = TASK_UNMAPPED_BASE;
61232+
61233+#ifdef CONFIG_PAX_RANDMMAP
61234+ if (mm->pax_flags & MF_PAX_RANDMMAP)
61235+ info.low_limit += mm->delta_mmap;
61236+#endif
61237+
61238 info.high_limit = TASK_SIZE;
61239 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
61240 info.align_offset = 0;
61241@@ -921,7 +931,7 @@ static struct file_system_type hugetlbfs_fs_type = {
61242 };
61243 MODULE_ALIAS_FS("hugetlbfs");
61244
61245-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
61246+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
61247
61248 static int can_do_hugetlb_shm(void)
61249 {
61250diff --git a/fs/inode.c b/fs/inode.c
61251index d2fb2f2..a6444b0 100644
61252--- a/fs/inode.c
61253+++ b/fs/inode.c
61254@@ -839,16 +839,20 @@ unsigned int get_next_ino(void)
61255 unsigned int *p = &get_cpu_var(last_ino);
61256 unsigned int res = *p;
61257
61258+start:
61259+
61260 #ifdef CONFIG_SMP
61261 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
61262- static atomic_t shared_last_ino;
61263- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
61264+ static atomic_unchecked_t shared_last_ino;
61265+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
61266
61267 res = next - LAST_INO_BATCH;
61268 }
61269 #endif
61270
61271- *p = ++res;
61272+ if (unlikely(!++res))
61273+ goto start; /* never zero */
61274+ *p = res;
61275 put_cpu_var(last_ino);
61276 return res;
61277 }
61278diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
61279index 4a6cf28..d3a29d3 100644
61280--- a/fs/jffs2/erase.c
61281+++ b/fs/jffs2/erase.c
61282@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
61283 struct jffs2_unknown_node marker = {
61284 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
61285 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
61286- .totlen = cpu_to_je32(c->cleanmarker_size)
61287+ .totlen = cpu_to_je32(c->cleanmarker_size),
61288+ .hdr_crc = cpu_to_je32(0)
61289 };
61290
61291 jffs2_prealloc_raw_node_refs(c, jeb, 1);
61292diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
61293index a6597d6..41b30ec 100644
61294--- a/fs/jffs2/wbuf.c
61295+++ b/fs/jffs2/wbuf.c
61296@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
61297 {
61298 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
61299 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
61300- .totlen = constant_cpu_to_je32(8)
61301+ .totlen = constant_cpu_to_je32(8),
61302+ .hdr_crc = constant_cpu_to_je32(0)
61303 };
61304
61305 /*
61306diff --git a/fs/jfs/super.c b/fs/jfs/super.c
61307index 97f7fda..09bd33d 100644
61308--- a/fs/jfs/super.c
61309+++ b/fs/jfs/super.c
61310@@ -885,7 +885,7 @@ static int __init init_jfs_fs(void)
61311
61312 jfs_inode_cachep =
61313 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
61314- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
61315+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
61316 init_once);
61317 if (jfs_inode_cachep == NULL)
61318 return -ENOMEM;
61319diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
61320index ac127cd..d8079db 100644
61321--- a/fs/kernfs/dir.c
61322+++ b/fs/kernfs/dir.c
61323@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
61324 *
61325 * Returns 31 bit hash of ns + name (so it fits in an off_t )
61326 */
61327-static unsigned int kernfs_name_hash(const char *name, const void *ns)
61328+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
61329 {
61330 unsigned long hash = init_name_hash();
61331 unsigned int len = strlen(name);
61332diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
61333index 5e9a80c..3853a24 100644
61334--- a/fs/kernfs/file.c
61335+++ b/fs/kernfs/file.c
61336@@ -33,7 +33,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
61337
61338 struct kernfs_open_node {
61339 atomic_t refcnt;
61340- atomic_t event;
61341+ atomic_unchecked_t event;
61342 wait_queue_head_t poll;
61343 struct list_head files; /* goes through kernfs_open_file.list */
61344 };
61345@@ -149,7 +149,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
61346 {
61347 struct kernfs_open_file *of = sf->private;
61348
61349- of->event = atomic_read(&of->kn->attr.open->event);
61350+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
61351
61352 return of->kn->attr.ops->seq_show(sf, v);
61353 }
61354@@ -361,12 +361,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
61355 return ret;
61356 }
61357
61358-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
61359- void *buf, int len, int write)
61360+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
61361+ void *buf, size_t len, int write)
61362 {
61363 struct file *file = vma->vm_file;
61364 struct kernfs_open_file *of = kernfs_of(file);
61365- int ret;
61366+ ssize_t ret;
61367
61368 if (!of->vm_ops)
61369 return -EINVAL;
61370@@ -567,7 +567,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
61371 return -ENOMEM;
61372
61373 atomic_set(&new_on->refcnt, 0);
61374- atomic_set(&new_on->event, 1);
61375+ atomic_set_unchecked(&new_on->event, 1);
61376 init_waitqueue_head(&new_on->poll);
61377 INIT_LIST_HEAD(&new_on->files);
61378 goto retry;
61379@@ -773,7 +773,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
61380
61381 kernfs_put_active(kn);
61382
61383- if (of->event != atomic_read(&on->event))
61384+ if (of->event != atomic_read_unchecked(&on->event))
61385 goto trigger;
61386
61387 return DEFAULT_POLLMASK;
61388@@ -798,7 +798,7 @@ void kernfs_notify(struct kernfs_node *kn)
61389 if (!WARN_ON(kernfs_type(kn) != KERNFS_FILE)) {
61390 on = kn->attr.open;
61391 if (on) {
61392- atomic_inc(&on->event);
61393+ atomic_inc_unchecked(&on->event);
61394 wake_up_interruptible(&on->poll);
61395 }
61396 }
61397diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
61398index 8a19889..4c3069a 100644
61399--- a/fs/kernfs/symlink.c
61400+++ b/fs/kernfs/symlink.c
61401@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
61402 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
61403 void *cookie)
61404 {
61405- char *page = nd_get_link(nd);
61406+ const char *page = nd_get_link(nd);
61407 if (!IS_ERR(page))
61408 free_page((unsigned long)page);
61409 }
61410diff --git a/fs/libfs.c b/fs/libfs.c
61411index a184424..944ddce 100644
61412--- a/fs/libfs.c
61413+++ b/fs/libfs.c
61414@@ -159,6 +159,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
61415
61416 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
61417 struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
61418+ char d_name[sizeof(next->d_iname)];
61419+ const unsigned char *name;
61420+
61421 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
61422 if (!simple_positive(next)) {
61423 spin_unlock(&next->d_lock);
61424@@ -167,7 +170,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
61425
61426 spin_unlock(&next->d_lock);
61427 spin_unlock(&dentry->d_lock);
61428- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
61429+ name = next->d_name.name;
61430+ if (name == next->d_iname) {
61431+ memcpy(d_name, name, next->d_name.len);
61432+ name = d_name;
61433+ }
61434+ if (!dir_emit(ctx, name, next->d_name.len,
61435 next->d_inode->i_ino, dt_type(next->d_inode)))
61436 return 0;
61437 spin_lock(&dentry->d_lock);
61438@@ -999,7 +1007,7 @@ EXPORT_SYMBOL(noop_fsync);
61439 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
61440 void *cookie)
61441 {
61442- char *s = nd_get_link(nd);
61443+ const char *s = nd_get_link(nd);
61444 if (!IS_ERR(s))
61445 kfree(s);
61446 }
61447diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
61448index acd3947..1f896e2 100644
61449--- a/fs/lockd/clntproc.c
61450+++ b/fs/lockd/clntproc.c
61451@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
61452 /*
61453 * Cookie counter for NLM requests
61454 */
61455-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
61456+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
61457
61458 void nlmclnt_next_cookie(struct nlm_cookie *c)
61459 {
61460- u32 cookie = atomic_inc_return(&nlm_cookie);
61461+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
61462
61463 memcpy(c->data, &cookie, 4);
61464 c->len=4;
61465diff --git a/fs/locks.c b/fs/locks.c
61466index e390bd9..c79870e 100644
61467--- a/fs/locks.c
61468+++ b/fs/locks.c
61469@@ -2315,16 +2315,16 @@ void locks_remove_file(struct file *filp)
61470 locks_remove_posix(filp, (fl_owner_t)filp);
61471
61472 if (filp->f_op->flock) {
61473- struct file_lock fl = {
61474+ struct file_lock flock = {
61475 .fl_pid = current->tgid,
61476 .fl_file = filp,
61477 .fl_flags = FL_FLOCK,
61478 .fl_type = F_UNLCK,
61479 .fl_end = OFFSET_MAX,
61480 };
61481- filp->f_op->flock(filp, F_SETLKW, &fl);
61482- if (fl.fl_ops && fl.fl_ops->fl_release_private)
61483- fl.fl_ops->fl_release_private(&fl);
61484+ filp->f_op->flock(filp, F_SETLKW, &flock);
61485+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
61486+ flock.fl_ops->fl_release_private(&flock);
61487 }
61488
61489 spin_lock(&inode->i_lock);
61490diff --git a/fs/mount.h b/fs/mount.h
61491index d55297f..f5b28c5 100644
61492--- a/fs/mount.h
61493+++ b/fs/mount.h
61494@@ -11,7 +11,7 @@ struct mnt_namespace {
61495 u64 seq; /* Sequence number to prevent loops */
61496 wait_queue_head_t poll;
61497 u64 event;
61498-};
61499+} __randomize_layout;
61500
61501 struct mnt_pcp {
61502 int mnt_count;
61503@@ -57,7 +57,7 @@ struct mount {
61504 int mnt_expiry_mark; /* true if marked for expiry */
61505 int mnt_pinned;
61506 struct path mnt_ex_mountpoint;
61507-};
61508+} __randomize_layout;
61509
61510 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
61511
61512diff --git a/fs/namei.c b/fs/namei.c
61513index 985c6f3..f67a0f8 100644
61514--- a/fs/namei.c
61515+++ b/fs/namei.c
61516@@ -330,17 +330,32 @@ int generic_permission(struct inode *inode, int mask)
61517 if (ret != -EACCES)
61518 return ret;
61519
61520+#ifdef CONFIG_GRKERNSEC
61521+ /* we'll block if we have to log due to a denied capability use */
61522+ if (mask & MAY_NOT_BLOCK)
61523+ return -ECHILD;
61524+#endif
61525+
61526 if (S_ISDIR(inode->i_mode)) {
61527 /* DACs are overridable for directories */
61528- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
61529- return 0;
61530 if (!(mask & MAY_WRITE))
61531- if (capable_wrt_inode_uidgid(inode,
61532- CAP_DAC_READ_SEARCH))
61533+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
61534+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
61535 return 0;
61536+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
61537+ return 0;
61538 return -EACCES;
61539 }
61540 /*
61541+ * Searching includes executable on directories, else just read.
61542+ */
61543+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
61544+ if (mask == MAY_READ)
61545+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
61546+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
61547+ return 0;
61548+
61549+ /*
61550 * Read/write DACs are always overridable.
61551 * Executable DACs are overridable when there is
61552 * at least one exec bit set.
61553@@ -349,14 +364,6 @@ int generic_permission(struct inode *inode, int mask)
61554 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
61555 return 0;
61556
61557- /*
61558- * Searching includes executable on directories, else just read.
61559- */
61560- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
61561- if (mask == MAY_READ)
61562- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
61563- return 0;
61564-
61565 return -EACCES;
61566 }
61567 EXPORT_SYMBOL(generic_permission);
61568@@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
61569 {
61570 struct dentry *dentry = link->dentry;
61571 int error;
61572- char *s;
61573+ const char *s;
61574
61575 BUG_ON(nd->flags & LOOKUP_RCU);
61576
61577@@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
61578 if (error)
61579 goto out_put_nd_path;
61580
61581+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
61582+ dentry->d_inode, dentry, nd->path.mnt)) {
61583+ error = -EACCES;
61584+ goto out_put_nd_path;
61585+ }
61586+
61587 nd->last_type = LAST_BIND;
61588 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
61589 error = PTR_ERR(*p);
61590@@ -1596,6 +1609,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
61591 if (res)
61592 break;
61593 res = walk_component(nd, path, LOOKUP_FOLLOW);
61594+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
61595+ res = -EACCES;
61596 put_link(nd, &link, cookie);
61597 } while (res > 0);
61598
61599@@ -1669,7 +1684,7 @@ EXPORT_SYMBOL(full_name_hash);
61600 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
61601 {
61602 unsigned long a, b, adata, bdata, mask, hash, len;
61603- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
61604+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
61605
61606 hash = a = 0;
61607 len = -sizeof(unsigned long);
61608@@ -1953,6 +1968,8 @@ static int path_lookupat(int dfd, const char *name,
61609 if (err)
61610 break;
61611 err = lookup_last(nd, &path);
61612+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
61613+ err = -EACCES;
61614 put_link(nd, &link, cookie);
61615 }
61616 }
61617@@ -1960,6 +1977,13 @@ static int path_lookupat(int dfd, const char *name,
61618 if (!err)
61619 err = complete_walk(nd);
61620
61621+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
61622+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
61623+ path_put(&nd->path);
61624+ err = -ENOENT;
61625+ }
61626+ }
61627+
61628 if (!err && nd->flags & LOOKUP_DIRECTORY) {
61629 if (!d_can_lookup(nd->path.dentry)) {
61630 path_put(&nd->path);
61631@@ -1987,8 +2011,15 @@ static int filename_lookup(int dfd, struct filename *name,
61632 retval = path_lookupat(dfd, name->name,
61633 flags | LOOKUP_REVAL, nd);
61634
61635- if (likely(!retval))
61636+ if (likely(!retval)) {
61637 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
61638+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
61639+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
61640+ path_put(&nd->path);
61641+ return -ENOENT;
61642+ }
61643+ }
61644+ }
61645 return retval;
61646 }
61647
61648@@ -2569,6 +2600,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
61649 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
61650 return -EPERM;
61651
61652+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
61653+ return -EPERM;
61654+ if (gr_handle_rawio(inode))
61655+ return -EPERM;
61656+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
61657+ return -EACCES;
61658+
61659 return 0;
61660 }
61661
61662@@ -2800,7 +2838,7 @@ looked_up:
61663 * cleared otherwise prior to returning.
61664 */
61665 static int lookup_open(struct nameidata *nd, struct path *path,
61666- struct file *file,
61667+ struct path *link, struct file *file,
61668 const struct open_flags *op,
61669 bool got_write, int *opened)
61670 {
61671@@ -2835,6 +2873,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
61672 /* Negative dentry, just create the file */
61673 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
61674 umode_t mode = op->mode;
61675+
61676+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
61677+ error = -EACCES;
61678+ goto out_dput;
61679+ }
61680+
61681+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
61682+ error = -EACCES;
61683+ goto out_dput;
61684+ }
61685+
61686 if (!IS_POSIXACL(dir->d_inode))
61687 mode &= ~current_umask();
61688 /*
61689@@ -2856,6 +2905,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
61690 nd->flags & LOOKUP_EXCL);
61691 if (error)
61692 goto out_dput;
61693+ else
61694+ gr_handle_create(dentry, nd->path.mnt);
61695 }
61696 out_no_open:
61697 path->dentry = dentry;
61698@@ -2870,7 +2921,7 @@ out_dput:
61699 /*
61700 * Handle the last step of open()
61701 */
61702-static int do_last(struct nameidata *nd, struct path *path,
61703+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
61704 struct file *file, const struct open_flags *op,
61705 int *opened, struct filename *name)
61706 {
61707@@ -2920,6 +2971,15 @@ static int do_last(struct nameidata *nd, struct path *path,
61708 if (error)
61709 return error;
61710
61711+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
61712+ error = -ENOENT;
61713+ goto out;
61714+ }
61715+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
61716+ error = -EACCES;
61717+ goto out;
61718+ }
61719+
61720 audit_inode(name, dir, LOOKUP_PARENT);
61721 error = -EISDIR;
61722 /* trailing slashes? */
61723@@ -2939,7 +2999,7 @@ retry_lookup:
61724 */
61725 }
61726 mutex_lock(&dir->d_inode->i_mutex);
61727- error = lookup_open(nd, path, file, op, got_write, opened);
61728+ error = lookup_open(nd, path, link, file, op, got_write, opened);
61729 mutex_unlock(&dir->d_inode->i_mutex);
61730
61731 if (error <= 0) {
61732@@ -2963,11 +3023,28 @@ retry_lookup:
61733 goto finish_open_created;
61734 }
61735
61736+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
61737+ error = -ENOENT;
61738+ goto exit_dput;
61739+ }
61740+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
61741+ error = -EACCES;
61742+ goto exit_dput;
61743+ }
61744+
61745 /*
61746 * create/update audit record if it already exists.
61747 */
61748- if (d_is_positive(path->dentry))
61749+ if (d_is_positive(path->dentry)) {
61750+ /* only check if O_CREAT is specified, all other checks need to go
61751+ into may_open */
61752+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
61753+ error = -EACCES;
61754+ goto exit_dput;
61755+ }
61756+
61757 audit_inode(name, path->dentry, 0);
61758+ }
61759
61760 /*
61761 * If atomic_open() acquired write access it is dropped now due to
61762@@ -3008,6 +3085,11 @@ finish_lookup:
61763 }
61764 }
61765 BUG_ON(inode != path->dentry->d_inode);
61766+ /* if we're resolving a symlink to another symlink */
61767+ if (link && gr_handle_symlink_owner(link, inode)) {
61768+ error = -EACCES;
61769+ goto out;
61770+ }
61771 return 1;
61772 }
61773
61774@@ -3017,7 +3099,6 @@ finish_lookup:
61775 save_parent.dentry = nd->path.dentry;
61776 save_parent.mnt = mntget(path->mnt);
61777 nd->path.dentry = path->dentry;
61778-
61779 }
61780 nd->inode = inode;
61781 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
61782@@ -3027,7 +3108,18 @@ finish_open:
61783 path_put(&save_parent);
61784 return error;
61785 }
61786+
61787+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
61788+ error = -ENOENT;
61789+ goto out;
61790+ }
61791+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
61792+ error = -EACCES;
61793+ goto out;
61794+ }
61795+
61796 audit_inode(name, nd->path.dentry, 0);
61797+
61798 error = -EISDIR;
61799 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
61800 goto out;
61801@@ -3190,7 +3282,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
61802 if (unlikely(error))
61803 goto out;
61804
61805- error = do_last(nd, &path, file, op, &opened, pathname);
61806+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
61807 while (unlikely(error > 0)) { /* trailing symlink */
61808 struct path link = path;
61809 void *cookie;
61810@@ -3208,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
61811 error = follow_link(&link, nd, &cookie);
61812 if (unlikely(error))
61813 break;
61814- error = do_last(nd, &path, file, op, &opened, pathname);
61815+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
61816 put_link(nd, &link, cookie);
61817 }
61818 out:
61819@@ -3308,9 +3400,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
61820 goto unlock;
61821
61822 error = -EEXIST;
61823- if (d_is_positive(dentry))
61824+ if (d_is_positive(dentry)) {
61825+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
61826+ error = -ENOENT;
61827 goto fail;
61828-
61829+ }
61830 /*
61831 * Special case - lookup gave negative, but... we had foo/bar/
61832 * From the vfs_mknod() POV we just have a negative dentry -
61833@@ -3362,6 +3456,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
61834 }
61835 EXPORT_SYMBOL(user_path_create);
61836
61837+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
61838+{
61839+ struct filename *tmp = getname(pathname);
61840+ struct dentry *res;
61841+ if (IS_ERR(tmp))
61842+ return ERR_CAST(tmp);
61843+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
61844+ if (IS_ERR(res))
61845+ putname(tmp);
61846+ else
61847+ *to = tmp;
61848+ return res;
61849+}
61850+
61851 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
61852 {
61853 int error = may_create(dir, dentry);
61854@@ -3425,6 +3533,17 @@ retry:
61855
61856 if (!IS_POSIXACL(path.dentry->d_inode))
61857 mode &= ~current_umask();
61858+
61859+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
61860+ error = -EPERM;
61861+ goto out;
61862+ }
61863+
61864+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
61865+ error = -EACCES;
61866+ goto out;
61867+ }
61868+
61869 error = security_path_mknod(&path, dentry, mode, dev);
61870 if (error)
61871 goto out;
61872@@ -3441,6 +3560,8 @@ retry:
61873 break;
61874 }
61875 out:
61876+ if (!error)
61877+ gr_handle_create(dentry, path.mnt);
61878 done_path_create(&path, dentry);
61879 if (retry_estale(error, lookup_flags)) {
61880 lookup_flags |= LOOKUP_REVAL;
61881@@ -3494,9 +3615,16 @@ retry:
61882
61883 if (!IS_POSIXACL(path.dentry->d_inode))
61884 mode &= ~current_umask();
61885+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
61886+ error = -EACCES;
61887+ goto out;
61888+ }
61889 error = security_path_mkdir(&path, dentry, mode);
61890 if (!error)
61891 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
61892+ if (!error)
61893+ gr_handle_create(dentry, path.mnt);
61894+out:
61895 done_path_create(&path, dentry);
61896 if (retry_estale(error, lookup_flags)) {
61897 lookup_flags |= LOOKUP_REVAL;
61898@@ -3579,6 +3707,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
61899 struct filename *name;
61900 struct dentry *dentry;
61901 struct nameidata nd;
61902+ ino_t saved_ino = 0;
61903+ dev_t saved_dev = 0;
61904 unsigned int lookup_flags = 0;
61905 retry:
61906 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
61907@@ -3611,10 +3741,21 @@ retry:
61908 error = -ENOENT;
61909 goto exit3;
61910 }
61911+
61912+ saved_ino = dentry->d_inode->i_ino;
61913+ saved_dev = gr_get_dev_from_dentry(dentry);
61914+
61915+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
61916+ error = -EACCES;
61917+ goto exit3;
61918+ }
61919+
61920 error = security_path_rmdir(&nd.path, dentry);
61921 if (error)
61922 goto exit3;
61923 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
61924+ if (!error && (saved_dev || saved_ino))
61925+ gr_handle_delete(saved_ino, saved_dev);
61926 exit3:
61927 dput(dentry);
61928 exit2:
61929@@ -3705,6 +3846,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
61930 struct nameidata nd;
61931 struct inode *inode = NULL;
61932 struct inode *delegated_inode = NULL;
61933+ ino_t saved_ino = 0;
61934+ dev_t saved_dev = 0;
61935 unsigned int lookup_flags = 0;
61936 retry:
61937 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
61938@@ -3731,10 +3874,22 @@ retry_deleg:
61939 if (d_is_negative(dentry))
61940 goto slashes;
61941 ihold(inode);
61942+
61943+ if (inode->i_nlink <= 1) {
61944+ saved_ino = inode->i_ino;
61945+ saved_dev = gr_get_dev_from_dentry(dentry);
61946+ }
61947+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
61948+ error = -EACCES;
61949+ goto exit2;
61950+ }
61951+
61952 error = security_path_unlink(&nd.path, dentry);
61953 if (error)
61954 goto exit2;
61955 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
61956+ if (!error && (saved_ino || saved_dev))
61957+ gr_handle_delete(saved_ino, saved_dev);
61958 exit2:
61959 dput(dentry);
61960 }
61961@@ -3823,9 +3978,17 @@ retry:
61962 if (IS_ERR(dentry))
61963 goto out_putname;
61964
61965+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
61966+ error = -EACCES;
61967+ goto out;
61968+ }
61969+
61970 error = security_path_symlink(&path, dentry, from->name);
61971 if (!error)
61972 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
61973+ if (!error)
61974+ gr_handle_create(dentry, path.mnt);
61975+out:
61976 done_path_create(&path, dentry);
61977 if (retry_estale(error, lookup_flags)) {
61978 lookup_flags |= LOOKUP_REVAL;
61979@@ -3929,6 +4092,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
61980 struct dentry *new_dentry;
61981 struct path old_path, new_path;
61982 struct inode *delegated_inode = NULL;
61983+ struct filename *to = NULL;
61984 int how = 0;
61985 int error;
61986
61987@@ -3952,7 +4116,7 @@ retry:
61988 if (error)
61989 return error;
61990
61991- new_dentry = user_path_create(newdfd, newname, &new_path,
61992+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
61993 (how & LOOKUP_REVAL));
61994 error = PTR_ERR(new_dentry);
61995 if (IS_ERR(new_dentry))
61996@@ -3964,11 +4128,28 @@ retry:
61997 error = may_linkat(&old_path);
61998 if (unlikely(error))
61999 goto out_dput;
62000+
62001+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
62002+ old_path.dentry->d_inode,
62003+ old_path.dentry->d_inode->i_mode, to)) {
62004+ error = -EACCES;
62005+ goto out_dput;
62006+ }
62007+
62008+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
62009+ old_path.dentry, old_path.mnt, to)) {
62010+ error = -EACCES;
62011+ goto out_dput;
62012+ }
62013+
62014 error = security_path_link(old_path.dentry, &new_path, new_dentry);
62015 if (error)
62016 goto out_dput;
62017 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
62018+ if (!error)
62019+ gr_handle_create(new_dentry, new_path.mnt);
62020 out_dput:
62021+ putname(to);
62022 done_path_create(&new_path, new_dentry);
62023 if (delegated_inode) {
62024 error = break_deleg_wait(&delegated_inode);
62025@@ -4278,6 +4459,12 @@ retry_deleg:
62026 if (new_dentry == trap)
62027 goto exit5;
62028
62029+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
62030+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
62031+ to, flags);
62032+ if (error)
62033+ goto exit5;
62034+
62035 error = security_path_rename(&oldnd.path, old_dentry,
62036 &newnd.path, new_dentry, flags);
62037 if (error)
62038@@ -4285,6 +4472,9 @@ retry_deleg:
62039 error = vfs_rename(old_dir->d_inode, old_dentry,
62040 new_dir->d_inode, new_dentry,
62041 &delegated_inode, flags);
62042+ if (!error)
62043+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
62044+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
62045 exit5:
62046 dput(new_dentry);
62047 exit4:
62048@@ -4327,14 +4517,24 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
62049
62050 int readlink_copy(char __user *buffer, int buflen, const char *link)
62051 {
62052+ char tmpbuf[64];
62053+ const char *newlink;
62054 int len = PTR_ERR(link);
62055+
62056 if (IS_ERR(link))
62057 goto out;
62058
62059 len = strlen(link);
62060 if (len > (unsigned) buflen)
62061 len = buflen;
62062- if (copy_to_user(buffer, link, len))
62063+
62064+ if (len < sizeof(tmpbuf)) {
62065+ memcpy(tmpbuf, link, len);
62066+ newlink = tmpbuf;
62067+ } else
62068+ newlink = link;
62069+
62070+ if (copy_to_user(buffer, newlink, len))
62071 len = -EFAULT;
62072 out:
62073 return len;
62074diff --git a/fs/namespace.c b/fs/namespace.c
62075index 182bc41..72e3cf1 100644
62076--- a/fs/namespace.c
62077+++ b/fs/namespace.c
62078@@ -1348,6 +1348,9 @@ static int do_umount(struct mount *mnt, int flags)
62079 if (!(sb->s_flags & MS_RDONLY))
62080 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
62081 up_write(&sb->s_umount);
62082+
62083+ gr_log_remount(mnt->mnt_devname, retval);
62084+
62085 return retval;
62086 }
62087
62088@@ -1370,6 +1373,9 @@ static int do_umount(struct mount *mnt, int flags)
62089 }
62090 unlock_mount_hash();
62091 namespace_unlock();
62092+
62093+ gr_log_unmount(mnt->mnt_devname, retval);
62094+
62095 return retval;
62096 }
62097
62098@@ -1389,7 +1395,7 @@ static inline bool may_mount(void)
62099 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
62100 */
62101
62102-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
62103+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
62104 {
62105 struct path path;
62106 struct mount *mnt;
62107@@ -1431,7 +1437,7 @@ out:
62108 /*
62109 * The 2.0 compatible umount. No flags.
62110 */
62111-SYSCALL_DEFINE1(oldumount, char __user *, name)
62112+SYSCALL_DEFINE1(oldumount, const char __user *, name)
62113 {
62114 return sys_umount(name, 0);
62115 }
62116@@ -2440,6 +2446,16 @@ long do_mount(const char *dev_name, const char *dir_name,
62117 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
62118 MS_STRICTATIME);
62119
62120+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
62121+ retval = -EPERM;
62122+ goto dput_out;
62123+ }
62124+
62125+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
62126+ retval = -EPERM;
62127+ goto dput_out;
62128+ }
62129+
62130 if (flags & MS_REMOUNT)
62131 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
62132 data_page);
62133@@ -2454,6 +2470,9 @@ long do_mount(const char *dev_name, const char *dir_name,
62134 dev_name, data_page);
62135 dput_out:
62136 path_put(&path);
62137+
62138+ gr_log_mount(dev_name, dir_name, retval);
62139+
62140 return retval;
62141 }
62142
62143@@ -2471,7 +2490,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
62144 * number incrementing at 10Ghz will take 12,427 years to wrap which
62145 * is effectively never, so we can ignore the possibility.
62146 */
62147-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
62148+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
62149
62150 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
62151 {
62152@@ -2486,7 +2505,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
62153 kfree(new_ns);
62154 return ERR_PTR(ret);
62155 }
62156- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
62157+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
62158 atomic_set(&new_ns->count, 1);
62159 new_ns->root = NULL;
62160 INIT_LIST_HEAD(&new_ns->list);
62161@@ -2496,7 +2515,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
62162 return new_ns;
62163 }
62164
62165-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
62166+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
62167 struct user_namespace *user_ns, struct fs_struct *new_fs)
62168 {
62169 struct mnt_namespace *new_ns;
62170@@ -2617,8 +2636,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
62171 }
62172 EXPORT_SYMBOL(mount_subtree);
62173
62174-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
62175- char __user *, type, unsigned long, flags, void __user *, data)
62176+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
62177+ const char __user *, type, unsigned long, flags, void __user *, data)
62178 {
62179 int ret;
62180 char *kernel_type;
62181@@ -2731,6 +2750,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
62182 if (error)
62183 goto out2;
62184
62185+ if (gr_handle_chroot_pivot()) {
62186+ error = -EPERM;
62187+ goto out2;
62188+ }
62189+
62190 get_fs_root(current->fs, &root);
62191 old_mp = lock_mount(&old);
62192 error = PTR_ERR(old_mp);
62193@@ -2999,7 +3023,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
62194 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
62195 return -EPERM;
62196
62197- if (fs->users != 1)
62198+ if (atomic_read(&fs->users) != 1)
62199 return -EINVAL;
62200
62201 get_mnt_ns(mnt_ns);
62202diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
62203index f4ccfe6..a5cf064 100644
62204--- a/fs/nfs/callback_xdr.c
62205+++ b/fs/nfs/callback_xdr.c
62206@@ -51,7 +51,7 @@ struct callback_op {
62207 callback_decode_arg_t decode_args;
62208 callback_encode_res_t encode_res;
62209 long res_maxsize;
62210-};
62211+} __do_const;
62212
62213 static struct callback_op callback_ops[];
62214
62215diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
62216index c79f3e7..d61d671 100644
62217--- a/fs/nfs/inode.c
62218+++ b/fs/nfs/inode.c
62219@@ -1209,16 +1209,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
62220 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
62221 }
62222
62223-static atomic_long_t nfs_attr_generation_counter;
62224+static atomic_long_unchecked_t nfs_attr_generation_counter;
62225
62226 static unsigned long nfs_read_attr_generation_counter(void)
62227 {
62228- return atomic_long_read(&nfs_attr_generation_counter);
62229+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
62230 }
62231
62232 unsigned long nfs_inc_attr_generation_counter(void)
62233 {
62234- return atomic_long_inc_return(&nfs_attr_generation_counter);
62235+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
62236 }
62237
62238 void nfs_fattr_init(struct nfs_fattr *fattr)
62239diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
62240index d543222..2cfa2a2 100644
62241--- a/fs/nfsd/nfs4proc.c
62242+++ b/fs/nfsd/nfs4proc.c
62243@@ -1178,7 +1178,7 @@ struct nfsd4_operation {
62244 nfsd4op_rsize op_rsize_bop;
62245 stateid_getter op_get_currentstateid;
62246 stateid_setter op_set_currentstateid;
62247-};
62248+} __do_const;
62249
62250 static struct nfsd4_operation nfsd4_ops[];
62251
62252diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
62253index b4c4958..04687ad 100644
62254--- a/fs/nfsd/nfs4xdr.c
62255+++ b/fs/nfsd/nfs4xdr.c
62256@@ -1530,7 +1530,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
62257
62258 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
62259
62260-static nfsd4_dec nfsd4_dec_ops[] = {
62261+static const nfsd4_dec nfsd4_dec_ops[] = {
62262 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
62263 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
62264 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
62265diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
62266index f8f060f..c4ba09a 100644
62267--- a/fs/nfsd/nfscache.c
62268+++ b/fs/nfsd/nfscache.c
62269@@ -519,14 +519,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
62270 {
62271 struct svc_cacherep *rp = rqstp->rq_cacherep;
62272 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
62273- int len;
62274+ long len;
62275 size_t bufsize = 0;
62276
62277 if (!rp)
62278 return;
62279
62280- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
62281- len >>= 2;
62282+ if (statp) {
62283+ len = (char*)statp - (char*)resv->iov_base;
62284+ len = resv->iov_len - len;
62285+ len >>= 2;
62286+ }
62287
62288 /* Don't cache excessive amounts of data and XDR failures */
62289 if (!statp || len > (256 >> 2)) {
62290diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
62291index 16f0673..1c2c30ab 100644
62292--- a/fs/nfsd/vfs.c
62293+++ b/fs/nfsd/vfs.c
62294@@ -843,7 +843,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
62295 } else {
62296 oldfs = get_fs();
62297 set_fs(KERNEL_DS);
62298- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
62299+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
62300 set_fs(oldfs);
62301 }
62302
62303@@ -934,7 +934,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
62304
62305 /* Write the data. */
62306 oldfs = get_fs(); set_fs(KERNEL_DS);
62307- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
62308+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
62309 set_fs(oldfs);
62310 if (host_err < 0)
62311 goto out_nfserr;
62312@@ -1479,7 +1479,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
62313 */
62314
62315 oldfs = get_fs(); set_fs(KERNEL_DS);
62316- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
62317+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
62318 set_fs(oldfs);
62319
62320 if (host_err < 0)
62321diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
62322index 52ccd34..43a53b1 100644
62323--- a/fs/nls/nls_base.c
62324+++ b/fs/nls/nls_base.c
62325@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
62326
62327 int __register_nls(struct nls_table *nls, struct module *owner)
62328 {
62329- struct nls_table ** tmp = &tables;
62330+ struct nls_table *tmp = tables;
62331
62332 if (nls->next)
62333 return -EBUSY;
62334
62335- nls->owner = owner;
62336+ pax_open_kernel();
62337+ *(void **)&nls->owner = owner;
62338+ pax_close_kernel();
62339 spin_lock(&nls_lock);
62340- while (*tmp) {
62341- if (nls == *tmp) {
62342+ while (tmp) {
62343+ if (nls == tmp) {
62344 spin_unlock(&nls_lock);
62345 return -EBUSY;
62346 }
62347- tmp = &(*tmp)->next;
62348+ tmp = tmp->next;
62349 }
62350- nls->next = tables;
62351+ pax_open_kernel();
62352+ *(struct nls_table **)&nls->next = tables;
62353+ pax_close_kernel();
62354 tables = nls;
62355 spin_unlock(&nls_lock);
62356 return 0;
62357@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
62358
62359 int unregister_nls(struct nls_table * nls)
62360 {
62361- struct nls_table ** tmp = &tables;
62362+ struct nls_table * const * tmp = &tables;
62363
62364 spin_lock(&nls_lock);
62365 while (*tmp) {
62366 if (nls == *tmp) {
62367- *tmp = nls->next;
62368+ pax_open_kernel();
62369+ *(struct nls_table **)tmp = nls->next;
62370+ pax_close_kernel();
62371 spin_unlock(&nls_lock);
62372 return 0;
62373 }
62374diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
62375index 162b3f1..6076a7c 100644
62376--- a/fs/nls/nls_euc-jp.c
62377+++ b/fs/nls/nls_euc-jp.c
62378@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
62379 p_nls = load_nls("cp932");
62380
62381 if (p_nls) {
62382- table.charset2upper = p_nls->charset2upper;
62383- table.charset2lower = p_nls->charset2lower;
62384+ pax_open_kernel();
62385+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
62386+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
62387+ pax_close_kernel();
62388 return register_nls(&table);
62389 }
62390
62391diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
62392index a80a741..7b96e1b 100644
62393--- a/fs/nls/nls_koi8-ru.c
62394+++ b/fs/nls/nls_koi8-ru.c
62395@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
62396 p_nls = load_nls("koi8-u");
62397
62398 if (p_nls) {
62399- table.charset2upper = p_nls->charset2upper;
62400- table.charset2lower = p_nls->charset2lower;
62401+ pax_open_kernel();
62402+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
62403+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
62404+ pax_close_kernel();
62405 return register_nls(&table);
62406 }
62407
62408diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
62409index 732648b..d3b017f 100644
62410--- a/fs/notify/fanotify/fanotify_user.c
62411+++ b/fs/notify/fanotify/fanotify_user.c
62412@@ -203,8 +203,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
62413
62414 fd = fanotify_event_metadata.fd;
62415 ret = -EFAULT;
62416- if (copy_to_user(buf, &fanotify_event_metadata,
62417- fanotify_event_metadata.event_len))
62418+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
62419+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
62420 goto out_close_fd;
62421
62422 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
62423diff --git a/fs/notify/notification.c b/fs/notify/notification.c
62424index 1e58402..bb2d6f4 100644
62425--- a/fs/notify/notification.c
62426+++ b/fs/notify/notification.c
62427@@ -48,7 +48,7 @@
62428 #include <linux/fsnotify_backend.h>
62429 #include "fsnotify.h"
62430
62431-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62432+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62433
62434 /**
62435 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
62436@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
62437 */
62438 u32 fsnotify_get_cookie(void)
62439 {
62440- return atomic_inc_return(&fsnotify_sync_cookie);
62441+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
62442 }
62443 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
62444
62445diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
62446index 9e38daf..5727cae 100644
62447--- a/fs/ntfs/dir.c
62448+++ b/fs/ntfs/dir.c
62449@@ -1310,7 +1310,7 @@ find_next_index_buffer:
62450 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
62451 ~(s64)(ndir->itype.index.block_size - 1)));
62452 /* Bounds checks. */
62453- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
62454+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
62455 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
62456 "inode 0x%lx or driver bug.", vdir->i_ino);
62457 goto err_out;
62458diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
62459index db9bd8a..8338fb6 100644
62460--- a/fs/ntfs/file.c
62461+++ b/fs/ntfs/file.c
62462@@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
62463 char *addr;
62464 size_t total = 0;
62465 unsigned len;
62466- int left;
62467+ unsigned left;
62468
62469 do {
62470 len = PAGE_CACHE_SIZE - ofs;
62471diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
62472index 9de2491..3306095 100644
62473--- a/fs/ntfs/super.c
62474+++ b/fs/ntfs/super.c
62475@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62476 if (!silent)
62477 ntfs_error(sb, "Primary boot sector is invalid.");
62478 } else if (!silent)
62479- ntfs_error(sb, read_err_str, "primary");
62480+ ntfs_error(sb, read_err_str, "%s", "primary");
62481 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
62482 if (bh_primary)
62483 brelse(bh_primary);
62484@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62485 goto hotfix_primary_boot_sector;
62486 brelse(bh_backup);
62487 } else if (!silent)
62488- ntfs_error(sb, read_err_str, "backup");
62489+ ntfs_error(sb, read_err_str, "%s", "backup");
62490 /* Try to read NT3.51- backup boot sector. */
62491 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
62492 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
62493@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
62494 "sector.");
62495 brelse(bh_backup);
62496 } else if (!silent)
62497- ntfs_error(sb, read_err_str, "backup");
62498+ ntfs_error(sb, read_err_str, "%s", "backup");
62499 /* We failed. Cleanup and return. */
62500 if (bh_primary)
62501 brelse(bh_primary);
62502diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
62503index 0440134..d52c93a 100644
62504--- a/fs/ocfs2/localalloc.c
62505+++ b/fs/ocfs2/localalloc.c
62506@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
62507 goto bail;
62508 }
62509
62510- atomic_inc(&osb->alloc_stats.moves);
62511+ atomic_inc_unchecked(&osb->alloc_stats.moves);
62512
62513 bail:
62514 if (handle)
62515diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
62516index 8d64a97..c37665d 100644
62517--- a/fs/ocfs2/ocfs2.h
62518+++ b/fs/ocfs2/ocfs2.h
62519@@ -236,11 +236,11 @@ enum ocfs2_vol_state
62520
62521 struct ocfs2_alloc_stats
62522 {
62523- atomic_t moves;
62524- atomic_t local_data;
62525- atomic_t bitmap_data;
62526- atomic_t bg_allocs;
62527- atomic_t bg_extends;
62528+ atomic_unchecked_t moves;
62529+ atomic_unchecked_t local_data;
62530+ atomic_unchecked_t bitmap_data;
62531+ atomic_unchecked_t bg_allocs;
62532+ atomic_unchecked_t bg_extends;
62533 };
62534
62535 enum ocfs2_local_alloc_state
62536diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
62537index 0cb889a..6a26b24 100644
62538--- a/fs/ocfs2/suballoc.c
62539+++ b/fs/ocfs2/suballoc.c
62540@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
62541 mlog_errno(status);
62542 goto bail;
62543 }
62544- atomic_inc(&osb->alloc_stats.bg_extends);
62545+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
62546
62547 /* You should never ask for this much metadata */
62548 BUG_ON(bits_wanted >
62549@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
62550 mlog_errno(status);
62551 goto bail;
62552 }
62553- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62554+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62555
62556 *suballoc_loc = res.sr_bg_blkno;
62557 *suballoc_bit_start = res.sr_bit_offset;
62558@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
62559 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
62560 res->sr_bits);
62561
62562- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62563+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62564
62565 BUG_ON(res->sr_bits != 1);
62566
62567@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
62568 mlog_errno(status);
62569 goto bail;
62570 }
62571- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62572+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
62573
62574 BUG_ON(res.sr_bits != 1);
62575
62576@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
62577 cluster_start,
62578 num_clusters);
62579 if (!status)
62580- atomic_inc(&osb->alloc_stats.local_data);
62581+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
62582 } else {
62583 if (min_clusters > (osb->bitmap_cpg - 1)) {
62584 /* The only paths asking for contiguousness
62585@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
62586 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
62587 res.sr_bg_blkno,
62588 res.sr_bit_offset);
62589- atomic_inc(&osb->alloc_stats.bitmap_data);
62590+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
62591 *num_clusters = res.sr_bits;
62592 }
62593 }
62594diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
62595index a7cdd56..c583144 100644
62596--- a/fs/ocfs2/super.c
62597+++ b/fs/ocfs2/super.c
62598@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
62599 "%10s => GlobalAllocs: %d LocalAllocs: %d "
62600 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
62601 "Stats",
62602- atomic_read(&osb->alloc_stats.bitmap_data),
62603- atomic_read(&osb->alloc_stats.local_data),
62604- atomic_read(&osb->alloc_stats.bg_allocs),
62605- atomic_read(&osb->alloc_stats.moves),
62606- atomic_read(&osb->alloc_stats.bg_extends));
62607+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
62608+ atomic_read_unchecked(&osb->alloc_stats.local_data),
62609+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
62610+ atomic_read_unchecked(&osb->alloc_stats.moves),
62611+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
62612
62613 out += snprintf(buf + out, len - out,
62614 "%10s => State: %u Descriptor: %llu Size: %u bits "
62615@@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
62616
62617 mutex_init(&osb->system_file_mutex);
62618
62619- atomic_set(&osb->alloc_stats.moves, 0);
62620- atomic_set(&osb->alloc_stats.local_data, 0);
62621- atomic_set(&osb->alloc_stats.bitmap_data, 0);
62622- atomic_set(&osb->alloc_stats.bg_allocs, 0);
62623- atomic_set(&osb->alloc_stats.bg_extends, 0);
62624+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
62625+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
62626+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
62627+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
62628+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
62629
62630 /* Copy the blockcheck stats from the superblock probe */
62631 osb->osb_ecc_stats = *stats;
62632diff --git a/fs/open.c b/fs/open.c
62633index 9d64679..75f925c 100644
62634--- a/fs/open.c
62635+++ b/fs/open.c
62636@@ -32,6 +32,8 @@
62637 #include <linux/dnotify.h>
62638 #include <linux/compat.h>
62639
62640+#define CREATE_TRACE_POINTS
62641+#include <trace/events/fs.h>
62642 #include "internal.h"
62643
62644 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
62645@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
62646 error = locks_verify_truncate(inode, NULL, length);
62647 if (!error)
62648 error = security_path_truncate(path);
62649+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
62650+ error = -EACCES;
62651 if (!error)
62652 error = do_truncate(path->dentry, length, 0, NULL);
62653
62654@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
62655 error = locks_verify_truncate(inode, f.file, length);
62656 if (!error)
62657 error = security_path_truncate(&f.file->f_path);
62658+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
62659+ error = -EACCES;
62660 if (!error)
62661 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
62662 sb_end_write(inode->i_sb);
62663@@ -381,6 +387,9 @@ retry:
62664 if (__mnt_is_readonly(path.mnt))
62665 res = -EROFS;
62666
62667+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
62668+ res = -EACCES;
62669+
62670 out_path_release:
62671 path_put(&path);
62672 if (retry_estale(res, lookup_flags)) {
62673@@ -412,6 +421,8 @@ retry:
62674 if (error)
62675 goto dput_and_out;
62676
62677+ gr_log_chdir(path.dentry, path.mnt);
62678+
62679 set_fs_pwd(current->fs, &path);
62680
62681 dput_and_out:
62682@@ -441,6 +452,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
62683 goto out_putf;
62684
62685 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
62686+
62687+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
62688+ error = -EPERM;
62689+
62690+ if (!error)
62691+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
62692+
62693 if (!error)
62694 set_fs_pwd(current->fs, &f.file->f_path);
62695 out_putf:
62696@@ -470,7 +488,13 @@ retry:
62697 if (error)
62698 goto dput_and_out;
62699
62700+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
62701+ goto dput_and_out;
62702+
62703 set_fs_root(current->fs, &path);
62704+
62705+ gr_handle_chroot_chdir(&path);
62706+
62707 error = 0;
62708 dput_and_out:
62709 path_put(&path);
62710@@ -494,6 +518,16 @@ static int chmod_common(struct path *path, umode_t mode)
62711 return error;
62712 retry_deleg:
62713 mutex_lock(&inode->i_mutex);
62714+
62715+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
62716+ error = -EACCES;
62717+ goto out_unlock;
62718+ }
62719+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
62720+ error = -EACCES;
62721+ goto out_unlock;
62722+ }
62723+
62724 error = security_path_chmod(path, mode);
62725 if (error)
62726 goto out_unlock;
62727@@ -559,6 +593,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
62728 uid = make_kuid(current_user_ns(), user);
62729 gid = make_kgid(current_user_ns(), group);
62730
62731+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
62732+ return -EACCES;
62733+
62734 newattrs.ia_valid = ATTR_CTIME;
62735 if (user != (uid_t) -1) {
62736 if (!uid_valid(uid))
62737@@ -978,6 +1015,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
62738 } else {
62739 fsnotify_open(f);
62740 fd_install(fd, f);
62741+ trace_do_sys_open(tmp->name, flags, mode);
62742 }
62743 }
62744 putname(tmp);
62745diff --git a/fs/pipe.c b/fs/pipe.c
62746index 034bffa..6c6b522 100644
62747--- a/fs/pipe.c
62748+++ b/fs/pipe.c
62749@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
62750
62751 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
62752 {
62753- if (pipe->files)
62754+ if (atomic_read(&pipe->files))
62755 mutex_lock_nested(&pipe->mutex, subclass);
62756 }
62757
62758@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
62759
62760 void pipe_unlock(struct pipe_inode_info *pipe)
62761 {
62762- if (pipe->files)
62763+ if (atomic_read(&pipe->files))
62764 mutex_unlock(&pipe->mutex);
62765 }
62766 EXPORT_SYMBOL(pipe_unlock);
62767@@ -342,9 +342,9 @@ pipe_read(struct kiocb *iocb, const struct iovec *_iov,
62768 }
62769 if (bufs) /* More to do? */
62770 continue;
62771- if (!pipe->writers)
62772+ if (!atomic_read(&pipe->writers))
62773 break;
62774- if (!pipe->waiting_writers) {
62775+ if (!atomic_read(&pipe->waiting_writers)) {
62776 /* syscall merging: Usually we must not sleep
62777 * if O_NONBLOCK is set, or if we got some data.
62778 * But if a writer sleeps in kernel space, then
62779@@ -406,7 +406,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
62780 ret = 0;
62781 __pipe_lock(pipe);
62782
62783- if (!pipe->readers) {
62784+ if (!atomic_read(&pipe->readers)) {
62785 send_sig(SIGPIPE, current, 0);
62786 ret = -EPIPE;
62787 goto out;
62788@@ -461,7 +461,7 @@ redo1:
62789 for (;;) {
62790 int bufs;
62791
62792- if (!pipe->readers) {
62793+ if (!atomic_read(&pipe->readers)) {
62794 send_sig(SIGPIPE, current, 0);
62795 if (!ret)
62796 ret = -EPIPE;
62797@@ -552,9 +552,9 @@ redo2:
62798 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
62799 do_wakeup = 0;
62800 }
62801- pipe->waiting_writers++;
62802+ atomic_inc(&pipe->waiting_writers);
62803 pipe_wait(pipe);
62804- pipe->waiting_writers--;
62805+ atomic_dec(&pipe->waiting_writers);
62806 }
62807 out:
62808 __pipe_unlock(pipe);
62809@@ -609,7 +609,7 @@ pipe_poll(struct file *filp, poll_table *wait)
62810 mask = 0;
62811 if (filp->f_mode & FMODE_READ) {
62812 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
62813- if (!pipe->writers && filp->f_version != pipe->w_counter)
62814+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
62815 mask |= POLLHUP;
62816 }
62817
62818@@ -619,7 +619,7 @@ pipe_poll(struct file *filp, poll_table *wait)
62819 * Most Unices do not set POLLERR for FIFOs but on Linux they
62820 * behave exactly like pipes for poll().
62821 */
62822- if (!pipe->readers)
62823+ if (!atomic_read(&pipe->readers))
62824 mask |= POLLERR;
62825 }
62826
62827@@ -631,7 +631,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
62828 int kill = 0;
62829
62830 spin_lock(&inode->i_lock);
62831- if (!--pipe->files) {
62832+ if (atomic_dec_and_test(&pipe->files)) {
62833 inode->i_pipe = NULL;
62834 kill = 1;
62835 }
62836@@ -648,11 +648,11 @@ pipe_release(struct inode *inode, struct file *file)
62837
62838 __pipe_lock(pipe);
62839 if (file->f_mode & FMODE_READ)
62840- pipe->readers--;
62841+ atomic_dec(&pipe->readers);
62842 if (file->f_mode & FMODE_WRITE)
62843- pipe->writers--;
62844+ atomic_dec(&pipe->writers);
62845
62846- if (pipe->readers || pipe->writers) {
62847+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
62848 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
62849 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
62850 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
62851@@ -717,7 +717,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
62852 kfree(pipe);
62853 }
62854
62855-static struct vfsmount *pipe_mnt __read_mostly;
62856+struct vfsmount *pipe_mnt __read_mostly;
62857
62858 /*
62859 * pipefs_dname() is called from d_path().
62860@@ -747,8 +747,9 @@ static struct inode * get_pipe_inode(void)
62861 goto fail_iput;
62862
62863 inode->i_pipe = pipe;
62864- pipe->files = 2;
62865- pipe->readers = pipe->writers = 1;
62866+ atomic_set(&pipe->files, 2);
62867+ atomic_set(&pipe->readers, 1);
62868+ atomic_set(&pipe->writers, 1);
62869 inode->i_fop = &pipefifo_fops;
62870
62871 /*
62872@@ -927,17 +928,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
62873 spin_lock(&inode->i_lock);
62874 if (inode->i_pipe) {
62875 pipe = inode->i_pipe;
62876- pipe->files++;
62877+ atomic_inc(&pipe->files);
62878 spin_unlock(&inode->i_lock);
62879 } else {
62880 spin_unlock(&inode->i_lock);
62881 pipe = alloc_pipe_info();
62882 if (!pipe)
62883 return -ENOMEM;
62884- pipe->files = 1;
62885+ atomic_set(&pipe->files, 1);
62886 spin_lock(&inode->i_lock);
62887 if (unlikely(inode->i_pipe)) {
62888- inode->i_pipe->files++;
62889+ atomic_inc(&inode->i_pipe->files);
62890 spin_unlock(&inode->i_lock);
62891 free_pipe_info(pipe);
62892 pipe = inode->i_pipe;
62893@@ -962,10 +963,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
62894 * opened, even when there is no process writing the FIFO.
62895 */
62896 pipe->r_counter++;
62897- if (pipe->readers++ == 0)
62898+ if (atomic_inc_return(&pipe->readers) == 1)
62899 wake_up_partner(pipe);
62900
62901- if (!is_pipe && !pipe->writers) {
62902+ if (!is_pipe && !atomic_read(&pipe->writers)) {
62903 if ((filp->f_flags & O_NONBLOCK)) {
62904 /* suppress POLLHUP until we have
62905 * seen a writer */
62906@@ -984,14 +985,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
62907 * errno=ENXIO when there is no process reading the FIFO.
62908 */
62909 ret = -ENXIO;
62910- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
62911+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
62912 goto err;
62913
62914 pipe->w_counter++;
62915- if (!pipe->writers++)
62916+ if (atomic_inc_return(&pipe->writers) == 1)
62917 wake_up_partner(pipe);
62918
62919- if (!is_pipe && !pipe->readers) {
62920+ if (!is_pipe && !atomic_read(&pipe->readers)) {
62921 if (wait_for_partner(pipe, &pipe->r_counter))
62922 goto err_wr;
62923 }
62924@@ -1005,11 +1006,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
62925 * the process can at least talk to itself.
62926 */
62927
62928- pipe->readers++;
62929- pipe->writers++;
62930+ atomic_inc(&pipe->readers);
62931+ atomic_inc(&pipe->writers);
62932 pipe->r_counter++;
62933 pipe->w_counter++;
62934- if (pipe->readers == 1 || pipe->writers == 1)
62935+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
62936 wake_up_partner(pipe);
62937 break;
62938
62939@@ -1023,13 +1024,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
62940 return 0;
62941
62942 err_rd:
62943- if (!--pipe->readers)
62944+ if (atomic_dec_and_test(&pipe->readers))
62945 wake_up_interruptible(&pipe->wait);
62946 ret = -ERESTARTSYS;
62947 goto err;
62948
62949 err_wr:
62950- if (!--pipe->writers)
62951+ if (atomic_dec_and_test(&pipe->writers))
62952 wake_up_interruptible(&pipe->wait);
62953 ret = -ERESTARTSYS;
62954 goto err;
62955diff --git a/fs/posix_acl.c b/fs/posix_acl.c
62956index 0855f77..6787d50 100644
62957--- a/fs/posix_acl.c
62958+++ b/fs/posix_acl.c
62959@@ -20,6 +20,7 @@
62960 #include <linux/xattr.h>
62961 #include <linux/export.h>
62962 #include <linux/user_namespace.h>
62963+#include <linux/grsecurity.h>
62964
62965 struct posix_acl **acl_by_type(struct inode *inode, int type)
62966 {
62967@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
62968 }
62969 }
62970 if (mode_p)
62971- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
62972+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
62973 return not_equiv;
62974 }
62975 EXPORT_SYMBOL(posix_acl_equiv_mode);
62976@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
62977 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
62978 }
62979
62980- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
62981+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
62982 return not_equiv;
62983 }
62984
62985@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
62986 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
62987 int err = -ENOMEM;
62988 if (clone) {
62989+ *mode_p &= ~gr_acl_umask();
62990+
62991 err = posix_acl_create_masq(clone, mode_p);
62992 if (err < 0) {
62993 posix_acl_release(clone);
62994@@ -659,11 +662,12 @@ struct posix_acl *
62995 posix_acl_from_xattr(struct user_namespace *user_ns,
62996 const void *value, size_t size)
62997 {
62998- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
62999- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
63000+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
63001+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
63002 int count;
63003 struct posix_acl *acl;
63004 struct posix_acl_entry *acl_e;
63005+ umode_t umask = gr_acl_umask();
63006
63007 if (!value)
63008 return NULL;
63009@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
63010
63011 switch(acl_e->e_tag) {
63012 case ACL_USER_OBJ:
63013+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
63014+ break;
63015 case ACL_GROUP_OBJ:
63016 case ACL_MASK:
63017+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
63018+ break;
63019 case ACL_OTHER:
63020+ acl_e->e_perm &= ~(umask & S_IRWXO);
63021 break;
63022
63023 case ACL_USER:
63024+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
63025 acl_e->e_uid =
63026 make_kuid(user_ns,
63027 le32_to_cpu(entry->e_id));
63028@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
63029 goto fail;
63030 break;
63031 case ACL_GROUP:
63032+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
63033 acl_e->e_gid =
63034 make_kgid(user_ns,
63035 le32_to_cpu(entry->e_id));
63036diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
63037index 2183fcf..3c32a98 100644
63038--- a/fs/proc/Kconfig
63039+++ b/fs/proc/Kconfig
63040@@ -30,7 +30,7 @@ config PROC_FS
63041
63042 config PROC_KCORE
63043 bool "/proc/kcore support" if !ARM
63044- depends on PROC_FS && MMU
63045+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
63046 help
63047 Provides a virtual ELF core file of the live kernel. This can
63048 be read with gdb and other ELF tools. No modifications can be
63049@@ -38,8 +38,8 @@ config PROC_KCORE
63050
63051 config PROC_VMCORE
63052 bool "/proc/vmcore support"
63053- depends on PROC_FS && CRASH_DUMP
63054- default y
63055+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
63056+ default n
63057 help
63058 Exports the dump image of crashed kernel in ELF format.
63059
63060@@ -63,8 +63,8 @@ config PROC_SYSCTL
63061 limited in memory.
63062
63063 config PROC_PAGE_MONITOR
63064- default y
63065- depends on PROC_FS && MMU
63066+ default n
63067+ depends on PROC_FS && MMU && !GRKERNSEC
63068 bool "Enable /proc page monitoring" if EXPERT
63069 help
63070 Various /proc files exist to monitor process memory utilization:
63071diff --git a/fs/proc/array.c b/fs/proc/array.c
63072index 64db2bc..a8185d6 100644
63073--- a/fs/proc/array.c
63074+++ b/fs/proc/array.c
63075@@ -60,6 +60,7 @@
63076 #include <linux/tty.h>
63077 #include <linux/string.h>
63078 #include <linux/mman.h>
63079+#include <linux/grsecurity.h>
63080 #include <linux/proc_fs.h>
63081 #include <linux/ioport.h>
63082 #include <linux/uaccess.h>
63083@@ -356,6 +357,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
63084 seq_putc(m, '\n');
63085 }
63086
63087+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63088+static inline void task_pax(struct seq_file *m, struct task_struct *p)
63089+{
63090+ if (p->mm)
63091+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
63092+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
63093+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
63094+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
63095+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
63096+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
63097+ else
63098+ seq_printf(m, "PaX:\t-----\n");
63099+}
63100+#endif
63101+
63102 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
63103 struct pid *pid, struct task_struct *task)
63104 {
63105@@ -374,9 +390,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
63106 task_cpus_allowed(m, task);
63107 cpuset_task_status_allowed(m, task);
63108 task_context_switch_counts(m, task);
63109+
63110+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63111+ task_pax(m, task);
63112+#endif
63113+
63114+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
63115+ task_grsec_rbac(m, task);
63116+#endif
63117+
63118 return 0;
63119 }
63120
63121+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63122+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
63123+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
63124+ _mm->pax_flags & MF_PAX_SEGMEXEC))
63125+#endif
63126+
63127 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63128 struct pid *pid, struct task_struct *task, int whole)
63129 {
63130@@ -398,6 +429,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63131 char tcomm[sizeof(task->comm)];
63132 unsigned long flags;
63133
63134+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63135+ if (current->exec_id != m->exec_id) {
63136+ gr_log_badprocpid("stat");
63137+ return 0;
63138+ }
63139+#endif
63140+
63141 state = *get_task_state(task);
63142 vsize = eip = esp = 0;
63143 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
63144@@ -468,6 +506,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63145 gtime = task_gtime(task);
63146 }
63147
63148+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63149+ if (PAX_RAND_FLAGS(mm)) {
63150+ eip = 0;
63151+ esp = 0;
63152+ wchan = 0;
63153+ }
63154+#endif
63155+#ifdef CONFIG_GRKERNSEC_HIDESYM
63156+ wchan = 0;
63157+ eip =0;
63158+ esp =0;
63159+#endif
63160+
63161 /* scale priority and nice values from timeslices to -20..20 */
63162 /* to make it look like a "normal" Unix priority/nice value */
63163 priority = task_prio(task);
63164@@ -504,9 +555,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63165 seq_put_decimal_ull(m, ' ', vsize);
63166 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
63167 seq_put_decimal_ull(m, ' ', rsslim);
63168+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63169+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
63170+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
63171+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
63172+#else
63173 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
63174 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
63175 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
63176+#endif
63177 seq_put_decimal_ull(m, ' ', esp);
63178 seq_put_decimal_ull(m, ' ', eip);
63179 /* The signal information here is obsolete.
63180@@ -528,7 +585,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
63181 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
63182 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
63183
63184- if (mm && permitted) {
63185+ if (mm && permitted
63186+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63187+ && !PAX_RAND_FLAGS(mm)
63188+#endif
63189+ ) {
63190 seq_put_decimal_ull(m, ' ', mm->start_data);
63191 seq_put_decimal_ull(m, ' ', mm->end_data);
63192 seq_put_decimal_ull(m, ' ', mm->start_brk);
63193@@ -566,8 +627,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
63194 struct pid *pid, struct task_struct *task)
63195 {
63196 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
63197- struct mm_struct *mm = get_task_mm(task);
63198+ struct mm_struct *mm;
63199
63200+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63201+ if (current->exec_id != m->exec_id) {
63202+ gr_log_badprocpid("statm");
63203+ return 0;
63204+ }
63205+#endif
63206+ mm = get_task_mm(task);
63207 if (mm) {
63208 size = task_statm(mm, &shared, &text, &data, &resident);
63209 mmput(mm);
63210@@ -590,6 +658,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
63211 return 0;
63212 }
63213
63214+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63215+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
63216+{
63217+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
63218+}
63219+#endif
63220+
63221 #ifdef CONFIG_CHECKPOINT_RESTORE
63222 static struct pid *
63223 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
63224diff --git a/fs/proc/base.c b/fs/proc/base.c
63225index 2d696b0..b9da447 100644
63226--- a/fs/proc/base.c
63227+++ b/fs/proc/base.c
63228@@ -113,6 +113,14 @@ struct pid_entry {
63229 union proc_op op;
63230 };
63231
63232+struct getdents_callback {
63233+ struct linux_dirent __user * current_dir;
63234+ struct linux_dirent __user * previous;
63235+ struct file * file;
63236+ int count;
63237+ int error;
63238+};
63239+
63240 #define NOD(NAME, MODE, IOP, FOP, OP) { \
63241 .name = (NAME), \
63242 .len = sizeof(NAME) - 1, \
63243@@ -205,12 +213,28 @@ static int proc_pid_cmdline(struct task_struct *task, char *buffer)
63244 return get_cmdline(task, buffer, PAGE_SIZE);
63245 }
63246
63247+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63248+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
63249+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
63250+ _mm->pax_flags & MF_PAX_SEGMEXEC))
63251+#endif
63252+
63253 static int proc_pid_auxv(struct task_struct *task, char *buffer)
63254 {
63255 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
63256 int res = PTR_ERR(mm);
63257 if (mm && !IS_ERR(mm)) {
63258 unsigned int nwords = 0;
63259+
63260+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63261+ /* allow if we're currently ptracing this task */
63262+ if (PAX_RAND_FLAGS(mm) &&
63263+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
63264+ mmput(mm);
63265+ return 0;
63266+ }
63267+#endif
63268+
63269 do {
63270 nwords += 2;
63271 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
63272@@ -224,7 +248,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
63273 }
63274
63275
63276-#ifdef CONFIG_KALLSYMS
63277+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63278 /*
63279 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
63280 * Returns the resolved symbol. If that fails, simply return the address.
63281@@ -263,7 +287,7 @@ static void unlock_trace(struct task_struct *task)
63282 mutex_unlock(&task->signal->cred_guard_mutex);
63283 }
63284
63285-#ifdef CONFIG_STACKTRACE
63286+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63287
63288 #define MAX_STACK_TRACE_DEPTH 64
63289
63290@@ -486,7 +510,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
63291 return count;
63292 }
63293
63294-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63295+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63296 static int proc_pid_syscall(struct task_struct *task, char *buffer)
63297 {
63298 long nr;
63299@@ -515,7 +539,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
63300 /************************************************************************/
63301
63302 /* permission checks */
63303-static int proc_fd_access_allowed(struct inode *inode)
63304+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
63305 {
63306 struct task_struct *task;
63307 int allowed = 0;
63308@@ -525,7 +549,10 @@ static int proc_fd_access_allowed(struct inode *inode)
63309 */
63310 task = get_proc_task(inode);
63311 if (task) {
63312- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
63313+ if (log)
63314+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
63315+ else
63316+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
63317 put_task_struct(task);
63318 }
63319 return allowed;
63320@@ -556,10 +583,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
63321 struct task_struct *task,
63322 int hide_pid_min)
63323 {
63324+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63325+ return false;
63326+
63327+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63328+ rcu_read_lock();
63329+ {
63330+ const struct cred *tmpcred = current_cred();
63331+ const struct cred *cred = __task_cred(task);
63332+
63333+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
63334+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63335+ || in_group_p(grsec_proc_gid)
63336+#endif
63337+ ) {
63338+ rcu_read_unlock();
63339+ return true;
63340+ }
63341+ }
63342+ rcu_read_unlock();
63343+
63344+ if (!pid->hide_pid)
63345+ return false;
63346+#endif
63347+
63348 if (pid->hide_pid < hide_pid_min)
63349 return true;
63350 if (in_group_p(pid->pid_gid))
63351 return true;
63352+
63353 return ptrace_may_access(task, PTRACE_MODE_READ);
63354 }
63355
63356@@ -577,7 +629,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
63357 put_task_struct(task);
63358
63359 if (!has_perms) {
63360+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63361+ {
63362+#else
63363 if (pid->hide_pid == 2) {
63364+#endif
63365 /*
63366 * Let's make getdents(), stat(), and open()
63367 * consistent with each other. If a process
63368@@ -675,6 +731,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
63369 if (!task)
63370 return -ESRCH;
63371
63372+ if (gr_acl_handle_procpidmem(task)) {
63373+ put_task_struct(task);
63374+ return -EPERM;
63375+ }
63376+
63377 mm = mm_access(task, mode);
63378 put_task_struct(task);
63379
63380@@ -690,6 +751,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
63381
63382 file->private_data = mm;
63383
63384+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63385+ file->f_version = current->exec_id;
63386+#endif
63387+
63388 return 0;
63389 }
63390
63391@@ -711,6 +776,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
63392 ssize_t copied;
63393 char *page;
63394
63395+#ifdef CONFIG_GRKERNSEC
63396+ if (write)
63397+ return -EPERM;
63398+#endif
63399+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63400+ if (file->f_version != current->exec_id) {
63401+ gr_log_badprocpid("mem");
63402+ return 0;
63403+ }
63404+#endif
63405+
63406 if (!mm)
63407 return 0;
63408
63409@@ -723,7 +799,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
63410 goto free;
63411
63412 while (count > 0) {
63413- int this_len = min_t(int, count, PAGE_SIZE);
63414+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
63415
63416 if (write && copy_from_user(page, buf, this_len)) {
63417 copied = -EFAULT;
63418@@ -815,6 +891,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
63419 if (!mm)
63420 return 0;
63421
63422+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63423+ if (file->f_version != current->exec_id) {
63424+ gr_log_badprocpid("environ");
63425+ return 0;
63426+ }
63427+#endif
63428+
63429 page = (char *)__get_free_page(GFP_TEMPORARY);
63430 if (!page)
63431 return -ENOMEM;
63432@@ -824,7 +907,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
63433 goto free;
63434 while (count > 0) {
63435 size_t this_len, max_len;
63436- int retval;
63437+ ssize_t retval;
63438
63439 if (src >= (mm->env_end - mm->env_start))
63440 break;
63441@@ -1438,7 +1521,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
63442 int error = -EACCES;
63443
63444 /* Are we allowed to snoop on the tasks file descriptors? */
63445- if (!proc_fd_access_allowed(inode))
63446+ if (!proc_fd_access_allowed(inode, 0))
63447 goto out;
63448
63449 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
63450@@ -1482,8 +1565,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
63451 struct path path;
63452
63453 /* Are we allowed to snoop on the tasks file descriptors? */
63454- if (!proc_fd_access_allowed(inode))
63455- goto out;
63456+ /* logging this is needed for learning on chromium to work properly,
63457+ but we don't want to flood the logs from 'ps' which does a readlink
63458+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
63459+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
63460+ */
63461+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
63462+ if (!proc_fd_access_allowed(inode,0))
63463+ goto out;
63464+ } else {
63465+ if (!proc_fd_access_allowed(inode,1))
63466+ goto out;
63467+ }
63468
63469 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
63470 if (error)
63471@@ -1533,7 +1626,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
63472 rcu_read_lock();
63473 cred = __task_cred(task);
63474 inode->i_uid = cred->euid;
63475+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63476+ inode->i_gid = grsec_proc_gid;
63477+#else
63478 inode->i_gid = cred->egid;
63479+#endif
63480 rcu_read_unlock();
63481 }
63482 security_task_to_inode(task, inode);
63483@@ -1569,10 +1666,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
63484 return -ENOENT;
63485 }
63486 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
63487+#ifdef CONFIG_GRKERNSEC_PROC_USER
63488+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
63489+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63490+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
63491+#endif
63492 task_dumpable(task)) {
63493 cred = __task_cred(task);
63494 stat->uid = cred->euid;
63495+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63496+ stat->gid = grsec_proc_gid;
63497+#else
63498 stat->gid = cred->egid;
63499+#endif
63500 }
63501 }
63502 rcu_read_unlock();
63503@@ -1610,11 +1716,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
63504
63505 if (task) {
63506 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
63507+#ifdef CONFIG_GRKERNSEC_PROC_USER
63508+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
63509+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63510+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
63511+#endif
63512 task_dumpable(task)) {
63513 rcu_read_lock();
63514 cred = __task_cred(task);
63515 inode->i_uid = cred->euid;
63516+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63517+ inode->i_gid = grsec_proc_gid;
63518+#else
63519 inode->i_gid = cred->egid;
63520+#endif
63521 rcu_read_unlock();
63522 } else {
63523 inode->i_uid = GLOBAL_ROOT_UID;
63524@@ -2149,6 +2264,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
63525 if (!task)
63526 goto out_no_task;
63527
63528+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63529+ goto out;
63530+
63531 /*
63532 * Yes, it does not scale. And it should not. Don't add
63533 * new entries into /proc/<tgid>/ without very good reasons.
63534@@ -2179,6 +2297,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
63535 if (!task)
63536 return -ENOENT;
63537
63538+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63539+ goto out;
63540+
63541 if (!dir_emit_dots(file, ctx))
63542 goto out;
63543
63544@@ -2568,7 +2689,7 @@ static const struct pid_entry tgid_base_stuff[] = {
63545 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
63546 #endif
63547 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
63548-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63549+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63550 INF("syscall", S_IRUSR, proc_pid_syscall),
63551 #endif
63552 INF("cmdline", S_IRUGO, proc_pid_cmdline),
63553@@ -2593,10 +2714,10 @@ static const struct pid_entry tgid_base_stuff[] = {
63554 #ifdef CONFIG_SECURITY
63555 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
63556 #endif
63557-#ifdef CONFIG_KALLSYMS
63558+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63559 INF("wchan", S_IRUGO, proc_pid_wchan),
63560 #endif
63561-#ifdef CONFIG_STACKTRACE
63562+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63563 ONE("stack", S_IRUSR, proc_pid_stack),
63564 #endif
63565 #ifdef CONFIG_SCHEDSTATS
63566@@ -2630,6 +2751,9 @@ static const struct pid_entry tgid_base_stuff[] = {
63567 #ifdef CONFIG_HARDWALL
63568 INF("hardwall", S_IRUGO, proc_pid_hardwall),
63569 #endif
63570+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63571+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
63572+#endif
63573 #ifdef CONFIG_USER_NS
63574 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
63575 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
63576@@ -2760,7 +2884,14 @@ static int proc_pid_instantiate(struct inode *dir,
63577 if (!inode)
63578 goto out;
63579
63580+#ifdef CONFIG_GRKERNSEC_PROC_USER
63581+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
63582+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63583+ inode->i_gid = grsec_proc_gid;
63584+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
63585+#else
63586 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
63587+#endif
63588 inode->i_op = &proc_tgid_base_inode_operations;
63589 inode->i_fop = &proc_tgid_base_operations;
63590 inode->i_flags|=S_IMMUTABLE;
63591@@ -2798,7 +2929,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
63592 if (!task)
63593 goto out;
63594
63595+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
63596+ goto out_put_task;
63597+
63598 result = proc_pid_instantiate(dir, dentry, task, NULL);
63599+out_put_task:
63600 put_task_struct(task);
63601 out:
63602 return ERR_PTR(result);
63603@@ -2904,7 +3039,7 @@ static const struct pid_entry tid_base_stuff[] = {
63604 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
63605 #endif
63606 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
63607-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
63608+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
63609 INF("syscall", S_IRUSR, proc_pid_syscall),
63610 #endif
63611 INF("cmdline", S_IRUGO, proc_pid_cmdline),
63612@@ -2931,10 +3066,10 @@ static const struct pid_entry tid_base_stuff[] = {
63613 #ifdef CONFIG_SECURITY
63614 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
63615 #endif
63616-#ifdef CONFIG_KALLSYMS
63617+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63618 INF("wchan", S_IRUGO, proc_pid_wchan),
63619 #endif
63620-#ifdef CONFIG_STACKTRACE
63621+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63622 ONE("stack", S_IRUSR, proc_pid_stack),
63623 #endif
63624 #ifdef CONFIG_SCHEDSTATS
63625diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
63626index cbd82df..c0407d2 100644
63627--- a/fs/proc/cmdline.c
63628+++ b/fs/proc/cmdline.c
63629@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
63630
63631 static int __init proc_cmdline_init(void)
63632 {
63633+#ifdef CONFIG_GRKERNSEC_PROC_ADD
63634+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
63635+#else
63636 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
63637+#endif
63638 return 0;
63639 }
63640 fs_initcall(proc_cmdline_init);
63641diff --git a/fs/proc/devices.c b/fs/proc/devices.c
63642index 50493ed..248166b 100644
63643--- a/fs/proc/devices.c
63644+++ b/fs/proc/devices.c
63645@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
63646
63647 static int __init proc_devices_init(void)
63648 {
63649+#ifdef CONFIG_GRKERNSEC_PROC_ADD
63650+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
63651+#else
63652 proc_create("devices", 0, NULL, &proc_devinfo_operations);
63653+#endif
63654 return 0;
63655 }
63656 fs_initcall(proc_devices_init);
63657diff --git a/fs/proc/fd.c b/fs/proc/fd.c
63658index 0788d09..9cc1385 100644
63659--- a/fs/proc/fd.c
63660+++ b/fs/proc/fd.c
63661@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
63662 if (!task)
63663 return -ENOENT;
63664
63665- files = get_files_struct(task);
63666+ if (!gr_acl_handle_procpidmem(task))
63667+ files = get_files_struct(task);
63668 put_task_struct(task);
63669
63670 if (files) {
63671@@ -285,11 +286,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
63672 */
63673 int proc_fd_permission(struct inode *inode, int mask)
63674 {
63675+ struct task_struct *task;
63676 int rv = generic_permission(inode, mask);
63677- if (rv == 0)
63678- return 0;
63679+
63680 if (task_tgid(current) == proc_pid(inode))
63681 rv = 0;
63682+
63683+ task = get_proc_task(inode);
63684+ if (task == NULL)
63685+ return rv;
63686+
63687+ if (gr_acl_handle_procpidmem(task))
63688+ rv = -EACCES;
63689+
63690+ put_task_struct(task);
63691+
63692 return rv;
63693 }
63694
63695diff --git a/fs/proc/generic.c b/fs/proc/generic.c
63696index b7f268e..3bea6b7 100644
63697--- a/fs/proc/generic.c
63698+++ b/fs/proc/generic.c
63699@@ -23,6 +23,7 @@
63700 #include <linux/bitops.h>
63701 #include <linux/spinlock.h>
63702 #include <linux/completion.h>
63703+#include <linux/grsecurity.h>
63704 #include <asm/uaccess.h>
63705
63706 #include "internal.h"
63707@@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
63708 return proc_lookup_de(PDE(dir), dir, dentry);
63709 }
63710
63711+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
63712+ unsigned int flags)
63713+{
63714+ if (gr_proc_is_restricted())
63715+ return ERR_PTR(-EACCES);
63716+
63717+ return proc_lookup_de(PDE(dir), dir, dentry);
63718+}
63719+
63720 /*
63721 * This returns non-zero if at EOF, so that the /proc
63722 * root directory can use this and check if it should
63723@@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
63724 return proc_readdir_de(PDE(inode), file, ctx);
63725 }
63726
63727+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
63728+{
63729+ struct inode *inode = file_inode(file);
63730+
63731+ if (gr_proc_is_restricted())
63732+ return -EACCES;
63733+
63734+ return proc_readdir_de(PDE(inode), file, ctx);
63735+}
63736+
63737 /*
63738 * These are the generic /proc directory operations. They
63739 * use the in-memory "struct proc_dir_entry" tree to parse
63740@@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
63741 .iterate = proc_readdir,
63742 };
63743
63744+static const struct file_operations proc_dir_restricted_operations = {
63745+ .llseek = generic_file_llseek,
63746+ .read = generic_read_dir,
63747+ .iterate = proc_readdir_restrict,
63748+};
63749+
63750 /*
63751 * proc directories can do almost nothing..
63752 */
63753@@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
63754 .setattr = proc_notify_change,
63755 };
63756
63757+static const struct inode_operations proc_dir_restricted_inode_operations = {
63758+ .lookup = proc_lookup_restrict,
63759+ .getattr = proc_getattr,
63760+ .setattr = proc_notify_change,
63761+};
63762+
63763 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
63764 {
63765 struct proc_dir_entry *tmp;
63766@@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
63767 return ret;
63768
63769 if (S_ISDIR(dp->mode)) {
63770- dp->proc_fops = &proc_dir_operations;
63771- dp->proc_iops = &proc_dir_inode_operations;
63772+ if (dp->restricted) {
63773+ dp->proc_fops = &proc_dir_restricted_operations;
63774+ dp->proc_iops = &proc_dir_restricted_inode_operations;
63775+ } else {
63776+ dp->proc_fops = &proc_dir_operations;
63777+ dp->proc_iops = &proc_dir_inode_operations;
63778+ }
63779 dir->nlink++;
63780 } else if (S_ISLNK(dp->mode)) {
63781 dp->proc_iops = &proc_link_inode_operations;
63782@@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
63783 }
63784 EXPORT_SYMBOL_GPL(proc_mkdir_data);
63785
63786+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
63787+ struct proc_dir_entry *parent, void *data)
63788+{
63789+ struct proc_dir_entry *ent;
63790+
63791+ if (mode == 0)
63792+ mode = S_IRUGO | S_IXUGO;
63793+
63794+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
63795+ if (ent) {
63796+ ent->data = data;
63797+ ent->restricted = 1;
63798+ if (proc_register(parent, ent) < 0) {
63799+ kfree(ent);
63800+ ent = NULL;
63801+ }
63802+ }
63803+ return ent;
63804+}
63805+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
63806+
63807 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
63808 struct proc_dir_entry *parent)
63809 {
63810@@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
63811 }
63812 EXPORT_SYMBOL(proc_mkdir);
63813
63814+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
63815+ struct proc_dir_entry *parent)
63816+{
63817+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
63818+}
63819+EXPORT_SYMBOL(proc_mkdir_restrict);
63820+
63821 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
63822 struct proc_dir_entry *parent,
63823 const struct file_operations *proc_fops,
63824diff --git a/fs/proc/inode.c b/fs/proc/inode.c
63825index 0adbc02..bee4d0b 100644
63826--- a/fs/proc/inode.c
63827+++ b/fs/proc/inode.c
63828@@ -23,11 +23,17 @@
63829 #include <linux/slab.h>
63830 #include <linux/mount.h>
63831 #include <linux/magic.h>
63832+#include <linux/grsecurity.h>
63833
63834 #include <asm/uaccess.h>
63835
63836 #include "internal.h"
63837
63838+#ifdef CONFIG_PROC_SYSCTL
63839+extern const struct inode_operations proc_sys_inode_operations;
63840+extern const struct inode_operations proc_sys_dir_operations;
63841+#endif
63842+
63843 static void proc_evict_inode(struct inode *inode)
63844 {
63845 struct proc_dir_entry *de;
63846@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
63847 ns = PROC_I(inode)->ns.ns;
63848 if (ns_ops && ns)
63849 ns_ops->put(ns);
63850+
63851+#ifdef CONFIG_PROC_SYSCTL
63852+ if (inode->i_op == &proc_sys_inode_operations ||
63853+ inode->i_op == &proc_sys_dir_operations)
63854+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
63855+#endif
63856+
63857 }
63858
63859 static struct kmem_cache * proc_inode_cachep;
63860@@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
63861 if (de->mode) {
63862 inode->i_mode = de->mode;
63863 inode->i_uid = de->uid;
63864+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63865+ inode->i_gid = grsec_proc_gid;
63866+#else
63867 inode->i_gid = de->gid;
63868+#endif
63869 }
63870 if (de->size)
63871 inode->i_size = de->size;
63872diff --git a/fs/proc/internal.h b/fs/proc/internal.h
63873index 3ab6d14..b26174e 100644
63874--- a/fs/proc/internal.h
63875+++ b/fs/proc/internal.h
63876@@ -46,9 +46,10 @@ struct proc_dir_entry {
63877 struct completion *pde_unload_completion;
63878 struct list_head pde_openers; /* who did ->open, but not ->release */
63879 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
63880+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
63881 u8 namelen;
63882 char name[];
63883-};
63884+} __randomize_layout;
63885
63886 union proc_op {
63887 int (*proc_get_link)(struct dentry *, struct path *);
63888@@ -67,7 +68,7 @@ struct proc_inode {
63889 struct ctl_table *sysctl_entry;
63890 struct proc_ns ns;
63891 struct inode vfs_inode;
63892-};
63893+} __randomize_layout;
63894
63895 /*
63896 * General functions
63897@@ -155,6 +156,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
63898 struct pid *, struct task_struct *);
63899 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
63900 struct pid *, struct task_struct *);
63901+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
63902+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
63903+#endif
63904
63905 /*
63906 * base.c
63907@@ -181,9 +185,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
63908 extern spinlock_t proc_subdir_lock;
63909
63910 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
63911+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
63912 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
63913 struct dentry *);
63914 extern int proc_readdir(struct file *, struct dir_context *);
63915+extern int proc_readdir_restrict(struct file *, struct dir_context *);
63916 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
63917
63918 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
63919diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
63920index a352d57..cb94a5c 100644
63921--- a/fs/proc/interrupts.c
63922+++ b/fs/proc/interrupts.c
63923@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
63924
63925 static int __init proc_interrupts_init(void)
63926 {
63927+#ifdef CONFIG_GRKERNSEC_PROC_ADD
63928+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
63929+#else
63930 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
63931+#endif
63932 return 0;
63933 }
63934 fs_initcall(proc_interrupts_init);
63935diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
63936index 39e6ef3..2f9cb5e 100644
63937--- a/fs/proc/kcore.c
63938+++ b/fs/proc/kcore.c
63939@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
63940 * the addresses in the elf_phdr on our list.
63941 */
63942 start = kc_offset_to_vaddr(*fpos - elf_buflen);
63943- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
63944+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
63945+ if (tsz > buflen)
63946 tsz = buflen;
63947-
63948+
63949 while (buflen) {
63950 struct kcore_list *m;
63951
63952@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
63953 kfree(elf_buf);
63954 } else {
63955 if (kern_addr_valid(start)) {
63956- unsigned long n;
63957+ char *elf_buf;
63958+ mm_segment_t oldfs;
63959
63960- n = copy_to_user(buffer, (char *)start, tsz);
63961- /*
63962- * We cannot distinguish between fault on source
63963- * and fault on destination. When this happens
63964- * we clear too and hope it will trigger the
63965- * EFAULT again.
63966- */
63967- if (n) {
63968- if (clear_user(buffer + tsz - n,
63969- n))
63970+ elf_buf = kmalloc(tsz, GFP_KERNEL);
63971+ if (!elf_buf)
63972+ return -ENOMEM;
63973+ oldfs = get_fs();
63974+ set_fs(KERNEL_DS);
63975+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
63976+ set_fs(oldfs);
63977+ if (copy_to_user(buffer, elf_buf, tsz)) {
63978+ kfree(elf_buf);
63979 return -EFAULT;
63980+ }
63981 }
63982+ set_fs(oldfs);
63983+ kfree(elf_buf);
63984 } else {
63985 if (clear_user(buffer, tsz))
63986 return -EFAULT;
63987@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
63988
63989 static int open_kcore(struct inode *inode, struct file *filp)
63990 {
63991+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
63992+ return -EPERM;
63993+#endif
63994 if (!capable(CAP_SYS_RAWIO))
63995 return -EPERM;
63996 if (kcore_need_update)
63997diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
63998index 7445af0..7c5113c 100644
63999--- a/fs/proc/meminfo.c
64000+++ b/fs/proc/meminfo.c
64001@@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
64002 vmi.used >> 10,
64003 vmi.largest_chunk >> 10
64004 #ifdef CONFIG_MEMORY_FAILURE
64005- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
64006+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
64007 #endif
64008 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
64009 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
64010diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
64011index d4a3574..b421ce9 100644
64012--- a/fs/proc/nommu.c
64013+++ b/fs/proc/nommu.c
64014@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
64015
64016 if (file) {
64017 seq_pad(m, ' ');
64018- seq_path(m, &file->f_path, "");
64019+ seq_path(m, &file->f_path, "\n\\");
64020 }
64021
64022 seq_putc(m, '\n');
64023diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
64024index 4677bb7..94067cd 100644
64025--- a/fs/proc/proc_net.c
64026+++ b/fs/proc/proc_net.c
64027@@ -23,6 +23,7 @@
64028 #include <linux/nsproxy.h>
64029 #include <net/net_namespace.h>
64030 #include <linux/seq_file.h>
64031+#include <linux/grsecurity.h>
64032
64033 #include "internal.h"
64034
64035@@ -36,6 +37,8 @@ static struct net *get_proc_net(const struct inode *inode)
64036 return maybe_get_net(PDE_NET(PDE(inode)));
64037 }
64038
64039+extern const struct seq_operations dev_seq_ops;
64040+
64041 int seq_open_net(struct inode *ino, struct file *f,
64042 const struct seq_operations *ops, int size)
64043 {
64044@@ -44,6 +47,10 @@ int seq_open_net(struct inode *ino, struct file *f,
64045
64046 BUG_ON(size < sizeof(*p));
64047
64048+ /* only permit access to /proc/net/dev */
64049+ if (ops != &dev_seq_ops && gr_proc_is_restricted())
64050+ return -EACCES;
64051+
64052 net = get_proc_net(ino);
64053 if (net == NULL)
64054 return -ENXIO;
64055@@ -66,6 +73,9 @@ int single_open_net(struct inode *inode, struct file *file,
64056 int err;
64057 struct net *net;
64058
64059+ if (gr_proc_is_restricted())
64060+ return -EACCES;
64061+
64062 err = -ENXIO;
64063 net = get_proc_net(inode);
64064 if (net == NULL)
64065diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
64066index 7129046..6914844 100644
64067--- a/fs/proc/proc_sysctl.c
64068+++ b/fs/proc/proc_sysctl.c
64069@@ -11,13 +11,21 @@
64070 #include <linux/namei.h>
64071 #include <linux/mm.h>
64072 #include <linux/module.h>
64073+#include <linux/nsproxy.h>
64074+#ifdef CONFIG_GRKERNSEC
64075+#include <net/net_namespace.h>
64076+#endif
64077 #include "internal.h"
64078
64079+extern int gr_handle_chroot_sysctl(const int op);
64080+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
64081+ const int op);
64082+
64083 static const struct dentry_operations proc_sys_dentry_operations;
64084 static const struct file_operations proc_sys_file_operations;
64085-static const struct inode_operations proc_sys_inode_operations;
64086+const struct inode_operations proc_sys_inode_operations;
64087 static const struct file_operations proc_sys_dir_file_operations;
64088-static const struct inode_operations proc_sys_dir_operations;
64089+const struct inode_operations proc_sys_dir_operations;
64090
64091 void proc_sys_poll_notify(struct ctl_table_poll *poll)
64092 {
64093@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
64094
64095 err = NULL;
64096 d_set_d_op(dentry, &proc_sys_dentry_operations);
64097+
64098+ gr_handle_proc_create(dentry, inode);
64099+
64100 d_add(dentry, inode);
64101
64102 out:
64103@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
64104 struct inode *inode = file_inode(filp);
64105 struct ctl_table_header *head = grab_header(inode);
64106 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
64107+ int op = write ? MAY_WRITE : MAY_READ;
64108 ssize_t error;
64109 size_t res;
64110
64111@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
64112 * and won't be until we finish.
64113 */
64114 error = -EPERM;
64115- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
64116+ if (sysctl_perm(head, table, op))
64117 goto out;
64118
64119 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
64120@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
64121 if (!table->proc_handler)
64122 goto out;
64123
64124+#ifdef CONFIG_GRKERNSEC
64125+ error = -EPERM;
64126+ if (gr_handle_chroot_sysctl(op))
64127+ goto out;
64128+ dget(filp->f_path.dentry);
64129+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
64130+ dput(filp->f_path.dentry);
64131+ goto out;
64132+ }
64133+ dput(filp->f_path.dentry);
64134+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
64135+ goto out;
64136+ if (write) {
64137+ if (current->nsproxy->net_ns != table->extra2) {
64138+ if (!capable(CAP_SYS_ADMIN))
64139+ goto out;
64140+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
64141+ goto out;
64142+ }
64143+#endif
64144+
64145 /* careful: calling conventions are nasty here */
64146 res = count;
64147 error = table->proc_handler(table, write, buf, &res, ppos);
64148@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
64149 return false;
64150 } else {
64151 d_set_d_op(child, &proc_sys_dentry_operations);
64152+
64153+ gr_handle_proc_create(child, inode);
64154+
64155 d_add(child, inode);
64156 }
64157 } else {
64158@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
64159 if ((*pos)++ < ctx->pos)
64160 return true;
64161
64162+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
64163+ return 0;
64164+
64165 if (unlikely(S_ISLNK(table->mode)))
64166 res = proc_sys_link_fill_cache(file, ctx, head, table);
64167 else
64168@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
64169 if (IS_ERR(head))
64170 return PTR_ERR(head);
64171
64172+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
64173+ return -ENOENT;
64174+
64175 generic_fillattr(inode, stat);
64176 if (table)
64177 stat->mode = (stat->mode & S_IFMT) | table->mode;
64178@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
64179 .llseek = generic_file_llseek,
64180 };
64181
64182-static const struct inode_operations proc_sys_inode_operations = {
64183+const struct inode_operations proc_sys_inode_operations = {
64184 .permission = proc_sys_permission,
64185 .setattr = proc_sys_setattr,
64186 .getattr = proc_sys_getattr,
64187 };
64188
64189-static const struct inode_operations proc_sys_dir_operations = {
64190+const struct inode_operations proc_sys_dir_operations = {
64191 .lookup = proc_sys_lookup,
64192 .permission = proc_sys_permission,
64193 .setattr = proc_sys_setattr,
64194@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
64195 static struct ctl_dir *new_dir(struct ctl_table_set *set,
64196 const char *name, int namelen)
64197 {
64198- struct ctl_table *table;
64199+ ctl_table_no_const *table;
64200 struct ctl_dir *new;
64201 struct ctl_node *node;
64202 char *new_name;
64203@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
64204 return NULL;
64205
64206 node = (struct ctl_node *)(new + 1);
64207- table = (struct ctl_table *)(node + 1);
64208+ table = (ctl_table_no_const *)(node + 1);
64209 new_name = (char *)(table + 2);
64210 memcpy(new_name, name, namelen);
64211 new_name[namelen] = '\0';
64212@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
64213 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
64214 struct ctl_table_root *link_root)
64215 {
64216- struct ctl_table *link_table, *entry, *link;
64217+ ctl_table_no_const *link_table, *link;
64218+ struct ctl_table *entry;
64219 struct ctl_table_header *links;
64220 struct ctl_node *node;
64221 char *link_name;
64222@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
64223 return NULL;
64224
64225 node = (struct ctl_node *)(links + 1);
64226- link_table = (struct ctl_table *)(node + nr_entries);
64227+ link_table = (ctl_table_no_const *)(node + nr_entries);
64228 link_name = (char *)&link_table[nr_entries + 1];
64229
64230 for (link = link_table, entry = table; entry->procname; link++, entry++) {
64231@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64232 struct ctl_table_header ***subheader, struct ctl_table_set *set,
64233 struct ctl_table *table)
64234 {
64235- struct ctl_table *ctl_table_arg = NULL;
64236- struct ctl_table *entry, *files;
64237+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
64238+ struct ctl_table *entry;
64239 int nr_files = 0;
64240 int nr_dirs = 0;
64241 int err = -ENOMEM;
64242@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64243 nr_files++;
64244 }
64245
64246- files = table;
64247 /* If there are mixed files and directories we need a new table */
64248 if (nr_dirs && nr_files) {
64249- struct ctl_table *new;
64250+ ctl_table_no_const *new;
64251 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
64252 GFP_KERNEL);
64253 if (!files)
64254@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
64255 /* Register everything except a directory full of subdirectories */
64256 if (nr_files || !nr_dirs) {
64257 struct ctl_table_header *header;
64258- header = __register_sysctl_table(set, path, files);
64259+ header = __register_sysctl_table(set, path, files ? files : table);
64260 if (!header) {
64261 kfree(ctl_table_arg);
64262 goto out;
64263diff --git a/fs/proc/root.c b/fs/proc/root.c
64264index 5dbadec..473af2f 100644
64265--- a/fs/proc/root.c
64266+++ b/fs/proc/root.c
64267@@ -185,7 +185,15 @@ void __init proc_root_init(void)
64268 proc_mkdir("openprom", NULL);
64269 #endif
64270 proc_tty_init();
64271+#ifdef CONFIG_GRKERNSEC_PROC_ADD
64272+#ifdef CONFIG_GRKERNSEC_PROC_USER
64273+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
64274+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64275+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
64276+#endif
64277+#else
64278 proc_mkdir("bus", NULL);
64279+#endif
64280 proc_sys_init();
64281 }
64282
64283diff --git a/fs/proc/stat.c b/fs/proc/stat.c
64284index 9d231e9..2e1b51a 100644
64285--- a/fs/proc/stat.c
64286+++ b/fs/proc/stat.c
64287@@ -11,6 +11,7 @@
64288 #include <linux/irqnr.h>
64289 #include <linux/cputime.h>
64290 #include <linux/tick.h>
64291+#include <linux/grsecurity.h>
64292
64293 #ifndef arch_irq_stat_cpu
64294 #define arch_irq_stat_cpu(cpu) 0
64295@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
64296 u64 sum_softirq = 0;
64297 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
64298 struct timespec boottime;
64299+ int unrestricted = 1;
64300+
64301+#ifdef CONFIG_GRKERNSEC_PROC_ADD
64302+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64303+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
64304+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
64305+ && !in_group_p(grsec_proc_gid)
64306+#endif
64307+ )
64308+ unrestricted = 0;
64309+#endif
64310+#endif
64311
64312 user = nice = system = idle = iowait =
64313 irq = softirq = steal = 0;
64314@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
64315 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
64316 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
64317 idle += get_idle_time(i);
64318- iowait += get_iowait_time(i);
64319- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64320- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64321- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64322- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64323- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64324- sum += kstat_cpu_irqs_sum(i);
64325- sum += arch_irq_stat_cpu(i);
64326+ if (unrestricted) {
64327+ iowait += get_iowait_time(i);
64328+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64329+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64330+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64331+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64332+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64333+ sum += kstat_cpu_irqs_sum(i);
64334+ sum += arch_irq_stat_cpu(i);
64335+ for (j = 0; j < NR_SOFTIRQS; j++) {
64336+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
64337
64338- for (j = 0; j < NR_SOFTIRQS; j++) {
64339- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
64340-
64341- per_softirq_sums[j] += softirq_stat;
64342- sum_softirq += softirq_stat;
64343+ per_softirq_sums[j] += softirq_stat;
64344+ sum_softirq += softirq_stat;
64345+ }
64346 }
64347 }
64348- sum += arch_irq_stat();
64349+ if (unrestricted)
64350+ sum += arch_irq_stat();
64351
64352 seq_puts(p, "cpu ");
64353 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
64354@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
64355 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
64356 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
64357 idle = get_idle_time(i);
64358- iowait = get_iowait_time(i);
64359- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64360- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64361- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64362- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64363- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64364+ if (unrestricted) {
64365+ iowait = get_iowait_time(i);
64366+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
64367+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
64368+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
64369+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
64370+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
64371+ }
64372 seq_printf(p, "cpu%d", i);
64373 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
64374 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
64375@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
64376
64377 /* sum again ? it could be updated? */
64378 for_each_irq_nr(j)
64379- seq_put_decimal_ull(p, ' ', kstat_irqs(j));
64380+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
64381
64382 seq_printf(p,
64383 "\nctxt %llu\n"
64384@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
64385 "processes %lu\n"
64386 "procs_running %lu\n"
64387 "procs_blocked %lu\n",
64388- nr_context_switches(),
64389+ unrestricted ? nr_context_switches() : 0ULL,
64390 (unsigned long)jif,
64391- total_forks,
64392- nr_running(),
64393- nr_iowait());
64394+ unrestricted ? total_forks : 0UL,
64395+ unrestricted ? nr_running() : 0UL,
64396+ unrestricted ? nr_iowait() : 0UL);
64397
64398 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
64399
64400diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
64401index c4b2646..84f0d7b 100644
64402--- a/fs/proc/task_mmu.c
64403+++ b/fs/proc/task_mmu.c
64404@@ -13,12 +13,19 @@
64405 #include <linux/swap.h>
64406 #include <linux/swapops.h>
64407 #include <linux/mmu_notifier.h>
64408+#include <linux/grsecurity.h>
64409
64410 #include <asm/elf.h>
64411 #include <asm/uaccess.h>
64412 #include <asm/tlbflush.h>
64413 #include "internal.h"
64414
64415+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64416+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
64417+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
64418+ _mm->pax_flags & MF_PAX_SEGMEXEC))
64419+#endif
64420+
64421 void task_mem(struct seq_file *m, struct mm_struct *mm)
64422 {
64423 unsigned long data, text, lib, swap;
64424@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64425 "VmExe:\t%8lu kB\n"
64426 "VmLib:\t%8lu kB\n"
64427 "VmPTE:\t%8lu kB\n"
64428- "VmSwap:\t%8lu kB\n",
64429- hiwater_vm << (PAGE_SHIFT-10),
64430+ "VmSwap:\t%8lu kB\n"
64431+
64432+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
64433+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
64434+#endif
64435+
64436+ ,hiwater_vm << (PAGE_SHIFT-10),
64437 total_vm << (PAGE_SHIFT-10),
64438 mm->locked_vm << (PAGE_SHIFT-10),
64439 mm->pinned_vm << (PAGE_SHIFT-10),
64440@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64441 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
64442 (PTRS_PER_PTE * sizeof(pte_t) *
64443 atomic_long_read(&mm->nr_ptes)) >> 10,
64444- swap << (PAGE_SHIFT-10));
64445+ swap << (PAGE_SHIFT-10)
64446+
64447+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
64448+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64449+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
64450+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
64451+#else
64452+ , mm->context.user_cs_base
64453+ , mm->context.user_cs_limit
64454+#endif
64455+#endif
64456+
64457+ );
64458 }
64459
64460 unsigned long task_vsize(struct mm_struct *mm)
64461@@ -271,13 +295,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64462 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
64463 }
64464
64465- /* We don't show the stack guard page in /proc/maps */
64466+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64467+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
64468+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
64469+#else
64470 start = vma->vm_start;
64471- if (stack_guard_page_start(vma, start))
64472- start += PAGE_SIZE;
64473 end = vma->vm_end;
64474- if (stack_guard_page_end(vma, end))
64475- end -= PAGE_SIZE;
64476+#endif
64477
64478 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
64479 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
64480@@ -287,7 +311,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64481 flags & VM_WRITE ? 'w' : '-',
64482 flags & VM_EXEC ? 'x' : '-',
64483 flags & VM_MAYSHARE ? 's' : 'p',
64484+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64485+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
64486+#else
64487 pgoff,
64488+#endif
64489 MAJOR(dev), MINOR(dev), ino);
64490
64491 /*
64492@@ -296,7 +324,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64493 */
64494 if (file) {
64495 seq_pad(m, ' ');
64496- seq_path(m, &file->f_path, "\n");
64497+ seq_path(m, &file->f_path, "\n\\");
64498 goto done;
64499 }
64500
64501@@ -322,8 +350,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
64502 * Thread stack in /proc/PID/task/TID/maps or
64503 * the main process stack.
64504 */
64505- if (!is_pid || (vma->vm_start <= mm->start_stack &&
64506- vma->vm_end >= mm->start_stack)) {
64507+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
64508+ (vma->vm_start <= mm->start_stack &&
64509+ vma->vm_end >= mm->start_stack)) {
64510 name = "[stack]";
64511 } else {
64512 /* Thread stack in /proc/PID/maps */
64513@@ -347,6 +376,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
64514 struct proc_maps_private *priv = m->private;
64515 struct task_struct *task = priv->task;
64516
64517+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64518+ if (current->exec_id != m->exec_id) {
64519+ gr_log_badprocpid("maps");
64520+ return 0;
64521+ }
64522+#endif
64523+
64524 show_map_vma(m, vma, is_pid);
64525
64526 if (m->count < m->size) /* vma is copied successfully */
64527@@ -587,12 +623,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
64528 .private = &mss,
64529 };
64530
64531+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64532+ if (current->exec_id != m->exec_id) {
64533+ gr_log_badprocpid("smaps");
64534+ return 0;
64535+ }
64536+#endif
64537 memset(&mss, 0, sizeof mss);
64538- mss.vma = vma;
64539- /* mmap_sem is held in m_start */
64540- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
64541- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
64542-
64543+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64544+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
64545+#endif
64546+ mss.vma = vma;
64547+ /* mmap_sem is held in m_start */
64548+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
64549+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
64550+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64551+ }
64552+#endif
64553 show_map_vma(m, vma, is_pid);
64554
64555 seq_printf(m,
64556@@ -610,7 +657,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
64557 "KernelPageSize: %8lu kB\n"
64558 "MMUPageSize: %8lu kB\n"
64559 "Locked: %8lu kB\n",
64560+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64561+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
64562+#else
64563 (vma->vm_end - vma->vm_start) >> 10,
64564+#endif
64565 mss.resident >> 10,
64566 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
64567 mss.shared_clean >> 10,
64568@@ -1388,6 +1439,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
64569 char buffer[64];
64570 int nid;
64571
64572+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64573+ if (current->exec_id != m->exec_id) {
64574+ gr_log_badprocpid("numa_maps");
64575+ return 0;
64576+ }
64577+#endif
64578+
64579 if (!mm)
64580 return 0;
64581
64582@@ -1405,11 +1463,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
64583 mpol_to_str(buffer, sizeof(buffer), pol);
64584 mpol_cond_put(pol);
64585
64586+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64587+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
64588+#else
64589 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
64590+#endif
64591
64592 if (file) {
64593 seq_printf(m, " file=");
64594- seq_path(m, &file->f_path, "\n\t= ");
64595+ seq_path(m, &file->f_path, "\n\t\\= ");
64596 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
64597 seq_printf(m, " heap");
64598 } else {
64599diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
64600index 678455d..ebd3245 100644
64601--- a/fs/proc/task_nommu.c
64602+++ b/fs/proc/task_nommu.c
64603@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
64604 else
64605 bytes += kobjsize(mm);
64606
64607- if (current->fs && current->fs->users > 1)
64608+ if (current->fs && atomic_read(&current->fs->users) > 1)
64609 sbytes += kobjsize(current->fs);
64610 else
64611 bytes += kobjsize(current->fs);
64612@@ -161,7 +161,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
64613
64614 if (file) {
64615 seq_pad(m, ' ');
64616- seq_path(m, &file->f_path, "");
64617+ seq_path(m, &file->f_path, "\n\\");
64618 } else if (mm) {
64619 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
64620
64621diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
64622index 6a8e785..41f2a6c 100644
64623--- a/fs/proc/vmcore.c
64624+++ b/fs/proc/vmcore.c
64625@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
64626 nr_bytes = count;
64627
64628 /* If pfn is not ram, return zeros for sparse dump files */
64629- if (pfn_is_ram(pfn) == 0)
64630- memset(buf, 0, nr_bytes);
64631- else {
64632+ if (pfn_is_ram(pfn) == 0) {
64633+ if (userbuf) {
64634+ if (clear_user((char __force_user *)buf, nr_bytes))
64635+ return -EFAULT;
64636+ } else
64637+ memset(buf, 0, nr_bytes);
64638+ } else {
64639 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
64640 offset, userbuf);
64641 if (tmp < 0)
64642@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
64643 static int copy_to(void *target, void *src, size_t size, int userbuf)
64644 {
64645 if (userbuf) {
64646- if (copy_to_user((char __user *) target, src, size))
64647+ if (copy_to_user((char __force_user *) target, src, size))
64648 return -EFAULT;
64649 } else {
64650 memcpy(target, src, size);
64651@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
64652 if (*fpos < m->offset + m->size) {
64653 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
64654 start = m->paddr + *fpos - m->offset;
64655- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
64656+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
64657 if (tmp < 0)
64658 return tmp;
64659 buflen -= tsz;
64660@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
64661 static ssize_t read_vmcore(struct file *file, char __user *buffer,
64662 size_t buflen, loff_t *fpos)
64663 {
64664- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
64665+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
64666 }
64667
64668 /*
64669diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
64670index b00fcc9..e0c6381 100644
64671--- a/fs/qnx6/qnx6.h
64672+++ b/fs/qnx6/qnx6.h
64673@@ -74,7 +74,7 @@ enum {
64674 BYTESEX_BE,
64675 };
64676
64677-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
64678+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
64679 {
64680 if (sbi->s_bytesex == BYTESEX_LE)
64681 return le64_to_cpu((__force __le64)n);
64682@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
64683 return (__force __fs64)cpu_to_be64(n);
64684 }
64685
64686-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
64687+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
64688 {
64689 if (sbi->s_bytesex == BYTESEX_LE)
64690 return le32_to_cpu((__force __le32)n);
64691diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
64692index 72d2917..c917c12 100644
64693--- a/fs/quota/netlink.c
64694+++ b/fs/quota/netlink.c
64695@@ -45,7 +45,7 @@ static struct genl_family quota_genl_family = {
64696 void quota_send_warning(struct kqid qid, dev_t dev,
64697 const char warntype)
64698 {
64699- static atomic_t seq;
64700+ static atomic_unchecked_t seq;
64701 struct sk_buff *skb;
64702 void *msg_head;
64703 int ret;
64704@@ -61,7 +61,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
64705 "VFS: Not enough memory to send quota warning.\n");
64706 return;
64707 }
64708- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
64709+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
64710 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
64711 if (!msg_head) {
64712 printk(KERN_ERR
64713diff --git a/fs/read_write.c b/fs/read_write.c
64714index 31c6efa..a068805 100644
64715--- a/fs/read_write.c
64716+++ b/fs/read_write.c
64717@@ -450,7 +450,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
64718
64719 old_fs = get_fs();
64720 set_fs(get_ds());
64721- p = (__force const char __user *)buf;
64722+ p = (const char __force_user *)buf;
64723 if (count > MAX_RW_COUNT)
64724 count = MAX_RW_COUNT;
64725 if (file->f_op->write)
64726diff --git a/fs/readdir.c b/fs/readdir.c
64727index 5b53d99..a6c3049 100644
64728--- a/fs/readdir.c
64729+++ b/fs/readdir.c
64730@@ -17,6 +17,7 @@
64731 #include <linux/security.h>
64732 #include <linux/syscalls.h>
64733 #include <linux/unistd.h>
64734+#include <linux/namei.h>
64735
64736 #include <asm/uaccess.h>
64737
64738@@ -69,6 +70,7 @@ struct old_linux_dirent {
64739 struct readdir_callback {
64740 struct dir_context ctx;
64741 struct old_linux_dirent __user * dirent;
64742+ struct file * file;
64743 int result;
64744 };
64745
64746@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
64747 buf->result = -EOVERFLOW;
64748 return -EOVERFLOW;
64749 }
64750+
64751+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
64752+ return 0;
64753+
64754 buf->result++;
64755 dirent = buf->dirent;
64756 if (!access_ok(VERIFY_WRITE, dirent,
64757@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
64758 if (!f.file)
64759 return -EBADF;
64760
64761+ buf.file = f.file;
64762 error = iterate_dir(f.file, &buf.ctx);
64763 if (buf.result)
64764 error = buf.result;
64765@@ -142,6 +149,7 @@ struct getdents_callback {
64766 struct dir_context ctx;
64767 struct linux_dirent __user * current_dir;
64768 struct linux_dirent __user * previous;
64769+ struct file * file;
64770 int count;
64771 int error;
64772 };
64773@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
64774 buf->error = -EOVERFLOW;
64775 return -EOVERFLOW;
64776 }
64777+
64778+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
64779+ return 0;
64780+
64781 dirent = buf->previous;
64782 if (dirent) {
64783 if (__put_user(offset, &dirent->d_off))
64784@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
64785 if (!f.file)
64786 return -EBADF;
64787
64788+ buf.file = f.file;
64789 error = iterate_dir(f.file, &buf.ctx);
64790 if (error >= 0)
64791 error = buf.error;
64792@@ -226,6 +239,7 @@ struct getdents_callback64 {
64793 struct dir_context ctx;
64794 struct linux_dirent64 __user * current_dir;
64795 struct linux_dirent64 __user * previous;
64796+ struct file *file;
64797 int count;
64798 int error;
64799 };
64800@@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
64801 buf->error = -EINVAL; /* only used if we fail.. */
64802 if (reclen > buf->count)
64803 return -EINVAL;
64804+
64805+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
64806+ return 0;
64807+
64808 dirent = buf->previous;
64809 if (dirent) {
64810 if (__put_user(offset, &dirent->d_off))
64811@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
64812 if (!f.file)
64813 return -EBADF;
64814
64815+ buf.file = f.file;
64816 error = iterate_dir(f.file, &buf.ctx);
64817 if (error >= 0)
64818 error = buf.error;
64819diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
64820index 9a3c68c..767933e 100644
64821--- a/fs/reiserfs/do_balan.c
64822+++ b/fs/reiserfs/do_balan.c
64823@@ -1546,7 +1546,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
64824 return;
64825 }
64826
64827- atomic_inc(&(fs_generation(tb->tb_sb)));
64828+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
64829 do_balance_starts(tb);
64830
64831 /* balance leaf returns 0 except if combining L R and S into
64832diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
64833index ee382ef..f4eb6eb5 100644
64834--- a/fs/reiserfs/item_ops.c
64835+++ b/fs/reiserfs/item_ops.c
64836@@ -725,18 +725,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
64837 }
64838
64839 static struct item_operations errcatch_ops = {
64840- errcatch_bytes_number,
64841- errcatch_decrement_key,
64842- errcatch_is_left_mergeable,
64843- errcatch_print_item,
64844- errcatch_check_item,
64845+ .bytes_number = errcatch_bytes_number,
64846+ .decrement_key = errcatch_decrement_key,
64847+ .is_left_mergeable = errcatch_is_left_mergeable,
64848+ .print_item = errcatch_print_item,
64849+ .check_item = errcatch_check_item,
64850
64851- errcatch_create_vi,
64852- errcatch_check_left,
64853- errcatch_check_right,
64854- errcatch_part_size,
64855- errcatch_unit_num,
64856- errcatch_print_vi
64857+ .create_vi = errcatch_create_vi,
64858+ .check_left = errcatch_check_left,
64859+ .check_right = errcatch_check_right,
64860+ .part_size = errcatch_part_size,
64861+ .unit_num = errcatch_unit_num,
64862+ .print_vi = errcatch_print_vi
64863 };
64864
64865 //////////////////////////////////////////////////////////////////////////////
64866diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
64867index 02b0b7d..c85018b 100644
64868--- a/fs/reiserfs/procfs.c
64869+++ b/fs/reiserfs/procfs.c
64870@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
64871 "SMALL_TAILS " : "NO_TAILS ",
64872 replay_only(sb) ? "REPLAY_ONLY " : "",
64873 convert_reiserfs(sb) ? "CONV " : "",
64874- atomic_read(&r->s_generation_counter),
64875+ atomic_read_unchecked(&r->s_generation_counter),
64876 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
64877 SF(s_do_balance), SF(s_unneeded_left_neighbor),
64878 SF(s_good_search_by_key_reada), SF(s_bmaps),
64879diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
64880index 83d4eac..04e39a7 100644
64881--- a/fs/reiserfs/reiserfs.h
64882+++ b/fs/reiserfs/reiserfs.h
64883@@ -453,7 +453,7 @@ struct reiserfs_sb_info {
64884 /* Comment? -Hans */
64885 wait_queue_head_t s_wait;
64886 /* To be obsoleted soon by per buffer seals.. -Hans */
64887- atomic_t s_generation_counter; // increased by one every time the
64888+ atomic_unchecked_t s_generation_counter; // increased by one every time the
64889 // tree gets re-balanced
64890 unsigned long s_properties; /* File system properties. Currently holds
64891 on-disk FS format */
64892@@ -1972,7 +1972,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
64893 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
64894
64895 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
64896-#define get_generation(s) atomic_read (&fs_generation(s))
64897+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
64898 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
64899 #define __fs_changed(gen,s) (gen != get_generation (s))
64900 #define fs_changed(gen,s) \
64901diff --git a/fs/select.c b/fs/select.c
64902index 467bb1c..cf9d65a 100644
64903--- a/fs/select.c
64904+++ b/fs/select.c
64905@@ -20,6 +20,7 @@
64906 #include <linux/export.h>
64907 #include <linux/slab.h>
64908 #include <linux/poll.h>
64909+#include <linux/security.h>
64910 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
64911 #include <linux/file.h>
64912 #include <linux/fdtable.h>
64913@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
64914 struct poll_list *walk = head;
64915 unsigned long todo = nfds;
64916
64917+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
64918 if (nfds > rlimit(RLIMIT_NOFILE))
64919 return -EINVAL;
64920
64921diff --git a/fs/seq_file.c b/fs/seq_file.c
64922index 1d641bb..c2f4743 100644
64923--- a/fs/seq_file.c
64924+++ b/fs/seq_file.c
64925@@ -10,6 +10,8 @@
64926 #include <linux/seq_file.h>
64927 #include <linux/slab.h>
64928 #include <linux/cred.h>
64929+#include <linux/sched.h>
64930+#include <linux/grsecurity.h>
64931
64932 #include <asm/uaccess.h>
64933 #include <asm/page.h>
64934@@ -60,6 +62,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
64935 #ifdef CONFIG_USER_NS
64936 p->user_ns = file->f_cred->user_ns;
64937 #endif
64938+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64939+ p->exec_id = current->exec_id;
64940+#endif
64941
64942 /*
64943 * Wrappers around seq_open(e.g. swaps_open) need to be
64944@@ -82,6 +87,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
64945 }
64946 EXPORT_SYMBOL(seq_open);
64947
64948+
64949+int seq_open_restrict(struct file *file, const struct seq_operations *op)
64950+{
64951+ if (gr_proc_is_restricted())
64952+ return -EACCES;
64953+
64954+ return seq_open(file, op);
64955+}
64956+EXPORT_SYMBOL(seq_open_restrict);
64957+
64958 static int traverse(struct seq_file *m, loff_t offset)
64959 {
64960 loff_t pos = 0, index;
64961@@ -96,7 +111,7 @@ static int traverse(struct seq_file *m, loff_t offset)
64962 return 0;
64963 }
64964 if (!m->buf) {
64965- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
64966+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
64967 if (!m->buf)
64968 return -ENOMEM;
64969 }
64970@@ -137,7 +152,7 @@ Eoverflow:
64971 m->op->stop(m, p);
64972 kfree(m->buf);
64973 m->count = 0;
64974- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
64975+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
64976 return !m->buf ? -ENOMEM : -EAGAIN;
64977 }
64978
64979@@ -153,7 +168,7 @@ Eoverflow:
64980 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
64981 {
64982 struct seq_file *m = file->private_data;
64983- size_t copied = 0;
64984+ ssize_t copied = 0;
64985 loff_t pos;
64986 size_t n;
64987 void *p;
64988@@ -192,7 +207,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
64989
64990 /* grab buffer if we didn't have one */
64991 if (!m->buf) {
64992- m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
64993+ m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
64994 if (!m->buf)
64995 goto Enomem;
64996 }
64997@@ -234,7 +249,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
64998 m->op->stop(m, p);
64999 kfree(m->buf);
65000 m->count = 0;
65001- m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
65002+ m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
65003 if (!m->buf)
65004 goto Enomem;
65005 m->version = 0;
65006@@ -584,7 +599,7 @@ static void single_stop(struct seq_file *p, void *v)
65007 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
65008 void *data)
65009 {
65010- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
65011+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
65012 int res = -ENOMEM;
65013
65014 if (op) {
65015@@ -620,6 +635,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
65016 }
65017 EXPORT_SYMBOL(single_open_size);
65018
65019+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
65020+ void *data)
65021+{
65022+ if (gr_proc_is_restricted())
65023+ return -EACCES;
65024+
65025+ return single_open(file, show, data);
65026+}
65027+EXPORT_SYMBOL(single_open_restrict);
65028+
65029+
65030 int single_release(struct inode *inode, struct file *file)
65031 {
65032 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
65033diff --git a/fs/splice.c b/fs/splice.c
65034index e246954..bd4f5b5 100644
65035--- a/fs/splice.c
65036+++ b/fs/splice.c
65037@@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
65038 pipe_lock(pipe);
65039
65040 for (;;) {
65041- if (!pipe->readers) {
65042+ if (!atomic_read(&pipe->readers)) {
65043 send_sig(SIGPIPE, current, 0);
65044 if (!ret)
65045 ret = -EPIPE;
65046@@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
65047 page_nr++;
65048 ret += buf->len;
65049
65050- if (pipe->files)
65051+ if (atomic_read(&pipe->files))
65052 do_wakeup = 1;
65053
65054 if (!--spd->nr_pages)
65055@@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
65056 do_wakeup = 0;
65057 }
65058
65059- pipe->waiting_writers++;
65060+ atomic_inc(&pipe->waiting_writers);
65061 pipe_wait(pipe);
65062- pipe->waiting_writers--;
65063+ atomic_dec(&pipe->waiting_writers);
65064 }
65065
65066 pipe_unlock(pipe);
65067@@ -575,7 +575,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
65068 old_fs = get_fs();
65069 set_fs(get_ds());
65070 /* The cast to a user pointer is valid due to the set_fs() */
65071- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
65072+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
65073 set_fs(old_fs);
65074
65075 return res;
65076@@ -590,7 +590,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
65077 old_fs = get_fs();
65078 set_fs(get_ds());
65079 /* The cast to a user pointer is valid due to the set_fs() */
65080- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
65081+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
65082 set_fs(old_fs);
65083
65084 return res;
65085@@ -643,7 +643,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
65086 goto err;
65087
65088 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
65089- vec[i].iov_base = (void __user *) page_address(page);
65090+ vec[i].iov_base = (void __force_user *) page_address(page);
65091 vec[i].iov_len = this_len;
65092 spd.pages[i] = page;
65093 spd.nr_pages++;
65094@@ -839,7 +839,7 @@ int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_desc *sd,
65095 ops->release(pipe, buf);
65096 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
65097 pipe->nrbufs--;
65098- if (pipe->files)
65099+ if (atomic_read(&pipe->files))
65100 sd->need_wakeup = true;
65101 }
65102
65103@@ -864,10 +864,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
65104 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
65105 {
65106 while (!pipe->nrbufs) {
65107- if (!pipe->writers)
65108+ if (!atomic_read(&pipe->writers))
65109 return 0;
65110
65111- if (!pipe->waiting_writers && sd->num_spliced)
65112+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
65113 return 0;
65114
65115 if (sd->flags & SPLICE_F_NONBLOCK)
65116@@ -1189,7 +1189,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
65117 * out of the pipe right after the splice_to_pipe(). So set
65118 * PIPE_READERS appropriately.
65119 */
65120- pipe->readers = 1;
65121+ atomic_set(&pipe->readers, 1);
65122
65123 current->splice_pipe = pipe;
65124 }
65125@@ -1485,6 +1485,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
65126
65127 partial[buffers].offset = off;
65128 partial[buffers].len = plen;
65129+ partial[buffers].private = 0;
65130
65131 off = 0;
65132 len -= plen;
65133@@ -1721,9 +1722,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
65134 ret = -ERESTARTSYS;
65135 break;
65136 }
65137- if (!pipe->writers)
65138+ if (!atomic_read(&pipe->writers))
65139 break;
65140- if (!pipe->waiting_writers) {
65141+ if (!atomic_read(&pipe->waiting_writers)) {
65142 if (flags & SPLICE_F_NONBLOCK) {
65143 ret = -EAGAIN;
65144 break;
65145@@ -1755,7 +1756,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
65146 pipe_lock(pipe);
65147
65148 while (pipe->nrbufs >= pipe->buffers) {
65149- if (!pipe->readers) {
65150+ if (!atomic_read(&pipe->readers)) {
65151 send_sig(SIGPIPE, current, 0);
65152 ret = -EPIPE;
65153 break;
65154@@ -1768,9 +1769,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
65155 ret = -ERESTARTSYS;
65156 break;
65157 }
65158- pipe->waiting_writers++;
65159+ atomic_inc(&pipe->waiting_writers);
65160 pipe_wait(pipe);
65161- pipe->waiting_writers--;
65162+ atomic_dec(&pipe->waiting_writers);
65163 }
65164
65165 pipe_unlock(pipe);
65166@@ -1806,14 +1807,14 @@ retry:
65167 pipe_double_lock(ipipe, opipe);
65168
65169 do {
65170- if (!opipe->readers) {
65171+ if (!atomic_read(&opipe->readers)) {
65172 send_sig(SIGPIPE, current, 0);
65173 if (!ret)
65174 ret = -EPIPE;
65175 break;
65176 }
65177
65178- if (!ipipe->nrbufs && !ipipe->writers)
65179+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
65180 break;
65181
65182 /*
65183@@ -1910,7 +1911,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
65184 pipe_double_lock(ipipe, opipe);
65185
65186 do {
65187- if (!opipe->readers) {
65188+ if (!atomic_read(&opipe->readers)) {
65189 send_sig(SIGPIPE, current, 0);
65190 if (!ret)
65191 ret = -EPIPE;
65192@@ -1955,7 +1956,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
65193 * return EAGAIN if we have the potential of some data in the
65194 * future, otherwise just return 0
65195 */
65196- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
65197+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
65198 ret = -EAGAIN;
65199
65200 pipe_unlock(ipipe);
65201diff --git a/fs/stat.c b/fs/stat.c
65202index ae0c3ce..9ee641c 100644
65203--- a/fs/stat.c
65204+++ b/fs/stat.c
65205@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
65206 stat->gid = inode->i_gid;
65207 stat->rdev = inode->i_rdev;
65208 stat->size = i_size_read(inode);
65209- stat->atime = inode->i_atime;
65210- stat->mtime = inode->i_mtime;
65211+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
65212+ stat->atime = inode->i_ctime;
65213+ stat->mtime = inode->i_ctime;
65214+ } else {
65215+ stat->atime = inode->i_atime;
65216+ stat->mtime = inode->i_mtime;
65217+ }
65218 stat->ctime = inode->i_ctime;
65219 stat->blksize = (1 << inode->i_blkbits);
65220 stat->blocks = inode->i_blocks;
65221@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
65222 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
65223 {
65224 struct inode *inode = path->dentry->d_inode;
65225+ int retval;
65226
65227- if (inode->i_op->getattr)
65228- return inode->i_op->getattr(path->mnt, path->dentry, stat);
65229+ if (inode->i_op->getattr) {
65230+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
65231+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
65232+ stat->atime = stat->ctime;
65233+ stat->mtime = stat->ctime;
65234+ }
65235+ return retval;
65236+ }
65237
65238 generic_fillattr(inode, stat);
65239 return 0;
65240diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
65241index 0b45ff4..847de5b 100644
65242--- a/fs/sysfs/dir.c
65243+++ b/fs/sysfs/dir.c
65244@@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
65245 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
65246 {
65247 struct kernfs_node *parent, *kn;
65248+ const char *name;
65249+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
65250+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
65251+ const char *parent_name;
65252+#endif
65253
65254 BUG_ON(!kobj);
65255
65256+ name = kobject_name(kobj);
65257+
65258 if (kobj->parent)
65259 parent = kobj->parent->sd;
65260 else
65261@@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
65262 if (!parent)
65263 return -ENOENT;
65264
65265- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
65266- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
65267+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
65268+ parent_name = parent->name;
65269+ mode = S_IRWXU;
65270+
65271+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
65272+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
65273+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
65274+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
65275+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
65276+#endif
65277+
65278+ kn = kernfs_create_dir_ns(parent, name,
65279+ mode, kobj, ns);
65280 if (IS_ERR(kn)) {
65281 if (PTR_ERR(kn) == -EEXIST)
65282- sysfs_warn_dup(parent, kobject_name(kobj));
65283+ sysfs_warn_dup(parent, name);
65284 return PTR_ERR(kn);
65285 }
65286
65287diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
65288index 69d4889..a810bd4 100644
65289--- a/fs/sysv/sysv.h
65290+++ b/fs/sysv/sysv.h
65291@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
65292 #endif
65293 }
65294
65295-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
65296+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
65297 {
65298 if (sbi->s_bytesex == BYTESEX_PDP)
65299 return PDP_swab((__force __u32)n);
65300diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
65301index e18b988..f1d4ad0f 100644
65302--- a/fs/ubifs/io.c
65303+++ b/fs/ubifs/io.c
65304@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
65305 return err;
65306 }
65307
65308-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
65309+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
65310 {
65311 int err;
65312
65313diff --git a/fs/udf/misc.c b/fs/udf/misc.c
65314index c175b4d..8f36a16 100644
65315--- a/fs/udf/misc.c
65316+++ b/fs/udf/misc.c
65317@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
65318
65319 u8 udf_tag_checksum(const struct tag *t)
65320 {
65321- u8 *data = (u8 *)t;
65322+ const u8 *data = (const u8 *)t;
65323 u8 checksum = 0;
65324 int i;
65325 for (i = 0; i < sizeof(struct tag); ++i)
65326diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
65327index 8d974c4..b82f6ec 100644
65328--- a/fs/ufs/swab.h
65329+++ b/fs/ufs/swab.h
65330@@ -22,7 +22,7 @@ enum {
65331 BYTESEX_BE
65332 };
65333
65334-static inline u64
65335+static inline u64 __intentional_overflow(-1)
65336 fs64_to_cpu(struct super_block *sbp, __fs64 n)
65337 {
65338 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
65339@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
65340 return (__force __fs64)cpu_to_be64(n);
65341 }
65342
65343-static inline u32
65344+static inline u32 __intentional_overflow(-1)
65345 fs32_to_cpu(struct super_block *sbp, __fs32 n)
65346 {
65347 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
65348diff --git a/fs/utimes.c b/fs/utimes.c
65349index aa138d6..5f3a811 100644
65350--- a/fs/utimes.c
65351+++ b/fs/utimes.c
65352@@ -1,6 +1,7 @@
65353 #include <linux/compiler.h>
65354 #include <linux/file.h>
65355 #include <linux/fs.h>
65356+#include <linux/security.h>
65357 #include <linux/linkage.h>
65358 #include <linux/mount.h>
65359 #include <linux/namei.h>
65360@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
65361 }
65362 }
65363 retry_deleg:
65364+
65365+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
65366+ error = -EACCES;
65367+ goto mnt_drop_write_and_out;
65368+ }
65369+
65370 mutex_lock(&inode->i_mutex);
65371 error = notify_change(path->dentry, &newattrs, &delegated_inode);
65372 mutex_unlock(&inode->i_mutex);
65373diff --git a/fs/xattr.c b/fs/xattr.c
65374index 3377dff..f394815 100644
65375--- a/fs/xattr.c
65376+++ b/fs/xattr.c
65377@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
65378 return rc;
65379 }
65380
65381+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
65382+ssize_t
65383+pax_getxattr(struct dentry *dentry, void *value, size_t size)
65384+{
65385+ struct inode *inode = dentry->d_inode;
65386+ ssize_t error;
65387+
65388+ error = inode_permission(inode, MAY_EXEC);
65389+ if (error)
65390+ return error;
65391+
65392+ if (inode->i_op->getxattr)
65393+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
65394+ else
65395+ error = -EOPNOTSUPP;
65396+
65397+ return error;
65398+}
65399+EXPORT_SYMBOL(pax_getxattr);
65400+#endif
65401+
65402 ssize_t
65403 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
65404 {
65405@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
65406 * Extended attribute SET operations
65407 */
65408 static long
65409-setxattr(struct dentry *d, const char __user *name, const void __user *value,
65410+setxattr(struct path *path, const char __user *name, const void __user *value,
65411 size_t size, int flags)
65412 {
65413 int error;
65414@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
65415 posix_acl_fix_xattr_from_user(kvalue, size);
65416 }
65417
65418- error = vfs_setxattr(d, kname, kvalue, size, flags);
65419+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
65420+ error = -EACCES;
65421+ goto out;
65422+ }
65423+
65424+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
65425 out:
65426 if (vvalue)
65427 vfree(vvalue);
65428@@ -377,7 +403,7 @@ retry:
65429 return error;
65430 error = mnt_want_write(path.mnt);
65431 if (!error) {
65432- error = setxattr(path.dentry, name, value, size, flags);
65433+ error = setxattr(&path, name, value, size, flags);
65434 mnt_drop_write(path.mnt);
65435 }
65436 path_put(&path);
65437@@ -401,7 +427,7 @@ retry:
65438 return error;
65439 error = mnt_want_write(path.mnt);
65440 if (!error) {
65441- error = setxattr(path.dentry, name, value, size, flags);
65442+ error = setxattr(&path, name, value, size, flags);
65443 mnt_drop_write(path.mnt);
65444 }
65445 path_put(&path);
65446@@ -416,16 +442,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
65447 const void __user *,value, size_t, size, int, flags)
65448 {
65449 struct fd f = fdget(fd);
65450- struct dentry *dentry;
65451 int error = -EBADF;
65452
65453 if (!f.file)
65454 return error;
65455- dentry = f.file->f_path.dentry;
65456- audit_inode(NULL, dentry, 0);
65457+ audit_inode(NULL, f.file->f_path.dentry, 0);
65458 error = mnt_want_write_file(f.file);
65459 if (!error) {
65460- error = setxattr(dentry, name, value, size, flags);
65461+ error = setxattr(&f.file->f_path, name, value, size, flags);
65462 mnt_drop_write_file(f.file);
65463 }
65464 fdput(f);
65465@@ -626,7 +650,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
65466 * Extended attribute REMOVE operations
65467 */
65468 static long
65469-removexattr(struct dentry *d, const char __user *name)
65470+removexattr(struct path *path, const char __user *name)
65471 {
65472 int error;
65473 char kname[XATTR_NAME_MAX + 1];
65474@@ -637,7 +661,10 @@ removexattr(struct dentry *d, const char __user *name)
65475 if (error < 0)
65476 return error;
65477
65478- return vfs_removexattr(d, kname);
65479+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
65480+ return -EACCES;
65481+
65482+ return vfs_removexattr(path->dentry, kname);
65483 }
65484
65485 SYSCALL_DEFINE2(removexattr, const char __user *, pathname,
65486@@ -652,7 +679,7 @@ retry:
65487 return error;
65488 error = mnt_want_write(path.mnt);
65489 if (!error) {
65490- error = removexattr(path.dentry, name);
65491+ error = removexattr(&path, name);
65492 mnt_drop_write(path.mnt);
65493 }
65494 path_put(&path);
65495@@ -675,7 +702,7 @@ retry:
65496 return error;
65497 error = mnt_want_write(path.mnt);
65498 if (!error) {
65499- error = removexattr(path.dentry, name);
65500+ error = removexattr(&path, name);
65501 mnt_drop_write(path.mnt);
65502 }
65503 path_put(&path);
65504@@ -689,16 +716,16 @@ retry:
65505 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
65506 {
65507 struct fd f = fdget(fd);
65508- struct dentry *dentry;
65509+ struct path *path;
65510 int error = -EBADF;
65511
65512 if (!f.file)
65513 return error;
65514- dentry = f.file->f_path.dentry;
65515- audit_inode(NULL, dentry, 0);
65516+ path = &f.file->f_path;
65517+ audit_inode(NULL, path->dentry, 0);
65518 error = mnt_want_write_file(f.file);
65519 if (!error) {
65520- error = removexattr(dentry, name);
65521+ error = removexattr(path, name);
65522 mnt_drop_write_file(f.file);
65523 }
65524 fdput(f);
65525diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
65526index f0efc7e..ba72910 100644
65527--- a/fs/xfs/xfs_bmap.c
65528+++ b/fs/xfs/xfs_bmap.c
65529@@ -584,7 +584,7 @@ xfs_bmap_validate_ret(
65530
65531 #else
65532 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
65533-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
65534+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
65535 #endif /* DEBUG */
65536
65537 /*
65538diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
65539index aead369..0dfecfd 100644
65540--- a/fs/xfs/xfs_dir2_readdir.c
65541+++ b/fs/xfs/xfs_dir2_readdir.c
65542@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
65543 ino = dp->d_ops->sf_get_ino(sfp, sfep);
65544 filetype = dp->d_ops->sf_get_ftype(sfep);
65545 ctx->pos = off & 0x7fffffff;
65546- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
65547+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
65548+ char name[sfep->namelen];
65549+ memcpy(name, sfep->name, sfep->namelen);
65550+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
65551+ return 0;
65552+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
65553 xfs_dir3_get_dtype(mp, filetype)))
65554 return 0;
65555 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
65556diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
65557index 6152cbe..f0f9eaa 100644
65558--- a/fs/xfs/xfs_ioctl.c
65559+++ b/fs/xfs/xfs_ioctl.c
65560@@ -122,7 +122,7 @@ xfs_find_handle(
65561 }
65562
65563 error = -EFAULT;
65564- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
65565+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
65566 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
65567 goto out_put;
65568
65569diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
65570new file mode 100644
65571index 0000000..bfd482c
65572--- /dev/null
65573+++ b/grsecurity/Kconfig
65574@@ -0,0 +1,1176 @@
65575+#
65576+# grecurity configuration
65577+#
65578+menu "Memory Protections"
65579+depends on GRKERNSEC
65580+
65581+config GRKERNSEC_KMEM
65582+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
65583+ default y if GRKERNSEC_CONFIG_AUTO
65584+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
65585+ help
65586+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
65587+ be written to or read from to modify or leak the contents of the running
65588+ kernel. /dev/port will also not be allowed to be opened, writing to
65589+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
65590+ If you have module support disabled, enabling this will close up several
65591+ ways that are currently used to insert malicious code into the running
65592+ kernel.
65593+
65594+ Even with this feature enabled, we still highly recommend that
65595+ you use the RBAC system, as it is still possible for an attacker to
65596+ modify the running kernel through other more obscure methods.
65597+
65598+ It is highly recommended that you say Y here if you meet all the
65599+ conditions above.
65600+
65601+config GRKERNSEC_VM86
65602+ bool "Restrict VM86 mode"
65603+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65604+ depends on X86_32
65605+
65606+ help
65607+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
65608+ make use of a special execution mode on 32bit x86 processors called
65609+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
65610+ video cards and will still work with this option enabled. The purpose
65611+ of the option is to prevent exploitation of emulation errors in
65612+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
65613+ Nearly all users should be able to enable this option.
65614+
65615+config GRKERNSEC_IO
65616+ bool "Disable privileged I/O"
65617+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
65618+ depends on X86
65619+ select RTC_CLASS
65620+ select RTC_INTF_DEV
65621+ select RTC_DRV_CMOS
65622+
65623+ help
65624+ If you say Y here, all ioperm and iopl calls will return an error.
65625+ Ioperm and iopl can be used to modify the running kernel.
65626+ Unfortunately, some programs need this access to operate properly,
65627+ the most notable of which are XFree86 and hwclock. hwclock can be
65628+ remedied by having RTC support in the kernel, so real-time
65629+ clock support is enabled if this option is enabled, to ensure
65630+ that hwclock operates correctly. If hwclock still does not work,
65631+ either update udev or symlink /dev/rtc to /dev/rtc0.
65632+
65633+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
65634+ you may not be able to boot into a graphical environment with this
65635+ option enabled. In this case, you should use the RBAC system instead.
65636+
65637+config GRKERNSEC_JIT_HARDEN
65638+ bool "Harden BPF JIT against spray attacks"
65639+ default y if GRKERNSEC_CONFIG_AUTO
65640+ depends on BPF_JIT && X86
65641+ help
65642+ If you say Y here, the native code generated by the kernel's Berkeley
65643+ Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
65644+ attacks that attempt to fit attacker-beneficial instructions in
65645+ 32bit immediate fields of JIT-generated native instructions. The
65646+ attacker will generally aim to cause an unintended instruction sequence
65647+ of JIT-generated native code to execute by jumping into the middle of
65648+ a generated instruction. This feature effectively randomizes the 32bit
65649+ immediate constants present in the generated code to thwart such attacks.
65650+
65651+ If you're using KERNEXEC, it's recommended that you enable this option
65652+ to supplement the hardening of the kernel.
65653+
65654+config GRKERNSEC_PERF_HARDEN
65655+ bool "Disable unprivileged PERF_EVENTS usage by default"
65656+ default y if GRKERNSEC_CONFIG_AUTO
65657+ depends on PERF_EVENTS
65658+ help
65659+ If you say Y here, the range of acceptable values for the
65660+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
65661+ default to a new value: 3. When the sysctl is set to this value, no
65662+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
65663+
65664+ Though PERF_EVENTS can be used legitimately for performance monitoring
65665+ and low-level application profiling, it is forced on regardless of
65666+ configuration, has been at fault for several vulnerabilities, and
65667+ creates new opportunities for side channels and other information leaks.
65668+
65669+ This feature puts PERF_EVENTS into a secure default state and permits
65670+ the administrator to change out of it temporarily if unprivileged
65671+ application profiling is needed.
65672+
65673+config GRKERNSEC_RAND_THREADSTACK
65674+ bool "Insert random gaps between thread stacks"
65675+ default y if GRKERNSEC_CONFIG_AUTO
65676+ depends on PAX_RANDMMAP && !PPC
65677+ help
65678+ If you say Y here, a random-sized gap will be enforced between allocated
65679+ thread stacks. Glibc's NPTL and other threading libraries that
65680+ pass MAP_STACK to the kernel for thread stack allocation are supported.
65681+ The implementation currently provides 8 bits of entropy for the gap.
65682+
65683+ Many distributions do not compile threaded remote services with the
65684+ -fstack-check argument to GCC, causing the variable-sized stack-based
65685+ allocator, alloca(), to not probe the stack on allocation. This
65686+ permits an unbounded alloca() to skip over any guard page and potentially
65687+ modify another thread's stack reliably. An enforced random gap
65688+ reduces the reliability of such an attack and increases the chance
65689+ that such a read/write to another thread's stack instead lands in
65690+ an unmapped area, causing a crash and triggering grsecurity's
65691+ anti-bruteforcing logic.
65692+
65693+config GRKERNSEC_PROC_MEMMAP
65694+ bool "Harden ASLR against information leaks and entropy reduction"
65695+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
65696+ depends on PAX_NOEXEC || PAX_ASLR
65697+ help
65698+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
65699+ give no information about the addresses of its mappings if
65700+ PaX features that rely on random addresses are enabled on the task.
65701+ In addition to sanitizing this information and disabling other
65702+ dangerous sources of information, this option causes reads of sensitive
65703+ /proc/<pid> entries where the file descriptor was opened in a different
65704+ task than the one performing the read. Such attempts are logged.
65705+ This option also limits argv/env strings for suid/sgid binaries
65706+ to 512KB to prevent a complete exhaustion of the stack entropy provided
65707+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
65708+ binaries to prevent alternative mmap layouts from being abused.
65709+
65710+ If you use PaX it is essential that you say Y here as it closes up
65711+ several holes that make full ASLR useless locally.
65712+
65713+
65714+config GRKERNSEC_KSTACKOVERFLOW
65715+ bool "Prevent kernel stack overflows"
65716+ default y if GRKERNSEC_CONFIG_AUTO
65717+ depends on !IA64 && 64BIT
65718+ help
65719+ If you say Y here, the kernel's process stacks will be allocated
65720+ with vmalloc instead of the kernel's default allocator. This
65721+ introduces guard pages that in combination with the alloca checking
65722+ of the STACKLEAK feature prevents all forms of kernel process stack
65723+ overflow abuse. Note that this is different from kernel stack
65724+ buffer overflows.
65725+
65726+config GRKERNSEC_BRUTE
65727+ bool "Deter exploit bruteforcing"
65728+ default y if GRKERNSEC_CONFIG_AUTO
65729+ help
65730+ If you say Y here, attempts to bruteforce exploits against forking
65731+ daemons such as apache or sshd, as well as against suid/sgid binaries
65732+ will be deterred. When a child of a forking daemon is killed by PaX
65733+ or crashes due to an illegal instruction or other suspicious signal,
65734+ the parent process will be delayed 30 seconds upon every subsequent
65735+ fork until the administrator is able to assess the situation and
65736+ restart the daemon.
65737+ In the suid/sgid case, the attempt is logged, the user has all their
65738+ existing instances of the suid/sgid binary terminated and will
65739+ be unable to execute any suid/sgid binaries for 15 minutes.
65740+
65741+ It is recommended that you also enable signal logging in the auditing
65742+ section so that logs are generated when a process triggers a suspicious
65743+ signal.
65744+ If the sysctl option is enabled, a sysctl option with name
65745+ "deter_bruteforce" is created.
65746+
65747+config GRKERNSEC_MODHARDEN
65748+ bool "Harden module auto-loading"
65749+ default y if GRKERNSEC_CONFIG_AUTO
65750+ depends on MODULES
65751+ help
65752+ If you say Y here, module auto-loading in response to use of some
65753+ feature implemented by an unloaded module will be restricted to
65754+ root users. Enabling this option helps defend against attacks
65755+ by unprivileged users who abuse the auto-loading behavior to
65756+ cause a vulnerable module to load that is then exploited.
65757+
65758+ If this option prevents a legitimate use of auto-loading for a
65759+ non-root user, the administrator can execute modprobe manually
65760+ with the exact name of the module mentioned in the alert log.
65761+ Alternatively, the administrator can add the module to the list
65762+ of modules loaded at boot by modifying init scripts.
65763+
65764+ Modification of init scripts will most likely be needed on
65765+ Ubuntu servers with encrypted home directory support enabled,
65766+ as the first non-root user logging in will cause the ecb(aes),
65767+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
65768+
65769+config GRKERNSEC_HIDESYM
65770+ bool "Hide kernel symbols"
65771+ default y if GRKERNSEC_CONFIG_AUTO
65772+ select PAX_USERCOPY_SLABS
65773+ help
65774+ If you say Y here, getting information on loaded modules, and
65775+ displaying all kernel symbols through a syscall will be restricted
65776+ to users with CAP_SYS_MODULE. For software compatibility reasons,
65777+ /proc/kallsyms will be restricted to the root user. The RBAC
65778+ system can hide that entry even from root.
65779+
65780+ This option also prevents leaking of kernel addresses through
65781+ several /proc entries.
65782+
65783+ Note that this option is only effective provided the following
65784+ conditions are met:
65785+ 1) The kernel using grsecurity is not precompiled by some distribution
65786+ 2) You have also enabled GRKERNSEC_DMESG
65787+ 3) You are using the RBAC system and hiding other files such as your
65788+ kernel image and System.map. Alternatively, enabling this option
65789+ causes the permissions on /boot, /lib/modules, and the kernel
65790+ source directory to change at compile time to prevent
65791+ reading by non-root users.
65792+ If the above conditions are met, this option will aid in providing a
65793+ useful protection against local kernel exploitation of overflows
65794+ and arbitrary read/write vulnerabilities.
65795+
65796+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
65797+ in addition to this feature.
65798+
65799+config GRKERNSEC_RANDSTRUCT
65800+ bool "Randomize layout of sensitive kernel structures"
65801+ default y if GRKERNSEC_CONFIG_AUTO
65802+ select GRKERNSEC_HIDESYM
65803+ select MODVERSIONS if MODULES
65804+ help
65805+ If you say Y here, the layouts of a number of sensitive kernel
65806+ structures (task, fs, cred, etc) and all structures composed entirely
65807+ of function pointers (aka "ops" structs) will be randomized at compile-time.
65808+ This can introduce the requirement of an additional infoleak
65809+ vulnerability for exploits targeting these structure types.
65810+
65811+ Enabling this feature will introduce some performance impact, slightly
65812+ increase memory usage, and prevent the use of forensic tools like
65813+ Volatility against the system (unless the kernel source tree isn't
65814+ cleaned after kernel installation).
65815+
65816+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
65817+ It remains after a make clean to allow for external modules to be compiled
65818+ with the existing seed and will be removed by a make mrproper or
65819+ make distclean.
65820+
65821+ Note that the implementation requires gcc 4.6.4. or newer. You may need
65822+ to install the supporting headers explicitly in addition to the normal
65823+ gcc package.
65824+
65825+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
65826+ bool "Use cacheline-aware structure randomization"
65827+ depends on GRKERNSEC_RANDSTRUCT
65828+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
65829+ help
65830+ If you say Y here, the RANDSTRUCT randomization will make a best effort
65831+ at restricting randomization to cacheline-sized groups of elements. It
65832+ will further not randomize bitfields in structures. This reduces the
65833+ performance hit of RANDSTRUCT at the cost of weakened randomization.
65834+
65835+config GRKERNSEC_KERN_LOCKOUT
65836+ bool "Active kernel exploit response"
65837+ default y if GRKERNSEC_CONFIG_AUTO
65838+ depends on X86 || ARM || PPC || SPARC
65839+ help
65840+ If you say Y here, when a PaX alert is triggered due to suspicious
65841+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
65842+ or an OOPS occurs due to bad memory accesses, instead of just
65843+ terminating the offending process (and potentially allowing
65844+ a subsequent exploit from the same user), we will take one of two
65845+ actions:
65846+ If the user was root, we will panic the system
65847+ If the user was non-root, we will log the attempt, terminate
65848+ all processes owned by the user, then prevent them from creating
65849+ any new processes until the system is restarted
65850+ This deters repeated kernel exploitation/bruteforcing attempts
65851+ and is useful for later forensics.
65852+
65853+config GRKERNSEC_OLD_ARM_USERLAND
65854+ bool "Old ARM userland compatibility"
65855+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
65856+ help
65857+ If you say Y here, stubs of executable code to perform such operations
65858+ as "compare-exchange" will be placed at fixed locations in the ARM vector
65859+ table. This is unfortunately needed for old ARM userland meant to run
65860+ across a wide range of processors. Without this option enabled,
65861+ the get_tls and data memory barrier stubs will be emulated by the kernel,
65862+ which is enough for Linaro userlands or other userlands designed for v6
65863+ and newer ARM CPUs. It's recommended that you try without this option enabled
65864+ first, and only enable it if your userland does not boot (it will likely fail
65865+ at init time).
65866+
65867+endmenu
65868+menu "Role Based Access Control Options"
65869+depends on GRKERNSEC
65870+
65871+config GRKERNSEC_RBAC_DEBUG
65872+ bool
65873+
65874+config GRKERNSEC_NO_RBAC
65875+ bool "Disable RBAC system"
65876+ help
65877+ If you say Y here, the /dev/grsec device will be removed from the kernel,
65878+ preventing the RBAC system from being enabled. You should only say Y
65879+ here if you have no intention of using the RBAC system, so as to prevent
65880+ an attacker with root access from misusing the RBAC system to hide files
65881+ and processes when loadable module support and /dev/[k]mem have been
65882+ locked down.
65883+
65884+config GRKERNSEC_ACL_HIDEKERN
65885+ bool "Hide kernel processes"
65886+ help
65887+ If you say Y here, all kernel threads will be hidden to all
65888+ processes but those whose subject has the "view hidden processes"
65889+ flag.
65890+
65891+config GRKERNSEC_ACL_MAXTRIES
65892+ int "Maximum tries before password lockout"
65893+ default 3
65894+ help
65895+ This option enforces the maximum number of times a user can attempt
65896+ to authorize themselves with the grsecurity RBAC system before being
65897+ denied the ability to attempt authorization again for a specified time.
65898+ The lower the number, the harder it will be to brute-force a password.
65899+
65900+config GRKERNSEC_ACL_TIMEOUT
65901+ int "Time to wait after max password tries, in seconds"
65902+ default 30
65903+ help
65904+ This option specifies the time the user must wait after attempting to
65905+ authorize to the RBAC system with the maximum number of invalid
65906+ passwords. The higher the number, the harder it will be to brute-force
65907+ a password.
65908+
65909+endmenu
65910+menu "Filesystem Protections"
65911+depends on GRKERNSEC
65912+
65913+config GRKERNSEC_PROC
65914+ bool "Proc restrictions"
65915+ default y if GRKERNSEC_CONFIG_AUTO
65916+ help
65917+ If you say Y here, the permissions of the /proc filesystem
65918+ will be altered to enhance system security and privacy. You MUST
65919+ choose either a user only restriction or a user and group restriction.
65920+ Depending upon the option you choose, you can either restrict users to
65921+ see only the processes they themselves run, or choose a group that can
65922+ view all processes and files normally restricted to root if you choose
65923+ the "restrict to user only" option. NOTE: If you're running identd or
65924+ ntpd as a non-root user, you will have to run it as the group you
65925+ specify here.
65926+
65927+config GRKERNSEC_PROC_USER
65928+ bool "Restrict /proc to user only"
65929+ depends on GRKERNSEC_PROC
65930+ help
65931+ If you say Y here, non-root users will only be able to view their own
65932+ processes, and restricts them from viewing network-related information,
65933+ and viewing kernel symbol and module information.
65934+
65935+config GRKERNSEC_PROC_USERGROUP
65936+ bool "Allow special group"
65937+ default y if GRKERNSEC_CONFIG_AUTO
65938+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
65939+ help
65940+ If you say Y here, you will be able to select a group that will be
65941+ able to view all processes and network-related information. If you've
65942+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
65943+ remain hidden. This option is useful if you want to run identd as
65944+ a non-root user. The group you select may also be chosen at boot time
65945+ via "grsec_proc_gid=" on the kernel commandline.
65946+
65947+config GRKERNSEC_PROC_GID
65948+ int "GID for special group"
65949+ depends on GRKERNSEC_PROC_USERGROUP
65950+ default 1001
65951+
65952+config GRKERNSEC_PROC_ADD
65953+ bool "Additional restrictions"
65954+ default y if GRKERNSEC_CONFIG_AUTO
65955+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
65956+ help
65957+ If you say Y here, additional restrictions will be placed on
65958+ /proc that keep normal users from viewing device information and
65959+ slabinfo information that could be useful for exploits.
65960+
65961+config GRKERNSEC_LINK
65962+ bool "Linking restrictions"
65963+ default y if GRKERNSEC_CONFIG_AUTO
65964+ help
65965+ If you say Y here, /tmp race exploits will be prevented, since users
65966+ will no longer be able to follow symlinks owned by other users in
65967+ world-writable +t directories (e.g. /tmp), unless the owner of the
65968+ symlink is the owner of the directory. users will also not be
65969+ able to hardlink to files they do not own. If the sysctl option is
65970+ enabled, a sysctl option with name "linking_restrictions" is created.
65971+
65972+config GRKERNSEC_SYMLINKOWN
65973+ bool "Kernel-enforced SymlinksIfOwnerMatch"
65974+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
65975+ help
65976+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
65977+ that prevents it from being used as a security feature. As Apache
65978+ verifies the symlink by performing a stat() against the target of
65979+ the symlink before it is followed, an attacker can setup a symlink
65980+ to point to a same-owned file, then replace the symlink with one
65981+ that targets another user's file just after Apache "validates" the
65982+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
65983+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
65984+ will be in place for the group you specify. If the sysctl option
65985+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
65986+ created.
65987+
65988+config GRKERNSEC_SYMLINKOWN_GID
65989+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
65990+ depends on GRKERNSEC_SYMLINKOWN
65991+ default 1006
65992+ help
65993+ Setting this GID determines what group kernel-enforced
65994+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
65995+ is enabled, a sysctl option with name "symlinkown_gid" is created.
65996+
65997+config GRKERNSEC_FIFO
65998+ bool "FIFO restrictions"
65999+ default y if GRKERNSEC_CONFIG_AUTO
66000+ help
66001+ If you say Y here, users will not be able to write to FIFOs they don't
66002+ own in world-writable +t directories (e.g. /tmp), unless the owner of
66003+ the FIFO is the same owner of the directory it's held in. If the sysctl
66004+ option is enabled, a sysctl option with name "fifo_restrictions" is
66005+ created.
66006+
66007+config GRKERNSEC_SYSFS_RESTRICT
66008+ bool "Sysfs/debugfs restriction"
66009+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
66010+ depends on SYSFS
66011+ help
66012+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
66013+ any filesystem normally mounted under it (e.g. debugfs) will be
66014+ mostly accessible only by root. These filesystems generally provide access
66015+ to hardware and debug information that isn't appropriate for unprivileged
66016+ users of the system. Sysfs and debugfs have also become a large source
66017+ of new vulnerabilities, ranging from infoleaks to local compromise.
66018+ There has been very little oversight with an eye toward security involved
66019+ in adding new exporters of information to these filesystems, so their
66020+ use is discouraged.
66021+ For reasons of compatibility, a few directories have been whitelisted
66022+ for access by non-root users:
66023+ /sys/fs/selinux
66024+ /sys/fs/fuse
66025+ /sys/devices/system/cpu
66026+
66027+config GRKERNSEC_ROFS
66028+ bool "Runtime read-only mount protection"
66029+ depends on SYSCTL
66030+ help
66031+ If you say Y here, a sysctl option with name "romount_protect" will
66032+ be created. By setting this option to 1 at runtime, filesystems
66033+ will be protected in the following ways:
66034+ * No new writable mounts will be allowed
66035+ * Existing read-only mounts won't be able to be remounted read/write
66036+ * Write operations will be denied on all block devices
66037+ This option acts independently of grsec_lock: once it is set to 1,
66038+ it cannot be turned off. Therefore, please be mindful of the resulting
66039+ behavior if this option is enabled in an init script on a read-only
66040+ filesystem.
66041+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
66042+ and GRKERNSEC_IO should be enabled and module loading disabled via
66043+ config or at runtime.
66044+ This feature is mainly intended for secure embedded systems.
66045+
66046+
66047+config GRKERNSEC_DEVICE_SIDECHANNEL
66048+ bool "Eliminate stat/notify-based device sidechannels"
66049+ default y if GRKERNSEC_CONFIG_AUTO
66050+ help
66051+ If you say Y here, timing analyses on block or character
66052+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
66053+ will be thwarted for unprivileged users. If a process without
66054+ CAP_MKNOD stats such a device, the last access and last modify times
66055+ will match the device's create time. No access or modify events
66056+ will be triggered through inotify/dnotify/fanotify for such devices.
66057+ This feature will prevent attacks that may at a minimum
66058+ allow an attacker to determine the administrator's password length.
66059+
66060+config GRKERNSEC_CHROOT
66061+ bool "Chroot jail restrictions"
66062+ default y if GRKERNSEC_CONFIG_AUTO
66063+ help
66064+ If you say Y here, you will be able to choose several options that will
66065+ make breaking out of a chrooted jail much more difficult. If you
66066+ encounter no software incompatibilities with the following options, it
66067+ is recommended that you enable each one.
66068+
66069+ Note that the chroot restrictions are not intended to apply to "chroots"
66070+ to directories that are simple bind mounts of the global root filesystem.
66071+ For several other reasons, a user shouldn't expect any significant
66072+ security by performing such a chroot.
66073+
66074+config GRKERNSEC_CHROOT_MOUNT
66075+ bool "Deny mounts"
66076+ default y if GRKERNSEC_CONFIG_AUTO
66077+ depends on GRKERNSEC_CHROOT
66078+ help
66079+ If you say Y here, processes inside a chroot will not be able to
66080+ mount or remount filesystems. If the sysctl option is enabled, a
66081+ sysctl option with name "chroot_deny_mount" is created.
66082+
66083+config GRKERNSEC_CHROOT_DOUBLE
66084+ bool "Deny double-chroots"
66085+ default y if GRKERNSEC_CONFIG_AUTO
66086+ depends on GRKERNSEC_CHROOT
66087+ help
66088+ If you say Y here, processes inside a chroot will not be able to chroot
66089+ again outside the chroot. This is a widely used method of breaking
66090+ out of a chroot jail and should not be allowed. If the sysctl
66091+ option is enabled, a sysctl option with name
66092+ "chroot_deny_chroot" is created.
66093+
66094+config GRKERNSEC_CHROOT_PIVOT
66095+ bool "Deny pivot_root in chroot"
66096+ default y if GRKERNSEC_CONFIG_AUTO
66097+ depends on GRKERNSEC_CHROOT
66098+ help
66099+ If you say Y here, processes inside a chroot will not be able to use
66100+ a function called pivot_root() that was introduced in Linux 2.3.41. It
66101+ works similar to chroot in that it changes the root filesystem. This
66102+ function could be misused in a chrooted process to attempt to break out
66103+ of the chroot, and therefore should not be allowed. If the sysctl
66104+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
66105+ created.
66106+
66107+config GRKERNSEC_CHROOT_CHDIR
66108+ bool "Enforce chdir(\"/\") on all chroots"
66109+ default y if GRKERNSEC_CONFIG_AUTO
66110+ depends on GRKERNSEC_CHROOT
66111+ help
66112+ If you say Y here, the current working directory of all newly-chrooted
66113+ applications will be set to the the root directory of the chroot.
66114+ The man page on chroot(2) states:
66115+ Note that this call does not change the current working
66116+ directory, so that `.' can be outside the tree rooted at
66117+ `/'. In particular, the super-user can escape from a
66118+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
66119+
66120+ It is recommended that you say Y here, since it's not known to break
66121+ any software. If the sysctl option is enabled, a sysctl option with
66122+ name "chroot_enforce_chdir" is created.
66123+
66124+config GRKERNSEC_CHROOT_CHMOD
66125+ bool "Deny (f)chmod +s"
66126+ default y if GRKERNSEC_CONFIG_AUTO
66127+ depends on GRKERNSEC_CHROOT
66128+ help
66129+ If you say Y here, processes inside a chroot will not be able to chmod
66130+ or fchmod files to make them have suid or sgid bits. This protects
66131+ against another published method of breaking a chroot. If the sysctl
66132+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
66133+ created.
66134+
66135+config GRKERNSEC_CHROOT_FCHDIR
66136+ bool "Deny fchdir and fhandle out of chroot"
66137+ default y if GRKERNSEC_CONFIG_AUTO
66138+ depends on GRKERNSEC_CHROOT
66139+ help
66140+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
66141+ to a file descriptor of the chrooting process that points to a directory
66142+ outside the filesystem will be stopped. Additionally, this option prevents
66143+ use of the recently-created syscall for opening files by a guessable "file
66144+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
66145+ with name "chroot_deny_fchdir" is created.
66146+
66147+config GRKERNSEC_CHROOT_MKNOD
66148+ bool "Deny mknod"
66149+ default y if GRKERNSEC_CONFIG_AUTO
66150+ depends on GRKERNSEC_CHROOT
66151+ help
66152+ If you say Y here, processes inside a chroot will not be allowed to
66153+ mknod. The problem with using mknod inside a chroot is that it
66154+ would allow an attacker to create a device entry that is the same
66155+ as one on the physical root of your system, which could range from
66156+ anything from the console device to a device for your harddrive (which
66157+ they could then use to wipe the drive or steal data). It is recommended
66158+ that you say Y here, unless you run into software incompatibilities.
66159+ If the sysctl option is enabled, a sysctl option with name
66160+ "chroot_deny_mknod" is created.
66161+
66162+config GRKERNSEC_CHROOT_SHMAT
66163+ bool "Deny shmat() out of chroot"
66164+ default y if GRKERNSEC_CONFIG_AUTO
66165+ depends on GRKERNSEC_CHROOT
66166+ help
66167+ If you say Y here, processes inside a chroot will not be able to attach
66168+ to shared memory segments that were created outside of the chroot jail.
66169+ It is recommended that you say Y here. If the sysctl option is enabled,
66170+ a sysctl option with name "chroot_deny_shmat" is created.
66171+
66172+config GRKERNSEC_CHROOT_UNIX
66173+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
66174+ default y if GRKERNSEC_CONFIG_AUTO
66175+ depends on GRKERNSEC_CHROOT
66176+ help
66177+ If you say Y here, processes inside a chroot will not be able to
66178+ connect to abstract (meaning not belonging to a filesystem) Unix
66179+ domain sockets that were bound outside of a chroot. It is recommended
66180+ that you say Y here. If the sysctl option is enabled, a sysctl option
66181+ with name "chroot_deny_unix" is created.
66182+
66183+config GRKERNSEC_CHROOT_FINDTASK
66184+ bool "Protect outside processes"
66185+ default y if GRKERNSEC_CONFIG_AUTO
66186+ depends on GRKERNSEC_CHROOT
66187+ help
66188+ If you say Y here, processes inside a chroot will not be able to
66189+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
66190+ getsid, or view any process outside of the chroot. If the sysctl
66191+ option is enabled, a sysctl option with name "chroot_findtask" is
66192+ created.
66193+
66194+config GRKERNSEC_CHROOT_NICE
66195+ bool "Restrict priority changes"
66196+ default y if GRKERNSEC_CONFIG_AUTO
66197+ depends on GRKERNSEC_CHROOT
66198+ help
66199+ If you say Y here, processes inside a chroot will not be able to raise
66200+ the priority of processes in the chroot, or alter the priority of
66201+ processes outside the chroot. This provides more security than simply
66202+ removing CAP_SYS_NICE from the process' capability set. If the
66203+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
66204+ is created.
66205+
66206+config GRKERNSEC_CHROOT_SYSCTL
66207+ bool "Deny sysctl writes"
66208+ default y if GRKERNSEC_CONFIG_AUTO
66209+ depends on GRKERNSEC_CHROOT
66210+ help
66211+ If you say Y here, an attacker in a chroot will not be able to
66212+ write to sysctl entries, either by sysctl(2) or through a /proc
66213+ interface. It is strongly recommended that you say Y here. If the
66214+ sysctl option is enabled, a sysctl option with name
66215+ "chroot_deny_sysctl" is created.
66216+
66217+config GRKERNSEC_CHROOT_CAPS
66218+ bool "Capability restrictions"
66219+ default y if GRKERNSEC_CONFIG_AUTO
66220+ depends on GRKERNSEC_CHROOT
66221+ help
66222+ If you say Y here, the capabilities on all processes within a
66223+ chroot jail will be lowered to stop module insertion, raw i/o,
66224+ system and net admin tasks, rebooting the system, modifying immutable
66225+ files, modifying IPC owned by another, and changing the system time.
66226+ This is left an option because it can break some apps. Disable this
66227+ if your chrooted apps are having problems performing those kinds of
66228+ tasks. If the sysctl option is enabled, a sysctl option with
66229+ name "chroot_caps" is created.
66230+
66231+config GRKERNSEC_CHROOT_INITRD
66232+ bool "Exempt initrd tasks from restrictions"
66233+ default y if GRKERNSEC_CONFIG_AUTO
66234+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
66235+ help
66236+ If you say Y here, tasks started prior to init will be exempted from
66237+ grsecurity's chroot restrictions. This option is mainly meant to
66238+ resolve Plymouth's performing privileged operations unnecessarily
66239+ in a chroot.
66240+
66241+endmenu
66242+menu "Kernel Auditing"
66243+depends on GRKERNSEC
66244+
66245+config GRKERNSEC_AUDIT_GROUP
66246+ bool "Single group for auditing"
66247+ help
66248+ If you say Y here, the exec and chdir logging features will only operate
66249+ on a group you specify. This option is recommended if you only want to
66250+ watch certain users instead of having a large amount of logs from the
66251+ entire system. If the sysctl option is enabled, a sysctl option with
66252+ name "audit_group" is created.
66253+
66254+config GRKERNSEC_AUDIT_GID
66255+ int "GID for auditing"
66256+ depends on GRKERNSEC_AUDIT_GROUP
66257+ default 1007
66258+
66259+config GRKERNSEC_EXECLOG
66260+ bool "Exec logging"
66261+ help
66262+ If you say Y here, all execve() calls will be logged (since the
66263+ other exec*() calls are frontends to execve(), all execution
66264+ will be logged). Useful for shell-servers that like to keep track
66265+ of their users. If the sysctl option is enabled, a sysctl option with
66266+ name "exec_logging" is created.
66267+ WARNING: This option when enabled will produce a LOT of logs, especially
66268+ on an active system.
66269+
66270+config GRKERNSEC_RESLOG
66271+ bool "Resource logging"
66272+ default y if GRKERNSEC_CONFIG_AUTO
66273+ help
66274+ If you say Y here, all attempts to overstep resource limits will
66275+ be logged with the resource name, the requested size, and the current
66276+ limit. It is highly recommended that you say Y here. If the sysctl
66277+ option is enabled, a sysctl option with name "resource_logging" is
66278+ created. If the RBAC system is enabled, the sysctl value is ignored.
66279+
66280+config GRKERNSEC_CHROOT_EXECLOG
66281+ bool "Log execs within chroot"
66282+ help
66283+ If you say Y here, all executions inside a chroot jail will be logged
66284+ to syslog. This can cause a large amount of logs if certain
66285+ applications (eg. djb's daemontools) are installed on the system, and
66286+ is therefore left as an option. If the sysctl option is enabled, a
66287+ sysctl option with name "chroot_execlog" is created.
66288+
66289+config GRKERNSEC_AUDIT_PTRACE
66290+ bool "Ptrace logging"
66291+ help
66292+ If you say Y here, all attempts to attach to a process via ptrace
66293+ will be logged. If the sysctl option is enabled, a sysctl option
66294+ with name "audit_ptrace" is created.
66295+
66296+config GRKERNSEC_AUDIT_CHDIR
66297+ bool "Chdir logging"
66298+ help
66299+ If you say Y here, all chdir() calls will be logged. If the sysctl
66300+ option is enabled, a sysctl option with name "audit_chdir" is created.
66301+
66302+config GRKERNSEC_AUDIT_MOUNT
66303+ bool "(Un)Mount logging"
66304+ help
66305+ If you say Y here, all mounts and unmounts will be logged. If the
66306+ sysctl option is enabled, a sysctl option with name "audit_mount" is
66307+ created.
66308+
66309+config GRKERNSEC_SIGNAL
66310+ bool "Signal logging"
66311+ default y if GRKERNSEC_CONFIG_AUTO
66312+ help
66313+ If you say Y here, certain important signals will be logged, such as
66314+ SIGSEGV, which will as a result inform you of when a error in a program
66315+ occurred, which in some cases could mean a possible exploit attempt.
66316+ If the sysctl option is enabled, a sysctl option with name
66317+ "signal_logging" is created.
66318+
66319+config GRKERNSEC_FORKFAIL
66320+ bool "Fork failure logging"
66321+ help
66322+ If you say Y here, all failed fork() attempts will be logged.
66323+ This could suggest a fork bomb, or someone attempting to overstep
66324+ their process limit. If the sysctl option is enabled, a sysctl option
66325+ with name "forkfail_logging" is created.
66326+
66327+config GRKERNSEC_TIME
66328+ bool "Time change logging"
66329+ default y if GRKERNSEC_CONFIG_AUTO
66330+ help
66331+ If you say Y here, any changes of the system clock will be logged.
66332+ If the sysctl option is enabled, a sysctl option with name
66333+ "timechange_logging" is created.
66334+
66335+config GRKERNSEC_PROC_IPADDR
66336+ bool "/proc/<pid>/ipaddr support"
66337+ default y if GRKERNSEC_CONFIG_AUTO
66338+ help
66339+ If you say Y here, a new entry will be added to each /proc/<pid>
66340+ directory that contains the IP address of the person using the task.
66341+ The IP is carried across local TCP and AF_UNIX stream sockets.
66342+ This information can be useful for IDS/IPSes to perform remote response
66343+ to a local attack. The entry is readable by only the owner of the
66344+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
66345+ the RBAC system), and thus does not create privacy concerns.
66346+
66347+config GRKERNSEC_RWXMAP_LOG
66348+ bool 'Denied RWX mmap/mprotect logging'
66349+ default y if GRKERNSEC_CONFIG_AUTO
66350+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
66351+ help
66352+ If you say Y here, calls to mmap() and mprotect() with explicit
66353+ usage of PROT_WRITE and PROT_EXEC together will be logged when
66354+ denied by the PAX_MPROTECT feature. This feature will also
66355+ log other problematic scenarios that can occur when PAX_MPROTECT
66356+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
66357+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
66358+ is created.
66359+
66360+endmenu
66361+
66362+menu "Executable Protections"
66363+depends on GRKERNSEC
66364+
66365+config GRKERNSEC_DMESG
66366+ bool "Dmesg(8) restriction"
66367+ default y if GRKERNSEC_CONFIG_AUTO
66368+ help
66369+ If you say Y here, non-root users will not be able to use dmesg(8)
66370+ to view the contents of the kernel's circular log buffer.
66371+ The kernel's log buffer often contains kernel addresses and other
66372+ identifying information useful to an attacker in fingerprinting a
66373+ system for a targeted exploit.
66374+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
66375+ created.
66376+
66377+config GRKERNSEC_HARDEN_PTRACE
66378+ bool "Deter ptrace-based process snooping"
66379+ default y if GRKERNSEC_CONFIG_AUTO
66380+ help
66381+ If you say Y here, TTY sniffers and other malicious monitoring
66382+ programs implemented through ptrace will be defeated. If you
66383+ have been using the RBAC system, this option has already been
66384+ enabled for several years for all users, with the ability to make
66385+ fine-grained exceptions.
66386+
66387+ This option only affects the ability of non-root users to ptrace
66388+ processes that are not a descendent of the ptracing process.
66389+ This means that strace ./binary and gdb ./binary will still work,
66390+ but attaching to arbitrary processes will not. If the sysctl
66391+ option is enabled, a sysctl option with name "harden_ptrace" is
66392+ created.
66393+
66394+config GRKERNSEC_PTRACE_READEXEC
66395+ bool "Require read access to ptrace sensitive binaries"
66396+ default y if GRKERNSEC_CONFIG_AUTO
66397+ help
66398+ If you say Y here, unprivileged users will not be able to ptrace unreadable
66399+ binaries. This option is useful in environments that
66400+ remove the read bits (e.g. file mode 4711) from suid binaries to
66401+ prevent infoleaking of their contents. This option adds
66402+ consistency to the use of that file mode, as the binary could normally
66403+ be read out when run without privileges while ptracing.
66404+
66405+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
66406+ is created.
66407+
66408+config GRKERNSEC_SETXID
66409+ bool "Enforce consistent multithreaded privileges"
66410+ default y if GRKERNSEC_CONFIG_AUTO
66411+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
66412+ help
66413+ If you say Y here, a change from a root uid to a non-root uid
66414+ in a multithreaded application will cause the resulting uids,
66415+ gids, supplementary groups, and capabilities in that thread
66416+ to be propagated to the other threads of the process. In most
66417+ cases this is unnecessary, as glibc will emulate this behavior
66418+ on behalf of the application. Other libcs do not act in the
66419+ same way, allowing the other threads of the process to continue
66420+ running with root privileges. If the sysctl option is enabled,
66421+ a sysctl option with name "consistent_setxid" is created.
66422+
66423+config GRKERNSEC_HARDEN_IPC
66424+ bool "Disallow access to overly-permissive IPC objects"
66425+ default y if GRKERNSEC_CONFIG_AUTO
66426+ depends on SYSVIPC
66427+ help
66428+ If you say Y here, access to overly-permissive IPC objects (shared
66429+ memory, message queues, and semaphores) will be denied for processes
66430+ given the following criteria beyond normal permission checks:
66431+ 1) If the IPC object is world-accessible and the euid doesn't match
66432+ that of the creator or current uid for the IPC object
66433+ 2) If the IPC object is group-accessible and the egid doesn't
66434+ match that of the creator or current gid for the IPC object
66435+ It's a common error to grant too much permission to these objects,
66436+ with impact ranging from denial of service and information leaking to
66437+ privilege escalation. This feature was developed in response to
66438+ research by Tim Brown:
66439+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
66440+ who found hundreds of such insecure usages. Processes with
66441+ CAP_IPC_OWNER are still permitted to access these IPC objects.
66442+ If the sysctl option is enabled, a sysctl option with name
66443+ "harden_ipc" is created.
66444+
66445+config GRKERNSEC_TPE
66446+ bool "Trusted Path Execution (TPE)"
66447+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
66448+ help
66449+ If you say Y here, you will be able to choose a gid to add to the
66450+ supplementary groups of users you want to mark as "untrusted."
66451+ These users will not be able to execute any files that are not in
66452+ root-owned directories writable only by root. If the sysctl option
66453+ is enabled, a sysctl option with name "tpe" is created.
66454+
66455+config GRKERNSEC_TPE_ALL
66456+ bool "Partially restrict all non-root users"
66457+ depends on GRKERNSEC_TPE
66458+ help
66459+ If you say Y here, all non-root users will be covered under
66460+ a weaker TPE restriction. This is separate from, and in addition to,
66461+ the main TPE options that you have selected elsewhere. Thus, if a
66462+ "trusted" GID is chosen, this restriction applies to even that GID.
66463+ Under this restriction, all non-root users will only be allowed to
66464+ execute files in directories they own that are not group or
66465+ world-writable, or in directories owned by root and writable only by
66466+ root. If the sysctl option is enabled, a sysctl option with name
66467+ "tpe_restrict_all" is created.
66468+
66469+config GRKERNSEC_TPE_INVERT
66470+ bool "Invert GID option"
66471+ depends on GRKERNSEC_TPE
66472+ help
66473+ If you say Y here, the group you specify in the TPE configuration will
66474+ decide what group TPE restrictions will be *disabled* for. This
66475+ option is useful if you want TPE restrictions to be applied to most
66476+ users on the system. If the sysctl option is enabled, a sysctl option
66477+ with name "tpe_invert" is created. Unlike other sysctl options, this
66478+ entry will default to on for backward-compatibility.
66479+
66480+config GRKERNSEC_TPE_GID
66481+ int
66482+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
66483+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
66484+
66485+config GRKERNSEC_TPE_UNTRUSTED_GID
66486+ int "GID for TPE-untrusted users"
66487+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
66488+ default 1005
66489+ help
66490+ Setting this GID determines what group TPE restrictions will be
66491+ *enabled* for. If the sysctl option is enabled, a sysctl option
66492+ with name "tpe_gid" is created.
66493+
66494+config GRKERNSEC_TPE_TRUSTED_GID
66495+ int "GID for TPE-trusted users"
66496+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
66497+ default 1005
66498+ help
66499+ Setting this GID determines what group TPE restrictions will be
66500+ *disabled* for. If the sysctl option is enabled, a sysctl option
66501+ with name "tpe_gid" is created.
66502+
66503+endmenu
66504+menu "Network Protections"
66505+depends on GRKERNSEC
66506+
66507+config GRKERNSEC_RANDNET
66508+ bool "Larger entropy pools"
66509+ default y if GRKERNSEC_CONFIG_AUTO
66510+ help
66511+ If you say Y here, the entropy pools used for many features of Linux
66512+ and grsecurity will be doubled in size. Since several grsecurity
66513+ features use additional randomness, it is recommended that you say Y
66514+ here. Saying Y here has a similar effect as modifying
66515+ /proc/sys/kernel/random/poolsize.
66516+
66517+config GRKERNSEC_BLACKHOLE
66518+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
66519+ default y if GRKERNSEC_CONFIG_AUTO
66520+ depends on NET
66521+ help
66522+ If you say Y here, neither TCP resets nor ICMP
66523+ destination-unreachable packets will be sent in response to packets
66524+ sent to ports for which no associated listening process exists.
66525+ This feature supports both IPV4 and IPV6 and exempts the
66526+ loopback interface from blackholing. Enabling this feature
66527+ makes a host more resilient to DoS attacks and reduces network
66528+ visibility against scanners.
66529+
66530+ The blackhole feature as-implemented is equivalent to the FreeBSD
66531+ blackhole feature, as it prevents RST responses to all packets, not
66532+ just SYNs. Under most application behavior this causes no
66533+ problems, but applications (like haproxy) may not close certain
66534+ connections in a way that cleanly terminates them on the remote
66535+ end, leaving the remote host in LAST_ACK state. Because of this
66536+ side-effect and to prevent intentional LAST_ACK DoSes, this
66537+ feature also adds automatic mitigation against such attacks.
66538+ The mitigation drastically reduces the amount of time a socket
66539+ can spend in LAST_ACK state. If you're using haproxy and not
66540+ all servers it connects to have this option enabled, consider
66541+ disabling this feature on the haproxy host.
66542+
66543+ If the sysctl option is enabled, two sysctl options with names
66544+ "ip_blackhole" and "lastack_retries" will be created.
66545+ While "ip_blackhole" takes the standard zero/non-zero on/off
66546+ toggle, "lastack_retries" uses the same kinds of values as
66547+ "tcp_retries1" and "tcp_retries2". The default value of 4
66548+ prevents a socket from lasting more than 45 seconds in LAST_ACK
66549+ state.
66550+
66551+config GRKERNSEC_NO_SIMULT_CONNECT
66552+ bool "Disable TCP Simultaneous Connect"
66553+ default y if GRKERNSEC_CONFIG_AUTO
66554+ depends on NET
66555+ help
66556+ If you say Y here, a feature by Willy Tarreau will be enabled that
66557+ removes a weakness in Linux's strict implementation of TCP that
66558+ allows two clients to connect to each other without either entering
66559+ a listening state. The weakness allows an attacker to easily prevent
66560+ a client from connecting to a known server provided the source port
66561+ for the connection is guessed correctly.
66562+
66563+ As the weakness could be used to prevent an antivirus or IPS from
66564+ fetching updates, or prevent an SSL gateway from fetching a CRL,
66565+ it should be eliminated by enabling this option. Though Linux is
66566+ one of few operating systems supporting simultaneous connect, it
66567+ has no legitimate use in practice and is rarely supported by firewalls.
66568+
66569+config GRKERNSEC_SOCKET
66570+ bool "Socket restrictions"
66571+ depends on NET
66572+ help
66573+ If you say Y here, you will be able to choose from several options.
66574+ If you assign a GID on your system and add it to the supplementary
66575+ groups of users you want to restrict socket access to, this patch
66576+ will perform up to three things, based on the option(s) you choose.
66577+
66578+config GRKERNSEC_SOCKET_ALL
66579+ bool "Deny any sockets to group"
66580+ depends on GRKERNSEC_SOCKET
66581+ help
66582+ If you say Y here, you will be able to choose a GID of whose users will
66583+ be unable to connect to other hosts from your machine or run server
66584+ applications from your machine. If the sysctl option is enabled, a
66585+ sysctl option with name "socket_all" is created.
66586+
66587+config GRKERNSEC_SOCKET_ALL_GID
66588+ int "GID to deny all sockets for"
66589+ depends on GRKERNSEC_SOCKET_ALL
66590+ default 1004
66591+ help
66592+ Here you can choose the GID to disable socket access for. Remember to
66593+ add the users you want socket access disabled for to the GID
66594+ specified here. If the sysctl option is enabled, a sysctl option
66595+ with name "socket_all_gid" is created.
66596+
66597+config GRKERNSEC_SOCKET_CLIENT
66598+ bool "Deny client sockets to group"
66599+ depends on GRKERNSEC_SOCKET
66600+ help
66601+ If you say Y here, you will be able to choose a GID of whose users will
66602+ be unable to connect to other hosts from your machine, but will be
66603+ able to run servers. If this option is enabled, all users in the group
66604+ you specify will have to use passive mode when initiating ftp transfers
66605+ from the shell on your machine. If the sysctl option is enabled, a
66606+ sysctl option with name "socket_client" is created.
66607+
66608+config GRKERNSEC_SOCKET_CLIENT_GID
66609+ int "GID to deny client sockets for"
66610+ depends on GRKERNSEC_SOCKET_CLIENT
66611+ default 1003
66612+ help
66613+ Here you can choose the GID to disable client socket access for.
66614+ Remember to add the users you want client socket access disabled for to
66615+ the GID specified here. If the sysctl option is enabled, a sysctl
66616+ option with name "socket_client_gid" is created.
66617+
66618+config GRKERNSEC_SOCKET_SERVER
66619+ bool "Deny server sockets to group"
66620+ depends on GRKERNSEC_SOCKET
66621+ help
66622+ If you say Y here, you will be able to choose a GID of whose users will
66623+ be unable to run server applications from your machine. If the sysctl
66624+ option is enabled, a sysctl option with name "socket_server" is created.
66625+
66626+config GRKERNSEC_SOCKET_SERVER_GID
66627+ int "GID to deny server sockets for"
66628+ depends on GRKERNSEC_SOCKET_SERVER
66629+ default 1002
66630+ help
66631+ Here you can choose the GID to disable server socket access for.
66632+ Remember to add the users you want server socket access disabled for to
66633+ the GID specified here. If the sysctl option is enabled, a sysctl
66634+ option with name "socket_server_gid" is created.
66635+
66636+endmenu
66637+
66638+menu "Physical Protections"
66639+depends on GRKERNSEC
66640+
66641+config GRKERNSEC_DENYUSB
66642+ bool "Deny new USB connections after toggle"
66643+ default y if GRKERNSEC_CONFIG_AUTO
66644+ depends on SYSCTL && USB_SUPPORT
66645+ help
66646+ If you say Y here, a new sysctl option with name "deny_new_usb"
66647+ will be created. Setting its value to 1 will prevent any new
66648+ USB devices from being recognized by the OS. Any attempted USB
66649+ device insertion will be logged. This option is intended to be
66650+ used against custom USB devices designed to exploit vulnerabilities
66651+ in various USB device drivers.
66652+
66653+ For greatest effectiveness, this sysctl should be set after any
66654+ relevant init scripts. This option is safe to enable in distros
66655+ as each user can choose whether or not to toggle the sysctl.
66656+
66657+config GRKERNSEC_DENYUSB_FORCE
66658+ bool "Reject all USB devices not connected at boot"
66659+ select USB
66660+ depends on GRKERNSEC_DENYUSB
66661+ help
66662+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
66663+ that doesn't involve a sysctl entry. This option should only be
66664+ enabled if you're sure you want to deny all new USB connections
66665+ at runtime and don't want to modify init scripts. This should not
66666+ be enabled by distros. It forces the core USB code to be built
66667+ into the kernel image so that all devices connected at boot time
66668+ can be recognized and new USB device connections can be prevented
66669+ prior to init running.
66670+
66671+endmenu
66672+
66673+menu "Sysctl Support"
66674+depends on GRKERNSEC && SYSCTL
66675+
66676+config GRKERNSEC_SYSCTL
66677+ bool "Sysctl support"
66678+ default y if GRKERNSEC_CONFIG_AUTO
66679+ help
66680+ If you say Y here, you will be able to change the options that
66681+ grsecurity runs with at bootup, without having to recompile your
66682+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
66683+ to enable (1) or disable (0) various features. All the sysctl entries
66684+ are mutable until the "grsec_lock" entry is set to a non-zero value.
66685+ All features enabled in the kernel configuration are disabled at boot
66686+ if you do not say Y to the "Turn on features by default" option.
66687+ All options should be set at startup, and the grsec_lock entry should
66688+ be set to a non-zero value after all the options are set.
66689+ *THIS IS EXTREMELY IMPORTANT*
66690+
66691+config GRKERNSEC_SYSCTL_DISTRO
66692+ bool "Extra sysctl support for distro makers (READ HELP)"
66693+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
66694+ help
66695+ If you say Y here, additional sysctl options will be created
66696+ for features that affect processes running as root. Therefore,
66697+ it is critical when using this option that the grsec_lock entry be
66698+ enabled after boot. Only distros with prebuilt kernel packages
66699+ with this option enabled that can ensure grsec_lock is enabled
66700+ after boot should use this option.
66701+ *Failure to set grsec_lock after boot makes all grsec features
66702+ this option covers useless*
66703+
66704+ Currently this option creates the following sysctl entries:
66705+ "Disable Privileged I/O": "disable_priv_io"
66706+
66707+config GRKERNSEC_SYSCTL_ON
66708+ bool "Turn on features by default"
66709+ default y if GRKERNSEC_CONFIG_AUTO
66710+ depends on GRKERNSEC_SYSCTL
66711+ help
66712+ If you say Y here, instead of having all features enabled in the
66713+ kernel configuration disabled at boot time, the features will be
66714+ enabled at boot time. It is recommended you say Y here unless
66715+ there is some reason you would want all sysctl-tunable features to
66716+ be disabled by default. As mentioned elsewhere, it is important
66717+ to enable the grsec_lock entry once you have finished modifying
66718+ the sysctl entries.
66719+
66720+endmenu
66721+menu "Logging Options"
66722+depends on GRKERNSEC
66723+
66724+config GRKERNSEC_FLOODTIME
66725+ int "Seconds in between log messages (minimum)"
66726+ default 10
66727+ help
66728+ This option allows you to enforce the number of seconds between
66729+ grsecurity log messages. The default should be suitable for most
66730+ people, however, if you choose to change it, choose a value small enough
66731+ to allow informative logs to be produced, but large enough to
66732+ prevent flooding.
66733+
66734+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
66735+ any rate limiting on grsecurity log messages.
66736+
66737+config GRKERNSEC_FLOODBURST
66738+ int "Number of messages in a burst (maximum)"
66739+ default 6
66740+ help
66741+ This option allows you to choose the maximum number of messages allowed
66742+ within the flood time interval you chose in a separate option. The
66743+ default should be suitable for most people, however if you find that
66744+ many of your logs are being interpreted as flooding, you may want to
66745+ raise this value.
66746+
66747+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
66748+ any rate limiting on grsecurity log messages.
66749+
66750+endmenu
66751diff --git a/grsecurity/Makefile b/grsecurity/Makefile
66752new file mode 100644
66753index 0000000..30ababb
66754--- /dev/null
66755+++ b/grsecurity/Makefile
66756@@ -0,0 +1,54 @@
66757+# grsecurity – access control and security hardening for Linux
66758+# All code in this directory and various hooks located throughout the Linux kernel are
66759+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
66760+# http://www.grsecurity.net spender@grsecurity.net
66761+#
66762+# This program is free software; you can redistribute it and/or
66763+# modify it under the terms of the GNU General Public License version 2
66764+# as published by the Free Software Foundation.
66765+#
66766+# This program is distributed in the hope that it will be useful,
66767+# but WITHOUT ANY WARRANTY; without even the implied warranty of
66768+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
66769+# GNU General Public License for more details.
66770+#
66771+# You should have received a copy of the GNU General Public License
66772+# along with this program; if not, write to the Free Software
66773+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
66774+
66775+KBUILD_CFLAGS += -Werror
66776+
66777+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
66778+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
66779+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
66780+ grsec_usb.o grsec_ipc.o grsec_proc.o
66781+
66782+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
66783+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
66784+ gracl_learn.o grsec_log.o gracl_policy.o
66785+ifdef CONFIG_COMPAT
66786+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
66787+endif
66788+
66789+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
66790+
66791+ifdef CONFIG_NET
66792+obj-y += grsec_sock.o
66793+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
66794+endif
66795+
66796+ifndef CONFIG_GRKERNSEC
66797+obj-y += grsec_disabled.o
66798+endif
66799+
66800+ifdef CONFIG_GRKERNSEC_HIDESYM
66801+extra-y := grsec_hidesym.o
66802+$(obj)/grsec_hidesym.o:
66803+ @-chmod -f 500 /boot
66804+ @-chmod -f 500 /lib/modules
66805+ @-chmod -f 500 /lib64/modules
66806+ @-chmod -f 500 /lib32/modules
66807+ @-chmod -f 700 .
66808+ @-chmod -f 700 $(objtree)
66809+ @echo ' grsec: protected kernel image paths'
66810+endif
66811diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
66812new file mode 100644
66813index 0000000..58223f6
66814--- /dev/null
66815+++ b/grsecurity/gracl.c
66816@@ -0,0 +1,2702 @@
66817+#include <linux/kernel.h>
66818+#include <linux/module.h>
66819+#include <linux/sched.h>
66820+#include <linux/mm.h>
66821+#include <linux/file.h>
66822+#include <linux/fs.h>
66823+#include <linux/namei.h>
66824+#include <linux/mount.h>
66825+#include <linux/tty.h>
66826+#include <linux/proc_fs.h>
66827+#include <linux/lglock.h>
66828+#include <linux/slab.h>
66829+#include <linux/vmalloc.h>
66830+#include <linux/types.h>
66831+#include <linux/sysctl.h>
66832+#include <linux/netdevice.h>
66833+#include <linux/ptrace.h>
66834+#include <linux/gracl.h>
66835+#include <linux/gralloc.h>
66836+#include <linux/security.h>
66837+#include <linux/grinternal.h>
66838+#include <linux/pid_namespace.h>
66839+#include <linux/stop_machine.h>
66840+#include <linux/fdtable.h>
66841+#include <linux/percpu.h>
66842+#include <linux/lglock.h>
66843+#include <linux/hugetlb.h>
66844+#include <linux/posix-timers.h>
66845+#include <linux/prefetch.h>
66846+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
66847+#include <linux/magic.h>
66848+#include <linux/pagemap.h>
66849+#include "../fs/btrfs/async-thread.h"
66850+#include "../fs/btrfs/ctree.h"
66851+#include "../fs/btrfs/btrfs_inode.h"
66852+#endif
66853+#include "../fs/mount.h"
66854+
66855+#include <asm/uaccess.h>
66856+#include <asm/errno.h>
66857+#include <asm/mman.h>
66858+
66859+#define FOR_EACH_ROLE_START(role) \
66860+ role = running_polstate.role_list; \
66861+ while (role) {
66862+
66863+#define FOR_EACH_ROLE_END(role) \
66864+ role = role->prev; \
66865+ }
66866+
66867+extern struct path gr_real_root;
66868+
66869+static struct gr_policy_state running_polstate;
66870+struct gr_policy_state *polstate = &running_polstate;
66871+extern struct gr_alloc_state *current_alloc_state;
66872+
66873+extern char *gr_shared_page[4];
66874+DEFINE_RWLOCK(gr_inode_lock);
66875+
66876+static unsigned int gr_status __read_only = GR_STATUS_INIT;
66877+
66878+#ifdef CONFIG_NET
66879+extern struct vfsmount *sock_mnt;
66880+#endif
66881+
66882+extern struct vfsmount *pipe_mnt;
66883+extern struct vfsmount *shm_mnt;
66884+
66885+#ifdef CONFIG_HUGETLBFS
66886+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
66887+#endif
66888+
66889+extern u16 acl_sp_role_value;
66890+extern struct acl_object_label *fakefs_obj_rw;
66891+extern struct acl_object_label *fakefs_obj_rwx;
66892+
66893+int gr_acl_is_enabled(void)
66894+{
66895+ return (gr_status & GR_READY);
66896+}
66897+
66898+void gr_enable_rbac_system(void)
66899+{
66900+ pax_open_kernel();
66901+ gr_status |= GR_READY;
66902+ pax_close_kernel();
66903+}
66904+
66905+int gr_rbac_disable(void *unused)
66906+{
66907+ pax_open_kernel();
66908+ gr_status &= ~GR_READY;
66909+ pax_close_kernel();
66910+
66911+ return 0;
66912+}
66913+
66914+static inline dev_t __get_dev(const struct dentry *dentry)
66915+{
66916+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
66917+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
66918+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
66919+ else
66920+#endif
66921+ return dentry->d_sb->s_dev;
66922+}
66923+
66924+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
66925+{
66926+ return __get_dev(dentry);
66927+}
66928+
66929+static char gr_task_roletype_to_char(struct task_struct *task)
66930+{
66931+ switch (task->role->roletype &
66932+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
66933+ GR_ROLE_SPECIAL)) {
66934+ case GR_ROLE_DEFAULT:
66935+ return 'D';
66936+ case GR_ROLE_USER:
66937+ return 'U';
66938+ case GR_ROLE_GROUP:
66939+ return 'G';
66940+ case GR_ROLE_SPECIAL:
66941+ return 'S';
66942+ }
66943+
66944+ return 'X';
66945+}
66946+
66947+char gr_roletype_to_char(void)
66948+{
66949+ return gr_task_roletype_to_char(current);
66950+}
66951+
66952+__inline__ int
66953+gr_acl_tpe_check(void)
66954+{
66955+ if (unlikely(!(gr_status & GR_READY)))
66956+ return 0;
66957+ if (current->role->roletype & GR_ROLE_TPE)
66958+ return 1;
66959+ else
66960+ return 0;
66961+}
66962+
66963+int
66964+gr_handle_rawio(const struct inode *inode)
66965+{
66966+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
66967+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
66968+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
66969+ !capable(CAP_SYS_RAWIO))
66970+ return 1;
66971+#endif
66972+ return 0;
66973+}
66974+
66975+int
66976+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
66977+{
66978+ if (likely(lena != lenb))
66979+ return 0;
66980+
66981+ return !memcmp(a, b, lena);
66982+}
66983+
66984+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
66985+{
66986+ *buflen -= namelen;
66987+ if (*buflen < 0)
66988+ return -ENAMETOOLONG;
66989+ *buffer -= namelen;
66990+ memcpy(*buffer, str, namelen);
66991+ return 0;
66992+}
66993+
66994+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
66995+{
66996+ return prepend(buffer, buflen, name->name, name->len);
66997+}
66998+
66999+static int prepend_path(const struct path *path, struct path *root,
67000+ char **buffer, int *buflen)
67001+{
67002+ struct dentry *dentry = path->dentry;
67003+ struct vfsmount *vfsmnt = path->mnt;
67004+ struct mount *mnt = real_mount(vfsmnt);
67005+ bool slash = false;
67006+ int error = 0;
67007+
67008+ while (dentry != root->dentry || vfsmnt != root->mnt) {
67009+ struct dentry * parent;
67010+
67011+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
67012+ /* Global root? */
67013+ if (!mnt_has_parent(mnt)) {
67014+ goto out;
67015+ }
67016+ dentry = mnt->mnt_mountpoint;
67017+ mnt = mnt->mnt_parent;
67018+ vfsmnt = &mnt->mnt;
67019+ continue;
67020+ }
67021+ parent = dentry->d_parent;
67022+ prefetch(parent);
67023+ spin_lock(&dentry->d_lock);
67024+ error = prepend_name(buffer, buflen, &dentry->d_name);
67025+ spin_unlock(&dentry->d_lock);
67026+ if (!error)
67027+ error = prepend(buffer, buflen, "/", 1);
67028+ if (error)
67029+ break;
67030+
67031+ slash = true;
67032+ dentry = parent;
67033+ }
67034+
67035+out:
67036+ if (!error && !slash)
67037+ error = prepend(buffer, buflen, "/", 1);
67038+
67039+ return error;
67040+}
67041+
67042+/* this must be called with mount_lock and rename_lock held */
67043+
67044+static char *__our_d_path(const struct path *path, struct path *root,
67045+ char *buf, int buflen)
67046+{
67047+ char *res = buf + buflen;
67048+ int error;
67049+
67050+ prepend(&res, &buflen, "\0", 1);
67051+ error = prepend_path(path, root, &res, &buflen);
67052+ if (error)
67053+ return ERR_PTR(error);
67054+
67055+ return res;
67056+}
67057+
67058+static char *
67059+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
67060+{
67061+ char *retval;
67062+
67063+ retval = __our_d_path(path, root, buf, buflen);
67064+ if (unlikely(IS_ERR(retval)))
67065+ retval = strcpy(buf, "<path too long>");
67066+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
67067+ retval[1] = '\0';
67068+
67069+ return retval;
67070+}
67071+
67072+static char *
67073+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
67074+ char *buf, int buflen)
67075+{
67076+ struct path path;
67077+ char *res;
67078+
67079+ path.dentry = (struct dentry *)dentry;
67080+ path.mnt = (struct vfsmount *)vfsmnt;
67081+
67082+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
67083+ by the RBAC system */
67084+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
67085+
67086+ return res;
67087+}
67088+
67089+static char *
67090+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
67091+ char *buf, int buflen)
67092+{
67093+ char *res;
67094+ struct path path;
67095+ struct path root;
67096+ struct task_struct *reaper = init_pid_ns.child_reaper;
67097+
67098+ path.dentry = (struct dentry *)dentry;
67099+ path.mnt = (struct vfsmount *)vfsmnt;
67100+
67101+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
67102+ get_fs_root(reaper->fs, &root);
67103+
67104+ read_seqlock_excl(&mount_lock);
67105+ write_seqlock(&rename_lock);
67106+ res = gen_full_path(&path, &root, buf, buflen);
67107+ write_sequnlock(&rename_lock);
67108+ read_sequnlock_excl(&mount_lock);
67109+
67110+ path_put(&root);
67111+ return res;
67112+}
67113+
67114+char *
67115+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
67116+{
67117+ char *ret;
67118+ read_seqlock_excl(&mount_lock);
67119+ write_seqlock(&rename_lock);
67120+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
67121+ PAGE_SIZE);
67122+ write_sequnlock(&rename_lock);
67123+ read_sequnlock_excl(&mount_lock);
67124+ return ret;
67125+}
67126+
67127+static char *
67128+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
67129+{
67130+ char *ret;
67131+ char *buf;
67132+ int buflen;
67133+
67134+ read_seqlock_excl(&mount_lock);
67135+ write_seqlock(&rename_lock);
67136+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
67137+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
67138+ buflen = (int)(ret - buf);
67139+ if (buflen >= 5)
67140+ prepend(&ret, &buflen, "/proc", 5);
67141+ else
67142+ ret = strcpy(buf, "<path too long>");
67143+ write_sequnlock(&rename_lock);
67144+ read_sequnlock_excl(&mount_lock);
67145+ return ret;
67146+}
67147+
67148+char *
67149+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
67150+{
67151+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
67152+ PAGE_SIZE);
67153+}
67154+
67155+char *
67156+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
67157+{
67158+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
67159+ PAGE_SIZE);
67160+}
67161+
67162+char *
67163+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
67164+{
67165+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
67166+ PAGE_SIZE);
67167+}
67168+
67169+char *
67170+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
67171+{
67172+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
67173+ PAGE_SIZE);
67174+}
67175+
67176+char *
67177+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
67178+{
67179+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
67180+ PAGE_SIZE);
67181+}
67182+
67183+__inline__ __u32
67184+to_gr_audit(const __u32 reqmode)
67185+{
67186+ /* masks off auditable permission flags, then shifts them to create
67187+ auditing flags, and adds the special case of append auditing if
67188+ we're requesting write */
67189+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
67190+}
67191+
67192+struct acl_role_label *
67193+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
67194+ const gid_t gid)
67195+{
67196+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
67197+ struct acl_role_label *match;
67198+ struct role_allowed_ip *ipp;
67199+ unsigned int x;
67200+ u32 curr_ip = task->signal->saved_ip;
67201+
67202+ match = state->acl_role_set.r_hash[index];
67203+
67204+ while (match) {
67205+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
67206+ for (x = 0; x < match->domain_child_num; x++) {
67207+ if (match->domain_children[x] == uid)
67208+ goto found;
67209+ }
67210+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
67211+ break;
67212+ match = match->next;
67213+ }
67214+found:
67215+ if (match == NULL) {
67216+ try_group:
67217+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
67218+ match = state->acl_role_set.r_hash[index];
67219+
67220+ while (match) {
67221+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
67222+ for (x = 0; x < match->domain_child_num; x++) {
67223+ if (match->domain_children[x] == gid)
67224+ goto found2;
67225+ }
67226+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
67227+ break;
67228+ match = match->next;
67229+ }
67230+found2:
67231+ if (match == NULL)
67232+ match = state->default_role;
67233+ if (match->allowed_ips == NULL)
67234+ return match;
67235+ else {
67236+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
67237+ if (likely
67238+ ((ntohl(curr_ip) & ipp->netmask) ==
67239+ (ntohl(ipp->addr) & ipp->netmask)))
67240+ return match;
67241+ }
67242+ match = state->default_role;
67243+ }
67244+ } else if (match->allowed_ips == NULL) {
67245+ return match;
67246+ } else {
67247+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
67248+ if (likely
67249+ ((ntohl(curr_ip) & ipp->netmask) ==
67250+ (ntohl(ipp->addr) & ipp->netmask)))
67251+ return match;
67252+ }
67253+ goto try_group;
67254+ }
67255+
67256+ return match;
67257+}
67258+
67259+static struct acl_role_label *
67260+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
67261+ const gid_t gid)
67262+{
67263+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
67264+}
67265+
67266+struct acl_subject_label *
67267+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
67268+ const struct acl_role_label *role)
67269+{
67270+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
67271+ struct acl_subject_label *match;
67272+
67273+ match = role->subj_hash[index];
67274+
67275+ while (match && (match->inode != ino || match->device != dev ||
67276+ (match->mode & GR_DELETED))) {
67277+ match = match->next;
67278+ }
67279+
67280+ if (match && !(match->mode & GR_DELETED))
67281+ return match;
67282+ else
67283+ return NULL;
67284+}
67285+
67286+struct acl_subject_label *
67287+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
67288+ const struct acl_role_label *role)
67289+{
67290+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
67291+ struct acl_subject_label *match;
67292+
67293+ match = role->subj_hash[index];
67294+
67295+ while (match && (match->inode != ino || match->device != dev ||
67296+ !(match->mode & GR_DELETED))) {
67297+ match = match->next;
67298+ }
67299+
67300+ if (match && (match->mode & GR_DELETED))
67301+ return match;
67302+ else
67303+ return NULL;
67304+}
67305+
67306+static struct acl_object_label *
67307+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
67308+ const struct acl_subject_label *subj)
67309+{
67310+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
67311+ struct acl_object_label *match;
67312+
67313+ match = subj->obj_hash[index];
67314+
67315+ while (match && (match->inode != ino || match->device != dev ||
67316+ (match->mode & GR_DELETED))) {
67317+ match = match->next;
67318+ }
67319+
67320+ if (match && !(match->mode & GR_DELETED))
67321+ return match;
67322+ else
67323+ return NULL;
67324+}
67325+
67326+static struct acl_object_label *
67327+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
67328+ const struct acl_subject_label *subj)
67329+{
67330+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
67331+ struct acl_object_label *match;
67332+
67333+ match = subj->obj_hash[index];
67334+
67335+ while (match && (match->inode != ino || match->device != dev ||
67336+ !(match->mode & GR_DELETED))) {
67337+ match = match->next;
67338+ }
67339+
67340+ if (match && (match->mode & GR_DELETED))
67341+ return match;
67342+
67343+ match = subj->obj_hash[index];
67344+
67345+ while (match && (match->inode != ino || match->device != dev ||
67346+ (match->mode & GR_DELETED))) {
67347+ match = match->next;
67348+ }
67349+
67350+ if (match && !(match->mode & GR_DELETED))
67351+ return match;
67352+ else
67353+ return NULL;
67354+}
67355+
67356+struct name_entry *
67357+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
67358+{
67359+ unsigned int len = strlen(name);
67360+ unsigned int key = full_name_hash(name, len);
67361+ unsigned int index = key % state->name_set.n_size;
67362+ struct name_entry *match;
67363+
67364+ match = state->name_set.n_hash[index];
67365+
67366+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
67367+ match = match->next;
67368+
67369+ return match;
67370+}
67371+
67372+static struct name_entry *
67373+lookup_name_entry(const char *name)
67374+{
67375+ return __lookup_name_entry(&running_polstate, name);
67376+}
67377+
67378+static struct name_entry *
67379+lookup_name_entry_create(const char *name)
67380+{
67381+ unsigned int len = strlen(name);
67382+ unsigned int key = full_name_hash(name, len);
67383+ unsigned int index = key % running_polstate.name_set.n_size;
67384+ struct name_entry *match;
67385+
67386+ match = running_polstate.name_set.n_hash[index];
67387+
67388+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
67389+ !match->deleted))
67390+ match = match->next;
67391+
67392+ if (match && match->deleted)
67393+ return match;
67394+
67395+ match = running_polstate.name_set.n_hash[index];
67396+
67397+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
67398+ match->deleted))
67399+ match = match->next;
67400+
67401+ if (match && !match->deleted)
67402+ return match;
67403+ else
67404+ return NULL;
67405+}
67406+
67407+static struct inodev_entry *
67408+lookup_inodev_entry(const ino_t ino, const dev_t dev)
67409+{
67410+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
67411+ struct inodev_entry *match;
67412+
67413+ match = running_polstate.inodev_set.i_hash[index];
67414+
67415+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
67416+ match = match->next;
67417+
67418+ return match;
67419+}
67420+
67421+void
67422+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
67423+{
67424+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
67425+ state->inodev_set.i_size);
67426+ struct inodev_entry **curr;
67427+
67428+ entry->prev = NULL;
67429+
67430+ curr = &state->inodev_set.i_hash[index];
67431+ if (*curr != NULL)
67432+ (*curr)->prev = entry;
67433+
67434+ entry->next = *curr;
67435+ *curr = entry;
67436+
67437+ return;
67438+}
67439+
67440+static void
67441+insert_inodev_entry(struct inodev_entry *entry)
67442+{
67443+ __insert_inodev_entry(&running_polstate, entry);
67444+}
67445+
67446+void
67447+insert_acl_obj_label(struct acl_object_label *obj,
67448+ struct acl_subject_label *subj)
67449+{
67450+ unsigned int index =
67451+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
67452+ struct acl_object_label **curr;
67453+
67454+ obj->prev = NULL;
67455+
67456+ curr = &subj->obj_hash[index];
67457+ if (*curr != NULL)
67458+ (*curr)->prev = obj;
67459+
67460+ obj->next = *curr;
67461+ *curr = obj;
67462+
67463+ return;
67464+}
67465+
67466+void
67467+insert_acl_subj_label(struct acl_subject_label *obj,
67468+ struct acl_role_label *role)
67469+{
67470+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
67471+ struct acl_subject_label **curr;
67472+
67473+ obj->prev = NULL;
67474+
67475+ curr = &role->subj_hash[index];
67476+ if (*curr != NULL)
67477+ (*curr)->prev = obj;
67478+
67479+ obj->next = *curr;
67480+ *curr = obj;
67481+
67482+ return;
67483+}
67484+
67485+/* derived from glibc fnmatch() 0: match, 1: no match*/
67486+
67487+static int
67488+glob_match(const char *p, const char *n)
67489+{
67490+ char c;
67491+
67492+ while ((c = *p++) != '\0') {
67493+ switch (c) {
67494+ case '?':
67495+ if (*n == '\0')
67496+ return 1;
67497+ else if (*n == '/')
67498+ return 1;
67499+ break;
67500+ case '\\':
67501+ if (*n != c)
67502+ return 1;
67503+ break;
67504+ case '*':
67505+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
67506+ if (*n == '/')
67507+ return 1;
67508+ else if (c == '?') {
67509+ if (*n == '\0')
67510+ return 1;
67511+ else
67512+ ++n;
67513+ }
67514+ }
67515+ if (c == '\0') {
67516+ return 0;
67517+ } else {
67518+ const char *endp;
67519+
67520+ if ((endp = strchr(n, '/')) == NULL)
67521+ endp = n + strlen(n);
67522+
67523+ if (c == '[') {
67524+ for (--p; n < endp; ++n)
67525+ if (!glob_match(p, n))
67526+ return 0;
67527+ } else if (c == '/') {
67528+ while (*n != '\0' && *n != '/')
67529+ ++n;
67530+ if (*n == '/' && !glob_match(p, n + 1))
67531+ return 0;
67532+ } else {
67533+ for (--p; n < endp; ++n)
67534+ if (*n == c && !glob_match(p, n))
67535+ return 0;
67536+ }
67537+
67538+ return 1;
67539+ }
67540+ case '[':
67541+ {
67542+ int not;
67543+ char cold;
67544+
67545+ if (*n == '\0' || *n == '/')
67546+ return 1;
67547+
67548+ not = (*p == '!' || *p == '^');
67549+ if (not)
67550+ ++p;
67551+
67552+ c = *p++;
67553+ for (;;) {
67554+ unsigned char fn = (unsigned char)*n;
67555+
67556+ if (c == '\0')
67557+ return 1;
67558+ else {
67559+ if (c == fn)
67560+ goto matched;
67561+ cold = c;
67562+ c = *p++;
67563+
67564+ if (c == '-' && *p != ']') {
67565+ unsigned char cend = *p++;
67566+
67567+ if (cend == '\0')
67568+ return 1;
67569+
67570+ if (cold <= fn && fn <= cend)
67571+ goto matched;
67572+
67573+ c = *p++;
67574+ }
67575+ }
67576+
67577+ if (c == ']')
67578+ break;
67579+ }
67580+ if (!not)
67581+ return 1;
67582+ break;
67583+ matched:
67584+ while (c != ']') {
67585+ if (c == '\0')
67586+ return 1;
67587+
67588+ c = *p++;
67589+ }
67590+ if (not)
67591+ return 1;
67592+ }
67593+ break;
67594+ default:
67595+ if (c != *n)
67596+ return 1;
67597+ }
67598+
67599+ ++n;
67600+ }
67601+
67602+ if (*n == '\0')
67603+ return 0;
67604+
67605+ if (*n == '/')
67606+ return 0;
67607+
67608+ return 1;
67609+}
67610+
67611+static struct acl_object_label *
67612+chk_glob_label(struct acl_object_label *globbed,
67613+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
67614+{
67615+ struct acl_object_label *tmp;
67616+
67617+ if (*path == NULL)
67618+ *path = gr_to_filename_nolock(dentry, mnt);
67619+
67620+ tmp = globbed;
67621+
67622+ while (tmp) {
67623+ if (!glob_match(tmp->filename, *path))
67624+ return tmp;
67625+ tmp = tmp->next;
67626+ }
67627+
67628+ return NULL;
67629+}
67630+
67631+static struct acl_object_label *
67632+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
67633+ const ino_t curr_ino, const dev_t curr_dev,
67634+ const struct acl_subject_label *subj, char **path, const int checkglob)
67635+{
67636+ struct acl_subject_label *tmpsubj;
67637+ struct acl_object_label *retval;
67638+ struct acl_object_label *retval2;
67639+
67640+ tmpsubj = (struct acl_subject_label *) subj;
67641+ read_lock(&gr_inode_lock);
67642+ do {
67643+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
67644+ if (retval) {
67645+ if (checkglob && retval->globbed) {
67646+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
67647+ if (retval2)
67648+ retval = retval2;
67649+ }
67650+ break;
67651+ }
67652+ } while ((tmpsubj = tmpsubj->parent_subject));
67653+ read_unlock(&gr_inode_lock);
67654+
67655+ return retval;
67656+}
67657+
67658+static __inline__ struct acl_object_label *
67659+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
67660+ struct dentry *curr_dentry,
67661+ const struct acl_subject_label *subj, char **path, const int checkglob)
67662+{
67663+ int newglob = checkglob;
67664+ ino_t inode;
67665+ dev_t device;
67666+
67667+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
67668+ as we don't want a / * rule to match instead of the / object
67669+ don't do this for create lookups that call this function though, since they're looking up
67670+ on the parent and thus need globbing checks on all paths
67671+ */
67672+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
67673+ newglob = GR_NO_GLOB;
67674+
67675+ spin_lock(&curr_dentry->d_lock);
67676+ inode = curr_dentry->d_inode->i_ino;
67677+ device = __get_dev(curr_dentry);
67678+ spin_unlock(&curr_dentry->d_lock);
67679+
67680+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
67681+}
67682+
67683+#ifdef CONFIG_HUGETLBFS
67684+static inline bool
67685+is_hugetlbfs_mnt(const struct vfsmount *mnt)
67686+{
67687+ int i;
67688+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
67689+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
67690+ return true;
67691+ }
67692+
67693+ return false;
67694+}
67695+#endif
67696+
67697+static struct acl_object_label *
67698+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67699+ const struct acl_subject_label *subj, char *path, const int checkglob)
67700+{
67701+ struct dentry *dentry = (struct dentry *) l_dentry;
67702+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
67703+ struct mount *real_mnt = real_mount(mnt);
67704+ struct acl_object_label *retval;
67705+ struct dentry *parent;
67706+
67707+ read_seqlock_excl(&mount_lock);
67708+ write_seqlock(&rename_lock);
67709+
67710+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
67711+#ifdef CONFIG_NET
67712+ mnt == sock_mnt ||
67713+#endif
67714+#ifdef CONFIG_HUGETLBFS
67715+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
67716+#endif
67717+ /* ignore Eric Biederman */
67718+ IS_PRIVATE(l_dentry->d_inode))) {
67719+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
67720+ goto out;
67721+ }
67722+
67723+ for (;;) {
67724+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
67725+ break;
67726+
67727+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
67728+ if (!mnt_has_parent(real_mnt))
67729+ break;
67730+
67731+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67732+ if (retval != NULL)
67733+ goto out;
67734+
67735+ dentry = real_mnt->mnt_mountpoint;
67736+ real_mnt = real_mnt->mnt_parent;
67737+ mnt = &real_mnt->mnt;
67738+ continue;
67739+ }
67740+
67741+ parent = dentry->d_parent;
67742+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67743+ if (retval != NULL)
67744+ goto out;
67745+
67746+ dentry = parent;
67747+ }
67748+
67749+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
67750+
67751+ /* gr_real_root is pinned so we don't have to hold a reference */
67752+ if (retval == NULL)
67753+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
67754+out:
67755+ write_sequnlock(&rename_lock);
67756+ read_sequnlock_excl(&mount_lock);
67757+
67758+ BUG_ON(retval == NULL);
67759+
67760+ return retval;
67761+}
67762+
67763+static __inline__ struct acl_object_label *
67764+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67765+ const struct acl_subject_label *subj)
67766+{
67767+ char *path = NULL;
67768+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
67769+}
67770+
67771+static __inline__ struct acl_object_label *
67772+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67773+ const struct acl_subject_label *subj)
67774+{
67775+ char *path = NULL;
67776+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
67777+}
67778+
67779+static __inline__ struct acl_object_label *
67780+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67781+ const struct acl_subject_label *subj, char *path)
67782+{
67783+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
67784+}
67785+
67786+struct acl_subject_label *
67787+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
67788+ const struct acl_role_label *role)
67789+{
67790+ struct dentry *dentry = (struct dentry *) l_dentry;
67791+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
67792+ struct mount *real_mnt = real_mount(mnt);
67793+ struct acl_subject_label *retval;
67794+ struct dentry *parent;
67795+
67796+ read_seqlock_excl(&mount_lock);
67797+ write_seqlock(&rename_lock);
67798+
67799+ for (;;) {
67800+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
67801+ break;
67802+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
67803+ if (!mnt_has_parent(real_mnt))
67804+ break;
67805+
67806+ spin_lock(&dentry->d_lock);
67807+ read_lock(&gr_inode_lock);
67808+ retval =
67809+ lookup_acl_subj_label(dentry->d_inode->i_ino,
67810+ __get_dev(dentry), role);
67811+ read_unlock(&gr_inode_lock);
67812+ spin_unlock(&dentry->d_lock);
67813+ if (retval != NULL)
67814+ goto out;
67815+
67816+ dentry = real_mnt->mnt_mountpoint;
67817+ real_mnt = real_mnt->mnt_parent;
67818+ mnt = &real_mnt->mnt;
67819+ continue;
67820+ }
67821+
67822+ spin_lock(&dentry->d_lock);
67823+ read_lock(&gr_inode_lock);
67824+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
67825+ __get_dev(dentry), role);
67826+ read_unlock(&gr_inode_lock);
67827+ parent = dentry->d_parent;
67828+ spin_unlock(&dentry->d_lock);
67829+
67830+ if (retval != NULL)
67831+ goto out;
67832+
67833+ dentry = parent;
67834+ }
67835+
67836+ spin_lock(&dentry->d_lock);
67837+ read_lock(&gr_inode_lock);
67838+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
67839+ __get_dev(dentry), role);
67840+ read_unlock(&gr_inode_lock);
67841+ spin_unlock(&dentry->d_lock);
67842+
67843+ if (unlikely(retval == NULL)) {
67844+ /* gr_real_root is pinned, we don't need to hold a reference */
67845+ read_lock(&gr_inode_lock);
67846+ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
67847+ __get_dev(gr_real_root.dentry), role);
67848+ read_unlock(&gr_inode_lock);
67849+ }
67850+out:
67851+ write_sequnlock(&rename_lock);
67852+ read_sequnlock_excl(&mount_lock);
67853+
67854+ BUG_ON(retval == NULL);
67855+
67856+ return retval;
67857+}
67858+
67859+void
67860+assign_special_role(const char *rolename)
67861+{
67862+ struct acl_object_label *obj;
67863+ struct acl_role_label *r;
67864+ struct acl_role_label *assigned = NULL;
67865+ struct task_struct *tsk;
67866+ struct file *filp;
67867+
67868+ FOR_EACH_ROLE_START(r)
67869+ if (!strcmp(rolename, r->rolename) &&
67870+ (r->roletype & GR_ROLE_SPECIAL)) {
67871+ assigned = r;
67872+ break;
67873+ }
67874+ FOR_EACH_ROLE_END(r)
67875+
67876+ if (!assigned)
67877+ return;
67878+
67879+ read_lock(&tasklist_lock);
67880+ read_lock(&grsec_exec_file_lock);
67881+
67882+ tsk = current->real_parent;
67883+ if (tsk == NULL)
67884+ goto out_unlock;
67885+
67886+ filp = tsk->exec_file;
67887+ if (filp == NULL)
67888+ goto out_unlock;
67889+
67890+ tsk->is_writable = 0;
67891+ tsk->inherited = 0;
67892+
67893+ tsk->acl_sp_role = 1;
67894+ tsk->acl_role_id = ++acl_sp_role_value;
67895+ tsk->role = assigned;
67896+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
67897+
67898+ /* ignore additional mmap checks for processes that are writable
67899+ by the default ACL */
67900+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
67901+ if (unlikely(obj->mode & GR_WRITE))
67902+ tsk->is_writable = 1;
67903+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
67904+ if (unlikely(obj->mode & GR_WRITE))
67905+ tsk->is_writable = 1;
67906+
67907+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
67908+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
67909+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
67910+#endif
67911+
67912+out_unlock:
67913+ read_unlock(&grsec_exec_file_lock);
67914+ read_unlock(&tasklist_lock);
67915+ return;
67916+}
67917+
67918+
67919+static void
67920+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
67921+{
67922+ struct task_struct *task = current;
67923+ const struct cred *cred = current_cred();
67924+
67925+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
67926+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
67927+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
67928+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
67929+
67930+ return;
67931+}
67932+
67933+static void
67934+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
67935+{
67936+ struct task_struct *task = current;
67937+ const struct cred *cred = current_cred();
67938+
67939+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
67940+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
67941+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
67942+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
67943+
67944+ return;
67945+}
67946+
67947+static void
67948+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
67949+{
67950+ struct task_struct *task = current;
67951+ const struct cred *cred = current_cred();
67952+
67953+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
67954+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
67955+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
67956+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
67957+
67958+ return;
67959+}
67960+
67961+static void
67962+gr_set_proc_res(struct task_struct *task)
67963+{
67964+ struct acl_subject_label *proc;
67965+ unsigned short i;
67966+
67967+ proc = task->acl;
67968+
67969+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
67970+ return;
67971+
67972+ for (i = 0; i < RLIM_NLIMITS; i++) {
67973+ if (!(proc->resmask & (1U << i)))
67974+ continue;
67975+
67976+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
67977+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
67978+
67979+ if (i == RLIMIT_CPU)
67980+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
67981+ }
67982+
67983+ return;
67984+}
67985+
67986+/* both of the below must be called with
67987+ rcu_read_lock();
67988+ read_lock(&tasklist_lock);
67989+ read_lock(&grsec_exec_file_lock);
67990+*/
67991+
67992+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
67993+{
67994+ char *tmpname;
67995+ struct acl_subject_label *tmpsubj;
67996+ struct file *filp;
67997+ struct name_entry *nmatch;
67998+
67999+ filp = task->exec_file;
68000+ if (filp == NULL)
68001+ return NULL;
68002+
68003+ /* the following is to apply the correct subject
68004+ on binaries running when the RBAC system
68005+ is enabled, when the binaries have been
68006+ replaced or deleted since their execution
68007+ -----
68008+ when the RBAC system starts, the inode/dev
68009+ from exec_file will be one the RBAC system
68010+ is unaware of. It only knows the inode/dev
68011+ of the present file on disk, or the absence
68012+ of it.
68013+ */
68014+
68015+ if (filename)
68016+ nmatch = __lookup_name_entry(state, filename);
68017+ else {
68018+ preempt_disable();
68019+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
68020+
68021+ nmatch = __lookup_name_entry(state, tmpname);
68022+ preempt_enable();
68023+ }
68024+ tmpsubj = NULL;
68025+ if (nmatch) {
68026+ if (nmatch->deleted)
68027+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
68028+ else
68029+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
68030+ }
68031+ /* this also works for the reload case -- if we don't match a potentially inherited subject
68032+ then we fall back to a normal lookup based on the binary's ino/dev
68033+ */
68034+ if (tmpsubj == NULL)
68035+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
68036+
68037+ return tmpsubj;
68038+}
68039+
68040+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
68041+{
68042+ return __gr_get_subject_for_task(&running_polstate, task, filename);
68043+}
68044+
68045+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
68046+{
68047+ struct acl_object_label *obj;
68048+ struct file *filp;
68049+
68050+ filp = task->exec_file;
68051+
68052+ task->acl = subj;
68053+ task->is_writable = 0;
68054+ /* ignore additional mmap checks for processes that are writable
68055+ by the default ACL */
68056+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
68057+ if (unlikely(obj->mode & GR_WRITE))
68058+ task->is_writable = 1;
68059+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
68060+ if (unlikely(obj->mode & GR_WRITE))
68061+ task->is_writable = 1;
68062+
68063+ gr_set_proc_res(task);
68064+
68065+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68066+ 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);
68067+#endif
68068+}
68069+
68070+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
68071+{
68072+ __gr_apply_subject_to_task(&running_polstate, task, subj);
68073+}
68074+
68075+__u32
68076+gr_search_file(const struct dentry * dentry, const __u32 mode,
68077+ const struct vfsmount * mnt)
68078+{
68079+ __u32 retval = mode;
68080+ struct acl_subject_label *curracl;
68081+ struct acl_object_label *currobj;
68082+
68083+ if (unlikely(!(gr_status & GR_READY)))
68084+ return (mode & ~GR_AUDITS);
68085+
68086+ curracl = current->acl;
68087+
68088+ currobj = chk_obj_label(dentry, mnt, curracl);
68089+ retval = currobj->mode & mode;
68090+
68091+ /* if we're opening a specified transfer file for writing
68092+ (e.g. /dev/initctl), then transfer our role to init
68093+ */
68094+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
68095+ current->role->roletype & GR_ROLE_PERSIST)) {
68096+ struct task_struct *task = init_pid_ns.child_reaper;
68097+
68098+ if (task->role != current->role) {
68099+ struct acl_subject_label *subj;
68100+
68101+ task->acl_sp_role = 0;
68102+ task->acl_role_id = current->acl_role_id;
68103+ task->role = current->role;
68104+ rcu_read_lock();
68105+ read_lock(&grsec_exec_file_lock);
68106+ subj = gr_get_subject_for_task(task, NULL);
68107+ gr_apply_subject_to_task(task, subj);
68108+ read_unlock(&grsec_exec_file_lock);
68109+ rcu_read_unlock();
68110+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
68111+ }
68112+ }
68113+
68114+ if (unlikely
68115+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
68116+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
68117+ __u32 new_mode = mode;
68118+
68119+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
68120+
68121+ retval = new_mode;
68122+
68123+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
68124+ new_mode |= GR_INHERIT;
68125+
68126+ if (!(mode & GR_NOLEARN))
68127+ gr_log_learn(dentry, mnt, new_mode);
68128+ }
68129+
68130+ return retval;
68131+}
68132+
68133+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
68134+ const struct dentry *parent,
68135+ const struct vfsmount *mnt)
68136+{
68137+ struct name_entry *match;
68138+ struct acl_object_label *matchpo;
68139+ struct acl_subject_label *curracl;
68140+ char *path;
68141+
68142+ if (unlikely(!(gr_status & GR_READY)))
68143+ return NULL;
68144+
68145+ preempt_disable();
68146+ path = gr_to_filename_rbac(new_dentry, mnt);
68147+ match = lookup_name_entry_create(path);
68148+
68149+ curracl = current->acl;
68150+
68151+ if (match) {
68152+ read_lock(&gr_inode_lock);
68153+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
68154+ read_unlock(&gr_inode_lock);
68155+
68156+ if (matchpo) {
68157+ preempt_enable();
68158+ return matchpo;
68159+ }
68160+ }
68161+
68162+ // lookup parent
68163+
68164+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
68165+
68166+ preempt_enable();
68167+ return matchpo;
68168+}
68169+
68170+__u32
68171+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
68172+ const struct vfsmount * mnt, const __u32 mode)
68173+{
68174+ struct acl_object_label *matchpo;
68175+ __u32 retval;
68176+
68177+ if (unlikely(!(gr_status & GR_READY)))
68178+ return (mode & ~GR_AUDITS);
68179+
68180+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
68181+
68182+ retval = matchpo->mode & mode;
68183+
68184+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
68185+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
68186+ __u32 new_mode = mode;
68187+
68188+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
68189+
68190+ gr_log_learn(new_dentry, mnt, new_mode);
68191+ return new_mode;
68192+ }
68193+
68194+ return retval;
68195+}
68196+
68197+__u32
68198+gr_check_link(const struct dentry * new_dentry,
68199+ const struct dentry * parent_dentry,
68200+ const struct vfsmount * parent_mnt,
68201+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
68202+{
68203+ struct acl_object_label *obj;
68204+ __u32 oldmode, newmode;
68205+ __u32 needmode;
68206+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
68207+ GR_DELETE | GR_INHERIT;
68208+
68209+ if (unlikely(!(gr_status & GR_READY)))
68210+ return (GR_CREATE | GR_LINK);
68211+
68212+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
68213+ oldmode = obj->mode;
68214+
68215+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
68216+ newmode = obj->mode;
68217+
68218+ needmode = newmode & checkmodes;
68219+
68220+ // old name for hardlink must have at least the permissions of the new name
68221+ if ((oldmode & needmode) != needmode)
68222+ goto bad;
68223+
68224+ // if old name had restrictions/auditing, make sure the new name does as well
68225+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
68226+
68227+ // don't allow hardlinking of suid/sgid/fcapped files without permission
68228+ if (is_privileged_binary(old_dentry))
68229+ needmode |= GR_SETID;
68230+
68231+ if ((newmode & needmode) != needmode)
68232+ goto bad;
68233+
68234+ // enforce minimum permissions
68235+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
68236+ return newmode;
68237+bad:
68238+ needmode = oldmode;
68239+ if (is_privileged_binary(old_dentry))
68240+ needmode |= GR_SETID;
68241+
68242+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
68243+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
68244+ return (GR_CREATE | GR_LINK);
68245+ } else if (newmode & GR_SUPPRESS)
68246+ return GR_SUPPRESS;
68247+ else
68248+ return 0;
68249+}
68250+
68251+int
68252+gr_check_hidden_task(const struct task_struct *task)
68253+{
68254+ if (unlikely(!(gr_status & GR_READY)))
68255+ return 0;
68256+
68257+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
68258+ return 1;
68259+
68260+ return 0;
68261+}
68262+
68263+int
68264+gr_check_protected_task(const struct task_struct *task)
68265+{
68266+ if (unlikely(!(gr_status & GR_READY) || !task))
68267+ return 0;
68268+
68269+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
68270+ task->acl != current->acl)
68271+ return 1;
68272+
68273+ return 0;
68274+}
68275+
68276+int
68277+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
68278+{
68279+ struct task_struct *p;
68280+ int ret = 0;
68281+
68282+ if (unlikely(!(gr_status & GR_READY) || !pid))
68283+ return ret;
68284+
68285+ read_lock(&tasklist_lock);
68286+ do_each_pid_task(pid, type, p) {
68287+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
68288+ p->acl != current->acl) {
68289+ ret = 1;
68290+ goto out;
68291+ }
68292+ } while_each_pid_task(pid, type, p);
68293+out:
68294+ read_unlock(&tasklist_lock);
68295+
68296+ return ret;
68297+}
68298+
68299+void
68300+gr_copy_label(struct task_struct *tsk)
68301+{
68302+ struct task_struct *p = current;
68303+
68304+ tsk->inherited = p->inherited;
68305+ tsk->acl_sp_role = 0;
68306+ tsk->acl_role_id = p->acl_role_id;
68307+ tsk->acl = p->acl;
68308+ tsk->role = p->role;
68309+ tsk->signal->used_accept = 0;
68310+ tsk->signal->curr_ip = p->signal->curr_ip;
68311+ tsk->signal->saved_ip = p->signal->saved_ip;
68312+ if (p->exec_file)
68313+ get_file(p->exec_file);
68314+ tsk->exec_file = p->exec_file;
68315+ tsk->is_writable = p->is_writable;
68316+ if (unlikely(p->signal->used_accept)) {
68317+ p->signal->curr_ip = 0;
68318+ p->signal->saved_ip = 0;
68319+ }
68320+
68321+ return;
68322+}
68323+
68324+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
68325+
68326+int
68327+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
68328+{
68329+ unsigned int i;
68330+ __u16 num;
68331+ uid_t *uidlist;
68332+ uid_t curuid;
68333+ int realok = 0;
68334+ int effectiveok = 0;
68335+ int fsok = 0;
68336+ uid_t globalreal, globaleffective, globalfs;
68337+
68338+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
68339+ struct user_struct *user;
68340+
68341+ if (!uid_valid(real))
68342+ goto skipit;
68343+
68344+ /* find user based on global namespace */
68345+
68346+ globalreal = GR_GLOBAL_UID(real);
68347+
68348+ user = find_user(make_kuid(&init_user_ns, globalreal));
68349+ if (user == NULL)
68350+ goto skipit;
68351+
68352+ if (gr_process_kernel_setuid_ban(user)) {
68353+ /* for find_user */
68354+ free_uid(user);
68355+ return 1;
68356+ }
68357+
68358+ /* for find_user */
68359+ free_uid(user);
68360+
68361+skipit:
68362+#endif
68363+
68364+ if (unlikely(!(gr_status & GR_READY)))
68365+ return 0;
68366+
68367+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
68368+ gr_log_learn_uid_change(real, effective, fs);
68369+
68370+ num = current->acl->user_trans_num;
68371+ uidlist = current->acl->user_transitions;
68372+
68373+ if (uidlist == NULL)
68374+ return 0;
68375+
68376+ if (!uid_valid(real)) {
68377+ realok = 1;
68378+ globalreal = (uid_t)-1;
68379+ } else {
68380+ globalreal = GR_GLOBAL_UID(real);
68381+ }
68382+ if (!uid_valid(effective)) {
68383+ effectiveok = 1;
68384+ globaleffective = (uid_t)-1;
68385+ } else {
68386+ globaleffective = GR_GLOBAL_UID(effective);
68387+ }
68388+ if (!uid_valid(fs)) {
68389+ fsok = 1;
68390+ globalfs = (uid_t)-1;
68391+ } else {
68392+ globalfs = GR_GLOBAL_UID(fs);
68393+ }
68394+
68395+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
68396+ for (i = 0; i < num; i++) {
68397+ curuid = uidlist[i];
68398+ if (globalreal == curuid)
68399+ realok = 1;
68400+ if (globaleffective == curuid)
68401+ effectiveok = 1;
68402+ if (globalfs == curuid)
68403+ fsok = 1;
68404+ }
68405+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
68406+ for (i = 0; i < num; i++) {
68407+ curuid = uidlist[i];
68408+ if (globalreal == curuid)
68409+ break;
68410+ if (globaleffective == curuid)
68411+ break;
68412+ if (globalfs == curuid)
68413+ break;
68414+ }
68415+ /* not in deny list */
68416+ if (i == num) {
68417+ realok = 1;
68418+ effectiveok = 1;
68419+ fsok = 1;
68420+ }
68421+ }
68422+
68423+ if (realok && effectiveok && fsok)
68424+ return 0;
68425+ else {
68426+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
68427+ return 1;
68428+ }
68429+}
68430+
68431+int
68432+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
68433+{
68434+ unsigned int i;
68435+ __u16 num;
68436+ gid_t *gidlist;
68437+ gid_t curgid;
68438+ int realok = 0;
68439+ int effectiveok = 0;
68440+ int fsok = 0;
68441+ gid_t globalreal, globaleffective, globalfs;
68442+
68443+ if (unlikely(!(gr_status & GR_READY)))
68444+ return 0;
68445+
68446+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
68447+ gr_log_learn_gid_change(real, effective, fs);
68448+
68449+ num = current->acl->group_trans_num;
68450+ gidlist = current->acl->group_transitions;
68451+
68452+ if (gidlist == NULL)
68453+ return 0;
68454+
68455+ if (!gid_valid(real)) {
68456+ realok = 1;
68457+ globalreal = (gid_t)-1;
68458+ } else {
68459+ globalreal = GR_GLOBAL_GID(real);
68460+ }
68461+ if (!gid_valid(effective)) {
68462+ effectiveok = 1;
68463+ globaleffective = (gid_t)-1;
68464+ } else {
68465+ globaleffective = GR_GLOBAL_GID(effective);
68466+ }
68467+ if (!gid_valid(fs)) {
68468+ fsok = 1;
68469+ globalfs = (gid_t)-1;
68470+ } else {
68471+ globalfs = GR_GLOBAL_GID(fs);
68472+ }
68473+
68474+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
68475+ for (i = 0; i < num; i++) {
68476+ curgid = gidlist[i];
68477+ if (globalreal == curgid)
68478+ realok = 1;
68479+ if (globaleffective == curgid)
68480+ effectiveok = 1;
68481+ if (globalfs == curgid)
68482+ fsok = 1;
68483+ }
68484+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
68485+ for (i = 0; i < num; i++) {
68486+ curgid = gidlist[i];
68487+ if (globalreal == curgid)
68488+ break;
68489+ if (globaleffective == curgid)
68490+ break;
68491+ if (globalfs == curgid)
68492+ break;
68493+ }
68494+ /* not in deny list */
68495+ if (i == num) {
68496+ realok = 1;
68497+ effectiveok = 1;
68498+ fsok = 1;
68499+ }
68500+ }
68501+
68502+ if (realok && effectiveok && fsok)
68503+ return 0;
68504+ else {
68505+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
68506+ return 1;
68507+ }
68508+}
68509+
68510+extern int gr_acl_is_capable(const int cap);
68511+
68512+void
68513+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
68514+{
68515+ struct acl_role_label *role = task->role;
68516+ struct acl_subject_label *subj = NULL;
68517+ struct acl_object_label *obj;
68518+ struct file *filp;
68519+ uid_t uid;
68520+ gid_t gid;
68521+
68522+ if (unlikely(!(gr_status & GR_READY)))
68523+ return;
68524+
68525+ uid = GR_GLOBAL_UID(kuid);
68526+ gid = GR_GLOBAL_GID(kgid);
68527+
68528+ filp = task->exec_file;
68529+
68530+ /* kernel process, we'll give them the kernel role */
68531+ if (unlikely(!filp)) {
68532+ task->role = running_polstate.kernel_role;
68533+ task->acl = running_polstate.kernel_role->root_label;
68534+ return;
68535+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
68536+ /* save the current ip at time of role lookup so that the proper
68537+ IP will be learned for role_allowed_ip */
68538+ task->signal->saved_ip = task->signal->curr_ip;
68539+ role = lookup_acl_role_label(task, uid, gid);
68540+ }
68541+
68542+ /* don't change the role if we're not a privileged process */
68543+ if (role && task->role != role &&
68544+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
68545+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
68546+ return;
68547+
68548+ /* perform subject lookup in possibly new role
68549+ we can use this result below in the case where role == task->role
68550+ */
68551+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
68552+
68553+ /* if we changed uid/gid, but result in the same role
68554+ and are using inheritance, don't lose the inherited subject
68555+ if current subject is other than what normal lookup
68556+ would result in, we arrived via inheritance, don't
68557+ lose subject
68558+ */
68559+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
68560+ (subj == task->acl)))
68561+ task->acl = subj;
68562+
68563+ /* leave task->inherited unaffected */
68564+
68565+ task->role = role;
68566+
68567+ task->is_writable = 0;
68568+
68569+ /* ignore additional mmap checks for processes that are writable
68570+ by the default ACL */
68571+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
68572+ if (unlikely(obj->mode & GR_WRITE))
68573+ task->is_writable = 1;
68574+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
68575+ if (unlikely(obj->mode & GR_WRITE))
68576+ task->is_writable = 1;
68577+
68578+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68579+ 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);
68580+#endif
68581+
68582+ gr_set_proc_res(task);
68583+
68584+ return;
68585+}
68586+
68587+int
68588+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
68589+ const int unsafe_flags)
68590+{
68591+ struct task_struct *task = current;
68592+ struct acl_subject_label *newacl;
68593+ struct acl_object_label *obj;
68594+ __u32 retmode;
68595+
68596+ if (unlikely(!(gr_status & GR_READY)))
68597+ return 0;
68598+
68599+ newacl = chk_subj_label(dentry, mnt, task->role);
68600+
68601+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
68602+ did an exec
68603+ */
68604+ rcu_read_lock();
68605+ read_lock(&tasklist_lock);
68606+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
68607+ (task->parent->acl->mode & GR_POVERRIDE))) {
68608+ read_unlock(&tasklist_lock);
68609+ rcu_read_unlock();
68610+ goto skip_check;
68611+ }
68612+ read_unlock(&tasklist_lock);
68613+ rcu_read_unlock();
68614+
68615+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
68616+ !(task->role->roletype & GR_ROLE_GOD) &&
68617+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
68618+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
68619+ if (unsafe_flags & LSM_UNSAFE_SHARE)
68620+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
68621+ else
68622+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
68623+ return -EACCES;
68624+ }
68625+
68626+skip_check:
68627+
68628+ obj = chk_obj_label(dentry, mnt, task->acl);
68629+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
68630+
68631+ if (!(task->acl->mode & GR_INHERITLEARN) &&
68632+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
68633+ if (obj->nested)
68634+ task->acl = obj->nested;
68635+ else
68636+ task->acl = newacl;
68637+ task->inherited = 0;
68638+ } else {
68639+ task->inherited = 1;
68640+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
68641+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
68642+ }
68643+
68644+ task->is_writable = 0;
68645+
68646+ /* ignore additional mmap checks for processes that are writable
68647+ by the default ACL */
68648+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
68649+ if (unlikely(obj->mode & GR_WRITE))
68650+ task->is_writable = 1;
68651+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
68652+ if (unlikely(obj->mode & GR_WRITE))
68653+ task->is_writable = 1;
68654+
68655+ gr_set_proc_res(task);
68656+
68657+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
68658+ 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);
68659+#endif
68660+ return 0;
68661+}
68662+
68663+/* always called with valid inodev ptr */
68664+static void
68665+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
68666+{
68667+ struct acl_object_label *matchpo;
68668+ struct acl_subject_label *matchps;
68669+ struct acl_subject_label *subj;
68670+ struct acl_role_label *role;
68671+ unsigned int x;
68672+
68673+ FOR_EACH_ROLE_START(role)
68674+ FOR_EACH_SUBJECT_START(role, subj, x)
68675+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
68676+ matchpo->mode |= GR_DELETED;
68677+ FOR_EACH_SUBJECT_END(subj,x)
68678+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
68679+ /* nested subjects aren't in the role's subj_hash table */
68680+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
68681+ matchpo->mode |= GR_DELETED;
68682+ FOR_EACH_NESTED_SUBJECT_END(subj)
68683+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
68684+ matchps->mode |= GR_DELETED;
68685+ FOR_EACH_ROLE_END(role)
68686+
68687+ inodev->nentry->deleted = 1;
68688+
68689+ return;
68690+}
68691+
68692+void
68693+gr_handle_delete(const ino_t ino, const dev_t dev)
68694+{
68695+ struct inodev_entry *inodev;
68696+
68697+ if (unlikely(!(gr_status & GR_READY)))
68698+ return;
68699+
68700+ write_lock(&gr_inode_lock);
68701+ inodev = lookup_inodev_entry(ino, dev);
68702+ if (inodev != NULL)
68703+ do_handle_delete(inodev, ino, dev);
68704+ write_unlock(&gr_inode_lock);
68705+
68706+ return;
68707+}
68708+
68709+static void
68710+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
68711+ const ino_t newinode, const dev_t newdevice,
68712+ struct acl_subject_label *subj)
68713+{
68714+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
68715+ struct acl_object_label *match;
68716+
68717+ match = subj->obj_hash[index];
68718+
68719+ while (match && (match->inode != oldinode ||
68720+ match->device != olddevice ||
68721+ !(match->mode & GR_DELETED)))
68722+ match = match->next;
68723+
68724+ if (match && (match->inode == oldinode)
68725+ && (match->device == olddevice)
68726+ && (match->mode & GR_DELETED)) {
68727+ if (match->prev == NULL) {
68728+ subj->obj_hash[index] = match->next;
68729+ if (match->next != NULL)
68730+ match->next->prev = NULL;
68731+ } else {
68732+ match->prev->next = match->next;
68733+ if (match->next != NULL)
68734+ match->next->prev = match->prev;
68735+ }
68736+ match->prev = NULL;
68737+ match->next = NULL;
68738+ match->inode = newinode;
68739+ match->device = newdevice;
68740+ match->mode &= ~GR_DELETED;
68741+
68742+ insert_acl_obj_label(match, subj);
68743+ }
68744+
68745+ return;
68746+}
68747+
68748+static void
68749+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
68750+ const ino_t newinode, const dev_t newdevice,
68751+ struct acl_role_label *role)
68752+{
68753+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
68754+ struct acl_subject_label *match;
68755+
68756+ match = role->subj_hash[index];
68757+
68758+ while (match && (match->inode != oldinode ||
68759+ match->device != olddevice ||
68760+ !(match->mode & GR_DELETED)))
68761+ match = match->next;
68762+
68763+ if (match && (match->inode == oldinode)
68764+ && (match->device == olddevice)
68765+ && (match->mode & GR_DELETED)) {
68766+ if (match->prev == NULL) {
68767+ role->subj_hash[index] = match->next;
68768+ if (match->next != NULL)
68769+ match->next->prev = NULL;
68770+ } else {
68771+ match->prev->next = match->next;
68772+ if (match->next != NULL)
68773+ match->next->prev = match->prev;
68774+ }
68775+ match->prev = NULL;
68776+ match->next = NULL;
68777+ match->inode = newinode;
68778+ match->device = newdevice;
68779+ match->mode &= ~GR_DELETED;
68780+
68781+ insert_acl_subj_label(match, role);
68782+ }
68783+
68784+ return;
68785+}
68786+
68787+static void
68788+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
68789+ const ino_t newinode, const dev_t newdevice)
68790+{
68791+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
68792+ struct inodev_entry *match;
68793+
68794+ match = running_polstate.inodev_set.i_hash[index];
68795+
68796+ while (match && (match->nentry->inode != oldinode ||
68797+ match->nentry->device != olddevice || !match->nentry->deleted))
68798+ match = match->next;
68799+
68800+ if (match && (match->nentry->inode == oldinode)
68801+ && (match->nentry->device == olddevice) &&
68802+ match->nentry->deleted) {
68803+ if (match->prev == NULL) {
68804+ running_polstate.inodev_set.i_hash[index] = match->next;
68805+ if (match->next != NULL)
68806+ match->next->prev = NULL;
68807+ } else {
68808+ match->prev->next = match->next;
68809+ if (match->next != NULL)
68810+ match->next->prev = match->prev;
68811+ }
68812+ match->prev = NULL;
68813+ match->next = NULL;
68814+ match->nentry->inode = newinode;
68815+ match->nentry->device = newdevice;
68816+ match->nentry->deleted = 0;
68817+
68818+ insert_inodev_entry(match);
68819+ }
68820+
68821+ return;
68822+}
68823+
68824+static void
68825+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
68826+{
68827+ struct acl_subject_label *subj;
68828+ struct acl_role_label *role;
68829+ unsigned int x;
68830+
68831+ FOR_EACH_ROLE_START(role)
68832+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
68833+
68834+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
68835+ if ((subj->inode == ino) && (subj->device == dev)) {
68836+ subj->inode = ino;
68837+ subj->device = dev;
68838+ }
68839+ /* nested subjects aren't in the role's subj_hash table */
68840+ update_acl_obj_label(matchn->inode, matchn->device,
68841+ ino, dev, subj);
68842+ FOR_EACH_NESTED_SUBJECT_END(subj)
68843+ FOR_EACH_SUBJECT_START(role, subj, x)
68844+ update_acl_obj_label(matchn->inode, matchn->device,
68845+ ino, dev, subj);
68846+ FOR_EACH_SUBJECT_END(subj,x)
68847+ FOR_EACH_ROLE_END(role)
68848+
68849+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
68850+
68851+ return;
68852+}
68853+
68854+static void
68855+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
68856+ const struct vfsmount *mnt)
68857+{
68858+ ino_t ino = dentry->d_inode->i_ino;
68859+ dev_t dev = __get_dev(dentry);
68860+
68861+ __do_handle_create(matchn, ino, dev);
68862+
68863+ return;
68864+}
68865+
68866+void
68867+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
68868+{
68869+ struct name_entry *matchn;
68870+
68871+ if (unlikely(!(gr_status & GR_READY)))
68872+ return;
68873+
68874+ preempt_disable();
68875+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
68876+
68877+ if (unlikely((unsigned long)matchn)) {
68878+ write_lock(&gr_inode_lock);
68879+ do_handle_create(matchn, dentry, mnt);
68880+ write_unlock(&gr_inode_lock);
68881+ }
68882+ preempt_enable();
68883+
68884+ return;
68885+}
68886+
68887+void
68888+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
68889+{
68890+ struct name_entry *matchn;
68891+
68892+ if (unlikely(!(gr_status & GR_READY)))
68893+ return;
68894+
68895+ preempt_disable();
68896+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
68897+
68898+ if (unlikely((unsigned long)matchn)) {
68899+ write_lock(&gr_inode_lock);
68900+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
68901+ write_unlock(&gr_inode_lock);
68902+ }
68903+ preempt_enable();
68904+
68905+ return;
68906+}
68907+
68908+void
68909+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
68910+ struct dentry *old_dentry,
68911+ struct dentry *new_dentry,
68912+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
68913+{
68914+ struct name_entry *matchn;
68915+ struct name_entry *matchn2 = NULL;
68916+ struct inodev_entry *inodev;
68917+ struct inode *inode = new_dentry->d_inode;
68918+ ino_t old_ino = old_dentry->d_inode->i_ino;
68919+ dev_t old_dev = __get_dev(old_dentry);
68920+ unsigned int exchange = flags & RENAME_EXCHANGE;
68921+
68922+ /* vfs_rename swaps the name and parent link for old_dentry and
68923+ new_dentry
68924+ at this point, old_dentry has the new name, parent link, and inode
68925+ for the renamed file
68926+ if a file is being replaced by a rename, new_dentry has the inode
68927+ and name for the replaced file
68928+ */
68929+
68930+ if (unlikely(!(gr_status & GR_READY)))
68931+ return;
68932+
68933+ preempt_disable();
68934+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
68935+
68936+ /* exchange cases:
68937+ a filename exists for the source, but not dest
68938+ do a recreate on source
68939+ a filename exists for the dest, but not source
68940+ do a recreate on dest
68941+ a filename exists for both source and dest
68942+ delete source and dest, then create source and dest
68943+ a filename exists for neither source nor dest
68944+ no updates needed
68945+
68946+ the name entry lookups get us the old inode/dev associated with
68947+ each name, so do the deletes first (if possible) so that when
68948+ we do the create, we pick up on the right entries
68949+ */
68950+
68951+ if (exchange)
68952+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
68953+
68954+ /* we wouldn't have to check d_inode if it weren't for
68955+ NFS silly-renaming
68956+ */
68957+
68958+ write_lock(&gr_inode_lock);
68959+ if (unlikely((replace || exchange) && inode)) {
68960+ ino_t new_ino = inode->i_ino;
68961+ dev_t new_dev = __get_dev(new_dentry);
68962+
68963+ inodev = lookup_inodev_entry(new_ino, new_dev);
68964+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
68965+ do_handle_delete(inodev, new_ino, new_dev);
68966+ }
68967+
68968+ inodev = lookup_inodev_entry(old_ino, old_dev);
68969+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
68970+ do_handle_delete(inodev, old_ino, old_dev);
68971+
68972+ if (unlikely(matchn != NULL))
68973+ do_handle_create(matchn, old_dentry, mnt);
68974+
68975+ if (unlikely(matchn2 != NULL))
68976+ do_handle_create(matchn2, new_dentry, mnt);
68977+
68978+ write_unlock(&gr_inode_lock);
68979+ preempt_enable();
68980+
68981+ return;
68982+}
68983+
68984+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
68985+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
68986+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
68987+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
68988+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
68989+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
68990+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
68991+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
68992+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
68993+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
68994+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
68995+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
68996+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
68997+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
68998+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
68999+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
69000+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
69001+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
69002+};
69003+
69004+void
69005+gr_learn_resource(const struct task_struct *task,
69006+ const int res, const unsigned long wanted, const int gt)
69007+{
69008+ struct acl_subject_label *acl;
69009+ const struct cred *cred;
69010+
69011+ if (unlikely((gr_status & GR_READY) &&
69012+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
69013+ goto skip_reslog;
69014+
69015+ gr_log_resource(task, res, wanted, gt);
69016+skip_reslog:
69017+
69018+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
69019+ return;
69020+
69021+ acl = task->acl;
69022+
69023+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
69024+ !(acl->resmask & (1U << (unsigned short) res))))
69025+ return;
69026+
69027+ if (wanted >= acl->res[res].rlim_cur) {
69028+ unsigned long res_add;
69029+
69030+ res_add = wanted + res_learn_bumps[res];
69031+
69032+ acl->res[res].rlim_cur = res_add;
69033+
69034+ if (wanted > acl->res[res].rlim_max)
69035+ acl->res[res].rlim_max = res_add;
69036+
69037+ /* only log the subject filename, since resource logging is supported for
69038+ single-subject learning only */
69039+ rcu_read_lock();
69040+ cred = __task_cred(task);
69041+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
69042+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
69043+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
69044+ "", (unsigned long) res, &task->signal->saved_ip);
69045+ rcu_read_unlock();
69046+ }
69047+
69048+ return;
69049+}
69050+EXPORT_SYMBOL_GPL(gr_learn_resource);
69051+#endif
69052+
69053+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
69054+void
69055+pax_set_initial_flags(struct linux_binprm *bprm)
69056+{
69057+ struct task_struct *task = current;
69058+ struct acl_subject_label *proc;
69059+ unsigned long flags;
69060+
69061+ if (unlikely(!(gr_status & GR_READY)))
69062+ return;
69063+
69064+ flags = pax_get_flags(task);
69065+
69066+ proc = task->acl;
69067+
69068+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
69069+ flags &= ~MF_PAX_PAGEEXEC;
69070+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
69071+ flags &= ~MF_PAX_SEGMEXEC;
69072+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
69073+ flags &= ~MF_PAX_RANDMMAP;
69074+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
69075+ flags &= ~MF_PAX_EMUTRAMP;
69076+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
69077+ flags &= ~MF_PAX_MPROTECT;
69078+
69079+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
69080+ flags |= MF_PAX_PAGEEXEC;
69081+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
69082+ flags |= MF_PAX_SEGMEXEC;
69083+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
69084+ flags |= MF_PAX_RANDMMAP;
69085+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
69086+ flags |= MF_PAX_EMUTRAMP;
69087+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
69088+ flags |= MF_PAX_MPROTECT;
69089+
69090+ pax_set_flags(task, flags);
69091+
69092+ return;
69093+}
69094+#endif
69095+
69096+int
69097+gr_handle_proc_ptrace(struct task_struct *task)
69098+{
69099+ struct file *filp;
69100+ struct task_struct *tmp = task;
69101+ struct task_struct *curtemp = current;
69102+ __u32 retmode;
69103+
69104+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
69105+ if (unlikely(!(gr_status & GR_READY)))
69106+ return 0;
69107+#endif
69108+
69109+ read_lock(&tasklist_lock);
69110+ read_lock(&grsec_exec_file_lock);
69111+ filp = task->exec_file;
69112+
69113+ while (task_pid_nr(tmp) > 0) {
69114+ if (tmp == curtemp)
69115+ break;
69116+ tmp = tmp->real_parent;
69117+ }
69118+
69119+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
69120+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
69121+ read_unlock(&grsec_exec_file_lock);
69122+ read_unlock(&tasklist_lock);
69123+ return 1;
69124+ }
69125+
69126+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
69127+ if (!(gr_status & GR_READY)) {
69128+ read_unlock(&grsec_exec_file_lock);
69129+ read_unlock(&tasklist_lock);
69130+ return 0;
69131+ }
69132+#endif
69133+
69134+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
69135+ read_unlock(&grsec_exec_file_lock);
69136+ read_unlock(&tasklist_lock);
69137+
69138+ if (retmode & GR_NOPTRACE)
69139+ return 1;
69140+
69141+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
69142+ && (current->acl != task->acl || (current->acl != current->role->root_label
69143+ && task_pid_nr(current) != task_pid_nr(task))))
69144+ return 1;
69145+
69146+ return 0;
69147+}
69148+
69149+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
69150+{
69151+ if (unlikely(!(gr_status & GR_READY)))
69152+ return;
69153+
69154+ if (!(current->role->roletype & GR_ROLE_GOD))
69155+ return;
69156+
69157+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
69158+ p->role->rolename, gr_task_roletype_to_char(p),
69159+ p->acl->filename);
69160+}
69161+
69162+int
69163+gr_handle_ptrace(struct task_struct *task, const long request)
69164+{
69165+ struct task_struct *tmp = task;
69166+ struct task_struct *curtemp = current;
69167+ __u32 retmode;
69168+
69169+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
69170+ if (unlikely(!(gr_status & GR_READY)))
69171+ return 0;
69172+#endif
69173+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
69174+ read_lock(&tasklist_lock);
69175+ while (task_pid_nr(tmp) > 0) {
69176+ if (tmp == curtemp)
69177+ break;
69178+ tmp = tmp->real_parent;
69179+ }
69180+
69181+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
69182+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
69183+ read_unlock(&tasklist_lock);
69184+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69185+ return 1;
69186+ }
69187+ read_unlock(&tasklist_lock);
69188+ }
69189+
69190+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
69191+ if (!(gr_status & GR_READY))
69192+ return 0;
69193+#endif
69194+
69195+ read_lock(&grsec_exec_file_lock);
69196+ if (unlikely(!task->exec_file)) {
69197+ read_unlock(&grsec_exec_file_lock);
69198+ return 0;
69199+ }
69200+
69201+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
69202+ read_unlock(&grsec_exec_file_lock);
69203+
69204+ if (retmode & GR_NOPTRACE) {
69205+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69206+ return 1;
69207+ }
69208+
69209+ if (retmode & GR_PTRACERD) {
69210+ switch (request) {
69211+ case PTRACE_SEIZE:
69212+ case PTRACE_POKETEXT:
69213+ case PTRACE_POKEDATA:
69214+ case PTRACE_POKEUSR:
69215+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
69216+ case PTRACE_SETREGS:
69217+ case PTRACE_SETFPREGS:
69218+#endif
69219+#ifdef CONFIG_X86
69220+ case PTRACE_SETFPXREGS:
69221+#endif
69222+#ifdef CONFIG_ALTIVEC
69223+ case PTRACE_SETVRREGS:
69224+#endif
69225+ return 1;
69226+ default:
69227+ return 0;
69228+ }
69229+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
69230+ !(current->role->roletype & GR_ROLE_GOD) &&
69231+ (current->acl != task->acl)) {
69232+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
69233+ return 1;
69234+ }
69235+
69236+ return 0;
69237+}
69238+
69239+static int is_writable_mmap(const struct file *filp)
69240+{
69241+ struct task_struct *task = current;
69242+ struct acl_object_label *obj, *obj2;
69243+
69244+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
69245+ !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))) {
69246+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
69247+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
69248+ task->role->root_label);
69249+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
69250+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
69251+ return 1;
69252+ }
69253+ }
69254+ return 0;
69255+}
69256+
69257+int
69258+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
69259+{
69260+ __u32 mode;
69261+
69262+ if (unlikely(!file || !(prot & PROT_EXEC)))
69263+ return 1;
69264+
69265+ if (is_writable_mmap(file))
69266+ return 0;
69267+
69268+ mode =
69269+ gr_search_file(file->f_path.dentry,
69270+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
69271+ file->f_path.mnt);
69272+
69273+ if (!gr_tpe_allow(file))
69274+ return 0;
69275+
69276+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
69277+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69278+ return 0;
69279+ } else if (unlikely(!(mode & GR_EXEC))) {
69280+ return 0;
69281+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
69282+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69283+ return 1;
69284+ }
69285+
69286+ return 1;
69287+}
69288+
69289+int
69290+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
69291+{
69292+ __u32 mode;
69293+
69294+ if (unlikely(!file || !(prot & PROT_EXEC)))
69295+ return 1;
69296+
69297+ if (is_writable_mmap(file))
69298+ return 0;
69299+
69300+ mode =
69301+ gr_search_file(file->f_path.dentry,
69302+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
69303+ file->f_path.mnt);
69304+
69305+ if (!gr_tpe_allow(file))
69306+ return 0;
69307+
69308+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
69309+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69310+ return 0;
69311+ } else if (unlikely(!(mode & GR_EXEC))) {
69312+ return 0;
69313+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
69314+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
69315+ return 1;
69316+ }
69317+
69318+ return 1;
69319+}
69320+
69321+void
69322+gr_acl_handle_psacct(struct task_struct *task, const long code)
69323+{
69324+ unsigned long runtime, cputime;
69325+ cputime_t utime, stime;
69326+ unsigned int wday, cday;
69327+ __u8 whr, chr;
69328+ __u8 wmin, cmin;
69329+ __u8 wsec, csec;
69330+ struct timespec timeval;
69331+
69332+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
69333+ !(task->acl->mode & GR_PROCACCT)))
69334+ return;
69335+
69336+ do_posix_clock_monotonic_gettime(&timeval);
69337+ runtime = timeval.tv_sec - task->start_time.tv_sec;
69338+ wday = runtime / (60 * 60 * 24);
69339+ runtime -= wday * (60 * 60 * 24);
69340+ whr = runtime / (60 * 60);
69341+ runtime -= whr * (60 * 60);
69342+ wmin = runtime / 60;
69343+ runtime -= wmin * 60;
69344+ wsec = runtime;
69345+
69346+ task_cputime(task, &utime, &stime);
69347+ cputime = cputime_to_secs(utime + stime);
69348+ cday = cputime / (60 * 60 * 24);
69349+ cputime -= cday * (60 * 60 * 24);
69350+ chr = cputime / (60 * 60);
69351+ cputime -= chr * (60 * 60);
69352+ cmin = cputime / 60;
69353+ cputime -= cmin * 60;
69354+ csec = cputime;
69355+
69356+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
69357+
69358+ return;
69359+}
69360+
69361+#ifdef CONFIG_TASKSTATS
69362+int gr_is_taskstats_denied(int pid)
69363+{
69364+ struct task_struct *task;
69365+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69366+ const struct cred *cred;
69367+#endif
69368+ int ret = 0;
69369+
69370+ /* restrict taskstats viewing to un-chrooted root users
69371+ who have the 'view' subject flag if the RBAC system is enabled
69372+ */
69373+
69374+ rcu_read_lock();
69375+ read_lock(&tasklist_lock);
69376+ task = find_task_by_vpid(pid);
69377+ if (task) {
69378+#ifdef CONFIG_GRKERNSEC_CHROOT
69379+ if (proc_is_chrooted(task))
69380+ ret = -EACCES;
69381+#endif
69382+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69383+ cred = __task_cred(task);
69384+#ifdef CONFIG_GRKERNSEC_PROC_USER
69385+ if (gr_is_global_nonroot(cred->uid))
69386+ ret = -EACCES;
69387+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69388+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
69389+ ret = -EACCES;
69390+#endif
69391+#endif
69392+ if (gr_status & GR_READY) {
69393+ if (!(task->acl->mode & GR_VIEW))
69394+ ret = -EACCES;
69395+ }
69396+ } else
69397+ ret = -ENOENT;
69398+
69399+ read_unlock(&tasklist_lock);
69400+ rcu_read_unlock();
69401+
69402+ return ret;
69403+}
69404+#endif
69405+
69406+/* AUXV entries are filled via a descendant of search_binary_handler
69407+ after we've already applied the subject for the target
69408+*/
69409+int gr_acl_enable_at_secure(void)
69410+{
69411+ if (unlikely(!(gr_status & GR_READY)))
69412+ return 0;
69413+
69414+ if (current->acl->mode & GR_ATSECURE)
69415+ return 1;
69416+
69417+ return 0;
69418+}
69419+
69420+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
69421+{
69422+ struct task_struct *task = current;
69423+ struct dentry *dentry = file->f_path.dentry;
69424+ struct vfsmount *mnt = file->f_path.mnt;
69425+ struct acl_object_label *obj, *tmp;
69426+ struct acl_subject_label *subj;
69427+ unsigned int bufsize;
69428+ int is_not_root;
69429+ char *path;
69430+ dev_t dev = __get_dev(dentry);
69431+
69432+ if (unlikely(!(gr_status & GR_READY)))
69433+ return 1;
69434+
69435+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
69436+ return 1;
69437+
69438+ /* ignore Eric Biederman */
69439+ if (IS_PRIVATE(dentry->d_inode))
69440+ return 1;
69441+
69442+ subj = task->acl;
69443+ read_lock(&gr_inode_lock);
69444+ do {
69445+ obj = lookup_acl_obj_label(ino, dev, subj);
69446+ if (obj != NULL) {
69447+ read_unlock(&gr_inode_lock);
69448+ return (obj->mode & GR_FIND) ? 1 : 0;
69449+ }
69450+ } while ((subj = subj->parent_subject));
69451+ read_unlock(&gr_inode_lock);
69452+
69453+ /* this is purely an optimization since we're looking for an object
69454+ for the directory we're doing a readdir on
69455+ if it's possible for any globbed object to match the entry we're
69456+ filling into the directory, then the object we find here will be
69457+ an anchor point with attached globbed objects
69458+ */
69459+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
69460+ if (obj->globbed == NULL)
69461+ return (obj->mode & GR_FIND) ? 1 : 0;
69462+
69463+ is_not_root = ((obj->filename[0] == '/') &&
69464+ (obj->filename[1] == '\0')) ? 0 : 1;
69465+ bufsize = PAGE_SIZE - namelen - is_not_root;
69466+
69467+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
69468+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
69469+ return 1;
69470+
69471+ preempt_disable();
69472+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69473+ bufsize);
69474+
69475+ bufsize = strlen(path);
69476+
69477+ /* if base is "/", don't append an additional slash */
69478+ if (is_not_root)
69479+ *(path + bufsize) = '/';
69480+ memcpy(path + bufsize + is_not_root, name, namelen);
69481+ *(path + bufsize + namelen + is_not_root) = '\0';
69482+
69483+ tmp = obj->globbed;
69484+ while (tmp) {
69485+ if (!glob_match(tmp->filename, path)) {
69486+ preempt_enable();
69487+ return (tmp->mode & GR_FIND) ? 1 : 0;
69488+ }
69489+ tmp = tmp->next;
69490+ }
69491+ preempt_enable();
69492+ return (obj->mode & GR_FIND) ? 1 : 0;
69493+}
69494+
69495+void gr_put_exec_file(struct task_struct *task)
69496+{
69497+ struct file *filp;
69498+
69499+ write_lock(&grsec_exec_file_lock);
69500+ filp = task->exec_file;
69501+ task->exec_file = NULL;
69502+ write_unlock(&grsec_exec_file_lock);
69503+
69504+ if (filp)
69505+ fput(filp);
69506+
69507+ return;
69508+}
69509+
69510+
69511+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
69512+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
69513+#endif
69514+#ifdef CONFIG_SECURITY
69515+EXPORT_SYMBOL_GPL(gr_check_user_change);
69516+EXPORT_SYMBOL_GPL(gr_check_group_change);
69517+#endif
69518+
69519diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
69520new file mode 100644
69521index 0000000..18ffbbd
69522--- /dev/null
69523+++ b/grsecurity/gracl_alloc.c
69524@@ -0,0 +1,105 @@
69525+#include <linux/kernel.h>
69526+#include <linux/mm.h>
69527+#include <linux/slab.h>
69528+#include <linux/vmalloc.h>
69529+#include <linux/gracl.h>
69530+#include <linux/grsecurity.h>
69531+
69532+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
69533+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
69534+
69535+static __inline__ int
69536+alloc_pop(void)
69537+{
69538+ if (current_alloc_state->alloc_stack_next == 1)
69539+ return 0;
69540+
69541+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
69542+
69543+ current_alloc_state->alloc_stack_next--;
69544+
69545+ return 1;
69546+}
69547+
69548+static __inline__ int
69549+alloc_push(void *buf)
69550+{
69551+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
69552+ return 1;
69553+
69554+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
69555+
69556+ current_alloc_state->alloc_stack_next++;
69557+
69558+ return 0;
69559+}
69560+
69561+void *
69562+acl_alloc(unsigned long len)
69563+{
69564+ void *ret = NULL;
69565+
69566+ if (!len || len > PAGE_SIZE)
69567+ goto out;
69568+
69569+ ret = kmalloc(len, GFP_KERNEL);
69570+
69571+ if (ret) {
69572+ if (alloc_push(ret)) {
69573+ kfree(ret);
69574+ ret = NULL;
69575+ }
69576+ }
69577+
69578+out:
69579+ return ret;
69580+}
69581+
69582+void *
69583+acl_alloc_num(unsigned long num, unsigned long len)
69584+{
69585+ if (!len || (num > (PAGE_SIZE / len)))
69586+ return NULL;
69587+
69588+ return acl_alloc(num * len);
69589+}
69590+
69591+void
69592+acl_free_all(void)
69593+{
69594+ if (!current_alloc_state->alloc_stack)
69595+ return;
69596+
69597+ while (alloc_pop()) ;
69598+
69599+ if (current_alloc_state->alloc_stack) {
69600+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
69601+ kfree(current_alloc_state->alloc_stack);
69602+ else
69603+ vfree(current_alloc_state->alloc_stack);
69604+ }
69605+
69606+ current_alloc_state->alloc_stack = NULL;
69607+ current_alloc_state->alloc_stack_size = 1;
69608+ current_alloc_state->alloc_stack_next = 1;
69609+
69610+ return;
69611+}
69612+
69613+int
69614+acl_alloc_stack_init(unsigned long size)
69615+{
69616+ if ((size * sizeof (void *)) <= PAGE_SIZE)
69617+ current_alloc_state->alloc_stack =
69618+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
69619+ else
69620+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
69621+
69622+ current_alloc_state->alloc_stack_size = size;
69623+ current_alloc_state->alloc_stack_next = 1;
69624+
69625+ if (!current_alloc_state->alloc_stack)
69626+ return 0;
69627+ else
69628+ return 1;
69629+}
69630diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
69631new file mode 100644
69632index 0000000..bdd51ea
69633--- /dev/null
69634+++ b/grsecurity/gracl_cap.c
69635@@ -0,0 +1,110 @@
69636+#include <linux/kernel.h>
69637+#include <linux/module.h>
69638+#include <linux/sched.h>
69639+#include <linux/gracl.h>
69640+#include <linux/grsecurity.h>
69641+#include <linux/grinternal.h>
69642+
69643+extern const char *captab_log[];
69644+extern int captab_log_entries;
69645+
69646+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
69647+{
69648+ struct acl_subject_label *curracl;
69649+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
69650+ kernel_cap_t cap_audit = __cap_empty_set;
69651+
69652+ if (!gr_acl_is_enabled())
69653+ return 1;
69654+
69655+ curracl = task->acl;
69656+
69657+ cap_drop = curracl->cap_lower;
69658+ cap_mask = curracl->cap_mask;
69659+ cap_audit = curracl->cap_invert_audit;
69660+
69661+ while ((curracl = curracl->parent_subject)) {
69662+ /* if the cap isn't specified in the current computed mask but is specified in the
69663+ current level subject, and is lowered in the current level subject, then add
69664+ it to the set of dropped capabilities
69665+ otherwise, add the current level subject's mask to the current computed mask
69666+ */
69667+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
69668+ cap_raise(cap_mask, cap);
69669+ if (cap_raised(curracl->cap_lower, cap))
69670+ cap_raise(cap_drop, cap);
69671+ if (cap_raised(curracl->cap_invert_audit, cap))
69672+ cap_raise(cap_audit, cap);
69673+ }
69674+ }
69675+
69676+ if (!cap_raised(cap_drop, cap)) {
69677+ if (cap_raised(cap_audit, cap))
69678+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
69679+ return 1;
69680+ }
69681+
69682+ curracl = task->acl;
69683+
69684+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
69685+ && cap_raised(cred->cap_effective, cap)) {
69686+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
69687+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
69688+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
69689+ gr_to_filename(task->exec_file->f_path.dentry,
69690+ task->exec_file->f_path.mnt) : curracl->filename,
69691+ curracl->filename, 0UL,
69692+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
69693+ return 1;
69694+ }
69695+
69696+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
69697+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
69698+
69699+ return 0;
69700+}
69701+
69702+int
69703+gr_acl_is_capable(const int cap)
69704+{
69705+ return gr_task_acl_is_capable(current, current_cred(), cap);
69706+}
69707+
69708+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
69709+{
69710+ struct acl_subject_label *curracl;
69711+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
69712+
69713+ if (!gr_acl_is_enabled())
69714+ return 1;
69715+
69716+ curracl = task->acl;
69717+
69718+ cap_drop = curracl->cap_lower;
69719+ cap_mask = curracl->cap_mask;
69720+
69721+ while ((curracl = curracl->parent_subject)) {
69722+ /* if the cap isn't specified in the current computed mask but is specified in the
69723+ current level subject, and is lowered in the current level subject, then add
69724+ it to the set of dropped capabilities
69725+ otherwise, add the current level subject's mask to the current computed mask
69726+ */
69727+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
69728+ cap_raise(cap_mask, cap);
69729+ if (cap_raised(curracl->cap_lower, cap))
69730+ cap_raise(cap_drop, cap);
69731+ }
69732+ }
69733+
69734+ if (!cap_raised(cap_drop, cap))
69735+ return 1;
69736+
69737+ return 0;
69738+}
69739+
69740+int
69741+gr_acl_is_capable_nolog(const int cap)
69742+{
69743+ return gr_task_acl_is_capable_nolog(current, cap);
69744+}
69745+
69746diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
69747new file mode 100644
69748index 0000000..ca25605
69749--- /dev/null
69750+++ b/grsecurity/gracl_compat.c
69751@@ -0,0 +1,270 @@
69752+#include <linux/kernel.h>
69753+#include <linux/gracl.h>
69754+#include <linux/compat.h>
69755+#include <linux/gracl_compat.h>
69756+
69757+#include <asm/uaccess.h>
69758+
69759+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
69760+{
69761+ struct gr_arg_wrapper_compat uwrapcompat;
69762+
69763+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
69764+ return -EFAULT;
69765+
69766+ if (((uwrapcompat.version != GRSECURITY_VERSION) &&
69767+ (uwrapcompat.version != 0x2901)) ||
69768+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
69769+ return -EINVAL;
69770+
69771+ uwrap->arg = compat_ptr(uwrapcompat.arg);
69772+ uwrap->version = uwrapcompat.version;
69773+ uwrap->size = sizeof(struct gr_arg);
69774+
69775+ return 0;
69776+}
69777+
69778+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
69779+{
69780+ struct gr_arg_compat argcompat;
69781+
69782+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
69783+ return -EFAULT;
69784+
69785+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
69786+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
69787+ arg->role_db.num_roles = argcompat.role_db.num_roles;
69788+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
69789+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
69790+ arg->role_db.num_objects = argcompat.role_db.num_objects;
69791+
69792+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
69793+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
69794+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
69795+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
69796+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
69797+ arg->segv_device = argcompat.segv_device;
69798+ arg->segv_inode = argcompat.segv_inode;
69799+ arg->segv_uid = argcompat.segv_uid;
69800+ arg->num_sprole_pws = argcompat.num_sprole_pws;
69801+ arg->mode = argcompat.mode;
69802+
69803+ return 0;
69804+}
69805+
69806+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
69807+{
69808+ struct acl_object_label_compat objcompat;
69809+
69810+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
69811+ return -EFAULT;
69812+
69813+ obj->filename = compat_ptr(objcompat.filename);
69814+ obj->inode = objcompat.inode;
69815+ obj->device = objcompat.device;
69816+ obj->mode = objcompat.mode;
69817+
69818+ obj->nested = compat_ptr(objcompat.nested);
69819+ obj->globbed = compat_ptr(objcompat.globbed);
69820+
69821+ obj->prev = compat_ptr(objcompat.prev);
69822+ obj->next = compat_ptr(objcompat.next);
69823+
69824+ return 0;
69825+}
69826+
69827+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
69828+{
69829+ unsigned int i;
69830+ struct acl_subject_label_compat subjcompat;
69831+
69832+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
69833+ return -EFAULT;
69834+
69835+ subj->filename = compat_ptr(subjcompat.filename);
69836+ subj->inode = subjcompat.inode;
69837+ subj->device = subjcompat.device;
69838+ subj->mode = subjcompat.mode;
69839+ subj->cap_mask = subjcompat.cap_mask;
69840+ subj->cap_lower = subjcompat.cap_lower;
69841+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
69842+
69843+ for (i = 0; i < GR_NLIMITS; i++) {
69844+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
69845+ subj->res[i].rlim_cur = RLIM_INFINITY;
69846+ else
69847+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
69848+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
69849+ subj->res[i].rlim_max = RLIM_INFINITY;
69850+ else
69851+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
69852+ }
69853+ subj->resmask = subjcompat.resmask;
69854+
69855+ subj->user_trans_type = subjcompat.user_trans_type;
69856+ subj->group_trans_type = subjcompat.group_trans_type;
69857+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
69858+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
69859+ subj->user_trans_num = subjcompat.user_trans_num;
69860+ subj->group_trans_num = subjcompat.group_trans_num;
69861+
69862+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
69863+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
69864+ subj->ip_type = subjcompat.ip_type;
69865+ subj->ips = compat_ptr(subjcompat.ips);
69866+ subj->ip_num = subjcompat.ip_num;
69867+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
69868+
69869+ subj->crashes = subjcompat.crashes;
69870+ subj->expires = subjcompat.expires;
69871+
69872+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
69873+ subj->hash = compat_ptr(subjcompat.hash);
69874+ subj->prev = compat_ptr(subjcompat.prev);
69875+ subj->next = compat_ptr(subjcompat.next);
69876+
69877+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
69878+ subj->obj_hash_size = subjcompat.obj_hash_size;
69879+ subj->pax_flags = subjcompat.pax_flags;
69880+
69881+ return 0;
69882+}
69883+
69884+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
69885+{
69886+ struct acl_role_label_compat rolecompat;
69887+
69888+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
69889+ return -EFAULT;
69890+
69891+ role->rolename = compat_ptr(rolecompat.rolename);
69892+ role->uidgid = rolecompat.uidgid;
69893+ role->roletype = rolecompat.roletype;
69894+
69895+ role->auth_attempts = rolecompat.auth_attempts;
69896+ role->expires = rolecompat.expires;
69897+
69898+ role->root_label = compat_ptr(rolecompat.root_label);
69899+ role->hash = compat_ptr(rolecompat.hash);
69900+
69901+ role->prev = compat_ptr(rolecompat.prev);
69902+ role->next = compat_ptr(rolecompat.next);
69903+
69904+ role->transitions = compat_ptr(rolecompat.transitions);
69905+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
69906+ role->domain_children = compat_ptr(rolecompat.domain_children);
69907+ role->domain_child_num = rolecompat.domain_child_num;
69908+
69909+ role->umask = rolecompat.umask;
69910+
69911+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
69912+ role->subj_hash_size = rolecompat.subj_hash_size;
69913+
69914+ return 0;
69915+}
69916+
69917+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
69918+{
69919+ struct role_allowed_ip_compat roleip_compat;
69920+
69921+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
69922+ return -EFAULT;
69923+
69924+ roleip->addr = roleip_compat.addr;
69925+ roleip->netmask = roleip_compat.netmask;
69926+
69927+ roleip->prev = compat_ptr(roleip_compat.prev);
69928+ roleip->next = compat_ptr(roleip_compat.next);
69929+
69930+ return 0;
69931+}
69932+
69933+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
69934+{
69935+ struct role_transition_compat trans_compat;
69936+
69937+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
69938+ return -EFAULT;
69939+
69940+ trans->rolename = compat_ptr(trans_compat.rolename);
69941+
69942+ trans->prev = compat_ptr(trans_compat.prev);
69943+ trans->next = compat_ptr(trans_compat.next);
69944+
69945+ return 0;
69946+
69947+}
69948+
69949+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
69950+{
69951+ struct gr_hash_struct_compat hash_compat;
69952+
69953+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
69954+ return -EFAULT;
69955+
69956+ hash->table = compat_ptr(hash_compat.table);
69957+ hash->nametable = compat_ptr(hash_compat.nametable);
69958+ hash->first = compat_ptr(hash_compat.first);
69959+
69960+ hash->table_size = hash_compat.table_size;
69961+ hash->used_size = hash_compat.used_size;
69962+
69963+ hash->type = hash_compat.type;
69964+
69965+ return 0;
69966+}
69967+
69968+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
69969+{
69970+ compat_uptr_t ptrcompat;
69971+
69972+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
69973+ return -EFAULT;
69974+
69975+ *(void **)ptr = compat_ptr(ptrcompat);
69976+
69977+ return 0;
69978+}
69979+
69980+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
69981+{
69982+ struct acl_ip_label_compat ip_compat;
69983+
69984+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
69985+ return -EFAULT;
69986+
69987+ ip->iface = compat_ptr(ip_compat.iface);
69988+ ip->addr = ip_compat.addr;
69989+ ip->netmask = ip_compat.netmask;
69990+ ip->low = ip_compat.low;
69991+ ip->high = ip_compat.high;
69992+ ip->mode = ip_compat.mode;
69993+ ip->type = ip_compat.type;
69994+
69995+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
69996+
69997+ ip->prev = compat_ptr(ip_compat.prev);
69998+ ip->next = compat_ptr(ip_compat.next);
69999+
70000+ return 0;
70001+}
70002+
70003+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
70004+{
70005+ struct sprole_pw_compat pw_compat;
70006+
70007+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
70008+ return -EFAULT;
70009+
70010+ pw->rolename = compat_ptr(pw_compat.rolename);
70011+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
70012+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
70013+
70014+ return 0;
70015+}
70016+
70017+size_t get_gr_arg_wrapper_size_compat(void)
70018+{
70019+ return sizeof(struct gr_arg_wrapper_compat);
70020+}
70021+
70022diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
70023new file mode 100644
70024index 0000000..4008fdc
70025--- /dev/null
70026+++ b/grsecurity/gracl_fs.c
70027@@ -0,0 +1,445 @@
70028+#include <linux/kernel.h>
70029+#include <linux/sched.h>
70030+#include <linux/types.h>
70031+#include <linux/fs.h>
70032+#include <linux/file.h>
70033+#include <linux/stat.h>
70034+#include <linux/grsecurity.h>
70035+#include <linux/grinternal.h>
70036+#include <linux/gracl.h>
70037+
70038+umode_t
70039+gr_acl_umask(void)
70040+{
70041+ if (unlikely(!gr_acl_is_enabled()))
70042+ return 0;
70043+
70044+ return current->role->umask;
70045+}
70046+
70047+__u32
70048+gr_acl_handle_hidden_file(const struct dentry * dentry,
70049+ const struct vfsmount * mnt)
70050+{
70051+ __u32 mode;
70052+
70053+ if (unlikely(d_is_negative(dentry)))
70054+ return GR_FIND;
70055+
70056+ mode =
70057+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
70058+
70059+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
70060+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
70061+ return mode;
70062+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
70063+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
70064+ return 0;
70065+ } else if (unlikely(!(mode & GR_FIND)))
70066+ return 0;
70067+
70068+ return GR_FIND;
70069+}
70070+
70071+__u32
70072+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
70073+ int acc_mode)
70074+{
70075+ __u32 reqmode = GR_FIND;
70076+ __u32 mode;
70077+
70078+ if (unlikely(d_is_negative(dentry)))
70079+ return reqmode;
70080+
70081+ if (acc_mode & MAY_APPEND)
70082+ reqmode |= GR_APPEND;
70083+ else if (acc_mode & MAY_WRITE)
70084+ reqmode |= GR_WRITE;
70085+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
70086+ reqmode |= GR_READ;
70087+
70088+ mode =
70089+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
70090+ mnt);
70091+
70092+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
70093+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
70094+ reqmode & GR_READ ? " reading" : "",
70095+ reqmode & GR_WRITE ? " writing" : reqmode &
70096+ GR_APPEND ? " appending" : "");
70097+ return reqmode;
70098+ } else
70099+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
70100+ {
70101+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
70102+ reqmode & GR_READ ? " reading" : "",
70103+ reqmode & GR_WRITE ? " writing" : reqmode &
70104+ GR_APPEND ? " appending" : "");
70105+ return 0;
70106+ } else if (unlikely((mode & reqmode) != reqmode))
70107+ return 0;
70108+
70109+ return reqmode;
70110+}
70111+
70112+__u32
70113+gr_acl_handle_creat(const struct dentry * dentry,
70114+ const struct dentry * p_dentry,
70115+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
70116+ const int imode)
70117+{
70118+ __u32 reqmode = GR_WRITE | GR_CREATE;
70119+ __u32 mode;
70120+
70121+ if (acc_mode & MAY_APPEND)
70122+ reqmode |= GR_APPEND;
70123+ // if a directory was required or the directory already exists, then
70124+ // don't count this open as a read
70125+ if ((acc_mode & MAY_READ) &&
70126+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
70127+ reqmode |= GR_READ;
70128+ if ((open_flags & O_CREAT) &&
70129+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
70130+ reqmode |= GR_SETID;
70131+
70132+ mode =
70133+ gr_check_create(dentry, p_dentry, p_mnt,
70134+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
70135+
70136+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
70137+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
70138+ reqmode & GR_READ ? " reading" : "",
70139+ reqmode & GR_WRITE ? " writing" : reqmode &
70140+ GR_APPEND ? " appending" : "");
70141+ return reqmode;
70142+ } else
70143+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
70144+ {
70145+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
70146+ reqmode & GR_READ ? " reading" : "",
70147+ reqmode & GR_WRITE ? " writing" : reqmode &
70148+ GR_APPEND ? " appending" : "");
70149+ return 0;
70150+ } else if (unlikely((mode & reqmode) != reqmode))
70151+ return 0;
70152+
70153+ return reqmode;
70154+}
70155+
70156+__u32
70157+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
70158+ const int fmode)
70159+{
70160+ __u32 mode, reqmode = GR_FIND;
70161+
70162+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
70163+ reqmode |= GR_EXEC;
70164+ if (fmode & S_IWOTH)
70165+ reqmode |= GR_WRITE;
70166+ if (fmode & S_IROTH)
70167+ reqmode |= GR_READ;
70168+
70169+ mode =
70170+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
70171+ mnt);
70172+
70173+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
70174+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
70175+ reqmode & GR_READ ? " reading" : "",
70176+ reqmode & GR_WRITE ? " writing" : "",
70177+ reqmode & GR_EXEC ? " executing" : "");
70178+ return reqmode;
70179+ } else
70180+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
70181+ {
70182+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
70183+ reqmode & GR_READ ? " reading" : "",
70184+ reqmode & GR_WRITE ? " writing" : "",
70185+ reqmode & GR_EXEC ? " executing" : "");
70186+ return 0;
70187+ } else if (unlikely((mode & reqmode) != reqmode))
70188+ return 0;
70189+
70190+ return reqmode;
70191+}
70192+
70193+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
70194+{
70195+ __u32 mode;
70196+
70197+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
70198+
70199+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
70200+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
70201+ return mode;
70202+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
70203+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
70204+ return 0;
70205+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
70206+ return 0;
70207+
70208+ return (reqmode);
70209+}
70210+
70211+__u32
70212+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
70213+{
70214+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
70215+}
70216+
70217+__u32
70218+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
70219+{
70220+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
70221+}
70222+
70223+__u32
70224+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
70225+{
70226+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
70227+}
70228+
70229+__u32
70230+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
70231+{
70232+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
70233+}
70234+
70235+__u32
70236+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
70237+ umode_t *modeptr)
70238+{
70239+ umode_t mode;
70240+
70241+ *modeptr &= ~gr_acl_umask();
70242+ mode = *modeptr;
70243+
70244+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
70245+ return 1;
70246+
70247+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
70248+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
70249+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
70250+ GR_CHMOD_ACL_MSG);
70251+ } else {
70252+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
70253+ }
70254+}
70255+
70256+__u32
70257+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
70258+{
70259+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
70260+}
70261+
70262+__u32
70263+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
70264+{
70265+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
70266+}
70267+
70268+__u32
70269+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
70270+{
70271+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
70272+}
70273+
70274+__u32
70275+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
70276+{
70277+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
70278+}
70279+
70280+__u32
70281+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
70282+{
70283+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
70284+ GR_UNIXCONNECT_ACL_MSG);
70285+}
70286+
70287+/* hardlinks require at minimum create and link permission,
70288+ any additional privilege required is based on the
70289+ privilege of the file being linked to
70290+*/
70291+__u32
70292+gr_acl_handle_link(const struct dentry * new_dentry,
70293+ const struct dentry * parent_dentry,
70294+ const struct vfsmount * parent_mnt,
70295+ const struct dentry * old_dentry,
70296+ const struct vfsmount * old_mnt, const struct filename *to)
70297+{
70298+ __u32 mode;
70299+ __u32 needmode = GR_CREATE | GR_LINK;
70300+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
70301+
70302+ mode =
70303+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
70304+ old_mnt);
70305+
70306+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
70307+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
70308+ return mode;
70309+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
70310+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
70311+ return 0;
70312+ } else if (unlikely((mode & needmode) != needmode))
70313+ return 0;
70314+
70315+ return 1;
70316+}
70317+
70318+__u32
70319+gr_acl_handle_symlink(const struct dentry * new_dentry,
70320+ const struct dentry * parent_dentry,
70321+ const struct vfsmount * parent_mnt, const struct filename *from)
70322+{
70323+ __u32 needmode = GR_WRITE | GR_CREATE;
70324+ __u32 mode;
70325+
70326+ mode =
70327+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
70328+ GR_CREATE | GR_AUDIT_CREATE |
70329+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
70330+
70331+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
70332+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
70333+ return mode;
70334+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
70335+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
70336+ return 0;
70337+ } else if (unlikely((mode & needmode) != needmode))
70338+ return 0;
70339+
70340+ return (GR_WRITE | GR_CREATE);
70341+}
70342+
70343+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)
70344+{
70345+ __u32 mode;
70346+
70347+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
70348+
70349+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
70350+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
70351+ return mode;
70352+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
70353+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
70354+ return 0;
70355+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
70356+ return 0;
70357+
70358+ return (reqmode);
70359+}
70360+
70361+__u32
70362+gr_acl_handle_mknod(const struct dentry * new_dentry,
70363+ const struct dentry * parent_dentry,
70364+ const struct vfsmount * parent_mnt,
70365+ const int mode)
70366+{
70367+ __u32 reqmode = GR_WRITE | GR_CREATE;
70368+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
70369+ reqmode |= GR_SETID;
70370+
70371+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
70372+ reqmode, GR_MKNOD_ACL_MSG);
70373+}
70374+
70375+__u32
70376+gr_acl_handle_mkdir(const struct dentry *new_dentry,
70377+ const struct dentry *parent_dentry,
70378+ const struct vfsmount *parent_mnt)
70379+{
70380+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
70381+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
70382+}
70383+
70384+#define RENAME_CHECK_SUCCESS(old, new) \
70385+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
70386+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
70387+
70388+int
70389+gr_acl_handle_rename(struct dentry *new_dentry,
70390+ struct dentry *parent_dentry,
70391+ const struct vfsmount *parent_mnt,
70392+ struct dentry *old_dentry,
70393+ struct inode *old_parent_inode,
70394+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
70395+{
70396+ __u32 comp1, comp2;
70397+ int error = 0;
70398+
70399+ if (unlikely(!gr_acl_is_enabled()))
70400+ return 0;
70401+
70402+ if (flags & RENAME_EXCHANGE) {
70403+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
70404+ GR_AUDIT_READ | GR_AUDIT_WRITE |
70405+ GR_SUPPRESS, parent_mnt);
70406+ comp2 =
70407+ gr_search_file(old_dentry,
70408+ GR_READ | GR_WRITE | GR_AUDIT_READ |
70409+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
70410+ } else if (d_is_negative(new_dentry)) {
70411+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
70412+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
70413+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
70414+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
70415+ GR_DELETE | GR_AUDIT_DELETE |
70416+ GR_AUDIT_READ | GR_AUDIT_WRITE |
70417+ GR_SUPPRESS, old_mnt);
70418+ } else {
70419+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
70420+ GR_CREATE | GR_DELETE |
70421+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
70422+ GR_AUDIT_READ | GR_AUDIT_WRITE |
70423+ GR_SUPPRESS, parent_mnt);
70424+ comp2 =
70425+ gr_search_file(old_dentry,
70426+ GR_READ | GR_WRITE | GR_AUDIT_READ |
70427+ GR_DELETE | GR_AUDIT_DELETE |
70428+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
70429+ }
70430+
70431+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
70432+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
70433+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
70434+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
70435+ && !(comp2 & GR_SUPPRESS)) {
70436+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
70437+ error = -EACCES;
70438+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
70439+ error = -EACCES;
70440+
70441+ return error;
70442+}
70443+
70444+void
70445+gr_acl_handle_exit(void)
70446+{
70447+ u16 id;
70448+ char *rolename;
70449+
70450+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
70451+ !(current->role->roletype & GR_ROLE_PERSIST))) {
70452+ id = current->acl_role_id;
70453+ rolename = current->role->rolename;
70454+ gr_set_acls(1);
70455+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
70456+ }
70457+
70458+ gr_put_exec_file(current);
70459+ return;
70460+}
70461+
70462+int
70463+gr_acl_handle_procpidmem(const struct task_struct *task)
70464+{
70465+ if (unlikely(!gr_acl_is_enabled()))
70466+ return 0;
70467+
70468+ if (task != current && task->acl->mode & GR_PROTPROCFD)
70469+ return -EACCES;
70470+
70471+ return 0;
70472+}
70473diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
70474new file mode 100644
70475index 0000000..f056b81
70476--- /dev/null
70477+++ b/grsecurity/gracl_ip.c
70478@@ -0,0 +1,386 @@
70479+#include <linux/kernel.h>
70480+#include <asm/uaccess.h>
70481+#include <asm/errno.h>
70482+#include <net/sock.h>
70483+#include <linux/file.h>
70484+#include <linux/fs.h>
70485+#include <linux/net.h>
70486+#include <linux/in.h>
70487+#include <linux/skbuff.h>
70488+#include <linux/ip.h>
70489+#include <linux/udp.h>
70490+#include <linux/types.h>
70491+#include <linux/sched.h>
70492+#include <linux/netdevice.h>
70493+#include <linux/inetdevice.h>
70494+#include <linux/gracl.h>
70495+#include <linux/grsecurity.h>
70496+#include <linux/grinternal.h>
70497+
70498+#define GR_BIND 0x01
70499+#define GR_CONNECT 0x02
70500+#define GR_INVERT 0x04
70501+#define GR_BINDOVERRIDE 0x08
70502+#define GR_CONNECTOVERRIDE 0x10
70503+#define GR_SOCK_FAMILY 0x20
70504+
70505+static const char * gr_protocols[IPPROTO_MAX] = {
70506+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
70507+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
70508+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
70509+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
70510+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
70511+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
70512+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
70513+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
70514+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
70515+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
70516+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
70517+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
70518+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
70519+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
70520+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
70521+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
70522+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
70523+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
70524+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
70525+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
70526+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
70527+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
70528+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
70529+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
70530+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
70531+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
70532+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
70533+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
70534+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
70535+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
70536+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
70537+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
70538+ };
70539+
70540+static const char * gr_socktypes[SOCK_MAX] = {
70541+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
70542+ "unknown:7", "unknown:8", "unknown:9", "packet"
70543+ };
70544+
70545+static const char * gr_sockfamilies[AF_MAX+1] = {
70546+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
70547+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
70548+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
70549+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
70550+ };
70551+
70552+const char *
70553+gr_proto_to_name(unsigned char proto)
70554+{
70555+ return gr_protocols[proto];
70556+}
70557+
70558+const char *
70559+gr_socktype_to_name(unsigned char type)
70560+{
70561+ return gr_socktypes[type];
70562+}
70563+
70564+const char *
70565+gr_sockfamily_to_name(unsigned char family)
70566+{
70567+ return gr_sockfamilies[family];
70568+}
70569+
70570+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
70571+
70572+int
70573+gr_search_socket(const int domain, const int type, const int protocol)
70574+{
70575+ struct acl_subject_label *curr;
70576+ const struct cred *cred = current_cred();
70577+
70578+ if (unlikely(!gr_acl_is_enabled()))
70579+ goto exit;
70580+
70581+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
70582+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
70583+ goto exit; // let the kernel handle it
70584+
70585+ curr = current->acl;
70586+
70587+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
70588+ /* the family is allowed, if this is PF_INET allow it only if
70589+ the extra sock type/protocol checks pass */
70590+ if (domain == PF_INET)
70591+ goto inet_check;
70592+ goto exit;
70593+ } else {
70594+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70595+ __u32 fakeip = 0;
70596+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70597+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
70598+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
70599+ gr_to_filename(current->exec_file->f_path.dentry,
70600+ current->exec_file->f_path.mnt) :
70601+ curr->filename, curr->filename,
70602+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
70603+ &current->signal->saved_ip);
70604+ goto exit;
70605+ }
70606+ goto exit_fail;
70607+ }
70608+
70609+inet_check:
70610+ /* the rest of this checking is for IPv4 only */
70611+ if (!curr->ips)
70612+ goto exit;
70613+
70614+ if ((curr->ip_type & (1U << type)) &&
70615+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
70616+ goto exit;
70617+
70618+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70619+ /* we don't place acls on raw sockets , and sometimes
70620+ dgram/ip sockets are opened for ioctl and not
70621+ bind/connect, so we'll fake a bind learn log */
70622+ if (type == SOCK_RAW || type == SOCK_PACKET) {
70623+ __u32 fakeip = 0;
70624+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70625+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
70626+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
70627+ gr_to_filename(current->exec_file->f_path.dentry,
70628+ current->exec_file->f_path.mnt) :
70629+ curr->filename, curr->filename,
70630+ &fakeip, 0, type,
70631+ protocol, GR_CONNECT, &current->signal->saved_ip);
70632+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
70633+ __u32 fakeip = 0;
70634+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70635+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
70636+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
70637+ gr_to_filename(current->exec_file->f_path.dentry,
70638+ current->exec_file->f_path.mnt) :
70639+ curr->filename, curr->filename,
70640+ &fakeip, 0, type,
70641+ protocol, GR_BIND, &current->signal->saved_ip);
70642+ }
70643+ /* we'll log when they use connect or bind */
70644+ goto exit;
70645+ }
70646+
70647+exit_fail:
70648+ if (domain == PF_INET)
70649+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
70650+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
70651+ else if (rcu_access_pointer(net_families[domain]) != NULL)
70652+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
70653+ gr_socktype_to_name(type), protocol);
70654+
70655+ return 0;
70656+exit:
70657+ return 1;
70658+}
70659+
70660+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)
70661+{
70662+ if ((ip->mode & mode) &&
70663+ (ip_port >= ip->low) &&
70664+ (ip_port <= ip->high) &&
70665+ ((ntohl(ip_addr) & our_netmask) ==
70666+ (ntohl(our_addr) & our_netmask))
70667+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
70668+ && (ip->type & (1U << type))) {
70669+ if (ip->mode & GR_INVERT)
70670+ return 2; // specifically denied
70671+ else
70672+ return 1; // allowed
70673+ }
70674+
70675+ return 0; // not specifically allowed, may continue parsing
70676+}
70677+
70678+static int
70679+gr_search_connectbind(const int full_mode, struct sock *sk,
70680+ struct sockaddr_in *addr, const int type)
70681+{
70682+ char iface[IFNAMSIZ] = {0};
70683+ struct acl_subject_label *curr;
70684+ struct acl_ip_label *ip;
70685+ struct inet_sock *isk;
70686+ struct net_device *dev;
70687+ struct in_device *idev;
70688+ unsigned long i;
70689+ int ret;
70690+ int mode = full_mode & (GR_BIND | GR_CONNECT);
70691+ __u32 ip_addr = 0;
70692+ __u32 our_addr;
70693+ __u32 our_netmask;
70694+ char *p;
70695+ __u16 ip_port = 0;
70696+ const struct cred *cred = current_cred();
70697+
70698+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
70699+ return 0;
70700+
70701+ curr = current->acl;
70702+ isk = inet_sk(sk);
70703+
70704+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
70705+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
70706+ addr->sin_addr.s_addr = curr->inaddr_any_override;
70707+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
70708+ struct sockaddr_in saddr;
70709+ int err;
70710+
70711+ saddr.sin_family = AF_INET;
70712+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
70713+ saddr.sin_port = isk->inet_sport;
70714+
70715+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
70716+ if (err)
70717+ return err;
70718+
70719+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
70720+ if (err)
70721+ return err;
70722+ }
70723+
70724+ if (!curr->ips)
70725+ return 0;
70726+
70727+ ip_addr = addr->sin_addr.s_addr;
70728+ ip_port = ntohs(addr->sin_port);
70729+
70730+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
70731+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
70732+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
70733+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
70734+ gr_to_filename(current->exec_file->f_path.dentry,
70735+ current->exec_file->f_path.mnt) :
70736+ curr->filename, curr->filename,
70737+ &ip_addr, ip_port, type,
70738+ sk->sk_protocol, mode, &current->signal->saved_ip);
70739+ return 0;
70740+ }
70741+
70742+ for (i = 0; i < curr->ip_num; i++) {
70743+ ip = *(curr->ips + i);
70744+ if (ip->iface != NULL) {
70745+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
70746+ p = strchr(iface, ':');
70747+ if (p != NULL)
70748+ *p = '\0';
70749+ dev = dev_get_by_name(sock_net(sk), iface);
70750+ if (dev == NULL)
70751+ continue;
70752+ idev = in_dev_get(dev);
70753+ if (idev == NULL) {
70754+ dev_put(dev);
70755+ continue;
70756+ }
70757+ rcu_read_lock();
70758+ for_ifa(idev) {
70759+ if (!strcmp(ip->iface, ifa->ifa_label)) {
70760+ our_addr = ifa->ifa_address;
70761+ our_netmask = 0xffffffff;
70762+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
70763+ if (ret == 1) {
70764+ rcu_read_unlock();
70765+ in_dev_put(idev);
70766+ dev_put(dev);
70767+ return 0;
70768+ } else if (ret == 2) {
70769+ rcu_read_unlock();
70770+ in_dev_put(idev);
70771+ dev_put(dev);
70772+ goto denied;
70773+ }
70774+ }
70775+ } endfor_ifa(idev);
70776+ rcu_read_unlock();
70777+ in_dev_put(idev);
70778+ dev_put(dev);
70779+ } else {
70780+ our_addr = ip->addr;
70781+ our_netmask = ip->netmask;
70782+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
70783+ if (ret == 1)
70784+ return 0;
70785+ else if (ret == 2)
70786+ goto denied;
70787+ }
70788+ }
70789+
70790+denied:
70791+ if (mode == GR_BIND)
70792+ 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));
70793+ else if (mode == GR_CONNECT)
70794+ 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));
70795+
70796+ return -EACCES;
70797+}
70798+
70799+int
70800+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
70801+{
70802+ /* always allow disconnection of dgram sockets with connect */
70803+ if (addr->sin_family == AF_UNSPEC)
70804+ return 0;
70805+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
70806+}
70807+
70808+int
70809+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
70810+{
70811+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
70812+}
70813+
70814+int gr_search_listen(struct socket *sock)
70815+{
70816+ struct sock *sk = sock->sk;
70817+ struct sockaddr_in addr;
70818+
70819+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
70820+ addr.sin_port = inet_sk(sk)->inet_sport;
70821+
70822+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
70823+}
70824+
70825+int gr_search_accept(struct socket *sock)
70826+{
70827+ struct sock *sk = sock->sk;
70828+ struct sockaddr_in addr;
70829+
70830+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
70831+ addr.sin_port = inet_sk(sk)->inet_sport;
70832+
70833+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
70834+}
70835+
70836+int
70837+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
70838+{
70839+ if (addr)
70840+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
70841+ else {
70842+ struct sockaddr_in sin;
70843+ const struct inet_sock *inet = inet_sk(sk);
70844+
70845+ sin.sin_addr.s_addr = inet->inet_daddr;
70846+ sin.sin_port = inet->inet_dport;
70847+
70848+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
70849+ }
70850+}
70851+
70852+int
70853+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
70854+{
70855+ struct sockaddr_in sin;
70856+
70857+ if (unlikely(skb->len < sizeof (struct udphdr)))
70858+ return 0; // skip this packet
70859+
70860+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
70861+ sin.sin_port = udp_hdr(skb)->source;
70862+
70863+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
70864+}
70865diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
70866new file mode 100644
70867index 0000000..25f54ef
70868--- /dev/null
70869+++ b/grsecurity/gracl_learn.c
70870@@ -0,0 +1,207 @@
70871+#include <linux/kernel.h>
70872+#include <linux/mm.h>
70873+#include <linux/sched.h>
70874+#include <linux/poll.h>
70875+#include <linux/string.h>
70876+#include <linux/file.h>
70877+#include <linux/types.h>
70878+#include <linux/vmalloc.h>
70879+#include <linux/grinternal.h>
70880+
70881+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
70882+ size_t count, loff_t *ppos);
70883+extern int gr_acl_is_enabled(void);
70884+
70885+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
70886+static int gr_learn_attached;
70887+
70888+/* use a 512k buffer */
70889+#define LEARN_BUFFER_SIZE (512 * 1024)
70890+
70891+static DEFINE_SPINLOCK(gr_learn_lock);
70892+static DEFINE_MUTEX(gr_learn_user_mutex);
70893+
70894+/* we need to maintain two buffers, so that the kernel context of grlearn
70895+ uses a semaphore around the userspace copying, and the other kernel contexts
70896+ use a spinlock when copying into the buffer, since they cannot sleep
70897+*/
70898+static char *learn_buffer;
70899+static char *learn_buffer_user;
70900+static int learn_buffer_len;
70901+static int learn_buffer_user_len;
70902+
70903+static ssize_t
70904+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
70905+{
70906+ DECLARE_WAITQUEUE(wait, current);
70907+ ssize_t retval = 0;
70908+
70909+ add_wait_queue(&learn_wait, &wait);
70910+ set_current_state(TASK_INTERRUPTIBLE);
70911+ do {
70912+ mutex_lock(&gr_learn_user_mutex);
70913+ spin_lock(&gr_learn_lock);
70914+ if (learn_buffer_len)
70915+ break;
70916+ spin_unlock(&gr_learn_lock);
70917+ mutex_unlock(&gr_learn_user_mutex);
70918+ if (file->f_flags & O_NONBLOCK) {
70919+ retval = -EAGAIN;
70920+ goto out;
70921+ }
70922+ if (signal_pending(current)) {
70923+ retval = -ERESTARTSYS;
70924+ goto out;
70925+ }
70926+
70927+ schedule();
70928+ } while (1);
70929+
70930+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
70931+ learn_buffer_user_len = learn_buffer_len;
70932+ retval = learn_buffer_len;
70933+ learn_buffer_len = 0;
70934+
70935+ spin_unlock(&gr_learn_lock);
70936+
70937+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
70938+ retval = -EFAULT;
70939+
70940+ mutex_unlock(&gr_learn_user_mutex);
70941+out:
70942+ set_current_state(TASK_RUNNING);
70943+ remove_wait_queue(&learn_wait, &wait);
70944+ return retval;
70945+}
70946+
70947+static unsigned int
70948+poll_learn(struct file * file, poll_table * wait)
70949+{
70950+ poll_wait(file, &learn_wait, wait);
70951+
70952+ if (learn_buffer_len)
70953+ return (POLLIN | POLLRDNORM);
70954+
70955+ return 0;
70956+}
70957+
70958+void
70959+gr_clear_learn_entries(void)
70960+{
70961+ char *tmp;
70962+
70963+ mutex_lock(&gr_learn_user_mutex);
70964+ spin_lock(&gr_learn_lock);
70965+ tmp = learn_buffer;
70966+ learn_buffer = NULL;
70967+ spin_unlock(&gr_learn_lock);
70968+ if (tmp)
70969+ vfree(tmp);
70970+ if (learn_buffer_user != NULL) {
70971+ vfree(learn_buffer_user);
70972+ learn_buffer_user = NULL;
70973+ }
70974+ learn_buffer_len = 0;
70975+ mutex_unlock(&gr_learn_user_mutex);
70976+
70977+ return;
70978+}
70979+
70980+void
70981+gr_add_learn_entry(const char *fmt, ...)
70982+{
70983+ va_list args;
70984+ unsigned int len;
70985+
70986+ if (!gr_learn_attached)
70987+ return;
70988+
70989+ spin_lock(&gr_learn_lock);
70990+
70991+ /* leave a gap at the end so we know when it's "full" but don't have to
70992+ compute the exact length of the string we're trying to append
70993+ */
70994+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
70995+ spin_unlock(&gr_learn_lock);
70996+ wake_up_interruptible(&learn_wait);
70997+ return;
70998+ }
70999+ if (learn_buffer == NULL) {
71000+ spin_unlock(&gr_learn_lock);
71001+ return;
71002+ }
71003+
71004+ va_start(args, fmt);
71005+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
71006+ va_end(args);
71007+
71008+ learn_buffer_len += len + 1;
71009+
71010+ spin_unlock(&gr_learn_lock);
71011+ wake_up_interruptible(&learn_wait);
71012+
71013+ return;
71014+}
71015+
71016+static int
71017+open_learn(struct inode *inode, struct file *file)
71018+{
71019+ if (file->f_mode & FMODE_READ && gr_learn_attached)
71020+ return -EBUSY;
71021+ if (file->f_mode & FMODE_READ) {
71022+ int retval = 0;
71023+ mutex_lock(&gr_learn_user_mutex);
71024+ if (learn_buffer == NULL)
71025+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
71026+ if (learn_buffer_user == NULL)
71027+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
71028+ if (learn_buffer == NULL) {
71029+ retval = -ENOMEM;
71030+ goto out_error;
71031+ }
71032+ if (learn_buffer_user == NULL) {
71033+ retval = -ENOMEM;
71034+ goto out_error;
71035+ }
71036+ learn_buffer_len = 0;
71037+ learn_buffer_user_len = 0;
71038+ gr_learn_attached = 1;
71039+out_error:
71040+ mutex_unlock(&gr_learn_user_mutex);
71041+ return retval;
71042+ }
71043+ return 0;
71044+}
71045+
71046+static int
71047+close_learn(struct inode *inode, struct file *file)
71048+{
71049+ if (file->f_mode & FMODE_READ) {
71050+ char *tmp = NULL;
71051+ mutex_lock(&gr_learn_user_mutex);
71052+ spin_lock(&gr_learn_lock);
71053+ tmp = learn_buffer;
71054+ learn_buffer = NULL;
71055+ spin_unlock(&gr_learn_lock);
71056+ if (tmp)
71057+ vfree(tmp);
71058+ if (learn_buffer_user != NULL) {
71059+ vfree(learn_buffer_user);
71060+ learn_buffer_user = NULL;
71061+ }
71062+ learn_buffer_len = 0;
71063+ learn_buffer_user_len = 0;
71064+ gr_learn_attached = 0;
71065+ mutex_unlock(&gr_learn_user_mutex);
71066+ }
71067+
71068+ return 0;
71069+}
71070+
71071+const struct file_operations grsec_fops = {
71072+ .read = read_learn,
71073+ .write = write_grsec_handler,
71074+ .open = open_learn,
71075+ .release = close_learn,
71076+ .poll = poll_learn,
71077+};
71078diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
71079new file mode 100644
71080index 0000000..361a099
71081--- /dev/null
71082+++ b/grsecurity/gracl_policy.c
71083@@ -0,0 +1,1782 @@
71084+#include <linux/kernel.h>
71085+#include <linux/module.h>
71086+#include <linux/sched.h>
71087+#include <linux/mm.h>
71088+#include <linux/file.h>
71089+#include <linux/fs.h>
71090+#include <linux/namei.h>
71091+#include <linux/mount.h>
71092+#include <linux/tty.h>
71093+#include <linux/proc_fs.h>
71094+#include <linux/lglock.h>
71095+#include <linux/slab.h>
71096+#include <linux/vmalloc.h>
71097+#include <linux/types.h>
71098+#include <linux/sysctl.h>
71099+#include <linux/netdevice.h>
71100+#include <linux/ptrace.h>
71101+#include <linux/gracl.h>
71102+#include <linux/gralloc.h>
71103+#include <linux/security.h>
71104+#include <linux/grinternal.h>
71105+#include <linux/pid_namespace.h>
71106+#include <linux/stop_machine.h>
71107+#include <linux/fdtable.h>
71108+#include <linux/percpu.h>
71109+#include <linux/lglock.h>
71110+#include <linux/hugetlb.h>
71111+#include <linux/posix-timers.h>
71112+#include "../fs/mount.h"
71113+
71114+#include <asm/uaccess.h>
71115+#include <asm/errno.h>
71116+#include <asm/mman.h>
71117+
71118+extern struct gr_policy_state *polstate;
71119+
71120+#define FOR_EACH_ROLE_START(role) \
71121+ role = polstate->role_list; \
71122+ while (role) {
71123+
71124+#define FOR_EACH_ROLE_END(role) \
71125+ role = role->prev; \
71126+ }
71127+
71128+struct path gr_real_root;
71129+
71130+extern struct gr_alloc_state *current_alloc_state;
71131+
71132+u16 acl_sp_role_value;
71133+
71134+static DEFINE_MUTEX(gr_dev_mutex);
71135+
71136+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
71137+extern void gr_clear_learn_entries(void);
71138+
71139+static struct gr_arg gr_usermode;
71140+static unsigned char gr_system_salt[GR_SALT_LEN];
71141+static unsigned char gr_system_sum[GR_SHA_LEN];
71142+
71143+static unsigned int gr_auth_attempts = 0;
71144+static unsigned long gr_auth_expires = 0UL;
71145+
71146+struct acl_object_label *fakefs_obj_rw;
71147+struct acl_object_label *fakefs_obj_rwx;
71148+
71149+extern int gr_init_uidset(void);
71150+extern void gr_free_uidset(void);
71151+extern void gr_remove_uid(uid_t uid);
71152+extern int gr_find_uid(uid_t uid);
71153+
71154+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
71155+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
71156+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
71157+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
71158+extern struct acl_role_label *__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid, const gid_t gid);
71159+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
71160+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
71161+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
71162+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
71163+extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
71164+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
71165+extern void assign_special_role(const char *rolename);
71166+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
71167+extern int gr_rbac_disable(void *unused);
71168+extern void gr_enable_rbac_system(void);
71169+
71170+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
71171+{
71172+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
71173+ return -EFAULT;
71174+
71175+ return 0;
71176+}
71177+
71178+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
71179+{
71180+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
71181+ return -EFAULT;
71182+
71183+ return 0;
71184+}
71185+
71186+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
71187+{
71188+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
71189+ return -EFAULT;
71190+
71191+ return 0;
71192+}
71193+
71194+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
71195+{
71196+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
71197+ return -EFAULT;
71198+
71199+ return 0;
71200+}
71201+
71202+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
71203+{
71204+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
71205+ return -EFAULT;
71206+
71207+ return 0;
71208+}
71209+
71210+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
71211+{
71212+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
71213+ return -EFAULT;
71214+
71215+ return 0;
71216+}
71217+
71218+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
71219+{
71220+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
71221+ return -EFAULT;
71222+
71223+ return 0;
71224+}
71225+
71226+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
71227+{
71228+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
71229+ return -EFAULT;
71230+
71231+ return 0;
71232+}
71233+
71234+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
71235+{
71236+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
71237+ return -EFAULT;
71238+
71239+ return 0;
71240+}
71241+
71242+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
71243+{
71244+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
71245+ return -EFAULT;
71246+
71247+ if (((uwrap->version != GRSECURITY_VERSION) &&
71248+ (uwrap->version != 0x2901)) ||
71249+ (uwrap->size != sizeof(struct gr_arg)))
71250+ return -EINVAL;
71251+
71252+ return 0;
71253+}
71254+
71255+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
71256+{
71257+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
71258+ return -EFAULT;
71259+
71260+ return 0;
71261+}
71262+
71263+static size_t get_gr_arg_wrapper_size_normal(void)
71264+{
71265+ return sizeof(struct gr_arg_wrapper);
71266+}
71267+
71268+#ifdef CONFIG_COMPAT
71269+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
71270+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
71271+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
71272+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
71273+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
71274+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
71275+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
71276+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
71277+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
71278+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
71279+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
71280+extern size_t get_gr_arg_wrapper_size_compat(void);
71281+
71282+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
71283+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
71284+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
71285+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
71286+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
71287+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
71288+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
71289+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
71290+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
71291+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
71292+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
71293+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
71294+
71295+#else
71296+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
71297+#define copy_gr_arg copy_gr_arg_normal
71298+#define copy_gr_hash_struct copy_gr_hash_struct_normal
71299+#define copy_acl_object_label copy_acl_object_label_normal
71300+#define copy_acl_subject_label copy_acl_subject_label_normal
71301+#define copy_acl_role_label copy_acl_role_label_normal
71302+#define copy_acl_ip_label copy_acl_ip_label_normal
71303+#define copy_pointer_from_array copy_pointer_from_array_normal
71304+#define copy_sprole_pw copy_sprole_pw_normal
71305+#define copy_role_transition copy_role_transition_normal
71306+#define copy_role_allowed_ip copy_role_allowed_ip_normal
71307+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
71308+#endif
71309+
71310+static struct acl_subject_label *
71311+lookup_subject_map(const struct acl_subject_label *userp)
71312+{
71313+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
71314+ struct subject_map *match;
71315+
71316+ match = polstate->subj_map_set.s_hash[index];
71317+
71318+ while (match && match->user != userp)
71319+ match = match->next;
71320+
71321+ if (match != NULL)
71322+ return match->kernel;
71323+ else
71324+ return NULL;
71325+}
71326+
71327+static void
71328+insert_subj_map_entry(struct subject_map *subjmap)
71329+{
71330+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
71331+ struct subject_map **curr;
71332+
71333+ subjmap->prev = NULL;
71334+
71335+ curr = &polstate->subj_map_set.s_hash[index];
71336+ if (*curr != NULL)
71337+ (*curr)->prev = subjmap;
71338+
71339+ subjmap->next = *curr;
71340+ *curr = subjmap;
71341+
71342+ return;
71343+}
71344+
71345+static void
71346+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
71347+{
71348+ unsigned int index =
71349+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
71350+ struct acl_role_label **curr;
71351+ struct acl_role_label *tmp, *tmp2;
71352+
71353+ curr = &polstate->acl_role_set.r_hash[index];
71354+
71355+ /* simple case, slot is empty, just set it to our role */
71356+ if (*curr == NULL) {
71357+ *curr = role;
71358+ } else {
71359+ /* example:
71360+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
71361+ 2 -> 3
71362+ */
71363+ /* first check to see if we can already be reached via this slot */
71364+ tmp = *curr;
71365+ while (tmp && tmp != role)
71366+ tmp = tmp->next;
71367+ if (tmp == role) {
71368+ /* we don't need to add ourselves to this slot's chain */
71369+ return;
71370+ }
71371+ /* we need to add ourselves to this chain, two cases */
71372+ if (role->next == NULL) {
71373+ /* simple case, append the current chain to our role */
71374+ role->next = *curr;
71375+ *curr = role;
71376+ } else {
71377+ /* 1 -> 2 -> 3 -> 4
71378+ 2 -> 3 -> 4
71379+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
71380+ */
71381+ /* trickier case: walk our role's chain until we find
71382+ the role for the start of the current slot's chain */
71383+ tmp = role;
71384+ tmp2 = *curr;
71385+ while (tmp->next && tmp->next != tmp2)
71386+ tmp = tmp->next;
71387+ if (tmp->next == tmp2) {
71388+ /* from example above, we found 3, so just
71389+ replace this slot's chain with ours */
71390+ *curr = role;
71391+ } else {
71392+ /* we didn't find a subset of our role's chain
71393+ in the current slot's chain, so append their
71394+ chain to ours, and set us as the first role in
71395+ the slot's chain
71396+
71397+ we could fold this case with the case above,
71398+ but making it explicit for clarity
71399+ */
71400+ tmp->next = tmp2;
71401+ *curr = role;
71402+ }
71403+ }
71404+ }
71405+
71406+ return;
71407+}
71408+
71409+static void
71410+insert_acl_role_label(struct acl_role_label *role)
71411+{
71412+ int i;
71413+
71414+ if (polstate->role_list == NULL) {
71415+ polstate->role_list = role;
71416+ role->prev = NULL;
71417+ } else {
71418+ role->prev = polstate->role_list;
71419+ polstate->role_list = role;
71420+ }
71421+
71422+ /* used for hash chains */
71423+ role->next = NULL;
71424+
71425+ if (role->roletype & GR_ROLE_DOMAIN) {
71426+ for (i = 0; i < role->domain_child_num; i++)
71427+ __insert_acl_role_label(role, role->domain_children[i]);
71428+ } else
71429+ __insert_acl_role_label(role, role->uidgid);
71430+}
71431+
71432+static int
71433+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
71434+{
71435+ struct name_entry **curr, *nentry;
71436+ struct inodev_entry *ientry;
71437+ unsigned int len = strlen(name);
71438+ unsigned int key = full_name_hash(name, len);
71439+ unsigned int index = key % polstate->name_set.n_size;
71440+
71441+ curr = &polstate->name_set.n_hash[index];
71442+
71443+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
71444+ curr = &((*curr)->next);
71445+
71446+ if (*curr != NULL)
71447+ return 1;
71448+
71449+ nentry = acl_alloc(sizeof (struct name_entry));
71450+ if (nentry == NULL)
71451+ return 0;
71452+ ientry = acl_alloc(sizeof (struct inodev_entry));
71453+ if (ientry == NULL)
71454+ return 0;
71455+ ientry->nentry = nentry;
71456+
71457+ nentry->key = key;
71458+ nentry->name = name;
71459+ nentry->inode = inode;
71460+ nentry->device = device;
71461+ nentry->len = len;
71462+ nentry->deleted = deleted;
71463+
71464+ nentry->prev = NULL;
71465+ curr = &polstate->name_set.n_hash[index];
71466+ if (*curr != NULL)
71467+ (*curr)->prev = nentry;
71468+ nentry->next = *curr;
71469+ *curr = nentry;
71470+
71471+ /* insert us into the table searchable by inode/dev */
71472+ __insert_inodev_entry(polstate, ientry);
71473+
71474+ return 1;
71475+}
71476+
71477+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
71478+
71479+static void *
71480+create_table(__u32 * len, int elementsize)
71481+{
71482+ unsigned int table_sizes[] = {
71483+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
71484+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
71485+ 4194301, 8388593, 16777213, 33554393, 67108859
71486+ };
71487+ void *newtable = NULL;
71488+ unsigned int pwr = 0;
71489+
71490+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
71491+ table_sizes[pwr] <= *len)
71492+ pwr++;
71493+
71494+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
71495+ return newtable;
71496+
71497+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
71498+ newtable =
71499+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
71500+ else
71501+ newtable = vmalloc(table_sizes[pwr] * elementsize);
71502+
71503+ *len = table_sizes[pwr];
71504+
71505+ return newtable;
71506+}
71507+
71508+static int
71509+init_variables(const struct gr_arg *arg, bool reload)
71510+{
71511+ struct task_struct *reaper = init_pid_ns.child_reaper;
71512+ unsigned int stacksize;
71513+
71514+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
71515+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
71516+ polstate->name_set.n_size = arg->role_db.num_objects;
71517+ polstate->inodev_set.i_size = arg->role_db.num_objects;
71518+
71519+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
71520+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
71521+ return 1;
71522+
71523+ if (!reload) {
71524+ if (!gr_init_uidset())
71525+ return 1;
71526+ }
71527+
71528+ /* set up the stack that holds allocation info */
71529+
71530+ stacksize = arg->role_db.num_pointers + 5;
71531+
71532+ if (!acl_alloc_stack_init(stacksize))
71533+ return 1;
71534+
71535+ if (!reload) {
71536+ /* grab reference for the real root dentry and vfsmount */
71537+ get_fs_root(reaper->fs, &gr_real_root);
71538+
71539+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71540+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(gr_real_root.dentry), gr_real_root.dentry->d_inode->i_ino);
71541+#endif
71542+
71543+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
71544+ if (fakefs_obj_rw == NULL)
71545+ return 1;
71546+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
71547+
71548+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
71549+ if (fakefs_obj_rwx == NULL)
71550+ return 1;
71551+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
71552+ }
71553+
71554+ polstate->subj_map_set.s_hash =
71555+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
71556+ polstate->acl_role_set.r_hash =
71557+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
71558+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
71559+ polstate->inodev_set.i_hash =
71560+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
71561+
71562+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
71563+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
71564+ return 1;
71565+
71566+ memset(polstate->subj_map_set.s_hash, 0,
71567+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
71568+ memset(polstate->acl_role_set.r_hash, 0,
71569+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
71570+ memset(polstate->name_set.n_hash, 0,
71571+ sizeof (struct name_entry *) * polstate->name_set.n_size);
71572+ memset(polstate->inodev_set.i_hash, 0,
71573+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
71574+
71575+ return 0;
71576+}
71577+
71578+/* free information not needed after startup
71579+ currently contains user->kernel pointer mappings for subjects
71580+*/
71581+
71582+static void
71583+free_init_variables(void)
71584+{
71585+ __u32 i;
71586+
71587+ if (polstate->subj_map_set.s_hash) {
71588+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
71589+ if (polstate->subj_map_set.s_hash[i]) {
71590+ kfree(polstate->subj_map_set.s_hash[i]);
71591+ polstate->subj_map_set.s_hash[i] = NULL;
71592+ }
71593+ }
71594+
71595+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
71596+ PAGE_SIZE)
71597+ kfree(polstate->subj_map_set.s_hash);
71598+ else
71599+ vfree(polstate->subj_map_set.s_hash);
71600+ }
71601+
71602+ return;
71603+}
71604+
71605+static void
71606+free_variables(bool reload)
71607+{
71608+ struct acl_subject_label *s;
71609+ struct acl_role_label *r;
71610+ struct task_struct *task, *task2;
71611+ unsigned int x;
71612+
71613+ if (!reload) {
71614+ gr_clear_learn_entries();
71615+
71616+ read_lock(&tasklist_lock);
71617+ do_each_thread(task2, task) {
71618+ task->acl_sp_role = 0;
71619+ task->acl_role_id = 0;
71620+ task->inherited = 0;
71621+ task->acl = NULL;
71622+ task->role = NULL;
71623+ } while_each_thread(task2, task);
71624+ read_unlock(&tasklist_lock);
71625+
71626+ kfree(fakefs_obj_rw);
71627+ fakefs_obj_rw = NULL;
71628+ kfree(fakefs_obj_rwx);
71629+ fakefs_obj_rwx = NULL;
71630+
71631+ /* release the reference to the real root dentry and vfsmount */
71632+ path_put(&gr_real_root);
71633+ memset(&gr_real_root, 0, sizeof(gr_real_root));
71634+ }
71635+
71636+ /* free all object hash tables */
71637+
71638+ FOR_EACH_ROLE_START(r)
71639+ if (r->subj_hash == NULL)
71640+ goto next_role;
71641+ FOR_EACH_SUBJECT_START(r, s, x)
71642+ if (s->obj_hash == NULL)
71643+ break;
71644+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
71645+ kfree(s->obj_hash);
71646+ else
71647+ vfree(s->obj_hash);
71648+ FOR_EACH_SUBJECT_END(s, x)
71649+ FOR_EACH_NESTED_SUBJECT_START(r, s)
71650+ if (s->obj_hash == NULL)
71651+ break;
71652+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
71653+ kfree(s->obj_hash);
71654+ else
71655+ vfree(s->obj_hash);
71656+ FOR_EACH_NESTED_SUBJECT_END(s)
71657+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
71658+ kfree(r->subj_hash);
71659+ else
71660+ vfree(r->subj_hash);
71661+ r->subj_hash = NULL;
71662+next_role:
71663+ FOR_EACH_ROLE_END(r)
71664+
71665+ acl_free_all();
71666+
71667+ if (polstate->acl_role_set.r_hash) {
71668+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
71669+ PAGE_SIZE)
71670+ kfree(polstate->acl_role_set.r_hash);
71671+ else
71672+ vfree(polstate->acl_role_set.r_hash);
71673+ }
71674+ if (polstate->name_set.n_hash) {
71675+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
71676+ PAGE_SIZE)
71677+ kfree(polstate->name_set.n_hash);
71678+ else
71679+ vfree(polstate->name_set.n_hash);
71680+ }
71681+
71682+ if (polstate->inodev_set.i_hash) {
71683+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
71684+ PAGE_SIZE)
71685+ kfree(polstate->inodev_set.i_hash);
71686+ else
71687+ vfree(polstate->inodev_set.i_hash);
71688+ }
71689+
71690+ if (!reload)
71691+ gr_free_uidset();
71692+
71693+ memset(&polstate->name_set, 0, sizeof (struct name_db));
71694+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
71695+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
71696+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
71697+
71698+ polstate->default_role = NULL;
71699+ polstate->kernel_role = NULL;
71700+ polstate->role_list = NULL;
71701+
71702+ return;
71703+}
71704+
71705+static struct acl_subject_label *
71706+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
71707+
71708+static int alloc_and_copy_string(char **name, unsigned int maxlen)
71709+{
71710+ unsigned int len = strnlen_user(*name, maxlen);
71711+ char *tmp;
71712+
71713+ if (!len || len >= maxlen)
71714+ return -EINVAL;
71715+
71716+ if ((tmp = (char *) acl_alloc(len)) == NULL)
71717+ return -ENOMEM;
71718+
71719+ if (copy_from_user(tmp, *name, len))
71720+ return -EFAULT;
71721+
71722+ tmp[len-1] = '\0';
71723+ *name = tmp;
71724+
71725+ return 0;
71726+}
71727+
71728+static int
71729+copy_user_glob(struct acl_object_label *obj)
71730+{
71731+ struct acl_object_label *g_tmp, **guser;
71732+ int error;
71733+
71734+ if (obj->globbed == NULL)
71735+ return 0;
71736+
71737+ guser = &obj->globbed;
71738+ while (*guser) {
71739+ g_tmp = (struct acl_object_label *)
71740+ acl_alloc(sizeof (struct acl_object_label));
71741+ if (g_tmp == NULL)
71742+ return -ENOMEM;
71743+
71744+ if (copy_acl_object_label(g_tmp, *guser))
71745+ return -EFAULT;
71746+
71747+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
71748+ if (error)
71749+ return error;
71750+
71751+ *guser = g_tmp;
71752+ guser = &(g_tmp->next);
71753+ }
71754+
71755+ return 0;
71756+}
71757+
71758+static int
71759+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
71760+ struct acl_role_label *role)
71761+{
71762+ struct acl_object_label *o_tmp;
71763+ int ret;
71764+
71765+ while (userp) {
71766+ if ((o_tmp = (struct acl_object_label *)
71767+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
71768+ return -ENOMEM;
71769+
71770+ if (copy_acl_object_label(o_tmp, userp))
71771+ return -EFAULT;
71772+
71773+ userp = o_tmp->prev;
71774+
71775+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
71776+ if (ret)
71777+ return ret;
71778+
71779+ insert_acl_obj_label(o_tmp, subj);
71780+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
71781+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
71782+ return -ENOMEM;
71783+
71784+ ret = copy_user_glob(o_tmp);
71785+ if (ret)
71786+ return ret;
71787+
71788+ if (o_tmp->nested) {
71789+ int already_copied;
71790+
71791+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
71792+ if (IS_ERR(o_tmp->nested))
71793+ return PTR_ERR(o_tmp->nested);
71794+
71795+ /* insert into nested subject list if we haven't copied this one yet
71796+ to prevent duplicate entries */
71797+ if (!already_copied) {
71798+ o_tmp->nested->next = role->hash->first;
71799+ role->hash->first = o_tmp->nested;
71800+ }
71801+ }
71802+ }
71803+
71804+ return 0;
71805+}
71806+
71807+static __u32
71808+count_user_subjs(struct acl_subject_label *userp)
71809+{
71810+ struct acl_subject_label s_tmp;
71811+ __u32 num = 0;
71812+
71813+ while (userp) {
71814+ if (copy_acl_subject_label(&s_tmp, userp))
71815+ break;
71816+
71817+ userp = s_tmp.prev;
71818+ }
71819+
71820+ return num;
71821+}
71822+
71823+static int
71824+copy_user_allowedips(struct acl_role_label *rolep)
71825+{
71826+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
71827+
71828+ ruserip = rolep->allowed_ips;
71829+
71830+ while (ruserip) {
71831+ rlast = rtmp;
71832+
71833+ if ((rtmp = (struct role_allowed_ip *)
71834+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
71835+ return -ENOMEM;
71836+
71837+ if (copy_role_allowed_ip(rtmp, ruserip))
71838+ return -EFAULT;
71839+
71840+ ruserip = rtmp->prev;
71841+
71842+ if (!rlast) {
71843+ rtmp->prev = NULL;
71844+ rolep->allowed_ips = rtmp;
71845+ } else {
71846+ rlast->next = rtmp;
71847+ rtmp->prev = rlast;
71848+ }
71849+
71850+ if (!ruserip)
71851+ rtmp->next = NULL;
71852+ }
71853+
71854+ return 0;
71855+}
71856+
71857+static int
71858+copy_user_transitions(struct acl_role_label *rolep)
71859+{
71860+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
71861+ int error;
71862+
71863+ rusertp = rolep->transitions;
71864+
71865+ while (rusertp) {
71866+ rlast = rtmp;
71867+
71868+ if ((rtmp = (struct role_transition *)
71869+ acl_alloc(sizeof (struct role_transition))) == NULL)
71870+ return -ENOMEM;
71871+
71872+ if (copy_role_transition(rtmp, rusertp))
71873+ return -EFAULT;
71874+
71875+ rusertp = rtmp->prev;
71876+
71877+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
71878+ if (error)
71879+ return error;
71880+
71881+ if (!rlast) {
71882+ rtmp->prev = NULL;
71883+ rolep->transitions = rtmp;
71884+ } else {
71885+ rlast->next = rtmp;
71886+ rtmp->prev = rlast;
71887+ }
71888+
71889+ if (!rusertp)
71890+ rtmp->next = NULL;
71891+ }
71892+
71893+ return 0;
71894+}
71895+
71896+static __u32 count_user_objs(const struct acl_object_label __user *userp)
71897+{
71898+ struct acl_object_label o_tmp;
71899+ __u32 num = 0;
71900+
71901+ while (userp) {
71902+ if (copy_acl_object_label(&o_tmp, userp))
71903+ break;
71904+
71905+ userp = o_tmp.prev;
71906+ num++;
71907+ }
71908+
71909+ return num;
71910+}
71911+
71912+static struct acl_subject_label *
71913+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
71914+{
71915+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
71916+ __u32 num_objs;
71917+ struct acl_ip_label **i_tmp, *i_utmp2;
71918+ struct gr_hash_struct ghash;
71919+ struct subject_map *subjmap;
71920+ unsigned int i_num;
71921+ int err;
71922+
71923+ if (already_copied != NULL)
71924+ *already_copied = 0;
71925+
71926+ s_tmp = lookup_subject_map(userp);
71927+
71928+ /* we've already copied this subject into the kernel, just return
71929+ the reference to it, and don't copy it over again
71930+ */
71931+ if (s_tmp) {
71932+ if (already_copied != NULL)
71933+ *already_copied = 1;
71934+ return(s_tmp);
71935+ }
71936+
71937+ if ((s_tmp = (struct acl_subject_label *)
71938+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
71939+ return ERR_PTR(-ENOMEM);
71940+
71941+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
71942+ if (subjmap == NULL)
71943+ return ERR_PTR(-ENOMEM);
71944+
71945+ subjmap->user = userp;
71946+ subjmap->kernel = s_tmp;
71947+ insert_subj_map_entry(subjmap);
71948+
71949+ if (copy_acl_subject_label(s_tmp, userp))
71950+ return ERR_PTR(-EFAULT);
71951+
71952+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
71953+ if (err)
71954+ return ERR_PTR(err);
71955+
71956+ if (!strcmp(s_tmp->filename, "/"))
71957+ role->root_label = s_tmp;
71958+
71959+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
71960+ return ERR_PTR(-EFAULT);
71961+
71962+ /* copy user and group transition tables */
71963+
71964+ if (s_tmp->user_trans_num) {
71965+ uid_t *uidlist;
71966+
71967+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
71968+ if (uidlist == NULL)
71969+ return ERR_PTR(-ENOMEM);
71970+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
71971+ return ERR_PTR(-EFAULT);
71972+
71973+ s_tmp->user_transitions = uidlist;
71974+ }
71975+
71976+ if (s_tmp->group_trans_num) {
71977+ gid_t *gidlist;
71978+
71979+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
71980+ if (gidlist == NULL)
71981+ return ERR_PTR(-ENOMEM);
71982+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
71983+ return ERR_PTR(-EFAULT);
71984+
71985+ s_tmp->group_transitions = gidlist;
71986+ }
71987+
71988+ /* set up object hash table */
71989+ num_objs = count_user_objs(ghash.first);
71990+
71991+ s_tmp->obj_hash_size = num_objs;
71992+ s_tmp->obj_hash =
71993+ (struct acl_object_label **)
71994+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
71995+
71996+ if (!s_tmp->obj_hash)
71997+ return ERR_PTR(-ENOMEM);
71998+
71999+ memset(s_tmp->obj_hash, 0,
72000+ s_tmp->obj_hash_size *
72001+ sizeof (struct acl_object_label *));
72002+
72003+ /* add in objects */
72004+ err = copy_user_objs(ghash.first, s_tmp, role);
72005+
72006+ if (err)
72007+ return ERR_PTR(err);
72008+
72009+ /* set pointer for parent subject */
72010+ if (s_tmp->parent_subject) {
72011+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
72012+
72013+ if (IS_ERR(s_tmp2))
72014+ return s_tmp2;
72015+
72016+ s_tmp->parent_subject = s_tmp2;
72017+ }
72018+
72019+ /* add in ip acls */
72020+
72021+ if (!s_tmp->ip_num) {
72022+ s_tmp->ips = NULL;
72023+ goto insert;
72024+ }
72025+
72026+ i_tmp =
72027+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
72028+ sizeof (struct acl_ip_label *));
72029+
72030+ if (!i_tmp)
72031+ return ERR_PTR(-ENOMEM);
72032+
72033+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
72034+ *(i_tmp + i_num) =
72035+ (struct acl_ip_label *)
72036+ acl_alloc(sizeof (struct acl_ip_label));
72037+ if (!*(i_tmp + i_num))
72038+ return ERR_PTR(-ENOMEM);
72039+
72040+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
72041+ return ERR_PTR(-EFAULT);
72042+
72043+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
72044+ return ERR_PTR(-EFAULT);
72045+
72046+ if ((*(i_tmp + i_num))->iface == NULL)
72047+ continue;
72048+
72049+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
72050+ if (err)
72051+ return ERR_PTR(err);
72052+ }
72053+
72054+ s_tmp->ips = i_tmp;
72055+
72056+insert:
72057+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
72058+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
72059+ return ERR_PTR(-ENOMEM);
72060+
72061+ return s_tmp;
72062+}
72063+
72064+static int
72065+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
72066+{
72067+ struct acl_subject_label s_pre;
72068+ struct acl_subject_label * ret;
72069+ int err;
72070+
72071+ while (userp) {
72072+ if (copy_acl_subject_label(&s_pre, userp))
72073+ return -EFAULT;
72074+
72075+ ret = do_copy_user_subj(userp, role, NULL);
72076+
72077+ err = PTR_ERR(ret);
72078+ if (IS_ERR(ret))
72079+ return err;
72080+
72081+ insert_acl_subj_label(ret, role);
72082+
72083+ userp = s_pre.prev;
72084+ }
72085+
72086+ return 0;
72087+}
72088+
72089+static int
72090+copy_user_acl(struct gr_arg *arg)
72091+{
72092+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
72093+ struct acl_subject_label *subj_list;
72094+ struct sprole_pw *sptmp;
72095+ struct gr_hash_struct *ghash;
72096+ uid_t *domainlist;
72097+ unsigned int r_num;
72098+ int err = 0;
72099+ __u16 i;
72100+ __u32 num_subjs;
72101+
72102+ /* we need a default and kernel role */
72103+ if (arg->role_db.num_roles < 2)
72104+ return -EINVAL;
72105+
72106+ /* copy special role authentication info from userspace */
72107+
72108+ polstate->num_sprole_pws = arg->num_sprole_pws;
72109+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
72110+
72111+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
72112+ return -ENOMEM;
72113+
72114+ for (i = 0; i < polstate->num_sprole_pws; i++) {
72115+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
72116+ if (!sptmp)
72117+ return -ENOMEM;
72118+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
72119+ return -EFAULT;
72120+
72121+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
72122+ if (err)
72123+ return err;
72124+
72125+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
72126+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
72127+#endif
72128+
72129+ polstate->acl_special_roles[i] = sptmp;
72130+ }
72131+
72132+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
72133+
72134+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
72135+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
72136+
72137+ if (!r_tmp)
72138+ return -ENOMEM;
72139+
72140+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
72141+ return -EFAULT;
72142+
72143+ if (copy_acl_role_label(r_tmp, r_utmp2))
72144+ return -EFAULT;
72145+
72146+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
72147+ if (err)
72148+ return err;
72149+
72150+ if (!strcmp(r_tmp->rolename, "default")
72151+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
72152+ polstate->default_role = r_tmp;
72153+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
72154+ polstate->kernel_role = r_tmp;
72155+ }
72156+
72157+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
72158+ return -ENOMEM;
72159+
72160+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
72161+ return -EFAULT;
72162+
72163+ r_tmp->hash = ghash;
72164+
72165+ num_subjs = count_user_subjs(r_tmp->hash->first);
72166+
72167+ r_tmp->subj_hash_size = num_subjs;
72168+ r_tmp->subj_hash =
72169+ (struct acl_subject_label **)
72170+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
72171+
72172+ if (!r_tmp->subj_hash)
72173+ return -ENOMEM;
72174+
72175+ err = copy_user_allowedips(r_tmp);
72176+ if (err)
72177+ return err;
72178+
72179+ /* copy domain info */
72180+ if (r_tmp->domain_children != NULL) {
72181+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
72182+ if (domainlist == NULL)
72183+ return -ENOMEM;
72184+
72185+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
72186+ return -EFAULT;
72187+
72188+ r_tmp->domain_children = domainlist;
72189+ }
72190+
72191+ err = copy_user_transitions(r_tmp);
72192+ if (err)
72193+ return err;
72194+
72195+ memset(r_tmp->subj_hash, 0,
72196+ r_tmp->subj_hash_size *
72197+ sizeof (struct acl_subject_label *));
72198+
72199+ /* acquire the list of subjects, then NULL out
72200+ the list prior to parsing the subjects for this role,
72201+ as during this parsing the list is replaced with a list
72202+ of *nested* subjects for the role
72203+ */
72204+ subj_list = r_tmp->hash->first;
72205+
72206+ /* set nested subject list to null */
72207+ r_tmp->hash->first = NULL;
72208+
72209+ err = copy_user_subjs(subj_list, r_tmp);
72210+
72211+ if (err)
72212+ return err;
72213+
72214+ insert_acl_role_label(r_tmp);
72215+ }
72216+
72217+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
72218+ return -EINVAL;
72219+
72220+ return err;
72221+}
72222+
72223+static int gracl_reload_apply_policies(void *reload)
72224+{
72225+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
72226+ struct task_struct *task, *task2;
72227+ struct acl_role_label *role, *rtmp;
72228+ struct acl_subject_label *subj;
72229+ const struct cred *cred;
72230+ int role_applied;
72231+ int ret = 0;
72232+
72233+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
72234+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
72235+
72236+ /* first make sure we'll be able to apply the new policy cleanly */
72237+ do_each_thread(task2, task) {
72238+ if (task->exec_file == NULL)
72239+ continue;
72240+ role_applied = 0;
72241+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
72242+ /* preserve special roles */
72243+ FOR_EACH_ROLE_START(role)
72244+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
72245+ rtmp = task->role;
72246+ task->role = role;
72247+ role_applied = 1;
72248+ break;
72249+ }
72250+ FOR_EACH_ROLE_END(role)
72251+ }
72252+ if (!role_applied) {
72253+ cred = __task_cred(task);
72254+ rtmp = task->role;
72255+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72256+ }
72257+ /* this handles non-nested inherited subjects, nested subjects will still
72258+ be dropped currently */
72259+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
72260+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
72261+ /* change the role back so that we've made no modifications to the policy */
72262+ task->role = rtmp;
72263+
72264+ if (subj == NULL || task->tmpacl == NULL) {
72265+ ret = -EINVAL;
72266+ goto out;
72267+ }
72268+ } while_each_thread(task2, task);
72269+
72270+ /* now actually apply the policy */
72271+
72272+ do_each_thread(task2, task) {
72273+ if (task->exec_file) {
72274+ role_applied = 0;
72275+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
72276+ /* preserve special roles */
72277+ FOR_EACH_ROLE_START(role)
72278+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
72279+ task->role = role;
72280+ role_applied = 1;
72281+ break;
72282+ }
72283+ FOR_EACH_ROLE_END(role)
72284+ }
72285+ if (!role_applied) {
72286+ cred = __task_cred(task);
72287+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72288+ }
72289+ /* this handles non-nested inherited subjects, nested subjects will still
72290+ be dropped currently */
72291+ if (!reload_state->oldmode && task->inherited)
72292+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
72293+ else {
72294+ /* looked up and tagged to the task previously */
72295+ subj = task->tmpacl;
72296+ }
72297+ /* subj will be non-null */
72298+ __gr_apply_subject_to_task(polstate, task, subj);
72299+ if (reload_state->oldmode) {
72300+ task->acl_role_id = 0;
72301+ task->acl_sp_role = 0;
72302+ task->inherited = 0;
72303+ }
72304+ } else {
72305+ // it's a kernel process
72306+ task->role = polstate->kernel_role;
72307+ task->acl = polstate->kernel_role->root_label;
72308+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
72309+ task->acl->mode &= ~GR_PROCFIND;
72310+#endif
72311+ }
72312+ } while_each_thread(task2, task);
72313+
72314+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
72315+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
72316+
72317+out:
72318+
72319+ return ret;
72320+}
72321+
72322+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
72323+{
72324+ struct gr_reload_state new_reload_state = { };
72325+ int err;
72326+
72327+ new_reload_state.oldpolicy_ptr = polstate;
72328+ new_reload_state.oldalloc_ptr = current_alloc_state;
72329+ new_reload_state.oldmode = oldmode;
72330+
72331+ current_alloc_state = &new_reload_state.newalloc;
72332+ polstate = &new_reload_state.newpolicy;
72333+
72334+ /* everything relevant is now saved off, copy in the new policy */
72335+ if (init_variables(args, true)) {
72336+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
72337+ err = -ENOMEM;
72338+ goto error;
72339+ }
72340+
72341+ err = copy_user_acl(args);
72342+ free_init_variables();
72343+ if (err)
72344+ goto error;
72345+ /* the new policy is copied in, with the old policy available via saved_state
72346+ first go through applying roles, making sure to preserve special roles
72347+ then apply new subjects, making sure to preserve inherited and nested subjects,
72348+ though currently only inherited subjects will be preserved
72349+ */
72350+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
72351+ if (err)
72352+ goto error;
72353+
72354+ /* we've now applied the new policy, so restore the old policy state to free it */
72355+ polstate = &new_reload_state.oldpolicy;
72356+ current_alloc_state = &new_reload_state.oldalloc;
72357+ free_variables(true);
72358+
72359+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
72360+ to running_polstate/current_alloc_state inside stop_machine
72361+ */
72362+ err = 0;
72363+ goto out;
72364+error:
72365+ /* on error of loading the new policy, we'll just keep the previous
72366+ policy set around
72367+ */
72368+ free_variables(true);
72369+
72370+ /* doesn't affect runtime, but maintains consistent state */
72371+out:
72372+ polstate = new_reload_state.oldpolicy_ptr;
72373+ current_alloc_state = new_reload_state.oldalloc_ptr;
72374+
72375+ return err;
72376+}
72377+
72378+static int
72379+gracl_init(struct gr_arg *args)
72380+{
72381+ int error = 0;
72382+
72383+ memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
72384+ memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
72385+
72386+ if (init_variables(args, false)) {
72387+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
72388+ error = -ENOMEM;
72389+ goto out;
72390+ }
72391+
72392+ error = copy_user_acl(args);
72393+ free_init_variables();
72394+ if (error)
72395+ goto out;
72396+
72397+ error = gr_set_acls(0);
72398+ if (error)
72399+ goto out;
72400+
72401+ gr_enable_rbac_system();
72402+
72403+ return 0;
72404+
72405+out:
72406+ free_variables(false);
72407+ return error;
72408+}
72409+
72410+static int
72411+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
72412+ unsigned char **sum)
72413+{
72414+ struct acl_role_label *r;
72415+ struct role_allowed_ip *ipp;
72416+ struct role_transition *trans;
72417+ unsigned int i;
72418+ int found = 0;
72419+ u32 curr_ip = current->signal->curr_ip;
72420+
72421+ current->signal->saved_ip = curr_ip;
72422+
72423+ /* check transition table */
72424+
72425+ for (trans = current->role->transitions; trans; trans = trans->next) {
72426+ if (!strcmp(rolename, trans->rolename)) {
72427+ found = 1;
72428+ break;
72429+ }
72430+ }
72431+
72432+ if (!found)
72433+ return 0;
72434+
72435+ /* handle special roles that do not require authentication
72436+ and check ip */
72437+
72438+ FOR_EACH_ROLE_START(r)
72439+ if (!strcmp(rolename, r->rolename) &&
72440+ (r->roletype & GR_ROLE_SPECIAL)) {
72441+ found = 0;
72442+ if (r->allowed_ips != NULL) {
72443+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
72444+ if ((ntohl(curr_ip) & ipp->netmask) ==
72445+ (ntohl(ipp->addr) & ipp->netmask))
72446+ found = 1;
72447+ }
72448+ } else
72449+ found = 2;
72450+ if (!found)
72451+ return 0;
72452+
72453+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
72454+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
72455+ *salt = NULL;
72456+ *sum = NULL;
72457+ return 1;
72458+ }
72459+ }
72460+ FOR_EACH_ROLE_END(r)
72461+
72462+ for (i = 0; i < polstate->num_sprole_pws; i++) {
72463+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
72464+ *salt = polstate->acl_special_roles[i]->salt;
72465+ *sum = polstate->acl_special_roles[i]->sum;
72466+ return 1;
72467+ }
72468+ }
72469+
72470+ return 0;
72471+}
72472+
72473+int gr_check_secure_terminal(struct task_struct *task)
72474+{
72475+ struct task_struct *p, *p2, *p3;
72476+ struct files_struct *files;
72477+ struct fdtable *fdt;
72478+ struct file *our_file = NULL, *file;
72479+ int i;
72480+
72481+ if (task->signal->tty == NULL)
72482+ return 1;
72483+
72484+ files = get_files_struct(task);
72485+ if (files != NULL) {
72486+ rcu_read_lock();
72487+ fdt = files_fdtable(files);
72488+ for (i=0; i < fdt->max_fds; i++) {
72489+ file = fcheck_files(files, i);
72490+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
72491+ get_file(file);
72492+ our_file = file;
72493+ }
72494+ }
72495+ rcu_read_unlock();
72496+ put_files_struct(files);
72497+ }
72498+
72499+ if (our_file == NULL)
72500+ return 1;
72501+
72502+ read_lock(&tasklist_lock);
72503+ do_each_thread(p2, p) {
72504+ files = get_files_struct(p);
72505+ if (files == NULL ||
72506+ (p->signal && p->signal->tty == task->signal->tty)) {
72507+ if (files != NULL)
72508+ put_files_struct(files);
72509+ continue;
72510+ }
72511+ rcu_read_lock();
72512+ fdt = files_fdtable(files);
72513+ for (i=0; i < fdt->max_fds; i++) {
72514+ file = fcheck_files(files, i);
72515+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
72516+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
72517+ p3 = task;
72518+ while (task_pid_nr(p3) > 0) {
72519+ if (p3 == p)
72520+ break;
72521+ p3 = p3->real_parent;
72522+ }
72523+ if (p3 == p)
72524+ break;
72525+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
72526+ gr_handle_alertkill(p);
72527+ rcu_read_unlock();
72528+ put_files_struct(files);
72529+ read_unlock(&tasklist_lock);
72530+ fput(our_file);
72531+ return 0;
72532+ }
72533+ }
72534+ rcu_read_unlock();
72535+ put_files_struct(files);
72536+ } while_each_thread(p2, p);
72537+ read_unlock(&tasklist_lock);
72538+
72539+ fput(our_file);
72540+ return 1;
72541+}
72542+
72543+ssize_t
72544+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
72545+{
72546+ struct gr_arg_wrapper uwrap;
72547+ unsigned char *sprole_salt = NULL;
72548+ unsigned char *sprole_sum = NULL;
72549+ int error = 0;
72550+ int error2 = 0;
72551+ size_t req_count = 0;
72552+ unsigned char oldmode = 0;
72553+
72554+ mutex_lock(&gr_dev_mutex);
72555+
72556+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
72557+ error = -EPERM;
72558+ goto out;
72559+ }
72560+
72561+#ifdef CONFIG_COMPAT
72562+ pax_open_kernel();
72563+ if (is_compat_task()) {
72564+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
72565+ copy_gr_arg = &copy_gr_arg_compat;
72566+ copy_acl_object_label = &copy_acl_object_label_compat;
72567+ copy_acl_subject_label = &copy_acl_subject_label_compat;
72568+ copy_acl_role_label = &copy_acl_role_label_compat;
72569+ copy_acl_ip_label = &copy_acl_ip_label_compat;
72570+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
72571+ copy_role_transition = &copy_role_transition_compat;
72572+ copy_sprole_pw = &copy_sprole_pw_compat;
72573+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
72574+ copy_pointer_from_array = &copy_pointer_from_array_compat;
72575+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
72576+ } else {
72577+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
72578+ copy_gr_arg = &copy_gr_arg_normal;
72579+ copy_acl_object_label = &copy_acl_object_label_normal;
72580+ copy_acl_subject_label = &copy_acl_subject_label_normal;
72581+ copy_acl_role_label = &copy_acl_role_label_normal;
72582+ copy_acl_ip_label = &copy_acl_ip_label_normal;
72583+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
72584+ copy_role_transition = &copy_role_transition_normal;
72585+ copy_sprole_pw = &copy_sprole_pw_normal;
72586+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
72587+ copy_pointer_from_array = &copy_pointer_from_array_normal;
72588+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
72589+ }
72590+ pax_close_kernel();
72591+#endif
72592+
72593+ req_count = get_gr_arg_wrapper_size();
72594+
72595+ if (count != req_count) {
72596+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
72597+ error = -EINVAL;
72598+ goto out;
72599+ }
72600+
72601+
72602+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
72603+ gr_auth_expires = 0;
72604+ gr_auth_attempts = 0;
72605+ }
72606+
72607+ error = copy_gr_arg_wrapper(buf, &uwrap);
72608+ if (error)
72609+ goto out;
72610+
72611+ error = copy_gr_arg(uwrap.arg, &gr_usermode);
72612+ if (error)
72613+ goto out;
72614+
72615+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
72616+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
72617+ time_after(gr_auth_expires, get_seconds())) {
72618+ error = -EBUSY;
72619+ goto out;
72620+ }
72621+
72622+ /* if non-root trying to do anything other than use a special role,
72623+ do not attempt authentication, do not count towards authentication
72624+ locking
72625+ */
72626+
72627+ if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
72628+ gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
72629+ gr_is_global_nonroot(current_uid())) {
72630+ error = -EPERM;
72631+ goto out;
72632+ }
72633+
72634+ /* ensure pw and special role name are null terminated */
72635+
72636+ gr_usermode.pw[GR_PW_LEN - 1] = '\0';
72637+ gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
72638+
72639+ /* Okay.
72640+ * We have our enough of the argument structure..(we have yet
72641+ * to copy_from_user the tables themselves) . Copy the tables
72642+ * only if we need them, i.e. for loading operations. */
72643+
72644+ switch (gr_usermode.mode) {
72645+ case GR_STATUS:
72646+ if (gr_acl_is_enabled()) {
72647+ error = 1;
72648+ if (!gr_check_secure_terminal(current))
72649+ error = 3;
72650+ } else
72651+ error = 2;
72652+ goto out;
72653+ case GR_SHUTDOWN:
72654+ if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72655+ stop_machine(gr_rbac_disable, NULL, NULL);
72656+ free_variables(false);
72657+ memset(&gr_usermode, 0, sizeof(gr_usermode));
72658+ memset(&gr_system_salt, 0, sizeof(gr_system_salt));
72659+ memset(&gr_system_sum, 0, sizeof(gr_system_sum));
72660+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
72661+ } else if (gr_acl_is_enabled()) {
72662+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
72663+ error = -EPERM;
72664+ } else {
72665+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
72666+ error = -EAGAIN;
72667+ }
72668+ break;
72669+ case GR_ENABLE:
72670+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
72671+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
72672+ else {
72673+ if (gr_acl_is_enabled())
72674+ error = -EAGAIN;
72675+ else
72676+ error = error2;
72677+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
72678+ }
72679+ break;
72680+ case GR_OLDRELOAD:
72681+ oldmode = 1;
72682+ case GR_RELOAD:
72683+ if (!gr_acl_is_enabled()) {
72684+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
72685+ error = -EAGAIN;
72686+ } else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72687+ error2 = gracl_reload(&gr_usermode, oldmode);
72688+ if (!error2)
72689+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
72690+ else {
72691+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
72692+ error = error2;
72693+ }
72694+ } else {
72695+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
72696+ error = -EPERM;
72697+ }
72698+ break;
72699+ case GR_SEGVMOD:
72700+ if (unlikely(!gr_acl_is_enabled())) {
72701+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
72702+ error = -EAGAIN;
72703+ break;
72704+ }
72705+
72706+ if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
72707+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
72708+ if (gr_usermode.segv_device && gr_usermode.segv_inode) {
72709+ struct acl_subject_label *segvacl;
72710+ segvacl =
72711+ lookup_acl_subj_label(gr_usermode.segv_inode,
72712+ gr_usermode.segv_device,
72713+ current->role);
72714+ if (segvacl) {
72715+ segvacl->crashes = 0;
72716+ segvacl->expires = 0;
72717+ }
72718+ } else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
72719+ gr_remove_uid(gr_usermode.segv_uid);
72720+ }
72721+ } else {
72722+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
72723+ error = -EPERM;
72724+ }
72725+ break;
72726+ case GR_SPROLE:
72727+ case GR_SPROLEPAM:
72728+ if (unlikely(!gr_acl_is_enabled())) {
72729+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
72730+ error = -EAGAIN;
72731+ break;
72732+ }
72733+
72734+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
72735+ current->role->expires = 0;
72736+ current->role->auth_attempts = 0;
72737+ }
72738+
72739+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
72740+ time_after(current->role->expires, get_seconds())) {
72741+ error = -EBUSY;
72742+ goto out;
72743+ }
72744+
72745+ if (lookup_special_role_auth
72746+ (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
72747+ && ((!sprole_salt && !sprole_sum)
72748+ || !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
72749+ char *p = "";
72750+ assign_special_role(gr_usermode.sp_role);
72751+ read_lock(&tasklist_lock);
72752+ if (current->real_parent)
72753+ p = current->real_parent->role->rolename;
72754+ read_unlock(&tasklist_lock);
72755+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
72756+ p, acl_sp_role_value);
72757+ } else {
72758+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
72759+ error = -EPERM;
72760+ if(!(current->role->auth_attempts++))
72761+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
72762+
72763+ goto out;
72764+ }
72765+ break;
72766+ case GR_UNSPROLE:
72767+ if (unlikely(!gr_acl_is_enabled())) {
72768+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
72769+ error = -EAGAIN;
72770+ break;
72771+ }
72772+
72773+ if (current->role->roletype & GR_ROLE_SPECIAL) {
72774+ char *p = "";
72775+ int i = 0;
72776+
72777+ read_lock(&tasklist_lock);
72778+ if (current->real_parent) {
72779+ p = current->real_parent->role->rolename;
72780+ i = current->real_parent->acl_role_id;
72781+ }
72782+ read_unlock(&tasklist_lock);
72783+
72784+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
72785+ gr_set_acls(1);
72786+ } else {
72787+ error = -EPERM;
72788+ goto out;
72789+ }
72790+ break;
72791+ default:
72792+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
72793+ error = -EINVAL;
72794+ break;
72795+ }
72796+
72797+ if (error != -EPERM)
72798+ goto out;
72799+
72800+ if(!(gr_auth_attempts++))
72801+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
72802+
72803+ out:
72804+ mutex_unlock(&gr_dev_mutex);
72805+
72806+ if (!error)
72807+ error = req_count;
72808+
72809+ return error;
72810+}
72811+
72812+int
72813+gr_set_acls(const int type)
72814+{
72815+ struct task_struct *task, *task2;
72816+ struct acl_role_label *role = current->role;
72817+ struct acl_subject_label *subj;
72818+ __u16 acl_role_id = current->acl_role_id;
72819+ const struct cred *cred;
72820+ int ret;
72821+
72822+ rcu_read_lock();
72823+ read_lock(&tasklist_lock);
72824+ read_lock(&grsec_exec_file_lock);
72825+ do_each_thread(task2, task) {
72826+ /* check to see if we're called from the exit handler,
72827+ if so, only replace ACLs that have inherited the admin
72828+ ACL */
72829+
72830+ if (type && (task->role != role ||
72831+ task->acl_role_id != acl_role_id))
72832+ continue;
72833+
72834+ task->acl_role_id = 0;
72835+ task->acl_sp_role = 0;
72836+ task->inherited = 0;
72837+
72838+ if (task->exec_file) {
72839+ cred = __task_cred(task);
72840+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
72841+ subj = __gr_get_subject_for_task(polstate, task, NULL);
72842+ if (subj == NULL) {
72843+ ret = -EINVAL;
72844+ read_unlock(&grsec_exec_file_lock);
72845+ read_unlock(&tasklist_lock);
72846+ rcu_read_unlock();
72847+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
72848+ return ret;
72849+ }
72850+ __gr_apply_subject_to_task(polstate, task, subj);
72851+ } else {
72852+ // it's a kernel process
72853+ task->role = polstate->kernel_role;
72854+ task->acl = polstate->kernel_role->root_label;
72855+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
72856+ task->acl->mode &= ~GR_PROCFIND;
72857+#endif
72858+ }
72859+ } while_each_thread(task2, task);
72860+ read_unlock(&grsec_exec_file_lock);
72861+ read_unlock(&tasklist_lock);
72862+ rcu_read_unlock();
72863+
72864+ return 0;
72865+}
72866diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
72867new file mode 100644
72868index 0000000..39645c9
72869--- /dev/null
72870+++ b/grsecurity/gracl_res.c
72871@@ -0,0 +1,68 @@
72872+#include <linux/kernel.h>
72873+#include <linux/sched.h>
72874+#include <linux/gracl.h>
72875+#include <linux/grinternal.h>
72876+
72877+static const char *restab_log[] = {
72878+ [RLIMIT_CPU] = "RLIMIT_CPU",
72879+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
72880+ [RLIMIT_DATA] = "RLIMIT_DATA",
72881+ [RLIMIT_STACK] = "RLIMIT_STACK",
72882+ [RLIMIT_CORE] = "RLIMIT_CORE",
72883+ [RLIMIT_RSS] = "RLIMIT_RSS",
72884+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
72885+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
72886+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
72887+ [RLIMIT_AS] = "RLIMIT_AS",
72888+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
72889+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
72890+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
72891+ [RLIMIT_NICE] = "RLIMIT_NICE",
72892+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
72893+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
72894+ [GR_CRASH_RES] = "RLIMIT_CRASH"
72895+};
72896+
72897+void
72898+gr_log_resource(const struct task_struct *task,
72899+ const int res, const unsigned long wanted, const int gt)
72900+{
72901+ const struct cred *cred;
72902+ unsigned long rlim;
72903+
72904+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
72905+ return;
72906+
72907+ // not yet supported resource
72908+ if (unlikely(!restab_log[res]))
72909+ return;
72910+
72911+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
72912+ rlim = task_rlimit_max(task, res);
72913+ else
72914+ rlim = task_rlimit(task, res);
72915+
72916+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
72917+ return;
72918+
72919+ rcu_read_lock();
72920+ cred = __task_cred(task);
72921+
72922+ if (res == RLIMIT_NPROC &&
72923+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
72924+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
72925+ goto out_rcu_unlock;
72926+ else if (res == RLIMIT_MEMLOCK &&
72927+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
72928+ goto out_rcu_unlock;
72929+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
72930+ goto out_rcu_unlock;
72931+ rcu_read_unlock();
72932+
72933+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
72934+
72935+ return;
72936+out_rcu_unlock:
72937+ rcu_read_unlock();
72938+ return;
72939+}
72940diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
72941new file mode 100644
72942index 0000000..2040e61
72943--- /dev/null
72944+++ b/grsecurity/gracl_segv.c
72945@@ -0,0 +1,313 @@
72946+#include <linux/kernel.h>
72947+#include <linux/mm.h>
72948+#include <asm/uaccess.h>
72949+#include <asm/errno.h>
72950+#include <asm/mman.h>
72951+#include <net/sock.h>
72952+#include <linux/file.h>
72953+#include <linux/fs.h>
72954+#include <linux/net.h>
72955+#include <linux/in.h>
72956+#include <linux/slab.h>
72957+#include <linux/types.h>
72958+#include <linux/sched.h>
72959+#include <linux/timer.h>
72960+#include <linux/gracl.h>
72961+#include <linux/grsecurity.h>
72962+#include <linux/grinternal.h>
72963+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
72964+#include <linux/magic.h>
72965+#include <linux/pagemap.h>
72966+#include "../fs/btrfs/async-thread.h"
72967+#include "../fs/btrfs/ctree.h"
72968+#include "../fs/btrfs/btrfs_inode.h"
72969+#endif
72970+
72971+static struct crash_uid *uid_set;
72972+static unsigned short uid_used;
72973+static DEFINE_SPINLOCK(gr_uid_lock);
72974+extern rwlock_t gr_inode_lock;
72975+extern struct acl_subject_label *
72976+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
72977+ struct acl_role_label *role);
72978+
72979+static inline dev_t __get_dev(const struct dentry *dentry)
72980+{
72981+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
72982+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
72983+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
72984+ else
72985+#endif
72986+ return dentry->d_sb->s_dev;
72987+}
72988+
72989+int
72990+gr_init_uidset(void)
72991+{
72992+ uid_set =
72993+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
72994+ uid_used = 0;
72995+
72996+ return uid_set ? 1 : 0;
72997+}
72998+
72999+void
73000+gr_free_uidset(void)
73001+{
73002+ if (uid_set) {
73003+ struct crash_uid *tmpset;
73004+ spin_lock(&gr_uid_lock);
73005+ tmpset = uid_set;
73006+ uid_set = NULL;
73007+ uid_used = 0;
73008+ spin_unlock(&gr_uid_lock);
73009+ if (tmpset)
73010+ kfree(tmpset);
73011+ }
73012+
73013+ return;
73014+}
73015+
73016+int
73017+gr_find_uid(const uid_t uid)
73018+{
73019+ struct crash_uid *tmp = uid_set;
73020+ uid_t buid;
73021+ int low = 0, high = uid_used - 1, mid;
73022+
73023+ while (high >= low) {
73024+ mid = (low + high) >> 1;
73025+ buid = tmp[mid].uid;
73026+ if (buid == uid)
73027+ return mid;
73028+ if (buid > uid)
73029+ high = mid - 1;
73030+ if (buid < uid)
73031+ low = mid + 1;
73032+ }
73033+
73034+ return -1;
73035+}
73036+
73037+static __inline__ void
73038+gr_insertsort(void)
73039+{
73040+ unsigned short i, j;
73041+ struct crash_uid index;
73042+
73043+ for (i = 1; i < uid_used; i++) {
73044+ index = uid_set[i];
73045+ j = i;
73046+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
73047+ uid_set[j] = uid_set[j - 1];
73048+ j--;
73049+ }
73050+ uid_set[j] = index;
73051+ }
73052+
73053+ return;
73054+}
73055+
73056+static __inline__ void
73057+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
73058+{
73059+ int loc;
73060+ uid_t uid = GR_GLOBAL_UID(kuid);
73061+
73062+ if (uid_used == GR_UIDTABLE_MAX)
73063+ return;
73064+
73065+ loc = gr_find_uid(uid);
73066+
73067+ if (loc >= 0) {
73068+ uid_set[loc].expires = expires;
73069+ return;
73070+ }
73071+
73072+ uid_set[uid_used].uid = uid;
73073+ uid_set[uid_used].expires = expires;
73074+ uid_used++;
73075+
73076+ gr_insertsort();
73077+
73078+ return;
73079+}
73080+
73081+void
73082+gr_remove_uid(const unsigned short loc)
73083+{
73084+ unsigned short i;
73085+
73086+ for (i = loc + 1; i < uid_used; i++)
73087+ uid_set[i - 1] = uid_set[i];
73088+
73089+ uid_used--;
73090+
73091+ return;
73092+}
73093+
73094+int
73095+gr_check_crash_uid(const kuid_t kuid)
73096+{
73097+ int loc;
73098+ int ret = 0;
73099+ uid_t uid;
73100+
73101+ if (unlikely(!gr_acl_is_enabled()))
73102+ return 0;
73103+
73104+ uid = GR_GLOBAL_UID(kuid);
73105+
73106+ spin_lock(&gr_uid_lock);
73107+ loc = gr_find_uid(uid);
73108+
73109+ if (loc < 0)
73110+ goto out_unlock;
73111+
73112+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
73113+ gr_remove_uid(loc);
73114+ else
73115+ ret = 1;
73116+
73117+out_unlock:
73118+ spin_unlock(&gr_uid_lock);
73119+ return ret;
73120+}
73121+
73122+static __inline__ int
73123+proc_is_setxid(const struct cred *cred)
73124+{
73125+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
73126+ !uid_eq(cred->uid, cred->fsuid))
73127+ return 1;
73128+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
73129+ !gid_eq(cred->gid, cred->fsgid))
73130+ return 1;
73131+
73132+ return 0;
73133+}
73134+
73135+extern int gr_fake_force_sig(int sig, struct task_struct *t);
73136+
73137+void
73138+gr_handle_crash(struct task_struct *task, const int sig)
73139+{
73140+ struct acl_subject_label *curr;
73141+ struct task_struct *tsk, *tsk2;
73142+ const struct cred *cred;
73143+ const struct cred *cred2;
73144+
73145+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
73146+ return;
73147+
73148+ if (unlikely(!gr_acl_is_enabled()))
73149+ return;
73150+
73151+ curr = task->acl;
73152+
73153+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
73154+ return;
73155+
73156+ if (time_before_eq(curr->expires, get_seconds())) {
73157+ curr->expires = 0;
73158+ curr->crashes = 0;
73159+ }
73160+
73161+ curr->crashes++;
73162+
73163+ if (!curr->expires)
73164+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
73165+
73166+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
73167+ time_after(curr->expires, get_seconds())) {
73168+ rcu_read_lock();
73169+ cred = __task_cred(task);
73170+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
73171+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
73172+ spin_lock(&gr_uid_lock);
73173+ gr_insert_uid(cred->uid, curr->expires);
73174+ spin_unlock(&gr_uid_lock);
73175+ curr->expires = 0;
73176+ curr->crashes = 0;
73177+ read_lock(&tasklist_lock);
73178+ do_each_thread(tsk2, tsk) {
73179+ cred2 = __task_cred(tsk);
73180+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
73181+ gr_fake_force_sig(SIGKILL, tsk);
73182+ } while_each_thread(tsk2, tsk);
73183+ read_unlock(&tasklist_lock);
73184+ } else {
73185+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
73186+ read_lock(&tasklist_lock);
73187+ read_lock(&grsec_exec_file_lock);
73188+ do_each_thread(tsk2, tsk) {
73189+ if (likely(tsk != task)) {
73190+ // if this thread has the same subject as the one that triggered
73191+ // RES_CRASH and it's the same binary, kill it
73192+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
73193+ gr_fake_force_sig(SIGKILL, tsk);
73194+ }
73195+ } while_each_thread(tsk2, tsk);
73196+ read_unlock(&grsec_exec_file_lock);
73197+ read_unlock(&tasklist_lock);
73198+ }
73199+ rcu_read_unlock();
73200+ }
73201+
73202+ return;
73203+}
73204+
73205+int
73206+gr_check_crash_exec(const struct file *filp)
73207+{
73208+ struct acl_subject_label *curr;
73209+
73210+ if (unlikely(!gr_acl_is_enabled()))
73211+ return 0;
73212+
73213+ read_lock(&gr_inode_lock);
73214+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
73215+ __get_dev(filp->f_path.dentry),
73216+ current->role);
73217+ read_unlock(&gr_inode_lock);
73218+
73219+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
73220+ (!curr->crashes && !curr->expires))
73221+ return 0;
73222+
73223+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
73224+ time_after(curr->expires, get_seconds()))
73225+ return 1;
73226+ else if (time_before_eq(curr->expires, get_seconds())) {
73227+ curr->crashes = 0;
73228+ curr->expires = 0;
73229+ }
73230+
73231+ return 0;
73232+}
73233+
73234+void
73235+gr_handle_alertkill(struct task_struct *task)
73236+{
73237+ struct acl_subject_label *curracl;
73238+ __u32 curr_ip;
73239+ struct task_struct *p, *p2;
73240+
73241+ if (unlikely(!gr_acl_is_enabled()))
73242+ return;
73243+
73244+ curracl = task->acl;
73245+ curr_ip = task->signal->curr_ip;
73246+
73247+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
73248+ read_lock(&tasklist_lock);
73249+ do_each_thread(p2, p) {
73250+ if (p->signal->curr_ip == curr_ip)
73251+ gr_fake_force_sig(SIGKILL, p);
73252+ } while_each_thread(p2, p);
73253+ read_unlock(&tasklist_lock);
73254+ } else if (curracl->mode & GR_KILLPROC)
73255+ gr_fake_force_sig(SIGKILL, task);
73256+
73257+ return;
73258+}
73259diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
73260new file mode 100644
73261index 0000000..98011b0
73262--- /dev/null
73263+++ b/grsecurity/gracl_shm.c
73264@@ -0,0 +1,40 @@
73265+#include <linux/kernel.h>
73266+#include <linux/mm.h>
73267+#include <linux/sched.h>
73268+#include <linux/file.h>
73269+#include <linux/ipc.h>
73270+#include <linux/gracl.h>
73271+#include <linux/grsecurity.h>
73272+#include <linux/grinternal.h>
73273+
73274+int
73275+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73276+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
73277+{
73278+ struct task_struct *task;
73279+
73280+ if (!gr_acl_is_enabled())
73281+ return 1;
73282+
73283+ rcu_read_lock();
73284+ read_lock(&tasklist_lock);
73285+
73286+ task = find_task_by_vpid(shm_cprid);
73287+
73288+ if (unlikely(!task))
73289+ task = find_task_by_vpid(shm_lapid);
73290+
73291+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
73292+ (task_pid_nr(task) == shm_lapid)) &&
73293+ (task->acl->mode & GR_PROTSHM) &&
73294+ (task->acl != current->acl))) {
73295+ read_unlock(&tasklist_lock);
73296+ rcu_read_unlock();
73297+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
73298+ return 0;
73299+ }
73300+ read_unlock(&tasklist_lock);
73301+ rcu_read_unlock();
73302+
73303+ return 1;
73304+}
73305diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
73306new file mode 100644
73307index 0000000..bc0be01
73308--- /dev/null
73309+++ b/grsecurity/grsec_chdir.c
73310@@ -0,0 +1,19 @@
73311+#include <linux/kernel.h>
73312+#include <linux/sched.h>
73313+#include <linux/fs.h>
73314+#include <linux/file.h>
73315+#include <linux/grsecurity.h>
73316+#include <linux/grinternal.h>
73317+
73318+void
73319+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
73320+{
73321+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
73322+ if ((grsec_enable_chdir && grsec_enable_group &&
73323+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
73324+ !grsec_enable_group)) {
73325+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
73326+ }
73327+#endif
73328+ return;
73329+}
73330diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
73331new file mode 100644
73332index 0000000..baa635c
73333--- /dev/null
73334+++ b/grsecurity/grsec_chroot.c
73335@@ -0,0 +1,387 @@
73336+#include <linux/kernel.h>
73337+#include <linux/module.h>
73338+#include <linux/sched.h>
73339+#include <linux/file.h>
73340+#include <linux/fs.h>
73341+#include <linux/mount.h>
73342+#include <linux/types.h>
73343+#include "../fs/mount.h"
73344+#include <linux/grsecurity.h>
73345+#include <linux/grinternal.h>
73346+
73347+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73348+int gr_init_ran;
73349+#endif
73350+
73351+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
73352+{
73353+#ifdef CONFIG_GRKERNSEC
73354+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
73355+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
73356+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73357+ && gr_init_ran
73358+#endif
73359+ )
73360+ task->gr_is_chrooted = 1;
73361+ else {
73362+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
73363+ if (task_pid_nr(task) == 1 && !gr_init_ran)
73364+ gr_init_ran = 1;
73365+#endif
73366+ task->gr_is_chrooted = 0;
73367+ }
73368+
73369+ task->gr_chroot_dentry = path->dentry;
73370+#endif
73371+ return;
73372+}
73373+
73374+void gr_clear_chroot_entries(struct task_struct *task)
73375+{
73376+#ifdef CONFIG_GRKERNSEC
73377+ task->gr_is_chrooted = 0;
73378+ task->gr_chroot_dentry = NULL;
73379+#endif
73380+ return;
73381+}
73382+
73383+int
73384+gr_handle_chroot_unix(const pid_t pid)
73385+{
73386+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
73387+ struct task_struct *p;
73388+
73389+ if (unlikely(!grsec_enable_chroot_unix))
73390+ return 1;
73391+
73392+ if (likely(!proc_is_chrooted(current)))
73393+ return 1;
73394+
73395+ rcu_read_lock();
73396+ read_lock(&tasklist_lock);
73397+ p = find_task_by_vpid_unrestricted(pid);
73398+ if (unlikely(p && !have_same_root(current, p))) {
73399+ read_unlock(&tasklist_lock);
73400+ rcu_read_unlock();
73401+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
73402+ return 0;
73403+ }
73404+ read_unlock(&tasklist_lock);
73405+ rcu_read_unlock();
73406+#endif
73407+ return 1;
73408+}
73409+
73410+int
73411+gr_handle_chroot_nice(void)
73412+{
73413+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
73414+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
73415+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
73416+ return -EPERM;
73417+ }
73418+#endif
73419+ return 0;
73420+}
73421+
73422+int
73423+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
73424+{
73425+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
73426+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
73427+ && proc_is_chrooted(current)) {
73428+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
73429+ return -EACCES;
73430+ }
73431+#endif
73432+ return 0;
73433+}
73434+
73435+int
73436+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
73437+{
73438+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73439+ struct task_struct *p;
73440+ int ret = 0;
73441+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
73442+ return ret;
73443+
73444+ read_lock(&tasklist_lock);
73445+ do_each_pid_task(pid, type, p) {
73446+ if (!have_same_root(current, p)) {
73447+ ret = 1;
73448+ goto out;
73449+ }
73450+ } while_each_pid_task(pid, type, p);
73451+out:
73452+ read_unlock(&tasklist_lock);
73453+ return ret;
73454+#endif
73455+ return 0;
73456+}
73457+
73458+int
73459+gr_pid_is_chrooted(struct task_struct *p)
73460+{
73461+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
73462+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
73463+ return 0;
73464+
73465+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
73466+ !have_same_root(current, p)) {
73467+ return 1;
73468+ }
73469+#endif
73470+ return 0;
73471+}
73472+
73473+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
73474+
73475+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
73476+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
73477+{
73478+ struct path path, currentroot;
73479+ int ret = 0;
73480+
73481+ path.dentry = (struct dentry *)u_dentry;
73482+ path.mnt = (struct vfsmount *)u_mnt;
73483+ get_fs_root(current->fs, &currentroot);
73484+ if (path_is_under(&path, &currentroot))
73485+ ret = 1;
73486+ path_put(&currentroot);
73487+
73488+ return ret;
73489+}
73490+#endif
73491+
73492+int
73493+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
73494+{
73495+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
73496+ if (!grsec_enable_chroot_fchdir)
73497+ return 1;
73498+
73499+ if (!proc_is_chrooted(current))
73500+ return 1;
73501+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
73502+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
73503+ return 0;
73504+ }
73505+#endif
73506+ return 1;
73507+}
73508+
73509+int
73510+gr_chroot_fhandle(void)
73511+{
73512+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
73513+ if (!grsec_enable_chroot_fchdir)
73514+ return 1;
73515+
73516+ if (!proc_is_chrooted(current))
73517+ return 1;
73518+ else {
73519+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
73520+ return 0;
73521+ }
73522+#endif
73523+ return 1;
73524+}
73525+
73526+int
73527+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
73528+ const time_t shm_createtime)
73529+{
73530+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
73531+ struct task_struct *p;
73532+ time_t starttime;
73533+
73534+ if (unlikely(!grsec_enable_chroot_shmat))
73535+ return 1;
73536+
73537+ if (likely(!proc_is_chrooted(current)))
73538+ return 1;
73539+
73540+ rcu_read_lock();
73541+ read_lock(&tasklist_lock);
73542+
73543+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
73544+ starttime = p->start_time.tv_sec;
73545+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
73546+ if (have_same_root(current, p)) {
73547+ goto allow;
73548+ } else {
73549+ read_unlock(&tasklist_lock);
73550+ rcu_read_unlock();
73551+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
73552+ return 0;
73553+ }
73554+ }
73555+ /* creator exited, pid reuse, fall through to next check */
73556+ }
73557+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
73558+ if (unlikely(!have_same_root(current, p))) {
73559+ read_unlock(&tasklist_lock);
73560+ rcu_read_unlock();
73561+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
73562+ return 0;
73563+ }
73564+ }
73565+
73566+allow:
73567+ read_unlock(&tasklist_lock);
73568+ rcu_read_unlock();
73569+#endif
73570+ return 1;
73571+}
73572+
73573+void
73574+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
73575+{
73576+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
73577+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
73578+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
73579+#endif
73580+ return;
73581+}
73582+
73583+int
73584+gr_handle_chroot_mknod(const struct dentry *dentry,
73585+ const struct vfsmount *mnt, const int mode)
73586+{
73587+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
73588+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
73589+ proc_is_chrooted(current)) {
73590+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
73591+ return -EPERM;
73592+ }
73593+#endif
73594+ return 0;
73595+}
73596+
73597+int
73598+gr_handle_chroot_mount(const struct dentry *dentry,
73599+ const struct vfsmount *mnt, const char *dev_name)
73600+{
73601+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
73602+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
73603+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
73604+ return -EPERM;
73605+ }
73606+#endif
73607+ return 0;
73608+}
73609+
73610+int
73611+gr_handle_chroot_pivot(void)
73612+{
73613+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
73614+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
73615+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
73616+ return -EPERM;
73617+ }
73618+#endif
73619+ return 0;
73620+}
73621+
73622+int
73623+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
73624+{
73625+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
73626+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
73627+ !gr_is_outside_chroot(dentry, mnt)) {
73628+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
73629+ return -EPERM;
73630+ }
73631+#endif
73632+ return 0;
73633+}
73634+
73635+extern const char *captab_log[];
73636+extern int captab_log_entries;
73637+
73638+int
73639+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
73640+{
73641+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73642+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
73643+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
73644+ if (cap_raised(chroot_caps, cap)) {
73645+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
73646+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
73647+ }
73648+ return 0;
73649+ }
73650+ }
73651+#endif
73652+ return 1;
73653+}
73654+
73655+int
73656+gr_chroot_is_capable(const int cap)
73657+{
73658+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73659+ return gr_task_chroot_is_capable(current, current_cred(), cap);
73660+#endif
73661+ return 1;
73662+}
73663+
73664+int
73665+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
73666+{
73667+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73668+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
73669+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
73670+ if (cap_raised(chroot_caps, cap)) {
73671+ return 0;
73672+ }
73673+ }
73674+#endif
73675+ return 1;
73676+}
73677+
73678+int
73679+gr_chroot_is_capable_nolog(const int cap)
73680+{
73681+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
73682+ return gr_task_chroot_is_capable_nolog(current, cap);
73683+#endif
73684+ return 1;
73685+}
73686+
73687+int
73688+gr_handle_chroot_sysctl(const int op)
73689+{
73690+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
73691+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
73692+ proc_is_chrooted(current))
73693+ return -EACCES;
73694+#endif
73695+ return 0;
73696+}
73697+
73698+void
73699+gr_handle_chroot_chdir(const struct path *path)
73700+{
73701+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
73702+ if (grsec_enable_chroot_chdir)
73703+ set_fs_pwd(current->fs, path);
73704+#endif
73705+ return;
73706+}
73707+
73708+int
73709+gr_handle_chroot_chmod(const struct dentry *dentry,
73710+ const struct vfsmount *mnt, const int mode)
73711+{
73712+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
73713+ /* allow chmod +s on directories, but not files */
73714+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
73715+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
73716+ proc_is_chrooted(current)) {
73717+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
73718+ return -EPERM;
73719+ }
73720+#endif
73721+ return 0;
73722+}
73723diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
73724new file mode 100644
73725index 0000000..de31e65
73726--- /dev/null
73727+++ b/grsecurity/grsec_disabled.c
73728@@ -0,0 +1,434 @@
73729+#include <linux/kernel.h>
73730+#include <linux/module.h>
73731+#include <linux/sched.h>
73732+#include <linux/file.h>
73733+#include <linux/fs.h>
73734+#include <linux/kdev_t.h>
73735+#include <linux/net.h>
73736+#include <linux/in.h>
73737+#include <linux/ip.h>
73738+#include <linux/skbuff.h>
73739+#include <linux/sysctl.h>
73740+
73741+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
73742+void
73743+pax_set_initial_flags(struct linux_binprm *bprm)
73744+{
73745+ return;
73746+}
73747+#endif
73748+
73749+#ifdef CONFIG_SYSCTL
73750+__u32
73751+gr_handle_sysctl(const struct ctl_table * table, const int op)
73752+{
73753+ return 0;
73754+}
73755+#endif
73756+
73757+#ifdef CONFIG_TASKSTATS
73758+int gr_is_taskstats_denied(int pid)
73759+{
73760+ return 0;
73761+}
73762+#endif
73763+
73764+int
73765+gr_acl_is_enabled(void)
73766+{
73767+ return 0;
73768+}
73769+
73770+void
73771+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
73772+{
73773+ return;
73774+}
73775+
73776+int
73777+gr_handle_rawio(const struct inode *inode)
73778+{
73779+ return 0;
73780+}
73781+
73782+void
73783+gr_acl_handle_psacct(struct task_struct *task, const long code)
73784+{
73785+ return;
73786+}
73787+
73788+int
73789+gr_handle_ptrace(struct task_struct *task, const long request)
73790+{
73791+ return 0;
73792+}
73793+
73794+int
73795+gr_handle_proc_ptrace(struct task_struct *task)
73796+{
73797+ return 0;
73798+}
73799+
73800+int
73801+gr_set_acls(const int type)
73802+{
73803+ return 0;
73804+}
73805+
73806+int
73807+gr_check_hidden_task(const struct task_struct *tsk)
73808+{
73809+ return 0;
73810+}
73811+
73812+int
73813+gr_check_protected_task(const struct task_struct *task)
73814+{
73815+ return 0;
73816+}
73817+
73818+int
73819+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
73820+{
73821+ return 0;
73822+}
73823+
73824+void
73825+gr_copy_label(struct task_struct *tsk)
73826+{
73827+ return;
73828+}
73829+
73830+void
73831+gr_set_pax_flags(struct task_struct *task)
73832+{
73833+ return;
73834+}
73835+
73836+int
73837+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
73838+ const int unsafe_share)
73839+{
73840+ return 0;
73841+}
73842+
73843+void
73844+gr_handle_delete(const ino_t ino, const dev_t dev)
73845+{
73846+ return;
73847+}
73848+
73849+void
73850+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
73851+{
73852+ return;
73853+}
73854+
73855+void
73856+gr_handle_crash(struct task_struct *task, const int sig)
73857+{
73858+ return;
73859+}
73860+
73861+int
73862+gr_check_crash_exec(const struct file *filp)
73863+{
73864+ return 0;
73865+}
73866+
73867+int
73868+gr_check_crash_uid(const kuid_t uid)
73869+{
73870+ return 0;
73871+}
73872+
73873+void
73874+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
73875+ struct dentry *old_dentry,
73876+ struct dentry *new_dentry,
73877+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
73878+{
73879+ return;
73880+}
73881+
73882+int
73883+gr_search_socket(const int family, const int type, const int protocol)
73884+{
73885+ return 1;
73886+}
73887+
73888+int
73889+gr_search_connectbind(const int mode, const struct socket *sock,
73890+ const struct sockaddr_in *addr)
73891+{
73892+ return 0;
73893+}
73894+
73895+void
73896+gr_handle_alertkill(struct task_struct *task)
73897+{
73898+ return;
73899+}
73900+
73901+__u32
73902+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
73903+{
73904+ return 1;
73905+}
73906+
73907+__u32
73908+gr_acl_handle_hidden_file(const struct dentry * dentry,
73909+ const struct vfsmount * mnt)
73910+{
73911+ return 1;
73912+}
73913+
73914+__u32
73915+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
73916+ int acc_mode)
73917+{
73918+ return 1;
73919+}
73920+
73921+__u32
73922+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
73923+{
73924+ return 1;
73925+}
73926+
73927+__u32
73928+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
73929+{
73930+ return 1;
73931+}
73932+
73933+int
73934+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
73935+ unsigned int *vm_flags)
73936+{
73937+ return 1;
73938+}
73939+
73940+__u32
73941+gr_acl_handle_truncate(const struct dentry * dentry,
73942+ const struct vfsmount * mnt)
73943+{
73944+ return 1;
73945+}
73946+
73947+__u32
73948+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
73949+{
73950+ return 1;
73951+}
73952+
73953+__u32
73954+gr_acl_handle_access(const struct dentry * dentry,
73955+ const struct vfsmount * mnt, const int fmode)
73956+{
73957+ return 1;
73958+}
73959+
73960+__u32
73961+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
73962+ umode_t *mode)
73963+{
73964+ return 1;
73965+}
73966+
73967+__u32
73968+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
73969+{
73970+ return 1;
73971+}
73972+
73973+__u32
73974+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
73975+{
73976+ return 1;
73977+}
73978+
73979+__u32
73980+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
73981+{
73982+ return 1;
73983+}
73984+
73985+void
73986+grsecurity_init(void)
73987+{
73988+ return;
73989+}
73990+
73991+umode_t gr_acl_umask(void)
73992+{
73993+ return 0;
73994+}
73995+
73996+__u32
73997+gr_acl_handle_mknod(const struct dentry * new_dentry,
73998+ const struct dentry * parent_dentry,
73999+ const struct vfsmount * parent_mnt,
74000+ const int mode)
74001+{
74002+ return 1;
74003+}
74004+
74005+__u32
74006+gr_acl_handle_mkdir(const struct dentry * new_dentry,
74007+ const struct dentry * parent_dentry,
74008+ const struct vfsmount * parent_mnt)
74009+{
74010+ return 1;
74011+}
74012+
74013+__u32
74014+gr_acl_handle_symlink(const struct dentry * new_dentry,
74015+ const struct dentry * parent_dentry,
74016+ const struct vfsmount * parent_mnt, const struct filename *from)
74017+{
74018+ return 1;
74019+}
74020+
74021+__u32
74022+gr_acl_handle_link(const struct dentry * new_dentry,
74023+ const struct dentry * parent_dentry,
74024+ const struct vfsmount * parent_mnt,
74025+ const struct dentry * old_dentry,
74026+ const struct vfsmount * old_mnt, const struct filename *to)
74027+{
74028+ return 1;
74029+}
74030+
74031+int
74032+gr_acl_handle_rename(const struct dentry *new_dentry,
74033+ const struct dentry *parent_dentry,
74034+ const struct vfsmount *parent_mnt,
74035+ const struct dentry *old_dentry,
74036+ const struct inode *old_parent_inode,
74037+ const struct vfsmount *old_mnt, const struct filename *newname,
74038+ unsigned int flags)
74039+{
74040+ return 0;
74041+}
74042+
74043+int
74044+gr_acl_handle_filldir(const struct file *file, const char *name,
74045+ const int namelen, const ino_t ino)
74046+{
74047+ return 1;
74048+}
74049+
74050+int
74051+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
74052+ const time_t shm_createtime, const kuid_t cuid, const int shmid)
74053+{
74054+ return 1;
74055+}
74056+
74057+int
74058+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
74059+{
74060+ return 0;
74061+}
74062+
74063+int
74064+gr_search_accept(const struct socket *sock)
74065+{
74066+ return 0;
74067+}
74068+
74069+int
74070+gr_search_listen(const struct socket *sock)
74071+{
74072+ return 0;
74073+}
74074+
74075+int
74076+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
74077+{
74078+ return 0;
74079+}
74080+
74081+__u32
74082+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
74083+{
74084+ return 1;
74085+}
74086+
74087+__u32
74088+gr_acl_handle_creat(const struct dentry * dentry,
74089+ const struct dentry * p_dentry,
74090+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
74091+ const int imode)
74092+{
74093+ return 1;
74094+}
74095+
74096+void
74097+gr_acl_handle_exit(void)
74098+{
74099+ return;
74100+}
74101+
74102+int
74103+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
74104+{
74105+ return 1;
74106+}
74107+
74108+void
74109+gr_set_role_label(const kuid_t uid, const kgid_t gid)
74110+{
74111+ return;
74112+}
74113+
74114+int
74115+gr_acl_handle_procpidmem(const struct task_struct *task)
74116+{
74117+ return 0;
74118+}
74119+
74120+int
74121+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
74122+{
74123+ return 0;
74124+}
74125+
74126+int
74127+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
74128+{
74129+ return 0;
74130+}
74131+
74132+int
74133+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
74134+{
74135+ return 0;
74136+}
74137+
74138+int
74139+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
74140+{
74141+ return 0;
74142+}
74143+
74144+int gr_acl_enable_at_secure(void)
74145+{
74146+ return 0;
74147+}
74148+
74149+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
74150+{
74151+ return dentry->d_sb->s_dev;
74152+}
74153+
74154+void gr_put_exec_file(struct task_struct *task)
74155+{
74156+ return;
74157+}
74158+
74159+#ifdef CONFIG_SECURITY
74160+EXPORT_SYMBOL_GPL(gr_check_user_change);
74161+EXPORT_SYMBOL_GPL(gr_check_group_change);
74162+#endif
74163diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
74164new file mode 100644
74165index 0000000..f35f454
74166--- /dev/null
74167+++ b/grsecurity/grsec_exec.c
74168@@ -0,0 +1,187 @@
74169+#include <linux/kernel.h>
74170+#include <linux/sched.h>
74171+#include <linux/file.h>
74172+#include <linux/binfmts.h>
74173+#include <linux/fs.h>
74174+#include <linux/types.h>
74175+#include <linux/grdefs.h>
74176+#include <linux/grsecurity.h>
74177+#include <linux/grinternal.h>
74178+#include <linux/capability.h>
74179+#include <linux/module.h>
74180+#include <linux/compat.h>
74181+
74182+#include <asm/uaccess.h>
74183+
74184+#ifdef CONFIG_GRKERNSEC_EXECLOG
74185+static char gr_exec_arg_buf[132];
74186+static DEFINE_MUTEX(gr_exec_arg_mutex);
74187+#endif
74188+
74189+struct user_arg_ptr {
74190+#ifdef CONFIG_COMPAT
74191+ bool is_compat;
74192+#endif
74193+ union {
74194+ const char __user *const __user *native;
74195+#ifdef CONFIG_COMPAT
74196+ const compat_uptr_t __user *compat;
74197+#endif
74198+ } ptr;
74199+};
74200+
74201+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
74202+
74203+void
74204+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
74205+{
74206+#ifdef CONFIG_GRKERNSEC_EXECLOG
74207+ char *grarg = gr_exec_arg_buf;
74208+ unsigned int i, x, execlen = 0;
74209+ char c;
74210+
74211+ if (!((grsec_enable_execlog && grsec_enable_group &&
74212+ in_group_p(grsec_audit_gid))
74213+ || (grsec_enable_execlog && !grsec_enable_group)))
74214+ return;
74215+
74216+ mutex_lock(&gr_exec_arg_mutex);
74217+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
74218+
74219+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
74220+ const char __user *p;
74221+ unsigned int len;
74222+
74223+ p = get_user_arg_ptr(argv, i);
74224+ if (IS_ERR(p))
74225+ goto log;
74226+
74227+ len = strnlen_user(p, 128 - execlen);
74228+ if (len > 128 - execlen)
74229+ len = 128 - execlen;
74230+ else if (len > 0)
74231+ len--;
74232+ if (copy_from_user(grarg + execlen, p, len))
74233+ goto log;
74234+
74235+ /* rewrite unprintable characters */
74236+ for (x = 0; x < len; x++) {
74237+ c = *(grarg + execlen + x);
74238+ if (c < 32 || c > 126)
74239+ *(grarg + execlen + x) = ' ';
74240+ }
74241+
74242+ execlen += len;
74243+ *(grarg + execlen) = ' ';
74244+ *(grarg + execlen + 1) = '\0';
74245+ execlen++;
74246+ }
74247+
74248+ log:
74249+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
74250+ bprm->file->f_path.mnt, grarg);
74251+ mutex_unlock(&gr_exec_arg_mutex);
74252+#endif
74253+ return;
74254+}
74255+
74256+#ifdef CONFIG_GRKERNSEC
74257+extern int gr_acl_is_capable(const int cap);
74258+extern int gr_acl_is_capable_nolog(const int cap);
74259+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
74260+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
74261+extern int gr_chroot_is_capable(const int cap);
74262+extern int gr_chroot_is_capable_nolog(const int cap);
74263+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
74264+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
74265+#endif
74266+
74267+const char *captab_log[] = {
74268+ "CAP_CHOWN",
74269+ "CAP_DAC_OVERRIDE",
74270+ "CAP_DAC_READ_SEARCH",
74271+ "CAP_FOWNER",
74272+ "CAP_FSETID",
74273+ "CAP_KILL",
74274+ "CAP_SETGID",
74275+ "CAP_SETUID",
74276+ "CAP_SETPCAP",
74277+ "CAP_LINUX_IMMUTABLE",
74278+ "CAP_NET_BIND_SERVICE",
74279+ "CAP_NET_BROADCAST",
74280+ "CAP_NET_ADMIN",
74281+ "CAP_NET_RAW",
74282+ "CAP_IPC_LOCK",
74283+ "CAP_IPC_OWNER",
74284+ "CAP_SYS_MODULE",
74285+ "CAP_SYS_RAWIO",
74286+ "CAP_SYS_CHROOT",
74287+ "CAP_SYS_PTRACE",
74288+ "CAP_SYS_PACCT",
74289+ "CAP_SYS_ADMIN",
74290+ "CAP_SYS_BOOT",
74291+ "CAP_SYS_NICE",
74292+ "CAP_SYS_RESOURCE",
74293+ "CAP_SYS_TIME",
74294+ "CAP_SYS_TTY_CONFIG",
74295+ "CAP_MKNOD",
74296+ "CAP_LEASE",
74297+ "CAP_AUDIT_WRITE",
74298+ "CAP_AUDIT_CONTROL",
74299+ "CAP_SETFCAP",
74300+ "CAP_MAC_OVERRIDE",
74301+ "CAP_MAC_ADMIN",
74302+ "CAP_SYSLOG",
74303+ "CAP_WAKE_ALARM"
74304+};
74305+
74306+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
74307+
74308+int gr_is_capable(const int cap)
74309+{
74310+#ifdef CONFIG_GRKERNSEC
74311+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
74312+ return 1;
74313+ return 0;
74314+#else
74315+ return 1;
74316+#endif
74317+}
74318+
74319+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
74320+{
74321+#ifdef CONFIG_GRKERNSEC
74322+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
74323+ return 1;
74324+ return 0;
74325+#else
74326+ return 1;
74327+#endif
74328+}
74329+
74330+int gr_is_capable_nolog(const int cap)
74331+{
74332+#ifdef CONFIG_GRKERNSEC
74333+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
74334+ return 1;
74335+ return 0;
74336+#else
74337+ return 1;
74338+#endif
74339+}
74340+
74341+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
74342+{
74343+#ifdef CONFIG_GRKERNSEC
74344+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
74345+ return 1;
74346+ return 0;
74347+#else
74348+ return 1;
74349+#endif
74350+}
74351+
74352+EXPORT_SYMBOL_GPL(gr_is_capable);
74353+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
74354+EXPORT_SYMBOL_GPL(gr_task_is_capable);
74355+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
74356diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
74357new file mode 100644
74358index 0000000..06cc6ea
74359--- /dev/null
74360+++ b/grsecurity/grsec_fifo.c
74361@@ -0,0 +1,24 @@
74362+#include <linux/kernel.h>
74363+#include <linux/sched.h>
74364+#include <linux/fs.h>
74365+#include <linux/file.h>
74366+#include <linux/grinternal.h>
74367+
74368+int
74369+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
74370+ const struct dentry *dir, const int flag, const int acc_mode)
74371+{
74372+#ifdef CONFIG_GRKERNSEC_FIFO
74373+ const struct cred *cred = current_cred();
74374+
74375+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
74376+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
74377+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
74378+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
74379+ if (!inode_permission(dentry->d_inode, acc_mode))
74380+ 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));
74381+ return -EACCES;
74382+ }
74383+#endif
74384+ return 0;
74385+}
74386diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
74387new file mode 100644
74388index 0000000..8ca18bf
74389--- /dev/null
74390+++ b/grsecurity/grsec_fork.c
74391@@ -0,0 +1,23 @@
74392+#include <linux/kernel.h>
74393+#include <linux/sched.h>
74394+#include <linux/grsecurity.h>
74395+#include <linux/grinternal.h>
74396+#include <linux/errno.h>
74397+
74398+void
74399+gr_log_forkfail(const int retval)
74400+{
74401+#ifdef CONFIG_GRKERNSEC_FORKFAIL
74402+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
74403+ switch (retval) {
74404+ case -EAGAIN:
74405+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
74406+ break;
74407+ case -ENOMEM:
74408+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
74409+ break;
74410+ }
74411+ }
74412+#endif
74413+ return;
74414+}
74415diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
74416new file mode 100644
74417index 0000000..ae6c028
74418--- /dev/null
74419+++ b/grsecurity/grsec_init.c
74420@@ -0,0 +1,272 @@
74421+#include <linux/kernel.h>
74422+#include <linux/sched.h>
74423+#include <linux/mm.h>
74424+#include <linux/gracl.h>
74425+#include <linux/slab.h>
74426+#include <linux/vmalloc.h>
74427+#include <linux/percpu.h>
74428+#include <linux/module.h>
74429+
74430+int grsec_enable_ptrace_readexec;
74431+int grsec_enable_setxid;
74432+int grsec_enable_symlinkown;
74433+kgid_t grsec_symlinkown_gid;
74434+int grsec_enable_brute;
74435+int grsec_enable_link;
74436+int grsec_enable_dmesg;
74437+int grsec_enable_harden_ptrace;
74438+int grsec_enable_harden_ipc;
74439+int grsec_enable_fifo;
74440+int grsec_enable_execlog;
74441+int grsec_enable_signal;
74442+int grsec_enable_forkfail;
74443+int grsec_enable_audit_ptrace;
74444+int grsec_enable_time;
74445+int grsec_enable_group;
74446+kgid_t grsec_audit_gid;
74447+int grsec_enable_chdir;
74448+int grsec_enable_mount;
74449+int grsec_enable_rofs;
74450+int grsec_deny_new_usb;
74451+int grsec_enable_chroot_findtask;
74452+int grsec_enable_chroot_mount;
74453+int grsec_enable_chroot_shmat;
74454+int grsec_enable_chroot_fchdir;
74455+int grsec_enable_chroot_double;
74456+int grsec_enable_chroot_pivot;
74457+int grsec_enable_chroot_chdir;
74458+int grsec_enable_chroot_chmod;
74459+int grsec_enable_chroot_mknod;
74460+int grsec_enable_chroot_nice;
74461+int grsec_enable_chroot_execlog;
74462+int grsec_enable_chroot_caps;
74463+int grsec_enable_chroot_sysctl;
74464+int grsec_enable_chroot_unix;
74465+int grsec_enable_tpe;
74466+kgid_t grsec_tpe_gid;
74467+int grsec_enable_blackhole;
74468+#ifdef CONFIG_IPV6_MODULE
74469+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
74470+#endif
74471+int grsec_lastack_retries;
74472+int grsec_enable_tpe_all;
74473+int grsec_enable_tpe_invert;
74474+int grsec_enable_socket_all;
74475+kgid_t grsec_socket_all_gid;
74476+int grsec_enable_socket_client;
74477+kgid_t grsec_socket_client_gid;
74478+int grsec_enable_socket_server;
74479+kgid_t grsec_socket_server_gid;
74480+int grsec_resource_logging;
74481+int grsec_disable_privio;
74482+int grsec_enable_log_rwxmaps;
74483+int grsec_lock;
74484+
74485+DEFINE_SPINLOCK(grsec_alert_lock);
74486+unsigned long grsec_alert_wtime = 0;
74487+unsigned long grsec_alert_fyet = 0;
74488+
74489+DEFINE_SPINLOCK(grsec_audit_lock);
74490+
74491+DEFINE_RWLOCK(grsec_exec_file_lock);
74492+
74493+char *gr_shared_page[4];
74494+
74495+char *gr_alert_log_fmt;
74496+char *gr_audit_log_fmt;
74497+char *gr_alert_log_buf;
74498+char *gr_audit_log_buf;
74499+
74500+void __init
74501+grsecurity_init(void)
74502+{
74503+ int j;
74504+ /* create the per-cpu shared pages */
74505+
74506+#ifdef CONFIG_X86
74507+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
74508+#endif
74509+
74510+ for (j = 0; j < 4; j++) {
74511+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
74512+ if (gr_shared_page[j] == NULL) {
74513+ panic("Unable to allocate grsecurity shared page");
74514+ return;
74515+ }
74516+ }
74517+
74518+ /* allocate log buffers */
74519+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
74520+ if (!gr_alert_log_fmt) {
74521+ panic("Unable to allocate grsecurity alert log format buffer");
74522+ return;
74523+ }
74524+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
74525+ if (!gr_audit_log_fmt) {
74526+ panic("Unable to allocate grsecurity audit log format buffer");
74527+ return;
74528+ }
74529+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
74530+ if (!gr_alert_log_buf) {
74531+ panic("Unable to allocate grsecurity alert log buffer");
74532+ return;
74533+ }
74534+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
74535+ if (!gr_audit_log_buf) {
74536+ panic("Unable to allocate grsecurity audit log buffer");
74537+ return;
74538+ }
74539+
74540+#ifdef CONFIG_GRKERNSEC_IO
74541+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
74542+ grsec_disable_privio = 1;
74543+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
74544+ grsec_disable_privio = 1;
74545+#else
74546+ grsec_disable_privio = 0;
74547+#endif
74548+#endif
74549+
74550+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
74551+ /* for backward compatibility, tpe_invert always defaults to on if
74552+ enabled in the kernel
74553+ */
74554+ grsec_enable_tpe_invert = 1;
74555+#endif
74556+
74557+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
74558+#ifndef CONFIG_GRKERNSEC_SYSCTL
74559+ grsec_lock = 1;
74560+#endif
74561+
74562+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
74563+ grsec_enable_log_rwxmaps = 1;
74564+#endif
74565+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
74566+ grsec_enable_group = 1;
74567+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
74568+#endif
74569+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
74570+ grsec_enable_ptrace_readexec = 1;
74571+#endif
74572+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
74573+ grsec_enable_chdir = 1;
74574+#endif
74575+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
74576+ grsec_enable_harden_ptrace = 1;
74577+#endif
74578+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
74579+ grsec_enable_harden_ipc = 1;
74580+#endif
74581+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
74582+ grsec_enable_mount = 1;
74583+#endif
74584+#ifdef CONFIG_GRKERNSEC_LINK
74585+ grsec_enable_link = 1;
74586+#endif
74587+#ifdef CONFIG_GRKERNSEC_BRUTE
74588+ grsec_enable_brute = 1;
74589+#endif
74590+#ifdef CONFIG_GRKERNSEC_DMESG
74591+ grsec_enable_dmesg = 1;
74592+#endif
74593+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
74594+ grsec_enable_blackhole = 1;
74595+ grsec_lastack_retries = 4;
74596+#endif
74597+#ifdef CONFIG_GRKERNSEC_FIFO
74598+ grsec_enable_fifo = 1;
74599+#endif
74600+#ifdef CONFIG_GRKERNSEC_EXECLOG
74601+ grsec_enable_execlog = 1;
74602+#endif
74603+#ifdef CONFIG_GRKERNSEC_SETXID
74604+ grsec_enable_setxid = 1;
74605+#endif
74606+#ifdef CONFIG_GRKERNSEC_SIGNAL
74607+ grsec_enable_signal = 1;
74608+#endif
74609+#ifdef CONFIG_GRKERNSEC_FORKFAIL
74610+ grsec_enable_forkfail = 1;
74611+#endif
74612+#ifdef CONFIG_GRKERNSEC_TIME
74613+ grsec_enable_time = 1;
74614+#endif
74615+#ifdef CONFIG_GRKERNSEC_RESLOG
74616+ grsec_resource_logging = 1;
74617+#endif
74618+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
74619+ grsec_enable_chroot_findtask = 1;
74620+#endif
74621+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
74622+ grsec_enable_chroot_unix = 1;
74623+#endif
74624+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
74625+ grsec_enable_chroot_mount = 1;
74626+#endif
74627+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
74628+ grsec_enable_chroot_fchdir = 1;
74629+#endif
74630+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
74631+ grsec_enable_chroot_shmat = 1;
74632+#endif
74633+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
74634+ grsec_enable_audit_ptrace = 1;
74635+#endif
74636+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
74637+ grsec_enable_chroot_double = 1;
74638+#endif
74639+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
74640+ grsec_enable_chroot_pivot = 1;
74641+#endif
74642+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
74643+ grsec_enable_chroot_chdir = 1;
74644+#endif
74645+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
74646+ grsec_enable_chroot_chmod = 1;
74647+#endif
74648+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
74649+ grsec_enable_chroot_mknod = 1;
74650+#endif
74651+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
74652+ grsec_enable_chroot_nice = 1;
74653+#endif
74654+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
74655+ grsec_enable_chroot_execlog = 1;
74656+#endif
74657+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
74658+ grsec_enable_chroot_caps = 1;
74659+#endif
74660+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
74661+ grsec_enable_chroot_sysctl = 1;
74662+#endif
74663+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
74664+ grsec_enable_symlinkown = 1;
74665+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
74666+#endif
74667+#ifdef CONFIG_GRKERNSEC_TPE
74668+ grsec_enable_tpe = 1;
74669+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
74670+#ifdef CONFIG_GRKERNSEC_TPE_ALL
74671+ grsec_enable_tpe_all = 1;
74672+#endif
74673+#endif
74674+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
74675+ grsec_enable_socket_all = 1;
74676+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
74677+#endif
74678+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
74679+ grsec_enable_socket_client = 1;
74680+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
74681+#endif
74682+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
74683+ grsec_enable_socket_server = 1;
74684+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
74685+#endif
74686+#endif
74687+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
74688+ grsec_deny_new_usb = 1;
74689+#endif
74690+
74691+ return;
74692+}
74693diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
74694new file mode 100644
74695index 0000000..1773300
74696--- /dev/null
74697+++ b/grsecurity/grsec_ipc.c
74698@@ -0,0 +1,48 @@
74699+#include <linux/kernel.h>
74700+#include <linux/mm.h>
74701+#include <linux/sched.h>
74702+#include <linux/file.h>
74703+#include <linux/ipc.h>
74704+#include <linux/ipc_namespace.h>
74705+#include <linux/grsecurity.h>
74706+#include <linux/grinternal.h>
74707+
74708+int
74709+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
74710+{
74711+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
74712+ int write;
74713+ int orig_granted_mode;
74714+ kuid_t euid;
74715+ kgid_t egid;
74716+
74717+ if (!grsec_enable_harden_ipc)
74718+ return 1;
74719+
74720+ euid = current_euid();
74721+ egid = current_egid();
74722+
74723+ write = requested_mode & 00002;
74724+ orig_granted_mode = ipcp->mode;
74725+
74726+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
74727+ orig_granted_mode >>= 6;
74728+ else {
74729+ /* if likely wrong permissions, lock to user */
74730+ if (orig_granted_mode & 0007)
74731+ orig_granted_mode = 0;
74732+ /* otherwise do a egid-only check */
74733+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
74734+ orig_granted_mode >>= 3;
74735+ /* otherwise, no access */
74736+ else
74737+ orig_granted_mode = 0;
74738+ }
74739+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
74740+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
74741+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
74742+ return 0;
74743+ }
74744+#endif
74745+ return 1;
74746+}
74747diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
74748new file mode 100644
74749index 0000000..5e05e20
74750--- /dev/null
74751+++ b/grsecurity/grsec_link.c
74752@@ -0,0 +1,58 @@
74753+#include <linux/kernel.h>
74754+#include <linux/sched.h>
74755+#include <linux/fs.h>
74756+#include <linux/file.h>
74757+#include <linux/grinternal.h>
74758+
74759+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
74760+{
74761+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
74762+ const struct inode *link_inode = link->dentry->d_inode;
74763+
74764+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
74765+ /* ignore root-owned links, e.g. /proc/self */
74766+ gr_is_global_nonroot(link_inode->i_uid) && target &&
74767+ !uid_eq(link_inode->i_uid, target->i_uid)) {
74768+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
74769+ return 1;
74770+ }
74771+#endif
74772+ return 0;
74773+}
74774+
74775+int
74776+gr_handle_follow_link(const struct inode *parent,
74777+ const struct inode *inode,
74778+ const struct dentry *dentry, const struct vfsmount *mnt)
74779+{
74780+#ifdef CONFIG_GRKERNSEC_LINK
74781+ const struct cred *cred = current_cred();
74782+
74783+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
74784+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
74785+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
74786+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
74787+ return -EACCES;
74788+ }
74789+#endif
74790+ return 0;
74791+}
74792+
74793+int
74794+gr_handle_hardlink(const struct dentry *dentry,
74795+ const struct vfsmount *mnt,
74796+ struct inode *inode, const int mode, const struct filename *to)
74797+{
74798+#ifdef CONFIG_GRKERNSEC_LINK
74799+ const struct cred *cred = current_cred();
74800+
74801+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
74802+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
74803+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
74804+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
74805+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
74806+ return -EPERM;
74807+ }
74808+#endif
74809+ return 0;
74810+}
74811diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
74812new file mode 100644
74813index 0000000..dbe0a6b
74814--- /dev/null
74815+++ b/grsecurity/grsec_log.c
74816@@ -0,0 +1,341 @@
74817+#include <linux/kernel.h>
74818+#include <linux/sched.h>
74819+#include <linux/file.h>
74820+#include <linux/tty.h>
74821+#include <linux/fs.h>
74822+#include <linux/mm.h>
74823+#include <linux/grinternal.h>
74824+
74825+#ifdef CONFIG_TREE_PREEMPT_RCU
74826+#define DISABLE_PREEMPT() preempt_disable()
74827+#define ENABLE_PREEMPT() preempt_enable()
74828+#else
74829+#define DISABLE_PREEMPT()
74830+#define ENABLE_PREEMPT()
74831+#endif
74832+
74833+#define BEGIN_LOCKS(x) \
74834+ DISABLE_PREEMPT(); \
74835+ rcu_read_lock(); \
74836+ read_lock(&tasklist_lock); \
74837+ read_lock(&grsec_exec_file_lock); \
74838+ if (x != GR_DO_AUDIT) \
74839+ spin_lock(&grsec_alert_lock); \
74840+ else \
74841+ spin_lock(&grsec_audit_lock)
74842+
74843+#define END_LOCKS(x) \
74844+ if (x != GR_DO_AUDIT) \
74845+ spin_unlock(&grsec_alert_lock); \
74846+ else \
74847+ spin_unlock(&grsec_audit_lock); \
74848+ read_unlock(&grsec_exec_file_lock); \
74849+ read_unlock(&tasklist_lock); \
74850+ rcu_read_unlock(); \
74851+ ENABLE_PREEMPT(); \
74852+ if (x == GR_DONT_AUDIT) \
74853+ gr_handle_alertkill(current)
74854+
74855+enum {
74856+ FLOODING,
74857+ NO_FLOODING
74858+};
74859+
74860+extern char *gr_alert_log_fmt;
74861+extern char *gr_audit_log_fmt;
74862+extern char *gr_alert_log_buf;
74863+extern char *gr_audit_log_buf;
74864+
74865+static int gr_log_start(int audit)
74866+{
74867+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
74868+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
74869+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74870+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
74871+ unsigned long curr_secs = get_seconds();
74872+
74873+ if (audit == GR_DO_AUDIT)
74874+ goto set_fmt;
74875+
74876+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
74877+ grsec_alert_wtime = curr_secs;
74878+ grsec_alert_fyet = 0;
74879+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
74880+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
74881+ grsec_alert_fyet++;
74882+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
74883+ grsec_alert_wtime = curr_secs;
74884+ grsec_alert_fyet++;
74885+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
74886+ return FLOODING;
74887+ }
74888+ else return FLOODING;
74889+
74890+set_fmt:
74891+#endif
74892+ memset(buf, 0, PAGE_SIZE);
74893+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
74894+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
74895+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
74896+ } else if (current->signal->curr_ip) {
74897+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
74898+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
74899+ } else if (gr_acl_is_enabled()) {
74900+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
74901+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
74902+ } else {
74903+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
74904+ strcpy(buf, fmt);
74905+ }
74906+
74907+ return NO_FLOODING;
74908+}
74909+
74910+static void gr_log_middle(int audit, const char *msg, va_list ap)
74911+ __attribute__ ((format (printf, 2, 0)));
74912+
74913+static void gr_log_middle(int audit, const char *msg, va_list ap)
74914+{
74915+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74916+ unsigned int len = strlen(buf);
74917+
74918+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
74919+
74920+ return;
74921+}
74922+
74923+static void gr_log_middle_varargs(int audit, const char *msg, ...)
74924+ __attribute__ ((format (printf, 2, 3)));
74925+
74926+static void gr_log_middle_varargs(int audit, const char *msg, ...)
74927+{
74928+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74929+ unsigned int len = strlen(buf);
74930+ va_list ap;
74931+
74932+ va_start(ap, msg);
74933+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
74934+ va_end(ap);
74935+
74936+ return;
74937+}
74938+
74939+static void gr_log_end(int audit, int append_default)
74940+{
74941+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
74942+ if (append_default) {
74943+ struct task_struct *task = current;
74944+ struct task_struct *parent = task->real_parent;
74945+ const struct cred *cred = __task_cred(task);
74946+ const struct cred *pcred = __task_cred(parent);
74947+ unsigned int len = strlen(buf);
74948+
74949+ 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));
74950+ }
74951+
74952+ printk("%s\n", buf);
74953+
74954+ return;
74955+}
74956+
74957+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
74958+{
74959+ int logtype;
74960+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
74961+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
74962+ void *voidptr = NULL;
74963+ int num1 = 0, num2 = 0;
74964+ unsigned long ulong1 = 0, ulong2 = 0;
74965+ struct dentry *dentry = NULL;
74966+ struct vfsmount *mnt = NULL;
74967+ struct file *file = NULL;
74968+ struct task_struct *task = NULL;
74969+ struct vm_area_struct *vma = NULL;
74970+ const struct cred *cred, *pcred;
74971+ va_list ap;
74972+
74973+ BEGIN_LOCKS(audit);
74974+ logtype = gr_log_start(audit);
74975+ if (logtype == FLOODING) {
74976+ END_LOCKS(audit);
74977+ return;
74978+ }
74979+ va_start(ap, argtypes);
74980+ switch (argtypes) {
74981+ case GR_TTYSNIFF:
74982+ task = va_arg(ap, struct task_struct *);
74983+ 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));
74984+ break;
74985+ case GR_SYSCTL_HIDDEN:
74986+ str1 = va_arg(ap, char *);
74987+ gr_log_middle_varargs(audit, msg, result, str1);
74988+ break;
74989+ case GR_RBAC:
74990+ dentry = va_arg(ap, struct dentry *);
74991+ mnt = va_arg(ap, struct vfsmount *);
74992+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
74993+ break;
74994+ case GR_RBAC_STR:
74995+ dentry = va_arg(ap, struct dentry *);
74996+ mnt = va_arg(ap, struct vfsmount *);
74997+ str1 = va_arg(ap, char *);
74998+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
74999+ break;
75000+ case GR_STR_RBAC:
75001+ str1 = va_arg(ap, char *);
75002+ dentry = va_arg(ap, struct dentry *);
75003+ mnt = va_arg(ap, struct vfsmount *);
75004+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
75005+ break;
75006+ case GR_RBAC_MODE2:
75007+ dentry = va_arg(ap, struct dentry *);
75008+ mnt = va_arg(ap, struct vfsmount *);
75009+ str1 = va_arg(ap, char *);
75010+ str2 = va_arg(ap, char *);
75011+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
75012+ break;
75013+ case GR_RBAC_MODE3:
75014+ dentry = va_arg(ap, struct dentry *);
75015+ mnt = va_arg(ap, struct vfsmount *);
75016+ str1 = va_arg(ap, char *);
75017+ str2 = va_arg(ap, char *);
75018+ str3 = va_arg(ap, char *);
75019+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
75020+ break;
75021+ case GR_FILENAME:
75022+ dentry = va_arg(ap, struct dentry *);
75023+ mnt = va_arg(ap, struct vfsmount *);
75024+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
75025+ break;
75026+ case GR_STR_FILENAME:
75027+ str1 = va_arg(ap, char *);
75028+ dentry = va_arg(ap, struct dentry *);
75029+ mnt = va_arg(ap, struct vfsmount *);
75030+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
75031+ break;
75032+ case GR_FILENAME_STR:
75033+ dentry = va_arg(ap, struct dentry *);
75034+ mnt = va_arg(ap, struct vfsmount *);
75035+ str1 = va_arg(ap, char *);
75036+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
75037+ break;
75038+ case GR_FILENAME_TWO_INT:
75039+ dentry = va_arg(ap, struct dentry *);
75040+ mnt = va_arg(ap, struct vfsmount *);
75041+ num1 = va_arg(ap, int);
75042+ num2 = va_arg(ap, int);
75043+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
75044+ break;
75045+ case GR_FILENAME_TWO_INT_STR:
75046+ dentry = va_arg(ap, struct dentry *);
75047+ mnt = va_arg(ap, struct vfsmount *);
75048+ num1 = va_arg(ap, int);
75049+ num2 = va_arg(ap, int);
75050+ str1 = va_arg(ap, char *);
75051+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
75052+ break;
75053+ case GR_TEXTREL:
75054+ file = va_arg(ap, struct file *);
75055+ ulong1 = va_arg(ap, unsigned long);
75056+ ulong2 = va_arg(ap, unsigned long);
75057+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
75058+ break;
75059+ case GR_PTRACE:
75060+ task = va_arg(ap, struct task_struct *);
75061+ 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));
75062+ break;
75063+ case GR_RESOURCE:
75064+ task = va_arg(ap, struct task_struct *);
75065+ cred = __task_cred(task);
75066+ pcred = __task_cred(task->real_parent);
75067+ ulong1 = va_arg(ap, unsigned long);
75068+ str1 = va_arg(ap, char *);
75069+ ulong2 = va_arg(ap, unsigned long);
75070+ 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));
75071+ break;
75072+ case GR_CAP:
75073+ task = va_arg(ap, struct task_struct *);
75074+ cred = __task_cred(task);
75075+ pcred = __task_cred(task->real_parent);
75076+ str1 = va_arg(ap, char *);
75077+ 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));
75078+ break;
75079+ case GR_SIG:
75080+ str1 = va_arg(ap, char *);
75081+ voidptr = va_arg(ap, void *);
75082+ gr_log_middle_varargs(audit, msg, str1, voidptr);
75083+ break;
75084+ case GR_SIG2:
75085+ task = va_arg(ap, struct task_struct *);
75086+ cred = __task_cred(task);
75087+ pcred = __task_cred(task->real_parent);
75088+ num1 = va_arg(ap, int);
75089+ 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));
75090+ break;
75091+ case GR_CRASH1:
75092+ task = va_arg(ap, struct task_struct *);
75093+ cred = __task_cred(task);
75094+ pcred = __task_cred(task->real_parent);
75095+ ulong1 = va_arg(ap, unsigned long);
75096+ 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);
75097+ break;
75098+ case GR_CRASH2:
75099+ task = va_arg(ap, struct task_struct *);
75100+ cred = __task_cred(task);
75101+ pcred = __task_cred(task->real_parent);
75102+ ulong1 = va_arg(ap, unsigned long);
75103+ 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);
75104+ break;
75105+ case GR_RWXMAP:
75106+ file = va_arg(ap, struct file *);
75107+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
75108+ break;
75109+ case GR_RWXMAPVMA:
75110+ vma = va_arg(ap, struct vm_area_struct *);
75111+ if (vma->vm_file)
75112+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
75113+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75114+ str1 = "<stack>";
75115+ else if (vma->vm_start <= current->mm->brk &&
75116+ vma->vm_end >= current->mm->start_brk)
75117+ str1 = "<heap>";
75118+ else
75119+ str1 = "<anonymous mapping>";
75120+ gr_log_middle_varargs(audit, msg, str1);
75121+ break;
75122+ case GR_PSACCT:
75123+ {
75124+ unsigned int wday, cday;
75125+ __u8 whr, chr;
75126+ __u8 wmin, cmin;
75127+ __u8 wsec, csec;
75128+ char cur_tty[64] = { 0 };
75129+ char parent_tty[64] = { 0 };
75130+
75131+ task = va_arg(ap, struct task_struct *);
75132+ wday = va_arg(ap, unsigned int);
75133+ cday = va_arg(ap, unsigned int);
75134+ whr = va_arg(ap, int);
75135+ chr = va_arg(ap, int);
75136+ wmin = va_arg(ap, int);
75137+ cmin = va_arg(ap, int);
75138+ wsec = va_arg(ap, int);
75139+ csec = va_arg(ap, int);
75140+ ulong1 = va_arg(ap, unsigned long);
75141+ cred = __task_cred(task);
75142+ pcred = __task_cred(task->real_parent);
75143+
75144+ 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));
75145+ }
75146+ break;
75147+ default:
75148+ gr_log_middle(audit, msg, ap);
75149+ }
75150+ va_end(ap);
75151+ // these don't need DEFAULTSECARGS printed on the end
75152+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
75153+ gr_log_end(audit, 0);
75154+ else
75155+ gr_log_end(audit, 1);
75156+ END_LOCKS(audit);
75157+}
75158diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
75159new file mode 100644
75160index 0000000..0e39d8c
75161--- /dev/null
75162+++ b/grsecurity/grsec_mem.c
75163@@ -0,0 +1,48 @@
75164+#include <linux/kernel.h>
75165+#include <linux/sched.h>
75166+#include <linux/mm.h>
75167+#include <linux/mman.h>
75168+#include <linux/module.h>
75169+#include <linux/grinternal.h>
75170+
75171+void gr_handle_msr_write(void)
75172+{
75173+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
75174+ return;
75175+}
75176+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
75177+
75178+void
75179+gr_handle_ioperm(void)
75180+{
75181+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
75182+ return;
75183+}
75184+
75185+void
75186+gr_handle_iopl(void)
75187+{
75188+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
75189+ return;
75190+}
75191+
75192+void
75193+gr_handle_mem_readwrite(u64 from, u64 to)
75194+{
75195+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
75196+ return;
75197+}
75198+
75199+void
75200+gr_handle_vm86(void)
75201+{
75202+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
75203+ return;
75204+}
75205+
75206+void
75207+gr_log_badprocpid(const char *entry)
75208+{
75209+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
75210+ return;
75211+}
75212diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
75213new file mode 100644
75214index 0000000..cd9e124
75215--- /dev/null
75216+++ b/grsecurity/grsec_mount.c
75217@@ -0,0 +1,65 @@
75218+#include <linux/kernel.h>
75219+#include <linux/sched.h>
75220+#include <linux/mount.h>
75221+#include <linux/major.h>
75222+#include <linux/grsecurity.h>
75223+#include <linux/grinternal.h>
75224+
75225+void
75226+gr_log_remount(const char *devname, const int retval)
75227+{
75228+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75229+ if (grsec_enable_mount && (retval >= 0))
75230+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
75231+#endif
75232+ return;
75233+}
75234+
75235+void
75236+gr_log_unmount(const char *devname, const int retval)
75237+{
75238+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75239+ if (grsec_enable_mount && (retval >= 0))
75240+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
75241+#endif
75242+ return;
75243+}
75244+
75245+void
75246+gr_log_mount(const char *from, const char *to, const int retval)
75247+{
75248+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
75249+ if (grsec_enable_mount && (retval >= 0))
75250+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
75251+#endif
75252+ return;
75253+}
75254+
75255+int
75256+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
75257+{
75258+#ifdef CONFIG_GRKERNSEC_ROFS
75259+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
75260+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
75261+ return -EPERM;
75262+ } else
75263+ return 0;
75264+#endif
75265+ return 0;
75266+}
75267+
75268+int
75269+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
75270+{
75271+#ifdef CONFIG_GRKERNSEC_ROFS
75272+ struct inode *inode = dentry->d_inode;
75273+
75274+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
75275+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
75276+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
75277+ return -EPERM;
75278+ } else
75279+ return 0;
75280+#endif
75281+ return 0;
75282+}
75283diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
75284new file mode 100644
75285index 0000000..6ee9d50
75286--- /dev/null
75287+++ b/grsecurity/grsec_pax.c
75288@@ -0,0 +1,45 @@
75289+#include <linux/kernel.h>
75290+#include <linux/sched.h>
75291+#include <linux/mm.h>
75292+#include <linux/file.h>
75293+#include <linux/grinternal.h>
75294+#include <linux/grsecurity.h>
75295+
75296+void
75297+gr_log_textrel(struct vm_area_struct * vma)
75298+{
75299+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75300+ if (grsec_enable_log_rwxmaps)
75301+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
75302+#endif
75303+ return;
75304+}
75305+
75306+void gr_log_ptgnustack(struct file *file)
75307+{
75308+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75309+ if (grsec_enable_log_rwxmaps)
75310+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
75311+#endif
75312+ return;
75313+}
75314+
75315+void
75316+gr_log_rwxmmap(struct file *file)
75317+{
75318+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75319+ if (grsec_enable_log_rwxmaps)
75320+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
75321+#endif
75322+ return;
75323+}
75324+
75325+void
75326+gr_log_rwxmprotect(struct vm_area_struct *vma)
75327+{
75328+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
75329+ if (grsec_enable_log_rwxmaps)
75330+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
75331+#endif
75332+ return;
75333+}
75334diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
75335new file mode 100644
75336index 0000000..2005a3a
75337--- /dev/null
75338+++ b/grsecurity/grsec_proc.c
75339@@ -0,0 +1,20 @@
75340+#include <linux/kernel.h>
75341+#include <linux/sched.h>
75342+#include <linux/grsecurity.h>
75343+#include <linux/grinternal.h>
75344+
75345+int gr_proc_is_restricted(void)
75346+{
75347+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75348+ const struct cred *cred = current_cred();
75349+#endif
75350+
75351+#ifdef CONFIG_GRKERNSEC_PROC_USER
75352+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
75353+ return -EACCES;
75354+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75355+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
75356+ return -EACCES;
75357+#endif
75358+ return 0;
75359+}
75360diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
75361new file mode 100644
75362index 0000000..f7f29aa
75363--- /dev/null
75364+++ b/grsecurity/grsec_ptrace.c
75365@@ -0,0 +1,30 @@
75366+#include <linux/kernel.h>
75367+#include <linux/sched.h>
75368+#include <linux/grinternal.h>
75369+#include <linux/security.h>
75370+
75371+void
75372+gr_audit_ptrace(struct task_struct *task)
75373+{
75374+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
75375+ if (grsec_enable_audit_ptrace)
75376+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
75377+#endif
75378+ return;
75379+}
75380+
75381+int
75382+gr_ptrace_readexec(struct file *file, int unsafe_flags)
75383+{
75384+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
75385+ const struct dentry *dentry = file->f_path.dentry;
75386+ const struct vfsmount *mnt = file->f_path.mnt;
75387+
75388+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
75389+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
75390+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
75391+ return -EACCES;
75392+ }
75393+#endif
75394+ return 0;
75395+}
75396diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
75397new file mode 100644
75398index 0000000..3860c7e
75399--- /dev/null
75400+++ b/grsecurity/grsec_sig.c
75401@@ -0,0 +1,236 @@
75402+#include <linux/kernel.h>
75403+#include <linux/sched.h>
75404+#include <linux/fs.h>
75405+#include <linux/delay.h>
75406+#include <linux/grsecurity.h>
75407+#include <linux/grinternal.h>
75408+#include <linux/hardirq.h>
75409+
75410+char *signames[] = {
75411+ [SIGSEGV] = "Segmentation fault",
75412+ [SIGILL] = "Illegal instruction",
75413+ [SIGABRT] = "Abort",
75414+ [SIGBUS] = "Invalid alignment/Bus error"
75415+};
75416+
75417+void
75418+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
75419+{
75420+#ifdef CONFIG_GRKERNSEC_SIGNAL
75421+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
75422+ (sig == SIGABRT) || (sig == SIGBUS))) {
75423+ if (task_pid_nr(t) == task_pid_nr(current)) {
75424+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
75425+ } else {
75426+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
75427+ }
75428+ }
75429+#endif
75430+ return;
75431+}
75432+
75433+int
75434+gr_handle_signal(const struct task_struct *p, const int sig)
75435+{
75436+#ifdef CONFIG_GRKERNSEC
75437+ /* ignore the 0 signal for protected task checks */
75438+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
75439+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
75440+ return -EPERM;
75441+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
75442+ return -EPERM;
75443+ }
75444+#endif
75445+ return 0;
75446+}
75447+
75448+#ifdef CONFIG_GRKERNSEC
75449+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
75450+
75451+int gr_fake_force_sig(int sig, struct task_struct *t)
75452+{
75453+ unsigned long int flags;
75454+ int ret, blocked, ignored;
75455+ struct k_sigaction *action;
75456+
75457+ spin_lock_irqsave(&t->sighand->siglock, flags);
75458+ action = &t->sighand->action[sig-1];
75459+ ignored = action->sa.sa_handler == SIG_IGN;
75460+ blocked = sigismember(&t->blocked, sig);
75461+ if (blocked || ignored) {
75462+ action->sa.sa_handler = SIG_DFL;
75463+ if (blocked) {
75464+ sigdelset(&t->blocked, sig);
75465+ recalc_sigpending_and_wake(t);
75466+ }
75467+ }
75468+ if (action->sa.sa_handler == SIG_DFL)
75469+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
75470+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
75471+
75472+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
75473+
75474+ return ret;
75475+}
75476+#endif
75477+
75478+#define GR_USER_BAN_TIME (15 * 60)
75479+#define GR_DAEMON_BRUTE_TIME (30 * 60)
75480+
75481+void gr_handle_brute_attach(int dumpable)
75482+{
75483+#ifdef CONFIG_GRKERNSEC_BRUTE
75484+ struct task_struct *p = current;
75485+ kuid_t uid = GLOBAL_ROOT_UID;
75486+ int daemon = 0;
75487+
75488+ if (!grsec_enable_brute)
75489+ return;
75490+
75491+ rcu_read_lock();
75492+ read_lock(&tasklist_lock);
75493+ read_lock(&grsec_exec_file_lock);
75494+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
75495+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
75496+ p->real_parent->brute = 1;
75497+ daemon = 1;
75498+ } else {
75499+ const struct cred *cred = __task_cred(p), *cred2;
75500+ struct task_struct *tsk, *tsk2;
75501+
75502+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
75503+ struct user_struct *user;
75504+
75505+ uid = cred->uid;
75506+
75507+ /* this is put upon execution past expiration */
75508+ user = find_user(uid);
75509+ if (user == NULL)
75510+ goto unlock;
75511+ user->suid_banned = 1;
75512+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
75513+ if (user->suid_ban_expires == ~0UL)
75514+ user->suid_ban_expires--;
75515+
75516+ /* only kill other threads of the same binary, from the same user */
75517+ do_each_thread(tsk2, tsk) {
75518+ cred2 = __task_cred(tsk);
75519+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
75520+ gr_fake_force_sig(SIGKILL, tsk);
75521+ } while_each_thread(tsk2, tsk);
75522+ }
75523+ }
75524+unlock:
75525+ read_unlock(&grsec_exec_file_lock);
75526+ read_unlock(&tasklist_lock);
75527+ rcu_read_unlock();
75528+
75529+ if (gr_is_global_nonroot(uid))
75530+ 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);
75531+ else if (daemon)
75532+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
75533+
75534+#endif
75535+ return;
75536+}
75537+
75538+void gr_handle_brute_check(void)
75539+{
75540+#ifdef CONFIG_GRKERNSEC_BRUTE
75541+ struct task_struct *p = current;
75542+
75543+ if (unlikely(p->brute)) {
75544+ if (!grsec_enable_brute)
75545+ p->brute = 0;
75546+ else if (time_before(get_seconds(), p->brute_expires))
75547+ msleep(30 * 1000);
75548+ }
75549+#endif
75550+ return;
75551+}
75552+
75553+void gr_handle_kernel_exploit(void)
75554+{
75555+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75556+ const struct cred *cred;
75557+ struct task_struct *tsk, *tsk2;
75558+ struct user_struct *user;
75559+ kuid_t uid;
75560+
75561+ if (in_irq() || in_serving_softirq() || in_nmi())
75562+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
75563+
75564+ uid = current_uid();
75565+
75566+ if (gr_is_global_root(uid))
75567+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
75568+ else {
75569+ /* kill all the processes of this user, hold a reference
75570+ to their creds struct, and prevent them from creating
75571+ another process until system reset
75572+ */
75573+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
75574+ GR_GLOBAL_UID(uid));
75575+ /* we intentionally leak this ref */
75576+ user = get_uid(current->cred->user);
75577+ if (user)
75578+ user->kernel_banned = 1;
75579+
75580+ /* kill all processes of this user */
75581+ read_lock(&tasklist_lock);
75582+ do_each_thread(tsk2, tsk) {
75583+ cred = __task_cred(tsk);
75584+ if (uid_eq(cred->uid, uid))
75585+ gr_fake_force_sig(SIGKILL, tsk);
75586+ } while_each_thread(tsk2, tsk);
75587+ read_unlock(&tasklist_lock);
75588+ }
75589+#endif
75590+}
75591+
75592+#ifdef CONFIG_GRKERNSEC_BRUTE
75593+static bool suid_ban_expired(struct user_struct *user)
75594+{
75595+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
75596+ user->suid_banned = 0;
75597+ user->suid_ban_expires = 0;
75598+ free_uid(user);
75599+ return true;
75600+ }
75601+
75602+ return false;
75603+}
75604+#endif
75605+
75606+int gr_process_kernel_exec_ban(void)
75607+{
75608+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75609+ if (unlikely(current->cred->user->kernel_banned))
75610+ return -EPERM;
75611+#endif
75612+ return 0;
75613+}
75614+
75615+int gr_process_kernel_setuid_ban(struct user_struct *user)
75616+{
75617+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
75618+ if (unlikely(user->kernel_banned))
75619+ gr_fake_force_sig(SIGKILL, current);
75620+#endif
75621+ return 0;
75622+}
75623+
75624+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
75625+{
75626+#ifdef CONFIG_GRKERNSEC_BRUTE
75627+ struct user_struct *user = current->cred->user;
75628+ if (unlikely(user->suid_banned)) {
75629+ if (suid_ban_expired(user))
75630+ return 0;
75631+ /* disallow execution of suid binaries only */
75632+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
75633+ return -EPERM;
75634+ }
75635+#endif
75636+ return 0;
75637+}
75638diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
75639new file mode 100644
75640index 0000000..c0aef3a
75641--- /dev/null
75642+++ b/grsecurity/grsec_sock.c
75643@@ -0,0 +1,244 @@
75644+#include <linux/kernel.h>
75645+#include <linux/module.h>
75646+#include <linux/sched.h>
75647+#include <linux/file.h>
75648+#include <linux/net.h>
75649+#include <linux/in.h>
75650+#include <linux/ip.h>
75651+#include <net/sock.h>
75652+#include <net/inet_sock.h>
75653+#include <linux/grsecurity.h>
75654+#include <linux/grinternal.h>
75655+#include <linux/gracl.h>
75656+
75657+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
75658+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
75659+
75660+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
75661+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
75662+
75663+#ifdef CONFIG_UNIX_MODULE
75664+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
75665+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
75666+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
75667+EXPORT_SYMBOL_GPL(gr_handle_create);
75668+#endif
75669+
75670+#ifdef CONFIG_GRKERNSEC
75671+#define gr_conn_table_size 32749
75672+struct conn_table_entry {
75673+ struct conn_table_entry *next;
75674+ struct signal_struct *sig;
75675+};
75676+
75677+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
75678+DEFINE_SPINLOCK(gr_conn_table_lock);
75679+
75680+extern const char * gr_socktype_to_name(unsigned char type);
75681+extern const char * gr_proto_to_name(unsigned char proto);
75682+extern const char * gr_sockfamily_to_name(unsigned char family);
75683+
75684+static __inline__ int
75685+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
75686+{
75687+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
75688+}
75689+
75690+static __inline__ int
75691+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
75692+ __u16 sport, __u16 dport)
75693+{
75694+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
75695+ sig->gr_sport == sport && sig->gr_dport == dport))
75696+ return 1;
75697+ else
75698+ return 0;
75699+}
75700+
75701+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
75702+{
75703+ struct conn_table_entry **match;
75704+ unsigned int index;
75705+
75706+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
75707+ sig->gr_sport, sig->gr_dport,
75708+ gr_conn_table_size);
75709+
75710+ newent->sig = sig;
75711+
75712+ match = &gr_conn_table[index];
75713+ newent->next = *match;
75714+ *match = newent;
75715+
75716+ return;
75717+}
75718+
75719+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
75720+{
75721+ struct conn_table_entry *match, *last = NULL;
75722+ unsigned int index;
75723+
75724+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
75725+ sig->gr_sport, sig->gr_dport,
75726+ gr_conn_table_size);
75727+
75728+ match = gr_conn_table[index];
75729+ while (match && !conn_match(match->sig,
75730+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
75731+ sig->gr_dport)) {
75732+ last = match;
75733+ match = match->next;
75734+ }
75735+
75736+ if (match) {
75737+ if (last)
75738+ last->next = match->next;
75739+ else
75740+ gr_conn_table[index] = NULL;
75741+ kfree(match);
75742+ }
75743+
75744+ return;
75745+}
75746+
75747+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
75748+ __u16 sport, __u16 dport)
75749+{
75750+ struct conn_table_entry *match;
75751+ unsigned int index;
75752+
75753+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
75754+
75755+ match = gr_conn_table[index];
75756+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
75757+ match = match->next;
75758+
75759+ if (match)
75760+ return match->sig;
75761+ else
75762+ return NULL;
75763+}
75764+
75765+#endif
75766+
75767+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
75768+{
75769+#ifdef CONFIG_GRKERNSEC
75770+ struct signal_struct *sig = task->signal;
75771+ struct conn_table_entry *newent;
75772+
75773+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
75774+ if (newent == NULL)
75775+ return;
75776+ /* no bh lock needed since we are called with bh disabled */
75777+ spin_lock(&gr_conn_table_lock);
75778+ gr_del_task_from_ip_table_nolock(sig);
75779+ sig->gr_saddr = inet->inet_rcv_saddr;
75780+ sig->gr_daddr = inet->inet_daddr;
75781+ sig->gr_sport = inet->inet_sport;
75782+ sig->gr_dport = inet->inet_dport;
75783+ gr_add_to_task_ip_table_nolock(sig, newent);
75784+ spin_unlock(&gr_conn_table_lock);
75785+#endif
75786+ return;
75787+}
75788+
75789+void gr_del_task_from_ip_table(struct task_struct *task)
75790+{
75791+#ifdef CONFIG_GRKERNSEC
75792+ spin_lock_bh(&gr_conn_table_lock);
75793+ gr_del_task_from_ip_table_nolock(task->signal);
75794+ spin_unlock_bh(&gr_conn_table_lock);
75795+#endif
75796+ return;
75797+}
75798+
75799+void
75800+gr_attach_curr_ip(const struct sock *sk)
75801+{
75802+#ifdef CONFIG_GRKERNSEC
75803+ struct signal_struct *p, *set;
75804+ const struct inet_sock *inet = inet_sk(sk);
75805+
75806+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
75807+ return;
75808+
75809+ set = current->signal;
75810+
75811+ spin_lock_bh(&gr_conn_table_lock);
75812+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
75813+ inet->inet_dport, inet->inet_sport);
75814+ if (unlikely(p != NULL)) {
75815+ set->curr_ip = p->curr_ip;
75816+ set->used_accept = 1;
75817+ gr_del_task_from_ip_table_nolock(p);
75818+ spin_unlock_bh(&gr_conn_table_lock);
75819+ return;
75820+ }
75821+ spin_unlock_bh(&gr_conn_table_lock);
75822+
75823+ set->curr_ip = inet->inet_daddr;
75824+ set->used_accept = 1;
75825+#endif
75826+ return;
75827+}
75828+
75829+int
75830+gr_handle_sock_all(const int family, const int type, const int protocol)
75831+{
75832+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
75833+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
75834+ (family != AF_UNIX)) {
75835+ if (family == AF_INET)
75836+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
75837+ else
75838+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
75839+ return -EACCES;
75840+ }
75841+#endif
75842+ return 0;
75843+}
75844+
75845+int
75846+gr_handle_sock_server(const struct sockaddr *sck)
75847+{
75848+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
75849+ if (grsec_enable_socket_server &&
75850+ in_group_p(grsec_socket_server_gid) &&
75851+ sck && (sck->sa_family != AF_UNIX) &&
75852+ (sck->sa_family != AF_LOCAL)) {
75853+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
75854+ return -EACCES;
75855+ }
75856+#endif
75857+ return 0;
75858+}
75859+
75860+int
75861+gr_handle_sock_server_other(const struct sock *sck)
75862+{
75863+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
75864+ if (grsec_enable_socket_server &&
75865+ in_group_p(grsec_socket_server_gid) &&
75866+ sck && (sck->sk_family != AF_UNIX) &&
75867+ (sck->sk_family != AF_LOCAL)) {
75868+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
75869+ return -EACCES;
75870+ }
75871+#endif
75872+ return 0;
75873+}
75874+
75875+int
75876+gr_handle_sock_client(const struct sockaddr *sck)
75877+{
75878+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
75879+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
75880+ sck && (sck->sa_family != AF_UNIX) &&
75881+ (sck->sa_family != AF_LOCAL)) {
75882+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
75883+ return -EACCES;
75884+ }
75885+#endif
75886+ return 0;
75887+}
75888diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
75889new file mode 100644
75890index 0000000..8159888
75891--- /dev/null
75892+++ b/grsecurity/grsec_sysctl.c
75893@@ -0,0 +1,479 @@
75894+#include <linux/kernel.h>
75895+#include <linux/sched.h>
75896+#include <linux/sysctl.h>
75897+#include <linux/grsecurity.h>
75898+#include <linux/grinternal.h>
75899+
75900+int
75901+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
75902+{
75903+#ifdef CONFIG_GRKERNSEC_SYSCTL
75904+ if (dirname == NULL || name == NULL)
75905+ return 0;
75906+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
75907+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
75908+ return -EACCES;
75909+ }
75910+#endif
75911+ return 0;
75912+}
75913+
75914+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
75915+static int __maybe_unused __read_only one = 1;
75916+#endif
75917+
75918+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
75919+ defined(CONFIG_GRKERNSEC_DENYUSB)
75920+struct ctl_table grsecurity_table[] = {
75921+#ifdef CONFIG_GRKERNSEC_SYSCTL
75922+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
75923+#ifdef CONFIG_GRKERNSEC_IO
75924+ {
75925+ .procname = "disable_priv_io",
75926+ .data = &grsec_disable_privio,
75927+ .maxlen = sizeof(int),
75928+ .mode = 0600,
75929+ .proc_handler = &proc_dointvec,
75930+ },
75931+#endif
75932+#endif
75933+#ifdef CONFIG_GRKERNSEC_LINK
75934+ {
75935+ .procname = "linking_restrictions",
75936+ .data = &grsec_enable_link,
75937+ .maxlen = sizeof(int),
75938+ .mode = 0600,
75939+ .proc_handler = &proc_dointvec,
75940+ },
75941+#endif
75942+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
75943+ {
75944+ .procname = "enforce_symlinksifowner",
75945+ .data = &grsec_enable_symlinkown,
75946+ .maxlen = sizeof(int),
75947+ .mode = 0600,
75948+ .proc_handler = &proc_dointvec,
75949+ },
75950+ {
75951+ .procname = "symlinkown_gid",
75952+ .data = &grsec_symlinkown_gid,
75953+ .maxlen = sizeof(int),
75954+ .mode = 0600,
75955+ .proc_handler = &proc_dointvec,
75956+ },
75957+#endif
75958+#ifdef CONFIG_GRKERNSEC_BRUTE
75959+ {
75960+ .procname = "deter_bruteforce",
75961+ .data = &grsec_enable_brute,
75962+ .maxlen = sizeof(int),
75963+ .mode = 0600,
75964+ .proc_handler = &proc_dointvec,
75965+ },
75966+#endif
75967+#ifdef CONFIG_GRKERNSEC_FIFO
75968+ {
75969+ .procname = "fifo_restrictions",
75970+ .data = &grsec_enable_fifo,
75971+ .maxlen = sizeof(int),
75972+ .mode = 0600,
75973+ .proc_handler = &proc_dointvec,
75974+ },
75975+#endif
75976+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
75977+ {
75978+ .procname = "ptrace_readexec",
75979+ .data = &grsec_enable_ptrace_readexec,
75980+ .maxlen = sizeof(int),
75981+ .mode = 0600,
75982+ .proc_handler = &proc_dointvec,
75983+ },
75984+#endif
75985+#ifdef CONFIG_GRKERNSEC_SETXID
75986+ {
75987+ .procname = "consistent_setxid",
75988+ .data = &grsec_enable_setxid,
75989+ .maxlen = sizeof(int),
75990+ .mode = 0600,
75991+ .proc_handler = &proc_dointvec,
75992+ },
75993+#endif
75994+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
75995+ {
75996+ .procname = "ip_blackhole",
75997+ .data = &grsec_enable_blackhole,
75998+ .maxlen = sizeof(int),
75999+ .mode = 0600,
76000+ .proc_handler = &proc_dointvec,
76001+ },
76002+ {
76003+ .procname = "lastack_retries",
76004+ .data = &grsec_lastack_retries,
76005+ .maxlen = sizeof(int),
76006+ .mode = 0600,
76007+ .proc_handler = &proc_dointvec,
76008+ },
76009+#endif
76010+#ifdef CONFIG_GRKERNSEC_EXECLOG
76011+ {
76012+ .procname = "exec_logging",
76013+ .data = &grsec_enable_execlog,
76014+ .maxlen = sizeof(int),
76015+ .mode = 0600,
76016+ .proc_handler = &proc_dointvec,
76017+ },
76018+#endif
76019+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
76020+ {
76021+ .procname = "rwxmap_logging",
76022+ .data = &grsec_enable_log_rwxmaps,
76023+ .maxlen = sizeof(int),
76024+ .mode = 0600,
76025+ .proc_handler = &proc_dointvec,
76026+ },
76027+#endif
76028+#ifdef CONFIG_GRKERNSEC_SIGNAL
76029+ {
76030+ .procname = "signal_logging",
76031+ .data = &grsec_enable_signal,
76032+ .maxlen = sizeof(int),
76033+ .mode = 0600,
76034+ .proc_handler = &proc_dointvec,
76035+ },
76036+#endif
76037+#ifdef CONFIG_GRKERNSEC_FORKFAIL
76038+ {
76039+ .procname = "forkfail_logging",
76040+ .data = &grsec_enable_forkfail,
76041+ .maxlen = sizeof(int),
76042+ .mode = 0600,
76043+ .proc_handler = &proc_dointvec,
76044+ },
76045+#endif
76046+#ifdef CONFIG_GRKERNSEC_TIME
76047+ {
76048+ .procname = "timechange_logging",
76049+ .data = &grsec_enable_time,
76050+ .maxlen = sizeof(int),
76051+ .mode = 0600,
76052+ .proc_handler = &proc_dointvec,
76053+ },
76054+#endif
76055+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76056+ {
76057+ .procname = "chroot_deny_shmat",
76058+ .data = &grsec_enable_chroot_shmat,
76059+ .maxlen = sizeof(int),
76060+ .mode = 0600,
76061+ .proc_handler = &proc_dointvec,
76062+ },
76063+#endif
76064+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76065+ {
76066+ .procname = "chroot_deny_unix",
76067+ .data = &grsec_enable_chroot_unix,
76068+ .maxlen = sizeof(int),
76069+ .mode = 0600,
76070+ .proc_handler = &proc_dointvec,
76071+ },
76072+#endif
76073+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76074+ {
76075+ .procname = "chroot_deny_mount",
76076+ .data = &grsec_enable_chroot_mount,
76077+ .maxlen = sizeof(int),
76078+ .mode = 0600,
76079+ .proc_handler = &proc_dointvec,
76080+ },
76081+#endif
76082+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76083+ {
76084+ .procname = "chroot_deny_fchdir",
76085+ .data = &grsec_enable_chroot_fchdir,
76086+ .maxlen = sizeof(int),
76087+ .mode = 0600,
76088+ .proc_handler = &proc_dointvec,
76089+ },
76090+#endif
76091+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76092+ {
76093+ .procname = "chroot_deny_chroot",
76094+ .data = &grsec_enable_chroot_double,
76095+ .maxlen = sizeof(int),
76096+ .mode = 0600,
76097+ .proc_handler = &proc_dointvec,
76098+ },
76099+#endif
76100+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76101+ {
76102+ .procname = "chroot_deny_pivot",
76103+ .data = &grsec_enable_chroot_pivot,
76104+ .maxlen = sizeof(int),
76105+ .mode = 0600,
76106+ .proc_handler = &proc_dointvec,
76107+ },
76108+#endif
76109+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76110+ {
76111+ .procname = "chroot_enforce_chdir",
76112+ .data = &grsec_enable_chroot_chdir,
76113+ .maxlen = sizeof(int),
76114+ .mode = 0600,
76115+ .proc_handler = &proc_dointvec,
76116+ },
76117+#endif
76118+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76119+ {
76120+ .procname = "chroot_deny_chmod",
76121+ .data = &grsec_enable_chroot_chmod,
76122+ .maxlen = sizeof(int),
76123+ .mode = 0600,
76124+ .proc_handler = &proc_dointvec,
76125+ },
76126+#endif
76127+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76128+ {
76129+ .procname = "chroot_deny_mknod",
76130+ .data = &grsec_enable_chroot_mknod,
76131+ .maxlen = sizeof(int),
76132+ .mode = 0600,
76133+ .proc_handler = &proc_dointvec,
76134+ },
76135+#endif
76136+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76137+ {
76138+ .procname = "chroot_restrict_nice",
76139+ .data = &grsec_enable_chroot_nice,
76140+ .maxlen = sizeof(int),
76141+ .mode = 0600,
76142+ .proc_handler = &proc_dointvec,
76143+ },
76144+#endif
76145+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76146+ {
76147+ .procname = "chroot_execlog",
76148+ .data = &grsec_enable_chroot_execlog,
76149+ .maxlen = sizeof(int),
76150+ .mode = 0600,
76151+ .proc_handler = &proc_dointvec,
76152+ },
76153+#endif
76154+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76155+ {
76156+ .procname = "chroot_caps",
76157+ .data = &grsec_enable_chroot_caps,
76158+ .maxlen = sizeof(int),
76159+ .mode = 0600,
76160+ .proc_handler = &proc_dointvec,
76161+ },
76162+#endif
76163+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76164+ {
76165+ .procname = "chroot_deny_sysctl",
76166+ .data = &grsec_enable_chroot_sysctl,
76167+ .maxlen = sizeof(int),
76168+ .mode = 0600,
76169+ .proc_handler = &proc_dointvec,
76170+ },
76171+#endif
76172+#ifdef CONFIG_GRKERNSEC_TPE
76173+ {
76174+ .procname = "tpe",
76175+ .data = &grsec_enable_tpe,
76176+ .maxlen = sizeof(int),
76177+ .mode = 0600,
76178+ .proc_handler = &proc_dointvec,
76179+ },
76180+ {
76181+ .procname = "tpe_gid",
76182+ .data = &grsec_tpe_gid,
76183+ .maxlen = sizeof(int),
76184+ .mode = 0600,
76185+ .proc_handler = &proc_dointvec,
76186+ },
76187+#endif
76188+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76189+ {
76190+ .procname = "tpe_invert",
76191+ .data = &grsec_enable_tpe_invert,
76192+ .maxlen = sizeof(int),
76193+ .mode = 0600,
76194+ .proc_handler = &proc_dointvec,
76195+ },
76196+#endif
76197+#ifdef CONFIG_GRKERNSEC_TPE_ALL
76198+ {
76199+ .procname = "tpe_restrict_all",
76200+ .data = &grsec_enable_tpe_all,
76201+ .maxlen = sizeof(int),
76202+ .mode = 0600,
76203+ .proc_handler = &proc_dointvec,
76204+ },
76205+#endif
76206+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
76207+ {
76208+ .procname = "socket_all",
76209+ .data = &grsec_enable_socket_all,
76210+ .maxlen = sizeof(int),
76211+ .mode = 0600,
76212+ .proc_handler = &proc_dointvec,
76213+ },
76214+ {
76215+ .procname = "socket_all_gid",
76216+ .data = &grsec_socket_all_gid,
76217+ .maxlen = sizeof(int),
76218+ .mode = 0600,
76219+ .proc_handler = &proc_dointvec,
76220+ },
76221+#endif
76222+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
76223+ {
76224+ .procname = "socket_client",
76225+ .data = &grsec_enable_socket_client,
76226+ .maxlen = sizeof(int),
76227+ .mode = 0600,
76228+ .proc_handler = &proc_dointvec,
76229+ },
76230+ {
76231+ .procname = "socket_client_gid",
76232+ .data = &grsec_socket_client_gid,
76233+ .maxlen = sizeof(int),
76234+ .mode = 0600,
76235+ .proc_handler = &proc_dointvec,
76236+ },
76237+#endif
76238+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
76239+ {
76240+ .procname = "socket_server",
76241+ .data = &grsec_enable_socket_server,
76242+ .maxlen = sizeof(int),
76243+ .mode = 0600,
76244+ .proc_handler = &proc_dointvec,
76245+ },
76246+ {
76247+ .procname = "socket_server_gid",
76248+ .data = &grsec_socket_server_gid,
76249+ .maxlen = sizeof(int),
76250+ .mode = 0600,
76251+ .proc_handler = &proc_dointvec,
76252+ },
76253+#endif
76254+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76255+ {
76256+ .procname = "audit_group",
76257+ .data = &grsec_enable_group,
76258+ .maxlen = sizeof(int),
76259+ .mode = 0600,
76260+ .proc_handler = &proc_dointvec,
76261+ },
76262+ {
76263+ .procname = "audit_gid",
76264+ .data = &grsec_audit_gid,
76265+ .maxlen = sizeof(int),
76266+ .mode = 0600,
76267+ .proc_handler = &proc_dointvec,
76268+ },
76269+#endif
76270+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76271+ {
76272+ .procname = "audit_chdir",
76273+ .data = &grsec_enable_chdir,
76274+ .maxlen = sizeof(int),
76275+ .mode = 0600,
76276+ .proc_handler = &proc_dointvec,
76277+ },
76278+#endif
76279+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76280+ {
76281+ .procname = "audit_mount",
76282+ .data = &grsec_enable_mount,
76283+ .maxlen = sizeof(int),
76284+ .mode = 0600,
76285+ .proc_handler = &proc_dointvec,
76286+ },
76287+#endif
76288+#ifdef CONFIG_GRKERNSEC_DMESG
76289+ {
76290+ .procname = "dmesg",
76291+ .data = &grsec_enable_dmesg,
76292+ .maxlen = sizeof(int),
76293+ .mode = 0600,
76294+ .proc_handler = &proc_dointvec,
76295+ },
76296+#endif
76297+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76298+ {
76299+ .procname = "chroot_findtask",
76300+ .data = &grsec_enable_chroot_findtask,
76301+ .maxlen = sizeof(int),
76302+ .mode = 0600,
76303+ .proc_handler = &proc_dointvec,
76304+ },
76305+#endif
76306+#ifdef CONFIG_GRKERNSEC_RESLOG
76307+ {
76308+ .procname = "resource_logging",
76309+ .data = &grsec_resource_logging,
76310+ .maxlen = sizeof(int),
76311+ .mode = 0600,
76312+ .proc_handler = &proc_dointvec,
76313+ },
76314+#endif
76315+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
76316+ {
76317+ .procname = "audit_ptrace",
76318+ .data = &grsec_enable_audit_ptrace,
76319+ .maxlen = sizeof(int),
76320+ .mode = 0600,
76321+ .proc_handler = &proc_dointvec,
76322+ },
76323+#endif
76324+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76325+ {
76326+ .procname = "harden_ptrace",
76327+ .data = &grsec_enable_harden_ptrace,
76328+ .maxlen = sizeof(int),
76329+ .mode = 0600,
76330+ .proc_handler = &proc_dointvec,
76331+ },
76332+#endif
76333+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76334+ {
76335+ .procname = "harden_ipc",
76336+ .data = &grsec_enable_harden_ipc,
76337+ .maxlen = sizeof(int),
76338+ .mode = 0600,
76339+ .proc_handler = &proc_dointvec,
76340+ },
76341+#endif
76342+ {
76343+ .procname = "grsec_lock",
76344+ .data = &grsec_lock,
76345+ .maxlen = sizeof(int),
76346+ .mode = 0600,
76347+ .proc_handler = &proc_dointvec,
76348+ },
76349+#endif
76350+#ifdef CONFIG_GRKERNSEC_ROFS
76351+ {
76352+ .procname = "romount_protect",
76353+ .data = &grsec_enable_rofs,
76354+ .maxlen = sizeof(int),
76355+ .mode = 0600,
76356+ .proc_handler = &proc_dointvec_minmax,
76357+ .extra1 = &one,
76358+ .extra2 = &one,
76359+ },
76360+#endif
76361+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
76362+ {
76363+ .procname = "deny_new_usb",
76364+ .data = &grsec_deny_new_usb,
76365+ .maxlen = sizeof(int),
76366+ .mode = 0600,
76367+ .proc_handler = &proc_dointvec,
76368+ },
76369+#endif
76370+ { }
76371+};
76372+#endif
76373diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
76374new file mode 100644
76375index 0000000..61b514e
76376--- /dev/null
76377+++ b/grsecurity/grsec_time.c
76378@@ -0,0 +1,16 @@
76379+#include <linux/kernel.h>
76380+#include <linux/sched.h>
76381+#include <linux/grinternal.h>
76382+#include <linux/module.h>
76383+
76384+void
76385+gr_log_timechange(void)
76386+{
76387+#ifdef CONFIG_GRKERNSEC_TIME
76388+ if (grsec_enable_time)
76389+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
76390+#endif
76391+ return;
76392+}
76393+
76394+EXPORT_SYMBOL_GPL(gr_log_timechange);
76395diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
76396new file mode 100644
76397index 0000000..d1953de
76398--- /dev/null
76399+++ b/grsecurity/grsec_tpe.c
76400@@ -0,0 +1,78 @@
76401+#include <linux/kernel.h>
76402+#include <linux/sched.h>
76403+#include <linux/file.h>
76404+#include <linux/fs.h>
76405+#include <linux/grinternal.h>
76406+
76407+extern int gr_acl_tpe_check(void);
76408+
76409+int
76410+gr_tpe_allow(const struct file *file)
76411+{
76412+#ifdef CONFIG_GRKERNSEC
76413+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
76414+ struct inode *file_inode = file->f_path.dentry->d_inode;
76415+ const struct cred *cred = current_cred();
76416+ char *msg = NULL;
76417+ char *msg2 = NULL;
76418+
76419+ // never restrict root
76420+ if (gr_is_global_root(cred->uid))
76421+ return 1;
76422+
76423+ if (grsec_enable_tpe) {
76424+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76425+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
76426+ msg = "not being in trusted group";
76427+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
76428+ msg = "being in untrusted group";
76429+#else
76430+ if (in_group_p(grsec_tpe_gid))
76431+ msg = "being in untrusted group";
76432+#endif
76433+ }
76434+ if (!msg && gr_acl_tpe_check())
76435+ msg = "being in untrusted role";
76436+
76437+ // not in any affected group/role
76438+ if (!msg)
76439+ goto next_check;
76440+
76441+ if (gr_is_global_nonroot(inode->i_uid))
76442+ msg2 = "file in non-root-owned directory";
76443+ else if (inode->i_mode & S_IWOTH)
76444+ msg2 = "file in world-writable directory";
76445+ else if (inode->i_mode & S_IWGRP)
76446+ msg2 = "file in group-writable directory";
76447+ else if (file_inode->i_mode & S_IWOTH)
76448+ msg2 = "file is world-writable";
76449+
76450+ if (msg && msg2) {
76451+ char fullmsg[70] = {0};
76452+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
76453+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
76454+ return 0;
76455+ }
76456+ msg = NULL;
76457+next_check:
76458+#ifdef CONFIG_GRKERNSEC_TPE_ALL
76459+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
76460+ return 1;
76461+
76462+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
76463+ msg = "directory not owned by user";
76464+ else if (inode->i_mode & S_IWOTH)
76465+ msg = "file in world-writable directory";
76466+ else if (inode->i_mode & S_IWGRP)
76467+ msg = "file in group-writable directory";
76468+ else if (file_inode->i_mode & S_IWOTH)
76469+ msg = "file is world-writable";
76470+
76471+ if (msg) {
76472+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
76473+ return 0;
76474+ }
76475+#endif
76476+#endif
76477+ return 1;
76478+}
76479diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
76480new file mode 100644
76481index 0000000..ae02d8e
76482--- /dev/null
76483+++ b/grsecurity/grsec_usb.c
76484@@ -0,0 +1,15 @@
76485+#include <linux/kernel.h>
76486+#include <linux/grinternal.h>
76487+#include <linux/module.h>
76488+
76489+int gr_handle_new_usb(void)
76490+{
76491+#ifdef CONFIG_GRKERNSEC_DENYUSB
76492+ if (grsec_deny_new_usb) {
76493+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
76494+ return 1;
76495+ }
76496+#endif
76497+ return 0;
76498+}
76499+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
76500diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
76501new file mode 100644
76502index 0000000..9f7b1ac
76503--- /dev/null
76504+++ b/grsecurity/grsum.c
76505@@ -0,0 +1,61 @@
76506+#include <linux/err.h>
76507+#include <linux/kernel.h>
76508+#include <linux/sched.h>
76509+#include <linux/mm.h>
76510+#include <linux/scatterlist.h>
76511+#include <linux/crypto.h>
76512+#include <linux/gracl.h>
76513+
76514+
76515+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
76516+#error "crypto and sha256 must be built into the kernel"
76517+#endif
76518+
76519+int
76520+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
76521+{
76522+ char *p;
76523+ struct crypto_hash *tfm;
76524+ struct hash_desc desc;
76525+ struct scatterlist sg;
76526+ unsigned char temp_sum[GR_SHA_LEN];
76527+ volatile int retval = 0;
76528+ volatile int dummy = 0;
76529+ unsigned int i;
76530+
76531+ sg_init_table(&sg, 1);
76532+
76533+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
76534+ if (IS_ERR(tfm)) {
76535+ /* should never happen, since sha256 should be built in */
76536+ return 1;
76537+ }
76538+
76539+ desc.tfm = tfm;
76540+ desc.flags = 0;
76541+
76542+ crypto_hash_init(&desc);
76543+
76544+ p = salt;
76545+ sg_set_buf(&sg, p, GR_SALT_LEN);
76546+ crypto_hash_update(&desc, &sg, sg.length);
76547+
76548+ p = entry->pw;
76549+ sg_set_buf(&sg, p, strlen(p));
76550+
76551+ crypto_hash_update(&desc, &sg, sg.length);
76552+
76553+ crypto_hash_final(&desc, temp_sum);
76554+
76555+ memset(entry->pw, 0, GR_PW_LEN);
76556+
76557+ for (i = 0; i < GR_SHA_LEN; i++)
76558+ if (sum[i] != temp_sum[i])
76559+ retval = 1;
76560+ else
76561+ dummy = 1; // waste a cycle
76562+
76563+ crypto_free_hash(tfm);
76564+
76565+ return retval;
76566+}
76567diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
76568index 77ff547..181834f 100644
76569--- a/include/asm-generic/4level-fixup.h
76570+++ b/include/asm-generic/4level-fixup.h
76571@@ -13,8 +13,10 @@
76572 #define pmd_alloc(mm, pud, address) \
76573 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
76574 NULL: pmd_offset(pud, address))
76575+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
76576
76577 #define pud_alloc(mm, pgd, address) (pgd)
76578+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
76579 #define pud_offset(pgd, start) (pgd)
76580 #define pud_none(pud) 0
76581 #define pud_bad(pud) 0
76582diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
76583index b7babf0..97f4c4f 100644
76584--- a/include/asm-generic/atomic-long.h
76585+++ b/include/asm-generic/atomic-long.h
76586@@ -22,6 +22,12 @@
76587
76588 typedef atomic64_t atomic_long_t;
76589
76590+#ifdef CONFIG_PAX_REFCOUNT
76591+typedef atomic64_unchecked_t atomic_long_unchecked_t;
76592+#else
76593+typedef atomic64_t atomic_long_unchecked_t;
76594+#endif
76595+
76596 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
76597
76598 static inline long atomic_long_read(atomic_long_t *l)
76599@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
76600 return (long)atomic64_read(v);
76601 }
76602
76603+#ifdef CONFIG_PAX_REFCOUNT
76604+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
76605+{
76606+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76607+
76608+ return (long)atomic64_read_unchecked(v);
76609+}
76610+#endif
76611+
76612 static inline void atomic_long_set(atomic_long_t *l, long i)
76613 {
76614 atomic64_t *v = (atomic64_t *)l;
76615@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
76616 atomic64_set(v, i);
76617 }
76618
76619+#ifdef CONFIG_PAX_REFCOUNT
76620+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
76621+{
76622+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76623+
76624+ atomic64_set_unchecked(v, i);
76625+}
76626+#endif
76627+
76628 static inline void atomic_long_inc(atomic_long_t *l)
76629 {
76630 atomic64_t *v = (atomic64_t *)l;
76631@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
76632 atomic64_inc(v);
76633 }
76634
76635+#ifdef CONFIG_PAX_REFCOUNT
76636+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
76637+{
76638+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76639+
76640+ atomic64_inc_unchecked(v);
76641+}
76642+#endif
76643+
76644 static inline void atomic_long_dec(atomic_long_t *l)
76645 {
76646 atomic64_t *v = (atomic64_t *)l;
76647@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
76648 atomic64_dec(v);
76649 }
76650
76651+#ifdef CONFIG_PAX_REFCOUNT
76652+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
76653+{
76654+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76655+
76656+ atomic64_dec_unchecked(v);
76657+}
76658+#endif
76659+
76660 static inline void atomic_long_add(long i, atomic_long_t *l)
76661 {
76662 atomic64_t *v = (atomic64_t *)l;
76663@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
76664 atomic64_add(i, v);
76665 }
76666
76667+#ifdef CONFIG_PAX_REFCOUNT
76668+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
76669+{
76670+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76671+
76672+ atomic64_add_unchecked(i, v);
76673+}
76674+#endif
76675+
76676 static inline void atomic_long_sub(long i, atomic_long_t *l)
76677 {
76678 atomic64_t *v = (atomic64_t *)l;
76679@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
76680 atomic64_sub(i, v);
76681 }
76682
76683+#ifdef CONFIG_PAX_REFCOUNT
76684+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
76685+{
76686+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76687+
76688+ atomic64_sub_unchecked(i, v);
76689+}
76690+#endif
76691+
76692 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
76693 {
76694 atomic64_t *v = (atomic64_t *)l;
76695@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
76696 return atomic64_add_negative(i, v);
76697 }
76698
76699-static inline long atomic_long_add_return(long i, atomic_long_t *l)
76700+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
76701 {
76702 atomic64_t *v = (atomic64_t *)l;
76703
76704 return (long)atomic64_add_return(i, v);
76705 }
76706
76707+#ifdef CONFIG_PAX_REFCOUNT
76708+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
76709+{
76710+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76711+
76712+ return (long)atomic64_add_return_unchecked(i, v);
76713+}
76714+#endif
76715+
76716 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
76717 {
76718 atomic64_t *v = (atomic64_t *)l;
76719@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
76720 return (long)atomic64_inc_return(v);
76721 }
76722
76723+#ifdef CONFIG_PAX_REFCOUNT
76724+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
76725+{
76726+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
76727+
76728+ return (long)atomic64_inc_return_unchecked(v);
76729+}
76730+#endif
76731+
76732 static inline long atomic_long_dec_return(atomic_long_t *l)
76733 {
76734 atomic64_t *v = (atomic64_t *)l;
76735@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
76736
76737 typedef atomic_t atomic_long_t;
76738
76739+#ifdef CONFIG_PAX_REFCOUNT
76740+typedef atomic_unchecked_t atomic_long_unchecked_t;
76741+#else
76742+typedef atomic_t atomic_long_unchecked_t;
76743+#endif
76744+
76745 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
76746 static inline long atomic_long_read(atomic_long_t *l)
76747 {
76748@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
76749 return (long)atomic_read(v);
76750 }
76751
76752+#ifdef CONFIG_PAX_REFCOUNT
76753+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
76754+{
76755+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76756+
76757+ return (long)atomic_read_unchecked(v);
76758+}
76759+#endif
76760+
76761 static inline void atomic_long_set(atomic_long_t *l, long i)
76762 {
76763 atomic_t *v = (atomic_t *)l;
76764@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
76765 atomic_set(v, i);
76766 }
76767
76768+#ifdef CONFIG_PAX_REFCOUNT
76769+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
76770+{
76771+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76772+
76773+ atomic_set_unchecked(v, i);
76774+}
76775+#endif
76776+
76777 static inline void atomic_long_inc(atomic_long_t *l)
76778 {
76779 atomic_t *v = (atomic_t *)l;
76780@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
76781 atomic_inc(v);
76782 }
76783
76784+#ifdef CONFIG_PAX_REFCOUNT
76785+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
76786+{
76787+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76788+
76789+ atomic_inc_unchecked(v);
76790+}
76791+#endif
76792+
76793 static inline void atomic_long_dec(atomic_long_t *l)
76794 {
76795 atomic_t *v = (atomic_t *)l;
76796@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
76797 atomic_dec(v);
76798 }
76799
76800+#ifdef CONFIG_PAX_REFCOUNT
76801+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
76802+{
76803+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76804+
76805+ atomic_dec_unchecked(v);
76806+}
76807+#endif
76808+
76809 static inline void atomic_long_add(long i, atomic_long_t *l)
76810 {
76811 atomic_t *v = (atomic_t *)l;
76812@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
76813 atomic_add(i, v);
76814 }
76815
76816+#ifdef CONFIG_PAX_REFCOUNT
76817+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
76818+{
76819+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76820+
76821+ atomic_add_unchecked(i, v);
76822+}
76823+#endif
76824+
76825 static inline void atomic_long_sub(long i, atomic_long_t *l)
76826 {
76827 atomic_t *v = (atomic_t *)l;
76828@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
76829 atomic_sub(i, v);
76830 }
76831
76832+#ifdef CONFIG_PAX_REFCOUNT
76833+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
76834+{
76835+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76836+
76837+ atomic_sub_unchecked(i, v);
76838+}
76839+#endif
76840+
76841 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
76842 {
76843 atomic_t *v = (atomic_t *)l;
76844@@ -218,6 +356,16 @@ static inline long atomic_long_add_return(long i, atomic_long_t *l)
76845 return (long)atomic_add_return(i, v);
76846 }
76847
76848+#ifdef CONFIG_PAX_REFCOUNT
76849+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
76850+{
76851+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76852+
76853+ return (long)atomic_add_return_unchecked(i, v);
76854+}
76855+
76856+#endif
76857+
76858 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
76859 {
76860 atomic_t *v = (atomic_t *)l;
76861@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
76862 return (long)atomic_inc_return(v);
76863 }
76864
76865+#ifdef CONFIG_PAX_REFCOUNT
76866+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
76867+{
76868+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
76869+
76870+ return (long)atomic_inc_return_unchecked(v);
76871+}
76872+#endif
76873+
76874 static inline long atomic_long_dec_return(atomic_long_t *l)
76875 {
76876 atomic_t *v = (atomic_t *)l;
76877@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
76878
76879 #endif /* BITS_PER_LONG == 64 */
76880
76881+#ifdef CONFIG_PAX_REFCOUNT
76882+static inline void pax_refcount_needs_these_functions(void)
76883+{
76884+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
76885+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
76886+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
76887+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
76888+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
76889+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
76890+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
76891+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
76892+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
76893+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
76894+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
76895+#ifdef CONFIG_X86
76896+ atomic_clear_mask_unchecked(0, NULL);
76897+ atomic_set_mask_unchecked(0, NULL);
76898+#endif
76899+
76900+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
76901+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
76902+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
76903+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
76904+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
76905+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
76906+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
76907+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
76908+}
76909+#else
76910+#define atomic_read_unchecked(v) atomic_read(v)
76911+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
76912+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
76913+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
76914+#define atomic_inc_unchecked(v) atomic_inc(v)
76915+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
76916+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
76917+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
76918+#define atomic_dec_unchecked(v) atomic_dec(v)
76919+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
76920+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
76921+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
76922+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
76923+
76924+#define atomic_long_read_unchecked(v) atomic_long_read(v)
76925+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
76926+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
76927+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
76928+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
76929+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
76930+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
76931+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
76932+#endif
76933+
76934 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
76935diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
76936index 33bd2de..f31bff97 100644
76937--- a/include/asm-generic/atomic.h
76938+++ b/include/asm-generic/atomic.h
76939@@ -153,7 +153,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
76940 * Atomically clears the bits set in @mask from @v
76941 */
76942 #ifndef atomic_clear_mask
76943-static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
76944+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
76945 {
76946 unsigned long flags;
76947
76948diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
76949index b18ce4f..2ee2843 100644
76950--- a/include/asm-generic/atomic64.h
76951+++ b/include/asm-generic/atomic64.h
76952@@ -16,6 +16,8 @@ typedef struct {
76953 long long counter;
76954 } atomic64_t;
76955
76956+typedef atomic64_t atomic64_unchecked_t;
76957+
76958 #define ATOMIC64_INIT(i) { (i) }
76959
76960 extern long long atomic64_read(const atomic64_t *v);
76961@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
76962 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
76963 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
76964
76965+#define atomic64_read_unchecked(v) atomic64_read(v)
76966+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
76967+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
76968+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
76969+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
76970+#define atomic64_inc_unchecked(v) atomic64_inc(v)
76971+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
76972+#define atomic64_dec_unchecked(v) atomic64_dec(v)
76973+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
76974+
76975 #endif /* _ASM_GENERIC_ATOMIC64_H */
76976diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
76977index 6f692f8..2ad9dd2 100644
76978--- a/include/asm-generic/barrier.h
76979+++ b/include/asm-generic/barrier.h
76980@@ -66,7 +66,7 @@
76981 do { \
76982 compiletime_assert_atomic_type(*p); \
76983 smp_mb(); \
76984- ACCESS_ONCE(*p) = (v); \
76985+ ACCESS_ONCE_RW(*p) = (v); \
76986 } while (0)
76987
76988 #define smp_load_acquire(p) \
76989diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
76990index a60a7cc..0fe12f2 100644
76991--- a/include/asm-generic/bitops/__fls.h
76992+++ b/include/asm-generic/bitops/__fls.h
76993@@ -9,7 +9,7 @@
76994 *
76995 * Undefined if no set bit exists, so code should check against 0 first.
76996 */
76997-static __always_inline unsigned long __fls(unsigned long word)
76998+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
76999 {
77000 int num = BITS_PER_LONG - 1;
77001
77002diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
77003index 0576d1f..dad6c71 100644
77004--- a/include/asm-generic/bitops/fls.h
77005+++ b/include/asm-generic/bitops/fls.h
77006@@ -9,7 +9,7 @@
77007 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
77008 */
77009
77010-static __always_inline int fls(int x)
77011+static __always_inline int __intentional_overflow(-1) fls(int x)
77012 {
77013 int r = 32;
77014
77015diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
77016index b097cf8..3d40e14 100644
77017--- a/include/asm-generic/bitops/fls64.h
77018+++ b/include/asm-generic/bitops/fls64.h
77019@@ -15,7 +15,7 @@
77020 * at position 64.
77021 */
77022 #if BITS_PER_LONG == 32
77023-static __always_inline int fls64(__u64 x)
77024+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
77025 {
77026 __u32 h = x >> 32;
77027 if (h)
77028@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
77029 return fls(x);
77030 }
77031 #elif BITS_PER_LONG == 64
77032-static __always_inline int fls64(__u64 x)
77033+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
77034 {
77035 if (x == 0)
77036 return 0;
77037diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
77038index 1bfcfe5..e04c5c9 100644
77039--- a/include/asm-generic/cache.h
77040+++ b/include/asm-generic/cache.h
77041@@ -6,7 +6,7 @@
77042 * cache lines need to provide their own cache.h.
77043 */
77044
77045-#define L1_CACHE_SHIFT 5
77046-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
77047+#define L1_CACHE_SHIFT 5UL
77048+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
77049
77050 #endif /* __ASM_GENERIC_CACHE_H */
77051diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
77052index 0d68a1e..b74a761 100644
77053--- a/include/asm-generic/emergency-restart.h
77054+++ b/include/asm-generic/emergency-restart.h
77055@@ -1,7 +1,7 @@
77056 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
77057 #define _ASM_GENERIC_EMERGENCY_RESTART_H
77058
77059-static inline void machine_emergency_restart(void)
77060+static inline __noreturn void machine_emergency_restart(void)
77061 {
77062 machine_restart(NULL);
77063 }
77064diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
77065index 975e1cc..0b8a083 100644
77066--- a/include/asm-generic/io.h
77067+++ b/include/asm-generic/io.h
77068@@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
77069 * These are pretty trivial
77070 */
77071 #ifndef virt_to_phys
77072-static inline unsigned long virt_to_phys(volatile void *address)
77073+static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
77074 {
77075 return __pa((unsigned long)address);
77076 }
77077diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
77078index 90f99c7..00ce236 100644
77079--- a/include/asm-generic/kmap_types.h
77080+++ b/include/asm-generic/kmap_types.h
77081@@ -2,9 +2,9 @@
77082 #define _ASM_GENERIC_KMAP_TYPES_H
77083
77084 #ifdef __WITH_KM_FENCE
77085-# define KM_TYPE_NR 41
77086+# define KM_TYPE_NR 42
77087 #else
77088-# define KM_TYPE_NR 20
77089+# define KM_TYPE_NR 21
77090 #endif
77091
77092 #endif
77093diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
77094index 9ceb03b..62b0b8f 100644
77095--- a/include/asm-generic/local.h
77096+++ b/include/asm-generic/local.h
77097@@ -23,24 +23,37 @@ typedef struct
77098 atomic_long_t a;
77099 } local_t;
77100
77101+typedef struct {
77102+ atomic_long_unchecked_t a;
77103+} local_unchecked_t;
77104+
77105 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
77106
77107 #define local_read(l) atomic_long_read(&(l)->a)
77108+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
77109 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
77110+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
77111 #define local_inc(l) atomic_long_inc(&(l)->a)
77112+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
77113 #define local_dec(l) atomic_long_dec(&(l)->a)
77114+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
77115 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
77116+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
77117 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
77118+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
77119
77120 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
77121 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
77122 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
77123 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
77124 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
77125+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
77126 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
77127 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
77128+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
77129
77130 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
77131+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
77132 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
77133 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
77134 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
77135diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
77136index 725612b..9cc513a 100644
77137--- a/include/asm-generic/pgtable-nopmd.h
77138+++ b/include/asm-generic/pgtable-nopmd.h
77139@@ -1,14 +1,19 @@
77140 #ifndef _PGTABLE_NOPMD_H
77141 #define _PGTABLE_NOPMD_H
77142
77143-#ifndef __ASSEMBLY__
77144-
77145 #include <asm-generic/pgtable-nopud.h>
77146
77147-struct mm_struct;
77148-
77149 #define __PAGETABLE_PMD_FOLDED
77150
77151+#define PMD_SHIFT PUD_SHIFT
77152+#define PTRS_PER_PMD 1
77153+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
77154+#define PMD_MASK (~(PMD_SIZE-1))
77155+
77156+#ifndef __ASSEMBLY__
77157+
77158+struct mm_struct;
77159+
77160 /*
77161 * Having the pmd type consist of a pud gets the size right, and allows
77162 * us to conceptually access the pud entry that this pmd is folded into
77163@@ -16,11 +21,6 @@ struct mm_struct;
77164 */
77165 typedef struct { pud_t pud; } pmd_t;
77166
77167-#define PMD_SHIFT PUD_SHIFT
77168-#define PTRS_PER_PMD 1
77169-#define PMD_SIZE (1UL << PMD_SHIFT)
77170-#define PMD_MASK (~(PMD_SIZE-1))
77171-
77172 /*
77173 * The "pud_xxx()" functions here are trivial for a folded two-level
77174 * setup: the pmd is never bad, and a pmd always exists (as it's folded
77175diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
77176index 810431d..0ec4804f 100644
77177--- a/include/asm-generic/pgtable-nopud.h
77178+++ b/include/asm-generic/pgtable-nopud.h
77179@@ -1,10 +1,15 @@
77180 #ifndef _PGTABLE_NOPUD_H
77181 #define _PGTABLE_NOPUD_H
77182
77183-#ifndef __ASSEMBLY__
77184-
77185 #define __PAGETABLE_PUD_FOLDED
77186
77187+#define PUD_SHIFT PGDIR_SHIFT
77188+#define PTRS_PER_PUD 1
77189+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
77190+#define PUD_MASK (~(PUD_SIZE-1))
77191+
77192+#ifndef __ASSEMBLY__
77193+
77194 /*
77195 * Having the pud type consist of a pgd gets the size right, and allows
77196 * us to conceptually access the pgd entry that this pud is folded into
77197@@ -12,11 +17,6 @@
77198 */
77199 typedef struct { pgd_t pgd; } pud_t;
77200
77201-#define PUD_SHIFT PGDIR_SHIFT
77202-#define PTRS_PER_PUD 1
77203-#define PUD_SIZE (1UL << PUD_SHIFT)
77204-#define PUD_MASK (~(PUD_SIZE-1))
77205-
77206 /*
77207 * The "pgd_xxx()" functions here are trivial for a folded two-level
77208 * setup: the pud is never bad, and a pud always exists (as it's folded
77209@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
77210 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
77211
77212 #define pgd_populate(mm, pgd, pud) do { } while (0)
77213+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
77214 /*
77215 * (puds are folded into pgds so this doesn't get actually called,
77216 * but the define is needed for a generic inline function.)
77217diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
77218index a8015a7..7a4407b 100644
77219--- a/include/asm-generic/pgtable.h
77220+++ b/include/asm-generic/pgtable.h
77221@@ -815,6 +815,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
77222 }
77223 #endif /* CONFIG_NUMA_BALANCING */
77224
77225+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
77226+#ifdef CONFIG_PAX_KERNEXEC
77227+#error KERNEXEC requires pax_open_kernel
77228+#else
77229+static inline unsigned long pax_open_kernel(void) { return 0; }
77230+#endif
77231+#endif
77232+
77233+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
77234+#ifdef CONFIG_PAX_KERNEXEC
77235+#error KERNEXEC requires pax_close_kernel
77236+#else
77237+static inline unsigned long pax_close_kernel(void) { return 0; }
77238+#endif
77239+#endif
77240+
77241 #endif /* CONFIG_MMU */
77242
77243 #endif /* !__ASSEMBLY__ */
77244diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
77245index 72d8803..cb9749c 100644
77246--- a/include/asm-generic/uaccess.h
77247+++ b/include/asm-generic/uaccess.h
77248@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
77249 return __clear_user(to, n);
77250 }
77251
77252+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
77253+#ifdef CONFIG_PAX_MEMORY_UDEREF
77254+#error UDEREF requires pax_open_userland
77255+#else
77256+static inline unsigned long pax_open_userland(void) { return 0; }
77257+#endif
77258+#endif
77259+
77260+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
77261+#ifdef CONFIG_PAX_MEMORY_UDEREF
77262+#error UDEREF requires pax_close_userland
77263+#else
77264+static inline unsigned long pax_close_userland(void) { return 0; }
77265+#endif
77266+#endif
77267+
77268 #endif /* __ASM_GENERIC_UACCESS_H */
77269diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
77270index 146e4ff..f4f9609 100644
77271--- a/include/asm-generic/vmlinux.lds.h
77272+++ b/include/asm-generic/vmlinux.lds.h
77273@@ -251,6 +251,7 @@
77274 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
77275 VMLINUX_SYMBOL(__start_rodata) = .; \
77276 *(.rodata) *(.rodata.*) \
77277+ *(.data..read_only) \
77278 *(__vermagic) /* Kernel version magic */ \
77279 . = ALIGN(8); \
77280 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
77281@@ -737,17 +738,18 @@
77282 * section in the linker script will go there too. @phdr should have
77283 * a leading colon.
77284 *
77285- * Note that this macros defines __per_cpu_load as an absolute symbol.
77286+ * Note that this macros defines per_cpu_load as an absolute symbol.
77287 * If there is no need to put the percpu section at a predetermined
77288 * address, use PERCPU_SECTION.
77289 */
77290 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
77291- VMLINUX_SYMBOL(__per_cpu_load) = .; \
77292- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
77293+ per_cpu_load = .; \
77294+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
77295 - LOAD_OFFSET) { \
77296+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
77297 PERCPU_INPUT(cacheline) \
77298 } phdr \
77299- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
77300+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
77301
77302 /**
77303 * PERCPU_SECTION - define output section for percpu area, simple version
77304diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
77305index 016c2f1..c4baa98 100644
77306--- a/include/crypto/algapi.h
77307+++ b/include/crypto/algapi.h
77308@@ -34,7 +34,7 @@ struct crypto_type {
77309 unsigned int maskclear;
77310 unsigned int maskset;
77311 unsigned int tfmsize;
77312-};
77313+} __do_const;
77314
77315 struct crypto_instance {
77316 struct crypto_alg alg;
77317diff --git a/include/drm/drmP.h b/include/drm/drmP.h
77318index a7c2a86..078f1b6 100644
77319--- a/include/drm/drmP.h
77320+++ b/include/drm/drmP.h
77321@@ -68,6 +68,7 @@
77322 #include <linux/workqueue.h>
77323 #include <linux/poll.h>
77324 #include <asm/pgalloc.h>
77325+#include <asm/local.h>
77326 #include <drm/drm.h>
77327 #include <drm/drm_sarea.h>
77328 #include <drm/drm_vma_manager.h>
77329@@ -268,10 +269,12 @@ do { \
77330 * \param cmd command.
77331 * \param arg argument.
77332 */
77333-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
77334+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
77335+ struct drm_file *file_priv);
77336+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
77337 struct drm_file *file_priv);
77338
77339-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
77340+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
77341 unsigned long arg);
77342
77343 #define DRM_IOCTL_NR(n) _IOC_NR(n)
77344@@ -287,10 +290,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
77345 struct drm_ioctl_desc {
77346 unsigned int cmd;
77347 int flags;
77348- drm_ioctl_t *func;
77349+ drm_ioctl_t func;
77350 unsigned int cmd_drv;
77351 const char *name;
77352-};
77353+} __do_const;
77354
77355 /**
77356 * Creates a driver or general drm_ioctl_desc array entry for the given
77357@@ -1001,7 +1004,8 @@ struct drm_info_list {
77358 int (*show)(struct seq_file*, void*); /** show callback */
77359 u32 driver_features; /**< Required driver features for this entry */
77360 void *data;
77361-};
77362+} __do_const;
77363+typedef struct drm_info_list __no_const drm_info_list_no_const;
77364
77365 /**
77366 * debugfs node structure. This structure represents a debugfs file.
77367@@ -1083,7 +1087,7 @@ struct drm_device {
77368
77369 /** \name Usage Counters */
77370 /*@{ */
77371- int open_count; /**< Outstanding files open */
77372+ local_t open_count; /**< Outstanding files open */
77373 int buf_use; /**< Buffers in use -- cannot alloc */
77374 atomic_t buf_alloc; /**< Buffer allocation in progress */
77375 /*@} */
77376diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
77377index 36a5feb..d9f01aa 100644
77378--- a/include/drm/drm_crtc_helper.h
77379+++ b/include/drm/drm_crtc_helper.h
77380@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
77381 struct drm_connector *connector);
77382 /* disable encoder when not in use - more explicit than dpms off */
77383 void (*disable)(struct drm_encoder *encoder);
77384-};
77385+} __no_const;
77386
77387 /**
77388 * drm_connector_helper_funcs - helper operations for connectors
77389diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
77390index 012d58f..d0a0642 100644
77391--- a/include/drm/i915_pciids.h
77392+++ b/include/drm/i915_pciids.h
77393@@ -37,7 +37,7 @@
77394 */
77395 #define INTEL_VGA_DEVICE(id, info) { \
77396 0x8086, id, \
77397- ~0, ~0, \
77398+ PCI_ANY_ID, PCI_ANY_ID, \
77399 0x030000, 0xff0000, \
77400 (unsigned long) info }
77401
77402diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
77403index 72dcbe8..8db58d7 100644
77404--- a/include/drm/ttm/ttm_memory.h
77405+++ b/include/drm/ttm/ttm_memory.h
77406@@ -48,7 +48,7 @@
77407
77408 struct ttm_mem_shrink {
77409 int (*do_shrink) (struct ttm_mem_shrink *);
77410-};
77411+} __no_const;
77412
77413 /**
77414 * struct ttm_mem_global - Global memory accounting structure.
77415diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
77416index 49a8284..9643967 100644
77417--- a/include/drm/ttm/ttm_page_alloc.h
77418+++ b/include/drm/ttm/ttm_page_alloc.h
77419@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
77420 */
77421 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
77422
77423+struct device;
77424 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
77425 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
77426
77427diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
77428index 4b840e8..155d235 100644
77429--- a/include/keys/asymmetric-subtype.h
77430+++ b/include/keys/asymmetric-subtype.h
77431@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
77432 /* Verify the signature on a key of this subtype (optional) */
77433 int (*verify_signature)(const struct key *key,
77434 const struct public_key_signature *sig);
77435-};
77436+} __do_const;
77437
77438 /**
77439 * asymmetric_key_subtype - Get the subtype from an asymmetric key
77440diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
77441index c1da539..1dcec55 100644
77442--- a/include/linux/atmdev.h
77443+++ b/include/linux/atmdev.h
77444@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
77445 #endif
77446
77447 struct k_atm_aal_stats {
77448-#define __HANDLE_ITEM(i) atomic_t i
77449+#define __HANDLE_ITEM(i) atomic_unchecked_t i
77450 __AAL_STAT_ITEMS
77451 #undef __HANDLE_ITEM
77452 };
77453@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
77454 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
77455 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
77456 struct module *owner;
77457-};
77458+} __do_const ;
77459
77460 struct atmphy_ops {
77461 int (*start)(struct atm_dev *dev);
77462diff --git a/include/linux/audit.h b/include/linux/audit.h
77463index 22cfddb..ab759e8 100644
77464--- a/include/linux/audit.h
77465+++ b/include/linux/audit.h
77466@@ -210,7 +210,7 @@ static inline void audit_ptrace(struct task_struct *t)
77467 extern unsigned int audit_serial(void);
77468 extern int auditsc_get_stamp(struct audit_context *ctx,
77469 struct timespec *t, unsigned int *serial);
77470-extern int audit_set_loginuid(kuid_t loginuid);
77471+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
77472
77473 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
77474 {
77475diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
77476index 61f29e5..e67c658 100644
77477--- a/include/linux/binfmts.h
77478+++ b/include/linux/binfmts.h
77479@@ -44,7 +44,7 @@ struct linux_binprm {
77480 unsigned interp_flags;
77481 unsigned interp_data;
77482 unsigned long loader, exec;
77483-};
77484+} __randomize_layout;
77485
77486 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
77487 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
77488@@ -73,8 +73,10 @@ struct linux_binfmt {
77489 int (*load_binary)(struct linux_binprm *);
77490 int (*load_shlib)(struct file *);
77491 int (*core_dump)(struct coredump_params *cprm);
77492+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
77493+ void (*handle_mmap)(struct file *);
77494 unsigned long min_coredump; /* minimal dump size */
77495-};
77496+} __do_const __randomize_layout;
77497
77498 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
77499
77500diff --git a/include/linux/bitops.h b/include/linux/bitops.h
77501index be5fd38..d71192a 100644
77502--- a/include/linux/bitops.h
77503+++ b/include/linux/bitops.h
77504@@ -102,7 +102,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
77505 * @word: value to rotate
77506 * @shift: bits to roll
77507 */
77508-static inline __u32 rol32(__u32 word, unsigned int shift)
77509+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
77510 {
77511 return (word << shift) | (word >> (32 - shift));
77512 }
77513@@ -112,7 +112,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
77514 * @word: value to rotate
77515 * @shift: bits to roll
77516 */
77517-static inline __u32 ror32(__u32 word, unsigned int shift)
77518+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
77519 {
77520 return (word >> shift) | (word << (32 - shift));
77521 }
77522@@ -168,7 +168,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
77523 return (__s32)(value << shift) >> shift;
77524 }
77525
77526-static inline unsigned fls_long(unsigned long l)
77527+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
77528 {
77529 if (sizeof(l) == 4)
77530 return fls(l);
77531diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
77532index 0d84981..bb741c0 100644
77533--- a/include/linux/blkdev.h
77534+++ b/include/linux/blkdev.h
77535@@ -1584,7 +1584,7 @@ struct block_device_operations {
77536 /* this callback is with swap_lock and sometimes page table lock held */
77537 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
77538 struct module *owner;
77539-};
77540+} __do_const;
77541
77542 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
77543 unsigned long);
77544diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
77545index afc1343..9735539 100644
77546--- a/include/linux/blktrace_api.h
77547+++ b/include/linux/blktrace_api.h
77548@@ -25,7 +25,7 @@ struct blk_trace {
77549 struct dentry *dropped_file;
77550 struct dentry *msg_file;
77551 struct list_head running_list;
77552- atomic_t dropped;
77553+ atomic_unchecked_t dropped;
77554 };
77555
77556 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
77557diff --git a/include/linux/cache.h b/include/linux/cache.h
77558index 17e7e82..1d7da26 100644
77559--- a/include/linux/cache.h
77560+++ b/include/linux/cache.h
77561@@ -16,6 +16,14 @@
77562 #define __read_mostly
77563 #endif
77564
77565+#ifndef __read_only
77566+#ifdef CONFIG_PAX_KERNEXEC
77567+#error KERNEXEC requires __read_only
77568+#else
77569+#define __read_only __read_mostly
77570+#endif
77571+#endif
77572+
77573 #ifndef ____cacheline_aligned
77574 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
77575 #endif
77576diff --git a/include/linux/capability.h b/include/linux/capability.h
77577index 84b13ad..172cdee 100644
77578--- a/include/linux/capability.h
77579+++ b/include/linux/capability.h
77580@@ -211,9 +211,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
77581 extern bool capable(int cap);
77582 extern bool ns_capable(struct user_namespace *ns, int cap);
77583 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
77584+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
77585 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
77586+extern bool capable_nolog(int cap);
77587+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
77588
77589 /* audit system wants to get cap info from files as well */
77590 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
77591
77592+extern int is_privileged_binary(const struct dentry *dentry);
77593+
77594 #endif /* !_LINUX_CAPABILITY_H */
77595diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
77596index 8609d57..86e4d79 100644
77597--- a/include/linux/cdrom.h
77598+++ b/include/linux/cdrom.h
77599@@ -87,7 +87,6 @@ struct cdrom_device_ops {
77600
77601 /* driver specifications */
77602 const int capability; /* capability flags */
77603- int n_minors; /* number of active minor devices */
77604 /* handle uniform packets for scsi type devices (scsi,atapi) */
77605 int (*generic_packet) (struct cdrom_device_info *,
77606 struct packet_command *);
77607diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
77608index 4ce9056..86caac6 100644
77609--- a/include/linux/cleancache.h
77610+++ b/include/linux/cleancache.h
77611@@ -31,7 +31,7 @@ struct cleancache_ops {
77612 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
77613 void (*invalidate_inode)(int, struct cleancache_filekey);
77614 void (*invalidate_fs)(int);
77615-};
77616+} __no_const;
77617
77618 extern struct cleancache_ops *
77619 cleancache_register_ops(struct cleancache_ops *ops);
77620diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
77621index 5119174..8e264f8 100644
77622--- a/include/linux/clk-provider.h
77623+++ b/include/linux/clk-provider.h
77624@@ -174,6 +174,7 @@ struct clk_ops {
77625 void (*init)(struct clk_hw *hw);
77626 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
77627 };
77628+typedef struct clk_ops __no_const clk_ops_no_const;
77629
77630 /**
77631 * struct clk_init_data - holds init data that's common to all clocks and is
77632diff --git a/include/linux/compat.h b/include/linux/compat.h
77633index e649426..a74047b 100644
77634--- a/include/linux/compat.h
77635+++ b/include/linux/compat.h
77636@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
77637 compat_size_t __user *len_ptr);
77638
77639 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
77640-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
77641+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
77642 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
77643 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
77644 compat_ssize_t msgsz, int msgflg);
77645@@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
77646 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
77647 compat_ulong_t addr, compat_ulong_t data);
77648 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
77649- compat_long_t addr, compat_long_t data);
77650+ compat_ulong_t addr, compat_ulong_t data);
77651
77652 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
77653 /*
77654diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
77655index 2507fd2..55203f8 100644
77656--- a/include/linux/compiler-gcc4.h
77657+++ b/include/linux/compiler-gcc4.h
77658@@ -39,9 +39,34 @@
77659 # define __compiletime_warning(message) __attribute__((warning(message)))
77660 # define __compiletime_error(message) __attribute__((error(message)))
77661 #endif /* __CHECKER__ */
77662+
77663+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
77664+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
77665+#define __bos0(ptr) __bos((ptr), 0)
77666+#define __bos1(ptr) __bos((ptr), 1)
77667 #endif /* GCC_VERSION >= 40300 */
77668
77669 #if GCC_VERSION >= 40500
77670+
77671+#ifdef RANDSTRUCT_PLUGIN
77672+#define __randomize_layout __attribute__((randomize_layout))
77673+#define __no_randomize_layout __attribute__((no_randomize_layout))
77674+#endif
77675+
77676+#ifdef CONSTIFY_PLUGIN
77677+#define __no_const __attribute__((no_const))
77678+#define __do_const __attribute__((do_const))
77679+#endif
77680+
77681+#ifdef SIZE_OVERFLOW_PLUGIN
77682+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
77683+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
77684+#endif
77685+
77686+#ifdef LATENT_ENTROPY_PLUGIN
77687+#define __latent_entropy __attribute__((latent_entropy))
77688+#endif
77689+
77690 /*
77691 * Mark a position in code as unreachable. This can be used to
77692 * suppress control flow warnings after asm blocks that transfer
77693diff --git a/include/linux/compiler.h b/include/linux/compiler.h
77694index ee7239e..7c11769 100644
77695--- a/include/linux/compiler.h
77696+++ b/include/linux/compiler.h
77697@@ -5,11 +5,14 @@
77698
77699 #ifdef __CHECKER__
77700 # define __user __attribute__((noderef, address_space(1)))
77701+# define __force_user __force __user
77702 # define __kernel __attribute__((address_space(0)))
77703+# define __force_kernel __force __kernel
77704 # define __safe __attribute__((safe))
77705 # define __force __attribute__((force))
77706 # define __nocast __attribute__((nocast))
77707 # define __iomem __attribute__((noderef, address_space(2)))
77708+# define __force_iomem __force __iomem
77709 # define __must_hold(x) __attribute__((context(x,1,1)))
77710 # define __acquires(x) __attribute__((context(x,0,1)))
77711 # define __releases(x) __attribute__((context(x,1,0)))
77712@@ -17,20 +20,37 @@
77713 # define __release(x) __context__(x,-1)
77714 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
77715 # define __percpu __attribute__((noderef, address_space(3)))
77716+# define __force_percpu __force __percpu
77717 #ifdef CONFIG_SPARSE_RCU_POINTER
77718 # define __rcu __attribute__((noderef, address_space(4)))
77719+# define __force_rcu __force __rcu
77720 #else
77721 # define __rcu
77722+# define __force_rcu
77723 #endif
77724 extern void __chk_user_ptr(const volatile void __user *);
77725 extern void __chk_io_ptr(const volatile void __iomem *);
77726 #else
77727-# define __user
77728-# define __kernel
77729+# ifdef CHECKER_PLUGIN
77730+//# define __user
77731+//# define __force_user
77732+//# define __kernel
77733+//# define __force_kernel
77734+# else
77735+# ifdef STRUCTLEAK_PLUGIN
77736+# define __user __attribute__((user))
77737+# else
77738+# define __user
77739+# endif
77740+# define __force_user
77741+# define __kernel
77742+# define __force_kernel
77743+# endif
77744 # define __safe
77745 # define __force
77746 # define __nocast
77747 # define __iomem
77748+# define __force_iomem
77749 # define __chk_user_ptr(x) (void)0
77750 # define __chk_io_ptr(x) (void)0
77751 # define __builtin_warning(x, y...) (1)
77752@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
77753 # define __release(x) (void)0
77754 # define __cond_lock(x,c) (c)
77755 # define __percpu
77756+# define __force_percpu
77757 # define __rcu
77758+# define __force_rcu
77759 #endif
77760
77761 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
77762@@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
77763 # define __attribute_const__ /* unimplemented */
77764 #endif
77765
77766+#ifndef __randomize_layout
77767+# define __randomize_layout
77768+#endif
77769+
77770+#ifndef __no_randomize_layout
77771+# define __no_randomize_layout
77772+#endif
77773+
77774+#ifndef __no_const
77775+# define __no_const
77776+#endif
77777+
77778+#ifndef __do_const
77779+# define __do_const
77780+#endif
77781+
77782+#ifndef __size_overflow
77783+# define __size_overflow(...)
77784+#endif
77785+
77786+#ifndef __intentional_overflow
77787+# define __intentional_overflow(...)
77788+#endif
77789+
77790+#ifndef __latent_entropy
77791+# define __latent_entropy
77792+#endif
77793+
77794 /*
77795 * Tell gcc if a function is cold. The compiler will assume any path
77796 * directly leading to the call is unlikely.
77797@@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
77798 #define __cold
77799 #endif
77800
77801+#ifndef __alloc_size
77802+#define __alloc_size(...)
77803+#endif
77804+
77805+#ifndef __bos
77806+#define __bos(ptr, arg)
77807+#endif
77808+
77809+#ifndef __bos0
77810+#define __bos0(ptr)
77811+#endif
77812+
77813+#ifndef __bos1
77814+#define __bos1(ptr)
77815+#endif
77816+
77817 /* Simple shorthand for a section definition */
77818 #ifndef __section
77819 # define __section(S) __attribute__ ((__section__(#S)))
77820@@ -369,7 +435,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
77821 * use is to mediate communication between process-level code and irq/NMI
77822 * handlers, all running on the same CPU.
77823 */
77824-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
77825+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
77826+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
77827
77828 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
77829 #ifdef CONFIG_KPROBES
77830diff --git a/include/linux/completion.h b/include/linux/completion.h
77831index 5d5aaae..0ea9b84 100644
77832--- a/include/linux/completion.h
77833+++ b/include/linux/completion.h
77834@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
77835
77836 extern void wait_for_completion(struct completion *);
77837 extern void wait_for_completion_io(struct completion *);
77838-extern int wait_for_completion_interruptible(struct completion *x);
77839-extern int wait_for_completion_killable(struct completion *x);
77840+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
77841+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
77842 extern unsigned long wait_for_completion_timeout(struct completion *x,
77843- unsigned long timeout);
77844+ unsigned long timeout) __intentional_overflow(-1);
77845 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
77846- unsigned long timeout);
77847+ unsigned long timeout) __intentional_overflow(-1);
77848 extern long wait_for_completion_interruptible_timeout(
77849- struct completion *x, unsigned long timeout);
77850+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
77851 extern long wait_for_completion_killable_timeout(
77852- struct completion *x, unsigned long timeout);
77853+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
77854 extern bool try_wait_for_completion(struct completion *x);
77855 extern bool completion_done(struct completion *x);
77856
77857diff --git a/include/linux/configfs.h b/include/linux/configfs.h
77858index 34025df..d94bbbc 100644
77859--- a/include/linux/configfs.h
77860+++ b/include/linux/configfs.h
77861@@ -125,7 +125,7 @@ struct configfs_attribute {
77862 const char *ca_name;
77863 struct module *ca_owner;
77864 umode_t ca_mode;
77865-};
77866+} __do_const;
77867
77868 /*
77869 * Users often need to create attribute structures for their configurable
77870diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
77871index 5ae5100..b809662 100644
77872--- a/include/linux/cpufreq.h
77873+++ b/include/linux/cpufreq.h
77874@@ -200,6 +200,7 @@ struct global_attr {
77875 ssize_t (*store)(struct kobject *a, struct attribute *b,
77876 const char *c, size_t count);
77877 };
77878+typedef struct global_attr __no_const global_attr_no_const;
77879
77880 #define define_one_global_ro(_name) \
77881 static struct global_attr _name = \
77882@@ -242,7 +243,7 @@ struct cpufreq_driver {
77883 bool boost_supported;
77884 bool boost_enabled;
77885 int (*set_boost) (int state);
77886-};
77887+} __do_const;
77888
77889 /* flags */
77890 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
77891diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
77892index b0238cb..db89e1e 100644
77893--- a/include/linux/cpuidle.h
77894+++ b/include/linux/cpuidle.h
77895@@ -50,7 +50,8 @@ struct cpuidle_state {
77896 int index);
77897
77898 int (*enter_dead) (struct cpuidle_device *dev, int index);
77899-};
77900+} __do_const;
77901+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
77902
77903 /* Idle State Flags */
77904 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
77905@@ -211,7 +212,7 @@ struct cpuidle_governor {
77906 void (*reflect) (struct cpuidle_device *dev, int index);
77907
77908 struct module *owner;
77909-};
77910+} __do_const;
77911
77912 #ifdef CONFIG_CPU_IDLE
77913 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
77914diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
77915index d08e4d2..95fad61 100644
77916--- a/include/linux/cpumask.h
77917+++ b/include/linux/cpumask.h
77918@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
77919 }
77920
77921 /* Valid inputs for n are -1 and 0. */
77922-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
77923+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
77924 {
77925 return n+1;
77926 }
77927
77928-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
77929+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
77930 {
77931 return n+1;
77932 }
77933
77934-static inline unsigned int cpumask_next_and(int n,
77935+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
77936 const struct cpumask *srcp,
77937 const struct cpumask *andp)
77938 {
77939@@ -167,7 +167,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
77940 *
77941 * Returns >= nr_cpu_ids if no further cpus set.
77942 */
77943-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
77944+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
77945 {
77946 /* -1 is a legal arg here. */
77947 if (n != -1)
77948@@ -182,7 +182,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
77949 *
77950 * Returns >= nr_cpu_ids if no further cpus unset.
77951 */
77952-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
77953+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
77954 {
77955 /* -1 is a legal arg here. */
77956 if (n != -1)
77957@@ -190,7 +190,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
77958 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
77959 }
77960
77961-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
77962+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
77963 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
77964
77965 /**
77966diff --git a/include/linux/cred.h b/include/linux/cred.h
77967index f61d6c8..d372d95 100644
77968--- a/include/linux/cred.h
77969+++ b/include/linux/cred.h
77970@@ -35,7 +35,7 @@ struct group_info {
77971 int nblocks;
77972 kgid_t small_block[NGROUPS_SMALL];
77973 kgid_t *blocks[0];
77974-};
77975+} __randomize_layout;
77976
77977 /**
77978 * get_group_info - Get a reference to a group info structure
77979@@ -136,7 +136,7 @@ struct cred {
77980 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
77981 struct group_info *group_info; /* supplementary groups for euid/fsgid */
77982 struct rcu_head rcu; /* RCU deletion hook */
77983-};
77984+} __randomize_layout;
77985
77986 extern void __put_cred(struct cred *);
77987 extern void exit_creds(struct task_struct *);
77988@@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
77989 static inline void validate_process_creds(void)
77990 {
77991 }
77992+static inline void validate_task_creds(struct task_struct *task)
77993+{
77994+}
77995 #endif
77996
77997 /**
77998@@ -322,6 +325,7 @@ static inline void put_cred(const struct cred *_cred)
77999
78000 #define task_uid(task) (task_cred_xxx((task), uid))
78001 #define task_euid(task) (task_cred_xxx((task), euid))
78002+#define task_securebits(task) (task_cred_xxx((task), securebits))
78003
78004 #define current_cred_xxx(xxx) \
78005 ({ \
78006diff --git a/include/linux/crypto.h b/include/linux/crypto.h
78007index b92eadf..b4ecdc1 100644
78008--- a/include/linux/crypto.h
78009+++ b/include/linux/crypto.h
78010@@ -373,7 +373,7 @@ struct cipher_tfm {
78011 const u8 *key, unsigned int keylen);
78012 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
78013 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
78014-};
78015+} __no_const;
78016
78017 struct hash_tfm {
78018 int (*init)(struct hash_desc *desc);
78019@@ -394,13 +394,13 @@ struct compress_tfm {
78020 int (*cot_decompress)(struct crypto_tfm *tfm,
78021 const u8 *src, unsigned int slen,
78022 u8 *dst, unsigned int *dlen);
78023-};
78024+} __no_const;
78025
78026 struct rng_tfm {
78027 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
78028 unsigned int dlen);
78029 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
78030-};
78031+} __no_const;
78032
78033 #define crt_ablkcipher crt_u.ablkcipher
78034 #define crt_aead crt_u.aead
78035diff --git a/include/linux/ctype.h b/include/linux/ctype.h
78036index 653589e..4ef254a 100644
78037--- a/include/linux/ctype.h
78038+++ b/include/linux/ctype.h
78039@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
78040 * Fast implementation of tolower() for internal usage. Do not use in your
78041 * code.
78042 */
78043-static inline char _tolower(const char c)
78044+static inline unsigned char _tolower(const unsigned char c)
78045 {
78046 return c | 0x20;
78047 }
78048diff --git a/include/linux/dcache.h b/include/linux/dcache.h
78049index 3c7ec32..4ca97cc 100644
78050--- a/include/linux/dcache.h
78051+++ b/include/linux/dcache.h
78052@@ -133,7 +133,7 @@ struct dentry {
78053 } d_u;
78054 struct list_head d_subdirs; /* our children */
78055 struct hlist_node d_alias; /* inode alias list */
78056-};
78057+} __randomize_layout;
78058
78059 /*
78060 * dentry->d_lock spinlock nesting subclasses:
78061diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
78062index 7925bf0..d5143d2 100644
78063--- a/include/linux/decompress/mm.h
78064+++ b/include/linux/decompress/mm.h
78065@@ -77,7 +77,7 @@ static void free(void *where)
78066 * warnings when not needed (indeed large_malloc / large_free are not
78067 * needed by inflate */
78068
78069-#define malloc(a) kmalloc(a, GFP_KERNEL)
78070+#define malloc(a) kmalloc((a), GFP_KERNEL)
78071 #define free(a) kfree(a)
78072
78073 #define large_malloc(a) vmalloc(a)
78074diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
78075index d48dc00..211ee54 100644
78076--- a/include/linux/devfreq.h
78077+++ b/include/linux/devfreq.h
78078@@ -114,7 +114,7 @@ struct devfreq_governor {
78079 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
78080 int (*event_handler)(struct devfreq *devfreq,
78081 unsigned int event, void *data);
78082-};
78083+} __do_const;
78084
78085 /**
78086 * struct devfreq - Device devfreq structure
78087diff --git a/include/linux/device.h b/include/linux/device.h
78088index d1d1c05..a90fdb0 100644
78089--- a/include/linux/device.h
78090+++ b/include/linux/device.h
78091@@ -310,7 +310,7 @@ struct subsys_interface {
78092 struct list_head node;
78093 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
78094 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
78095-};
78096+} __do_const;
78097
78098 int subsys_interface_register(struct subsys_interface *sif);
78099 void subsys_interface_unregister(struct subsys_interface *sif);
78100@@ -506,7 +506,7 @@ struct device_type {
78101 void (*release)(struct device *dev);
78102
78103 const struct dev_pm_ops *pm;
78104-};
78105+} __do_const;
78106
78107 /* interface for exporting device attributes */
78108 struct device_attribute {
78109@@ -516,11 +516,12 @@ struct device_attribute {
78110 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
78111 const char *buf, size_t count);
78112 };
78113+typedef struct device_attribute __no_const device_attribute_no_const;
78114
78115 struct dev_ext_attribute {
78116 struct device_attribute attr;
78117 void *var;
78118-};
78119+} __do_const;
78120
78121 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
78122 char *buf);
78123diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
78124index fd4aee2..1f28db9 100644
78125--- a/include/linux/dma-mapping.h
78126+++ b/include/linux/dma-mapping.h
78127@@ -54,7 +54,7 @@ struct dma_map_ops {
78128 u64 (*get_required_mask)(struct device *dev);
78129 #endif
78130 int is_phys;
78131-};
78132+} __do_const;
78133
78134 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
78135
78136diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
78137index 72cb0dd..7fe9a4b 100644
78138--- a/include/linux/dmaengine.h
78139+++ b/include/linux/dmaengine.h
78140@@ -1147,9 +1147,9 @@ struct dma_pinned_list {
78141 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
78142 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
78143
78144-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
78145+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
78146 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
78147-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
78148+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
78149 struct dma_pinned_list *pinned_list, struct page *page,
78150 unsigned int offset, size_t len);
78151
78152diff --git a/include/linux/efi.h b/include/linux/efi.h
78153index 6c100ff..e3289b4 100644
78154--- a/include/linux/efi.h
78155+++ b/include/linux/efi.h
78156@@ -1009,6 +1009,7 @@ struct efivar_operations {
78157 efi_set_variable_t *set_variable;
78158 efi_query_variable_store_t *query_variable_store;
78159 };
78160+typedef struct efivar_operations __no_const efivar_operations_no_const;
78161
78162 struct efivars {
78163 /*
78164diff --git a/include/linux/elf.h b/include/linux/elf.h
78165index 67a5fa7..b817372 100644
78166--- a/include/linux/elf.h
78167+++ b/include/linux/elf.h
78168@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
78169 #define elf_note elf32_note
78170 #define elf_addr_t Elf32_Off
78171 #define Elf_Half Elf32_Half
78172+#define elf_dyn Elf32_Dyn
78173
78174 #else
78175
78176@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
78177 #define elf_note elf64_note
78178 #define elf_addr_t Elf64_Off
78179 #define Elf_Half Elf64_Half
78180+#define elf_dyn Elf64_Dyn
78181
78182 #endif
78183
78184diff --git a/include/linux/err.h b/include/linux/err.h
78185index a729120..6ede2c9 100644
78186--- a/include/linux/err.h
78187+++ b/include/linux/err.h
78188@@ -20,12 +20,12 @@
78189
78190 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
78191
78192-static inline void * __must_check ERR_PTR(long error)
78193+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
78194 {
78195 return (void *) error;
78196 }
78197
78198-static inline long __must_check PTR_ERR(__force const void *ptr)
78199+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
78200 {
78201 return (long) ptr;
78202 }
78203diff --git a/include/linux/extcon.h b/include/linux/extcon.h
78204index f488145..3b6b04e 100644
78205--- a/include/linux/extcon.h
78206+++ b/include/linux/extcon.h
78207@@ -135,7 +135,7 @@ struct extcon_dev {
78208 /* /sys/class/extcon/.../mutually_exclusive/... */
78209 struct attribute_group attr_g_muex;
78210 struct attribute **attrs_muex;
78211- struct device_attribute *d_attrs_muex;
78212+ device_attribute_no_const *d_attrs_muex;
78213 };
78214
78215 /**
78216diff --git a/include/linux/fb.h b/include/linux/fb.h
78217index fe6ac95..898d41d 100644
78218--- a/include/linux/fb.h
78219+++ b/include/linux/fb.h
78220@@ -304,7 +304,7 @@ struct fb_ops {
78221 /* called at KDB enter and leave time to prepare the console */
78222 int (*fb_debug_enter)(struct fb_info *info);
78223 int (*fb_debug_leave)(struct fb_info *info);
78224-};
78225+} __do_const;
78226
78227 #ifdef CONFIG_FB_TILEBLITTING
78228 #define FB_TILE_CURSOR_NONE 0
78229diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
78230index 230f87b..1fd0485 100644
78231--- a/include/linux/fdtable.h
78232+++ b/include/linux/fdtable.h
78233@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
78234 void put_files_struct(struct files_struct *fs);
78235 void reset_files_struct(struct files_struct *);
78236 int unshare_files(struct files_struct **);
78237-struct files_struct *dup_fd(struct files_struct *, int *);
78238+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
78239 void do_close_on_exec(struct files_struct *);
78240 int iterate_fd(struct files_struct *, unsigned,
78241 int (*)(const void *, struct file *, unsigned),
78242diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
78243index 8293262..2b3b8bd 100644
78244--- a/include/linux/frontswap.h
78245+++ b/include/linux/frontswap.h
78246@@ -11,7 +11,7 @@ struct frontswap_ops {
78247 int (*load)(unsigned, pgoff_t, struct page *);
78248 void (*invalidate_page)(unsigned, pgoff_t);
78249 void (*invalidate_area)(unsigned);
78250-};
78251+} __no_const;
78252
78253 extern bool frontswap_enabled;
78254 extern struct frontswap_ops *
78255diff --git a/include/linux/fs.h b/include/linux/fs.h
78256index 8780312..425cc22 100644
78257--- a/include/linux/fs.h
78258+++ b/include/linux/fs.h
78259@@ -398,7 +398,7 @@ struct address_space {
78260 spinlock_t private_lock; /* for use by the address_space */
78261 struct list_head private_list; /* ditto */
78262 void *private_data; /* ditto */
78263-} __attribute__((aligned(sizeof(long))));
78264+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
78265 /*
78266 * On most architectures that alignment is already the case; but
78267 * must be enforced here for CRIS, to let the least significant bit
78268@@ -441,7 +441,7 @@ struct block_device {
78269 int bd_fsfreeze_count;
78270 /* Mutex for freeze */
78271 struct mutex bd_fsfreeze_mutex;
78272-};
78273+} __randomize_layout;
78274
78275 /*
78276 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
78277@@ -585,7 +585,7 @@ struct inode {
78278 #endif
78279
78280 void *i_private; /* fs or device private pointer */
78281-};
78282+} __randomize_layout;
78283
78284 static inline int inode_unhashed(struct inode *inode)
78285 {
78286@@ -778,7 +778,7 @@ struct file {
78287 struct list_head f_tfile_llink;
78288 #endif /* #ifdef CONFIG_EPOLL */
78289 struct address_space *f_mapping;
78290-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
78291+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
78292
78293 struct file_handle {
78294 __u32 handle_bytes;
78295@@ -906,7 +906,7 @@ struct file_lock {
78296 int state; /* state of grant or error if -ve */
78297 } afs;
78298 } fl_u;
78299-};
78300+} __randomize_layout;
78301
78302 /* The following constant reflects the upper bound of the file/locking space */
78303 #ifndef OFFSET_MAX
78304@@ -1255,7 +1255,7 @@ struct super_block {
78305 struct list_lru s_dentry_lru ____cacheline_aligned_in_smp;
78306 struct list_lru s_inode_lru ____cacheline_aligned_in_smp;
78307 struct rcu_head rcu;
78308-};
78309+} __randomize_layout;
78310
78311 extern struct timespec current_fs_time(struct super_block *sb);
78312
78313@@ -1477,7 +1477,8 @@ struct file_operations {
78314 long (*fallocate)(struct file *file, int mode, loff_t offset,
78315 loff_t len);
78316 int (*show_fdinfo)(struct seq_file *m, struct file *f);
78317-};
78318+} __do_const __randomize_layout;
78319+typedef struct file_operations __no_const file_operations_no_const;
78320
78321 struct inode_operations {
78322 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
78323@@ -2757,4 +2758,14 @@ static inline bool dir_relax(struct inode *inode)
78324 return !IS_DEADDIR(inode);
78325 }
78326
78327+static inline bool is_sidechannel_device(const struct inode *inode)
78328+{
78329+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
78330+ umode_t mode = inode->i_mode;
78331+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
78332+#else
78333+ return false;
78334+#endif
78335+}
78336+
78337 #endif /* _LINUX_FS_H */
78338diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
78339index 0efc3e6..fd23610 100644
78340--- a/include/linux/fs_struct.h
78341+++ b/include/linux/fs_struct.h
78342@@ -6,13 +6,13 @@
78343 #include <linux/seqlock.h>
78344
78345 struct fs_struct {
78346- int users;
78347+ atomic_t users;
78348 spinlock_t lock;
78349 seqcount_t seq;
78350 int umask;
78351 int in_exec;
78352 struct path root, pwd;
78353-};
78354+} __randomize_layout;
78355
78356 extern struct kmem_cache *fs_cachep;
78357
78358diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
78359index 7714849..a4a5c7a 100644
78360--- a/include/linux/fscache-cache.h
78361+++ b/include/linux/fscache-cache.h
78362@@ -113,7 +113,7 @@ struct fscache_operation {
78363 fscache_operation_release_t release;
78364 };
78365
78366-extern atomic_t fscache_op_debug_id;
78367+extern atomic_unchecked_t fscache_op_debug_id;
78368 extern void fscache_op_work_func(struct work_struct *work);
78369
78370 extern void fscache_enqueue_operation(struct fscache_operation *);
78371@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
78372 INIT_WORK(&op->work, fscache_op_work_func);
78373 atomic_set(&op->usage, 1);
78374 op->state = FSCACHE_OP_ST_INITIALISED;
78375- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
78376+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
78377 op->processor = processor;
78378 op->release = release;
78379 INIT_LIST_HEAD(&op->pend_link);
78380diff --git a/include/linux/fscache.h b/include/linux/fscache.h
78381index 115bb81..e7b812b 100644
78382--- a/include/linux/fscache.h
78383+++ b/include/linux/fscache.h
78384@@ -152,7 +152,7 @@ struct fscache_cookie_def {
78385 * - this is mandatory for any object that may have data
78386 */
78387 void (*now_uncached)(void *cookie_netfs_data);
78388-};
78389+} __do_const;
78390
78391 /*
78392 * fscache cached network filesystem type
78393diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
78394index 1c804b0..1432c2b 100644
78395--- a/include/linux/fsnotify.h
78396+++ b/include/linux/fsnotify.h
78397@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
78398 struct inode *inode = file_inode(file);
78399 __u32 mask = FS_ACCESS;
78400
78401+ if (is_sidechannel_device(inode))
78402+ return;
78403+
78404 if (S_ISDIR(inode->i_mode))
78405 mask |= FS_ISDIR;
78406
78407@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
78408 struct inode *inode = file_inode(file);
78409 __u32 mask = FS_MODIFY;
78410
78411+ if (is_sidechannel_device(inode))
78412+ return;
78413+
78414 if (S_ISDIR(inode->i_mode))
78415 mask |= FS_ISDIR;
78416
78417@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
78418 */
78419 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
78420 {
78421- return kstrdup(name, GFP_KERNEL);
78422+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
78423 }
78424
78425 /*
78426diff --git a/include/linux/genhd.h b/include/linux/genhd.h
78427index 9f3c275..8bdff5d 100644
78428--- a/include/linux/genhd.h
78429+++ b/include/linux/genhd.h
78430@@ -194,7 +194,7 @@ struct gendisk {
78431 struct kobject *slave_dir;
78432
78433 struct timer_rand_state *random;
78434- atomic_t sync_io; /* RAID */
78435+ atomic_unchecked_t sync_io; /* RAID */
78436 struct disk_events *ev;
78437 #ifdef CONFIG_BLK_DEV_INTEGRITY
78438 struct blk_integrity *integrity;
78439@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
78440 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
78441
78442 /* drivers/char/random.c */
78443-extern void add_disk_randomness(struct gendisk *disk);
78444+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
78445 extern void rand_initialize_disk(struct gendisk *disk);
78446
78447 static inline sector_t get_start_sect(struct block_device *bdev)
78448diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
78449index c0894dd..2fbf10c 100644
78450--- a/include/linux/genl_magic_func.h
78451+++ b/include/linux/genl_magic_func.h
78452@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
78453 },
78454
78455 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
78456-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
78457+static struct genl_ops ZZZ_genl_ops[] = {
78458 #include GENL_MAGIC_INCLUDE_FILE
78459 };
78460
78461diff --git a/include/linux/gfp.h b/include/linux/gfp.h
78462index 39b81dc..819dc51 100644
78463--- a/include/linux/gfp.h
78464+++ b/include/linux/gfp.h
78465@@ -36,6 +36,13 @@ struct vm_area_struct;
78466 #define ___GFP_NO_KSWAPD 0x400000u
78467 #define ___GFP_OTHER_NODE 0x800000u
78468 #define ___GFP_WRITE 0x1000000u
78469+
78470+#ifdef CONFIG_PAX_USERCOPY_SLABS
78471+#define ___GFP_USERCOPY 0x2000000u
78472+#else
78473+#define ___GFP_USERCOPY 0
78474+#endif
78475+
78476 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
78477
78478 /*
78479@@ -93,6 +100,7 @@ struct vm_area_struct;
78480 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
78481 #define __GFP_KMEMCG ((__force gfp_t)___GFP_KMEMCG) /* Allocation comes from a memcg-accounted resource */
78482 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
78483+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
78484
78485 /*
78486 * This may seem redundant, but it's a way of annotating false positives vs.
78487@@ -100,7 +108,7 @@ struct vm_area_struct;
78488 */
78489 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
78490
78491-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
78492+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
78493 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
78494
78495 /* This equals 0, but use constants in case they ever change */
78496@@ -158,6 +166,8 @@ struct vm_area_struct;
78497 /* 4GB DMA on some platforms */
78498 #define GFP_DMA32 __GFP_DMA32
78499
78500+#define GFP_USERCOPY __GFP_USERCOPY
78501+
78502 /* Convert GFP flags to their corresponding migrate type */
78503 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
78504 {
78505diff --git a/include/linux/gracl.h b/include/linux/gracl.h
78506new file mode 100644
78507index 0000000..edb2cb6
78508--- /dev/null
78509+++ b/include/linux/gracl.h
78510@@ -0,0 +1,340 @@
78511+#ifndef GR_ACL_H
78512+#define GR_ACL_H
78513+
78514+#include <linux/grdefs.h>
78515+#include <linux/resource.h>
78516+#include <linux/capability.h>
78517+#include <linux/dcache.h>
78518+#include <asm/resource.h>
78519+
78520+/* Major status information */
78521+
78522+#define GR_VERSION "grsecurity 3.0"
78523+#define GRSECURITY_VERSION 0x3000
78524+
78525+enum {
78526+ GR_SHUTDOWN = 0,
78527+ GR_ENABLE = 1,
78528+ GR_SPROLE = 2,
78529+ GR_OLDRELOAD = 3,
78530+ GR_SEGVMOD = 4,
78531+ GR_STATUS = 5,
78532+ GR_UNSPROLE = 6,
78533+ GR_PASSSET = 7,
78534+ GR_SPROLEPAM = 8,
78535+ GR_RELOAD = 9,
78536+};
78537+
78538+/* Password setup definitions
78539+ * kernel/grhash.c */
78540+enum {
78541+ GR_PW_LEN = 128,
78542+ GR_SALT_LEN = 16,
78543+ GR_SHA_LEN = 32,
78544+};
78545+
78546+enum {
78547+ GR_SPROLE_LEN = 64,
78548+};
78549+
78550+enum {
78551+ GR_NO_GLOB = 0,
78552+ GR_REG_GLOB,
78553+ GR_CREATE_GLOB
78554+};
78555+
78556+#define GR_NLIMITS 32
78557+
78558+/* Begin Data Structures */
78559+
78560+struct sprole_pw {
78561+ unsigned char *rolename;
78562+ unsigned char salt[GR_SALT_LEN];
78563+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
78564+};
78565+
78566+struct name_entry {
78567+ __u32 key;
78568+ ino_t inode;
78569+ dev_t device;
78570+ char *name;
78571+ __u16 len;
78572+ __u8 deleted;
78573+ struct name_entry *prev;
78574+ struct name_entry *next;
78575+};
78576+
78577+struct inodev_entry {
78578+ struct name_entry *nentry;
78579+ struct inodev_entry *prev;
78580+ struct inodev_entry *next;
78581+};
78582+
78583+struct acl_role_db {
78584+ struct acl_role_label **r_hash;
78585+ __u32 r_size;
78586+};
78587+
78588+struct inodev_db {
78589+ struct inodev_entry **i_hash;
78590+ __u32 i_size;
78591+};
78592+
78593+struct name_db {
78594+ struct name_entry **n_hash;
78595+ __u32 n_size;
78596+};
78597+
78598+struct crash_uid {
78599+ uid_t uid;
78600+ unsigned long expires;
78601+};
78602+
78603+struct gr_hash_struct {
78604+ void **table;
78605+ void **nametable;
78606+ void *first;
78607+ __u32 table_size;
78608+ __u32 used_size;
78609+ int type;
78610+};
78611+
78612+/* Userspace Grsecurity ACL data structures */
78613+
78614+struct acl_subject_label {
78615+ char *filename;
78616+ ino_t inode;
78617+ dev_t device;
78618+ __u32 mode;
78619+ kernel_cap_t cap_mask;
78620+ kernel_cap_t cap_lower;
78621+ kernel_cap_t cap_invert_audit;
78622+
78623+ struct rlimit res[GR_NLIMITS];
78624+ __u32 resmask;
78625+
78626+ __u8 user_trans_type;
78627+ __u8 group_trans_type;
78628+ uid_t *user_transitions;
78629+ gid_t *group_transitions;
78630+ __u16 user_trans_num;
78631+ __u16 group_trans_num;
78632+
78633+ __u32 sock_families[2];
78634+ __u32 ip_proto[8];
78635+ __u32 ip_type;
78636+ struct acl_ip_label **ips;
78637+ __u32 ip_num;
78638+ __u32 inaddr_any_override;
78639+
78640+ __u32 crashes;
78641+ unsigned long expires;
78642+
78643+ struct acl_subject_label *parent_subject;
78644+ struct gr_hash_struct *hash;
78645+ struct acl_subject_label *prev;
78646+ struct acl_subject_label *next;
78647+
78648+ struct acl_object_label **obj_hash;
78649+ __u32 obj_hash_size;
78650+ __u16 pax_flags;
78651+};
78652+
78653+struct role_allowed_ip {
78654+ __u32 addr;
78655+ __u32 netmask;
78656+
78657+ struct role_allowed_ip *prev;
78658+ struct role_allowed_ip *next;
78659+};
78660+
78661+struct role_transition {
78662+ char *rolename;
78663+
78664+ struct role_transition *prev;
78665+ struct role_transition *next;
78666+};
78667+
78668+struct acl_role_label {
78669+ char *rolename;
78670+ uid_t uidgid;
78671+ __u16 roletype;
78672+
78673+ __u16 auth_attempts;
78674+ unsigned long expires;
78675+
78676+ struct acl_subject_label *root_label;
78677+ struct gr_hash_struct *hash;
78678+
78679+ struct acl_role_label *prev;
78680+ struct acl_role_label *next;
78681+
78682+ struct role_transition *transitions;
78683+ struct role_allowed_ip *allowed_ips;
78684+ uid_t *domain_children;
78685+ __u16 domain_child_num;
78686+
78687+ umode_t umask;
78688+
78689+ struct acl_subject_label **subj_hash;
78690+ __u32 subj_hash_size;
78691+};
78692+
78693+struct user_acl_role_db {
78694+ struct acl_role_label **r_table;
78695+ __u32 num_pointers; /* Number of allocations to track */
78696+ __u32 num_roles; /* Number of roles */
78697+ __u32 num_domain_children; /* Number of domain children */
78698+ __u32 num_subjects; /* Number of subjects */
78699+ __u32 num_objects; /* Number of objects */
78700+};
78701+
78702+struct acl_object_label {
78703+ char *filename;
78704+ ino_t inode;
78705+ dev_t device;
78706+ __u32 mode;
78707+
78708+ struct acl_subject_label *nested;
78709+ struct acl_object_label *globbed;
78710+
78711+ /* next two structures not used */
78712+
78713+ struct acl_object_label *prev;
78714+ struct acl_object_label *next;
78715+};
78716+
78717+struct acl_ip_label {
78718+ char *iface;
78719+ __u32 addr;
78720+ __u32 netmask;
78721+ __u16 low, high;
78722+ __u8 mode;
78723+ __u32 type;
78724+ __u32 proto[8];
78725+
78726+ /* next two structures not used */
78727+
78728+ struct acl_ip_label *prev;
78729+ struct acl_ip_label *next;
78730+};
78731+
78732+struct gr_arg {
78733+ struct user_acl_role_db role_db;
78734+ unsigned char pw[GR_PW_LEN];
78735+ unsigned char salt[GR_SALT_LEN];
78736+ unsigned char sum[GR_SHA_LEN];
78737+ unsigned char sp_role[GR_SPROLE_LEN];
78738+ struct sprole_pw *sprole_pws;
78739+ dev_t segv_device;
78740+ ino_t segv_inode;
78741+ uid_t segv_uid;
78742+ __u16 num_sprole_pws;
78743+ __u16 mode;
78744+};
78745+
78746+struct gr_arg_wrapper {
78747+ struct gr_arg *arg;
78748+ __u32 version;
78749+ __u32 size;
78750+};
78751+
78752+struct subject_map {
78753+ struct acl_subject_label *user;
78754+ struct acl_subject_label *kernel;
78755+ struct subject_map *prev;
78756+ struct subject_map *next;
78757+};
78758+
78759+struct acl_subj_map_db {
78760+ struct subject_map **s_hash;
78761+ __u32 s_size;
78762+};
78763+
78764+struct gr_policy_state {
78765+ struct sprole_pw **acl_special_roles;
78766+ __u16 num_sprole_pws;
78767+ struct acl_role_label *kernel_role;
78768+ struct acl_role_label *role_list;
78769+ struct acl_role_label *default_role;
78770+ struct acl_role_db acl_role_set;
78771+ struct acl_subj_map_db subj_map_set;
78772+ struct name_db name_set;
78773+ struct inodev_db inodev_set;
78774+};
78775+
78776+struct gr_alloc_state {
78777+ unsigned long alloc_stack_next;
78778+ unsigned long alloc_stack_size;
78779+ void **alloc_stack;
78780+};
78781+
78782+struct gr_reload_state {
78783+ struct gr_policy_state oldpolicy;
78784+ struct gr_alloc_state oldalloc;
78785+ struct gr_policy_state newpolicy;
78786+ struct gr_alloc_state newalloc;
78787+ struct gr_policy_state *oldpolicy_ptr;
78788+ struct gr_alloc_state *oldalloc_ptr;
78789+ unsigned char oldmode;
78790+};
78791+
78792+/* End Data Structures Section */
78793+
78794+/* Hash functions generated by empirical testing by Brad Spengler
78795+ Makes good use of the low bits of the inode. Generally 0-1 times
78796+ in loop for successful match. 0-3 for unsuccessful match.
78797+ Shift/add algorithm with modulus of table size and an XOR*/
78798+
78799+static __inline__ unsigned int
78800+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
78801+{
78802+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
78803+}
78804+
78805+ static __inline__ unsigned int
78806+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
78807+{
78808+ return ((const unsigned long)userp % sz);
78809+}
78810+
78811+static __inline__ unsigned int
78812+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
78813+{
78814+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
78815+}
78816+
78817+static __inline__ unsigned int
78818+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
78819+{
78820+ return full_name_hash((const unsigned char *)name, len) % sz;
78821+}
78822+
78823+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
78824+ subj = NULL; \
78825+ iter = 0; \
78826+ while (iter < role->subj_hash_size) { \
78827+ if (subj == NULL) \
78828+ subj = role->subj_hash[iter]; \
78829+ if (subj == NULL) { \
78830+ iter++; \
78831+ continue; \
78832+ }
78833+
78834+#define FOR_EACH_SUBJECT_END(subj,iter) \
78835+ subj = subj->next; \
78836+ if (subj == NULL) \
78837+ iter++; \
78838+ }
78839+
78840+
78841+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
78842+ subj = role->hash->first; \
78843+ while (subj != NULL) {
78844+
78845+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
78846+ subj = subj->next; \
78847+ }
78848+
78849+#endif
78850+
78851diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
78852new file mode 100644
78853index 0000000..33ebd1f
78854--- /dev/null
78855+++ b/include/linux/gracl_compat.h
78856@@ -0,0 +1,156 @@
78857+#ifndef GR_ACL_COMPAT_H
78858+#define GR_ACL_COMPAT_H
78859+
78860+#include <linux/resource.h>
78861+#include <asm/resource.h>
78862+
78863+struct sprole_pw_compat {
78864+ compat_uptr_t rolename;
78865+ unsigned char salt[GR_SALT_LEN];
78866+ unsigned char sum[GR_SHA_LEN];
78867+};
78868+
78869+struct gr_hash_struct_compat {
78870+ compat_uptr_t table;
78871+ compat_uptr_t nametable;
78872+ compat_uptr_t first;
78873+ __u32 table_size;
78874+ __u32 used_size;
78875+ int type;
78876+};
78877+
78878+struct acl_subject_label_compat {
78879+ compat_uptr_t filename;
78880+ compat_ino_t inode;
78881+ __u32 device;
78882+ __u32 mode;
78883+ kernel_cap_t cap_mask;
78884+ kernel_cap_t cap_lower;
78885+ kernel_cap_t cap_invert_audit;
78886+
78887+ struct compat_rlimit res[GR_NLIMITS];
78888+ __u32 resmask;
78889+
78890+ __u8 user_trans_type;
78891+ __u8 group_trans_type;
78892+ compat_uptr_t user_transitions;
78893+ compat_uptr_t group_transitions;
78894+ __u16 user_trans_num;
78895+ __u16 group_trans_num;
78896+
78897+ __u32 sock_families[2];
78898+ __u32 ip_proto[8];
78899+ __u32 ip_type;
78900+ compat_uptr_t ips;
78901+ __u32 ip_num;
78902+ __u32 inaddr_any_override;
78903+
78904+ __u32 crashes;
78905+ compat_ulong_t expires;
78906+
78907+ compat_uptr_t parent_subject;
78908+ compat_uptr_t hash;
78909+ compat_uptr_t prev;
78910+ compat_uptr_t next;
78911+
78912+ compat_uptr_t obj_hash;
78913+ __u32 obj_hash_size;
78914+ __u16 pax_flags;
78915+};
78916+
78917+struct role_allowed_ip_compat {
78918+ __u32 addr;
78919+ __u32 netmask;
78920+
78921+ compat_uptr_t prev;
78922+ compat_uptr_t next;
78923+};
78924+
78925+struct role_transition_compat {
78926+ compat_uptr_t rolename;
78927+
78928+ compat_uptr_t prev;
78929+ compat_uptr_t next;
78930+};
78931+
78932+struct acl_role_label_compat {
78933+ compat_uptr_t rolename;
78934+ uid_t uidgid;
78935+ __u16 roletype;
78936+
78937+ __u16 auth_attempts;
78938+ compat_ulong_t expires;
78939+
78940+ compat_uptr_t root_label;
78941+ compat_uptr_t hash;
78942+
78943+ compat_uptr_t prev;
78944+ compat_uptr_t next;
78945+
78946+ compat_uptr_t transitions;
78947+ compat_uptr_t allowed_ips;
78948+ compat_uptr_t domain_children;
78949+ __u16 domain_child_num;
78950+
78951+ umode_t umask;
78952+
78953+ compat_uptr_t subj_hash;
78954+ __u32 subj_hash_size;
78955+};
78956+
78957+struct user_acl_role_db_compat {
78958+ compat_uptr_t r_table;
78959+ __u32 num_pointers;
78960+ __u32 num_roles;
78961+ __u32 num_domain_children;
78962+ __u32 num_subjects;
78963+ __u32 num_objects;
78964+};
78965+
78966+struct acl_object_label_compat {
78967+ compat_uptr_t filename;
78968+ compat_ino_t inode;
78969+ __u32 device;
78970+ __u32 mode;
78971+
78972+ compat_uptr_t nested;
78973+ compat_uptr_t globbed;
78974+
78975+ compat_uptr_t prev;
78976+ compat_uptr_t next;
78977+};
78978+
78979+struct acl_ip_label_compat {
78980+ compat_uptr_t iface;
78981+ __u32 addr;
78982+ __u32 netmask;
78983+ __u16 low, high;
78984+ __u8 mode;
78985+ __u32 type;
78986+ __u32 proto[8];
78987+
78988+ compat_uptr_t prev;
78989+ compat_uptr_t next;
78990+};
78991+
78992+struct gr_arg_compat {
78993+ struct user_acl_role_db_compat role_db;
78994+ unsigned char pw[GR_PW_LEN];
78995+ unsigned char salt[GR_SALT_LEN];
78996+ unsigned char sum[GR_SHA_LEN];
78997+ unsigned char sp_role[GR_SPROLE_LEN];
78998+ compat_uptr_t sprole_pws;
78999+ __u32 segv_device;
79000+ compat_ino_t segv_inode;
79001+ uid_t segv_uid;
79002+ __u16 num_sprole_pws;
79003+ __u16 mode;
79004+};
79005+
79006+struct gr_arg_wrapper_compat {
79007+ compat_uptr_t arg;
79008+ __u32 version;
79009+ __u32 size;
79010+};
79011+
79012+#endif
79013diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
79014new file mode 100644
79015index 0000000..323ecf2
79016--- /dev/null
79017+++ b/include/linux/gralloc.h
79018@@ -0,0 +1,9 @@
79019+#ifndef __GRALLOC_H
79020+#define __GRALLOC_H
79021+
79022+void acl_free_all(void);
79023+int acl_alloc_stack_init(unsigned long size);
79024+void *acl_alloc(unsigned long len);
79025+void *acl_alloc_num(unsigned long num, unsigned long len);
79026+
79027+#endif
79028diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
79029new file mode 100644
79030index 0000000..be66033
79031--- /dev/null
79032+++ b/include/linux/grdefs.h
79033@@ -0,0 +1,140 @@
79034+#ifndef GRDEFS_H
79035+#define GRDEFS_H
79036+
79037+/* Begin grsecurity status declarations */
79038+
79039+enum {
79040+ GR_READY = 0x01,
79041+ GR_STATUS_INIT = 0x00 // disabled state
79042+};
79043+
79044+/* Begin ACL declarations */
79045+
79046+/* Role flags */
79047+
79048+enum {
79049+ GR_ROLE_USER = 0x0001,
79050+ GR_ROLE_GROUP = 0x0002,
79051+ GR_ROLE_DEFAULT = 0x0004,
79052+ GR_ROLE_SPECIAL = 0x0008,
79053+ GR_ROLE_AUTH = 0x0010,
79054+ GR_ROLE_NOPW = 0x0020,
79055+ GR_ROLE_GOD = 0x0040,
79056+ GR_ROLE_LEARN = 0x0080,
79057+ GR_ROLE_TPE = 0x0100,
79058+ GR_ROLE_DOMAIN = 0x0200,
79059+ GR_ROLE_PAM = 0x0400,
79060+ GR_ROLE_PERSIST = 0x0800
79061+};
79062+
79063+/* ACL Subject and Object mode flags */
79064+enum {
79065+ GR_DELETED = 0x80000000
79066+};
79067+
79068+/* ACL Object-only mode flags */
79069+enum {
79070+ GR_READ = 0x00000001,
79071+ GR_APPEND = 0x00000002,
79072+ GR_WRITE = 0x00000004,
79073+ GR_EXEC = 0x00000008,
79074+ GR_FIND = 0x00000010,
79075+ GR_INHERIT = 0x00000020,
79076+ GR_SETID = 0x00000040,
79077+ GR_CREATE = 0x00000080,
79078+ GR_DELETE = 0x00000100,
79079+ GR_LINK = 0x00000200,
79080+ GR_AUDIT_READ = 0x00000400,
79081+ GR_AUDIT_APPEND = 0x00000800,
79082+ GR_AUDIT_WRITE = 0x00001000,
79083+ GR_AUDIT_EXEC = 0x00002000,
79084+ GR_AUDIT_FIND = 0x00004000,
79085+ GR_AUDIT_INHERIT= 0x00008000,
79086+ GR_AUDIT_SETID = 0x00010000,
79087+ GR_AUDIT_CREATE = 0x00020000,
79088+ GR_AUDIT_DELETE = 0x00040000,
79089+ GR_AUDIT_LINK = 0x00080000,
79090+ GR_PTRACERD = 0x00100000,
79091+ GR_NOPTRACE = 0x00200000,
79092+ GR_SUPPRESS = 0x00400000,
79093+ GR_NOLEARN = 0x00800000,
79094+ GR_INIT_TRANSFER= 0x01000000
79095+};
79096+
79097+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
79098+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
79099+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
79100+
79101+/* ACL subject-only mode flags */
79102+enum {
79103+ GR_KILL = 0x00000001,
79104+ GR_VIEW = 0x00000002,
79105+ GR_PROTECTED = 0x00000004,
79106+ GR_LEARN = 0x00000008,
79107+ GR_OVERRIDE = 0x00000010,
79108+ /* just a placeholder, this mode is only used in userspace */
79109+ GR_DUMMY = 0x00000020,
79110+ GR_PROTSHM = 0x00000040,
79111+ GR_KILLPROC = 0x00000080,
79112+ GR_KILLIPPROC = 0x00000100,
79113+ /* just a placeholder, this mode is only used in userspace */
79114+ GR_NOTROJAN = 0x00000200,
79115+ GR_PROTPROCFD = 0x00000400,
79116+ GR_PROCACCT = 0x00000800,
79117+ GR_RELAXPTRACE = 0x00001000,
79118+ //GR_NESTED = 0x00002000,
79119+ GR_INHERITLEARN = 0x00004000,
79120+ GR_PROCFIND = 0x00008000,
79121+ GR_POVERRIDE = 0x00010000,
79122+ GR_KERNELAUTH = 0x00020000,
79123+ GR_ATSECURE = 0x00040000,
79124+ GR_SHMEXEC = 0x00080000
79125+};
79126+
79127+enum {
79128+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
79129+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
79130+ GR_PAX_ENABLE_MPROTECT = 0x0004,
79131+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
79132+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
79133+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
79134+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
79135+ GR_PAX_DISABLE_MPROTECT = 0x0400,
79136+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
79137+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
79138+};
79139+
79140+enum {
79141+ GR_ID_USER = 0x01,
79142+ GR_ID_GROUP = 0x02,
79143+};
79144+
79145+enum {
79146+ GR_ID_ALLOW = 0x01,
79147+ GR_ID_DENY = 0x02,
79148+};
79149+
79150+#define GR_CRASH_RES 31
79151+#define GR_UIDTABLE_MAX 500
79152+
79153+/* begin resource learning section */
79154+enum {
79155+ GR_RLIM_CPU_BUMP = 60,
79156+ GR_RLIM_FSIZE_BUMP = 50000,
79157+ GR_RLIM_DATA_BUMP = 10000,
79158+ GR_RLIM_STACK_BUMP = 1000,
79159+ GR_RLIM_CORE_BUMP = 10000,
79160+ GR_RLIM_RSS_BUMP = 500000,
79161+ GR_RLIM_NPROC_BUMP = 1,
79162+ GR_RLIM_NOFILE_BUMP = 5,
79163+ GR_RLIM_MEMLOCK_BUMP = 50000,
79164+ GR_RLIM_AS_BUMP = 500000,
79165+ GR_RLIM_LOCKS_BUMP = 2,
79166+ GR_RLIM_SIGPENDING_BUMP = 5,
79167+ GR_RLIM_MSGQUEUE_BUMP = 10000,
79168+ GR_RLIM_NICE_BUMP = 1,
79169+ GR_RLIM_RTPRIO_BUMP = 1,
79170+ GR_RLIM_RTTIME_BUMP = 1000000
79171+};
79172+
79173+#endif
79174diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
79175new file mode 100644
79176index 0000000..d25522e
79177--- /dev/null
79178+++ b/include/linux/grinternal.h
79179@@ -0,0 +1,229 @@
79180+#ifndef __GRINTERNAL_H
79181+#define __GRINTERNAL_H
79182+
79183+#ifdef CONFIG_GRKERNSEC
79184+
79185+#include <linux/fs.h>
79186+#include <linux/mnt_namespace.h>
79187+#include <linux/nsproxy.h>
79188+#include <linux/gracl.h>
79189+#include <linux/grdefs.h>
79190+#include <linux/grmsg.h>
79191+
79192+void gr_add_learn_entry(const char *fmt, ...)
79193+ __attribute__ ((format (printf, 1, 2)));
79194+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
79195+ const struct vfsmount *mnt);
79196+__u32 gr_check_create(const struct dentry *new_dentry,
79197+ const struct dentry *parent,
79198+ const struct vfsmount *mnt, const __u32 mode);
79199+int gr_check_protected_task(const struct task_struct *task);
79200+__u32 to_gr_audit(const __u32 reqmode);
79201+int gr_set_acls(const int type);
79202+int gr_acl_is_enabled(void);
79203+char gr_roletype_to_char(void);
79204+
79205+void gr_handle_alertkill(struct task_struct *task);
79206+char *gr_to_filename(const struct dentry *dentry,
79207+ const struct vfsmount *mnt);
79208+char *gr_to_filename1(const struct dentry *dentry,
79209+ const struct vfsmount *mnt);
79210+char *gr_to_filename2(const struct dentry *dentry,
79211+ const struct vfsmount *mnt);
79212+char *gr_to_filename3(const struct dentry *dentry,
79213+ const struct vfsmount *mnt);
79214+
79215+extern int grsec_enable_ptrace_readexec;
79216+extern int grsec_enable_harden_ptrace;
79217+extern int grsec_enable_link;
79218+extern int grsec_enable_fifo;
79219+extern int grsec_enable_execve;
79220+extern int grsec_enable_shm;
79221+extern int grsec_enable_execlog;
79222+extern int grsec_enable_signal;
79223+extern int grsec_enable_audit_ptrace;
79224+extern int grsec_enable_forkfail;
79225+extern int grsec_enable_time;
79226+extern int grsec_enable_rofs;
79227+extern int grsec_deny_new_usb;
79228+extern int grsec_enable_chroot_shmat;
79229+extern int grsec_enable_chroot_mount;
79230+extern int grsec_enable_chroot_double;
79231+extern int grsec_enable_chroot_pivot;
79232+extern int grsec_enable_chroot_chdir;
79233+extern int grsec_enable_chroot_chmod;
79234+extern int grsec_enable_chroot_mknod;
79235+extern int grsec_enable_chroot_fchdir;
79236+extern int grsec_enable_chroot_nice;
79237+extern int grsec_enable_chroot_execlog;
79238+extern int grsec_enable_chroot_caps;
79239+extern int grsec_enable_chroot_sysctl;
79240+extern int grsec_enable_chroot_unix;
79241+extern int grsec_enable_symlinkown;
79242+extern kgid_t grsec_symlinkown_gid;
79243+extern int grsec_enable_tpe;
79244+extern kgid_t grsec_tpe_gid;
79245+extern int grsec_enable_tpe_all;
79246+extern int grsec_enable_tpe_invert;
79247+extern int grsec_enable_socket_all;
79248+extern kgid_t grsec_socket_all_gid;
79249+extern int grsec_enable_socket_client;
79250+extern kgid_t grsec_socket_client_gid;
79251+extern int grsec_enable_socket_server;
79252+extern kgid_t grsec_socket_server_gid;
79253+extern kgid_t grsec_audit_gid;
79254+extern int grsec_enable_group;
79255+extern int grsec_enable_log_rwxmaps;
79256+extern int grsec_enable_mount;
79257+extern int grsec_enable_chdir;
79258+extern int grsec_resource_logging;
79259+extern int grsec_enable_blackhole;
79260+extern int grsec_lastack_retries;
79261+extern int grsec_enable_brute;
79262+extern int grsec_enable_harden_ipc;
79263+extern int grsec_lock;
79264+
79265+extern spinlock_t grsec_alert_lock;
79266+extern unsigned long grsec_alert_wtime;
79267+extern unsigned long grsec_alert_fyet;
79268+
79269+extern spinlock_t grsec_audit_lock;
79270+
79271+extern rwlock_t grsec_exec_file_lock;
79272+
79273+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
79274+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
79275+ (tsk)->exec_file->f_path.mnt) : "/")
79276+
79277+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
79278+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
79279+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
79280+
79281+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
79282+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
79283+ (tsk)->exec_file->f_path.mnt) : "/")
79284+
79285+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
79286+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
79287+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
79288+
79289+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
79290+
79291+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
79292+
79293+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
79294+{
79295+ if (file1 && file2) {
79296+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
79297+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
79298+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
79299+ return true;
79300+ }
79301+
79302+ return false;
79303+}
79304+
79305+#define GR_CHROOT_CAPS {{ \
79306+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
79307+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
79308+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
79309+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
79310+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
79311+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
79312+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
79313+
79314+#define security_learn(normal_msg,args...) \
79315+({ \
79316+ read_lock(&grsec_exec_file_lock); \
79317+ gr_add_learn_entry(normal_msg "\n", ## args); \
79318+ read_unlock(&grsec_exec_file_lock); \
79319+})
79320+
79321+enum {
79322+ GR_DO_AUDIT,
79323+ GR_DONT_AUDIT,
79324+ /* used for non-audit messages that we shouldn't kill the task on */
79325+ GR_DONT_AUDIT_GOOD
79326+};
79327+
79328+enum {
79329+ GR_TTYSNIFF,
79330+ GR_RBAC,
79331+ GR_RBAC_STR,
79332+ GR_STR_RBAC,
79333+ GR_RBAC_MODE2,
79334+ GR_RBAC_MODE3,
79335+ GR_FILENAME,
79336+ GR_SYSCTL_HIDDEN,
79337+ GR_NOARGS,
79338+ GR_ONE_INT,
79339+ GR_ONE_INT_TWO_STR,
79340+ GR_ONE_STR,
79341+ GR_STR_INT,
79342+ GR_TWO_STR_INT,
79343+ GR_TWO_INT,
79344+ GR_TWO_U64,
79345+ GR_THREE_INT,
79346+ GR_FIVE_INT_TWO_STR,
79347+ GR_TWO_STR,
79348+ GR_THREE_STR,
79349+ GR_FOUR_STR,
79350+ GR_STR_FILENAME,
79351+ GR_FILENAME_STR,
79352+ GR_FILENAME_TWO_INT,
79353+ GR_FILENAME_TWO_INT_STR,
79354+ GR_TEXTREL,
79355+ GR_PTRACE,
79356+ GR_RESOURCE,
79357+ GR_CAP,
79358+ GR_SIG,
79359+ GR_SIG2,
79360+ GR_CRASH1,
79361+ GR_CRASH2,
79362+ GR_PSACCT,
79363+ GR_RWXMAP,
79364+ GR_RWXMAPVMA
79365+};
79366+
79367+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
79368+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
79369+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
79370+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
79371+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
79372+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
79373+#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)
79374+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
79375+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
79376+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
79377+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
79378+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
79379+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
79380+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
79381+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
79382+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
79383+#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)
79384+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
79385+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
79386+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
79387+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
79388+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
79389+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
79390+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
79391+#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)
79392+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
79393+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
79394+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
79395+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
79396+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
79397+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
79398+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
79399+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
79400+#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)
79401+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
79402+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
79403+
79404+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
79405+
79406+#endif
79407+
79408+#endif
79409diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
79410new file mode 100644
79411index 0000000..b02ba9d
79412--- /dev/null
79413+++ b/include/linux/grmsg.h
79414@@ -0,0 +1,117 @@
79415+#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"
79416+#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"
79417+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
79418+#define GR_STOPMOD_MSG "denied modification of module state by "
79419+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
79420+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
79421+#define GR_IOPERM_MSG "denied use of ioperm() by "
79422+#define GR_IOPL_MSG "denied use of iopl() by "
79423+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
79424+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
79425+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
79426+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
79427+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
79428+#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"
79429+#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"
79430+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
79431+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
79432+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
79433+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
79434+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
79435+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
79436+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
79437+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
79438+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
79439+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
79440+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
79441+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
79442+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
79443+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
79444+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
79445+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
79446+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
79447+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
79448+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
79449+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
79450+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
79451+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
79452+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
79453+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
79454+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
79455+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
79456+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
79457+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
79458+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
79459+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
79460+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
79461+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
79462+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
79463+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
79464+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
79465+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
79466+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
79467+#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"
79468+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
79469+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
79470+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
79471+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
79472+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
79473+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
79474+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
79475+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
79476+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
79477+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
79478+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
79479+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
79480+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
79481+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
79482+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
79483+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
79484+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
79485+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
79486+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
79487+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
79488+#define GR_FAILFORK_MSG "failed fork with errno %s by "
79489+#define GR_NICE_CHROOT_MSG "denied priority change by "
79490+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
79491+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
79492+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
79493+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
79494+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
79495+#define GR_TIME_MSG "time set by "
79496+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
79497+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
79498+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
79499+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
79500+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
79501+#define GR_BIND_MSG "denied bind() by "
79502+#define GR_CONNECT_MSG "denied connect() by "
79503+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
79504+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
79505+#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"
79506+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
79507+#define GR_CAP_ACL_MSG "use of %s denied for "
79508+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
79509+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
79510+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
79511+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
79512+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
79513+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
79514+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
79515+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
79516+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
79517+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
79518+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
79519+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
79520+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
79521+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
79522+#define GR_VM86_MSG "denied use of vm86 by "
79523+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
79524+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
79525+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
79526+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
79527+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
79528+#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 "
79529+#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 "
79530+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
79531+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
79532diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
79533new file mode 100644
79534index 0000000..13ac2e2
79535--- /dev/null
79536+++ b/include/linux/grsecurity.h
79537@@ -0,0 +1,249 @@
79538+#ifndef GR_SECURITY_H
79539+#define GR_SECURITY_H
79540+#include <linux/fs.h>
79541+#include <linux/fs_struct.h>
79542+#include <linux/binfmts.h>
79543+#include <linux/gracl.h>
79544+
79545+/* notify of brain-dead configs */
79546+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79547+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
79548+#endif
79549+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
79550+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
79551+#endif
79552+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
79553+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
79554+#endif
79555+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
79556+#error "CONFIG_PAX enabled, but no PaX options are enabled."
79557+#endif
79558+
79559+int gr_handle_new_usb(void);
79560+
79561+void gr_handle_brute_attach(int dumpable);
79562+void gr_handle_brute_check(void);
79563+void gr_handle_kernel_exploit(void);
79564+
79565+char gr_roletype_to_char(void);
79566+
79567+int gr_proc_is_restricted(void);
79568+
79569+int gr_acl_enable_at_secure(void);
79570+
79571+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
79572+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
79573+
79574+void gr_del_task_from_ip_table(struct task_struct *p);
79575+
79576+int gr_pid_is_chrooted(struct task_struct *p);
79577+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
79578+int gr_handle_chroot_nice(void);
79579+int gr_handle_chroot_sysctl(const int op);
79580+int gr_handle_chroot_setpriority(struct task_struct *p,
79581+ const int niceval);
79582+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
79583+int gr_chroot_fhandle(void);
79584+int gr_handle_chroot_chroot(const struct dentry *dentry,
79585+ const struct vfsmount *mnt);
79586+void gr_handle_chroot_chdir(const struct path *path);
79587+int gr_handle_chroot_chmod(const struct dentry *dentry,
79588+ const struct vfsmount *mnt, const int mode);
79589+int gr_handle_chroot_mknod(const struct dentry *dentry,
79590+ const struct vfsmount *mnt, const int mode);
79591+int gr_handle_chroot_mount(const struct dentry *dentry,
79592+ const struct vfsmount *mnt,
79593+ const char *dev_name);
79594+int gr_handle_chroot_pivot(void);
79595+int gr_handle_chroot_unix(const pid_t pid);
79596+
79597+int gr_handle_rawio(const struct inode *inode);
79598+
79599+void gr_handle_ioperm(void);
79600+void gr_handle_iopl(void);
79601+void gr_handle_msr_write(void);
79602+
79603+umode_t gr_acl_umask(void);
79604+
79605+int gr_tpe_allow(const struct file *file);
79606+
79607+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
79608+void gr_clear_chroot_entries(struct task_struct *task);
79609+
79610+void gr_log_forkfail(const int retval);
79611+void gr_log_timechange(void);
79612+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
79613+void gr_log_chdir(const struct dentry *dentry,
79614+ const struct vfsmount *mnt);
79615+void gr_log_chroot_exec(const struct dentry *dentry,
79616+ const struct vfsmount *mnt);
79617+void gr_log_remount(const char *devname, const int retval);
79618+void gr_log_unmount(const char *devname, const int retval);
79619+void gr_log_mount(const char *from, const char *to, const int retval);
79620+void gr_log_textrel(struct vm_area_struct *vma);
79621+void gr_log_ptgnustack(struct file *file);
79622+void gr_log_rwxmmap(struct file *file);
79623+void gr_log_rwxmprotect(struct vm_area_struct *vma);
79624+
79625+int gr_handle_follow_link(const struct inode *parent,
79626+ const struct inode *inode,
79627+ const struct dentry *dentry,
79628+ const struct vfsmount *mnt);
79629+int gr_handle_fifo(const struct dentry *dentry,
79630+ const struct vfsmount *mnt,
79631+ const struct dentry *dir, const int flag,
79632+ const int acc_mode);
79633+int gr_handle_hardlink(const struct dentry *dentry,
79634+ const struct vfsmount *mnt,
79635+ struct inode *inode,
79636+ const int mode, const struct filename *to);
79637+
79638+int gr_is_capable(const int cap);
79639+int gr_is_capable_nolog(const int cap);
79640+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
79641+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
79642+
79643+void gr_copy_label(struct task_struct *tsk);
79644+void gr_handle_crash(struct task_struct *task, const int sig);
79645+int gr_handle_signal(const struct task_struct *p, const int sig);
79646+int gr_check_crash_uid(const kuid_t uid);
79647+int gr_check_protected_task(const struct task_struct *task);
79648+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
79649+int gr_acl_handle_mmap(const struct file *file,
79650+ const unsigned long prot);
79651+int gr_acl_handle_mprotect(const struct file *file,
79652+ const unsigned long prot);
79653+int gr_check_hidden_task(const struct task_struct *tsk);
79654+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
79655+ const struct vfsmount *mnt);
79656+__u32 gr_acl_handle_utime(const struct dentry *dentry,
79657+ const struct vfsmount *mnt);
79658+__u32 gr_acl_handle_access(const struct dentry *dentry,
79659+ const struct vfsmount *mnt, const int fmode);
79660+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
79661+ const struct vfsmount *mnt, umode_t *mode);
79662+__u32 gr_acl_handle_chown(const struct dentry *dentry,
79663+ const struct vfsmount *mnt);
79664+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
79665+ const struct vfsmount *mnt);
79666+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
79667+ const struct vfsmount *mnt);
79668+int gr_handle_ptrace(struct task_struct *task, const long request);
79669+int gr_handle_proc_ptrace(struct task_struct *task);
79670+__u32 gr_acl_handle_execve(const struct dentry *dentry,
79671+ const struct vfsmount *mnt);
79672+int gr_check_crash_exec(const struct file *filp);
79673+int gr_acl_is_enabled(void);
79674+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
79675+ const kgid_t gid);
79676+int gr_set_proc_label(const struct dentry *dentry,
79677+ const struct vfsmount *mnt,
79678+ const int unsafe_flags);
79679+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
79680+ const struct vfsmount *mnt);
79681+__u32 gr_acl_handle_open(const struct dentry *dentry,
79682+ const struct vfsmount *mnt, int acc_mode);
79683+__u32 gr_acl_handle_creat(const struct dentry *dentry,
79684+ const struct dentry *p_dentry,
79685+ const struct vfsmount *p_mnt,
79686+ int open_flags, int acc_mode, const int imode);
79687+void gr_handle_create(const struct dentry *dentry,
79688+ const struct vfsmount *mnt);
79689+void gr_handle_proc_create(const struct dentry *dentry,
79690+ const struct inode *inode);
79691+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
79692+ const struct dentry *parent_dentry,
79693+ const struct vfsmount *parent_mnt,
79694+ const int mode);
79695+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
79696+ const struct dentry *parent_dentry,
79697+ const struct vfsmount *parent_mnt);
79698+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
79699+ const struct vfsmount *mnt);
79700+void gr_handle_delete(const ino_t ino, const dev_t dev);
79701+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
79702+ const struct vfsmount *mnt);
79703+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
79704+ const struct dentry *parent_dentry,
79705+ const struct vfsmount *parent_mnt,
79706+ const struct filename *from);
79707+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
79708+ const struct dentry *parent_dentry,
79709+ const struct vfsmount *parent_mnt,
79710+ const struct dentry *old_dentry,
79711+ const struct vfsmount *old_mnt, const struct filename *to);
79712+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
79713+int gr_acl_handle_rename(struct dentry *new_dentry,
79714+ struct dentry *parent_dentry,
79715+ const struct vfsmount *parent_mnt,
79716+ struct dentry *old_dentry,
79717+ struct inode *old_parent_inode,
79718+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
79719+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79720+ struct dentry *old_dentry,
79721+ struct dentry *new_dentry,
79722+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
79723+__u32 gr_check_link(const struct dentry *new_dentry,
79724+ const struct dentry *parent_dentry,
79725+ const struct vfsmount *parent_mnt,
79726+ const struct dentry *old_dentry,
79727+ const struct vfsmount *old_mnt);
79728+int gr_acl_handle_filldir(const struct file *file, const char *name,
79729+ const unsigned int namelen, const ino_t ino);
79730+
79731+__u32 gr_acl_handle_unix(const struct dentry *dentry,
79732+ const struct vfsmount *mnt);
79733+void gr_acl_handle_exit(void);
79734+void gr_acl_handle_psacct(struct task_struct *task, const long code);
79735+int gr_acl_handle_procpidmem(const struct task_struct *task);
79736+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
79737+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
79738+void gr_audit_ptrace(struct task_struct *task);
79739+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
79740+void gr_put_exec_file(struct task_struct *task);
79741+
79742+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
79743+
79744+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
79745+extern void gr_learn_resource(const struct task_struct *task, const int res,
79746+ const unsigned long wanted, const int gt);
79747+#else
79748+static inline void gr_learn_resource(const struct task_struct *task, const int res,
79749+ const unsigned long wanted, const int gt)
79750+{
79751+}
79752+#endif
79753+
79754+#ifdef CONFIG_GRKERNSEC_RESLOG
79755+extern void gr_log_resource(const struct task_struct *task, const int res,
79756+ const unsigned long wanted, const int gt);
79757+#else
79758+static inline void gr_log_resource(const struct task_struct *task, const int res,
79759+ const unsigned long wanted, const int gt)
79760+{
79761+}
79762+#endif
79763+
79764+#ifdef CONFIG_GRKERNSEC
79765+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
79766+void gr_handle_vm86(void);
79767+void gr_handle_mem_readwrite(u64 from, u64 to);
79768+
79769+void gr_log_badprocpid(const char *entry);
79770+
79771+extern int grsec_enable_dmesg;
79772+extern int grsec_disable_privio;
79773+
79774+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
79775+extern kgid_t grsec_proc_gid;
79776+#endif
79777+
79778+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
79779+extern int grsec_enable_chroot_findtask;
79780+#endif
79781+#ifdef CONFIG_GRKERNSEC_SETXID
79782+extern int grsec_enable_setxid;
79783+#endif
79784+#endif
79785+
79786+#endif
79787diff --git a/include/linux/grsock.h b/include/linux/grsock.h
79788new file mode 100644
79789index 0000000..e7ffaaf
79790--- /dev/null
79791+++ b/include/linux/grsock.h
79792@@ -0,0 +1,19 @@
79793+#ifndef __GRSOCK_H
79794+#define __GRSOCK_H
79795+
79796+extern void gr_attach_curr_ip(const struct sock *sk);
79797+extern int gr_handle_sock_all(const int family, const int type,
79798+ const int protocol);
79799+extern int gr_handle_sock_server(const struct sockaddr *sck);
79800+extern int gr_handle_sock_server_other(const struct sock *sck);
79801+extern int gr_handle_sock_client(const struct sockaddr *sck);
79802+extern int gr_search_connect(struct socket * sock,
79803+ struct sockaddr_in * addr);
79804+extern int gr_search_bind(struct socket * sock,
79805+ struct sockaddr_in * addr);
79806+extern int gr_search_listen(struct socket * sock);
79807+extern int gr_search_accept(struct socket * sock);
79808+extern int gr_search_socket(const int domain, const int type,
79809+ const int protocol);
79810+
79811+#endif
79812diff --git a/include/linux/hash.h b/include/linux/hash.h
79813index bd1754c..8240892 100644
79814--- a/include/linux/hash.h
79815+++ b/include/linux/hash.h
79816@@ -83,7 +83,7 @@ static inline u32 hash32_ptr(const void *ptr)
79817 struct fast_hash_ops {
79818 u32 (*hash)(const void *data, u32 len, u32 seed);
79819 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
79820-};
79821+} __no_const;
79822
79823 /**
79824 * arch_fast_hash - Caclulates a hash over a given buffer that can have
79825diff --git a/include/linux/highmem.h b/include/linux/highmem.h
79826index 7fb31da..08b5114 100644
79827--- a/include/linux/highmem.h
79828+++ b/include/linux/highmem.h
79829@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
79830 kunmap_atomic(kaddr);
79831 }
79832
79833+static inline void sanitize_highpage(struct page *page)
79834+{
79835+ void *kaddr;
79836+ unsigned long flags;
79837+
79838+ local_irq_save(flags);
79839+ kaddr = kmap_atomic(page);
79840+ clear_page(kaddr);
79841+ kunmap_atomic(kaddr);
79842+ local_irq_restore(flags);
79843+}
79844+
79845 static inline void zero_user_segments(struct page *page,
79846 unsigned start1, unsigned end1,
79847 unsigned start2, unsigned end2)
79848diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
79849index 1c7b89a..7dda400 100644
79850--- a/include/linux/hwmon-sysfs.h
79851+++ b/include/linux/hwmon-sysfs.h
79852@@ -25,7 +25,8 @@
79853 struct sensor_device_attribute{
79854 struct device_attribute dev_attr;
79855 int index;
79856-};
79857+} __do_const;
79858+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
79859 #define to_sensor_dev_attr(_dev_attr) \
79860 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
79861
79862@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
79863 struct device_attribute dev_attr;
79864 u8 index;
79865 u8 nr;
79866-};
79867+} __do_const;
79868+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
79869 #define to_sensor_dev_attr_2(_dev_attr) \
79870 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
79871
79872diff --git a/include/linux/i2c.h b/include/linux/i2c.h
79873index b556e0a..c10a515 100644
79874--- a/include/linux/i2c.h
79875+++ b/include/linux/i2c.h
79876@@ -378,6 +378,7 @@ struct i2c_algorithm {
79877 /* To determine what the adapter supports */
79878 u32 (*functionality) (struct i2c_adapter *);
79879 };
79880+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
79881
79882 /**
79883 * struct i2c_bus_recovery_info - I2C bus recovery information
79884diff --git a/include/linux/i2o.h b/include/linux/i2o.h
79885index d23c3c2..eb63c81 100644
79886--- a/include/linux/i2o.h
79887+++ b/include/linux/i2o.h
79888@@ -565,7 +565,7 @@ struct i2o_controller {
79889 struct i2o_device *exec; /* Executive */
79890 #if BITS_PER_LONG == 64
79891 spinlock_t context_list_lock; /* lock for context_list */
79892- atomic_t context_list_counter; /* needed for unique contexts */
79893+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
79894 struct list_head context_list; /* list of context id's
79895 and pointers */
79896 #endif
79897diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
79898index aff7ad8..3942bbd 100644
79899--- a/include/linux/if_pppox.h
79900+++ b/include/linux/if_pppox.h
79901@@ -76,7 +76,7 @@ struct pppox_proto {
79902 int (*ioctl)(struct socket *sock, unsigned int cmd,
79903 unsigned long arg);
79904 struct module *owner;
79905-};
79906+} __do_const;
79907
79908 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
79909 extern void unregister_pppox_proto(int proto_num);
79910diff --git a/include/linux/init.h b/include/linux/init.h
79911index a3ba270..a1b6604 100644
79912--- a/include/linux/init.h
79913+++ b/include/linux/init.h
79914@@ -37,9 +37,17 @@
79915 * section.
79916 */
79917
79918+#define add_init_latent_entropy __latent_entropy
79919+
79920+#ifdef CONFIG_MEMORY_HOTPLUG
79921+#define add_meminit_latent_entropy
79922+#else
79923+#define add_meminit_latent_entropy __latent_entropy
79924+#endif
79925+
79926 /* These are for everybody (although not all archs will actually
79927 discard it in modules) */
79928-#define __init __section(.init.text) __cold notrace
79929+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
79930 #define __initdata __section(.init.data)
79931 #define __initconst __constsection(.init.rodata)
79932 #define __exitdata __section(.exit.data)
79933@@ -100,7 +108,7 @@
79934 #define __cpuexitconst
79935
79936 /* Used for MEMORY_HOTPLUG */
79937-#define __meminit __section(.meminit.text) __cold notrace
79938+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
79939 #define __meminitdata __section(.meminit.data)
79940 #define __meminitconst __constsection(.meminit.rodata)
79941 #define __memexit __section(.memexit.text) __exitused __cold notrace
79942diff --git a/include/linux/init_task.h b/include/linux/init_task.h
79943index 6df7f9f..d0bf699 100644
79944--- a/include/linux/init_task.h
79945+++ b/include/linux/init_task.h
79946@@ -156,6 +156,12 @@ extern struct task_group root_task_group;
79947
79948 #define INIT_TASK_COMM "swapper"
79949
79950+#ifdef CONFIG_X86
79951+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
79952+#else
79953+#define INIT_TASK_THREAD_INFO
79954+#endif
79955+
79956 #ifdef CONFIG_RT_MUTEXES
79957 # define INIT_RT_MUTEXES(tsk) \
79958 .pi_waiters = RB_ROOT, \
79959@@ -203,6 +209,7 @@ extern struct task_group root_task_group;
79960 RCU_POINTER_INITIALIZER(cred, &init_cred), \
79961 .comm = INIT_TASK_COMM, \
79962 .thread = INIT_THREAD, \
79963+ INIT_TASK_THREAD_INFO \
79964 .fs = &init_fs, \
79965 .files = &init_files, \
79966 .signal = &init_signals, \
79967diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
79968index 051c850..431f83a 100644
79969--- a/include/linux/interrupt.h
79970+++ b/include/linux/interrupt.h
79971@@ -412,8 +412,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
79972
79973 struct softirq_action
79974 {
79975- void (*action)(struct softirq_action *);
79976-};
79977+ void (*action)(void);
79978+} __no_const;
79979
79980 asmlinkage void do_softirq(void);
79981 asmlinkage void __do_softirq(void);
79982@@ -427,7 +427,7 @@ static inline void do_softirq_own_stack(void)
79983 }
79984 #endif
79985
79986-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
79987+extern void open_softirq(int nr, void (*action)(void));
79988 extern void softirq_init(void);
79989 extern void __raise_softirq_irqoff(unsigned int nr);
79990
79991diff --git a/include/linux/iommu.h b/include/linux/iommu.h
79992index b96a5b2..2732d1c 100644
79993--- a/include/linux/iommu.h
79994+++ b/include/linux/iommu.h
79995@@ -131,7 +131,7 @@ struct iommu_ops {
79996 u32 (*domain_get_windows)(struct iommu_domain *domain);
79997
79998 unsigned long pgsize_bitmap;
79999-};
80000+} __do_const;
80001
80002 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
80003 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
80004diff --git a/include/linux/ioport.h b/include/linux/ioport.h
80005index 5e3a906..3131d0f 100644
80006--- a/include/linux/ioport.h
80007+++ b/include/linux/ioport.h
80008@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
80009 int adjust_resource(struct resource *res, resource_size_t start,
80010 resource_size_t size);
80011 resource_size_t resource_alignment(struct resource *res);
80012-static inline resource_size_t resource_size(const struct resource *res)
80013+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
80014 {
80015 return res->end - res->start + 1;
80016 }
80017diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
80018index 35e7eca..6afb7ad 100644
80019--- a/include/linux/ipc_namespace.h
80020+++ b/include/linux/ipc_namespace.h
80021@@ -69,7 +69,7 @@ struct ipc_namespace {
80022 struct user_namespace *user_ns;
80023
80024 unsigned int proc_inum;
80025-};
80026+} __randomize_layout;
80027
80028 extern struct ipc_namespace init_ipc_ns;
80029 extern atomic_t nr_ipc_ns;
80030diff --git a/include/linux/irq.h b/include/linux/irq.h
80031index 5c57efb..965a62b 100644
80032--- a/include/linux/irq.h
80033+++ b/include/linux/irq.h
80034@@ -344,7 +344,8 @@ struct irq_chip {
80035 void (*irq_release_resources)(struct irq_data *data);
80036
80037 unsigned long flags;
80038-};
80039+} __do_const;
80040+typedef struct irq_chip __no_const irq_chip_no_const;
80041
80042 /*
80043 * irq_chip specific flags
80044diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
80045index 7ed92d0..589abf5 100644
80046--- a/include/linux/irqchip/arm-gic.h
80047+++ b/include/linux/irqchip/arm-gic.h
80048@@ -73,9 +73,11 @@
80049
80050 #ifndef __ASSEMBLY__
80051
80052+#include <linux/irq.h>
80053+
80054 struct device_node;
80055
80056-extern struct irq_chip gic_arch_extn;
80057+extern irq_chip_no_const gic_arch_extn;
80058
80059 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
80060 u32 offset, struct device_node *);
80061diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
80062index 1f44466..b481806 100644
80063--- a/include/linux/jiffies.h
80064+++ b/include/linux/jiffies.h
80065@@ -292,20 +292,20 @@ extern unsigned long preset_lpj;
80066 /*
80067 * Convert various time units to each other:
80068 */
80069-extern unsigned int jiffies_to_msecs(const unsigned long j);
80070-extern unsigned int jiffies_to_usecs(const unsigned long j);
80071+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
80072+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
80073
80074-static inline u64 jiffies_to_nsecs(const unsigned long j)
80075+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
80076 {
80077 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
80078 }
80079
80080-extern unsigned long msecs_to_jiffies(const unsigned int m);
80081-extern unsigned long usecs_to_jiffies(const unsigned int u);
80082+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
80083+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
80084 extern unsigned long timespec_to_jiffies(const struct timespec *value);
80085 extern void jiffies_to_timespec(const unsigned long jiffies,
80086- struct timespec *value);
80087-extern unsigned long timeval_to_jiffies(const struct timeval *value);
80088+ struct timespec *value) __intentional_overflow(-1);
80089+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
80090 extern void jiffies_to_timeval(const unsigned long jiffies,
80091 struct timeval *value);
80092
80093diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
80094index 6883e19..e854fcb 100644
80095--- a/include/linux/kallsyms.h
80096+++ b/include/linux/kallsyms.h
80097@@ -15,7 +15,8 @@
80098
80099 struct module;
80100
80101-#ifdef CONFIG_KALLSYMS
80102+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
80103+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80104 /* Lookup the address for a symbol. Returns 0 if not found. */
80105 unsigned long kallsyms_lookup_name(const char *name);
80106
80107@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
80108 /* Stupid that this does nothing, but I didn't create this mess. */
80109 #define __print_symbol(fmt, addr)
80110 #endif /*CONFIG_KALLSYMS*/
80111+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
80112+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
80113+extern unsigned long kallsyms_lookup_name(const char *name);
80114+extern void __print_symbol(const char *fmt, unsigned long address);
80115+extern int sprint_backtrace(char *buffer, unsigned long address);
80116+extern int sprint_symbol(char *buffer, unsigned long address);
80117+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
80118+const char *kallsyms_lookup(unsigned long addr,
80119+ unsigned long *symbolsize,
80120+ unsigned long *offset,
80121+ char **modname, char *namebuf);
80122+extern int kallsyms_lookup_size_offset(unsigned long addr,
80123+ unsigned long *symbolsize,
80124+ unsigned long *offset);
80125+#endif
80126
80127 /* This macro allows us to keep printk typechecking */
80128 static __printf(1, 2)
80129diff --git a/include/linux/key-type.h b/include/linux/key-type.h
80130index a74c3a8..28d3f21 100644
80131--- a/include/linux/key-type.h
80132+++ b/include/linux/key-type.h
80133@@ -131,7 +131,7 @@ struct key_type {
80134 /* internal fields */
80135 struct list_head link; /* link in types list */
80136 struct lock_class_key lock_class; /* key->sem lock class */
80137-};
80138+} __do_const;
80139
80140 extern struct key_type key_type_keyring;
80141
80142diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
80143index 6b06d37..c134867 100644
80144--- a/include/linux/kgdb.h
80145+++ b/include/linux/kgdb.h
80146@@ -52,7 +52,7 @@ extern int kgdb_connected;
80147 extern int kgdb_io_module_registered;
80148
80149 extern atomic_t kgdb_setting_breakpoint;
80150-extern atomic_t kgdb_cpu_doing_single_step;
80151+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
80152
80153 extern struct task_struct *kgdb_usethread;
80154 extern struct task_struct *kgdb_contthread;
80155@@ -254,7 +254,7 @@ struct kgdb_arch {
80156 void (*correct_hw_break)(void);
80157
80158 void (*enable_nmi)(bool on);
80159-};
80160+} __do_const;
80161
80162 /**
80163 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
80164@@ -279,7 +279,7 @@ struct kgdb_io {
80165 void (*pre_exception) (void);
80166 void (*post_exception) (void);
80167 int is_console;
80168-};
80169+} __do_const;
80170
80171 extern struct kgdb_arch arch_kgdb_ops;
80172
80173diff --git a/include/linux/kmod.h b/include/linux/kmod.h
80174index 0555cc6..40116ce 100644
80175--- a/include/linux/kmod.h
80176+++ b/include/linux/kmod.h
80177@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
80178 * usually useless though. */
80179 extern __printf(2, 3)
80180 int __request_module(bool wait, const char *name, ...);
80181+extern __printf(3, 4)
80182+int ___request_module(bool wait, char *param_name, const char *name, ...);
80183 #define request_module(mod...) __request_module(true, mod)
80184 #define request_module_nowait(mod...) __request_module(false, mod)
80185 #define try_then_request_module(x, mod...) \
80186@@ -57,6 +59,9 @@ struct subprocess_info {
80187 struct work_struct work;
80188 struct completion *complete;
80189 char *path;
80190+#ifdef CONFIG_GRKERNSEC
80191+ char *origpath;
80192+#endif
80193 char **argv;
80194 char **envp;
80195 int wait;
80196diff --git a/include/linux/kobject.h b/include/linux/kobject.h
80197index f896a33..f2eb10f 100644
80198--- a/include/linux/kobject.h
80199+++ b/include/linux/kobject.h
80200@@ -116,7 +116,7 @@ struct kobj_type {
80201 struct attribute **default_attrs;
80202 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
80203 const void *(*namespace)(struct kobject *kobj);
80204-};
80205+} __do_const;
80206
80207 struct kobj_uevent_env {
80208 char *argv[3];
80209@@ -140,6 +140,7 @@ struct kobj_attribute {
80210 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
80211 const char *buf, size_t count);
80212 };
80213+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
80214
80215 extern const struct sysfs_ops kobj_sysfs_ops;
80216
80217@@ -167,7 +168,7 @@ struct kset {
80218 spinlock_t list_lock;
80219 struct kobject kobj;
80220 const struct kset_uevent_ops *uevent_ops;
80221-};
80222+} __randomize_layout;
80223
80224 extern void kset_init(struct kset *kset);
80225 extern int __must_check kset_register(struct kset *kset);
80226diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
80227index df32d25..fb52e27 100644
80228--- a/include/linux/kobject_ns.h
80229+++ b/include/linux/kobject_ns.h
80230@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
80231 const void *(*netlink_ns)(struct sock *sk);
80232 const void *(*initial_ns)(void);
80233 void (*drop_ns)(void *);
80234-};
80235+} __do_const;
80236
80237 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
80238 int kobj_ns_type_registered(enum kobj_ns_type type);
80239diff --git a/include/linux/kref.h b/include/linux/kref.h
80240index 484604d..0f6c5b6 100644
80241--- a/include/linux/kref.h
80242+++ b/include/linux/kref.h
80243@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
80244 static inline int kref_sub(struct kref *kref, unsigned int count,
80245 void (*release)(struct kref *kref))
80246 {
80247- WARN_ON(release == NULL);
80248+ BUG_ON(release == NULL);
80249
80250 if (atomic_sub_and_test((int) count, &kref->refcount)) {
80251 release(kref);
80252diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
80253index 7d21cf9..bc0c81f 100644
80254--- a/include/linux/kvm_host.h
80255+++ b/include/linux/kvm_host.h
80256@@ -466,7 +466,7 @@ static inline void kvm_irqfd_exit(void)
80257 {
80258 }
80259 #endif
80260-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
80261+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
80262 struct module *module);
80263 void kvm_exit(void);
80264
80265@@ -632,7 +632,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
80266 struct kvm_guest_debug *dbg);
80267 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
80268
80269-int kvm_arch_init(void *opaque);
80270+int kvm_arch_init(const void *opaque);
80271 void kvm_arch_exit(void);
80272
80273 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
80274diff --git a/include/linux/libata.h b/include/linux/libata.h
80275index 5ab4e3a..2fe237b 100644
80276--- a/include/linux/libata.h
80277+++ b/include/linux/libata.h
80278@@ -975,7 +975,7 @@ struct ata_port_operations {
80279 * fields must be pointers.
80280 */
80281 const struct ata_port_operations *inherits;
80282-};
80283+} __do_const;
80284
80285 struct ata_port_info {
80286 unsigned long flags;
80287diff --git a/include/linux/linkage.h b/include/linux/linkage.h
80288index a6a42dd..6c5ebce 100644
80289--- a/include/linux/linkage.h
80290+++ b/include/linux/linkage.h
80291@@ -36,6 +36,7 @@
80292 #endif
80293
80294 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
80295+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
80296 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
80297
80298 /*
80299diff --git a/include/linux/list.h b/include/linux/list.h
80300index ef95941..82db65a 100644
80301--- a/include/linux/list.h
80302+++ b/include/linux/list.h
80303@@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
80304 extern void list_del(struct list_head *entry);
80305 #endif
80306
80307+extern void __pax_list_add(struct list_head *new,
80308+ struct list_head *prev,
80309+ struct list_head *next);
80310+static inline void pax_list_add(struct list_head *new, struct list_head *head)
80311+{
80312+ __pax_list_add(new, head, head->next);
80313+}
80314+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
80315+{
80316+ __pax_list_add(new, head->prev, head);
80317+}
80318+extern void pax_list_del(struct list_head *entry);
80319+
80320 /**
80321 * list_replace - replace old entry by new one
80322 * @old : the element to be replaced
80323@@ -145,6 +158,8 @@ static inline void list_del_init(struct list_head *entry)
80324 INIT_LIST_HEAD(entry);
80325 }
80326
80327+extern void pax_list_del_init(struct list_head *entry);
80328+
80329 /**
80330 * list_move - delete from one list and add as another's head
80331 * @list: the entry to move
80332diff --git a/include/linux/math64.h b/include/linux/math64.h
80333index c45c089..298841c 100644
80334--- a/include/linux/math64.h
80335+++ b/include/linux/math64.h
80336@@ -15,7 +15,7 @@
80337 * This is commonly provided by 32bit archs to provide an optimized 64bit
80338 * divide.
80339 */
80340-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80341+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80342 {
80343 *remainder = dividend % divisor;
80344 return dividend / divisor;
80345@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
80346 /**
80347 * div64_u64 - unsigned 64bit divide with 64bit divisor
80348 */
80349-static inline u64 div64_u64(u64 dividend, u64 divisor)
80350+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
80351 {
80352 return dividend / divisor;
80353 }
80354@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
80355 #define div64_ul(x, y) div_u64((x), (y))
80356
80357 #ifndef div_u64_rem
80358-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80359+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
80360 {
80361 *remainder = do_div(dividend, divisor);
80362 return dividend;
80363@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
80364 #endif
80365
80366 #ifndef div64_u64
80367-extern u64 div64_u64(u64 dividend, u64 divisor);
80368+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
80369 #endif
80370
80371 #ifndef div64_s64
80372@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
80373 * divide.
80374 */
80375 #ifndef div_u64
80376-static inline u64 div_u64(u64 dividend, u32 divisor)
80377+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
80378 {
80379 u32 remainder;
80380 return div_u64_rem(dividend, divisor, &remainder);
80381diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
80382index f230a97..714c006 100644
80383--- a/include/linux/mempolicy.h
80384+++ b/include/linux/mempolicy.h
80385@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
80386 }
80387
80388 #define vma_policy(vma) ((vma)->vm_policy)
80389+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
80390+{
80391+ vma->vm_policy = pol;
80392+}
80393
80394 static inline void mpol_get(struct mempolicy *pol)
80395 {
80396@@ -228,6 +232,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
80397 }
80398
80399 #define vma_policy(vma) NULL
80400+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
80401+{
80402+}
80403
80404 static inline int
80405 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
80406diff --git a/include/linux/mm.h b/include/linux/mm.h
80407index d677706..673408c 100644
80408--- a/include/linux/mm.h
80409+++ b/include/linux/mm.h
80410@@ -127,6 +127,11 @@ extern unsigned int kobjsize(const void *objp);
80411 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
80412 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
80413 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
80414+
80415+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
80416+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
80417+#endif
80418+
80419 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
80420
80421 #ifdef CONFIG_MEM_SOFT_DIRTY
80422@@ -237,8 +242,8 @@ struct vm_operations_struct {
80423 /* called by access_process_vm when get_user_pages() fails, typically
80424 * for use by special VMAs that can switch between memory and hardware
80425 */
80426- int (*access)(struct vm_area_struct *vma, unsigned long addr,
80427- void *buf, int len, int write);
80428+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
80429+ void *buf, size_t len, int write);
80430 #ifdef CONFIG_NUMA
80431 /*
80432 * set_policy() op must add a reference to any non-NULL @new mempolicy
80433@@ -268,6 +273,7 @@ struct vm_operations_struct {
80434 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
80435 unsigned long size, pgoff_t pgoff);
80436 };
80437+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
80438
80439 struct mmu_gather;
80440 struct inode;
80441@@ -1133,8 +1139,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
80442 unsigned long *pfn);
80443 int follow_phys(struct vm_area_struct *vma, unsigned long address,
80444 unsigned int flags, unsigned long *prot, resource_size_t *phys);
80445-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
80446- void *buf, int len, int write);
80447+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
80448+ void *buf, size_t len, int write);
80449
80450 static inline void unmap_shared_mapping_range(struct address_space *mapping,
80451 loff_t const holebegin, loff_t const holelen)
80452@@ -1173,9 +1179,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
80453 }
80454 #endif
80455
80456-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
80457-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
80458- void *buf, int len, int write);
80459+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
80460+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
80461+ void *buf, size_t len, int write);
80462
80463 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
80464 unsigned long start, unsigned long nr_pages,
80465@@ -1208,34 +1214,6 @@ int set_page_dirty_lock(struct page *page);
80466 int clear_page_dirty_for_io(struct page *page);
80467 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
80468
80469-/* Is the vma a continuation of the stack vma above it? */
80470-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
80471-{
80472- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
80473-}
80474-
80475-static inline int stack_guard_page_start(struct vm_area_struct *vma,
80476- unsigned long addr)
80477-{
80478- return (vma->vm_flags & VM_GROWSDOWN) &&
80479- (vma->vm_start == addr) &&
80480- !vma_growsdown(vma->vm_prev, addr);
80481-}
80482-
80483-/* Is the vma a continuation of the stack vma below it? */
80484-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
80485-{
80486- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
80487-}
80488-
80489-static inline int stack_guard_page_end(struct vm_area_struct *vma,
80490- unsigned long addr)
80491-{
80492- return (vma->vm_flags & VM_GROWSUP) &&
80493- (vma->vm_end == addr) &&
80494- !vma_growsup(vma->vm_next, addr);
80495-}
80496-
80497 extern pid_t
80498 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
80499
80500@@ -1335,6 +1313,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
80501 }
80502 #endif
80503
80504+#ifdef CONFIG_MMU
80505+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
80506+#else
80507+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
80508+{
80509+ return __pgprot(0);
80510+}
80511+#endif
80512+
80513 int vma_wants_writenotify(struct vm_area_struct *vma);
80514
80515 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
80516@@ -1353,8 +1340,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
80517 {
80518 return 0;
80519 }
80520+
80521+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
80522+ unsigned long address)
80523+{
80524+ return 0;
80525+}
80526 #else
80527 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
80528+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
80529 #endif
80530
80531 #ifdef __PAGETABLE_PMD_FOLDED
80532@@ -1363,8 +1357,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
80533 {
80534 return 0;
80535 }
80536+
80537+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
80538+ unsigned long address)
80539+{
80540+ return 0;
80541+}
80542 #else
80543 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
80544+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
80545 #endif
80546
80547 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
80548@@ -1382,11 +1383,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
80549 NULL: pud_offset(pgd, address);
80550 }
80551
80552+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
80553+{
80554+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
80555+ NULL: pud_offset(pgd, address);
80556+}
80557+
80558 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
80559 {
80560 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
80561 NULL: pmd_offset(pud, address);
80562 }
80563+
80564+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
80565+{
80566+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
80567+ NULL: pmd_offset(pud, address);
80568+}
80569 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
80570
80571 #if USE_SPLIT_PTE_PTLOCKS
80572@@ -1783,7 +1796,7 @@ extern int install_special_mapping(struct mm_struct *mm,
80573 unsigned long addr, unsigned long len,
80574 unsigned long flags, struct page **pages);
80575
80576-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
80577+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
80578
80579 extern unsigned long mmap_region(struct file *file, unsigned long addr,
80580 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
80581@@ -1791,6 +1804,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
80582 unsigned long len, unsigned long prot, unsigned long flags,
80583 unsigned long pgoff, unsigned long *populate);
80584 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
80585+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
80586
80587 #ifdef CONFIG_MMU
80588 extern int __mm_populate(unsigned long addr, unsigned long len,
80589@@ -1819,10 +1833,11 @@ struct vm_unmapped_area_info {
80590 unsigned long high_limit;
80591 unsigned long align_mask;
80592 unsigned long align_offset;
80593+ unsigned long threadstack_offset;
80594 };
80595
80596-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
80597-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
80598+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
80599+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
80600
80601 /*
80602 * Search for an unmapped address range.
80603@@ -1834,7 +1849,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
80604 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
80605 */
80606 static inline unsigned long
80607-vm_unmapped_area(struct vm_unmapped_area_info *info)
80608+vm_unmapped_area(const struct vm_unmapped_area_info *info)
80609 {
80610 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
80611 return unmapped_area(info);
80612@@ -1896,6 +1911,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
80613 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
80614 struct vm_area_struct **pprev);
80615
80616+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
80617+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
80618+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
80619+
80620 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
80621 NULL if none. Assume start_addr < end_addr. */
80622 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
80623@@ -1924,15 +1943,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
80624 return vma;
80625 }
80626
80627-#ifdef CONFIG_MMU
80628-pgprot_t vm_get_page_prot(unsigned long vm_flags);
80629-#else
80630-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
80631-{
80632- return __pgprot(0);
80633-}
80634-#endif
80635-
80636 #ifdef CONFIG_NUMA_BALANCING
80637 unsigned long change_prot_numa(struct vm_area_struct *vma,
80638 unsigned long start, unsigned long end);
80639@@ -1984,6 +1994,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
80640 static inline void vm_stat_account(struct mm_struct *mm,
80641 unsigned long flags, struct file *file, long pages)
80642 {
80643+
80644+#ifdef CONFIG_PAX_RANDMMAP
80645+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
80646+#endif
80647+
80648 mm->total_vm += pages;
80649 }
80650 #endif /* CONFIG_PROC_FS */
80651@@ -2065,7 +2080,7 @@ extern int unpoison_memory(unsigned long pfn);
80652 extern int sysctl_memory_failure_early_kill;
80653 extern int sysctl_memory_failure_recovery;
80654 extern void shake_page(struct page *p, int access);
80655-extern atomic_long_t num_poisoned_pages;
80656+extern atomic_long_unchecked_t num_poisoned_pages;
80657 extern int soft_offline_page(struct page *page, int flags);
80658
80659 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
80660@@ -2100,5 +2115,11 @@ void __init setup_nr_node_ids(void);
80661 static inline void setup_nr_node_ids(void) {}
80662 #endif
80663
80664+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
80665+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
80666+#else
80667+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
80668+#endif
80669+
80670 #endif /* __KERNEL__ */
80671 #endif /* _LINUX_MM_H */
80672diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
80673index 8967e20..61f7900 100644
80674--- a/include/linux/mm_types.h
80675+++ b/include/linux/mm_types.h
80676@@ -308,7 +308,9 @@ struct vm_area_struct {
80677 #ifdef CONFIG_NUMA
80678 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
80679 #endif
80680-};
80681+
80682+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
80683+} __randomize_layout;
80684
80685 struct core_thread {
80686 struct task_struct *task;
80687@@ -454,7 +456,25 @@ struct mm_struct {
80688 bool tlb_flush_pending;
80689 #endif
80690 struct uprobes_state uprobes_state;
80691-};
80692+
80693+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
80694+ unsigned long pax_flags;
80695+#endif
80696+
80697+#ifdef CONFIG_PAX_DLRESOLVE
80698+ unsigned long call_dl_resolve;
80699+#endif
80700+
80701+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
80702+ unsigned long call_syscall;
80703+#endif
80704+
80705+#ifdef CONFIG_PAX_ASLR
80706+ unsigned long delta_mmap; /* randomized offset */
80707+ unsigned long delta_stack; /* randomized offset */
80708+#endif
80709+
80710+} __randomize_layout;
80711
80712 static inline void mm_init_cpumask(struct mm_struct *mm)
80713 {
80714diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
80715index c5d5278..f0b68c8 100644
80716--- a/include/linux/mmiotrace.h
80717+++ b/include/linux/mmiotrace.h
80718@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
80719 /* Called from ioremap.c */
80720 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
80721 void __iomem *addr);
80722-extern void mmiotrace_iounmap(volatile void __iomem *addr);
80723+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
80724
80725 /* For anyone to insert markers. Remember trailing newline. */
80726 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
80727@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
80728 {
80729 }
80730
80731-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
80732+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
80733 {
80734 }
80735
80736diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
80737index 835aa3d..676b387 100644
80738--- a/include/linux/mmzone.h
80739+++ b/include/linux/mmzone.h
80740@@ -406,7 +406,7 @@ struct zone {
80741 unsigned long flags; /* zone flags, see below */
80742
80743 /* Zone statistics */
80744- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
80745+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
80746
80747 /*
80748 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
80749diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
80750index 44eeef0..a92d3f9 100644
80751--- a/include/linux/mod_devicetable.h
80752+++ b/include/linux/mod_devicetable.h
80753@@ -139,7 +139,7 @@ struct usb_device_id {
80754 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
80755 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
80756
80757-#define HID_ANY_ID (~0)
80758+#define HID_ANY_ID (~0U)
80759 #define HID_BUS_ANY 0xffff
80760 #define HID_GROUP_ANY 0x0000
80761
80762@@ -475,7 +475,7 @@ struct dmi_system_id {
80763 const char *ident;
80764 struct dmi_strmatch matches[4];
80765 void *driver_data;
80766-};
80767+} __do_const;
80768 /*
80769 * struct dmi_device_id appears during expansion of
80770 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
80771diff --git a/include/linux/module.h b/include/linux/module.h
80772index f520a76..5f898ef 100644
80773--- a/include/linux/module.h
80774+++ b/include/linux/module.h
80775@@ -17,9 +17,11 @@
80776 #include <linux/moduleparam.h>
80777 #include <linux/jump_label.h>
80778 #include <linux/export.h>
80779+#include <linux/fs.h>
80780
80781 #include <linux/percpu.h>
80782 #include <asm/module.h>
80783+#include <asm/pgtable.h>
80784
80785 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
80786 #define MODULE_SIG_STRING "~Module signature appended~\n"
80787@@ -42,7 +44,7 @@ struct module_kobject {
80788 struct kobject *drivers_dir;
80789 struct module_param_attrs *mp;
80790 struct completion *kobj_completion;
80791-};
80792+} __randomize_layout;
80793
80794 struct module_attribute {
80795 struct attribute attr;
80796@@ -54,12 +56,13 @@ struct module_attribute {
80797 int (*test)(struct module *);
80798 void (*free)(struct module *);
80799 };
80800+typedef struct module_attribute __no_const module_attribute_no_const;
80801
80802 struct module_version_attribute {
80803 struct module_attribute mattr;
80804 const char *module_name;
80805 const char *version;
80806-} __attribute__ ((__aligned__(sizeof(void *))));
80807+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
80808
80809 extern ssize_t __modver_version_show(struct module_attribute *,
80810 struct module_kobject *, char *);
80811@@ -235,7 +238,7 @@ struct module {
80812
80813 /* Sysfs stuff. */
80814 struct module_kobject mkobj;
80815- struct module_attribute *modinfo_attrs;
80816+ module_attribute_no_const *modinfo_attrs;
80817 const char *version;
80818 const char *srcversion;
80819 struct kobject *holders_dir;
80820@@ -284,19 +287,16 @@ struct module {
80821 int (*init)(void);
80822
80823 /* If this is non-NULL, vfree after init() returns */
80824- void *module_init;
80825+ void *module_init_rx, *module_init_rw;
80826
80827 /* Here is the actual code + data, vfree'd on unload. */
80828- void *module_core;
80829+ void *module_core_rx, *module_core_rw;
80830
80831 /* Here are the sizes of the init and core sections */
80832- unsigned int init_size, core_size;
80833+ unsigned int init_size_rw, core_size_rw;
80834
80835 /* The size of the executable code in each section. */
80836- unsigned int init_text_size, core_text_size;
80837-
80838- /* Size of RO sections of the module (text+rodata) */
80839- unsigned int init_ro_size, core_ro_size;
80840+ unsigned int init_size_rx, core_size_rx;
80841
80842 /* Arch-specific module values */
80843 struct mod_arch_specific arch;
80844@@ -352,6 +352,10 @@ struct module {
80845 #ifdef CONFIG_EVENT_TRACING
80846 struct ftrace_event_call **trace_events;
80847 unsigned int num_trace_events;
80848+ struct file_operations trace_id;
80849+ struct file_operations trace_enable;
80850+ struct file_operations trace_format;
80851+ struct file_operations trace_filter;
80852 #endif
80853 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
80854 unsigned int num_ftrace_callsites;
80855@@ -375,7 +379,7 @@ struct module {
80856 ctor_fn_t *ctors;
80857 unsigned int num_ctors;
80858 #endif
80859-};
80860+} __randomize_layout;
80861 #ifndef MODULE_ARCH_INIT
80862 #define MODULE_ARCH_INIT {}
80863 #endif
80864@@ -396,16 +400,46 @@ bool is_module_address(unsigned long addr);
80865 bool is_module_percpu_address(unsigned long addr);
80866 bool is_module_text_address(unsigned long addr);
80867
80868+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
80869+{
80870+
80871+#ifdef CONFIG_PAX_KERNEXEC
80872+ if (ktla_ktva(addr) >= (unsigned long)start &&
80873+ ktla_ktva(addr) < (unsigned long)start + size)
80874+ return 1;
80875+#endif
80876+
80877+ return ((void *)addr >= start && (void *)addr < start + size);
80878+}
80879+
80880+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
80881+{
80882+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
80883+}
80884+
80885+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
80886+{
80887+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
80888+}
80889+
80890+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
80891+{
80892+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
80893+}
80894+
80895+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
80896+{
80897+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
80898+}
80899+
80900 static inline int within_module_core(unsigned long addr, const struct module *mod)
80901 {
80902- return (unsigned long)mod->module_core <= addr &&
80903- addr < (unsigned long)mod->module_core + mod->core_size;
80904+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
80905 }
80906
80907 static inline int within_module_init(unsigned long addr, const struct module *mod)
80908 {
80909- return (unsigned long)mod->module_init <= addr &&
80910- addr < (unsigned long)mod->module_init + mod->init_size;
80911+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
80912 }
80913
80914 /* Search for module by name: must hold module_mutex. */
80915diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
80916index 560ca53..ef621ef 100644
80917--- a/include/linux/moduleloader.h
80918+++ b/include/linux/moduleloader.h
80919@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
80920 sections. Returns NULL on failure. */
80921 void *module_alloc(unsigned long size);
80922
80923+#ifdef CONFIG_PAX_KERNEXEC
80924+void *module_alloc_exec(unsigned long size);
80925+#else
80926+#define module_alloc_exec(x) module_alloc(x)
80927+#endif
80928+
80929 /* Free memory returned from module_alloc. */
80930 void module_free(struct module *mod, void *module_region);
80931
80932+#ifdef CONFIG_PAX_KERNEXEC
80933+void module_free_exec(struct module *mod, void *module_region);
80934+#else
80935+#define module_free_exec(x, y) module_free((x), (y))
80936+#endif
80937+
80938 /*
80939 * Apply the given relocation to the (simplified) ELF. Return -error
80940 * or 0.
80941@@ -45,7 +57,9 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
80942 unsigned int relsec,
80943 struct module *me)
80944 {
80945+#ifdef CONFIG_MODULES
80946 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
80947+#endif
80948 return -ENOEXEC;
80949 }
80950 #endif
80951@@ -67,7 +81,9 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
80952 unsigned int relsec,
80953 struct module *me)
80954 {
80955+#ifdef CONFIG_MODULES
80956 printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
80957+#endif
80958 return -ENOEXEC;
80959 }
80960 #endif
80961diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
80962index 204a677..e9b486a 100644
80963--- a/include/linux/moduleparam.h
80964+++ b/include/linux/moduleparam.h
80965@@ -293,7 +293,7 @@ static inline void __kernel_param_unlock(void)
80966 * @len is usually just sizeof(string).
80967 */
80968 #define module_param_string(name, string, len, perm) \
80969- static const struct kparam_string __param_string_##name \
80970+ static const struct kparam_string __param_string_##name __used \
80971 = { len, string }; \
80972 __module_param_call(MODULE_PARAM_PREFIX, name, \
80973 &param_ops_string, \
80974@@ -432,7 +432,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
80975 */
80976 #define module_param_array_named(name, array, type, nump, perm) \
80977 param_check_##type(name, &(array)[0]); \
80978- static const struct kparam_array __param_arr_##name \
80979+ static const struct kparam_array __param_arr_##name __used \
80980 = { .max = ARRAY_SIZE(array), .num = nump, \
80981 .ops = &param_ops_##type, \
80982 .elemsize = sizeof(array[0]), .elem = array }; \
80983diff --git a/include/linux/mount.h b/include/linux/mount.h
80984index 839bac2..a96b37c 100644
80985--- a/include/linux/mount.h
80986+++ b/include/linux/mount.h
80987@@ -59,7 +59,7 @@ struct vfsmount {
80988 struct dentry *mnt_root; /* root of the mounted tree */
80989 struct super_block *mnt_sb; /* pointer to superblock */
80990 int mnt_flags;
80991-};
80992+} __randomize_layout;
80993
80994 struct file; /* forward dec */
80995
80996diff --git a/include/linux/namei.h b/include/linux/namei.h
80997index 492de72..1bddcd4 100644
80998--- a/include/linux/namei.h
80999+++ b/include/linux/namei.h
81000@@ -19,7 +19,7 @@ struct nameidata {
81001 unsigned seq, m_seq;
81002 int last_type;
81003 unsigned depth;
81004- char *saved_names[MAX_NESTED_LINKS + 1];
81005+ const char *saved_names[MAX_NESTED_LINKS + 1];
81006 };
81007
81008 /*
81009@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
81010
81011 extern void nd_jump_link(struct nameidata *nd, struct path *path);
81012
81013-static inline void nd_set_link(struct nameidata *nd, char *path)
81014+static inline void nd_set_link(struct nameidata *nd, const char *path)
81015 {
81016 nd->saved_names[nd->depth] = path;
81017 }
81018
81019-static inline char *nd_get_link(struct nameidata *nd)
81020+static inline const char *nd_get_link(const struct nameidata *nd)
81021 {
81022 return nd->saved_names[nd->depth];
81023 }
81024diff --git a/include/linux/net.h b/include/linux/net.h
81025index 17d8339..81656c0 100644
81026--- a/include/linux/net.h
81027+++ b/include/linux/net.h
81028@@ -192,7 +192,7 @@ struct net_proto_family {
81029 int (*create)(struct net *net, struct socket *sock,
81030 int protocol, int kern);
81031 struct module *owner;
81032-};
81033+} __do_const;
81034
81035 struct iovec;
81036 struct kvec;
81037diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
81038index b42d07b..7f45ae2 100644
81039--- a/include/linux/netdevice.h
81040+++ b/include/linux/netdevice.h
81041@@ -1146,6 +1146,7 @@ struct net_device_ops {
81042 void *priv);
81043 int (*ndo_get_lock_subclass)(struct net_device *dev);
81044 };
81045+typedef struct net_device_ops __no_const net_device_ops_no_const;
81046
81047 /**
81048 * enum net_device_priv_flags - &struct net_device priv_flags
81049@@ -1313,11 +1314,11 @@ struct net_device {
81050 struct net_device_stats stats;
81051
81052 /* dropped packets by core network, Do not use this in drivers */
81053- atomic_long_t rx_dropped;
81054- atomic_long_t tx_dropped;
81055+ atomic_long_unchecked_t rx_dropped;
81056+ atomic_long_unchecked_t tx_dropped;
81057
81058 /* Stats to monitor carrier on<->off transitions */
81059- atomic_t carrier_changes;
81060+ atomic_unchecked_t carrier_changes;
81061
81062 #ifdef CONFIG_WIRELESS_EXT
81063 /* List of functions to handle Wireless Extensions (instead of ioctl).
81064diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
81065index 2077489..a15e561 100644
81066--- a/include/linux/netfilter.h
81067+++ b/include/linux/netfilter.h
81068@@ -84,7 +84,7 @@ struct nf_sockopt_ops {
81069 #endif
81070 /* Use the module struct to lock set/get code in place */
81071 struct module *owner;
81072-};
81073+} __do_const;
81074
81075 /* Function to register/unregister hook points. */
81076 int nf_register_hook(struct nf_hook_ops *reg);
81077diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
81078index e955d47..04a5338 100644
81079--- a/include/linux/netfilter/nfnetlink.h
81080+++ b/include/linux/netfilter/nfnetlink.h
81081@@ -19,7 +19,7 @@ struct nfnl_callback {
81082 const struct nlattr * const cda[]);
81083 const struct nla_policy *policy; /* netlink attribute policy */
81084 const u_int16_t attr_count; /* number of nlattr's */
81085-};
81086+} __do_const;
81087
81088 struct nfnetlink_subsystem {
81089 const char *name;
81090diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
81091new file mode 100644
81092index 0000000..33f4af8
81093--- /dev/null
81094+++ b/include/linux/netfilter/xt_gradm.h
81095@@ -0,0 +1,9 @@
81096+#ifndef _LINUX_NETFILTER_XT_GRADM_H
81097+#define _LINUX_NETFILTER_XT_GRADM_H 1
81098+
81099+struct xt_gradm_mtinfo {
81100+ __u16 flags;
81101+ __u16 invflags;
81102+};
81103+
81104+#endif
81105diff --git a/include/linux/nls.h b/include/linux/nls.h
81106index 520681b..1d67ed2 100644
81107--- a/include/linux/nls.h
81108+++ b/include/linux/nls.h
81109@@ -31,7 +31,7 @@ struct nls_table {
81110 const unsigned char *charset2upper;
81111 struct module *owner;
81112 struct nls_table *next;
81113-};
81114+} __do_const;
81115
81116 /* this value hold the maximum octet of charset */
81117 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
81118diff --git a/include/linux/notifier.h b/include/linux/notifier.h
81119index d14a4c3..a078786 100644
81120--- a/include/linux/notifier.h
81121+++ b/include/linux/notifier.h
81122@@ -54,7 +54,8 @@ struct notifier_block {
81123 notifier_fn_t notifier_call;
81124 struct notifier_block __rcu *next;
81125 int priority;
81126-};
81127+} __do_const;
81128+typedef struct notifier_block __no_const notifier_block_no_const;
81129
81130 struct atomic_notifier_head {
81131 spinlock_t lock;
81132diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
81133index b2a0f15..4d7da32 100644
81134--- a/include/linux/oprofile.h
81135+++ b/include/linux/oprofile.h
81136@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
81137 int oprofilefs_create_ro_ulong(struct dentry * root,
81138 char const * name, ulong * val);
81139
81140-/** Create a file for read-only access to an atomic_t. */
81141+/** Create a file for read-only access to an atomic_unchecked_t. */
81142 int oprofilefs_create_ro_atomic(struct dentry * root,
81143- char const * name, atomic_t * val);
81144+ char const * name, atomic_unchecked_t * val);
81145
81146 /** create a directory */
81147 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
81148diff --git a/include/linux/padata.h b/include/linux/padata.h
81149index 4386946..f50c615 100644
81150--- a/include/linux/padata.h
81151+++ b/include/linux/padata.h
81152@@ -129,7 +129,7 @@ struct parallel_data {
81153 struct padata_serial_queue __percpu *squeue;
81154 atomic_t reorder_objects;
81155 atomic_t refcnt;
81156- atomic_t seq_nr;
81157+ atomic_unchecked_t seq_nr;
81158 struct padata_cpumask cpumask;
81159 spinlock_t lock ____cacheline_aligned;
81160 unsigned int processed;
81161diff --git a/include/linux/path.h b/include/linux/path.h
81162index d137218..be0c176 100644
81163--- a/include/linux/path.h
81164+++ b/include/linux/path.h
81165@@ -1,13 +1,15 @@
81166 #ifndef _LINUX_PATH_H
81167 #define _LINUX_PATH_H
81168
81169+#include <linux/compiler.h>
81170+
81171 struct dentry;
81172 struct vfsmount;
81173
81174 struct path {
81175 struct vfsmount *mnt;
81176 struct dentry *dentry;
81177-};
81178+} __randomize_layout;
81179
81180 extern void path_get(const struct path *);
81181 extern void path_put(const struct path *);
81182diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
81183index 5f2e559..7d59314 100644
81184--- a/include/linux/pci_hotplug.h
81185+++ b/include/linux/pci_hotplug.h
81186@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
81187 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
81188 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
81189 int (*reset_slot) (struct hotplug_slot *slot, int probe);
81190-};
81191+} __do_const;
81192+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
81193
81194 /**
81195 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
81196diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
81197index 3ef6ea1..ed1a248 100644
81198--- a/include/linux/perf_event.h
81199+++ b/include/linux/perf_event.h
81200@@ -328,8 +328,8 @@ struct perf_event {
81201
81202 enum perf_event_active_state state;
81203 unsigned int attach_state;
81204- local64_t count;
81205- atomic64_t child_count;
81206+ local64_t count; /* PaX: fix it one day */
81207+ atomic64_unchecked_t child_count;
81208
81209 /*
81210 * These are the total time in nanoseconds that the event
81211@@ -380,8 +380,8 @@ struct perf_event {
81212 * These accumulate total time (in nanoseconds) that children
81213 * events have been enabled and running, respectively.
81214 */
81215- atomic64_t child_total_time_enabled;
81216- atomic64_t child_total_time_running;
81217+ atomic64_unchecked_t child_total_time_enabled;
81218+ atomic64_unchecked_t child_total_time_running;
81219
81220 /*
81221 * Protect attach/detach and child_list:
81222@@ -710,7 +710,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
81223 entry->ip[entry->nr++] = ip;
81224 }
81225
81226-extern int sysctl_perf_event_paranoid;
81227+extern int sysctl_perf_event_legitimately_concerned;
81228 extern int sysctl_perf_event_mlock;
81229 extern int sysctl_perf_event_sample_rate;
81230 extern int sysctl_perf_cpu_time_max_percent;
81231@@ -725,19 +725,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
81232 loff_t *ppos);
81233
81234
81235+static inline bool perf_paranoid_any(void)
81236+{
81237+ return sysctl_perf_event_legitimately_concerned > 2;
81238+}
81239+
81240 static inline bool perf_paranoid_tracepoint_raw(void)
81241 {
81242- return sysctl_perf_event_paranoid > -1;
81243+ return sysctl_perf_event_legitimately_concerned > -1;
81244 }
81245
81246 static inline bool perf_paranoid_cpu(void)
81247 {
81248- return sysctl_perf_event_paranoid > 0;
81249+ return sysctl_perf_event_legitimately_concerned > 0;
81250 }
81251
81252 static inline bool perf_paranoid_kernel(void)
81253 {
81254- return sysctl_perf_event_paranoid > 1;
81255+ return sysctl_perf_event_legitimately_concerned > 1;
81256 }
81257
81258 extern void perf_event_init(void);
81259@@ -867,7 +872,7 @@ struct perf_pmu_events_attr {
81260 struct device_attribute attr;
81261 u64 id;
81262 const char *event_str;
81263-};
81264+} __do_const;
81265
81266 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
81267 static struct perf_pmu_events_attr _var = { \
81268diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
81269index 7246ef3..1539ea4 100644
81270--- a/include/linux/pid_namespace.h
81271+++ b/include/linux/pid_namespace.h
81272@@ -43,7 +43,7 @@ struct pid_namespace {
81273 int hide_pid;
81274 int reboot; /* group exit code if this pidns was rebooted */
81275 unsigned int proc_inum;
81276-};
81277+} __randomize_layout;
81278
81279 extern struct pid_namespace init_pid_ns;
81280
81281diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
81282index eb8b8ac..62649e1 100644
81283--- a/include/linux/pipe_fs_i.h
81284+++ b/include/linux/pipe_fs_i.h
81285@@ -47,10 +47,10 @@ struct pipe_inode_info {
81286 struct mutex mutex;
81287 wait_queue_head_t wait;
81288 unsigned int nrbufs, curbuf, buffers;
81289- unsigned int readers;
81290- unsigned int writers;
81291- unsigned int files;
81292- unsigned int waiting_writers;
81293+ atomic_t readers;
81294+ atomic_t writers;
81295+ atomic_t files;
81296+ atomic_t waiting_writers;
81297 unsigned int r_counter;
81298 unsigned int w_counter;
81299 struct page *tmp_page;
81300diff --git a/include/linux/pm.h b/include/linux/pm.h
81301index d915d03..0531037 100644
81302--- a/include/linux/pm.h
81303+++ b/include/linux/pm.h
81304@@ -600,6 +600,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
81305 struct dev_pm_domain {
81306 struct dev_pm_ops ops;
81307 };
81308+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
81309
81310 /*
81311 * The PM_EVENT_ messages are also used by drivers implementing the legacy
81312diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
81313index 7c1d252..0e7061d 100644
81314--- a/include/linux/pm_domain.h
81315+++ b/include/linux/pm_domain.h
81316@@ -44,11 +44,11 @@ struct gpd_dev_ops {
81317 int (*thaw_early)(struct device *dev);
81318 int (*thaw)(struct device *dev);
81319 bool (*active_wakeup)(struct device *dev);
81320-};
81321+} __no_const;
81322
81323 struct gpd_cpu_data {
81324 unsigned int saved_exit_latency;
81325- struct cpuidle_state *idle_state;
81326+ cpuidle_state_no_const *idle_state;
81327 };
81328
81329 struct generic_pm_domain {
81330diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
81331index 2a5897a..4f9af63 100644
81332--- a/include/linux/pm_runtime.h
81333+++ b/include/linux/pm_runtime.h
81334@@ -113,7 +113,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
81335
81336 static inline void pm_runtime_mark_last_busy(struct device *dev)
81337 {
81338- ACCESS_ONCE(dev->power.last_busy) = jiffies;
81339+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
81340 }
81341
81342 #else /* !CONFIG_PM_RUNTIME */
81343diff --git a/include/linux/pnp.h b/include/linux/pnp.h
81344index 195aafc..49a7bc2 100644
81345--- a/include/linux/pnp.h
81346+++ b/include/linux/pnp.h
81347@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
81348 struct pnp_fixup {
81349 char id[7];
81350 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
81351-};
81352+} __do_const;
81353
81354 /* config parameters */
81355 #define PNP_CONFIG_NORMAL 0x0001
81356diff --git a/include/linux/poison.h b/include/linux/poison.h
81357index 2110a81..13a11bb 100644
81358--- a/include/linux/poison.h
81359+++ b/include/linux/poison.h
81360@@ -19,8 +19,8 @@
81361 * under normal circumstances, used to verify that nobody uses
81362 * non-initialized list entries.
81363 */
81364-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
81365-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
81366+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
81367+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
81368
81369 /********** include/linux/timer.h **********/
81370 /*
81371diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
81372index d8b187c3..9a9257a 100644
81373--- a/include/linux/power/smartreflex.h
81374+++ b/include/linux/power/smartreflex.h
81375@@ -238,7 +238,7 @@ struct omap_sr_class_data {
81376 int (*notify)(struct omap_sr *sr, u32 status);
81377 u8 notify_flags;
81378 u8 class_type;
81379-};
81380+} __do_const;
81381
81382 /**
81383 * struct omap_sr_nvalue_table - Smartreflex n-target value info
81384diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
81385index 4ea1d37..80f4b33 100644
81386--- a/include/linux/ppp-comp.h
81387+++ b/include/linux/ppp-comp.h
81388@@ -84,7 +84,7 @@ struct compressor {
81389 struct module *owner;
81390 /* Extra skb space needed by the compressor algorithm */
81391 unsigned int comp_extra;
81392-};
81393+} __do_const;
81394
81395 /*
81396 * The return value from decompress routine is the length of the
81397diff --git a/include/linux/preempt.h b/include/linux/preempt.h
81398index de83b4e..c4b997d 100644
81399--- a/include/linux/preempt.h
81400+++ b/include/linux/preempt.h
81401@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
81402 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
81403 #endif
81404
81405+#define raw_preempt_count_add(val) __preempt_count_add(val)
81406+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
81407+
81408 #define __preempt_count_inc() __preempt_count_add(1)
81409 #define __preempt_count_dec() __preempt_count_sub(1)
81410
81411 #define preempt_count_inc() preempt_count_add(1)
81412+#define raw_preempt_count_inc() raw_preempt_count_add(1)
81413 #define preempt_count_dec() preempt_count_sub(1)
81414+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
81415
81416 #ifdef CONFIG_PREEMPT_COUNT
81417
81418@@ -41,6 +46,12 @@ do { \
81419 barrier(); \
81420 } while (0)
81421
81422+#define raw_preempt_disable() \
81423+do { \
81424+ raw_preempt_count_inc(); \
81425+ barrier(); \
81426+} while (0)
81427+
81428 #define sched_preempt_enable_no_resched() \
81429 do { \
81430 barrier(); \
81431@@ -49,6 +60,12 @@ do { \
81432
81433 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
81434
81435+#define raw_preempt_enable_no_resched() \
81436+do { \
81437+ barrier(); \
81438+ raw_preempt_count_dec(); \
81439+} while (0)
81440+
81441 #ifdef CONFIG_PREEMPT
81442 #define preempt_enable() \
81443 do { \
81444@@ -113,8 +130,10 @@ do { \
81445 * region.
81446 */
81447 #define preempt_disable() barrier()
81448+#define raw_preempt_disable() barrier()
81449 #define sched_preempt_enable_no_resched() barrier()
81450 #define preempt_enable_no_resched() barrier()
81451+#define raw_preempt_enable_no_resched() barrier()
81452 #define preempt_enable() barrier()
81453 #define preempt_check_resched() do { } while (0)
81454
81455@@ -128,11 +147,13 @@ do { \
81456 /*
81457 * Modules have no business playing preemption tricks.
81458 */
81459+#ifndef CONFIG_PAX_KERNEXEC
81460 #undef sched_preempt_enable_no_resched
81461 #undef preempt_enable_no_resched
81462 #undef preempt_enable_no_resched_notrace
81463 #undef preempt_check_resched
81464 #endif
81465+#endif
81466
81467 #define preempt_set_need_resched() \
81468 do { \
81469diff --git a/include/linux/printk.h b/include/linux/printk.h
81470index 8752f75..2b80c0f 100644
81471--- a/include/linux/printk.h
81472+++ b/include/linux/printk.h
81473@@ -110,6 +110,8 @@ static inline __printf(1, 2) __cold
81474 void early_printk(const char *s, ...) { }
81475 #endif
81476
81477+extern int kptr_restrict;
81478+
81479 #ifdef CONFIG_PRINTK
81480 asmlinkage __printf(5, 0)
81481 int vprintk_emit(int facility, int level,
81482@@ -144,7 +146,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
81483
81484 extern int printk_delay_msec;
81485 extern int dmesg_restrict;
81486-extern int kptr_restrict;
81487
81488 extern void wake_up_klogd(void);
81489
81490diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
81491index 608e60a..79cfb18 100644
81492--- a/include/linux/proc_fs.h
81493+++ b/include/linux/proc_fs.h
81494@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
81495 extern struct proc_dir_entry *proc_symlink(const char *,
81496 struct proc_dir_entry *, const char *);
81497 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
81498+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
81499 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
81500 struct proc_dir_entry *, void *);
81501+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
81502+ struct proc_dir_entry *, void *);
81503 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
81504 struct proc_dir_entry *);
81505
81506@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
81507 return proc_create_data(name, mode, parent, proc_fops, NULL);
81508 }
81509
81510+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
81511+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
81512+{
81513+#ifdef CONFIG_GRKERNSEC_PROC_USER
81514+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
81515+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81516+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
81517+#else
81518+ return proc_create_data(name, mode, parent, proc_fops, NULL);
81519+#endif
81520+}
81521+
81522+
81523 extern void proc_set_size(struct proc_dir_entry *, loff_t);
81524 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
81525 extern void *PDE_DATA(const struct inode *);
81526@@ -52,8 +68,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
81527 struct proc_dir_entry *parent,const char *dest) { return NULL;}
81528 static inline struct proc_dir_entry *proc_mkdir(const char *name,
81529 struct proc_dir_entry *parent) {return NULL;}
81530+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
81531+ struct proc_dir_entry *parent) { return NULL; }
81532 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
81533 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
81534+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
81535+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
81536 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
81537 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
81538 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
81539@@ -73,7 +93,7 @@ static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *p
81540 static inline struct proc_dir_entry *proc_net_mkdir(
81541 struct net *net, const char *name, struct proc_dir_entry *parent)
81542 {
81543- return proc_mkdir_data(name, 0, parent, net);
81544+ return proc_mkdir_data_restrict(name, 0, parent, net);
81545 }
81546
81547 #endif /* _LINUX_PROC_FS_H */
81548diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
81549index 34a1e10..70f6bde 100644
81550--- a/include/linux/proc_ns.h
81551+++ b/include/linux/proc_ns.h
81552@@ -14,7 +14,7 @@ struct proc_ns_operations {
81553 void (*put)(void *ns);
81554 int (*install)(struct nsproxy *nsproxy, void *ns);
81555 unsigned int (*inum)(void *ns);
81556-};
81557+} __do_const __randomize_layout;
81558
81559 struct proc_ns {
81560 void *ns;
81561diff --git a/include/linux/quota.h b/include/linux/quota.h
81562index cc7494a..1e27036 100644
81563--- a/include/linux/quota.h
81564+++ b/include/linux/quota.h
81565@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
81566
81567 extern bool qid_eq(struct kqid left, struct kqid right);
81568 extern bool qid_lt(struct kqid left, struct kqid right);
81569-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
81570+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
81571 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
81572 extern bool qid_valid(struct kqid qid);
81573
81574diff --git a/include/linux/random.h b/include/linux/random.h
81575index 57fbbff..2331f3f 100644
81576--- a/include/linux/random.h
81577+++ b/include/linux/random.h
81578@@ -9,9 +9,19 @@
81579 #include <uapi/linux/random.h>
81580
81581 extern void add_device_randomness(const void *, unsigned int);
81582+
81583+static inline void add_latent_entropy(void)
81584+{
81585+
81586+#ifdef LATENT_ENTROPY_PLUGIN
81587+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
81588+#endif
81589+
81590+}
81591+
81592 extern void add_input_randomness(unsigned int type, unsigned int code,
81593- unsigned int value);
81594-extern void add_interrupt_randomness(int irq, int irq_flags);
81595+ unsigned int value) __latent_entropy;
81596+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
81597
81598 extern void get_random_bytes(void *buf, int nbytes);
81599 extern void get_random_bytes_arch(void *buf, int nbytes);
81600@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
81601 extern const struct file_operations random_fops, urandom_fops;
81602 #endif
81603
81604-unsigned int get_random_int(void);
81605+unsigned int __intentional_overflow(-1) get_random_int(void);
81606 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
81607
81608-u32 prandom_u32(void);
81609+u32 prandom_u32(void) __intentional_overflow(-1);
81610 void prandom_bytes(void *buf, int nbytes);
81611 void prandom_seed(u32 seed);
81612 void prandom_reseed_late(void);
81613@@ -37,6 +47,11 @@ struct rnd_state {
81614 u32 prandom_u32_state(struct rnd_state *state);
81615 void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
81616
81617+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
81618+{
81619+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
81620+}
81621+
81622 /**
81623 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
81624 * @ep_ro: right open interval endpoint
81625diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
81626index fea49b5..2ac22bb 100644
81627--- a/include/linux/rbtree_augmented.h
81628+++ b/include/linux/rbtree_augmented.h
81629@@ -80,7 +80,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
81630 old->rbaugmented = rbcompute(old); \
81631 } \
81632 rbstatic const struct rb_augment_callbacks rbname = { \
81633- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
81634+ .propagate = rbname ## _propagate, \
81635+ .copy = rbname ## _copy, \
81636+ .rotate = rbname ## _rotate \
81637 };
81638
81639
81640diff --git a/include/linux/rculist.h b/include/linux/rculist.h
81641index 8183b46..a388711 100644
81642--- a/include/linux/rculist.h
81643+++ b/include/linux/rculist.h
81644@@ -29,8 +29,8 @@
81645 */
81646 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
81647 {
81648- ACCESS_ONCE(list->next) = list;
81649- ACCESS_ONCE(list->prev) = list;
81650+ ACCESS_ONCE_RW(list->next) = list;
81651+ ACCESS_ONCE_RW(list->prev) = list;
81652 }
81653
81654 /*
81655@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
81656 struct list_head *prev, struct list_head *next);
81657 #endif
81658
81659+void __pax_list_add_rcu(struct list_head *new,
81660+ struct list_head *prev, struct list_head *next);
81661+
81662 /**
81663 * list_add_rcu - add a new entry to rcu-protected list
81664 * @new: new entry to be added
81665@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
81666 __list_add_rcu(new, head, head->next);
81667 }
81668
81669+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
81670+{
81671+ __pax_list_add_rcu(new, head, head->next);
81672+}
81673+
81674 /**
81675 * list_add_tail_rcu - add a new entry to rcu-protected list
81676 * @new: new entry to be added
81677@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
81678 __list_add_rcu(new, head->prev, head);
81679 }
81680
81681+static inline void pax_list_add_tail_rcu(struct list_head *new,
81682+ struct list_head *head)
81683+{
81684+ __pax_list_add_rcu(new, head->prev, head);
81685+}
81686+
81687 /**
81688 * list_del_rcu - deletes entry from list without re-initialization
81689 * @entry: the element to delete from the list.
81690@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
81691 entry->prev = LIST_POISON2;
81692 }
81693
81694+extern void pax_list_del_rcu(struct list_head *entry);
81695+
81696 /**
81697 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
81698 * @n: the element to delete from the hash list.
81699diff --git a/include/linux/reboot.h b/include/linux/reboot.h
81700index 48bf152..d38b785 100644
81701--- a/include/linux/reboot.h
81702+++ b/include/linux/reboot.h
81703@@ -44,9 +44,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
81704 */
81705
81706 extern void migrate_to_reboot_cpu(void);
81707-extern void machine_restart(char *cmd);
81708-extern void machine_halt(void);
81709-extern void machine_power_off(void);
81710+extern void machine_restart(char *cmd) __noreturn;
81711+extern void machine_halt(void) __noreturn;
81712+extern void machine_power_off(void) __noreturn;
81713
81714 extern void machine_shutdown(void);
81715 struct pt_regs;
81716@@ -57,9 +57,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
81717 */
81718
81719 extern void kernel_restart_prepare(char *cmd);
81720-extern void kernel_restart(char *cmd);
81721-extern void kernel_halt(void);
81722-extern void kernel_power_off(void);
81723+extern void kernel_restart(char *cmd) __noreturn;
81724+extern void kernel_halt(void) __noreturn;
81725+extern void kernel_power_off(void) __noreturn;
81726
81727 extern int C_A_D; /* for sysctl */
81728 void ctrl_alt_del(void);
81729@@ -73,7 +73,7 @@ extern int orderly_poweroff(bool force);
81730 * Emergency restart, callable from an interrupt handler.
81731 */
81732
81733-extern void emergency_restart(void);
81734+extern void emergency_restart(void) __noreturn;
81735 #include <asm/emergency-restart.h>
81736
81737 #endif /* _LINUX_REBOOT_H */
81738diff --git a/include/linux/regset.h b/include/linux/regset.h
81739index 8e0c9fe..ac4d221 100644
81740--- a/include/linux/regset.h
81741+++ b/include/linux/regset.h
81742@@ -161,7 +161,8 @@ struct user_regset {
81743 unsigned int align;
81744 unsigned int bias;
81745 unsigned int core_note_type;
81746-};
81747+} __do_const;
81748+typedef struct user_regset __no_const user_regset_no_const;
81749
81750 /**
81751 * struct user_regset_view - available regsets
81752diff --git a/include/linux/relay.h b/include/linux/relay.h
81753index d7c8359..818daf5 100644
81754--- a/include/linux/relay.h
81755+++ b/include/linux/relay.h
81756@@ -157,7 +157,7 @@ struct rchan_callbacks
81757 * The callback should return 0 if successful, negative if not.
81758 */
81759 int (*remove_buf_file)(struct dentry *dentry);
81760-};
81761+} __no_const;
81762
81763 /*
81764 * CONFIG_RELAY kernel API, kernel/relay.c
81765diff --git a/include/linux/rio.h b/include/linux/rio.h
81766index 6bda06f..bf39a9b 100644
81767--- a/include/linux/rio.h
81768+++ b/include/linux/rio.h
81769@@ -358,7 +358,7 @@ struct rio_ops {
81770 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
81771 u64 rstart, u32 size, u32 flags);
81772 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
81773-};
81774+} __no_const;
81775
81776 #define RIO_RESOURCE_MEM 0x00000100
81777 #define RIO_RESOURCE_DOORBELL 0x00000200
81778diff --git a/include/linux/rmap.h b/include/linux/rmap.h
81779index b66c211..13d2915 100644
81780--- a/include/linux/rmap.h
81781+++ b/include/linux/rmap.h
81782@@ -145,8 +145,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
81783 void anon_vma_init(void); /* create anon_vma_cachep */
81784 int anon_vma_prepare(struct vm_area_struct *);
81785 void unlink_anon_vmas(struct vm_area_struct *);
81786-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
81787-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
81788+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
81789+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
81790
81791 static inline void anon_vma_merge(struct vm_area_struct *vma,
81792 struct vm_area_struct *next)
81793diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
81794index a964f72..b475afb 100644
81795--- a/include/linux/scatterlist.h
81796+++ b/include/linux/scatterlist.h
81797@@ -1,6 +1,7 @@
81798 #ifndef _LINUX_SCATTERLIST_H
81799 #define _LINUX_SCATTERLIST_H
81800
81801+#include <linux/sched.h>
81802 #include <linux/string.h>
81803 #include <linux/bug.h>
81804 #include <linux/mm.h>
81805@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
81806 #ifdef CONFIG_DEBUG_SG
81807 BUG_ON(!virt_addr_valid(buf));
81808 #endif
81809+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
81810+ if (object_starts_on_stack(buf)) {
81811+ void *adjbuf = buf - current->stack + current->lowmem_stack;
81812+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
81813+ } else
81814+#endif
81815 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
81816 }
81817
81818diff --git a/include/linux/sched.h b/include/linux/sched.h
81819index 221b2bd..e2e5f82 100644
81820--- a/include/linux/sched.h
81821+++ b/include/linux/sched.h
81822@@ -131,6 +131,7 @@ struct fs_struct;
81823 struct perf_event_context;
81824 struct blk_plug;
81825 struct filename;
81826+struct linux_binprm;
81827
81828 #define VMACACHE_BITS 2
81829 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
81830@@ -380,7 +381,7 @@ extern char __sched_text_start[], __sched_text_end[];
81831 extern int in_sched_functions(unsigned long addr);
81832
81833 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
81834-extern signed long schedule_timeout(signed long timeout);
81835+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
81836 extern signed long schedule_timeout_interruptible(signed long timeout);
81837 extern signed long schedule_timeout_killable(signed long timeout);
81838 extern signed long schedule_timeout_uninterruptible(signed long timeout);
81839@@ -391,6 +392,19 @@ struct nsproxy;
81840 struct user_namespace;
81841
81842 #ifdef CONFIG_MMU
81843+
81844+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
81845+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
81846+#else
81847+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
81848+{
81849+ return 0;
81850+}
81851+#endif
81852+
81853+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
81854+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
81855+
81856 extern void arch_pick_mmap_layout(struct mm_struct *mm);
81857 extern unsigned long
81858 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
81859@@ -688,6 +702,17 @@ struct signal_struct {
81860 #ifdef CONFIG_TASKSTATS
81861 struct taskstats *stats;
81862 #endif
81863+
81864+#ifdef CONFIG_GRKERNSEC
81865+ u32 curr_ip;
81866+ u32 saved_ip;
81867+ u32 gr_saddr;
81868+ u32 gr_daddr;
81869+ u16 gr_sport;
81870+ u16 gr_dport;
81871+ u8 used_accept:1;
81872+#endif
81873+
81874 #ifdef CONFIG_AUDIT
81875 unsigned audit_tty;
81876 unsigned audit_tty_log_passwd;
81877@@ -714,7 +739,7 @@ struct signal_struct {
81878 struct mutex cred_guard_mutex; /* guard against foreign influences on
81879 * credential calculations
81880 * (notably. ptrace) */
81881-};
81882+} __randomize_layout;
81883
81884 /*
81885 * Bits in flags field of signal_struct.
81886@@ -768,6 +793,14 @@ struct user_struct {
81887 struct key *session_keyring; /* UID's default session keyring */
81888 #endif
81889
81890+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
81891+ unsigned char kernel_banned;
81892+#endif
81893+#ifdef CONFIG_GRKERNSEC_BRUTE
81894+ unsigned char suid_banned;
81895+ unsigned long suid_ban_expires;
81896+#endif
81897+
81898 /* Hash table maintenance information */
81899 struct hlist_node uidhash_node;
81900 kuid_t uid;
81901@@ -775,7 +808,7 @@ struct user_struct {
81902 #ifdef CONFIG_PERF_EVENTS
81903 atomic_long_t locked_vm;
81904 #endif
81905-};
81906+} __randomize_layout;
81907
81908 extern int uids_sysfs_init(void);
81909
81910@@ -1179,6 +1212,9 @@ enum perf_event_task_context {
81911 struct task_struct {
81912 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
81913 void *stack;
81914+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
81915+ void *lowmem_stack;
81916+#endif
81917 atomic_t usage;
81918 unsigned int flags; /* per process flags, defined below */
81919 unsigned int ptrace;
81920@@ -1304,8 +1340,8 @@ struct task_struct {
81921 struct list_head thread_node;
81922
81923 struct completion *vfork_done; /* for vfork() */
81924- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
81925- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
81926+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
81927+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
81928
81929 cputime_t utime, stime, utimescaled, stimescaled;
81930 cputime_t gtime;
81931@@ -1330,11 +1366,6 @@ struct task_struct {
81932 struct task_cputime cputime_expires;
81933 struct list_head cpu_timers[3];
81934
81935-/* process credentials */
81936- const struct cred __rcu *real_cred; /* objective and real subjective task
81937- * credentials (COW) */
81938- const struct cred __rcu *cred; /* effective (overridable) subjective task
81939- * credentials (COW) */
81940 char comm[TASK_COMM_LEN]; /* executable name excluding path
81941 - access with [gs]et_task_comm (which lock
81942 it with task_lock())
81943@@ -1351,6 +1382,10 @@ struct task_struct {
81944 #endif
81945 /* CPU-specific state of this task */
81946 struct thread_struct thread;
81947+/* thread_info moved to task_struct */
81948+#ifdef CONFIG_X86
81949+ struct thread_info tinfo;
81950+#endif
81951 /* filesystem information */
81952 struct fs_struct *fs;
81953 /* open file information */
81954@@ -1427,6 +1462,10 @@ struct task_struct {
81955 gfp_t lockdep_reclaim_gfp;
81956 #endif
81957
81958+/* process credentials */
81959+ const struct cred __rcu *real_cred; /* objective and real subjective task
81960+ * credentials (COW) */
81961+
81962 /* journalling filesystem info */
81963 void *journal_info;
81964
81965@@ -1465,6 +1504,10 @@ struct task_struct {
81966 /* cg_list protected by css_set_lock and tsk->alloc_lock */
81967 struct list_head cg_list;
81968 #endif
81969+
81970+ const struct cred __rcu *cred; /* effective (overridable) subjective task
81971+ * credentials (COW) */
81972+
81973 #ifdef CONFIG_FUTEX
81974 struct robust_list_head __user *robust_list;
81975 #ifdef CONFIG_COMPAT
81976@@ -1610,7 +1653,78 @@ struct task_struct {
81977 unsigned int sequential_io;
81978 unsigned int sequential_io_avg;
81979 #endif
81980-};
81981+
81982+#ifdef CONFIG_GRKERNSEC
81983+ /* grsecurity */
81984+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81985+ u64 exec_id;
81986+#endif
81987+#ifdef CONFIG_GRKERNSEC_SETXID
81988+ const struct cred *delayed_cred;
81989+#endif
81990+ struct dentry *gr_chroot_dentry;
81991+ struct acl_subject_label *acl;
81992+ struct acl_subject_label *tmpacl;
81993+ struct acl_role_label *role;
81994+ struct file *exec_file;
81995+ unsigned long brute_expires;
81996+ u16 acl_role_id;
81997+ u8 inherited;
81998+ /* is this the task that authenticated to the special role */
81999+ u8 acl_sp_role;
82000+ u8 is_writable;
82001+ u8 brute;
82002+ u8 gr_is_chrooted;
82003+#endif
82004+
82005+} __randomize_layout;
82006+
82007+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
82008+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
82009+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
82010+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
82011+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
82012+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
82013+
82014+#ifdef CONFIG_PAX_SOFTMODE
82015+extern int pax_softmode;
82016+#endif
82017+
82018+extern int pax_check_flags(unsigned long *);
82019+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
82020+
82021+/* if tsk != current then task_lock must be held on it */
82022+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
82023+static inline unsigned long pax_get_flags(struct task_struct *tsk)
82024+{
82025+ if (likely(tsk->mm))
82026+ return tsk->mm->pax_flags;
82027+ else
82028+ return 0UL;
82029+}
82030+
82031+/* if tsk != current then task_lock must be held on it */
82032+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
82033+{
82034+ if (likely(tsk->mm)) {
82035+ tsk->mm->pax_flags = flags;
82036+ return 0;
82037+ }
82038+ return -EINVAL;
82039+}
82040+#endif
82041+
82042+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
82043+extern void pax_set_initial_flags(struct linux_binprm *bprm);
82044+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
82045+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
82046+#endif
82047+
82048+struct path;
82049+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
82050+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
82051+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
82052+extern void pax_report_refcount_overflow(struct pt_regs *regs);
82053
82054 /* Future-safe accessor for struct task_struct's cpus_allowed. */
82055 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
82056@@ -1692,7 +1806,7 @@ struct pid_namespace;
82057 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
82058 struct pid_namespace *ns);
82059
82060-static inline pid_t task_pid_nr(struct task_struct *tsk)
82061+static inline pid_t task_pid_nr(const struct task_struct *tsk)
82062 {
82063 return tsk->pid;
82064 }
82065@@ -2039,6 +2153,25 @@ extern u64 sched_clock_cpu(int cpu);
82066
82067 extern void sched_clock_init(void);
82068
82069+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
82070+static inline void populate_stack(void)
82071+{
82072+ struct task_struct *curtask = current;
82073+ int c;
82074+ int *ptr = curtask->stack;
82075+ int *end = curtask->stack + THREAD_SIZE;
82076+
82077+ while (ptr < end) {
82078+ c = *(volatile int *)ptr;
82079+ ptr += PAGE_SIZE/sizeof(int);
82080+ }
82081+}
82082+#else
82083+static inline void populate_stack(void)
82084+{
82085+}
82086+#endif
82087+
82088 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
82089 static inline void sched_clock_tick(void)
82090 {
82091@@ -2172,7 +2305,9 @@ void yield(void);
82092 extern struct exec_domain default_exec_domain;
82093
82094 union thread_union {
82095+#ifndef CONFIG_X86
82096 struct thread_info thread_info;
82097+#endif
82098 unsigned long stack[THREAD_SIZE/sizeof(long)];
82099 };
82100
82101@@ -2205,6 +2340,7 @@ extern struct pid_namespace init_pid_ns;
82102 */
82103
82104 extern struct task_struct *find_task_by_vpid(pid_t nr);
82105+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
82106 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
82107 struct pid_namespace *ns);
82108
82109@@ -2367,7 +2503,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
82110 extern void exit_itimers(struct signal_struct *);
82111 extern void flush_itimer_signals(void);
82112
82113-extern void do_group_exit(int);
82114+extern __noreturn void do_group_exit(int);
82115
82116 extern int allow_signal(int);
82117 extern int disallow_signal(int);
82118@@ -2568,9 +2704,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
82119
82120 #endif
82121
82122-static inline int object_is_on_stack(void *obj)
82123+static inline int object_starts_on_stack(const void *obj)
82124 {
82125- void *stack = task_stack_page(current);
82126+ const void *stack = task_stack_page(current);
82127
82128 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
82129 }
82130diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
82131index 8045a55..c959cd5 100644
82132--- a/include/linux/sched/sysctl.h
82133+++ b/include/linux/sched/sysctl.h
82134@@ -30,6 +30,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
82135 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
82136
82137 extern int sysctl_max_map_count;
82138+extern unsigned long sysctl_heap_stack_gap;
82139
82140 extern unsigned int sysctl_sched_latency;
82141 extern unsigned int sysctl_sched_min_granularity;
82142diff --git a/include/linux/security.h b/include/linux/security.h
82143index 6478ce3..5e6ad6e 100644
82144--- a/include/linux/security.h
82145+++ b/include/linux/security.h
82146@@ -27,6 +27,7 @@
82147 #include <linux/slab.h>
82148 #include <linux/err.h>
82149 #include <linux/string.h>
82150+#include <linux/grsecurity.h>
82151
82152 struct linux_binprm;
82153 struct cred;
82154@@ -116,8 +117,6 @@ struct seq_file;
82155
82156 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
82157
82158-void reset_security_ops(void);
82159-
82160 #ifdef CONFIG_MMU
82161 extern unsigned long mmap_min_addr;
82162 extern unsigned long dac_mmap_min_addr;
82163@@ -1719,7 +1718,7 @@ struct security_operations {
82164 struct audit_context *actx);
82165 void (*audit_rule_free) (void *lsmrule);
82166 #endif /* CONFIG_AUDIT */
82167-};
82168+} __randomize_layout;
82169
82170 /* prototypes */
82171 extern int security_init(void);
82172diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
82173index dc368b8..e895209 100644
82174--- a/include/linux/semaphore.h
82175+++ b/include/linux/semaphore.h
82176@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
82177 }
82178
82179 extern void down(struct semaphore *sem);
82180-extern int __must_check down_interruptible(struct semaphore *sem);
82181+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
82182 extern int __must_check down_killable(struct semaphore *sem);
82183 extern int __must_check down_trylock(struct semaphore *sem);
82184 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
82185diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
82186index 52e0097..383f21d 100644
82187--- a/include/linux/seq_file.h
82188+++ b/include/linux/seq_file.h
82189@@ -27,6 +27,9 @@ struct seq_file {
82190 struct mutex lock;
82191 const struct seq_operations *op;
82192 int poll_event;
82193+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
82194+ u64 exec_id;
82195+#endif
82196 #ifdef CONFIG_USER_NS
82197 struct user_namespace *user_ns;
82198 #endif
82199@@ -39,6 +42,7 @@ struct seq_operations {
82200 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
82201 int (*show) (struct seq_file *m, void *v);
82202 };
82203+typedef struct seq_operations __no_const seq_operations_no_const;
82204
82205 #define SEQ_SKIP 1
82206
82207@@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
82208
82209 char *mangle_path(char *s, const char *p, const char *esc);
82210 int seq_open(struct file *, const struct seq_operations *);
82211+int seq_open_restrict(struct file *, const struct seq_operations *);
82212 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
82213 loff_t seq_lseek(struct file *, loff_t, int);
82214 int seq_release(struct inode *, struct file *);
82215@@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
82216 }
82217
82218 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
82219+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
82220 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
82221 int single_release(struct inode *, struct file *);
82222 void *__seq_open_private(struct file *, const struct seq_operations *, int);
82223diff --git a/include/linux/shm.h b/include/linux/shm.h
82224index 1e2cd2e..0288750 100644
82225--- a/include/linux/shm.h
82226+++ b/include/linux/shm.h
82227@@ -21,6 +21,10 @@ struct shmid_kernel /* private to the kernel */
82228
82229 /* The task created the shm object. NULL if the task is dead. */
82230 struct task_struct *shm_creator;
82231+#ifdef CONFIG_GRKERNSEC
82232+ time_t shm_createtime;
82233+ pid_t shm_lapid;
82234+#endif
82235 };
82236
82237 /* shm_mode upper byte flags */
82238diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
82239index 08074a8..e2ae280 100644
82240--- a/include/linux/skbuff.h
82241+++ b/include/linux/skbuff.h
82242@@ -717,7 +717,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
82243 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
82244 int node);
82245 struct sk_buff *build_skb(void *data, unsigned int frag_size);
82246-static inline struct sk_buff *alloc_skb(unsigned int size,
82247+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
82248 gfp_t priority)
82249 {
82250 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
82251@@ -1825,7 +1825,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
82252 return skb->inner_transport_header - skb->inner_network_header;
82253 }
82254
82255-static inline int skb_network_offset(const struct sk_buff *skb)
82256+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
82257 {
82258 return skb_network_header(skb) - skb->data;
82259 }
82260@@ -1885,7 +1885,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
82261 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
82262 */
82263 #ifndef NET_SKB_PAD
82264-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
82265+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
82266 #endif
82267
82268 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
82269@@ -2484,7 +2484,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
82270 int *err);
82271 unsigned int datagram_poll(struct file *file, struct socket *sock,
82272 struct poll_table_struct *wait);
82273-int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
82274+int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
82275 struct iovec *to, int size);
82276 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
82277 struct iovec *iov);
82278@@ -2776,6 +2776,9 @@ static inline void nf_reset(struct sk_buff *skb)
82279 nf_bridge_put(skb->nf_bridge);
82280 skb->nf_bridge = NULL;
82281 #endif
82282+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
82283+ skb->nf_trace = 0;
82284+#endif
82285 }
82286
82287 static inline void nf_reset_trace(struct sk_buff *skb)
82288diff --git a/include/linux/slab.h b/include/linux/slab.h
82289index 307bfbe..a999cf3 100644
82290--- a/include/linux/slab.h
82291+++ b/include/linux/slab.h
82292@@ -14,15 +14,29 @@
82293 #include <linux/gfp.h>
82294 #include <linux/types.h>
82295 #include <linux/workqueue.h>
82296-
82297+#include <linux/err.h>
82298
82299 /*
82300 * Flags to pass to kmem_cache_create().
82301 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
82302 */
82303 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
82304+
82305+#ifdef CONFIG_PAX_USERCOPY_SLABS
82306+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
82307+#else
82308+#define SLAB_USERCOPY 0x00000000UL
82309+#endif
82310+
82311 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
82312 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
82313+
82314+#ifdef CONFIG_PAX_MEMORY_SANITIZE
82315+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
82316+#else
82317+#define SLAB_NO_SANITIZE 0x00000000UL
82318+#endif
82319+
82320 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
82321 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
82322 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
82323@@ -98,10 +112,13 @@
82324 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
82325 * Both make kfree a no-op.
82326 */
82327-#define ZERO_SIZE_PTR ((void *)16)
82328+#define ZERO_SIZE_PTR \
82329+({ \
82330+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
82331+ (void *)(-MAX_ERRNO-1L); \
82332+})
82333
82334-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
82335- (unsigned long)ZERO_SIZE_PTR)
82336+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
82337
82338 #include <linux/kmemleak.h>
82339
82340@@ -142,6 +159,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
82341 void kfree(const void *);
82342 void kzfree(const void *);
82343 size_t ksize(const void *);
82344+const char *check_heap_object(const void *ptr, unsigned long n);
82345+bool is_usercopy_object(const void *ptr);
82346
82347 /*
82348 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
82349@@ -174,7 +193,7 @@ struct kmem_cache {
82350 unsigned int align; /* Alignment as calculated */
82351 unsigned long flags; /* Active flags on the slab */
82352 const char *name; /* Slab name for sysfs */
82353- int refcount; /* Use counter */
82354+ atomic_t refcount; /* Use counter */
82355 void (*ctor)(void *); /* Called on object slot creation */
82356 struct list_head list; /* List of all slab caches on the system */
82357 };
82358@@ -259,6 +278,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
82359 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
82360 #endif
82361
82362+#ifdef CONFIG_PAX_USERCOPY_SLABS
82363+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
82364+#endif
82365+
82366 /*
82367 * Figure out which kmalloc slab an allocation of a certain size
82368 * belongs to.
82369@@ -267,7 +290,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
82370 * 2 = 120 .. 192 bytes
82371 * n = 2^(n-1) .. 2^n -1
82372 */
82373-static __always_inline int kmalloc_index(size_t size)
82374+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
82375 {
82376 if (!size)
82377 return 0;
82378@@ -310,11 +333,11 @@ static __always_inline int kmalloc_index(size_t size)
82379 }
82380 #endif /* !CONFIG_SLOB */
82381
82382-void *__kmalloc(size_t size, gfp_t flags);
82383+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
82384 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
82385
82386 #ifdef CONFIG_NUMA
82387-void *__kmalloc_node(size_t size, gfp_t flags, int node);
82388+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
82389 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
82390 #else
82391 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
82392diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
82393index 8235dfb..47ce586 100644
82394--- a/include/linux/slab_def.h
82395+++ b/include/linux/slab_def.h
82396@@ -38,7 +38,7 @@ struct kmem_cache {
82397 /* 4) cache creation/removal */
82398 const char *name;
82399 struct list_head list;
82400- int refcount;
82401+ atomic_t refcount;
82402 int object_size;
82403 int align;
82404
82405@@ -54,10 +54,14 @@ struct kmem_cache {
82406 unsigned long node_allocs;
82407 unsigned long node_frees;
82408 unsigned long node_overflow;
82409- atomic_t allochit;
82410- atomic_t allocmiss;
82411- atomic_t freehit;
82412- atomic_t freemiss;
82413+ atomic_unchecked_t allochit;
82414+ atomic_unchecked_t allocmiss;
82415+ atomic_unchecked_t freehit;
82416+ atomic_unchecked_t freemiss;
82417+#ifdef CONFIG_PAX_MEMORY_SANITIZE
82418+ atomic_unchecked_t sanitized;
82419+ atomic_unchecked_t not_sanitized;
82420+#endif
82421
82422 /*
82423 * If debugging is enabled, then the allocator can add additional
82424diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
82425index d82abd4..408c3a0 100644
82426--- a/include/linux/slub_def.h
82427+++ b/include/linux/slub_def.h
82428@@ -74,7 +74,7 @@ struct kmem_cache {
82429 struct kmem_cache_order_objects max;
82430 struct kmem_cache_order_objects min;
82431 gfp_t allocflags; /* gfp flags to use on each alloc */
82432- int refcount; /* Refcount for slab cache destroy */
82433+ atomic_t refcount; /* Refcount for slab cache destroy */
82434 void (*ctor)(void *);
82435 int inuse; /* Offset to metadata */
82436 int align; /* Alignment */
82437diff --git a/include/linux/smp.h b/include/linux/smp.h
82438index 633f5ed..6c3dc3f 100644
82439--- a/include/linux/smp.h
82440+++ b/include/linux/smp.h
82441@@ -176,7 +176,9 @@ static inline void kick_all_cpus_sync(void) { }
82442 #endif
82443
82444 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
82445+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
82446 #define put_cpu() preempt_enable()
82447+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
82448
82449 /*
82450 * Callback to arch code if there's nosmp or maxcpus=0 on the
82451diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
82452index 46cca4c..3323536 100644
82453--- a/include/linux/sock_diag.h
82454+++ b/include/linux/sock_diag.h
82455@@ -11,7 +11,7 @@ struct sock;
82456 struct sock_diag_handler {
82457 __u8 family;
82458 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
82459-};
82460+} __do_const;
82461
82462 int sock_diag_register(const struct sock_diag_handler *h);
82463 void sock_diag_unregister(const struct sock_diag_handler *h);
82464diff --git a/include/linux/sonet.h b/include/linux/sonet.h
82465index 680f9a3..f13aeb0 100644
82466--- a/include/linux/sonet.h
82467+++ b/include/linux/sonet.h
82468@@ -7,7 +7,7 @@
82469 #include <uapi/linux/sonet.h>
82470
82471 struct k_sonet_stats {
82472-#define __HANDLE_ITEM(i) atomic_t i
82473+#define __HANDLE_ITEM(i) atomic_unchecked_t i
82474 __SONET_ITEMS
82475 #undef __HANDLE_ITEM
82476 };
82477diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
82478index 07d8e53..dc934c9 100644
82479--- a/include/linux/sunrpc/addr.h
82480+++ b/include/linux/sunrpc/addr.h
82481@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
82482 {
82483 switch (sap->sa_family) {
82484 case AF_INET:
82485- return ntohs(((struct sockaddr_in *)sap)->sin_port);
82486+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
82487 case AF_INET6:
82488- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
82489+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
82490 }
82491 return 0;
82492 }
82493@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
82494 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
82495 const struct sockaddr *src)
82496 {
82497- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
82498+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
82499 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
82500
82501 dsin->sin_family = ssin->sin_family;
82502@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
82503 if (sa->sa_family != AF_INET6)
82504 return 0;
82505
82506- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
82507+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
82508 }
82509
82510 #endif /* _LINUX_SUNRPC_ADDR_H */
82511diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
82512index 70736b9..37f33db 100644
82513--- a/include/linux/sunrpc/clnt.h
82514+++ b/include/linux/sunrpc/clnt.h
82515@@ -97,7 +97,7 @@ struct rpc_procinfo {
82516 unsigned int p_timer; /* Which RTT timer to use */
82517 u32 p_statidx; /* Which procedure to account */
82518 const char * p_name; /* name of procedure */
82519-};
82520+} __do_const;
82521
82522 #ifdef __KERNEL__
82523
82524diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
82525index 04e7632..2e2a8a3 100644
82526--- a/include/linux/sunrpc/svc.h
82527+++ b/include/linux/sunrpc/svc.h
82528@@ -412,7 +412,7 @@ struct svc_procedure {
82529 unsigned int pc_count; /* call count */
82530 unsigned int pc_cachetype; /* cache info (NFS) */
82531 unsigned int pc_xdrressize; /* maximum size of XDR reply */
82532-};
82533+} __do_const;
82534
82535 /*
82536 * Function prototypes.
82537diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
82538index 0b8e3e6..33e0a01 100644
82539--- a/include/linux/sunrpc/svc_rdma.h
82540+++ b/include/linux/sunrpc/svc_rdma.h
82541@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
82542 extern unsigned int svcrdma_max_requests;
82543 extern unsigned int svcrdma_max_req_size;
82544
82545-extern atomic_t rdma_stat_recv;
82546-extern atomic_t rdma_stat_read;
82547-extern atomic_t rdma_stat_write;
82548-extern atomic_t rdma_stat_sq_starve;
82549-extern atomic_t rdma_stat_rq_starve;
82550-extern atomic_t rdma_stat_rq_poll;
82551-extern atomic_t rdma_stat_rq_prod;
82552-extern atomic_t rdma_stat_sq_poll;
82553-extern atomic_t rdma_stat_sq_prod;
82554+extern atomic_unchecked_t rdma_stat_recv;
82555+extern atomic_unchecked_t rdma_stat_read;
82556+extern atomic_unchecked_t rdma_stat_write;
82557+extern atomic_unchecked_t rdma_stat_sq_starve;
82558+extern atomic_unchecked_t rdma_stat_rq_starve;
82559+extern atomic_unchecked_t rdma_stat_rq_poll;
82560+extern atomic_unchecked_t rdma_stat_rq_prod;
82561+extern atomic_unchecked_t rdma_stat_sq_poll;
82562+extern atomic_unchecked_t rdma_stat_sq_prod;
82563
82564 #define RPCRDMA_VERSION 1
82565
82566diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
82567index 8d71d65..f79586e 100644
82568--- a/include/linux/sunrpc/svcauth.h
82569+++ b/include/linux/sunrpc/svcauth.h
82570@@ -120,7 +120,7 @@ struct auth_ops {
82571 int (*release)(struct svc_rqst *rq);
82572 void (*domain_release)(struct auth_domain *);
82573 int (*set_client)(struct svc_rqst *rq);
82574-};
82575+} __do_const;
82576
82577 #define SVC_GARBAGE 1
82578 #define SVC_SYSERR 2
82579diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
82580index a5ffd32..0935dea 100644
82581--- a/include/linux/swiotlb.h
82582+++ b/include/linux/swiotlb.h
82583@@ -60,7 +60,8 @@ extern void
82584
82585 extern void
82586 swiotlb_free_coherent(struct device *hwdev, size_t size,
82587- void *vaddr, dma_addr_t dma_handle);
82588+ void *vaddr, dma_addr_t dma_handle,
82589+ struct dma_attrs *attrs);
82590
82591 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
82592 unsigned long offset, size_t size,
82593diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
82594index a4a0588..752870e 100644
82595--- a/include/linux/syscalls.h
82596+++ b/include/linux/syscalls.h
82597@@ -98,10 +98,16 @@ struct sigaltstack;
82598 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
82599
82600 #define __SC_DECL(t, a) t a
82601+#define __TYPE_IS_U(t) (__same_type((t)0, 0UL) || __same_type((t)0, 0U) || __same_type((t)0, (unsigned short)0) || __same_type((t)0, (unsigned char)0))
82602 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
82603 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
82604 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
82605-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
82606+#define __SC_LONG(t, a) __typeof( \
82607+ __builtin_choose_expr( \
82608+ sizeof(t) > sizeof(int), \
82609+ (t) 0, \
82610+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
82611+ )) a
82612 #define __SC_CAST(t, a) (t) a
82613 #define __SC_ARGS(t, a) a
82614 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
82615@@ -379,11 +385,11 @@ asmlinkage long sys_sync(void);
82616 asmlinkage long sys_fsync(unsigned int fd);
82617 asmlinkage long sys_fdatasync(unsigned int fd);
82618 asmlinkage long sys_bdflush(int func, long data);
82619-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
82620- char __user *type, unsigned long flags,
82621+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
82622+ const char __user *type, unsigned long flags,
82623 void __user *data);
82624-asmlinkage long sys_umount(char __user *name, int flags);
82625-asmlinkage long sys_oldumount(char __user *name);
82626+asmlinkage long sys_umount(const char __user *name, int flags);
82627+asmlinkage long sys_oldumount(const char __user *name);
82628 asmlinkage long sys_truncate(const char __user *path, long length);
82629 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
82630 asmlinkage long sys_stat(const char __user *filename,
82631@@ -595,7 +601,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
82632 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
82633 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
82634 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
82635- struct sockaddr __user *, int);
82636+ struct sockaddr __user *, int) __intentional_overflow(0);
82637 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
82638 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
82639 unsigned int vlen, unsigned flags);
82640diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
82641index 27b3b0b..e093dd9 100644
82642--- a/include/linux/syscore_ops.h
82643+++ b/include/linux/syscore_ops.h
82644@@ -16,7 +16,7 @@ struct syscore_ops {
82645 int (*suspend)(void);
82646 void (*resume)(void);
82647 void (*shutdown)(void);
82648-};
82649+} __do_const;
82650
82651 extern void register_syscore_ops(struct syscore_ops *ops);
82652 extern void unregister_syscore_ops(struct syscore_ops *ops);
82653diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
82654index 14a8ff2..fa95f3a 100644
82655--- a/include/linux/sysctl.h
82656+++ b/include/linux/sysctl.h
82657@@ -34,13 +34,13 @@ struct ctl_table_root;
82658 struct ctl_table_header;
82659 struct ctl_dir;
82660
82661-typedef struct ctl_table ctl_table;
82662-
82663 typedef int proc_handler (struct ctl_table *ctl, int write,
82664 void __user *buffer, size_t *lenp, loff_t *ppos);
82665
82666 extern int proc_dostring(struct ctl_table *, int,
82667 void __user *, size_t *, loff_t *);
82668+extern int proc_dostring_modpriv(struct ctl_table *, int,
82669+ void __user *, size_t *, loff_t *);
82670 extern int proc_dointvec(struct ctl_table *, int,
82671 void __user *, size_t *, loff_t *);
82672 extern int proc_dointvec_minmax(struct ctl_table *, int,
82673@@ -115,7 +115,9 @@ struct ctl_table
82674 struct ctl_table_poll *poll;
82675 void *extra1;
82676 void *extra2;
82677-};
82678+} __do_const __randomize_layout;
82679+typedef struct ctl_table __no_const ctl_table_no_const;
82680+typedef struct ctl_table ctl_table;
82681
82682 struct ctl_node {
82683 struct rb_node node;
82684diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
82685index 5ffaa34..fe3e31c 100644
82686--- a/include/linux/sysfs.h
82687+++ b/include/linux/sysfs.h
82688@@ -34,7 +34,8 @@ struct attribute {
82689 struct lock_class_key *key;
82690 struct lock_class_key skey;
82691 #endif
82692-};
82693+} __do_const;
82694+typedef struct attribute __no_const attribute_no_const;
82695
82696 /**
82697 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
82698@@ -63,7 +64,8 @@ struct attribute_group {
82699 struct attribute *, int);
82700 struct attribute **attrs;
82701 struct bin_attribute **bin_attrs;
82702-};
82703+} __do_const;
82704+typedef struct attribute_group __no_const attribute_group_no_const;
82705
82706 /**
82707 * Use these macros to make defining attributes easier. See include/linux/device.h
82708@@ -128,7 +130,8 @@ struct bin_attribute {
82709 char *, loff_t, size_t);
82710 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
82711 struct vm_area_struct *vma);
82712-};
82713+} __do_const;
82714+typedef struct bin_attribute __no_const bin_attribute_no_const;
82715
82716 /**
82717 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
82718diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
82719index 387fa7d..3fcde6b 100644
82720--- a/include/linux/sysrq.h
82721+++ b/include/linux/sysrq.h
82722@@ -16,6 +16,7 @@
82723
82724 #include <linux/errno.h>
82725 #include <linux/types.h>
82726+#include <linux/compiler.h>
82727
82728 /* Possible values of bitmask for enabling sysrq functions */
82729 /* 0x0001 is reserved for enable everything */
82730@@ -33,7 +34,7 @@ struct sysrq_key_op {
82731 char *help_msg;
82732 char *action_msg;
82733 int enable_mask;
82734-};
82735+} __do_const;
82736
82737 #ifdef CONFIG_MAGIC_SYSRQ
82738
82739diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
82740index fddbe20..a0e76ab 100644
82741--- a/include/linux/thread_info.h
82742+++ b/include/linux/thread_info.h
82743@@ -161,6 +161,13 @@ static inline bool test_and_clear_restore_sigmask(void)
82744 #error "no set_restore_sigmask() provided and default one won't work"
82745 #endif
82746
82747+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
82748+
82749+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
82750+{
82751+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
82752+}
82753+
82754 #endif /* __KERNEL__ */
82755
82756 #endif /* _LINUX_THREAD_INFO_H */
82757diff --git a/include/linux/tty.h b/include/linux/tty.h
82758index 1c3316a..ae83b9f 100644
82759--- a/include/linux/tty.h
82760+++ b/include/linux/tty.h
82761@@ -202,7 +202,7 @@ struct tty_port {
82762 const struct tty_port_operations *ops; /* Port operations */
82763 spinlock_t lock; /* Lock protecting tty field */
82764 int blocked_open; /* Waiting to open */
82765- int count; /* Usage count */
82766+ atomic_t count; /* Usage count */
82767 wait_queue_head_t open_wait; /* Open waiters */
82768 wait_queue_head_t close_wait; /* Close waiters */
82769 wait_queue_head_t delta_msr_wait; /* Modem status change */
82770@@ -284,7 +284,7 @@ struct tty_struct {
82771 /* If the tty has a pending do_SAK, queue it here - akpm */
82772 struct work_struct SAK_work;
82773 struct tty_port *port;
82774-};
82775+} __randomize_layout;
82776
82777 /* Each of a tty's open files has private_data pointing to tty_file_private */
82778 struct tty_file_private {
82779@@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port,
82780 struct tty_struct *tty, struct file *filp);
82781 static inline int tty_port_users(struct tty_port *port)
82782 {
82783- return port->count + port->blocked_open;
82784+ return atomic_read(&port->count) + port->blocked_open;
82785 }
82786
82787 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
82788diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
82789index 756a609..89db85e 100644
82790--- a/include/linux/tty_driver.h
82791+++ b/include/linux/tty_driver.h
82792@@ -285,7 +285,7 @@ struct tty_operations {
82793 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
82794 #endif
82795 const struct file_operations *proc_fops;
82796-};
82797+} __do_const __randomize_layout;
82798
82799 struct tty_driver {
82800 int magic; /* magic number for this structure */
82801@@ -319,7 +319,7 @@ struct tty_driver {
82802
82803 const struct tty_operations *ops;
82804 struct list_head tty_drivers;
82805-};
82806+} __randomize_layout;
82807
82808 extern struct list_head tty_drivers;
82809
82810diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
82811index add26da..22c00bef 100644
82812--- a/include/linux/tty_ldisc.h
82813+++ b/include/linux/tty_ldisc.h
82814@@ -212,7 +212,7 @@ struct tty_ldisc_ops {
82815
82816 struct module *owner;
82817
82818- int refcount;
82819+ atomic_t refcount;
82820 };
82821
82822 struct tty_ldisc {
82823diff --git a/include/linux/types.h b/include/linux/types.h
82824index 4d118ba..c3ee9bf 100644
82825--- a/include/linux/types.h
82826+++ b/include/linux/types.h
82827@@ -176,10 +176,26 @@ typedef struct {
82828 int counter;
82829 } atomic_t;
82830
82831+#ifdef CONFIG_PAX_REFCOUNT
82832+typedef struct {
82833+ int counter;
82834+} atomic_unchecked_t;
82835+#else
82836+typedef atomic_t atomic_unchecked_t;
82837+#endif
82838+
82839 #ifdef CONFIG_64BIT
82840 typedef struct {
82841 long counter;
82842 } atomic64_t;
82843+
82844+#ifdef CONFIG_PAX_REFCOUNT
82845+typedef struct {
82846+ long counter;
82847+} atomic64_unchecked_t;
82848+#else
82849+typedef atomic64_t atomic64_unchecked_t;
82850+#endif
82851 #endif
82852
82853 struct list_head {
82854diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
82855index ecd3319..8a36ded 100644
82856--- a/include/linux/uaccess.h
82857+++ b/include/linux/uaccess.h
82858@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
82859 long ret; \
82860 mm_segment_t old_fs = get_fs(); \
82861 \
82862- set_fs(KERNEL_DS); \
82863 pagefault_disable(); \
82864- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
82865- pagefault_enable(); \
82866+ set_fs(KERNEL_DS); \
82867+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
82868 set_fs(old_fs); \
82869+ pagefault_enable(); \
82870 ret; \
82871 })
82872
82873diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
82874index 2d1f9b6..d7a9fce 100644
82875--- a/include/linux/uidgid.h
82876+++ b/include/linux/uidgid.h
82877@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
82878
82879 #endif /* CONFIG_USER_NS */
82880
82881+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
82882+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
82883+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
82884+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
82885+
82886 #endif /* _LINUX_UIDGID_H */
82887diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
82888index 99c1b4d..562e6f3 100644
82889--- a/include/linux/unaligned/access_ok.h
82890+++ b/include/linux/unaligned/access_ok.h
82891@@ -4,34 +4,34 @@
82892 #include <linux/kernel.h>
82893 #include <asm/byteorder.h>
82894
82895-static inline u16 get_unaligned_le16(const void *p)
82896+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
82897 {
82898- return le16_to_cpup((__le16 *)p);
82899+ return le16_to_cpup((const __le16 *)p);
82900 }
82901
82902-static inline u32 get_unaligned_le32(const void *p)
82903+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
82904 {
82905- return le32_to_cpup((__le32 *)p);
82906+ return le32_to_cpup((const __le32 *)p);
82907 }
82908
82909-static inline u64 get_unaligned_le64(const void *p)
82910+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
82911 {
82912- return le64_to_cpup((__le64 *)p);
82913+ return le64_to_cpup((const __le64 *)p);
82914 }
82915
82916-static inline u16 get_unaligned_be16(const void *p)
82917+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
82918 {
82919- return be16_to_cpup((__be16 *)p);
82920+ return be16_to_cpup((const __be16 *)p);
82921 }
82922
82923-static inline u32 get_unaligned_be32(const void *p)
82924+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
82925 {
82926- return be32_to_cpup((__be32 *)p);
82927+ return be32_to_cpup((const __be32 *)p);
82928 }
82929
82930-static inline u64 get_unaligned_be64(const void *p)
82931+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
82932 {
82933- return be64_to_cpup((__be64 *)p);
82934+ return be64_to_cpup((const __be64 *)p);
82935 }
82936
82937 static inline void put_unaligned_le16(u16 val, void *p)
82938diff --git a/include/linux/usb.h b/include/linux/usb.h
82939index 6b7ec37..4428419 100644
82940--- a/include/linux/usb.h
82941+++ b/include/linux/usb.h
82942@@ -569,7 +569,7 @@ struct usb_device {
82943 int maxchild;
82944
82945 u32 quirks;
82946- atomic_t urbnum;
82947+ atomic_unchecked_t urbnum;
82948
82949 unsigned long active_duration;
82950
82951@@ -1653,7 +1653,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
82952
82953 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
82954 __u8 request, __u8 requesttype, __u16 value, __u16 index,
82955- void *data, __u16 size, int timeout);
82956+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
82957 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
82958 void *data, int len, int *actual_length, int timeout);
82959 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
82960diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
82961index e452ba6..78f8e80 100644
82962--- a/include/linux/usb/renesas_usbhs.h
82963+++ b/include/linux/usb/renesas_usbhs.h
82964@@ -39,7 +39,7 @@ enum {
82965 */
82966 struct renesas_usbhs_driver_callback {
82967 int (*notify_hotplug)(struct platform_device *pdev);
82968-};
82969+} __no_const;
82970
82971 /*
82972 * callback functions for platform
82973diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
82974index 4836ba3..603f6ee 100644
82975--- a/include/linux/user_namespace.h
82976+++ b/include/linux/user_namespace.h
82977@@ -33,7 +33,7 @@ struct user_namespace {
82978 struct key *persistent_keyring_register;
82979 struct rw_semaphore persistent_keyring_register_sem;
82980 #endif
82981-};
82982+} __randomize_layout;
82983
82984 extern struct user_namespace init_user_ns;
82985
82986diff --git a/include/linux/utsname.h b/include/linux/utsname.h
82987index 239e277..22a5cf5 100644
82988--- a/include/linux/utsname.h
82989+++ b/include/linux/utsname.h
82990@@ -24,7 +24,7 @@ struct uts_namespace {
82991 struct new_utsname name;
82992 struct user_namespace *user_ns;
82993 unsigned int proc_inum;
82994-};
82995+} __randomize_layout;
82996 extern struct uts_namespace init_uts_ns;
82997
82998 #ifdef CONFIG_UTS_NS
82999diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
83000index 6f8fbcf..4efc177 100644
83001--- a/include/linux/vermagic.h
83002+++ b/include/linux/vermagic.h
83003@@ -25,9 +25,42 @@
83004 #define MODULE_ARCH_VERMAGIC ""
83005 #endif
83006
83007+#ifdef CONFIG_PAX_REFCOUNT
83008+#define MODULE_PAX_REFCOUNT "REFCOUNT "
83009+#else
83010+#define MODULE_PAX_REFCOUNT ""
83011+#endif
83012+
83013+#ifdef CONSTIFY_PLUGIN
83014+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
83015+#else
83016+#define MODULE_CONSTIFY_PLUGIN ""
83017+#endif
83018+
83019+#ifdef STACKLEAK_PLUGIN
83020+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
83021+#else
83022+#define MODULE_STACKLEAK_PLUGIN ""
83023+#endif
83024+
83025+#ifdef RANDSTRUCT_PLUGIN
83026+#include <generated/randomize_layout_hash.h>
83027+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
83028+#else
83029+#define MODULE_RANDSTRUCT_PLUGIN
83030+#endif
83031+
83032+#ifdef CONFIG_GRKERNSEC
83033+#define MODULE_GRSEC "GRSEC "
83034+#else
83035+#define MODULE_GRSEC ""
83036+#endif
83037+
83038 #define VERMAGIC_STRING \
83039 UTS_RELEASE " " \
83040 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
83041 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
83042- MODULE_ARCH_VERMAGIC
83043+ MODULE_ARCH_VERMAGIC \
83044+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
83045+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
83046
83047diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
83048index 502073a..a7de024 100644
83049--- a/include/linux/vga_switcheroo.h
83050+++ b/include/linux/vga_switcheroo.h
83051@@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
83052
83053 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
83054
83055-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
83056-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
83057+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
83058+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
83059 #else
83060
83061 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
83062@@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
83063
83064 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
83065
83066-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
83067-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
83068+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
83069+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
83070
83071 #endif
83072 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
83073diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
83074index 4b8a891..e9a2863 100644
83075--- a/include/linux/vmalloc.h
83076+++ b/include/linux/vmalloc.h
83077@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
83078 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
83079 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
83080 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
83081+
83082+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
83083+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
83084+#endif
83085+
83086 /* bits [20..32] reserved for arch specific ioremap internals */
83087
83088 /*
83089@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
83090 unsigned long flags, pgprot_t prot);
83091 extern void vunmap(const void *addr);
83092
83093+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
83094+extern void unmap_process_stacks(struct task_struct *task);
83095+#endif
83096+
83097 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
83098 unsigned long uaddr, void *kaddr,
83099 unsigned long size);
83100@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
83101
83102 /* for /dev/kmem */
83103 extern long vread(char *buf, char *addr, unsigned long count);
83104-extern long vwrite(char *buf, char *addr, unsigned long count);
83105+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
83106
83107 /*
83108 * Internals. Dont't use..
83109diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
83110index 45c9cd1..20bd0bf 100644
83111--- a/include/linux/vmstat.h
83112+++ b/include/linux/vmstat.h
83113@@ -102,18 +102,18 @@ static inline void vm_events_fold_cpu(int cpu)
83114 /*
83115 * Zone based page accounting with per cpu differentials.
83116 */
83117-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83118+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83119
83120 static inline void zone_page_state_add(long x, struct zone *zone,
83121 enum zone_stat_item item)
83122 {
83123- atomic_long_add(x, &zone->vm_stat[item]);
83124- atomic_long_add(x, &vm_stat[item]);
83125+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
83126+ atomic_long_add_unchecked(x, &vm_stat[item]);
83127 }
83128
83129-static inline unsigned long global_page_state(enum zone_stat_item item)
83130+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
83131 {
83132- long x = atomic_long_read(&vm_stat[item]);
83133+ long x = atomic_long_read_unchecked(&vm_stat[item]);
83134 #ifdef CONFIG_SMP
83135 if (x < 0)
83136 x = 0;
83137@@ -121,10 +121,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
83138 return x;
83139 }
83140
83141-static inline unsigned long zone_page_state(struct zone *zone,
83142+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
83143 enum zone_stat_item item)
83144 {
83145- long x = atomic_long_read(&zone->vm_stat[item]);
83146+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
83147 #ifdef CONFIG_SMP
83148 if (x < 0)
83149 x = 0;
83150@@ -141,7 +141,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
83151 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
83152 enum zone_stat_item item)
83153 {
83154- long x = atomic_long_read(&zone->vm_stat[item]);
83155+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
83156
83157 #ifdef CONFIG_SMP
83158 int cpu;
83159@@ -228,14 +228,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
83160
83161 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
83162 {
83163- atomic_long_inc(&zone->vm_stat[item]);
83164- atomic_long_inc(&vm_stat[item]);
83165+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
83166+ atomic_long_inc_unchecked(&vm_stat[item]);
83167 }
83168
83169 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
83170 {
83171- atomic_long_dec(&zone->vm_stat[item]);
83172- atomic_long_dec(&vm_stat[item]);
83173+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
83174+ atomic_long_dec_unchecked(&vm_stat[item]);
83175 }
83176
83177 static inline void __inc_zone_page_state(struct page *page,
83178diff --git a/include/linux/xattr.h b/include/linux/xattr.h
83179index 91b0a68..0e9adf6 100644
83180--- a/include/linux/xattr.h
83181+++ b/include/linux/xattr.h
83182@@ -28,7 +28,7 @@ struct xattr_handler {
83183 size_t size, int handler_flags);
83184 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
83185 size_t size, int flags, int handler_flags);
83186-};
83187+} __do_const;
83188
83189 struct xattr {
83190 const char *name;
83191@@ -37,6 +37,9 @@ struct xattr {
83192 };
83193
83194 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
83195+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
83196+ssize_t pax_getxattr(struct dentry *, void *, size_t);
83197+#endif
83198 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
83199 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
83200 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
83201diff --git a/include/linux/zlib.h b/include/linux/zlib.h
83202index 9c5a6b4..09c9438 100644
83203--- a/include/linux/zlib.h
83204+++ b/include/linux/zlib.h
83205@@ -31,6 +31,7 @@
83206 #define _ZLIB_H
83207
83208 #include <linux/zconf.h>
83209+#include <linux/compiler.h>
83210
83211 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
83212 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
83213@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
83214
83215 /* basic functions */
83216
83217-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
83218+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
83219 /*
83220 Returns the number of bytes that needs to be allocated for a per-
83221 stream workspace with the specified parameters. A pointer to this
83222diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
83223index eec6e46..82d5641 100644
83224--- a/include/media/v4l2-dev.h
83225+++ b/include/media/v4l2-dev.h
83226@@ -77,7 +77,7 @@ struct v4l2_file_operations {
83227 int (*mmap) (struct file *, struct vm_area_struct *);
83228 int (*open) (struct file *);
83229 int (*release) (struct file *);
83230-};
83231+} __do_const;
83232
83233 /*
83234 * Newer version of video_device, handled by videodev2.c
83235diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
83236index c9b1593..a572459 100644
83237--- a/include/media/v4l2-device.h
83238+++ b/include/media/v4l2-device.h
83239@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
83240 this function returns 0. If the name ends with a digit (e.g. cx18),
83241 then the name will be set to cx18-0 since cx180 looks really odd. */
83242 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
83243- atomic_t *instance);
83244+ atomic_unchecked_t *instance);
83245
83246 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
83247 Since the parent disappears this ensures that v4l2_dev doesn't have an
83248diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
83249index d9fa68f..45c88d1 100644
83250--- a/include/net/9p/transport.h
83251+++ b/include/net/9p/transport.h
83252@@ -63,7 +63,7 @@ struct p9_trans_module {
83253 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
83254 int (*zc_request)(struct p9_client *, struct p9_req_t *,
83255 char *, char *, int , int, int, int);
83256-};
83257+} __do_const;
83258
83259 void v9fs_register_trans(struct p9_trans_module *m);
83260 void v9fs_unregister_trans(struct p9_trans_module *m);
83261diff --git a/include/net/af_unix.h b/include/net/af_unix.h
83262index a175ba4..196eb82 100644
83263--- a/include/net/af_unix.h
83264+++ b/include/net/af_unix.h
83265@@ -36,7 +36,7 @@ struct unix_skb_parms {
83266 u32 secid; /* Security ID */
83267 #endif
83268 u32 consumed;
83269-};
83270+} __randomize_layout;
83271
83272 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
83273 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
83274diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
83275index 4abdcb2..945c5cc 100644
83276--- a/include/net/bluetooth/l2cap.h
83277+++ b/include/net/bluetooth/l2cap.h
83278@@ -601,7 +601,7 @@ struct l2cap_ops {
83279 long (*get_sndtimeo) (struct l2cap_chan *chan);
83280 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
83281 unsigned long len, int nb);
83282-};
83283+} __do_const;
83284
83285 struct l2cap_conn {
83286 struct hci_conn *hcon;
83287diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
83288index f2ae33d..c457cf0 100644
83289--- a/include/net/caif/cfctrl.h
83290+++ b/include/net/caif/cfctrl.h
83291@@ -52,7 +52,7 @@ struct cfctrl_rsp {
83292 void (*radioset_rsp)(void);
83293 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
83294 struct cflayer *client_layer);
83295-};
83296+} __no_const;
83297
83298 /* Link Setup Parameters for CAIF-Links. */
83299 struct cfctrl_link_param {
83300@@ -101,8 +101,8 @@ struct cfctrl_request_info {
83301 struct cfctrl {
83302 struct cfsrvl serv;
83303 struct cfctrl_rsp res;
83304- atomic_t req_seq_no;
83305- atomic_t rsp_seq_no;
83306+ atomic_unchecked_t req_seq_no;
83307+ atomic_unchecked_t rsp_seq_no;
83308 struct list_head list;
83309 /* Protects from simultaneous access to first_req list */
83310 spinlock_t info_list_lock;
83311diff --git a/include/net/flow.h b/include/net/flow.h
83312index 8109a15..504466d 100644
83313--- a/include/net/flow.h
83314+++ b/include/net/flow.h
83315@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
83316
83317 void flow_cache_flush(struct net *net);
83318 void flow_cache_flush_deferred(struct net *net);
83319-extern atomic_t flow_cache_genid;
83320+extern atomic_unchecked_t flow_cache_genid;
83321
83322 #endif
83323diff --git a/include/net/genetlink.h b/include/net/genetlink.h
83324index 93695f0..766d71c 100644
83325--- a/include/net/genetlink.h
83326+++ b/include/net/genetlink.h
83327@@ -120,7 +120,7 @@ struct genl_ops {
83328 u8 cmd;
83329 u8 internal_flags;
83330 u8 flags;
83331-};
83332+} __do_const;
83333
83334 int __genl_register_family(struct genl_family *family);
83335
83336diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
83337index 734d9b5..48a9a4b 100644
83338--- a/include/net/gro_cells.h
83339+++ b/include/net/gro_cells.h
83340@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
83341 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
83342
83343 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
83344- atomic_long_inc(&dev->rx_dropped);
83345+ atomic_long_inc_unchecked(&dev->rx_dropped);
83346 kfree_skb(skb);
83347 return;
83348 }
83349diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
83350index 7a43138..bc76865 100644
83351--- a/include/net/inet_connection_sock.h
83352+++ b/include/net/inet_connection_sock.h
83353@@ -62,7 +62,7 @@ struct inet_connection_sock_af_ops {
83354 void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
83355 int (*bind_conflict)(const struct sock *sk,
83356 const struct inet_bind_bucket *tb, bool relax);
83357-};
83358+} __do_const;
83359
83360 /** inet_connection_sock - INET connection oriented sock
83361 *
83362diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
83363index 058271b..1a44af7 100644
83364--- a/include/net/inetpeer.h
83365+++ b/include/net/inetpeer.h
83366@@ -47,8 +47,8 @@ struct inet_peer {
83367 */
83368 union {
83369 struct {
83370- atomic_t rid; /* Frag reception counter */
83371- atomic_t ip_id_count; /* IP ID for the next packet */
83372+ atomic_unchecked_t rid; /* Frag reception counter */
83373+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
83374 };
83375 struct rcu_head rcu;
83376 struct inet_peer *gc_next;
83377@@ -179,7 +179,7 @@ static inline int inet_getid(struct inet_peer *p, int more)
83378 {
83379 more++;
83380 inet_peer_refcheck(p);
83381- return atomic_add_return(more, &p->ip_id_count) - more;
83382+ return atomic_add_return_unchecked(more, &p->ip_id_count) - more;
83383 }
83384
83385 #endif /* _NET_INETPEER_H */
83386diff --git a/include/net/ip.h b/include/net/ip.h
83387index 3ec2b0f..72435b6 100644
83388--- a/include/net/ip.h
83389+++ b/include/net/ip.h
83390@@ -220,7 +220,7 @@ static inline void snmp_mib_free(void __percpu *ptr[SNMP_ARRAY_SZ])
83391
83392 void inet_get_local_port_range(struct net *net, int *low, int *high);
83393
83394-extern unsigned long *sysctl_local_reserved_ports;
83395+extern unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
83396 static inline int inet_is_reserved_local_port(int port)
83397 {
83398 return test_bit(port, sysctl_local_reserved_ports);
83399diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
83400index 9922093..a1755d6 100644
83401--- a/include/net/ip_fib.h
83402+++ b/include/net/ip_fib.h
83403@@ -169,7 +169,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
83404
83405 #define FIB_RES_SADDR(net, res) \
83406 ((FIB_RES_NH(res).nh_saddr_genid == \
83407- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
83408+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
83409 FIB_RES_NH(res).nh_saddr : \
83410 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
83411 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
83412diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
83413index 5679d92..2e7a690 100644
83414--- a/include/net/ip_vs.h
83415+++ b/include/net/ip_vs.h
83416@@ -558,7 +558,7 @@ struct ip_vs_conn {
83417 struct ip_vs_conn *control; /* Master control connection */
83418 atomic_t n_control; /* Number of controlled ones */
83419 struct ip_vs_dest *dest; /* real server */
83420- atomic_t in_pkts; /* incoming packet counter */
83421+ atomic_unchecked_t in_pkts; /* incoming packet counter */
83422
83423 /* packet transmitter for different forwarding methods. If it
83424 mangles the packet, it must return NF_DROP or better NF_STOLEN,
83425@@ -705,7 +705,7 @@ struct ip_vs_dest {
83426 __be16 port; /* port number of the server */
83427 union nf_inet_addr addr; /* IP address of the server */
83428 volatile unsigned int flags; /* dest status flags */
83429- atomic_t conn_flags; /* flags to copy to conn */
83430+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
83431 atomic_t weight; /* server weight */
83432
83433 atomic_t refcnt; /* reference counter */
83434@@ -960,11 +960,11 @@ struct netns_ipvs {
83435 /* ip_vs_lblc */
83436 int sysctl_lblc_expiration;
83437 struct ctl_table_header *lblc_ctl_header;
83438- struct ctl_table *lblc_ctl_table;
83439+ ctl_table_no_const *lblc_ctl_table;
83440 /* ip_vs_lblcr */
83441 int sysctl_lblcr_expiration;
83442 struct ctl_table_header *lblcr_ctl_header;
83443- struct ctl_table *lblcr_ctl_table;
83444+ ctl_table_no_const *lblcr_ctl_table;
83445 /* ip_vs_est */
83446 struct list_head est_list; /* estimator list */
83447 spinlock_t est_lock;
83448diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
83449index 8d4f588..2e37ad2 100644
83450--- a/include/net/irda/ircomm_tty.h
83451+++ b/include/net/irda/ircomm_tty.h
83452@@ -33,6 +33,7 @@
83453 #include <linux/termios.h>
83454 #include <linux/timer.h>
83455 #include <linux/tty.h> /* struct tty_struct */
83456+#include <asm/local.h>
83457
83458 #include <net/irda/irias_object.h>
83459 #include <net/irda/ircomm_core.h>
83460diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
83461index 714cc9a..ea05f3e 100644
83462--- a/include/net/iucv/af_iucv.h
83463+++ b/include/net/iucv/af_iucv.h
83464@@ -149,7 +149,7 @@ struct iucv_skb_cb {
83465 struct iucv_sock_list {
83466 struct hlist_head head;
83467 rwlock_t lock;
83468- atomic_t autobind_name;
83469+ atomic_unchecked_t autobind_name;
83470 };
83471
83472 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
83473diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
83474index f3be818..bf46196 100644
83475--- a/include/net/llc_c_ac.h
83476+++ b/include/net/llc_c_ac.h
83477@@ -87,7 +87,7 @@
83478 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
83479 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
83480
83481-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
83482+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
83483
83484 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
83485 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
83486diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
83487index 3948cf1..83b28c4 100644
83488--- a/include/net/llc_c_ev.h
83489+++ b/include/net/llc_c_ev.h
83490@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
83491 return (struct llc_conn_state_ev *)skb->cb;
83492 }
83493
83494-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
83495-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
83496+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
83497+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
83498
83499 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
83500 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
83501diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
83502index 0e79cfb..f46db31 100644
83503--- a/include/net/llc_c_st.h
83504+++ b/include/net/llc_c_st.h
83505@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
83506 u8 next_state;
83507 llc_conn_ev_qfyr_t *ev_qualifiers;
83508 llc_conn_action_t *ev_actions;
83509-};
83510+} __do_const;
83511
83512 struct llc_conn_state {
83513 u8 current_state;
83514diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
83515index a61b98c..aade1eb 100644
83516--- a/include/net/llc_s_ac.h
83517+++ b/include/net/llc_s_ac.h
83518@@ -23,7 +23,7 @@
83519 #define SAP_ACT_TEST_IND 9
83520
83521 /* All action functions must look like this */
83522-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
83523+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
83524
83525 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
83526 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
83527diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
83528index 567c681..cd73ac02 100644
83529--- a/include/net/llc_s_st.h
83530+++ b/include/net/llc_s_st.h
83531@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
83532 llc_sap_ev_t ev;
83533 u8 next_state;
83534 llc_sap_action_t *ev_actions;
83535-};
83536+} __do_const;
83537
83538 struct llc_sap_state {
83539 u8 curr_state;
83540diff --git a/include/net/mac80211.h b/include/net/mac80211.h
83541index 8248e39..7610eec 100644
83542--- a/include/net/mac80211.h
83543+++ b/include/net/mac80211.h
83544@@ -4467,7 +4467,7 @@ struct rate_control_ops {
83545 void (*add_sta_debugfs)(void *priv, void *priv_sta,
83546 struct dentry *dir);
83547 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
83548-};
83549+} __do_const;
83550
83551 static inline int rate_supported(struct ieee80211_sta *sta,
83552 enum ieee80211_band band,
83553diff --git a/include/net/neighbour.h b/include/net/neighbour.h
83554index 7277caf..fd095bc 100644
83555--- a/include/net/neighbour.h
83556+++ b/include/net/neighbour.h
83557@@ -163,7 +163,7 @@ struct neigh_ops {
83558 void (*error_report)(struct neighbour *, struct sk_buff *);
83559 int (*output)(struct neighbour *, struct sk_buff *);
83560 int (*connected_output)(struct neighbour *, struct sk_buff *);
83561-};
83562+} __do_const;
83563
83564 struct pneigh_entry {
83565 struct pneigh_entry *next;
83566@@ -203,7 +203,6 @@ struct neigh_table {
83567 void (*proxy_redo)(struct sk_buff *skb);
83568 char *id;
83569 struct neigh_parms parms;
83570- /* HACK. gc_* should follow parms without a gap! */
83571 int gc_interval;
83572 int gc_thresh1;
83573 int gc_thresh2;
83574@@ -218,7 +217,7 @@ struct neigh_table {
83575 struct neigh_statistics __percpu *stats;
83576 struct neigh_hash_table __rcu *nht;
83577 struct pneigh_entry **phash_buckets;
83578-};
83579+} __randomize_layout;
83580
83581 static inline int neigh_parms_family(struct neigh_parms *p)
83582 {
83583diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
83584index 5f9eb26..85699c4 100644
83585--- a/include/net/net_namespace.h
83586+++ b/include/net/net_namespace.h
83587@@ -129,8 +129,8 @@ struct net {
83588 struct netns_ipvs *ipvs;
83589 #endif
83590 struct sock *diag_nlsk;
83591- atomic_t fnhe_genid;
83592-};
83593+ atomic_unchecked_t fnhe_genid;
83594+} __randomize_layout;
83595
83596 #include <linux/seq_file_net.h>
83597
83598@@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
83599 #define __net_init __init
83600 #define __net_exit __exit_refok
83601 #define __net_initdata __initdata
83602+#ifdef CONSTIFY_PLUGIN
83603 #define __net_initconst __initconst
83604+#else
83605+#define __net_initconst __initdata
83606+#endif
83607 #endif
83608
83609 struct pernet_operations {
83610@@ -296,7 +300,7 @@ struct pernet_operations {
83611 void (*exit_batch)(struct list_head *net_exit_list);
83612 int *id;
83613 size_t size;
83614-};
83615+} __do_const;
83616
83617 /*
83618 * Use these carefully. If you implement a network device and it
83619@@ -344,23 +348,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
83620
83621 static inline int rt_genid_ipv4(struct net *net)
83622 {
83623- return atomic_read(&net->ipv4.rt_genid);
83624+ return atomic_read_unchecked(&net->ipv4.rt_genid);
83625 }
83626
83627 static inline void rt_genid_bump_ipv4(struct net *net)
83628 {
83629- atomic_inc(&net->ipv4.rt_genid);
83630+ atomic_inc_unchecked(&net->ipv4.rt_genid);
83631 }
83632
83633 #if IS_ENABLED(CONFIG_IPV6)
83634 static inline int rt_genid_ipv6(struct net *net)
83635 {
83636- return atomic_read(&net->ipv6.rt_genid);
83637+ return atomic_read_unchecked(&net->ipv6.rt_genid);
83638 }
83639
83640 static inline void rt_genid_bump_ipv6(struct net *net)
83641 {
83642- atomic_inc(&net->ipv6.rt_genid);
83643+ atomic_inc_unchecked(&net->ipv6.rt_genid);
83644 }
83645 #else
83646 static inline int rt_genid_ipv6(struct net *net)
83647@@ -382,12 +386,12 @@ static inline void rt_genid_bump_all(struct net *net)
83648
83649 static inline int fnhe_genid(struct net *net)
83650 {
83651- return atomic_read(&net->fnhe_genid);
83652+ return atomic_read_unchecked(&net->fnhe_genid);
83653 }
83654
83655 static inline void fnhe_genid_bump(struct net *net)
83656 {
83657- atomic_inc(&net->fnhe_genid);
83658+ atomic_inc_unchecked(&net->fnhe_genid);
83659 }
83660
83661 #endif /* __NET_NET_NAMESPACE_H */
83662diff --git a/include/net/netdma.h b/include/net/netdma.h
83663index 8ba8ce2..99b7fff 100644
83664--- a/include/net/netdma.h
83665+++ b/include/net/netdma.h
83666@@ -24,7 +24,7 @@
83667 #include <linux/dmaengine.h>
83668 #include <linux/skbuff.h>
83669
83670-int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
83671+int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
83672 struct sk_buff *skb, int offset, struct iovec *to,
83673 size_t len, struct dma_pinned_list *pinned_list);
83674
83675diff --git a/include/net/netlink.h b/include/net/netlink.h
83676index 2b47eaa..6d5bcc2 100644
83677--- a/include/net/netlink.h
83678+++ b/include/net/netlink.h
83679@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
83680 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
83681 {
83682 if (mark)
83683- skb_trim(skb, (unsigned char *) mark - skb->data);
83684+ skb_trim(skb, (const unsigned char *) mark - skb->data);
83685 }
83686
83687 /**
83688diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
83689index 773cce3..6a11852 100644
83690--- a/include/net/netns/conntrack.h
83691+++ b/include/net/netns/conntrack.h
83692@@ -13,10 +13,10 @@ struct nf_conntrack_ecache;
83693 struct nf_proto_net {
83694 #ifdef CONFIG_SYSCTL
83695 struct ctl_table_header *ctl_table_header;
83696- struct ctl_table *ctl_table;
83697+ ctl_table_no_const *ctl_table;
83698 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
83699 struct ctl_table_header *ctl_compat_header;
83700- struct ctl_table *ctl_compat_table;
83701+ ctl_table_no_const *ctl_compat_table;
83702 #endif
83703 #endif
83704 unsigned int users;
83705@@ -59,7 +59,7 @@ struct nf_ip_net {
83706 struct nf_icmp_net icmpv6;
83707 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
83708 struct ctl_table_header *ctl_table_header;
83709- struct ctl_table *ctl_table;
83710+ ctl_table_no_const *ctl_table;
83711 #endif
83712 };
83713
83714diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
83715index b2704fd0..421d717 100644
83716--- a/include/net/netns/ipv4.h
83717+++ b/include/net/netns/ipv4.h
83718@@ -79,7 +79,7 @@ struct netns_ipv4 {
83719
83720 struct ping_group_range ping_group_range;
83721
83722- atomic_t dev_addr_genid;
83723+ atomic_unchecked_t dev_addr_genid;
83724
83725 #ifdef CONFIG_IP_MROUTE
83726 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
83727@@ -89,6 +89,6 @@ struct netns_ipv4 {
83728 struct fib_rules_ops *mr_rules_ops;
83729 #endif
83730 #endif
83731- atomic_t rt_genid;
83732+ atomic_unchecked_t rt_genid;
83733 };
83734 #endif
83735diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
83736index 21edaf1..4c5faae 100644
83737--- a/include/net/netns/ipv6.h
83738+++ b/include/net/netns/ipv6.h
83739@@ -73,8 +73,8 @@ struct netns_ipv6 {
83740 struct fib_rules_ops *mr6_rules_ops;
83741 #endif
83742 #endif
83743- atomic_t dev_addr_genid;
83744- atomic_t rt_genid;
83745+ atomic_unchecked_t dev_addr_genid;
83746+ atomic_unchecked_t rt_genid;
83747 };
83748
83749 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
83750diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
83751index 3492434..209f58c 100644
83752--- a/include/net/netns/xfrm.h
83753+++ b/include/net/netns/xfrm.h
83754@@ -64,7 +64,7 @@ struct netns_xfrm {
83755
83756 /* flow cache part */
83757 struct flow_cache flow_cache_global;
83758- atomic_t flow_cache_genid;
83759+ atomic_unchecked_t flow_cache_genid;
83760 struct list_head flow_cache_gc_list;
83761 spinlock_t flow_cache_gc_lock;
83762 struct work_struct flow_cache_gc_work;
83763diff --git a/include/net/ping.h b/include/net/ping.h
83764index 026479b..d9b2829 100644
83765--- a/include/net/ping.h
83766+++ b/include/net/ping.h
83767@@ -54,7 +54,7 @@ struct ping_iter_state {
83768
83769 extern struct proto ping_prot;
83770 #if IS_ENABLED(CONFIG_IPV6)
83771-extern struct pingv6_ops pingv6_ops;
83772+extern struct pingv6_ops *pingv6_ops;
83773 #endif
83774
83775 struct pingfakehdr {
83776diff --git a/include/net/protocol.h b/include/net/protocol.h
83777index a7e986b..dc67bce 100644
83778--- a/include/net/protocol.h
83779+++ b/include/net/protocol.h
83780@@ -49,7 +49,7 @@ struct net_protocol {
83781 * socket lookup?
83782 */
83783 icmp_strict_tag_validation:1;
83784-};
83785+} __do_const;
83786
83787 #if IS_ENABLED(CONFIG_IPV6)
83788 struct inet6_protocol {
83789@@ -62,7 +62,7 @@ struct inet6_protocol {
83790 u8 type, u8 code, int offset,
83791 __be32 info);
83792 unsigned int flags; /* INET6_PROTO_xxx */
83793-};
83794+} __do_const;
83795
83796 #define INET6_PROTO_NOPOLICY 0x1
83797 #define INET6_PROTO_FINAL 0x2
83798diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
83799index 72240e5..8c14bef 100644
83800--- a/include/net/rtnetlink.h
83801+++ b/include/net/rtnetlink.h
83802@@ -93,7 +93,7 @@ struct rtnl_link_ops {
83803 int (*fill_slave_info)(struct sk_buff *skb,
83804 const struct net_device *dev,
83805 const struct net_device *slave_dev);
83806-};
83807+} __do_const;
83808
83809 int __rtnl_link_register(struct rtnl_link_ops *ops);
83810 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
83811diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
83812index 4a5b9a3..ca27d73 100644
83813--- a/include/net/sctp/checksum.h
83814+++ b/include/net/sctp/checksum.h
83815@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
83816 unsigned int offset)
83817 {
83818 struct sctphdr *sh = sctp_hdr(skb);
83819- __le32 ret, old = sh->checksum;
83820- const struct skb_checksum_ops ops = {
83821+ __le32 ret, old = sh->checksum;
83822+ static const struct skb_checksum_ops ops = {
83823 .update = sctp_csum_update,
83824 .combine = sctp_csum_combine,
83825 };
83826diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
83827index 7f4eeb3..37e8fe1 100644
83828--- a/include/net/sctp/sm.h
83829+++ b/include/net/sctp/sm.h
83830@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
83831 typedef struct {
83832 sctp_state_fn_t *fn;
83833 const char *name;
83834-} sctp_sm_table_entry_t;
83835+} __do_const sctp_sm_table_entry_t;
83836
83837 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
83838 * currently in use.
83839@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
83840 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
83841
83842 /* Extern declarations for major data structures. */
83843-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
83844+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
83845
83846
83847 /* Get the size of a DATA chunk payload. */
83848diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
83849index 0dfcc92..7967849 100644
83850--- a/include/net/sctp/structs.h
83851+++ b/include/net/sctp/structs.h
83852@@ -507,7 +507,7 @@ struct sctp_pf {
83853 struct sctp_association *asoc);
83854 void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
83855 struct sctp_af *af;
83856-};
83857+} __do_const;
83858
83859
83860 /* Structure to track chunk fragments that have been acked, but peer
83861diff --git a/include/net/sock.h b/include/net/sock.h
83862index 21569cf..dd60300 100644
83863--- a/include/net/sock.h
83864+++ b/include/net/sock.h
83865@@ -348,7 +348,7 @@ struct sock {
83866 unsigned int sk_napi_id;
83867 unsigned int sk_ll_usec;
83868 #endif
83869- atomic_t sk_drops;
83870+ atomic_unchecked_t sk_drops;
83871 int sk_rcvbuf;
83872
83873 struct sk_filter __rcu *sk_filter;
83874@@ -1036,7 +1036,7 @@ struct proto {
83875 void (*destroy_cgroup)(struct mem_cgroup *memcg);
83876 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
83877 #endif
83878-};
83879+} __randomize_layout;
83880
83881 /*
83882 * Bits in struct cg_proto.flags
83883@@ -1223,7 +1223,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
83884 return ret >> PAGE_SHIFT;
83885 }
83886
83887-static inline long
83888+static inline long __intentional_overflow(-1)
83889 sk_memory_allocated(const struct sock *sk)
83890 {
83891 struct proto *prot = sk->sk_prot;
83892@@ -1368,7 +1368,7 @@ struct sock_iocb {
83893 struct scm_cookie *scm;
83894 struct msghdr *msg, async_msg;
83895 struct kiocb *kiocb;
83896-};
83897+} __randomize_layout;
83898
83899 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
83900 {
83901@@ -1728,8 +1728,8 @@ sk_dst_get(struct sock *sk)
83902
83903 rcu_read_lock();
83904 dst = rcu_dereference(sk->sk_dst_cache);
83905- if (dst)
83906- dst_hold(dst);
83907+ if (dst && !atomic_inc_not_zero(&dst->__refcnt))
83908+ dst = NULL;
83909 rcu_read_unlock();
83910 return dst;
83911 }
83912@@ -1803,7 +1803,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
83913 }
83914
83915 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
83916- char __user *from, char *to,
83917+ char __user *from, unsigned char *to,
83918 int copy, int offset)
83919 {
83920 if (skb->ip_summed == CHECKSUM_NONE) {
83921@@ -2065,7 +2065,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
83922 }
83923 }
83924
83925-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
83926+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
83927
83928 /**
83929 * sk_page_frag - return an appropriate page_frag
83930diff --git a/include/net/tcp.h b/include/net/tcp.h
83931index 87d8774..cf214f8 100644
83932--- a/include/net/tcp.h
83933+++ b/include/net/tcp.h
83934@@ -541,7 +541,7 @@ void tcp_retransmit_timer(struct sock *sk);
83935 void tcp_xmit_retransmit_queue(struct sock *);
83936 void tcp_simple_retransmit(struct sock *);
83937 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
83938-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
83939+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
83940
83941 void tcp_send_probe0(struct sock *);
83942 void tcp_send_partial(struct sock *);
83943@@ -715,8 +715,8 @@ struct tcp_skb_cb {
83944 struct inet6_skb_parm h6;
83945 #endif
83946 } header; /* For incoming frames */
83947- __u32 seq; /* Starting sequence number */
83948- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
83949+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
83950+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
83951 __u32 when; /* used to compute rtt's */
83952 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
83953
83954@@ -730,7 +730,7 @@ struct tcp_skb_cb {
83955
83956 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
83957 /* 1 byte hole */
83958- __u32 ack_seq; /* Sequence number ACK'd */
83959+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
83960 };
83961
83962 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
83963diff --git a/include/net/xfrm.h b/include/net/xfrm.h
83964index 116e9c7..3070537 100644
83965--- a/include/net/xfrm.h
83966+++ b/include/net/xfrm.h
83967@@ -285,7 +285,6 @@ struct xfrm_dst;
83968 struct xfrm_policy_afinfo {
83969 unsigned short family;
83970 struct dst_ops *dst_ops;
83971- void (*garbage_collect)(struct net *net);
83972 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
83973 const xfrm_address_t *saddr,
83974 const xfrm_address_t *daddr);
83975@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
83976 struct net_device *dev,
83977 const struct flowi *fl);
83978 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
83979-};
83980+} __do_const;
83981
83982 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
83983 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
83984@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
83985 int (*transport_finish)(struct sk_buff *skb,
83986 int async);
83987 void (*local_error)(struct sk_buff *skb, u32 mtu);
83988-};
83989+} __do_const;
83990
83991 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
83992 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
83993@@ -437,7 +436,7 @@ struct xfrm_mode {
83994 struct module *owner;
83995 unsigned int encap;
83996 int flags;
83997-};
83998+} __do_const;
83999
84000 /* Flags for xfrm_mode. */
84001 enum {
84002@@ -534,7 +533,7 @@ struct xfrm_policy {
84003 struct timer_list timer;
84004
84005 struct flow_cache_object flo;
84006- atomic_t genid;
84007+ atomic_unchecked_t genid;
84008 u32 priority;
84009 u32 index;
84010 struct xfrm_mark mark;
84011@@ -1180,6 +1179,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
84012 }
84013
84014 void xfrm_garbage_collect(struct net *net);
84015+void xfrm_garbage_collect_deferred(struct net *net);
84016
84017 #else
84018
84019@@ -1218,6 +1218,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
84020 static inline void xfrm_garbage_collect(struct net *net)
84021 {
84022 }
84023+static inline void xfrm_garbage_collect_deferred(struct net *net)
84024+{
84025+}
84026 #endif
84027
84028 static __inline__
84029diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
84030index 1017e0b..227aa4d 100644
84031--- a/include/rdma/iw_cm.h
84032+++ b/include/rdma/iw_cm.h
84033@@ -122,7 +122,7 @@ struct iw_cm_verbs {
84034 int backlog);
84035
84036 int (*destroy_listen)(struct iw_cm_id *cm_id);
84037-};
84038+} __no_const;
84039
84040 /**
84041 * iw_create_cm_id - Create an IW CM identifier.
84042diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
84043index 52beadf..598734c 100644
84044--- a/include/scsi/libfc.h
84045+++ b/include/scsi/libfc.h
84046@@ -771,6 +771,7 @@ struct libfc_function_template {
84047 */
84048 void (*disc_stop_final) (struct fc_lport *);
84049 };
84050+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
84051
84052 /**
84053 * struct fc_disc - Discovery context
84054@@ -875,7 +876,7 @@ struct fc_lport {
84055 struct fc_vport *vport;
84056
84057 /* Operational Information */
84058- struct libfc_function_template tt;
84059+ libfc_function_template_no_const tt;
84060 u8 link_up;
84061 u8 qfull;
84062 enum fc_lport_state state;
84063diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
84064index 5853c91..1e355a8 100644
84065--- a/include/scsi/scsi_device.h
84066+++ b/include/scsi/scsi_device.h
84067@@ -186,9 +186,9 @@ struct scsi_device {
84068 unsigned int max_device_blocked; /* what device_blocked counts down from */
84069 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
84070
84071- atomic_t iorequest_cnt;
84072- atomic_t iodone_cnt;
84073- atomic_t ioerr_cnt;
84074+ atomic_unchecked_t iorequest_cnt;
84075+ atomic_unchecked_t iodone_cnt;
84076+ atomic_unchecked_t ioerr_cnt;
84077
84078 struct device sdev_gendev,
84079 sdev_dev;
84080diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
84081index 8c79980..723f6f9 100644
84082--- a/include/scsi/scsi_transport_fc.h
84083+++ b/include/scsi/scsi_transport_fc.h
84084@@ -752,7 +752,8 @@ struct fc_function_template {
84085 unsigned long show_host_system_hostname:1;
84086
84087 unsigned long disable_target_scan:1;
84088-};
84089+} __do_const;
84090+typedef struct fc_function_template __no_const fc_function_template_no_const;
84091
84092
84093 /**
84094diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
84095index ae6c3b8..fd748ac 100644
84096--- a/include/sound/compress_driver.h
84097+++ b/include/sound/compress_driver.h
84098@@ -128,7 +128,7 @@ struct snd_compr_ops {
84099 struct snd_compr_caps *caps);
84100 int (*get_codec_caps) (struct snd_compr_stream *stream,
84101 struct snd_compr_codec_caps *codec);
84102-};
84103+} __no_const;
84104
84105 /**
84106 * struct snd_compr: Compressed device
84107diff --git a/include/sound/soc.h b/include/sound/soc.h
84108index 0b83168..d67280a 100644
84109--- a/include/sound/soc.h
84110+++ b/include/sound/soc.h
84111@@ -782,7 +782,7 @@ struct snd_soc_codec_driver {
84112 /* probe ordering - for components with runtime dependencies */
84113 int probe_order;
84114 int remove_order;
84115-};
84116+} __do_const;
84117
84118 /* SoC platform interface */
84119 struct snd_soc_platform_driver {
84120@@ -828,7 +828,7 @@ struct snd_soc_platform_driver {
84121 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
84122 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
84123 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
84124-};
84125+} __do_const;
84126
84127 struct snd_soc_platform {
84128 const char *name;
84129diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
84130index 9ec9864..e2ee1ee 100644
84131--- a/include/target/target_core_base.h
84132+++ b/include/target/target_core_base.h
84133@@ -761,7 +761,7 @@ struct se_device {
84134 atomic_long_t write_bytes;
84135 /* Active commands on this virtual SE device */
84136 atomic_t simple_cmds;
84137- atomic_t dev_ordered_id;
84138+ atomic_unchecked_t dev_ordered_id;
84139 atomic_t dev_ordered_sync;
84140 atomic_t dev_qf_count;
84141 int export_count;
84142diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
84143new file mode 100644
84144index 0000000..fb634b7
84145--- /dev/null
84146+++ b/include/trace/events/fs.h
84147@@ -0,0 +1,53 @@
84148+#undef TRACE_SYSTEM
84149+#define TRACE_SYSTEM fs
84150+
84151+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
84152+#define _TRACE_FS_H
84153+
84154+#include <linux/fs.h>
84155+#include <linux/tracepoint.h>
84156+
84157+TRACE_EVENT(do_sys_open,
84158+
84159+ TP_PROTO(const char *filename, int flags, int mode),
84160+
84161+ TP_ARGS(filename, flags, mode),
84162+
84163+ TP_STRUCT__entry(
84164+ __string( filename, filename )
84165+ __field( int, flags )
84166+ __field( int, mode )
84167+ ),
84168+
84169+ TP_fast_assign(
84170+ __assign_str(filename, filename);
84171+ __entry->flags = flags;
84172+ __entry->mode = mode;
84173+ ),
84174+
84175+ TP_printk("\"%s\" %x %o",
84176+ __get_str(filename), __entry->flags, __entry->mode)
84177+);
84178+
84179+TRACE_EVENT(open_exec,
84180+
84181+ TP_PROTO(const char *filename),
84182+
84183+ TP_ARGS(filename),
84184+
84185+ TP_STRUCT__entry(
84186+ __string( filename, filename )
84187+ ),
84188+
84189+ TP_fast_assign(
84190+ __assign_str(filename, filename);
84191+ ),
84192+
84193+ TP_printk("\"%s\"",
84194+ __get_str(filename))
84195+);
84196+
84197+#endif /* _TRACE_FS_H */
84198+
84199+/* This part must be outside protection */
84200+#include <trace/define_trace.h>
84201diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
84202index 1c09820..7f5ec79 100644
84203--- a/include/trace/events/irq.h
84204+++ b/include/trace/events/irq.h
84205@@ -36,7 +36,7 @@ struct softirq_action;
84206 */
84207 TRACE_EVENT(irq_handler_entry,
84208
84209- TP_PROTO(int irq, struct irqaction *action),
84210+ TP_PROTO(int irq, const struct irqaction *action),
84211
84212 TP_ARGS(irq, action),
84213
84214@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
84215 */
84216 TRACE_EVENT(irq_handler_exit,
84217
84218- TP_PROTO(int irq, struct irqaction *action, int ret),
84219+ TP_PROTO(int irq, const struct irqaction *action, int ret),
84220
84221 TP_ARGS(irq, action, ret),
84222
84223diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
84224index 7caf44c..23c6f27 100644
84225--- a/include/uapi/linux/a.out.h
84226+++ b/include/uapi/linux/a.out.h
84227@@ -39,6 +39,14 @@ enum machine_type {
84228 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
84229 };
84230
84231+/* Constants for the N_FLAGS field */
84232+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
84233+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
84234+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
84235+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
84236+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
84237+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
84238+
84239 #if !defined (N_MAGIC)
84240 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
84241 #endif
84242diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
84243index 22b6ad3..aeba37e 100644
84244--- a/include/uapi/linux/bcache.h
84245+++ b/include/uapi/linux/bcache.h
84246@@ -5,6 +5,7 @@
84247 * Bcache on disk data structures
84248 */
84249
84250+#include <linux/compiler.h>
84251 #include <asm/types.h>
84252
84253 #define BITMASK(name, type, field, offset, size) \
84254@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
84255 /* Btree keys - all units are in sectors */
84256
84257 struct bkey {
84258- __u64 high;
84259- __u64 low;
84260+ __u64 high __intentional_overflow(-1);
84261+ __u64 low __intentional_overflow(-1);
84262 __u64 ptr[];
84263 };
84264
84265diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
84266index d876736..ccce5c0 100644
84267--- a/include/uapi/linux/byteorder/little_endian.h
84268+++ b/include/uapi/linux/byteorder/little_endian.h
84269@@ -42,51 +42,51 @@
84270
84271 static inline __le64 __cpu_to_le64p(const __u64 *p)
84272 {
84273- return (__force __le64)*p;
84274+ return (__force const __le64)*p;
84275 }
84276-static inline __u64 __le64_to_cpup(const __le64 *p)
84277+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
84278 {
84279- return (__force __u64)*p;
84280+ return (__force const __u64)*p;
84281 }
84282 static inline __le32 __cpu_to_le32p(const __u32 *p)
84283 {
84284- return (__force __le32)*p;
84285+ return (__force const __le32)*p;
84286 }
84287 static inline __u32 __le32_to_cpup(const __le32 *p)
84288 {
84289- return (__force __u32)*p;
84290+ return (__force const __u32)*p;
84291 }
84292 static inline __le16 __cpu_to_le16p(const __u16 *p)
84293 {
84294- return (__force __le16)*p;
84295+ return (__force const __le16)*p;
84296 }
84297 static inline __u16 __le16_to_cpup(const __le16 *p)
84298 {
84299- return (__force __u16)*p;
84300+ return (__force const __u16)*p;
84301 }
84302 static inline __be64 __cpu_to_be64p(const __u64 *p)
84303 {
84304- return (__force __be64)__swab64p(p);
84305+ return (__force const __be64)__swab64p(p);
84306 }
84307 static inline __u64 __be64_to_cpup(const __be64 *p)
84308 {
84309- return __swab64p((__u64 *)p);
84310+ return __swab64p((const __u64 *)p);
84311 }
84312 static inline __be32 __cpu_to_be32p(const __u32 *p)
84313 {
84314- return (__force __be32)__swab32p(p);
84315+ return (__force const __be32)__swab32p(p);
84316 }
84317-static inline __u32 __be32_to_cpup(const __be32 *p)
84318+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
84319 {
84320- return __swab32p((__u32 *)p);
84321+ return __swab32p((const __u32 *)p);
84322 }
84323 static inline __be16 __cpu_to_be16p(const __u16 *p)
84324 {
84325- return (__force __be16)__swab16p(p);
84326+ return (__force const __be16)__swab16p(p);
84327 }
84328 static inline __u16 __be16_to_cpup(const __be16 *p)
84329 {
84330- return __swab16p((__u16 *)p);
84331+ return __swab16p((const __u16 *)p);
84332 }
84333 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
84334 #define __le64_to_cpus(x) do { (void)(x); } while (0)
84335diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
84336index ef6103b..d4e65dd 100644
84337--- a/include/uapi/linux/elf.h
84338+++ b/include/uapi/linux/elf.h
84339@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
84340 #define PT_GNU_EH_FRAME 0x6474e550
84341
84342 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
84343+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
84344+
84345+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
84346+
84347+/* Constants for the e_flags field */
84348+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
84349+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
84350+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
84351+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
84352+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
84353+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
84354
84355 /*
84356 * Extended Numbering
84357@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
84358 #define DT_DEBUG 21
84359 #define DT_TEXTREL 22
84360 #define DT_JMPREL 23
84361+#define DT_FLAGS 30
84362+ #define DF_TEXTREL 0x00000004
84363 #define DT_ENCODING 32
84364 #define OLD_DT_LOOS 0x60000000
84365 #define DT_LOOS 0x6000000d
84366@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
84367 #define PF_W 0x2
84368 #define PF_X 0x1
84369
84370+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
84371+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
84372+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
84373+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
84374+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
84375+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
84376+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
84377+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
84378+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
84379+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
84380+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
84381+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
84382+
84383 typedef struct elf32_phdr{
84384 Elf32_Word p_type;
84385 Elf32_Off p_offset;
84386@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
84387 #define EI_OSABI 7
84388 #define EI_PAD 8
84389
84390+#define EI_PAX 14
84391+
84392 #define ELFMAG0 0x7f /* EI_MAG */
84393 #define ELFMAG1 'E'
84394 #define ELFMAG2 'L'
84395diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
84396index aa169c4..6a2771d 100644
84397--- a/include/uapi/linux/personality.h
84398+++ b/include/uapi/linux/personality.h
84399@@ -30,6 +30,7 @@ enum {
84400 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
84401 ADDR_NO_RANDOMIZE | \
84402 ADDR_COMPAT_LAYOUT | \
84403+ ADDR_LIMIT_3GB | \
84404 MMAP_PAGE_ZERO)
84405
84406 /*
84407diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
84408index 7530e74..e714828 100644
84409--- a/include/uapi/linux/screen_info.h
84410+++ b/include/uapi/linux/screen_info.h
84411@@ -43,7 +43,8 @@ struct screen_info {
84412 __u16 pages; /* 0x32 */
84413 __u16 vesa_attributes; /* 0x34 */
84414 __u32 capabilities; /* 0x36 */
84415- __u8 _reserved[6]; /* 0x3a */
84416+ __u16 vesapm_size; /* 0x3a */
84417+ __u8 _reserved[4]; /* 0x3c */
84418 } __attribute__((packed));
84419
84420 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
84421diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
84422index 0e011eb..82681b1 100644
84423--- a/include/uapi/linux/swab.h
84424+++ b/include/uapi/linux/swab.h
84425@@ -43,7 +43,7 @@
84426 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
84427 */
84428
84429-static inline __attribute_const__ __u16 __fswab16(__u16 val)
84430+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
84431 {
84432 #ifdef __HAVE_BUILTIN_BSWAP16__
84433 return __builtin_bswap16(val);
84434@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
84435 #endif
84436 }
84437
84438-static inline __attribute_const__ __u32 __fswab32(__u32 val)
84439+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
84440 {
84441 #ifdef __HAVE_BUILTIN_BSWAP32__
84442 return __builtin_bswap32(val);
84443@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
84444 #endif
84445 }
84446
84447-static inline __attribute_const__ __u64 __fswab64(__u64 val)
84448+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
84449 {
84450 #ifdef __HAVE_BUILTIN_BSWAP64__
84451 return __builtin_bswap64(val);
84452diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
84453index 6d67213..552fdd9 100644
84454--- a/include/uapi/linux/sysctl.h
84455+++ b/include/uapi/linux/sysctl.h
84456@@ -155,8 +155,6 @@ enum
84457 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
84458 };
84459
84460-
84461-
84462 /* CTL_VM names: */
84463 enum
84464 {
84465diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
84466index ea468ee..4d367a5 100644
84467--- a/include/uapi/linux/videodev2.h
84468+++ b/include/uapi/linux/videodev2.h
84469@@ -1248,7 +1248,7 @@ struct v4l2_ext_control {
84470 union {
84471 __s32 value;
84472 __s64 value64;
84473- char *string;
84474+ char __user *string;
84475 };
84476 } __attribute__ ((packed));
84477
84478diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
84479index c38355c..17a57bc 100644
84480--- a/include/uapi/linux/xattr.h
84481+++ b/include/uapi/linux/xattr.h
84482@@ -73,5 +73,9 @@
84483 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
84484 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
84485
84486+/* User namespace */
84487+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
84488+#define XATTR_PAX_FLAGS_SUFFIX "flags"
84489+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
84490
84491 #endif /* _UAPI_LINUX_XATTR_H */
84492diff --git a/include/video/udlfb.h b/include/video/udlfb.h
84493index f9466fa..f4e2b81 100644
84494--- a/include/video/udlfb.h
84495+++ b/include/video/udlfb.h
84496@@ -53,10 +53,10 @@ struct dlfb_data {
84497 u32 pseudo_palette[256];
84498 int blank_mode; /*one of FB_BLANK_ */
84499 /* blit-only rendering path metrics, exposed through sysfs */
84500- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
84501- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
84502- atomic_t bytes_sent; /* to usb, after compression including overhead */
84503- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
84504+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
84505+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
84506+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
84507+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
84508 };
84509
84510 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
84511diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
84512index 30f5362..8ed8ac9 100644
84513--- a/include/video/uvesafb.h
84514+++ b/include/video/uvesafb.h
84515@@ -122,6 +122,7 @@ struct uvesafb_par {
84516 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
84517 u8 pmi_setpal; /* PMI for palette changes */
84518 u16 *pmi_base; /* protected mode interface location */
84519+ u8 *pmi_code; /* protected mode code location */
84520 void *pmi_start;
84521 void *pmi_pal;
84522 u8 *vbe_state_orig; /*
84523diff --git a/init/Kconfig b/init/Kconfig
84524index 9d3585b..ad45d34 100644
84525--- a/init/Kconfig
84526+++ b/init/Kconfig
84527@@ -1093,6 +1093,7 @@ endif # CGROUPS
84528
84529 config CHECKPOINT_RESTORE
84530 bool "Checkpoint/restore support" if EXPERT
84531+ depends on !GRKERNSEC
84532 default n
84533 help
84534 Enables additional kernel features in a sake of checkpoint/restore.
84535@@ -1570,7 +1571,7 @@ config SLUB_DEBUG
84536
84537 config COMPAT_BRK
84538 bool "Disable heap randomization"
84539- default y
84540+ default n
84541 help
84542 Randomizing heap placement makes heap exploits harder, but it
84543 also breaks ancient binaries (including anything libc5 based).
84544@@ -1858,7 +1859,7 @@ config INIT_ALL_POSSIBLE
84545 config STOP_MACHINE
84546 bool
84547 default y
84548- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
84549+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
84550 help
84551 Need stop_machine() primitive.
84552
84553diff --git a/init/Makefile b/init/Makefile
84554index 7bc47ee..6da2dc7 100644
84555--- a/init/Makefile
84556+++ b/init/Makefile
84557@@ -2,6 +2,9 @@
84558 # Makefile for the linux kernel.
84559 #
84560
84561+ccflags-y := $(GCC_PLUGINS_CFLAGS)
84562+asflags-y := $(GCC_PLUGINS_AFLAGS)
84563+
84564 obj-y := main.o version.o mounts.o
84565 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
84566 obj-y += noinitramfs.o
84567diff --git a/init/do_mounts.c b/init/do_mounts.c
84568index 82f2288..ea1430a 100644
84569--- a/init/do_mounts.c
84570+++ b/init/do_mounts.c
84571@@ -359,11 +359,11 @@ static void __init get_fs_names(char *page)
84572 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
84573 {
84574 struct super_block *s;
84575- int err = sys_mount(name, "/root", fs, flags, data);
84576+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
84577 if (err)
84578 return err;
84579
84580- sys_chdir("/root");
84581+ sys_chdir((const char __force_user *)"/root");
84582 s = current->fs->pwd.dentry->d_sb;
84583 ROOT_DEV = s->s_dev;
84584 printk(KERN_INFO
84585@@ -484,18 +484,18 @@ void __init change_floppy(char *fmt, ...)
84586 va_start(args, fmt);
84587 vsprintf(buf, fmt, args);
84588 va_end(args);
84589- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
84590+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
84591 if (fd >= 0) {
84592 sys_ioctl(fd, FDEJECT, 0);
84593 sys_close(fd);
84594 }
84595 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
84596- fd = sys_open("/dev/console", O_RDWR, 0);
84597+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
84598 if (fd >= 0) {
84599 sys_ioctl(fd, TCGETS, (long)&termios);
84600 termios.c_lflag &= ~ICANON;
84601 sys_ioctl(fd, TCSETSF, (long)&termios);
84602- sys_read(fd, &c, 1);
84603+ sys_read(fd, (char __user *)&c, 1);
84604 termios.c_lflag |= ICANON;
84605 sys_ioctl(fd, TCSETSF, (long)&termios);
84606 sys_close(fd);
84607@@ -589,8 +589,8 @@ void __init prepare_namespace(void)
84608 mount_root();
84609 out:
84610 devtmpfs_mount("dev");
84611- sys_mount(".", "/", NULL, MS_MOVE, NULL);
84612- sys_chroot(".");
84613+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
84614+ sys_chroot((const char __force_user *)".");
84615 }
84616
84617 static bool is_tmpfs;
84618diff --git a/init/do_mounts.h b/init/do_mounts.h
84619index f5b978a..69dbfe8 100644
84620--- a/init/do_mounts.h
84621+++ b/init/do_mounts.h
84622@@ -15,15 +15,15 @@ extern int root_mountflags;
84623
84624 static inline int create_dev(char *name, dev_t dev)
84625 {
84626- sys_unlink(name);
84627- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
84628+ sys_unlink((char __force_user *)name);
84629+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
84630 }
84631
84632 #if BITS_PER_LONG == 32
84633 static inline u32 bstat(char *name)
84634 {
84635 struct stat64 stat;
84636- if (sys_stat64(name, &stat) != 0)
84637+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
84638 return 0;
84639 if (!S_ISBLK(stat.st_mode))
84640 return 0;
84641@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
84642 static inline u32 bstat(char *name)
84643 {
84644 struct stat stat;
84645- if (sys_newstat(name, &stat) != 0)
84646+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
84647 return 0;
84648 if (!S_ISBLK(stat.st_mode))
84649 return 0;
84650diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
84651index 3e0878e..8a9d7a0 100644
84652--- a/init/do_mounts_initrd.c
84653+++ b/init/do_mounts_initrd.c
84654@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
84655 {
84656 sys_unshare(CLONE_FS | CLONE_FILES);
84657 /* stdin/stdout/stderr for /linuxrc */
84658- sys_open("/dev/console", O_RDWR, 0);
84659+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
84660 sys_dup(0);
84661 sys_dup(0);
84662 /* move initrd over / and chdir/chroot in initrd root */
84663- sys_chdir("/root");
84664- sys_mount(".", "/", NULL, MS_MOVE, NULL);
84665- sys_chroot(".");
84666+ sys_chdir((const char __force_user *)"/root");
84667+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
84668+ sys_chroot((const char __force_user *)".");
84669 sys_setsid();
84670 return 0;
84671 }
84672@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
84673 create_dev("/dev/root.old", Root_RAM0);
84674 /* mount initrd on rootfs' /root */
84675 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
84676- sys_mkdir("/old", 0700);
84677- sys_chdir("/old");
84678+ sys_mkdir((const char __force_user *)"/old", 0700);
84679+ sys_chdir((const char __force_user *)"/old");
84680
84681 /* try loading default modules from initrd */
84682 load_default_modules();
84683@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
84684 current->flags &= ~PF_FREEZER_SKIP;
84685
84686 /* move initrd to rootfs' /old */
84687- sys_mount("..", ".", NULL, MS_MOVE, NULL);
84688+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
84689 /* switch root and cwd back to / of rootfs */
84690- sys_chroot("..");
84691+ sys_chroot((const char __force_user *)"..");
84692
84693 if (new_decode_dev(real_root_dev) == Root_RAM0) {
84694- sys_chdir("/old");
84695+ sys_chdir((const char __force_user *)"/old");
84696 return;
84697 }
84698
84699- sys_chdir("/");
84700+ sys_chdir((const char __force_user *)"/");
84701 ROOT_DEV = new_decode_dev(real_root_dev);
84702 mount_root();
84703
84704 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
84705- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
84706+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
84707 if (!error)
84708 printk("okay\n");
84709 else {
84710- int fd = sys_open("/dev/root.old", O_RDWR, 0);
84711+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
84712 if (error == -ENOENT)
84713 printk("/initrd does not exist. Ignored.\n");
84714 else
84715 printk("failed\n");
84716 printk(KERN_NOTICE "Unmounting old root\n");
84717- sys_umount("/old", MNT_DETACH);
84718+ sys_umount((char __force_user *)"/old", MNT_DETACH);
84719 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
84720 if (fd < 0) {
84721 error = fd;
84722@@ -127,11 +127,11 @@ int __init initrd_load(void)
84723 * mounted in the normal path.
84724 */
84725 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
84726- sys_unlink("/initrd.image");
84727+ sys_unlink((const char __force_user *)"/initrd.image");
84728 handle_initrd();
84729 return 1;
84730 }
84731 }
84732- sys_unlink("/initrd.image");
84733+ sys_unlink((const char __force_user *)"/initrd.image");
84734 return 0;
84735 }
84736diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
84737index 8cb6db5..d729f50 100644
84738--- a/init/do_mounts_md.c
84739+++ b/init/do_mounts_md.c
84740@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
84741 partitioned ? "_d" : "", minor,
84742 md_setup_args[ent].device_names);
84743
84744- fd = sys_open(name, 0, 0);
84745+ fd = sys_open((char __force_user *)name, 0, 0);
84746 if (fd < 0) {
84747 printk(KERN_ERR "md: open failed - cannot start "
84748 "array %s\n", name);
84749@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
84750 * array without it
84751 */
84752 sys_close(fd);
84753- fd = sys_open(name, 0, 0);
84754+ fd = sys_open((char __force_user *)name, 0, 0);
84755 sys_ioctl(fd, BLKRRPART, 0);
84756 }
84757 sys_close(fd);
84758@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
84759
84760 wait_for_device_probe();
84761
84762- fd = sys_open("/dev/md0", 0, 0);
84763+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
84764 if (fd >= 0) {
84765 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
84766 sys_close(fd);
84767diff --git a/init/init_task.c b/init/init_task.c
84768index ba0a7f36..2bcf1d5 100644
84769--- a/init/init_task.c
84770+++ b/init/init_task.c
84771@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
84772 * Initial thread structure. Alignment of this is handled by a special
84773 * linker map entry.
84774 */
84775+#ifdef CONFIG_X86
84776+union thread_union init_thread_union __init_task_data;
84777+#else
84778 union thread_union init_thread_union __init_task_data =
84779 { INIT_THREAD_INFO(init_task) };
84780+#endif
84781diff --git a/init/initramfs.c b/init/initramfs.c
84782index a8497fa..35b3c90 100644
84783--- a/init/initramfs.c
84784+++ b/init/initramfs.c
84785@@ -84,7 +84,7 @@ static void __init free_hash(void)
84786 }
84787 }
84788
84789-static long __init do_utime(char *filename, time_t mtime)
84790+static long __init do_utime(char __force_user *filename, time_t mtime)
84791 {
84792 struct timespec t[2];
84793
84794@@ -119,7 +119,7 @@ static void __init dir_utime(void)
84795 struct dir_entry *de, *tmp;
84796 list_for_each_entry_safe(de, tmp, &dir_list, list) {
84797 list_del(&de->list);
84798- do_utime(de->name, de->mtime);
84799+ do_utime((char __force_user *)de->name, de->mtime);
84800 kfree(de->name);
84801 kfree(de);
84802 }
84803@@ -281,7 +281,7 @@ static int __init maybe_link(void)
84804 if (nlink >= 2) {
84805 char *old = find_link(major, minor, ino, mode, collected);
84806 if (old)
84807- return (sys_link(old, collected) < 0) ? -1 : 1;
84808+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
84809 }
84810 return 0;
84811 }
84812@@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
84813 {
84814 struct stat st;
84815
84816- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
84817+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
84818 if (S_ISDIR(st.st_mode))
84819- sys_rmdir(path);
84820+ sys_rmdir((char __force_user *)path);
84821 else
84822- sys_unlink(path);
84823+ sys_unlink((char __force_user *)path);
84824 }
84825 }
84826
84827@@ -315,7 +315,7 @@ static int __init do_name(void)
84828 int openflags = O_WRONLY|O_CREAT;
84829 if (ml != 1)
84830 openflags |= O_TRUNC;
84831- wfd = sys_open(collected, openflags, mode);
84832+ wfd = sys_open((char __force_user *)collected, openflags, mode);
84833
84834 if (wfd >= 0) {
84835 sys_fchown(wfd, uid, gid);
84836@@ -327,17 +327,17 @@ static int __init do_name(void)
84837 }
84838 }
84839 } else if (S_ISDIR(mode)) {
84840- sys_mkdir(collected, mode);
84841- sys_chown(collected, uid, gid);
84842- sys_chmod(collected, mode);
84843+ sys_mkdir((char __force_user *)collected, mode);
84844+ sys_chown((char __force_user *)collected, uid, gid);
84845+ sys_chmod((char __force_user *)collected, mode);
84846 dir_add(collected, mtime);
84847 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
84848 S_ISFIFO(mode) || S_ISSOCK(mode)) {
84849 if (maybe_link() == 0) {
84850- sys_mknod(collected, mode, rdev);
84851- sys_chown(collected, uid, gid);
84852- sys_chmod(collected, mode);
84853- do_utime(collected, mtime);
84854+ sys_mknod((char __force_user *)collected, mode, rdev);
84855+ sys_chown((char __force_user *)collected, uid, gid);
84856+ sys_chmod((char __force_user *)collected, mode);
84857+ do_utime((char __force_user *)collected, mtime);
84858 }
84859 }
84860 return 0;
84861@@ -346,15 +346,15 @@ static int __init do_name(void)
84862 static int __init do_copy(void)
84863 {
84864 if (count >= body_len) {
84865- sys_write(wfd, victim, body_len);
84866+ sys_write(wfd, (char __force_user *)victim, body_len);
84867 sys_close(wfd);
84868- do_utime(vcollected, mtime);
84869+ do_utime((char __force_user *)vcollected, mtime);
84870 kfree(vcollected);
84871 eat(body_len);
84872 state = SkipIt;
84873 return 0;
84874 } else {
84875- sys_write(wfd, victim, count);
84876+ sys_write(wfd, (char __force_user *)victim, count);
84877 body_len -= count;
84878 eat(count);
84879 return 1;
84880@@ -365,9 +365,9 @@ static int __init do_symlink(void)
84881 {
84882 collected[N_ALIGN(name_len) + body_len] = '\0';
84883 clean_path(collected, 0);
84884- sys_symlink(collected + N_ALIGN(name_len), collected);
84885- sys_lchown(collected, uid, gid);
84886- do_utime(collected, mtime);
84887+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
84888+ sys_lchown((char __force_user *)collected, uid, gid);
84889+ do_utime((char __force_user *)collected, mtime);
84890 state = SkipIt;
84891 next_state = Reset;
84892 return 0;
84893diff --git a/init/main.c b/init/main.c
84894index 48655ce..d0113e4 100644
84895--- a/init/main.c
84896+++ b/init/main.c
84897@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
84898 static inline void mark_rodata_ro(void) { }
84899 #endif
84900
84901+extern void grsecurity_init(void);
84902+
84903 /*
84904 * Debug helper: via this flag we know that we are in 'early bootup code'
84905 * where only the boot processor is running with IRQ disabled. This means
84906@@ -158,6 +160,75 @@ static int __init set_reset_devices(char *str)
84907
84908 __setup("reset_devices", set_reset_devices);
84909
84910+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
84911+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
84912+static int __init setup_grsec_proc_gid(char *str)
84913+{
84914+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
84915+ return 1;
84916+}
84917+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
84918+#endif
84919+
84920+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
84921+unsigned long pax_user_shadow_base __read_only;
84922+EXPORT_SYMBOL(pax_user_shadow_base);
84923+extern char pax_enter_kernel_user[];
84924+extern char pax_exit_kernel_user[];
84925+#endif
84926+
84927+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
84928+static int __init setup_pax_nouderef(char *str)
84929+{
84930+#ifdef CONFIG_X86_32
84931+ unsigned int cpu;
84932+ struct desc_struct *gdt;
84933+
84934+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
84935+ gdt = get_cpu_gdt_table(cpu);
84936+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
84937+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
84938+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
84939+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
84940+ }
84941+ loadsegment(ds, __KERNEL_DS);
84942+ loadsegment(es, __KERNEL_DS);
84943+ loadsegment(ss, __KERNEL_DS);
84944+#else
84945+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
84946+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
84947+ clone_pgd_mask = ~(pgdval_t)0UL;
84948+ pax_user_shadow_base = 0UL;
84949+ setup_clear_cpu_cap(X86_FEATURE_PCID);
84950+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
84951+#endif
84952+
84953+ return 0;
84954+}
84955+early_param("pax_nouderef", setup_pax_nouderef);
84956+
84957+#ifdef CONFIG_X86_64
84958+static int __init setup_pax_weakuderef(char *str)
84959+{
84960+ if (clone_pgd_mask != ~(pgdval_t)0UL)
84961+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
84962+ return 1;
84963+}
84964+__setup("pax_weakuderef", setup_pax_weakuderef);
84965+#endif
84966+#endif
84967+
84968+#ifdef CONFIG_PAX_SOFTMODE
84969+int pax_softmode;
84970+
84971+static int __init setup_pax_softmode(char *str)
84972+{
84973+ get_option(&str, &pax_softmode);
84974+ return 1;
84975+}
84976+__setup("pax_softmode=", setup_pax_softmode);
84977+#endif
84978+
84979 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
84980 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
84981 static const char *panic_later, *panic_param;
84982@@ -688,25 +759,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
84983 {
84984 int count = preempt_count();
84985 int ret;
84986- char msgbuf[64];
84987+ const char *msg1 = "", *msg2 = "";
84988
84989 if (initcall_debug)
84990 ret = do_one_initcall_debug(fn);
84991 else
84992 ret = fn();
84993
84994- msgbuf[0] = 0;
84995-
84996 if (preempt_count() != count) {
84997- sprintf(msgbuf, "preemption imbalance ");
84998+ msg1 = " preemption imbalance";
84999 preempt_count_set(count);
85000 }
85001 if (irqs_disabled()) {
85002- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
85003+ msg2 = " disabled interrupts";
85004 local_irq_enable();
85005 }
85006- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
85007+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
85008
85009+ add_latent_entropy();
85010 return ret;
85011 }
85012
85013@@ -813,8 +883,8 @@ static int run_init_process(const char *init_filename)
85014 {
85015 argv_init[0] = init_filename;
85016 return do_execve(getname_kernel(init_filename),
85017- (const char __user *const __user *)argv_init,
85018- (const char __user *const __user *)envp_init);
85019+ (const char __user *const __force_user *)argv_init,
85020+ (const char __user *const __force_user *)envp_init);
85021 }
85022
85023 static int try_to_run_init_process(const char *init_filename)
85024@@ -831,6 +901,10 @@ static int try_to_run_init_process(const char *init_filename)
85025 return ret;
85026 }
85027
85028+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
85029+extern int gr_init_ran;
85030+#endif
85031+
85032 static noinline void __init kernel_init_freeable(void);
85033
85034 static int __ref kernel_init(void *unused)
85035@@ -855,6 +929,11 @@ static int __ref kernel_init(void *unused)
85036 ramdisk_execute_command, ret);
85037 }
85038
85039+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
85040+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
85041+ gr_init_ran = 1;
85042+#endif
85043+
85044 /*
85045 * We try each of these until one succeeds.
85046 *
85047@@ -910,7 +989,7 @@ static noinline void __init kernel_init_freeable(void)
85048 do_basic_setup();
85049
85050 /* Open the /dev/console on the rootfs, this should never fail */
85051- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
85052+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
85053 pr_err("Warning: unable to open an initial console.\n");
85054
85055 (void) sys_dup(0);
85056@@ -923,11 +1002,13 @@ static noinline void __init kernel_init_freeable(void)
85057 if (!ramdisk_execute_command)
85058 ramdisk_execute_command = "/init";
85059
85060- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
85061+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
85062 ramdisk_execute_command = NULL;
85063 prepare_namespace();
85064 }
85065
85066+ grsecurity_init();
85067+
85068 /*
85069 * Ok, we have completed the initial bootup, and
85070 * we're essentially up and running. Get rid of the
85071diff --git a/ipc/compat.c b/ipc/compat.c
85072index 45d035d..e4a7f99 100644
85073--- a/ipc/compat.c
85074+++ b/ipc/compat.c
85075@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
85076 COMPAT_SHMLBA);
85077 if (err < 0)
85078 return err;
85079- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
85080+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
85081 }
85082 case SHMDT:
85083 return sys_shmdt(compat_ptr(ptr));
85084diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
85085index 998d31b..30c24df 100644
85086--- a/ipc/ipc_sysctl.c
85087+++ b/ipc/ipc_sysctl.c
85088@@ -30,7 +30,7 @@ static void *get_ipc(ctl_table *table)
85089 static int proc_ipc_dointvec(ctl_table *table, int write,
85090 void __user *buffer, size_t *lenp, loff_t *ppos)
85091 {
85092- struct ctl_table ipc_table;
85093+ ctl_table_no_const ipc_table;
85094
85095 memcpy(&ipc_table, table, sizeof(ipc_table));
85096 ipc_table.data = get_ipc(table);
85097@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(ctl_table *table, int write,
85098 static int proc_ipc_dointvec_minmax(ctl_table *table, int write,
85099 void __user *buffer, size_t *lenp, loff_t *ppos)
85100 {
85101- struct ctl_table ipc_table;
85102+ ctl_table_no_const ipc_table;
85103
85104 memcpy(&ipc_table, table, sizeof(ipc_table));
85105 ipc_table.data = get_ipc(table);
85106@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(ctl_table *table, int write,
85107 static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
85108 void __user *buffer, size_t *lenp, loff_t *ppos)
85109 {
85110- struct ctl_table ipc_table;
85111+ ctl_table_no_const ipc_table;
85112 size_t lenp_bef = *lenp;
85113 int rc;
85114
85115@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(ctl_table *table, int write,
85116 static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
85117 void __user *buffer, size_t *lenp, loff_t *ppos)
85118 {
85119- struct ctl_table ipc_table;
85120+ ctl_table_no_const ipc_table;
85121 memcpy(&ipc_table, table, sizeof(ipc_table));
85122 ipc_table.data = get_ipc(table);
85123
85124@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
85125 static int proc_ipcauto_dointvec_minmax(ctl_table *table, int write,
85126 void __user *buffer, size_t *lenp, loff_t *ppos)
85127 {
85128- struct ctl_table ipc_table;
85129+ ctl_table_no_const ipc_table;
85130 size_t lenp_bef = *lenp;
85131 int oldval;
85132 int rc;
85133diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
85134index 5bb8bfe..a38ec05 100644
85135--- a/ipc/mq_sysctl.c
85136+++ b/ipc/mq_sysctl.c
85137@@ -25,7 +25,7 @@ static void *get_mq(ctl_table *table)
85138 static int proc_mq_dointvec(ctl_table *table, int write,
85139 void __user *buffer, size_t *lenp, loff_t *ppos)
85140 {
85141- struct ctl_table mq_table;
85142+ ctl_table_no_const mq_table;
85143 memcpy(&mq_table, table, sizeof(mq_table));
85144 mq_table.data = get_mq(table);
85145
85146@@ -35,7 +35,7 @@ static int proc_mq_dointvec(ctl_table *table, int write,
85147 static int proc_mq_dointvec_minmax(ctl_table *table, int write,
85148 void __user *buffer, size_t *lenp, loff_t *ppos)
85149 {
85150- struct ctl_table mq_table;
85151+ ctl_table_no_const mq_table;
85152 memcpy(&mq_table, table, sizeof(mq_table));
85153 mq_table.data = get_mq(table);
85154
85155diff --git a/ipc/mqueue.c b/ipc/mqueue.c
85156index 4fcf39a..d3cc2ec 100644
85157--- a/ipc/mqueue.c
85158+++ b/ipc/mqueue.c
85159@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
85160 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
85161 info->attr.mq_msgsize);
85162
85163+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
85164 spin_lock(&mq_lock);
85165 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
85166 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
85167diff --git a/ipc/msg.c b/ipc/msg.c
85168index 6498531..b0ff3c8 100644
85169--- a/ipc/msg.c
85170+++ b/ipc/msg.c
85171@@ -303,18 +303,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
85172 return security_msg_queue_associate(msq, msgflg);
85173 }
85174
85175+static struct ipc_ops msg_ops = {
85176+ .getnew = newque,
85177+ .associate = msg_security,
85178+ .more_checks = NULL
85179+};
85180+
85181 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
85182 {
85183 struct ipc_namespace *ns;
85184- struct ipc_ops msg_ops;
85185 struct ipc_params msg_params;
85186
85187 ns = current->nsproxy->ipc_ns;
85188
85189- msg_ops.getnew = newque;
85190- msg_ops.associate = msg_security;
85191- msg_ops.more_checks = NULL;
85192-
85193 msg_params.key = key;
85194 msg_params.flg = msgflg;
85195
85196diff --git a/ipc/sem.c b/ipc/sem.c
85197index bee5554..e9af81dd 100644
85198--- a/ipc/sem.c
85199+++ b/ipc/sem.c
85200@@ -561,10 +561,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
85201 return 0;
85202 }
85203
85204+static struct ipc_ops sem_ops = {
85205+ .getnew = newary,
85206+ .associate = sem_security,
85207+ .more_checks = sem_more_checks
85208+};
85209+
85210 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
85211 {
85212 struct ipc_namespace *ns;
85213- struct ipc_ops sem_ops;
85214 struct ipc_params sem_params;
85215
85216 ns = current->nsproxy->ipc_ns;
85217@@ -572,10 +577,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
85218 if (nsems < 0 || nsems > ns->sc_semmsl)
85219 return -EINVAL;
85220
85221- sem_ops.getnew = newary;
85222- sem_ops.associate = sem_security;
85223- sem_ops.more_checks = sem_more_checks;
85224-
85225 sem_params.key = key;
85226 sem_params.flg = semflg;
85227 sem_params.u.nsems = nsems;
85228diff --git a/ipc/shm.c b/ipc/shm.c
85229index 7645961..afc7f02 100644
85230--- a/ipc/shm.c
85231+++ b/ipc/shm.c
85232@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
85233 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
85234 #endif
85235
85236+#ifdef CONFIG_GRKERNSEC
85237+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85238+ const time_t shm_createtime, const kuid_t cuid,
85239+ const int shmid);
85240+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85241+ const time_t shm_createtime);
85242+#endif
85243+
85244 void shm_init_ns(struct ipc_namespace *ns)
85245 {
85246 ns->shm_ctlmax = SHMMAX;
85247@@ -553,6 +561,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
85248 shp->shm_lprid = 0;
85249 shp->shm_atim = shp->shm_dtim = 0;
85250 shp->shm_ctim = get_seconds();
85251+#ifdef CONFIG_GRKERNSEC
85252+ {
85253+ struct timespec timeval;
85254+ do_posix_clock_monotonic_gettime(&timeval);
85255+
85256+ shp->shm_createtime = timeval.tv_sec;
85257+ }
85258+#endif
85259 shp->shm_segsz = size;
85260 shp->shm_nattch = 0;
85261 shp->shm_file = file;
85262@@ -606,18 +622,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
85263 return 0;
85264 }
85265
85266+static struct ipc_ops shm_ops = {
85267+ .getnew = newseg,
85268+ .associate = shm_security,
85269+ .more_checks = shm_more_checks
85270+};
85271+
85272 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
85273 {
85274 struct ipc_namespace *ns;
85275- struct ipc_ops shm_ops;
85276 struct ipc_params shm_params;
85277
85278 ns = current->nsproxy->ipc_ns;
85279
85280- shm_ops.getnew = newseg;
85281- shm_ops.associate = shm_security;
85282- shm_ops.more_checks = shm_more_checks;
85283-
85284 shm_params.key = key;
85285 shm_params.flg = shmflg;
85286 shm_params.u.size = size;
85287@@ -1088,6 +1105,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
85288 f_mode = FMODE_READ | FMODE_WRITE;
85289 }
85290 if (shmflg & SHM_EXEC) {
85291+
85292+#ifdef CONFIG_PAX_MPROTECT
85293+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
85294+ goto out;
85295+#endif
85296+
85297 prot |= PROT_EXEC;
85298 acc_mode |= S_IXUGO;
85299 }
85300@@ -1112,6 +1135,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
85301 if (err)
85302 goto out_unlock;
85303
85304+#ifdef CONFIG_GRKERNSEC
85305+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
85306+ shp->shm_perm.cuid, shmid) ||
85307+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
85308+ err = -EACCES;
85309+ goto out_unlock;
85310+ }
85311+#endif
85312+
85313 ipc_lock_object(&shp->shm_perm);
85314
85315 /* check if shm_destroy() is tearing down shp */
85316@@ -1124,6 +1156,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
85317 path = shp->shm_file->f_path;
85318 path_get(&path);
85319 shp->shm_nattch++;
85320+#ifdef CONFIG_GRKERNSEC
85321+ shp->shm_lapid = current->pid;
85322+#endif
85323 size = i_size_read(path.dentry->d_inode);
85324 ipc_unlock_object(&shp->shm_perm);
85325 rcu_read_unlock();
85326diff --git a/ipc/util.c b/ipc/util.c
85327index 2eb0d1e..0308564 100644
85328--- a/ipc/util.c
85329+++ b/ipc/util.c
85330@@ -71,6 +71,8 @@ struct ipc_proc_iface {
85331 int (*show)(struct seq_file *, void *);
85332 };
85333
85334+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
85335+
85336 static void ipc_memory_notifier(struct work_struct *work)
85337 {
85338 ipcns_notify(IPCNS_MEMCHANGED);
85339@@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
85340 granted_mode >>= 6;
85341 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
85342 granted_mode >>= 3;
85343+
85344+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
85345+ return -1;
85346+
85347 /* is there some bit set in requested_mode but not in granted_mode? */
85348 if ((requested_mode & ~granted_mode & 0007) &&
85349 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
85350diff --git a/kernel/acct.c b/kernel/acct.c
85351index 8d6e145..33e0b1e 100644
85352--- a/kernel/acct.c
85353+++ b/kernel/acct.c
85354@@ -556,7 +556,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
85355 */
85356 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
85357 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
85358- file->f_op->write(file, (char *)&ac,
85359+ file->f_op->write(file, (char __force_user *)&ac,
85360 sizeof(acct_t), &file->f_pos);
85361 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
85362 set_fs(fs);
85363diff --git a/kernel/audit.c b/kernel/audit.c
85364index 47845c5..bd9dd5b 100644
85365--- a/kernel/audit.c
85366+++ b/kernel/audit.c
85367@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
85368 3) suppressed due to audit_rate_limit
85369 4) suppressed due to audit_backlog_limit
85370 */
85371-static atomic_t audit_lost = ATOMIC_INIT(0);
85372+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
85373
85374 /* The netlink socket. */
85375 static struct sock *audit_sock;
85376@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
85377 unsigned long now;
85378 int print;
85379
85380- atomic_inc(&audit_lost);
85381+ atomic_inc_unchecked(&audit_lost);
85382
85383 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
85384
85385@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
85386 if (print) {
85387 if (printk_ratelimit())
85388 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
85389- atomic_read(&audit_lost),
85390+ atomic_read_unchecked(&audit_lost),
85391 audit_rate_limit,
85392 audit_backlog_limit);
85393 audit_panic(message);
85394@@ -808,7 +808,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
85395 s.pid = audit_pid;
85396 s.rate_limit = audit_rate_limit;
85397 s.backlog_limit = audit_backlog_limit;
85398- s.lost = atomic_read(&audit_lost);
85399+ s.lost = atomic_read_unchecked(&audit_lost);
85400 s.backlog = skb_queue_len(&audit_skb_queue);
85401 s.version = AUDIT_VERSION_LATEST;
85402 s.backlog_wait_time = audit_backlog_wait_time;
85403diff --git a/kernel/auditsc.c b/kernel/auditsc.c
85404index 21eae3c..66db239 100644
85405--- a/kernel/auditsc.c
85406+++ b/kernel/auditsc.c
85407@@ -2023,7 +2023,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
85408 }
85409
85410 /* global counter which is incremented every time something logs in */
85411-static atomic_t session_id = ATOMIC_INIT(0);
85412+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
85413
85414 static int audit_set_loginuid_perm(kuid_t loginuid)
85415 {
85416@@ -2090,7 +2090,7 @@ int audit_set_loginuid(kuid_t loginuid)
85417
85418 /* are we setting or clearing? */
85419 if (uid_valid(loginuid))
85420- sessionid = (unsigned int)atomic_inc_return(&session_id);
85421+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
85422
85423 task->sessionid = sessionid;
85424 task->loginuid = loginuid;
85425diff --git a/kernel/capability.c b/kernel/capability.c
85426index 24663b3..b926ae1 100644
85427--- a/kernel/capability.c
85428+++ b/kernel/capability.c
85429@@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
85430 * before modification is attempted and the application
85431 * fails.
85432 */
85433+ if (tocopy > ARRAY_SIZE(kdata))
85434+ return -EFAULT;
85435+
85436 if (copy_to_user(dataptr, kdata, tocopy
85437 * sizeof(struct __user_cap_data_struct))) {
85438 return -EFAULT;
85439@@ -294,10 +297,11 @@ bool has_ns_capability(struct task_struct *t,
85440 int ret;
85441
85442 rcu_read_lock();
85443- ret = security_capable(__task_cred(t), ns, cap);
85444+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
85445+ gr_task_is_capable(t, __task_cred(t), cap);
85446 rcu_read_unlock();
85447
85448- return (ret == 0);
85449+ return ret;
85450 }
85451
85452 /**
85453@@ -334,10 +338,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
85454 int ret;
85455
85456 rcu_read_lock();
85457- ret = security_capable_noaudit(__task_cred(t), ns, cap);
85458+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
85459 rcu_read_unlock();
85460
85461- return (ret == 0);
85462+ return ret;
85463 }
85464
85465 /**
85466@@ -375,7 +379,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
85467 BUG();
85468 }
85469
85470- if (security_capable(current_cred(), ns, cap) == 0) {
85471+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
85472 current->flags |= PF_SUPERPRIV;
85473 return true;
85474 }
85475@@ -383,6 +387,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
85476 }
85477 EXPORT_SYMBOL(ns_capable);
85478
85479+bool ns_capable_nolog(struct user_namespace *ns, int cap)
85480+{
85481+ if (unlikely(!cap_valid(cap))) {
85482+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
85483+ BUG();
85484+ }
85485+
85486+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
85487+ current->flags |= PF_SUPERPRIV;
85488+ return true;
85489+ }
85490+ return false;
85491+}
85492+EXPORT_SYMBOL(ns_capable_nolog);
85493+
85494 /**
85495 * file_ns_capable - Determine if the file's opener had a capability in effect
85496 * @file: The file we want to check
85497@@ -423,6 +442,12 @@ bool capable(int cap)
85498 }
85499 EXPORT_SYMBOL(capable);
85500
85501+bool capable_nolog(int cap)
85502+{
85503+ return ns_capable_nolog(&init_user_ns, cap);
85504+}
85505+EXPORT_SYMBOL(capable_nolog);
85506+
85507 /**
85508 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
85509 * @inode: The inode in question
85510@@ -440,3 +465,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
85511 kgid_has_mapping(ns, inode->i_gid);
85512 }
85513 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
85514+
85515+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
85516+{
85517+ struct user_namespace *ns = current_user_ns();
85518+
85519+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
85520+ kgid_has_mapping(ns, inode->i_gid);
85521+}
85522+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
85523diff --git a/kernel/cgroup.c b/kernel/cgroup.c
85524index ceee0c5..d6f81dd 100644
85525--- a/kernel/cgroup.c
85526+++ b/kernel/cgroup.c
85527@@ -4757,7 +4757,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
85528 struct task_struct *task;
85529 int count = 0;
85530
85531- seq_printf(seq, "css_set %p\n", cset);
85532+ seq_printf(seq, "css_set %pK\n", cset);
85533
85534 list_for_each_entry(task, &cset->tasks, cg_list) {
85535 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
85536diff --git a/kernel/compat.c b/kernel/compat.c
85537index e40b043..3da8f51 100644
85538--- a/kernel/compat.c
85539+++ b/kernel/compat.c
85540@@ -13,6 +13,7 @@
85541
85542 #include <linux/linkage.h>
85543 #include <linux/compat.h>
85544+#include <linux/module.h>
85545 #include <linux/errno.h>
85546 #include <linux/time.h>
85547 #include <linux/signal.h>
85548@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
85549 mm_segment_t oldfs;
85550 long ret;
85551
85552- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
85553+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
85554 oldfs = get_fs();
85555 set_fs(KERNEL_DS);
85556 ret = hrtimer_nanosleep_restart(restart);
85557@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
85558 oldfs = get_fs();
85559 set_fs(KERNEL_DS);
85560 ret = hrtimer_nanosleep(&tu,
85561- rmtp ? (struct timespec __user *)&rmt : NULL,
85562+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
85563 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
85564 set_fs(oldfs);
85565
85566@@ -361,7 +362,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
85567 mm_segment_t old_fs = get_fs();
85568
85569 set_fs(KERNEL_DS);
85570- ret = sys_sigpending((old_sigset_t __user *) &s);
85571+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
85572 set_fs(old_fs);
85573 if (ret == 0)
85574 ret = put_user(s, set);
85575@@ -451,7 +452,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
85576 mm_segment_t old_fs = get_fs();
85577
85578 set_fs(KERNEL_DS);
85579- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
85580+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
85581 set_fs(old_fs);
85582
85583 if (!ret) {
85584@@ -533,8 +534,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
85585 set_fs (KERNEL_DS);
85586 ret = sys_wait4(pid,
85587 (stat_addr ?
85588- (unsigned int __user *) &status : NULL),
85589- options, (struct rusage __user *) &r);
85590+ (unsigned int __force_user *) &status : NULL),
85591+ options, (struct rusage __force_user *) &r);
85592 set_fs (old_fs);
85593
85594 if (ret > 0) {
85595@@ -560,8 +561,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
85596 memset(&info, 0, sizeof(info));
85597
85598 set_fs(KERNEL_DS);
85599- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
85600- uru ? (struct rusage __user *)&ru : NULL);
85601+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
85602+ uru ? (struct rusage __force_user *)&ru : NULL);
85603 set_fs(old_fs);
85604
85605 if ((ret < 0) || (info.si_signo == 0))
85606@@ -695,8 +696,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
85607 oldfs = get_fs();
85608 set_fs(KERNEL_DS);
85609 err = sys_timer_settime(timer_id, flags,
85610- (struct itimerspec __user *) &newts,
85611- (struct itimerspec __user *) &oldts);
85612+ (struct itimerspec __force_user *) &newts,
85613+ (struct itimerspec __force_user *) &oldts);
85614 set_fs(oldfs);
85615 if (!err && old && put_compat_itimerspec(old, &oldts))
85616 return -EFAULT;
85617@@ -713,7 +714,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
85618 oldfs = get_fs();
85619 set_fs(KERNEL_DS);
85620 err = sys_timer_gettime(timer_id,
85621- (struct itimerspec __user *) &ts);
85622+ (struct itimerspec __force_user *) &ts);
85623 set_fs(oldfs);
85624 if (!err && put_compat_itimerspec(setting, &ts))
85625 return -EFAULT;
85626@@ -732,7 +733,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
85627 oldfs = get_fs();
85628 set_fs(KERNEL_DS);
85629 err = sys_clock_settime(which_clock,
85630- (struct timespec __user *) &ts);
85631+ (struct timespec __force_user *) &ts);
85632 set_fs(oldfs);
85633 return err;
85634 }
85635@@ -747,7 +748,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
85636 oldfs = get_fs();
85637 set_fs(KERNEL_DS);
85638 err = sys_clock_gettime(which_clock,
85639- (struct timespec __user *) &ts);
85640+ (struct timespec __force_user *) &ts);
85641 set_fs(oldfs);
85642 if (!err && compat_put_timespec(&ts, tp))
85643 return -EFAULT;
85644@@ -767,7 +768,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
85645
85646 oldfs = get_fs();
85647 set_fs(KERNEL_DS);
85648- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
85649+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
85650 set_fs(oldfs);
85651
85652 err = compat_put_timex(utp, &txc);
85653@@ -787,7 +788,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
85654 oldfs = get_fs();
85655 set_fs(KERNEL_DS);
85656 err = sys_clock_getres(which_clock,
85657- (struct timespec __user *) &ts);
85658+ (struct timespec __force_user *) &ts);
85659 set_fs(oldfs);
85660 if (!err && tp && compat_put_timespec(&ts, tp))
85661 return -EFAULT;
85662@@ -801,7 +802,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
85663 struct timespec tu;
85664 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
85665
85666- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
85667+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
85668 oldfs = get_fs();
85669 set_fs(KERNEL_DS);
85670 err = clock_nanosleep_restart(restart);
85671@@ -833,8 +834,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
85672 oldfs = get_fs();
85673 set_fs(KERNEL_DS);
85674 err = sys_clock_nanosleep(which_clock, flags,
85675- (struct timespec __user *) &in,
85676- (struct timespec __user *) &out);
85677+ (struct timespec __force_user *) &in,
85678+ (struct timespec __force_user *) &out);
85679 set_fs(oldfs);
85680
85681 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
85682@@ -1128,7 +1129,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
85683 mm_segment_t old_fs = get_fs();
85684
85685 set_fs(KERNEL_DS);
85686- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
85687+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
85688 set_fs(old_fs);
85689 if (compat_put_timespec(&t, interval))
85690 return -EFAULT;
85691diff --git a/kernel/configs.c b/kernel/configs.c
85692index c18b1f1..b9a0132 100644
85693--- a/kernel/configs.c
85694+++ b/kernel/configs.c
85695@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
85696 struct proc_dir_entry *entry;
85697
85698 /* create the current config file */
85699+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
85700+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
85701+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
85702+ &ikconfig_file_ops);
85703+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85704+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
85705+ &ikconfig_file_ops);
85706+#endif
85707+#else
85708 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
85709 &ikconfig_file_ops);
85710+#endif
85711+
85712 if (!entry)
85713 return -ENOMEM;
85714
85715diff --git a/kernel/cred.c b/kernel/cred.c
85716index e0573a4..26c0fd3 100644
85717--- a/kernel/cred.c
85718+++ b/kernel/cred.c
85719@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
85720 validate_creds(cred);
85721 alter_cred_subscribers(cred, -1);
85722 put_cred(cred);
85723+
85724+#ifdef CONFIG_GRKERNSEC_SETXID
85725+ cred = (struct cred *) tsk->delayed_cred;
85726+ if (cred != NULL) {
85727+ tsk->delayed_cred = NULL;
85728+ validate_creds(cred);
85729+ alter_cred_subscribers(cred, -1);
85730+ put_cred(cred);
85731+ }
85732+#endif
85733 }
85734
85735 /**
85736@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
85737 * Always returns 0 thus allowing this function to be tail-called at the end
85738 * of, say, sys_setgid().
85739 */
85740-int commit_creds(struct cred *new)
85741+static int __commit_creds(struct cred *new)
85742 {
85743 struct task_struct *task = current;
85744 const struct cred *old = task->real_cred;
85745@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
85746
85747 get_cred(new); /* we will require a ref for the subj creds too */
85748
85749+ gr_set_role_label(task, new->uid, new->gid);
85750+
85751 /* dumpability changes */
85752 if (!uid_eq(old->euid, new->euid) ||
85753 !gid_eq(old->egid, new->egid) ||
85754@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
85755 put_cred(old);
85756 return 0;
85757 }
85758+#ifdef CONFIG_GRKERNSEC_SETXID
85759+extern int set_user(struct cred *new);
85760+
85761+void gr_delayed_cred_worker(void)
85762+{
85763+ const struct cred *new = current->delayed_cred;
85764+ struct cred *ncred;
85765+
85766+ current->delayed_cred = NULL;
85767+
85768+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
85769+ // from doing get_cred on it when queueing this
85770+ put_cred(new);
85771+ return;
85772+ } else if (new == NULL)
85773+ return;
85774+
85775+ ncred = prepare_creds();
85776+ if (!ncred)
85777+ goto die;
85778+ // uids
85779+ ncred->uid = new->uid;
85780+ ncred->euid = new->euid;
85781+ ncred->suid = new->suid;
85782+ ncred->fsuid = new->fsuid;
85783+ // gids
85784+ ncred->gid = new->gid;
85785+ ncred->egid = new->egid;
85786+ ncred->sgid = new->sgid;
85787+ ncred->fsgid = new->fsgid;
85788+ // groups
85789+ set_groups(ncred, new->group_info);
85790+ // caps
85791+ ncred->securebits = new->securebits;
85792+ ncred->cap_inheritable = new->cap_inheritable;
85793+ ncred->cap_permitted = new->cap_permitted;
85794+ ncred->cap_effective = new->cap_effective;
85795+ ncred->cap_bset = new->cap_bset;
85796+
85797+ if (set_user(ncred)) {
85798+ abort_creds(ncred);
85799+ goto die;
85800+ }
85801+
85802+ // from doing get_cred on it when queueing this
85803+ put_cred(new);
85804+
85805+ __commit_creds(ncred);
85806+ return;
85807+die:
85808+ // from doing get_cred on it when queueing this
85809+ put_cred(new);
85810+ do_group_exit(SIGKILL);
85811+}
85812+#endif
85813+
85814+int commit_creds(struct cred *new)
85815+{
85816+#ifdef CONFIG_GRKERNSEC_SETXID
85817+ int ret;
85818+ int schedule_it = 0;
85819+ struct task_struct *t;
85820+ unsigned oldsecurebits = current_cred()->securebits;
85821+
85822+ /* we won't get called with tasklist_lock held for writing
85823+ and interrupts disabled as the cred struct in that case is
85824+ init_cred
85825+ */
85826+ if (grsec_enable_setxid && !current_is_single_threaded() &&
85827+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
85828+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
85829+ schedule_it = 1;
85830+ }
85831+ ret = __commit_creds(new);
85832+ if (schedule_it) {
85833+ rcu_read_lock();
85834+ read_lock(&tasklist_lock);
85835+ for (t = next_thread(current); t != current;
85836+ t = next_thread(t)) {
85837+ /* we'll check if the thread has uid 0 in
85838+ * the delayed worker routine
85839+ */
85840+ if (task_securebits(t) == oldsecurebits &&
85841+ t->delayed_cred == NULL) {
85842+ t->delayed_cred = get_cred(new);
85843+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
85844+ set_tsk_need_resched(t);
85845+ }
85846+ }
85847+ read_unlock(&tasklist_lock);
85848+ rcu_read_unlock();
85849+ }
85850+
85851+ return ret;
85852+#else
85853+ return __commit_creds(new);
85854+#endif
85855+}
85856+
85857 EXPORT_SYMBOL(commit_creds);
85858
85859 /**
85860diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
85861index 2956c8d..cfe1e2e 100644
85862--- a/kernel/debug/debug_core.c
85863+++ b/kernel/debug/debug_core.c
85864@@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
85865 */
85866 static atomic_t masters_in_kgdb;
85867 static atomic_t slaves_in_kgdb;
85868-static atomic_t kgdb_break_tasklet_var;
85869+static atomic_unchecked_t kgdb_break_tasklet_var;
85870 atomic_t kgdb_setting_breakpoint;
85871
85872 struct task_struct *kgdb_usethread;
85873@@ -134,7 +134,7 @@ int kgdb_single_step;
85874 static pid_t kgdb_sstep_pid;
85875
85876 /* to keep track of the CPU which is doing the single stepping*/
85877-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
85878+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
85879
85880 /*
85881 * If you are debugging a problem where roundup (the collection of
85882@@ -549,7 +549,7 @@ return_normal:
85883 * kernel will only try for the value of sstep_tries before
85884 * giving up and continuing on.
85885 */
85886- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
85887+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
85888 (kgdb_info[cpu].task &&
85889 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
85890 atomic_set(&kgdb_active, -1);
85891@@ -647,8 +647,8 @@ cpu_master_loop:
85892 }
85893
85894 kgdb_restore:
85895- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
85896- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
85897+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
85898+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
85899 if (kgdb_info[sstep_cpu].task)
85900 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
85901 else
85902@@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
85903 static void kgdb_tasklet_bpt(unsigned long ing)
85904 {
85905 kgdb_breakpoint();
85906- atomic_set(&kgdb_break_tasklet_var, 0);
85907+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
85908 }
85909
85910 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
85911
85912 void kgdb_schedule_breakpoint(void)
85913 {
85914- if (atomic_read(&kgdb_break_tasklet_var) ||
85915+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
85916 atomic_read(&kgdb_active) != -1 ||
85917 atomic_read(&kgdb_setting_breakpoint))
85918 return;
85919- atomic_inc(&kgdb_break_tasklet_var);
85920+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
85921 tasklet_schedule(&kgdb_tasklet_breakpoint);
85922 }
85923 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
85924diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
85925index 0b097c8..11dd5c5 100644
85926--- a/kernel/debug/kdb/kdb_main.c
85927+++ b/kernel/debug/kdb/kdb_main.c
85928@@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
85929 continue;
85930
85931 kdb_printf("%-20s%8u 0x%p ", mod->name,
85932- mod->core_size, (void *)mod);
85933+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
85934 #ifdef CONFIG_MODULE_UNLOAD
85935 kdb_printf("%4ld ", module_refcount(mod));
85936 #endif
85937@@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
85938 kdb_printf(" (Loading)");
85939 else
85940 kdb_printf(" (Live)");
85941- kdb_printf(" 0x%p", mod->module_core);
85942+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
85943
85944 #ifdef CONFIG_MODULE_UNLOAD
85945 {
85946diff --git a/kernel/events/core.c b/kernel/events/core.c
85947index 440eefc..0909f02 100644
85948--- a/kernel/events/core.c
85949+++ b/kernel/events/core.c
85950@@ -158,8 +158,15 @@ static struct srcu_struct pmus_srcu;
85951 * 0 - disallow raw tracepoint access for unpriv
85952 * 1 - disallow cpu events for unpriv
85953 * 2 - disallow kernel profiling for unpriv
85954+ * 3 - disallow all unpriv perf event use
85955 */
85956-int sysctl_perf_event_paranoid __read_mostly = 1;
85957+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
85958+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
85959+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
85960+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
85961+#else
85962+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
85963+#endif
85964
85965 /* Minimum for 512 kiB + 1 user control page */
85966 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
85967@@ -185,7 +192,7 @@ void update_perf_cpu_limits(void)
85968
85969 tmp *= sysctl_perf_cpu_time_max_percent;
85970 do_div(tmp, 100);
85971- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
85972+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
85973 }
85974
85975 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
85976@@ -291,7 +298,7 @@ void perf_sample_event_took(u64 sample_len_ns)
85977 }
85978 }
85979
85980-static atomic64_t perf_event_id;
85981+static atomic64_unchecked_t perf_event_id;
85982
85983 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
85984 enum event_type_t event_type);
85985@@ -3002,7 +3009,7 @@ static void __perf_event_read(void *info)
85986
85987 static inline u64 perf_event_count(struct perf_event *event)
85988 {
85989- return local64_read(&event->count) + atomic64_read(&event->child_count);
85990+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
85991 }
85992
85993 static u64 perf_event_read(struct perf_event *event)
85994@@ -3361,9 +3368,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
85995 mutex_lock(&event->child_mutex);
85996 total += perf_event_read(event);
85997 *enabled += event->total_time_enabled +
85998- atomic64_read(&event->child_total_time_enabled);
85999+ atomic64_read_unchecked(&event->child_total_time_enabled);
86000 *running += event->total_time_running +
86001- atomic64_read(&event->child_total_time_running);
86002+ atomic64_read_unchecked(&event->child_total_time_running);
86003
86004 list_for_each_entry(child, &event->child_list, child_list) {
86005 total += perf_event_read(child);
86006@@ -3792,10 +3799,10 @@ void perf_event_update_userpage(struct perf_event *event)
86007 userpg->offset -= local64_read(&event->hw.prev_count);
86008
86009 userpg->time_enabled = enabled +
86010- atomic64_read(&event->child_total_time_enabled);
86011+ atomic64_read_unchecked(&event->child_total_time_enabled);
86012
86013 userpg->time_running = running +
86014- atomic64_read(&event->child_total_time_running);
86015+ atomic64_read_unchecked(&event->child_total_time_running);
86016
86017 arch_perf_update_userpage(userpg, now);
86018
86019@@ -4359,7 +4366,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
86020
86021 /* Data. */
86022 sp = perf_user_stack_pointer(regs);
86023- rem = __output_copy_user(handle, (void *) sp, dump_size);
86024+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
86025 dyn_size = dump_size - rem;
86026
86027 perf_output_skip(handle, rem);
86028@@ -4450,11 +4457,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
86029 values[n++] = perf_event_count(event);
86030 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
86031 values[n++] = enabled +
86032- atomic64_read(&event->child_total_time_enabled);
86033+ atomic64_read_unchecked(&event->child_total_time_enabled);
86034 }
86035 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
86036 values[n++] = running +
86037- atomic64_read(&event->child_total_time_running);
86038+ atomic64_read_unchecked(&event->child_total_time_running);
86039 }
86040 if (read_format & PERF_FORMAT_ID)
86041 values[n++] = primary_event_id(event);
86042@@ -6733,7 +6740,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
86043 event->parent = parent_event;
86044
86045 event->ns = get_pid_ns(task_active_pid_ns(current));
86046- event->id = atomic64_inc_return(&perf_event_id);
86047+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
86048
86049 event->state = PERF_EVENT_STATE_INACTIVE;
86050
86051@@ -7015,6 +7022,11 @@ SYSCALL_DEFINE5(perf_event_open,
86052 if (flags & ~PERF_FLAG_ALL)
86053 return -EINVAL;
86054
86055+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
86056+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
86057+ return -EACCES;
86058+#endif
86059+
86060 err = perf_copy_attr(attr_uptr, &attr);
86061 if (err)
86062 return err;
86063@@ -7353,10 +7365,10 @@ static void sync_child_event(struct perf_event *child_event,
86064 /*
86065 * Add back the child's count to the parent's count:
86066 */
86067- atomic64_add(child_val, &parent_event->child_count);
86068- atomic64_add(child_event->total_time_enabled,
86069+ atomic64_add_unchecked(child_val, &parent_event->child_count);
86070+ atomic64_add_unchecked(child_event->total_time_enabled,
86071 &parent_event->child_total_time_enabled);
86072- atomic64_add(child_event->total_time_running,
86073+ atomic64_add_unchecked(child_event->total_time_running,
86074 &parent_event->child_total_time_running);
86075
86076 /*
86077diff --git a/kernel/events/internal.h b/kernel/events/internal.h
86078index 569b2187..19940d9 100644
86079--- a/kernel/events/internal.h
86080+++ b/kernel/events/internal.h
86081@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
86082 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
86083 }
86084
86085-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
86086+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
86087 static inline unsigned long \
86088 func_name(struct perf_output_handle *handle, \
86089- const void *buf, unsigned long len) \
86090+ const void user *buf, unsigned long len) \
86091 { \
86092 unsigned long size, written; \
86093 \
86094@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
86095 return 0;
86096 }
86097
86098-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
86099+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
86100
86101 static inline unsigned long
86102 memcpy_skip(void *dst, const void *src, unsigned long n)
86103@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
86104 return 0;
86105 }
86106
86107-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
86108+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
86109
86110 #ifndef arch_perf_out_copy_user
86111 #define arch_perf_out_copy_user arch_perf_out_copy_user
86112@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
86113 }
86114 #endif
86115
86116-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
86117+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
86118
86119 /* Callchain handling */
86120 extern struct perf_callchain_entry *
86121diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
86122index 04709b6..d330828 100644
86123--- a/kernel/events/uprobes.c
86124+++ b/kernel/events/uprobes.c
86125@@ -1666,7 +1666,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
86126 {
86127 struct page *page;
86128 uprobe_opcode_t opcode;
86129- int result;
86130+ long result;
86131
86132 pagefault_disable();
86133 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
86134diff --git a/kernel/exit.c b/kernel/exit.c
86135index 6ed6a1d..edecb0e 100644
86136--- a/kernel/exit.c
86137+++ b/kernel/exit.c
86138@@ -173,6 +173,10 @@ void release_task(struct task_struct * p)
86139 struct task_struct *leader;
86140 int zap_leader;
86141 repeat:
86142+#ifdef CONFIG_NET
86143+ gr_del_task_from_ip_table(p);
86144+#endif
86145+
86146 /* don't need to get the RCU readlock here - the process is dead and
86147 * can't be modifying its own credentials. But shut RCU-lockdep up */
86148 rcu_read_lock();
86149@@ -330,7 +334,7 @@ int allow_signal(int sig)
86150 * know it'll be handled, so that they don't get converted to
86151 * SIGKILL or just silently dropped.
86152 */
86153- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
86154+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
86155 recalc_sigpending();
86156 spin_unlock_irq(&current->sighand->siglock);
86157 return 0;
86158@@ -699,6 +703,8 @@ void do_exit(long code)
86159 struct task_struct *tsk = current;
86160 int group_dead;
86161
86162+ set_fs(USER_DS);
86163+
86164 profile_task_exit(tsk);
86165
86166 WARN_ON(blk_needs_flush_plug(tsk));
86167@@ -715,7 +721,6 @@ void do_exit(long code)
86168 * mm_release()->clear_child_tid() from writing to a user-controlled
86169 * kernel address.
86170 */
86171- set_fs(USER_DS);
86172
86173 ptrace_event(PTRACE_EVENT_EXIT, code);
86174
86175@@ -774,6 +779,9 @@ void do_exit(long code)
86176 tsk->exit_code = code;
86177 taskstats_exit(tsk, group_dead);
86178
86179+ gr_acl_handle_psacct(tsk, code);
86180+ gr_acl_handle_exit();
86181+
86182 exit_mm(tsk);
86183
86184 if (group_dead)
86185@@ -893,7 +901,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
86186 * Take down every thread in the group. This is called by fatal signals
86187 * as well as by sys_exit_group (below).
86188 */
86189-void
86190+__noreturn void
86191 do_group_exit(int exit_code)
86192 {
86193 struct signal_struct *sig = current->signal;
86194diff --git a/kernel/fork.c b/kernel/fork.c
86195index 68b9226..0700bf6 100644
86196--- a/kernel/fork.c
86197+++ b/kernel/fork.c
86198@@ -183,6 +183,48 @@ void thread_info_cache_init(void)
86199 # endif
86200 #endif
86201
86202+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86203+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
86204+ int node, void **lowmem_stack)
86205+{
86206+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
86207+ void *ret = NULL;
86208+ unsigned int i;
86209+
86210+ *lowmem_stack = alloc_thread_info_node(tsk, node);
86211+ if (*lowmem_stack == NULL)
86212+ goto out;
86213+
86214+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
86215+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
86216+
86217+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
86218+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
86219+ if (ret == NULL) {
86220+ free_thread_info(*lowmem_stack);
86221+ *lowmem_stack = NULL;
86222+ }
86223+
86224+out:
86225+ return ret;
86226+}
86227+
86228+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
86229+{
86230+ unmap_process_stacks(tsk);
86231+}
86232+#else
86233+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
86234+ int node, void **lowmem_stack)
86235+{
86236+ return alloc_thread_info_node(tsk, node);
86237+}
86238+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
86239+{
86240+ free_thread_info(ti);
86241+}
86242+#endif
86243+
86244 /* SLAB cache for signal_struct structures (tsk->signal) */
86245 static struct kmem_cache *signal_cachep;
86246
86247@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
86248 /* SLAB cache for mm_struct structures (tsk->mm) */
86249 static struct kmem_cache *mm_cachep;
86250
86251-static void account_kernel_stack(struct thread_info *ti, int account)
86252+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
86253 {
86254+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86255+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
86256+#else
86257 struct zone *zone = page_zone(virt_to_page(ti));
86258+#endif
86259
86260 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
86261 }
86262
86263 void free_task(struct task_struct *tsk)
86264 {
86265- account_kernel_stack(tsk->stack, -1);
86266+ account_kernel_stack(tsk, tsk->stack, -1);
86267 arch_release_thread_info(tsk->stack);
86268- free_thread_info(tsk->stack);
86269+ gr_free_thread_info(tsk, tsk->stack);
86270 rt_mutex_debug_task_free(tsk);
86271 ftrace_graph_exit_task(tsk);
86272 put_seccomp_filter(tsk);
86273@@ -299,6 +345,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86274 struct task_struct *tsk;
86275 struct thread_info *ti;
86276 unsigned long *stackend;
86277+ void *lowmem_stack;
86278 int node = tsk_fork_get_node(orig);
86279 int err;
86280
86281@@ -306,7 +353,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86282 if (!tsk)
86283 return NULL;
86284
86285- ti = alloc_thread_info_node(tsk, node);
86286+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
86287 if (!ti)
86288 goto free_tsk;
86289
86290@@ -315,6 +362,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86291 goto free_ti;
86292
86293 tsk->stack = ti;
86294+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86295+ tsk->lowmem_stack = lowmem_stack;
86296+#endif
86297
86298 setup_thread_stack(tsk, orig);
86299 clear_user_return_notifier(tsk);
86300@@ -323,7 +373,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86301 *stackend = STACK_END_MAGIC; /* for overflow detection */
86302
86303 #ifdef CONFIG_CC_STACKPROTECTOR
86304- tsk->stack_canary = get_random_int();
86305+ tsk->stack_canary = pax_get_random_long();
86306 #endif
86307
86308 /*
86309@@ -337,24 +387,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
86310 tsk->splice_pipe = NULL;
86311 tsk->task_frag.page = NULL;
86312
86313- account_kernel_stack(ti, 1);
86314+ account_kernel_stack(tsk, ti, 1);
86315
86316 return tsk;
86317
86318 free_ti:
86319- free_thread_info(ti);
86320+ gr_free_thread_info(tsk, ti);
86321 free_tsk:
86322 free_task_struct(tsk);
86323 return NULL;
86324 }
86325
86326 #ifdef CONFIG_MMU
86327-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86328+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
86329+{
86330+ struct vm_area_struct *tmp;
86331+ unsigned long charge;
86332+ struct file *file;
86333+ int retval;
86334+
86335+ charge = 0;
86336+ if (mpnt->vm_flags & VM_ACCOUNT) {
86337+ unsigned long len = vma_pages(mpnt);
86338+
86339+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
86340+ goto fail_nomem;
86341+ charge = len;
86342+ }
86343+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
86344+ if (!tmp)
86345+ goto fail_nomem;
86346+ *tmp = *mpnt;
86347+ tmp->vm_mm = mm;
86348+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
86349+ retval = vma_dup_policy(mpnt, tmp);
86350+ if (retval)
86351+ goto fail_nomem_policy;
86352+ if (anon_vma_fork(tmp, mpnt))
86353+ goto fail_nomem_anon_vma_fork;
86354+ tmp->vm_flags &= ~VM_LOCKED;
86355+ tmp->vm_next = tmp->vm_prev = NULL;
86356+ tmp->vm_mirror = NULL;
86357+ file = tmp->vm_file;
86358+ if (file) {
86359+ struct inode *inode = file_inode(file);
86360+ struct address_space *mapping = file->f_mapping;
86361+
86362+ get_file(file);
86363+ if (tmp->vm_flags & VM_DENYWRITE)
86364+ atomic_dec(&inode->i_writecount);
86365+ mutex_lock(&mapping->i_mmap_mutex);
86366+ if (tmp->vm_flags & VM_SHARED)
86367+ mapping->i_mmap_writable++;
86368+ flush_dcache_mmap_lock(mapping);
86369+ /* insert tmp into the share list, just after mpnt */
86370+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
86371+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
86372+ else
86373+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
86374+ flush_dcache_mmap_unlock(mapping);
86375+ mutex_unlock(&mapping->i_mmap_mutex);
86376+ }
86377+
86378+ /*
86379+ * Clear hugetlb-related page reserves for children. This only
86380+ * affects MAP_PRIVATE mappings. Faults generated by the child
86381+ * are not guaranteed to succeed, even if read-only
86382+ */
86383+ if (is_vm_hugetlb_page(tmp))
86384+ reset_vma_resv_huge_pages(tmp);
86385+
86386+ return tmp;
86387+
86388+fail_nomem_anon_vma_fork:
86389+ mpol_put(vma_policy(tmp));
86390+fail_nomem_policy:
86391+ kmem_cache_free(vm_area_cachep, tmp);
86392+fail_nomem:
86393+ vm_unacct_memory(charge);
86394+ return NULL;
86395+}
86396+
86397+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86398 {
86399 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
86400 struct rb_node **rb_link, *rb_parent;
86401 int retval;
86402- unsigned long charge;
86403
86404 uprobe_start_dup_mmap();
86405 down_write(&oldmm->mmap_sem);
86406@@ -383,55 +501,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86407
86408 prev = NULL;
86409 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
86410- struct file *file;
86411-
86412 if (mpnt->vm_flags & VM_DONTCOPY) {
86413 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
86414 -vma_pages(mpnt));
86415 continue;
86416 }
86417- charge = 0;
86418- if (mpnt->vm_flags & VM_ACCOUNT) {
86419- unsigned long len = vma_pages(mpnt);
86420-
86421- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
86422- goto fail_nomem;
86423- charge = len;
86424- }
86425- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
86426- if (!tmp)
86427- goto fail_nomem;
86428- *tmp = *mpnt;
86429- INIT_LIST_HEAD(&tmp->anon_vma_chain);
86430- retval = vma_dup_policy(mpnt, tmp);
86431- if (retval)
86432- goto fail_nomem_policy;
86433- tmp->vm_mm = mm;
86434- if (anon_vma_fork(tmp, mpnt))
86435- goto fail_nomem_anon_vma_fork;
86436- tmp->vm_flags &= ~VM_LOCKED;
86437- tmp->vm_next = tmp->vm_prev = NULL;
86438- file = tmp->vm_file;
86439- if (file) {
86440- struct inode *inode = file_inode(file);
86441- struct address_space *mapping = file->f_mapping;
86442-
86443- get_file(file);
86444- if (tmp->vm_flags & VM_DENYWRITE)
86445- atomic_dec(&inode->i_writecount);
86446- mutex_lock(&mapping->i_mmap_mutex);
86447- if (tmp->vm_flags & VM_SHARED)
86448- mapping->i_mmap_writable++;
86449- flush_dcache_mmap_lock(mapping);
86450- /* insert tmp into the share list, just after mpnt */
86451- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
86452- vma_nonlinear_insert(tmp,
86453- &mapping->i_mmap_nonlinear);
86454- else
86455- vma_interval_tree_insert_after(tmp, mpnt,
86456- &mapping->i_mmap);
86457- flush_dcache_mmap_unlock(mapping);
86458- mutex_unlock(&mapping->i_mmap_mutex);
86459+ tmp = dup_vma(mm, oldmm, mpnt);
86460+ if (!tmp) {
86461+ retval = -ENOMEM;
86462+ goto out;
86463 }
86464
86465 /*
86466@@ -463,6 +541,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
86467 if (retval)
86468 goto out;
86469 }
86470+
86471+#ifdef CONFIG_PAX_SEGMEXEC
86472+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
86473+ struct vm_area_struct *mpnt_m;
86474+
86475+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
86476+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
86477+
86478+ if (!mpnt->vm_mirror)
86479+ continue;
86480+
86481+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
86482+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
86483+ mpnt->vm_mirror = mpnt_m;
86484+ } else {
86485+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
86486+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
86487+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
86488+ mpnt->vm_mirror->vm_mirror = mpnt;
86489+ }
86490+ }
86491+ BUG_ON(mpnt_m);
86492+ }
86493+#endif
86494+
86495 /* a new mm has just been created */
86496 arch_dup_mmap(oldmm, mm);
86497 retval = 0;
86498@@ -472,14 +575,6 @@ out:
86499 up_write(&oldmm->mmap_sem);
86500 uprobe_end_dup_mmap();
86501 return retval;
86502-fail_nomem_anon_vma_fork:
86503- mpol_put(vma_policy(tmp));
86504-fail_nomem_policy:
86505- kmem_cache_free(vm_area_cachep, tmp);
86506-fail_nomem:
86507- retval = -ENOMEM;
86508- vm_unacct_memory(charge);
86509- goto out;
86510 }
86511
86512 static inline int mm_alloc_pgd(struct mm_struct *mm)
86513@@ -698,8 +793,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
86514 return ERR_PTR(err);
86515
86516 mm = get_task_mm(task);
86517- if (mm && mm != current->mm &&
86518- !ptrace_may_access(task, mode)) {
86519+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
86520+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
86521 mmput(mm);
86522 mm = ERR_PTR(-EACCES);
86523 }
86524@@ -918,13 +1013,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
86525 spin_unlock(&fs->lock);
86526 return -EAGAIN;
86527 }
86528- fs->users++;
86529+ atomic_inc(&fs->users);
86530 spin_unlock(&fs->lock);
86531 return 0;
86532 }
86533 tsk->fs = copy_fs_struct(fs);
86534 if (!tsk->fs)
86535 return -ENOMEM;
86536+ /* Carry through gr_chroot_dentry and is_chrooted instead
86537+ of recomputing it here. Already copied when the task struct
86538+ is duplicated. This allows pivot_root to not be treated as
86539+ a chroot
86540+ */
86541+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
86542+
86543 return 0;
86544 }
86545
86546@@ -1133,7 +1235,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
86547 * parts of the process environment (as per the clone
86548 * flags). The actual kick-off is left to the caller.
86549 */
86550-static struct task_struct *copy_process(unsigned long clone_flags,
86551+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
86552 unsigned long stack_start,
86553 unsigned long stack_size,
86554 int __user *child_tidptr,
86555@@ -1205,6 +1307,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
86556 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
86557 #endif
86558 retval = -EAGAIN;
86559+
86560+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
86561+
86562 if (atomic_read(&p->real_cred->user->processes) >=
86563 task_rlimit(p, RLIMIT_NPROC)) {
86564 if (p->real_cred->user != INIT_USER &&
86565@@ -1452,6 +1557,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
86566 goto bad_fork_free_pid;
86567 }
86568
86569+ /* synchronizes with gr_set_acls()
86570+ we need to call this past the point of no return for fork()
86571+ */
86572+ gr_copy_label(p);
86573+
86574 if (likely(p->pid)) {
86575 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
86576
86577@@ -1541,6 +1651,8 @@ bad_fork_cleanup_count:
86578 bad_fork_free:
86579 free_task(p);
86580 fork_out:
86581+ gr_log_forkfail(retval);
86582+
86583 return ERR_PTR(retval);
86584 }
86585
86586@@ -1602,6 +1714,7 @@ long do_fork(unsigned long clone_flags,
86587
86588 p = copy_process(clone_flags, stack_start, stack_size,
86589 child_tidptr, NULL, trace);
86590+ add_latent_entropy();
86591 /*
86592 * Do this prior waking up the new thread - the thread pointer
86593 * might get invalid after that point, if the thread exits quickly.
86594@@ -1618,6 +1731,8 @@ long do_fork(unsigned long clone_flags,
86595 if (clone_flags & CLONE_PARENT_SETTID)
86596 put_user(nr, parent_tidptr);
86597
86598+ gr_handle_brute_check();
86599+
86600 if (clone_flags & CLONE_VFORK) {
86601 p->vfork_done = &vfork;
86602 init_completion(&vfork);
86603@@ -1736,7 +1851,7 @@ void __init proc_caches_init(void)
86604 mm_cachep = kmem_cache_create("mm_struct",
86605 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
86606 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
86607- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
86608+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
86609 mmap_init();
86610 nsproxy_cache_init();
86611 }
86612@@ -1776,7 +1891,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
86613 return 0;
86614
86615 /* don't need lock here; in the worst case we'll do useless copy */
86616- if (fs->users == 1)
86617+ if (atomic_read(&fs->users) == 1)
86618 return 0;
86619
86620 *new_fsp = copy_fs_struct(fs);
86621@@ -1883,7 +1998,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
86622 fs = current->fs;
86623 spin_lock(&fs->lock);
86624 current->fs = new_fs;
86625- if (--fs->users)
86626+ gr_set_chroot_entries(current, &current->fs->root);
86627+ if (atomic_dec_return(&fs->users))
86628 new_fs = NULL;
86629 else
86630 new_fs = fs;
86631diff --git a/kernel/futex.c b/kernel/futex.c
86632index de938d2..c566038 100644
86633--- a/kernel/futex.c
86634+++ b/kernel/futex.c
86635@@ -202,7 +202,7 @@ struct futex_pi_state {
86636 atomic_t refcount;
86637
86638 union futex_key key;
86639-};
86640+} __randomize_layout;
86641
86642 /**
86643 * struct futex_q - The hashed futex queue entry, one per waiting task
86644@@ -236,7 +236,7 @@ struct futex_q {
86645 struct rt_mutex_waiter *rt_waiter;
86646 union futex_key *requeue_pi_key;
86647 u32 bitset;
86648-};
86649+} __randomize_layout;
86650
86651 static const struct futex_q futex_q_init = {
86652 /* list gets initialized in queue_me()*/
86653@@ -394,6 +394,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
86654 struct page *page, *page_head;
86655 int err, ro = 0;
86656
86657+#ifdef CONFIG_PAX_SEGMEXEC
86658+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
86659+ return -EFAULT;
86660+#endif
86661+
86662 /*
86663 * The futex address must be "naturally" aligned.
86664 */
86665@@ -593,7 +598,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
86666
86667 static int get_futex_value_locked(u32 *dest, u32 __user *from)
86668 {
86669- int ret;
86670+ unsigned long ret;
86671
86672 pagefault_disable();
86673 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
86674@@ -3033,6 +3038,7 @@ static void __init futex_detect_cmpxchg(void)
86675 {
86676 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
86677 u32 curval;
86678+ mm_segment_t oldfs;
86679
86680 /*
86681 * This will fail and we want it. Some arch implementations do
86682@@ -3044,8 +3050,11 @@ static void __init futex_detect_cmpxchg(void)
86683 * implementation, the non-functional ones will return
86684 * -ENOSYS.
86685 */
86686+ oldfs = get_fs();
86687+ set_fs(USER_DS);
86688 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
86689 futex_cmpxchg_enabled = 1;
86690+ set_fs(oldfs);
86691 #endif
86692 }
86693
86694diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
86695index 55c8c93..9ba7ad6 100644
86696--- a/kernel/futex_compat.c
86697+++ b/kernel/futex_compat.c
86698@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
86699 return 0;
86700 }
86701
86702-static void __user *futex_uaddr(struct robust_list __user *entry,
86703+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
86704 compat_long_t futex_offset)
86705 {
86706 compat_uptr_t base = ptr_to_compat(entry);
86707diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
86708index f45b75b..bfac6d5 100644
86709--- a/kernel/gcov/base.c
86710+++ b/kernel/gcov/base.c
86711@@ -108,11 +108,6 @@ void gcov_enable_events(void)
86712 }
86713
86714 #ifdef CONFIG_MODULES
86715-static inline int within(void *addr, void *start, unsigned long size)
86716-{
86717- return ((addr >= start) && (addr < start + size));
86718-}
86719-
86720 /* Update list and generate events when modules are unloaded. */
86721 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
86722 void *data)
86723@@ -127,7 +122,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
86724
86725 /* Remove entries located in module from linked list. */
86726 while ((info = gcov_info_next(info))) {
86727- if (within(info, mod->module_core, mod->core_size)) {
86728+ if (within_module_core_rw((unsigned long)info, mod)) {
86729 gcov_info_unlink(prev, info);
86730 if (gcov_events_enabled)
86731 gcov_event(GCOV_REMOVE, info);
86732diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
86733index e0501fe..312edd6 100644
86734--- a/kernel/hrtimer.c
86735+++ b/kernel/hrtimer.c
86736@@ -1448,7 +1448,7 @@ void hrtimer_peek_ahead_timers(void)
86737 local_irq_restore(flags);
86738 }
86739
86740-static void run_hrtimer_softirq(struct softirq_action *h)
86741+static __latent_entropy void run_hrtimer_softirq(void)
86742 {
86743 hrtimer_peek_ahead_timers();
86744 }
86745diff --git a/kernel/irq_work.c b/kernel/irq_work.c
86746index a82170e..5b01e7f 100644
86747--- a/kernel/irq_work.c
86748+++ b/kernel/irq_work.c
86749@@ -191,12 +191,13 @@ static int irq_work_cpu_notify(struct notifier_block *self,
86750 return NOTIFY_OK;
86751 }
86752
86753-static struct notifier_block cpu_notify;
86754+static struct notifier_block cpu_notify = {
86755+ .notifier_call = irq_work_cpu_notify,
86756+ .priority = 0,
86757+};
86758
86759 static __init int irq_work_init_cpu_notifier(void)
86760 {
86761- cpu_notify.notifier_call = irq_work_cpu_notify;
86762- cpu_notify.priority = 0;
86763 register_cpu_notifier(&cpu_notify);
86764 return 0;
86765 }
86766diff --git a/kernel/jump_label.c b/kernel/jump_label.c
86767index 9019f15..9a3c42e 100644
86768--- a/kernel/jump_label.c
86769+++ b/kernel/jump_label.c
86770@@ -14,6 +14,7 @@
86771 #include <linux/err.h>
86772 #include <linux/static_key.h>
86773 #include <linux/jump_label_ratelimit.h>
86774+#include <linux/mm.h>
86775
86776 #ifdef HAVE_JUMP_LABEL
86777
86778@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
86779
86780 size = (((unsigned long)stop - (unsigned long)start)
86781 / sizeof(struct jump_entry));
86782+ pax_open_kernel();
86783 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
86784+ pax_close_kernel();
86785 }
86786
86787 static void jump_label_update(struct static_key *key, int enable);
86788@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
86789 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
86790 struct jump_entry *iter;
86791
86792+ pax_open_kernel();
86793 for (iter = iter_start; iter < iter_stop; iter++) {
86794 if (within_module_init(iter->code, mod))
86795 iter->code = 0;
86796 }
86797+ pax_close_kernel();
86798 }
86799
86800 static int
86801diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
86802index cb0cf37..b69e161 100644
86803--- a/kernel/kallsyms.c
86804+++ b/kernel/kallsyms.c
86805@@ -11,6 +11,9 @@
86806 * Changed the compression method from stem compression to "table lookup"
86807 * compression (see scripts/kallsyms.c for a more complete description)
86808 */
86809+#ifdef CONFIG_GRKERNSEC_HIDESYM
86810+#define __INCLUDED_BY_HIDESYM 1
86811+#endif
86812 #include <linux/kallsyms.h>
86813 #include <linux/module.h>
86814 #include <linux/init.h>
86815@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
86816
86817 static inline int is_kernel_inittext(unsigned long addr)
86818 {
86819+ if (system_state != SYSTEM_BOOTING)
86820+ return 0;
86821+
86822 if (addr >= (unsigned long)_sinittext
86823 && addr <= (unsigned long)_einittext)
86824 return 1;
86825 return 0;
86826 }
86827
86828+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
86829+#ifdef CONFIG_MODULES
86830+static inline int is_module_text(unsigned long addr)
86831+{
86832+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
86833+ return 1;
86834+
86835+ addr = ktla_ktva(addr);
86836+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
86837+}
86838+#else
86839+static inline int is_module_text(unsigned long addr)
86840+{
86841+ return 0;
86842+}
86843+#endif
86844+#endif
86845+
86846 static inline int is_kernel_text(unsigned long addr)
86847 {
86848 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
86849@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
86850
86851 static inline int is_kernel(unsigned long addr)
86852 {
86853+
86854+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
86855+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
86856+ return 1;
86857+
86858+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
86859+#else
86860 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
86861+#endif
86862+
86863 return 1;
86864 return in_gate_area_no_mm(addr);
86865 }
86866
86867 static int is_ksym_addr(unsigned long addr)
86868 {
86869+
86870+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
86871+ if (is_module_text(addr))
86872+ return 0;
86873+#endif
86874+
86875 if (all_var)
86876 return is_kernel(addr);
86877
86878@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
86879
86880 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
86881 {
86882- iter->name[0] = '\0';
86883 iter->nameoff = get_symbol_offset(new_pos);
86884 iter->pos = new_pos;
86885 }
86886@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
86887 {
86888 struct kallsym_iter *iter = m->private;
86889
86890+#ifdef CONFIG_GRKERNSEC_HIDESYM
86891+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
86892+ return 0;
86893+#endif
86894+
86895 /* Some debugging symbols have no name. Ignore them. */
86896 if (!iter->name[0])
86897 return 0;
86898@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
86899 */
86900 type = iter->exported ? toupper(iter->type) :
86901 tolower(iter->type);
86902+
86903 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
86904 type, iter->name, iter->module_name);
86905 } else
86906@@ -567,7 +611,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
86907 struct kallsym_iter *iter;
86908 int ret;
86909
86910- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
86911+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
86912 if (!iter)
86913 return -ENOMEM;
86914 reset_iter(iter, 0);
86915diff --git a/kernel/kcmp.c b/kernel/kcmp.c
86916index e30ac0f..3528cac 100644
86917--- a/kernel/kcmp.c
86918+++ b/kernel/kcmp.c
86919@@ -99,6 +99,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
86920 struct task_struct *task1, *task2;
86921 int ret;
86922
86923+#ifdef CONFIG_GRKERNSEC
86924+ return -ENOSYS;
86925+#endif
86926+
86927 rcu_read_lock();
86928
86929 /*
86930diff --git a/kernel/kexec.c b/kernel/kexec.c
86931index 28c5706..bfc8388 100644
86932--- a/kernel/kexec.c
86933+++ b/kernel/kexec.c
86934@@ -1046,7 +1046,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
86935 compat_ulong_t, flags)
86936 {
86937 struct compat_kexec_segment in;
86938- struct kexec_segment out, __user *ksegments;
86939+ struct kexec_segment out;
86940+ struct kexec_segment __user *ksegments;
86941 unsigned long i, result;
86942
86943 /* Don't allow clients that don't understand the native
86944diff --git a/kernel/kmod.c b/kernel/kmod.c
86945index 6b375af..eaff670 100644
86946--- a/kernel/kmod.c
86947+++ b/kernel/kmod.c
86948@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
86949 kfree(info->argv);
86950 }
86951
86952-static int call_modprobe(char *module_name, int wait)
86953+static int call_modprobe(char *module_name, char *module_param, int wait)
86954 {
86955 struct subprocess_info *info;
86956 static char *envp[] = {
86957@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
86958 NULL
86959 };
86960
86961- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
86962+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
86963 if (!argv)
86964 goto out;
86965
86966@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
86967 argv[1] = "-q";
86968 argv[2] = "--";
86969 argv[3] = module_name; /* check free_modprobe_argv() */
86970- argv[4] = NULL;
86971+ argv[4] = module_param;
86972+ argv[5] = NULL;
86973
86974 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
86975 NULL, free_modprobe_argv, NULL);
86976@@ -129,9 +130,8 @@ out:
86977 * If module auto-loading support is disabled then this function
86978 * becomes a no-operation.
86979 */
86980-int __request_module(bool wait, const char *fmt, ...)
86981+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
86982 {
86983- va_list args;
86984 char module_name[MODULE_NAME_LEN];
86985 unsigned int max_modprobes;
86986 int ret;
86987@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
86988 if (!modprobe_path[0])
86989 return 0;
86990
86991- va_start(args, fmt);
86992- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
86993- va_end(args);
86994+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
86995 if (ret >= MODULE_NAME_LEN)
86996 return -ENAMETOOLONG;
86997
86998@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
86999 if (ret)
87000 return ret;
87001
87002+#ifdef CONFIG_GRKERNSEC_MODHARDEN
87003+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
87004+ /* hack to workaround consolekit/udisks stupidity */
87005+ read_lock(&tasklist_lock);
87006+ if (!strcmp(current->comm, "mount") &&
87007+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
87008+ read_unlock(&tasklist_lock);
87009+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
87010+ return -EPERM;
87011+ }
87012+ read_unlock(&tasklist_lock);
87013+ }
87014+#endif
87015+
87016 /* If modprobe needs a service that is in a module, we get a recursive
87017 * loop. Limit the number of running kmod threads to max_threads/2 or
87018 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
87019@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
87020
87021 trace_module_request(module_name, wait, _RET_IP_);
87022
87023- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
87024+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
87025
87026 atomic_dec(&kmod_concurrent);
87027 return ret;
87028 }
87029+
87030+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
87031+{
87032+ va_list args;
87033+ int ret;
87034+
87035+ va_start(args, fmt);
87036+ ret = ____request_module(wait, module_param, fmt, args);
87037+ va_end(args);
87038+
87039+ return ret;
87040+}
87041+
87042+int __request_module(bool wait, const char *fmt, ...)
87043+{
87044+ va_list args;
87045+ int ret;
87046+
87047+#ifdef CONFIG_GRKERNSEC_MODHARDEN
87048+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
87049+ char module_param[MODULE_NAME_LEN];
87050+
87051+ memset(module_param, 0, sizeof(module_param));
87052+
87053+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
87054+
87055+ va_start(args, fmt);
87056+ ret = ____request_module(wait, module_param, fmt, args);
87057+ va_end(args);
87058+
87059+ return ret;
87060+ }
87061+#endif
87062+
87063+ va_start(args, fmt);
87064+ ret = ____request_module(wait, NULL, fmt, args);
87065+ va_end(args);
87066+
87067+ return ret;
87068+}
87069+
87070 EXPORT_SYMBOL(__request_module);
87071 #endif /* CONFIG_MODULES */
87072
87073@@ -218,6 +271,20 @@ static int ____call_usermodehelper(void *data)
87074 */
87075 set_user_nice(current, 0);
87076
87077+#ifdef CONFIG_GRKERNSEC
87078+ /* this is race-free as far as userland is concerned as we copied
87079+ out the path to be used prior to this point and are now operating
87080+ on that copy
87081+ */
87082+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
87083+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
87084+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
87085+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
87086+ retval = -EPERM;
87087+ goto fail;
87088+ }
87089+#endif
87090+
87091 retval = -ENOMEM;
87092 new = prepare_kernel_cred(current);
87093 if (!new)
87094@@ -240,8 +307,8 @@ static int ____call_usermodehelper(void *data)
87095 commit_creds(new);
87096
87097 retval = do_execve(getname_kernel(sub_info->path),
87098- (const char __user *const __user *)sub_info->argv,
87099- (const char __user *const __user *)sub_info->envp);
87100+ (const char __user *const __force_user *)sub_info->argv,
87101+ (const char __user *const __force_user *)sub_info->envp);
87102 if (!retval)
87103 return 0;
87104
87105@@ -260,6 +327,10 @@ static int call_helper(void *data)
87106
87107 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
87108 {
87109+#ifdef CONFIG_GRKERNSEC
87110+ kfree(info->path);
87111+ info->path = info->origpath;
87112+#endif
87113 if (info->cleanup)
87114 (*info->cleanup)(info);
87115 kfree(info);
87116@@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
87117 *
87118 * Thus the __user pointer cast is valid here.
87119 */
87120- sys_wait4(pid, (int __user *)&ret, 0, NULL);
87121+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
87122
87123 /*
87124 * If ret is 0, either ____call_usermodehelper failed and the
87125@@ -542,7 +613,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
87126 goto out;
87127
87128 INIT_WORK(&sub_info->work, __call_usermodehelper);
87129+#ifdef CONFIG_GRKERNSEC
87130+ sub_info->origpath = path;
87131+ sub_info->path = kstrdup(path, gfp_mask);
87132+#else
87133 sub_info->path = path;
87134+#endif
87135 sub_info->argv = argv;
87136 sub_info->envp = envp;
87137
87138@@ -650,7 +726,7 @@ EXPORT_SYMBOL(call_usermodehelper);
87139 static int proc_cap_handler(struct ctl_table *table, int write,
87140 void __user *buffer, size_t *lenp, loff_t *ppos)
87141 {
87142- struct ctl_table t;
87143+ ctl_table_no_const t;
87144 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
87145 kernel_cap_t new_cap;
87146 int err, i;
87147diff --git a/kernel/kprobes.c b/kernel/kprobes.c
87148index ceeadfc..11c18b6 100644
87149--- a/kernel/kprobes.c
87150+++ b/kernel/kprobes.c
87151@@ -31,6 +31,9 @@
87152 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
87153 * <prasanna@in.ibm.com> added function-return probes.
87154 */
87155+#ifdef CONFIG_GRKERNSEC_HIDESYM
87156+#define __INCLUDED_BY_HIDESYM 1
87157+#endif
87158 #include <linux/kprobes.h>
87159 #include <linux/hash.h>
87160 #include <linux/init.h>
87161@@ -135,12 +138,12 @@ enum kprobe_slot_state {
87162
87163 static void *alloc_insn_page(void)
87164 {
87165- return module_alloc(PAGE_SIZE);
87166+ return module_alloc_exec(PAGE_SIZE);
87167 }
87168
87169 static void free_insn_page(void *page)
87170 {
87171- module_free(NULL, page);
87172+ module_free_exec(NULL, page);
87173 }
87174
87175 struct kprobe_insn_cache kprobe_insn_slots = {
87176@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
87177 kprobe_type = "k";
87178
87179 if (sym)
87180- seq_printf(pi, "%p %s %s+0x%x %s ",
87181+ seq_printf(pi, "%pK %s %s+0x%x %s ",
87182 p->addr, kprobe_type, sym, offset,
87183 (modname ? modname : " "));
87184 else
87185- seq_printf(pi, "%p %s %p ",
87186+ seq_printf(pi, "%pK %s %pK ",
87187 p->addr, kprobe_type, p->addr);
87188
87189 if (!pp)
87190diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
87191index 2495a9b..071b906 100644
87192--- a/kernel/ksysfs.c
87193+++ b/kernel/ksysfs.c
87194@@ -49,6 +49,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
87195 {
87196 if (count+1 > UEVENT_HELPER_PATH_LEN)
87197 return -ENOENT;
87198+ if (!capable(CAP_SYS_ADMIN))
87199+ return -EPERM;
87200 memcpy(uevent_helper, buf, count);
87201 uevent_helper[count] = '\0';
87202 if (count && uevent_helper[count-1] == '\n')
87203@@ -175,7 +177,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
87204 return count;
87205 }
87206
87207-static struct bin_attribute notes_attr = {
87208+static bin_attribute_no_const notes_attr __read_only = {
87209 .attr = {
87210 .name = "notes",
87211 .mode = S_IRUGO,
87212diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
87213index d24e433..fa04fb8 100644
87214--- a/kernel/locking/lockdep.c
87215+++ b/kernel/locking/lockdep.c
87216@@ -597,6 +597,10 @@ static int static_obj(void *obj)
87217 end = (unsigned long) &_end,
87218 addr = (unsigned long) obj;
87219
87220+#ifdef CONFIG_PAX_KERNEXEC
87221+ start = ktla_ktva(start);
87222+#endif
87223+
87224 /*
87225 * static variable?
87226 */
87227@@ -738,6 +742,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
87228 if (!static_obj(lock->key)) {
87229 debug_locks_off();
87230 printk("INFO: trying to register non-static key.\n");
87231+ printk("lock:%pS key:%pS.\n", lock, lock->key);
87232 printk("the code is fine but needs lockdep annotation.\n");
87233 printk("turning off the locking correctness validator.\n");
87234 dump_stack();
87235@@ -3079,7 +3084,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
87236 if (!class)
87237 return 0;
87238 }
87239- atomic_inc((atomic_t *)&class->ops);
87240+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
87241 if (very_verbose(class)) {
87242 printk("\nacquire class [%p] %s", class->key, class->name);
87243 if (class->name_version > 1)
87244diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
87245index ef43ac4..2720dfa 100644
87246--- a/kernel/locking/lockdep_proc.c
87247+++ b/kernel/locking/lockdep_proc.c
87248@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
87249 return 0;
87250 }
87251
87252- seq_printf(m, "%p", class->key);
87253+ seq_printf(m, "%pK", class->key);
87254 #ifdef CONFIG_DEBUG_LOCKDEP
87255 seq_printf(m, " OPS:%8ld", class->ops);
87256 #endif
87257@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
87258
87259 list_for_each_entry(entry, &class->locks_after, entry) {
87260 if (entry->distance == 1) {
87261- seq_printf(m, " -> [%p] ", entry->class->key);
87262+ seq_printf(m, " -> [%pK] ", entry->class->key);
87263 print_name(m, entry->class);
87264 seq_puts(m, "\n");
87265 }
87266@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
87267 if (!class->key)
87268 continue;
87269
87270- seq_printf(m, "[%p] ", class->key);
87271+ seq_printf(m, "[%pK] ", class->key);
87272 print_name(m, class);
87273 seq_puts(m, "\n");
87274 }
87275@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
87276 if (!i)
87277 seq_line(m, '-', 40-namelen, namelen);
87278
87279- snprintf(ip, sizeof(ip), "[<%p>]",
87280+ snprintf(ip, sizeof(ip), "[<%pK>]",
87281 (void *)class->contention_point[i]);
87282 seq_printf(m, "%40s %14lu %29s %pS\n",
87283 name, stats->contention_point[i],
87284@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
87285 if (!i)
87286 seq_line(m, '-', 40-namelen, namelen);
87287
87288- snprintf(ip, sizeof(ip), "[<%p>]",
87289+ snprintf(ip, sizeof(ip), "[<%pK>]",
87290 (void *)class->contending_point[i]);
87291 seq_printf(m, "%40s %14lu %29s %pS\n",
87292 name, stats->contending_point[i],
87293diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
87294index 838dc9e..760e158 100644
87295--- a/kernel/locking/mcs_spinlock.c
87296+++ b/kernel/locking/mcs_spinlock.c
87297@@ -71,7 +71,7 @@ bool osq_lock(struct optimistic_spin_queue **lock)
87298 if (likely(prev == NULL))
87299 return true;
87300
87301- ACCESS_ONCE(prev->next) = node;
87302+ ACCESS_ONCE_RW(prev->next) = node;
87303
87304 /*
87305 * Normally @prev is untouchable after the above store; because at that
87306@@ -143,8 +143,8 @@ unqueue:
87307 * it will wait in Step-A.
87308 */
87309
87310- ACCESS_ONCE(next->prev) = prev;
87311- ACCESS_ONCE(prev->next) = next;
87312+ ACCESS_ONCE_RW(next->prev) = prev;
87313+ ACCESS_ONCE_RW(prev->next) = next;
87314
87315 return false;
87316 }
87317@@ -165,13 +165,13 @@ void osq_unlock(struct optimistic_spin_queue **lock)
87318 */
87319 next = xchg(&node->next, NULL);
87320 if (next) {
87321- ACCESS_ONCE(next->locked) = 1;
87322+ ACCESS_ONCE_RW(next->locked) = 1;
87323 return;
87324 }
87325
87326 next = osq_wait_next(lock, node, NULL);
87327 if (next)
87328- ACCESS_ONCE(next->locked) = 1;
87329+ ACCESS_ONCE_RW(next->locked) = 1;
87330 }
87331
87332 #endif
87333diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
87334index a2dbac4..e02a34a 100644
87335--- a/kernel/locking/mcs_spinlock.h
87336+++ b/kernel/locking/mcs_spinlock.h
87337@@ -81,7 +81,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
87338 */
87339 return;
87340 }
87341- ACCESS_ONCE(prev->next) = node;
87342+ ACCESS_ONCE_RW(prev->next) = node;
87343
87344 /* Wait until the lock holder passes the lock down. */
87345 arch_mcs_spin_lock_contended(&node->locked);
87346diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
87347index 5cf6731..ce3bc5a 100644
87348--- a/kernel/locking/mutex-debug.c
87349+++ b/kernel/locking/mutex-debug.c
87350@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
87351 }
87352
87353 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
87354- struct thread_info *ti)
87355+ struct task_struct *task)
87356 {
87357 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
87358
87359 /* Mark the current thread as blocked on the lock: */
87360- ti->task->blocked_on = waiter;
87361+ task->blocked_on = waiter;
87362 }
87363
87364 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
87365- struct thread_info *ti)
87366+ struct task_struct *task)
87367 {
87368 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
87369- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
87370- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
87371- ti->task->blocked_on = NULL;
87372+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
87373+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
87374+ task->blocked_on = NULL;
87375
87376 list_del_init(&waiter->list);
87377 waiter->task = NULL;
87378diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
87379index 0799fd3..d06ae3b 100644
87380--- a/kernel/locking/mutex-debug.h
87381+++ b/kernel/locking/mutex-debug.h
87382@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
87383 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
87384 extern void debug_mutex_add_waiter(struct mutex *lock,
87385 struct mutex_waiter *waiter,
87386- struct thread_info *ti);
87387+ struct task_struct *task);
87388 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
87389- struct thread_info *ti);
87390+ struct task_struct *task);
87391 extern void debug_mutex_unlock(struct mutex *lock);
87392 extern void debug_mutex_init(struct mutex *lock, const char *name,
87393 struct lock_class_key *key);
87394diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
87395index bc73d33..6f308aa 100644
87396--- a/kernel/locking/mutex.c
87397+++ b/kernel/locking/mutex.c
87398@@ -490,7 +490,7 @@ slowpath:
87399 goto skip_wait;
87400
87401 debug_mutex_lock_common(lock, &waiter);
87402- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
87403+ debug_mutex_add_waiter(lock, &waiter, task);
87404
87405 /* add waiting tasks to the end of the waitqueue (FIFO): */
87406 list_add_tail(&waiter.list, &lock->wait_list);
87407@@ -534,7 +534,7 @@ slowpath:
87408 schedule_preempt_disabled();
87409 spin_lock_mutex(&lock->wait_lock, flags);
87410 }
87411- mutex_remove_waiter(lock, &waiter, current_thread_info());
87412+ mutex_remove_waiter(lock, &waiter, task);
87413 /* set it to 0 if there are no waiters left: */
87414 if (likely(list_empty(&lock->wait_list)))
87415 atomic_set(&lock->count, 0);
87416@@ -571,7 +571,7 @@ skip_wait:
87417 return 0;
87418
87419 err:
87420- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
87421+ mutex_remove_waiter(lock, &waiter, task);
87422 spin_unlock_mutex(&lock->wait_lock, flags);
87423 debug_mutex_free_waiter(&waiter);
87424 mutex_release(&lock->dep_map, 1, ip);
87425diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
87426index 1d96dd0..994ff19 100644
87427--- a/kernel/locking/rtmutex-tester.c
87428+++ b/kernel/locking/rtmutex-tester.c
87429@@ -22,7 +22,7 @@
87430 #define MAX_RT_TEST_MUTEXES 8
87431
87432 static spinlock_t rttest_lock;
87433-static atomic_t rttest_event;
87434+static atomic_unchecked_t rttest_event;
87435
87436 struct test_thread_data {
87437 int opcode;
87438@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87439
87440 case RTTEST_LOCKCONT:
87441 td->mutexes[td->opdata] = 1;
87442- td->event = atomic_add_return(1, &rttest_event);
87443+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87444 return 0;
87445
87446 case RTTEST_RESET:
87447@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87448 return 0;
87449
87450 case RTTEST_RESETEVENT:
87451- atomic_set(&rttest_event, 0);
87452+ atomic_set_unchecked(&rttest_event, 0);
87453 return 0;
87454
87455 default:
87456@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87457 return ret;
87458
87459 td->mutexes[id] = 1;
87460- td->event = atomic_add_return(1, &rttest_event);
87461+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87462 rt_mutex_lock(&mutexes[id]);
87463- td->event = atomic_add_return(1, &rttest_event);
87464+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87465 td->mutexes[id] = 4;
87466 return 0;
87467
87468@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87469 return ret;
87470
87471 td->mutexes[id] = 1;
87472- td->event = atomic_add_return(1, &rttest_event);
87473+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87474 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
87475- td->event = atomic_add_return(1, &rttest_event);
87476+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87477 td->mutexes[id] = ret ? 0 : 4;
87478 return ret ? -EINTR : 0;
87479
87480@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
87481 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
87482 return ret;
87483
87484- td->event = atomic_add_return(1, &rttest_event);
87485+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87486 rt_mutex_unlock(&mutexes[id]);
87487- td->event = atomic_add_return(1, &rttest_event);
87488+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87489 td->mutexes[id] = 0;
87490 return 0;
87491
87492@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87493 break;
87494
87495 td->mutexes[dat] = 2;
87496- td->event = atomic_add_return(1, &rttest_event);
87497+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87498 break;
87499
87500 default:
87501@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87502 return;
87503
87504 td->mutexes[dat] = 3;
87505- td->event = atomic_add_return(1, &rttest_event);
87506+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87507 break;
87508
87509 case RTTEST_LOCKNOWAIT:
87510@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
87511 return;
87512
87513 td->mutexes[dat] = 1;
87514- td->event = atomic_add_return(1, &rttest_event);
87515+ td->event = atomic_add_return_unchecked(1, &rttest_event);
87516 return;
87517
87518 default:
87519diff --git a/kernel/module.c b/kernel/module.c
87520index 079c461..741f79c 100644
87521--- a/kernel/module.c
87522+++ b/kernel/module.c
87523@@ -61,6 +61,7 @@
87524 #include <linux/pfn.h>
87525 #include <linux/bsearch.h>
87526 #include <linux/fips.h>
87527+#include <linux/grsecurity.h>
87528 #include <uapi/linux/module.h>
87529 #include "module-internal.h"
87530
87531@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
87532
87533 /* Bounds of module allocation, for speeding __module_address.
87534 * Protected by module_mutex. */
87535-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
87536+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
87537+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
87538
87539 int register_module_notifier(struct notifier_block * nb)
87540 {
87541@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
87542 return true;
87543
87544 list_for_each_entry_rcu(mod, &modules, list) {
87545- struct symsearch arr[] = {
87546+ struct symsearch modarr[] = {
87547 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
87548 NOT_GPL_ONLY, false },
87549 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
87550@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
87551 if (mod->state == MODULE_STATE_UNFORMED)
87552 continue;
87553
87554- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
87555+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
87556 return true;
87557 }
87558 return false;
87559@@ -489,7 +491,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
87560 if (!pcpusec->sh_size)
87561 return 0;
87562
87563- if (align > PAGE_SIZE) {
87564+ if (align-1 >= PAGE_SIZE) {
87565 pr_warn("%s: per-cpu alignment %li > %li\n",
87566 mod->name, align, PAGE_SIZE);
87567 align = PAGE_SIZE;
87568@@ -1061,7 +1063,7 @@ struct module_attribute module_uevent =
87569 static ssize_t show_coresize(struct module_attribute *mattr,
87570 struct module_kobject *mk, char *buffer)
87571 {
87572- return sprintf(buffer, "%u\n", mk->mod->core_size);
87573+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
87574 }
87575
87576 static struct module_attribute modinfo_coresize =
87577@@ -1070,7 +1072,7 @@ static struct module_attribute modinfo_coresize =
87578 static ssize_t show_initsize(struct module_attribute *mattr,
87579 struct module_kobject *mk, char *buffer)
87580 {
87581- return sprintf(buffer, "%u\n", mk->mod->init_size);
87582+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
87583 }
87584
87585 static struct module_attribute modinfo_initsize =
87586@@ -1162,12 +1164,29 @@ static int check_version(Elf_Shdr *sechdrs,
87587 goto bad_version;
87588 }
87589
87590+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87591+ /*
87592+ * avoid potentially printing jibberish on attempted load
87593+ * of a module randomized with a different seed
87594+ */
87595+ pr_warn("no symbol version for %s\n", symname);
87596+#else
87597 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
87598+#endif
87599 return 0;
87600
87601 bad_version:
87602+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87603+ /*
87604+ * avoid potentially printing jibberish on attempted load
87605+ * of a module randomized with a different seed
87606+ */
87607+ printk("attempted module disagrees about version of symbol %s\n",
87608+ symname);
87609+#else
87610 printk("%s: disagrees about version of symbol %s\n",
87611 mod->name, symname);
87612+#endif
87613 return 0;
87614 }
87615
87616@@ -1283,7 +1302,7 @@ resolve_symbol_wait(struct module *mod,
87617 */
87618 #ifdef CONFIG_SYSFS
87619
87620-#ifdef CONFIG_KALLSYMS
87621+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
87622 static inline bool sect_empty(const Elf_Shdr *sect)
87623 {
87624 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
87625@@ -1423,7 +1442,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
87626 {
87627 unsigned int notes, loaded, i;
87628 struct module_notes_attrs *notes_attrs;
87629- struct bin_attribute *nattr;
87630+ bin_attribute_no_const *nattr;
87631
87632 /* failed to create section attributes, so can't create notes */
87633 if (!mod->sect_attrs)
87634@@ -1535,7 +1554,7 @@ static void del_usage_links(struct module *mod)
87635 static int module_add_modinfo_attrs(struct module *mod)
87636 {
87637 struct module_attribute *attr;
87638- struct module_attribute *temp_attr;
87639+ module_attribute_no_const *temp_attr;
87640 int error = 0;
87641 int i;
87642
87643@@ -1756,21 +1775,21 @@ static void set_section_ro_nx(void *base,
87644
87645 static void unset_module_core_ro_nx(struct module *mod)
87646 {
87647- set_page_attributes(mod->module_core + mod->core_text_size,
87648- mod->module_core + mod->core_size,
87649+ set_page_attributes(mod->module_core_rw,
87650+ mod->module_core_rw + mod->core_size_rw,
87651 set_memory_x);
87652- set_page_attributes(mod->module_core,
87653- mod->module_core + mod->core_ro_size,
87654+ set_page_attributes(mod->module_core_rx,
87655+ mod->module_core_rx + mod->core_size_rx,
87656 set_memory_rw);
87657 }
87658
87659 static void unset_module_init_ro_nx(struct module *mod)
87660 {
87661- set_page_attributes(mod->module_init + mod->init_text_size,
87662- mod->module_init + mod->init_size,
87663+ set_page_attributes(mod->module_init_rw,
87664+ mod->module_init_rw + mod->init_size_rw,
87665 set_memory_x);
87666- set_page_attributes(mod->module_init,
87667- mod->module_init + mod->init_ro_size,
87668+ set_page_attributes(mod->module_init_rx,
87669+ mod->module_init_rx + mod->init_size_rx,
87670 set_memory_rw);
87671 }
87672
87673@@ -1783,14 +1802,14 @@ void set_all_modules_text_rw(void)
87674 list_for_each_entry_rcu(mod, &modules, list) {
87675 if (mod->state == MODULE_STATE_UNFORMED)
87676 continue;
87677- if ((mod->module_core) && (mod->core_text_size)) {
87678- set_page_attributes(mod->module_core,
87679- mod->module_core + mod->core_text_size,
87680+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
87681+ set_page_attributes(mod->module_core_rx,
87682+ mod->module_core_rx + mod->core_size_rx,
87683 set_memory_rw);
87684 }
87685- if ((mod->module_init) && (mod->init_text_size)) {
87686- set_page_attributes(mod->module_init,
87687- mod->module_init + mod->init_text_size,
87688+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
87689+ set_page_attributes(mod->module_init_rx,
87690+ mod->module_init_rx + mod->init_size_rx,
87691 set_memory_rw);
87692 }
87693 }
87694@@ -1806,14 +1825,14 @@ void set_all_modules_text_ro(void)
87695 list_for_each_entry_rcu(mod, &modules, list) {
87696 if (mod->state == MODULE_STATE_UNFORMED)
87697 continue;
87698- if ((mod->module_core) && (mod->core_text_size)) {
87699- set_page_attributes(mod->module_core,
87700- mod->module_core + mod->core_text_size,
87701+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
87702+ set_page_attributes(mod->module_core_rx,
87703+ mod->module_core_rx + mod->core_size_rx,
87704 set_memory_ro);
87705 }
87706- if ((mod->module_init) && (mod->init_text_size)) {
87707- set_page_attributes(mod->module_init,
87708- mod->module_init + mod->init_text_size,
87709+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
87710+ set_page_attributes(mod->module_init_rx,
87711+ mod->module_init_rx + mod->init_size_rx,
87712 set_memory_ro);
87713 }
87714 }
87715@@ -1864,16 +1883,19 @@ static void free_module(struct module *mod)
87716
87717 /* This may be NULL, but that's OK */
87718 unset_module_init_ro_nx(mod);
87719- module_free(mod, mod->module_init);
87720+ module_free(mod, mod->module_init_rw);
87721+ module_free_exec(mod, mod->module_init_rx);
87722 kfree(mod->args);
87723 percpu_modfree(mod);
87724
87725 /* Free lock-classes: */
87726- lockdep_free_key_range(mod->module_core, mod->core_size);
87727+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
87728+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
87729
87730 /* Finally, free the core (containing the module structure) */
87731 unset_module_core_ro_nx(mod);
87732- module_free(mod, mod->module_core);
87733+ module_free_exec(mod, mod->module_core_rx);
87734+ module_free(mod, mod->module_core_rw);
87735
87736 #ifdef CONFIG_MPU
87737 update_protections(current->mm);
87738@@ -1942,9 +1964,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87739 int ret = 0;
87740 const struct kernel_symbol *ksym;
87741
87742+#ifdef CONFIG_GRKERNSEC_MODHARDEN
87743+ int is_fs_load = 0;
87744+ int register_filesystem_found = 0;
87745+ char *p;
87746+
87747+ p = strstr(mod->args, "grsec_modharden_fs");
87748+ if (p) {
87749+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
87750+ /* copy \0 as well */
87751+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
87752+ is_fs_load = 1;
87753+ }
87754+#endif
87755+
87756 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
87757 const char *name = info->strtab + sym[i].st_name;
87758
87759+#ifdef CONFIG_GRKERNSEC_MODHARDEN
87760+ /* it's a real shame this will never get ripped and copied
87761+ upstream! ;(
87762+ */
87763+ if (is_fs_load && !strcmp(name, "register_filesystem"))
87764+ register_filesystem_found = 1;
87765+#endif
87766+
87767 switch (sym[i].st_shndx) {
87768 case SHN_COMMON:
87769 /* Ignore common symbols */
87770@@ -1969,7 +2013,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87771 ksym = resolve_symbol_wait(mod, info, name);
87772 /* Ok if resolved. */
87773 if (ksym && !IS_ERR(ksym)) {
87774+ pax_open_kernel();
87775 sym[i].st_value = ksym->value;
87776+ pax_close_kernel();
87777 break;
87778 }
87779
87780@@ -1988,11 +2034,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
87781 secbase = (unsigned long)mod_percpu(mod);
87782 else
87783 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
87784+ pax_open_kernel();
87785 sym[i].st_value += secbase;
87786+ pax_close_kernel();
87787 break;
87788 }
87789 }
87790
87791+#ifdef CONFIG_GRKERNSEC_MODHARDEN
87792+ if (is_fs_load && !register_filesystem_found) {
87793+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
87794+ ret = -EPERM;
87795+ }
87796+#endif
87797+
87798 return ret;
87799 }
87800
87801@@ -2076,22 +2131,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
87802 || s->sh_entsize != ~0UL
87803 || strstarts(sname, ".init"))
87804 continue;
87805- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
87806+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
87807+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
87808+ else
87809+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
87810 pr_debug("\t%s\n", sname);
87811 }
87812- switch (m) {
87813- case 0: /* executable */
87814- mod->core_size = debug_align(mod->core_size);
87815- mod->core_text_size = mod->core_size;
87816- break;
87817- case 1: /* RO: text and ro-data */
87818- mod->core_size = debug_align(mod->core_size);
87819- mod->core_ro_size = mod->core_size;
87820- break;
87821- case 3: /* whole core */
87822- mod->core_size = debug_align(mod->core_size);
87823- break;
87824- }
87825 }
87826
87827 pr_debug("Init section allocation order:\n");
87828@@ -2105,23 +2150,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
87829 || s->sh_entsize != ~0UL
87830 || !strstarts(sname, ".init"))
87831 continue;
87832- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
87833- | INIT_OFFSET_MASK);
87834+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
87835+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
87836+ else
87837+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
87838+ s->sh_entsize |= INIT_OFFSET_MASK;
87839 pr_debug("\t%s\n", sname);
87840 }
87841- switch (m) {
87842- case 0: /* executable */
87843- mod->init_size = debug_align(mod->init_size);
87844- mod->init_text_size = mod->init_size;
87845- break;
87846- case 1: /* RO: text and ro-data */
87847- mod->init_size = debug_align(mod->init_size);
87848- mod->init_ro_size = mod->init_size;
87849- break;
87850- case 3: /* whole init */
87851- mod->init_size = debug_align(mod->init_size);
87852- break;
87853- }
87854 }
87855 }
87856
87857@@ -2294,7 +2329,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
87858
87859 /* Put symbol section at end of init part of module. */
87860 symsect->sh_flags |= SHF_ALLOC;
87861- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
87862+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
87863 info->index.sym) | INIT_OFFSET_MASK;
87864 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
87865
87866@@ -2311,13 +2346,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
87867 }
87868
87869 /* Append room for core symbols at end of core part. */
87870- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
87871- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
87872- mod->core_size += strtab_size;
87873+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
87874+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
87875+ mod->core_size_rx += strtab_size;
87876
87877 /* Put string table section at end of init part of module. */
87878 strsect->sh_flags |= SHF_ALLOC;
87879- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
87880+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
87881 info->index.str) | INIT_OFFSET_MASK;
87882 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
87883 }
87884@@ -2335,12 +2370,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
87885 /* Make sure we get permanent strtab: don't use info->strtab. */
87886 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
87887
87888+ pax_open_kernel();
87889+
87890 /* Set types up while we still have access to sections. */
87891 for (i = 0; i < mod->num_symtab; i++)
87892 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
87893
87894- mod->core_symtab = dst = mod->module_core + info->symoffs;
87895- mod->core_strtab = s = mod->module_core + info->stroffs;
87896+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
87897+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
87898 src = mod->symtab;
87899 for (ndst = i = 0; i < mod->num_symtab; i++) {
87900 if (i == 0 ||
87901@@ -2352,6 +2389,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
87902 }
87903 }
87904 mod->core_num_syms = ndst;
87905+
87906+ pax_close_kernel();
87907 }
87908 #else
87909 static inline void layout_symtab(struct module *mod, struct load_info *info)
87910@@ -2385,17 +2424,33 @@ void * __weak module_alloc(unsigned long size)
87911 return vmalloc_exec(size);
87912 }
87913
87914-static void *module_alloc_update_bounds(unsigned long size)
87915+static void *module_alloc_update_bounds_rw(unsigned long size)
87916 {
87917 void *ret = module_alloc(size);
87918
87919 if (ret) {
87920 mutex_lock(&module_mutex);
87921 /* Update module bounds. */
87922- if ((unsigned long)ret < module_addr_min)
87923- module_addr_min = (unsigned long)ret;
87924- if ((unsigned long)ret + size > module_addr_max)
87925- module_addr_max = (unsigned long)ret + size;
87926+ if ((unsigned long)ret < module_addr_min_rw)
87927+ module_addr_min_rw = (unsigned long)ret;
87928+ if ((unsigned long)ret + size > module_addr_max_rw)
87929+ module_addr_max_rw = (unsigned long)ret + size;
87930+ mutex_unlock(&module_mutex);
87931+ }
87932+ return ret;
87933+}
87934+
87935+static void *module_alloc_update_bounds_rx(unsigned long size)
87936+{
87937+ void *ret = module_alloc_exec(size);
87938+
87939+ if (ret) {
87940+ mutex_lock(&module_mutex);
87941+ /* Update module bounds. */
87942+ if ((unsigned long)ret < module_addr_min_rx)
87943+ module_addr_min_rx = (unsigned long)ret;
87944+ if ((unsigned long)ret + size > module_addr_max_rx)
87945+ module_addr_max_rx = (unsigned long)ret + size;
87946 mutex_unlock(&module_mutex);
87947 }
87948 return ret;
87949@@ -2652,7 +2707,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
87950 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
87951
87952 if (info->index.sym == 0) {
87953+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
87954+ /*
87955+ * avoid potentially printing jibberish on attempted load
87956+ * of a module randomized with a different seed
87957+ */
87958+ pr_warn("module has no symbols (stripped?)\n");
87959+#else
87960 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
87961+#endif
87962 return ERR_PTR(-ENOEXEC);
87963 }
87964
87965@@ -2668,8 +2731,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
87966 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
87967 {
87968 const char *modmagic = get_modinfo(info, "vermagic");
87969+ const char *license = get_modinfo(info, "license");
87970 int err;
87971
87972+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
87973+ if (!license || !license_is_gpl_compatible(license))
87974+ return -ENOEXEC;
87975+#endif
87976+
87977 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
87978 modmagic = NULL;
87979
87980@@ -2694,7 +2763,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
87981 }
87982
87983 /* Set up license info based on the info section */
87984- set_license(mod, get_modinfo(info, "license"));
87985+ set_license(mod, license);
87986
87987 return 0;
87988 }
87989@@ -2788,7 +2857,7 @@ static int move_module(struct module *mod, struct load_info *info)
87990 void *ptr;
87991
87992 /* Do the allocs. */
87993- ptr = module_alloc_update_bounds(mod->core_size);
87994+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
87995 /*
87996 * The pointer to this block is stored in the module structure
87997 * which is inside the block. Just mark it as not being a
87998@@ -2798,11 +2867,11 @@ static int move_module(struct module *mod, struct load_info *info)
87999 if (!ptr)
88000 return -ENOMEM;
88001
88002- memset(ptr, 0, mod->core_size);
88003- mod->module_core = ptr;
88004+ memset(ptr, 0, mod->core_size_rw);
88005+ mod->module_core_rw = ptr;
88006
88007- if (mod->init_size) {
88008- ptr = module_alloc_update_bounds(mod->init_size);
88009+ if (mod->init_size_rw) {
88010+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
88011 /*
88012 * The pointer to this block is stored in the module structure
88013 * which is inside the block. This block doesn't need to be
88014@@ -2811,13 +2880,45 @@ static int move_module(struct module *mod, struct load_info *info)
88015 */
88016 kmemleak_ignore(ptr);
88017 if (!ptr) {
88018- module_free(mod, mod->module_core);
88019+ module_free(mod, mod->module_core_rw);
88020 return -ENOMEM;
88021 }
88022- memset(ptr, 0, mod->init_size);
88023- mod->module_init = ptr;
88024+ memset(ptr, 0, mod->init_size_rw);
88025+ mod->module_init_rw = ptr;
88026 } else
88027- mod->module_init = NULL;
88028+ mod->module_init_rw = NULL;
88029+
88030+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
88031+ kmemleak_not_leak(ptr);
88032+ if (!ptr) {
88033+ if (mod->module_init_rw)
88034+ module_free(mod, mod->module_init_rw);
88035+ module_free(mod, mod->module_core_rw);
88036+ return -ENOMEM;
88037+ }
88038+
88039+ pax_open_kernel();
88040+ memset(ptr, 0, mod->core_size_rx);
88041+ pax_close_kernel();
88042+ mod->module_core_rx = ptr;
88043+
88044+ if (mod->init_size_rx) {
88045+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
88046+ kmemleak_ignore(ptr);
88047+ if (!ptr && mod->init_size_rx) {
88048+ module_free_exec(mod, mod->module_core_rx);
88049+ if (mod->module_init_rw)
88050+ module_free(mod, mod->module_init_rw);
88051+ module_free(mod, mod->module_core_rw);
88052+ return -ENOMEM;
88053+ }
88054+
88055+ pax_open_kernel();
88056+ memset(ptr, 0, mod->init_size_rx);
88057+ pax_close_kernel();
88058+ mod->module_init_rx = ptr;
88059+ } else
88060+ mod->module_init_rx = NULL;
88061
88062 /* Transfer each section which specifies SHF_ALLOC */
88063 pr_debug("final section addresses:\n");
88064@@ -2828,16 +2929,45 @@ static int move_module(struct module *mod, struct load_info *info)
88065 if (!(shdr->sh_flags & SHF_ALLOC))
88066 continue;
88067
88068- if (shdr->sh_entsize & INIT_OFFSET_MASK)
88069- dest = mod->module_init
88070- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
88071- else
88072- dest = mod->module_core + shdr->sh_entsize;
88073+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
88074+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
88075+ dest = mod->module_init_rw
88076+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
88077+ else
88078+ dest = mod->module_init_rx
88079+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
88080+ } else {
88081+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
88082+ dest = mod->module_core_rw + shdr->sh_entsize;
88083+ else
88084+ dest = mod->module_core_rx + shdr->sh_entsize;
88085+ }
88086+
88087+ if (shdr->sh_type != SHT_NOBITS) {
88088+
88089+#ifdef CONFIG_PAX_KERNEXEC
88090+#ifdef CONFIG_X86_64
88091+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
88092+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
88093+#endif
88094+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
88095+ pax_open_kernel();
88096+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
88097+ pax_close_kernel();
88098+ } else
88099+#endif
88100
88101- if (shdr->sh_type != SHT_NOBITS)
88102 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
88103+ }
88104 /* Update sh_addr to point to copy in image. */
88105- shdr->sh_addr = (unsigned long)dest;
88106+
88107+#ifdef CONFIG_PAX_KERNEXEC
88108+ if (shdr->sh_flags & SHF_EXECINSTR)
88109+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
88110+ else
88111+#endif
88112+
88113+ shdr->sh_addr = (unsigned long)dest;
88114 pr_debug("\t0x%lx %s\n",
88115 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
88116 }
88117@@ -2894,12 +3024,12 @@ static void flush_module_icache(const struct module *mod)
88118 * Do it before processing of module parameters, so the module
88119 * can provide parameter accessor functions of its own.
88120 */
88121- if (mod->module_init)
88122- flush_icache_range((unsigned long)mod->module_init,
88123- (unsigned long)mod->module_init
88124- + mod->init_size);
88125- flush_icache_range((unsigned long)mod->module_core,
88126- (unsigned long)mod->module_core + mod->core_size);
88127+ if (mod->module_init_rx)
88128+ flush_icache_range((unsigned long)mod->module_init_rx,
88129+ (unsigned long)mod->module_init_rx
88130+ + mod->init_size_rx);
88131+ flush_icache_range((unsigned long)mod->module_core_rx,
88132+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
88133
88134 set_fs(old_fs);
88135 }
88136@@ -2956,8 +3086,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
88137 static void module_deallocate(struct module *mod, struct load_info *info)
88138 {
88139 percpu_modfree(mod);
88140- module_free(mod, mod->module_init);
88141- module_free(mod, mod->module_core);
88142+ module_free_exec(mod, mod->module_init_rx);
88143+ module_free_exec(mod, mod->module_core_rx);
88144+ module_free(mod, mod->module_init_rw);
88145+ module_free(mod, mod->module_core_rw);
88146 }
88147
88148 int __weak module_finalize(const Elf_Ehdr *hdr,
88149@@ -2970,7 +3102,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
88150 static int post_relocation(struct module *mod, const struct load_info *info)
88151 {
88152 /* Sort exception table now relocations are done. */
88153+ pax_open_kernel();
88154 sort_extable(mod->extable, mod->extable + mod->num_exentries);
88155+ pax_close_kernel();
88156
88157 /* Copy relocated percpu area over. */
88158 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
88159@@ -3024,16 +3158,16 @@ static int do_init_module(struct module *mod)
88160 MODULE_STATE_COMING, mod);
88161
88162 /* Set RO and NX regions for core */
88163- set_section_ro_nx(mod->module_core,
88164- mod->core_text_size,
88165- mod->core_ro_size,
88166- mod->core_size);
88167+ set_section_ro_nx(mod->module_core_rx,
88168+ mod->core_size_rx,
88169+ mod->core_size_rx,
88170+ mod->core_size_rx);
88171
88172 /* Set RO and NX regions for init */
88173- set_section_ro_nx(mod->module_init,
88174- mod->init_text_size,
88175- mod->init_ro_size,
88176- mod->init_size);
88177+ set_section_ro_nx(mod->module_init_rx,
88178+ mod->init_size_rx,
88179+ mod->init_size_rx,
88180+ mod->init_size_rx);
88181
88182 do_mod_ctors(mod);
88183 /* Start the module */
88184@@ -3094,11 +3228,12 @@ static int do_init_module(struct module *mod)
88185 mod->strtab = mod->core_strtab;
88186 #endif
88187 unset_module_init_ro_nx(mod);
88188- module_free(mod, mod->module_init);
88189- mod->module_init = NULL;
88190- mod->init_size = 0;
88191- mod->init_ro_size = 0;
88192- mod->init_text_size = 0;
88193+ module_free(mod, mod->module_init_rw);
88194+ module_free_exec(mod, mod->module_init_rx);
88195+ mod->module_init_rw = NULL;
88196+ mod->module_init_rx = NULL;
88197+ mod->init_size_rw = 0;
88198+ mod->init_size_rx = 0;
88199 mutex_unlock(&module_mutex);
88200 wake_up_all(&module_wq);
88201
88202@@ -3241,9 +3376,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
88203 if (err)
88204 goto free_unload;
88205
88206+ /* Now copy in args */
88207+ mod->args = strndup_user(uargs, ~0UL >> 1);
88208+ if (IS_ERR(mod->args)) {
88209+ err = PTR_ERR(mod->args);
88210+ goto free_unload;
88211+ }
88212+
88213 /* Set up MODINFO_ATTR fields */
88214 setup_modinfo(mod, info);
88215
88216+#ifdef CONFIG_GRKERNSEC_MODHARDEN
88217+ {
88218+ char *p, *p2;
88219+
88220+ if (strstr(mod->args, "grsec_modharden_netdev")) {
88221+ 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);
88222+ err = -EPERM;
88223+ goto free_modinfo;
88224+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
88225+ p += sizeof("grsec_modharden_normal") - 1;
88226+ p2 = strstr(p, "_");
88227+ if (p2) {
88228+ *p2 = '\0';
88229+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
88230+ *p2 = '_';
88231+ }
88232+ err = -EPERM;
88233+ goto free_modinfo;
88234+ }
88235+ }
88236+#endif
88237+
88238 /* Fix up syms, so that st_value is a pointer to location. */
88239 err = simplify_symbols(mod, info);
88240 if (err < 0)
88241@@ -3259,13 +3423,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
88242
88243 flush_module_icache(mod);
88244
88245- /* Now copy in args */
88246- mod->args = strndup_user(uargs, ~0UL >> 1);
88247- if (IS_ERR(mod->args)) {
88248- err = PTR_ERR(mod->args);
88249- goto free_arch_cleanup;
88250- }
88251-
88252 dynamic_debug_setup(info->debug, info->num_debug);
88253
88254 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
88255@@ -3303,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
88256 ddebug_cleanup:
88257 dynamic_debug_remove(info->debug);
88258 synchronize_sched();
88259- kfree(mod->args);
88260- free_arch_cleanup:
88261 module_arch_cleanup(mod);
88262 free_modinfo:
88263 free_modinfo(mod);
88264+ kfree(mod->args);
88265 free_unload:
88266 module_unload_free(mod);
88267 unlink_mod:
88268@@ -3390,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
88269 unsigned long nextval;
88270
88271 /* At worse, next value is at end of module */
88272- if (within_module_init(addr, mod))
88273- nextval = (unsigned long)mod->module_init+mod->init_text_size;
88274+ if (within_module_init_rx(addr, mod))
88275+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
88276+ else if (within_module_init_rw(addr, mod))
88277+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
88278+ else if (within_module_core_rx(addr, mod))
88279+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
88280+ else if (within_module_core_rw(addr, mod))
88281+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
88282 else
88283- nextval = (unsigned long)mod->module_core+mod->core_text_size;
88284+ return NULL;
88285
88286 /* Scan for closest preceding symbol, and next symbol. (ELF
88287 starts real symbols at 1). */
88288@@ -3644,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
88289 return 0;
88290
88291 seq_printf(m, "%s %u",
88292- mod->name, mod->init_size + mod->core_size);
88293+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
88294 print_unload_info(m, mod);
88295
88296 /* Informative for users. */
88297@@ -3653,7 +3815,7 @@ static int m_show(struct seq_file *m, void *p)
88298 mod->state == MODULE_STATE_COMING ? "Loading":
88299 "Live");
88300 /* Used by oprofile and other similar tools. */
88301- seq_printf(m, " 0x%pK", mod->module_core);
88302+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
88303
88304 /* Taints info */
88305 if (mod->taints)
88306@@ -3689,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
88307
88308 static int __init proc_modules_init(void)
88309 {
88310+#ifndef CONFIG_GRKERNSEC_HIDESYM
88311+#ifdef CONFIG_GRKERNSEC_PROC_USER
88312+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
88313+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88314+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
88315+#else
88316 proc_create("modules", 0, NULL, &proc_modules_operations);
88317+#endif
88318+#else
88319+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
88320+#endif
88321 return 0;
88322 }
88323 module_init(proc_modules_init);
88324@@ -3750,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
88325 {
88326 struct module *mod;
88327
88328- if (addr < module_addr_min || addr > module_addr_max)
88329+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
88330+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
88331 return NULL;
88332
88333 list_for_each_entry_rcu(mod, &modules, list) {
88334 if (mod->state == MODULE_STATE_UNFORMED)
88335 continue;
88336- if (within_module_core(addr, mod)
88337- || within_module_init(addr, mod))
88338+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
88339 return mod;
88340 }
88341 return NULL;
88342@@ -3792,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
88343 */
88344 struct module *__module_text_address(unsigned long addr)
88345 {
88346- struct module *mod = __module_address(addr);
88347+ struct module *mod;
88348+
88349+#ifdef CONFIG_X86_32
88350+ addr = ktla_ktva(addr);
88351+#endif
88352+
88353+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
88354+ return NULL;
88355+
88356+ mod = __module_address(addr);
88357+
88358 if (mod) {
88359 /* Make sure it's within the text section. */
88360- if (!within(addr, mod->module_init, mod->init_text_size)
88361- && !within(addr, mod->module_core, mod->core_text_size))
88362+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
88363 mod = NULL;
88364 }
88365 return mod;
88366diff --git a/kernel/notifier.c b/kernel/notifier.c
88367index db4c8b0..ad011c5 100644
88368--- a/kernel/notifier.c
88369+++ b/kernel/notifier.c
88370@@ -5,6 +5,7 @@
88371 #include <linux/rcupdate.h>
88372 #include <linux/vmalloc.h>
88373 #include <linux/reboot.h>
88374+#include <linux/mm.h>
88375
88376 /*
88377 * Notifier list for kernel code which wants to be called
88378@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
88379 while ((*nl) != NULL) {
88380 if (n->priority > (*nl)->priority)
88381 break;
88382- nl = &((*nl)->next);
88383+ nl = (struct notifier_block **)&((*nl)->next);
88384 }
88385- n->next = *nl;
88386+ pax_open_kernel();
88387+ *(const void **)&n->next = *nl;
88388 rcu_assign_pointer(*nl, n);
88389+ pax_close_kernel();
88390 return 0;
88391 }
88392
88393@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
88394 return 0;
88395 if (n->priority > (*nl)->priority)
88396 break;
88397- nl = &((*nl)->next);
88398+ nl = (struct notifier_block **)&((*nl)->next);
88399 }
88400- n->next = *nl;
88401+ pax_open_kernel();
88402+ *(const void **)&n->next = *nl;
88403 rcu_assign_pointer(*nl, n);
88404+ pax_close_kernel();
88405 return 0;
88406 }
88407
88408@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
88409 {
88410 while ((*nl) != NULL) {
88411 if ((*nl) == n) {
88412+ pax_open_kernel();
88413 rcu_assign_pointer(*nl, n->next);
88414+ pax_close_kernel();
88415 return 0;
88416 }
88417- nl = &((*nl)->next);
88418+ nl = (struct notifier_block **)&((*nl)->next);
88419 }
88420 return -ENOENT;
88421 }
88422diff --git a/kernel/padata.c b/kernel/padata.c
88423index 161402f..598814c 100644
88424--- a/kernel/padata.c
88425+++ b/kernel/padata.c
88426@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
88427 * seq_nr mod. number of cpus in use.
88428 */
88429
88430- seq_nr = atomic_inc_return(&pd->seq_nr);
88431+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
88432 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
88433
88434 return padata_index_to_cpu(pd, cpu_index);
88435@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
88436 padata_init_pqueues(pd);
88437 padata_init_squeues(pd);
88438 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
88439- atomic_set(&pd->seq_nr, -1);
88440+ atomic_set_unchecked(&pd->seq_nr, -1);
88441 atomic_set(&pd->reorder_objects, 0);
88442 atomic_set(&pd->refcnt, 0);
88443 pd->pinst = pinst;
88444diff --git a/kernel/panic.c b/kernel/panic.c
88445index d02fa9f..9faec0a 100644
88446--- a/kernel/panic.c
88447+++ b/kernel/panic.c
88448@@ -52,7 +52,7 @@ EXPORT_SYMBOL(panic_blink);
88449 /*
88450 * Stop ourself in panic -- architecture code may override this
88451 */
88452-void __weak panic_smp_self_stop(void)
88453+void __weak __noreturn panic_smp_self_stop(void)
88454 {
88455 while (1)
88456 cpu_relax();
88457@@ -408,7 +408,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
88458 disable_trace_on_warning();
88459
88460 pr_warn("------------[ cut here ]------------\n");
88461- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
88462+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
88463 raw_smp_processor_id(), current->pid, file, line, caller);
88464
88465 if (args)
88466@@ -462,7 +462,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
88467 */
88468 __visible void __stack_chk_fail(void)
88469 {
88470- panic("stack-protector: Kernel stack is corrupted in: %p\n",
88471+ dump_stack();
88472+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
88473 __builtin_return_address(0));
88474 }
88475 EXPORT_SYMBOL(__stack_chk_fail);
88476diff --git a/kernel/pid.c b/kernel/pid.c
88477index 9b9a266..c20ef80 100644
88478--- a/kernel/pid.c
88479+++ b/kernel/pid.c
88480@@ -33,6 +33,7 @@
88481 #include <linux/rculist.h>
88482 #include <linux/bootmem.h>
88483 #include <linux/hash.h>
88484+#include <linux/security.h>
88485 #include <linux/pid_namespace.h>
88486 #include <linux/init_task.h>
88487 #include <linux/syscalls.h>
88488@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
88489
88490 int pid_max = PID_MAX_DEFAULT;
88491
88492-#define RESERVED_PIDS 300
88493+#define RESERVED_PIDS 500
88494
88495 int pid_max_min = RESERVED_PIDS + 1;
88496 int pid_max_max = PID_MAX_LIMIT;
88497@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
88498 */
88499 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
88500 {
88501+ struct task_struct *task;
88502+
88503 rcu_lockdep_assert(rcu_read_lock_held(),
88504 "find_task_by_pid_ns() needs rcu_read_lock()"
88505 " protection");
88506- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
88507+
88508+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
88509+
88510+ if (gr_pid_is_chrooted(task))
88511+ return NULL;
88512+
88513+ return task;
88514 }
88515
88516 struct task_struct *find_task_by_vpid(pid_t vnr)
88517@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
88518 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
88519 }
88520
88521+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
88522+{
88523+ rcu_lockdep_assert(rcu_read_lock_held(),
88524+ "find_task_by_pid_ns() needs rcu_read_lock()"
88525+ " protection");
88526+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
88527+}
88528+
88529 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
88530 {
88531 struct pid *pid;
88532diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
88533index db95d8e..a0ca23f 100644
88534--- a/kernel/pid_namespace.c
88535+++ b/kernel/pid_namespace.c
88536@@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
88537 void __user *buffer, size_t *lenp, loff_t *ppos)
88538 {
88539 struct pid_namespace *pid_ns = task_active_pid_ns(current);
88540- struct ctl_table tmp = *table;
88541+ ctl_table_no_const tmp = *table;
88542
88543 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
88544 return -EPERM;
88545diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
88546index 3b89464..5e38379 100644
88547--- a/kernel/posix-cpu-timers.c
88548+++ b/kernel/posix-cpu-timers.c
88549@@ -1464,14 +1464,14 @@ struct k_clock clock_posix_cpu = {
88550
88551 static __init int init_posix_cpu_timers(void)
88552 {
88553- struct k_clock process = {
88554+ static struct k_clock process = {
88555 .clock_getres = process_cpu_clock_getres,
88556 .clock_get = process_cpu_clock_get,
88557 .timer_create = process_cpu_timer_create,
88558 .nsleep = process_cpu_nsleep,
88559 .nsleep_restart = process_cpu_nsleep_restart,
88560 };
88561- struct k_clock thread = {
88562+ static struct k_clock thread = {
88563 .clock_getres = thread_cpu_clock_getres,
88564 .clock_get = thread_cpu_clock_get,
88565 .timer_create = thread_cpu_timer_create,
88566diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
88567index 424c2d4..679242f 100644
88568--- a/kernel/posix-timers.c
88569+++ b/kernel/posix-timers.c
88570@@ -43,6 +43,7 @@
88571 #include <linux/hash.h>
88572 #include <linux/posix-clock.h>
88573 #include <linux/posix-timers.h>
88574+#include <linux/grsecurity.h>
88575 #include <linux/syscalls.h>
88576 #include <linux/wait.h>
88577 #include <linux/workqueue.h>
88578@@ -122,7 +123,7 @@ static DEFINE_SPINLOCK(hash_lock);
88579 * which we beg off on and pass to do_sys_settimeofday().
88580 */
88581
88582-static struct k_clock posix_clocks[MAX_CLOCKS];
88583+static struct k_clock *posix_clocks[MAX_CLOCKS];
88584
88585 /*
88586 * These ones are defined below.
88587@@ -275,7 +276,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
88588 */
88589 static __init int init_posix_timers(void)
88590 {
88591- struct k_clock clock_realtime = {
88592+ static struct k_clock clock_realtime = {
88593 .clock_getres = hrtimer_get_res,
88594 .clock_get = posix_clock_realtime_get,
88595 .clock_set = posix_clock_realtime_set,
88596@@ -287,7 +288,7 @@ static __init int init_posix_timers(void)
88597 .timer_get = common_timer_get,
88598 .timer_del = common_timer_del,
88599 };
88600- struct k_clock clock_monotonic = {
88601+ static struct k_clock clock_monotonic = {
88602 .clock_getres = hrtimer_get_res,
88603 .clock_get = posix_ktime_get_ts,
88604 .nsleep = common_nsleep,
88605@@ -297,19 +298,19 @@ static __init int init_posix_timers(void)
88606 .timer_get = common_timer_get,
88607 .timer_del = common_timer_del,
88608 };
88609- struct k_clock clock_monotonic_raw = {
88610+ static struct k_clock clock_monotonic_raw = {
88611 .clock_getres = hrtimer_get_res,
88612 .clock_get = posix_get_monotonic_raw,
88613 };
88614- struct k_clock clock_realtime_coarse = {
88615+ static struct k_clock clock_realtime_coarse = {
88616 .clock_getres = posix_get_coarse_res,
88617 .clock_get = posix_get_realtime_coarse,
88618 };
88619- struct k_clock clock_monotonic_coarse = {
88620+ static struct k_clock clock_monotonic_coarse = {
88621 .clock_getres = posix_get_coarse_res,
88622 .clock_get = posix_get_monotonic_coarse,
88623 };
88624- struct k_clock clock_tai = {
88625+ static struct k_clock clock_tai = {
88626 .clock_getres = hrtimer_get_res,
88627 .clock_get = posix_get_tai,
88628 .nsleep = common_nsleep,
88629@@ -319,7 +320,7 @@ static __init int init_posix_timers(void)
88630 .timer_get = common_timer_get,
88631 .timer_del = common_timer_del,
88632 };
88633- struct k_clock clock_boottime = {
88634+ static struct k_clock clock_boottime = {
88635 .clock_getres = hrtimer_get_res,
88636 .clock_get = posix_get_boottime,
88637 .nsleep = common_nsleep,
88638@@ -531,7 +532,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
88639 return;
88640 }
88641
88642- posix_clocks[clock_id] = *new_clock;
88643+ posix_clocks[clock_id] = new_clock;
88644 }
88645 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
88646
88647@@ -577,9 +578,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
88648 return (id & CLOCKFD_MASK) == CLOCKFD ?
88649 &clock_posix_dynamic : &clock_posix_cpu;
88650
88651- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
88652+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
88653 return NULL;
88654- return &posix_clocks[id];
88655+ return posix_clocks[id];
88656 }
88657
88658 static int common_timer_create(struct k_itimer *new_timer)
88659@@ -597,7 +598,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
88660 struct k_clock *kc = clockid_to_kclock(which_clock);
88661 struct k_itimer *new_timer;
88662 int error, new_timer_id;
88663- sigevent_t event;
88664+ sigevent_t event = { };
88665 int it_id_set = IT_ID_NOT_SET;
88666
88667 if (!kc)
88668@@ -1011,6 +1012,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
88669 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
88670 return -EFAULT;
88671
88672+ /* only the CLOCK_REALTIME clock can be set, all other clocks
88673+ have their clock_set fptr set to a nosettime dummy function
88674+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
88675+ call common_clock_set, which calls do_sys_settimeofday, which
88676+ we hook
88677+ */
88678+
88679 return kc->clock_set(which_clock, &new_tp);
88680 }
88681
88682diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
88683index 2fac9cc..56fef29 100644
88684--- a/kernel/power/Kconfig
88685+++ b/kernel/power/Kconfig
88686@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
88687 config HIBERNATION
88688 bool "Hibernation (aka 'suspend to disk')"
88689 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
88690+ depends on !GRKERNSEC_KMEM
88691+ depends on !PAX_MEMORY_SANITIZE
88692 select HIBERNATE_CALLBACKS
88693 select LZO_COMPRESS
88694 select LZO_DECOMPRESS
88695diff --git a/kernel/power/process.c b/kernel/power/process.c
88696index 06ec886..9dba35e 100644
88697--- a/kernel/power/process.c
88698+++ b/kernel/power/process.c
88699@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
88700 unsigned int elapsed_msecs;
88701 bool wakeup = false;
88702 int sleep_usecs = USEC_PER_MSEC;
88703+ bool timedout = false;
88704
88705 do_gettimeofday(&start);
88706
88707@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
88708
88709 while (true) {
88710 todo = 0;
88711+ if (time_after(jiffies, end_time))
88712+ timedout = true;
88713 read_lock(&tasklist_lock);
88714 do_each_thread(g, p) {
88715 if (p == current || !freeze_task(p))
88716 continue;
88717
88718- if (!freezer_should_skip(p))
88719+ if (!freezer_should_skip(p)) {
88720 todo++;
88721+ if (timedout) {
88722+ printk(KERN_ERR "Task refusing to freeze:\n");
88723+ sched_show_task(p);
88724+ }
88725+ }
88726 } while_each_thread(g, p);
88727 read_unlock(&tasklist_lock);
88728
88729@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
88730 todo += wq_busy;
88731 }
88732
88733- if (!todo || time_after(jiffies, end_time))
88734+ if (!todo || timedout)
88735 break;
88736
88737 if (pm_wakeup_pending()) {
88738diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
88739index 221229c..c76ca0a 100644
88740--- a/kernel/printk/printk.c
88741+++ b/kernel/printk/printk.c
88742@@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
88743 if (from_file && type != SYSLOG_ACTION_OPEN)
88744 return 0;
88745
88746+#ifdef CONFIG_GRKERNSEC_DMESG
88747+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
88748+ return -EPERM;
88749+#endif
88750+
88751 if (syslog_action_restricted(type)) {
88752 if (capable(CAP_SYSLOG))
88753 return 0;
88754diff --git a/kernel/profile.c b/kernel/profile.c
88755index cb980f0..ccd8782 100644
88756--- a/kernel/profile.c
88757+++ b/kernel/profile.c
88758@@ -37,7 +37,7 @@ struct profile_hit {
88759 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
88760 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
88761
88762-static atomic_t *prof_buffer;
88763+static atomic_unchecked_t *prof_buffer;
88764 static unsigned long prof_len, prof_shift;
88765
88766 int prof_on __read_mostly;
88767@@ -260,7 +260,7 @@ static void profile_flip_buffers(void)
88768 hits[i].pc = 0;
88769 continue;
88770 }
88771- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
88772+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
88773 hits[i].hits = hits[i].pc = 0;
88774 }
88775 }
88776@@ -321,9 +321,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
88777 * Add the current hit(s) and flush the write-queue out
88778 * to the global buffer:
88779 */
88780- atomic_add(nr_hits, &prof_buffer[pc]);
88781+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
88782 for (i = 0; i < NR_PROFILE_HIT; ++i) {
88783- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
88784+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
88785 hits[i].pc = hits[i].hits = 0;
88786 }
88787 out:
88788@@ -398,7 +398,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
88789 {
88790 unsigned long pc;
88791 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
88792- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
88793+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
88794 }
88795 #endif /* !CONFIG_SMP */
88796
88797@@ -494,7 +494,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
88798 return -EFAULT;
88799 buf++; p++; count--; read++;
88800 }
88801- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
88802+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
88803 if (copy_to_user(buf, (void *)pnt, count))
88804 return -EFAULT;
88805 read += count;
88806@@ -525,7 +525,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
88807 }
88808 #endif
88809 profile_discard_flip_buffers();
88810- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
88811+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
88812 return count;
88813 }
88814
88815diff --git a/kernel/ptrace.c b/kernel/ptrace.c
88816index adf9862..9d86345 100644
88817--- a/kernel/ptrace.c
88818+++ b/kernel/ptrace.c
88819@@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
88820 if (seize)
88821 flags |= PT_SEIZED;
88822 rcu_read_lock();
88823- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
88824+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
88825 flags |= PT_PTRACE_CAP;
88826 rcu_read_unlock();
88827 task->ptrace = flags;
88828@@ -538,7 +538,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
88829 break;
88830 return -EIO;
88831 }
88832- if (copy_to_user(dst, buf, retval))
88833+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
88834 return -EFAULT;
88835 copied += retval;
88836 src += retval;
88837@@ -806,7 +806,7 @@ int ptrace_request(struct task_struct *child, long request,
88838 bool seized = child->ptrace & PT_SEIZED;
88839 int ret = -EIO;
88840 siginfo_t siginfo, *si;
88841- void __user *datavp = (void __user *) data;
88842+ void __user *datavp = (__force void __user *) data;
88843 unsigned long __user *datalp = datavp;
88844 unsigned long flags;
88845
88846@@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
88847 goto out;
88848 }
88849
88850+ if (gr_handle_ptrace(child, request)) {
88851+ ret = -EPERM;
88852+ goto out_put_task_struct;
88853+ }
88854+
88855 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
88856 ret = ptrace_attach(child, request, addr, data);
88857 /*
88858 * Some architectures need to do book-keeping after
88859 * a ptrace attach.
88860 */
88861- if (!ret)
88862+ if (!ret) {
88863 arch_ptrace_attach(child);
88864+ gr_audit_ptrace(child);
88865+ }
88866 goto out_put_task_struct;
88867 }
88868
88869@@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
88870 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
88871 if (copied != sizeof(tmp))
88872 return -EIO;
88873- return put_user(tmp, (unsigned long __user *)data);
88874+ return put_user(tmp, (__force unsigned long __user *)data);
88875 }
88876
88877 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
88878@@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
88879 }
88880
88881 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
88882- compat_long_t, addr, compat_long_t, data)
88883+ compat_ulong_t, addr, compat_ulong_t, data)
88884 {
88885 struct task_struct *child;
88886 long ret;
88887@@ -1197,14 +1204,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
88888 goto out;
88889 }
88890
88891+ if (gr_handle_ptrace(child, request)) {
88892+ ret = -EPERM;
88893+ goto out_put_task_struct;
88894+ }
88895+
88896 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
88897 ret = ptrace_attach(child, request, addr, data);
88898 /*
88899 * Some architectures need to do book-keeping after
88900 * a ptrace attach.
88901 */
88902- if (!ret)
88903+ if (!ret) {
88904 arch_ptrace_attach(child);
88905+ gr_audit_ptrace(child);
88906+ }
88907 goto out_put_task_struct;
88908 }
88909
88910diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
88911index bd30bc6..dce23da 100644
88912--- a/kernel/rcu/rcutorture.c
88913+++ b/kernel/rcu/rcutorture.c
88914@@ -122,12 +122,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
88915 rcu_torture_count) = { 0 };
88916 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
88917 rcu_torture_batch) = { 0 };
88918-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
88919-static atomic_t n_rcu_torture_alloc;
88920-static atomic_t n_rcu_torture_alloc_fail;
88921-static atomic_t n_rcu_torture_free;
88922-static atomic_t n_rcu_torture_mberror;
88923-static atomic_t n_rcu_torture_error;
88924+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
88925+static atomic_unchecked_t n_rcu_torture_alloc;
88926+static atomic_unchecked_t n_rcu_torture_alloc_fail;
88927+static atomic_unchecked_t n_rcu_torture_free;
88928+static atomic_unchecked_t n_rcu_torture_mberror;
88929+static atomic_unchecked_t n_rcu_torture_error;
88930 static long n_rcu_torture_barrier_error;
88931 static long n_rcu_torture_boost_ktrerror;
88932 static long n_rcu_torture_boost_rterror;
88933@@ -186,11 +186,11 @@ rcu_torture_alloc(void)
88934
88935 spin_lock_bh(&rcu_torture_lock);
88936 if (list_empty(&rcu_torture_freelist)) {
88937- atomic_inc(&n_rcu_torture_alloc_fail);
88938+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
88939 spin_unlock_bh(&rcu_torture_lock);
88940 return NULL;
88941 }
88942- atomic_inc(&n_rcu_torture_alloc);
88943+ atomic_inc_unchecked(&n_rcu_torture_alloc);
88944 p = rcu_torture_freelist.next;
88945 list_del_init(p);
88946 spin_unlock_bh(&rcu_torture_lock);
88947@@ -203,7 +203,7 @@ rcu_torture_alloc(void)
88948 static void
88949 rcu_torture_free(struct rcu_torture *p)
88950 {
88951- atomic_inc(&n_rcu_torture_free);
88952+ atomic_inc_unchecked(&n_rcu_torture_free);
88953 spin_lock_bh(&rcu_torture_lock);
88954 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
88955 spin_unlock_bh(&rcu_torture_lock);
88956@@ -287,7 +287,7 @@ rcu_torture_cb(struct rcu_head *p)
88957 i = rp->rtort_pipe_count;
88958 if (i > RCU_TORTURE_PIPE_LEN)
88959 i = RCU_TORTURE_PIPE_LEN;
88960- atomic_inc(&rcu_torture_wcount[i]);
88961+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
88962 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
88963 rp->rtort_mbtest = 0;
88964 rcu_torture_free(rp);
88965@@ -714,7 +714,7 @@ rcu_torture_writer(void *arg)
88966 i = old_rp->rtort_pipe_count;
88967 if (i > RCU_TORTURE_PIPE_LEN)
88968 i = RCU_TORTURE_PIPE_LEN;
88969- atomic_inc(&rcu_torture_wcount[i]);
88970+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
88971 old_rp->rtort_pipe_count++;
88972 if (gp_normal == gp_exp)
88973 exp = !!(torture_random(&rand) & 0x80);
88974@@ -732,7 +732,7 @@ rcu_torture_writer(void *arg)
88975 i = rp->rtort_pipe_count;
88976 if (i > RCU_TORTURE_PIPE_LEN)
88977 i = RCU_TORTURE_PIPE_LEN;
88978- atomic_inc(&rcu_torture_wcount[i]);
88979+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
88980 if (++rp->rtort_pipe_count >=
88981 RCU_TORTURE_PIPE_LEN) {
88982 rp->rtort_mbtest = 0;
88983@@ -825,7 +825,7 @@ static void rcu_torture_timer(unsigned long unused)
88984 return;
88985 }
88986 if (p->rtort_mbtest == 0)
88987- atomic_inc(&n_rcu_torture_mberror);
88988+ atomic_inc_unchecked(&n_rcu_torture_mberror);
88989 spin_lock(&rand_lock);
88990 cur_ops->read_delay(&rand);
88991 n_rcu_torture_timers++;
88992@@ -895,7 +895,7 @@ rcu_torture_reader(void *arg)
88993 continue;
88994 }
88995 if (p->rtort_mbtest == 0)
88996- atomic_inc(&n_rcu_torture_mberror);
88997+ atomic_inc_unchecked(&n_rcu_torture_mberror);
88998 cur_ops->read_delay(&rand);
88999 preempt_disable();
89000 pipe_count = p->rtort_pipe_count;
89001@@ -950,15 +950,15 @@ rcu_torture_printk(char *page)
89002 }
89003 page += sprintf(page, "%s%s ", torture_type, TORTURE_FLAG);
89004 page += sprintf(page,
89005- "rtc: %p ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
89006+ "rtc: %pP ver: %lu tfle: %d rta: %d rtaf: %d rtf: %d ",
89007 rcu_torture_current,
89008 rcu_torture_current_version,
89009 list_empty(&rcu_torture_freelist),
89010- atomic_read(&n_rcu_torture_alloc),
89011- atomic_read(&n_rcu_torture_alloc_fail),
89012- atomic_read(&n_rcu_torture_free));
89013+ atomic_read_unchecked(&n_rcu_torture_alloc),
89014+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
89015+ atomic_read_unchecked(&n_rcu_torture_free));
89016 page += sprintf(page, "rtmbe: %d rtbke: %ld rtbre: %ld ",
89017- atomic_read(&n_rcu_torture_mberror),
89018+ atomic_read_unchecked(&n_rcu_torture_mberror),
89019 n_rcu_torture_boost_ktrerror,
89020 n_rcu_torture_boost_rterror);
89021 page += sprintf(page, "rtbf: %ld rtb: %ld nt: %ld ",
89022@@ -971,14 +971,14 @@ rcu_torture_printk(char *page)
89023 n_barrier_attempts,
89024 n_rcu_torture_barrier_error);
89025 page += sprintf(page, "\n%s%s ", torture_type, TORTURE_FLAG);
89026- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
89027+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
89028 n_rcu_torture_barrier_error != 0 ||
89029 n_rcu_torture_boost_ktrerror != 0 ||
89030 n_rcu_torture_boost_rterror != 0 ||
89031 n_rcu_torture_boost_failure != 0 ||
89032 i > 1) {
89033 page += sprintf(page, "!!! ");
89034- atomic_inc(&n_rcu_torture_error);
89035+ atomic_inc_unchecked(&n_rcu_torture_error);
89036 WARN_ON_ONCE(1);
89037 }
89038 page += sprintf(page, "Reader Pipe: ");
89039@@ -992,7 +992,7 @@ rcu_torture_printk(char *page)
89040 page += sprintf(page, "Free-Block Circulation: ");
89041 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
89042 page += sprintf(page, " %d",
89043- atomic_read(&rcu_torture_wcount[i]));
89044+ atomic_read_unchecked(&rcu_torture_wcount[i]));
89045 }
89046 page += sprintf(page, "\n");
89047 if (cur_ops->stats)
89048@@ -1341,7 +1341,7 @@ rcu_torture_cleanup(void)
89049
89050 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
89051
89052- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
89053+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
89054 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
89055 else if (torture_onoff_failures())
89056 rcu_torture_print_module_parms(cur_ops,
89057@@ -1460,18 +1460,18 @@ rcu_torture_init(void)
89058
89059 rcu_torture_current = NULL;
89060 rcu_torture_current_version = 0;
89061- atomic_set(&n_rcu_torture_alloc, 0);
89062- atomic_set(&n_rcu_torture_alloc_fail, 0);
89063- atomic_set(&n_rcu_torture_free, 0);
89064- atomic_set(&n_rcu_torture_mberror, 0);
89065- atomic_set(&n_rcu_torture_error, 0);
89066+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
89067+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
89068+ atomic_set_unchecked(&n_rcu_torture_free, 0);
89069+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
89070+ atomic_set_unchecked(&n_rcu_torture_error, 0);
89071 n_rcu_torture_barrier_error = 0;
89072 n_rcu_torture_boost_ktrerror = 0;
89073 n_rcu_torture_boost_rterror = 0;
89074 n_rcu_torture_boost_failure = 0;
89075 n_rcu_torture_boosts = 0;
89076 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
89077- atomic_set(&rcu_torture_wcount[i], 0);
89078+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
89079 for_each_possible_cpu(cpu) {
89080 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
89081 per_cpu(rcu_torture_count, cpu)[i] = 0;
89082diff --git a/kernel/rcu/srcu.c b/kernel/rcu/srcu.c
89083index c639556..cf0a0d5 100644
89084--- a/kernel/rcu/srcu.c
89085+++ b/kernel/rcu/srcu.c
89086@@ -298,9 +298,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
89087
89088 idx = ACCESS_ONCE(sp->completed) & 0x1;
89089 preempt_disable();
89090- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
89091+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
89092 smp_mb(); /* B */ /* Avoid leaking the critical section. */
89093- ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
89094+ ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
89095 preempt_enable();
89096 return idx;
89097 }
89098diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
89099index d9efcc1..ea543e9 100644
89100--- a/kernel/rcu/tiny.c
89101+++ b/kernel/rcu/tiny.c
89102@@ -42,7 +42,7 @@
89103 /* Forward declarations for tiny_plugin.h. */
89104 struct rcu_ctrlblk;
89105 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
89106-static void rcu_process_callbacks(struct softirq_action *unused);
89107+static void rcu_process_callbacks(void);
89108 static void __call_rcu(struct rcu_head *head,
89109 void (*func)(struct rcu_head *rcu),
89110 struct rcu_ctrlblk *rcp);
89111@@ -308,7 +308,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
89112 false));
89113 }
89114
89115-static void rcu_process_callbacks(struct softirq_action *unused)
89116+static __latent_entropy void rcu_process_callbacks(void)
89117 {
89118 __rcu_process_callbacks(&rcu_sched_ctrlblk);
89119 __rcu_process_callbacks(&rcu_bh_ctrlblk);
89120diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
89121index 0c47e30..a084591 100644
89122--- a/kernel/rcu/tree.c
89123+++ b/kernel/rcu/tree.c
89124@@ -388,9 +388,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
89125 rcu_prepare_for_idle(smp_processor_id());
89126 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
89127 smp_mb__before_atomic_inc(); /* See above. */
89128- atomic_inc(&rdtp->dynticks);
89129+ atomic_inc_unchecked(&rdtp->dynticks);
89130 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
89131- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
89132+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
89133
89134 /*
89135 * It is illegal to enter an extended quiescent state while
89136@@ -508,10 +508,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
89137 int user)
89138 {
89139 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
89140- atomic_inc(&rdtp->dynticks);
89141+ atomic_inc_unchecked(&rdtp->dynticks);
89142 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
89143 smp_mb__after_atomic_inc(); /* See above. */
89144- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
89145+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
89146 rcu_cleanup_after_idle(smp_processor_id());
89147 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
89148 if (!user && !is_idle_task(current)) {
89149@@ -632,14 +632,14 @@ void rcu_nmi_enter(void)
89150 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
89151
89152 if (rdtp->dynticks_nmi_nesting == 0 &&
89153- (atomic_read(&rdtp->dynticks) & 0x1))
89154+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
89155 return;
89156 rdtp->dynticks_nmi_nesting++;
89157 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
89158- atomic_inc(&rdtp->dynticks);
89159+ atomic_inc_unchecked(&rdtp->dynticks);
89160 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
89161 smp_mb__after_atomic_inc(); /* See above. */
89162- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
89163+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
89164 }
89165
89166 /**
89167@@ -658,9 +658,9 @@ void rcu_nmi_exit(void)
89168 return;
89169 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
89170 smp_mb__before_atomic_inc(); /* See above. */
89171- atomic_inc(&rdtp->dynticks);
89172+ atomic_inc_unchecked(&rdtp->dynticks);
89173 smp_mb__after_atomic_inc(); /* Force delay to next write. */
89174- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
89175+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
89176 }
89177
89178 /**
89179@@ -673,7 +673,7 @@ void rcu_nmi_exit(void)
89180 */
89181 bool notrace __rcu_is_watching(void)
89182 {
89183- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
89184+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
89185 }
89186
89187 /**
89188@@ -756,7 +756,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
89189 static int dyntick_save_progress_counter(struct rcu_data *rdp,
89190 bool *isidle, unsigned long *maxj)
89191 {
89192- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
89193+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
89194 rcu_sysidle_check_cpu(rdp, isidle, maxj);
89195 return (rdp->dynticks_snap & 0x1) == 0;
89196 }
89197@@ -779,7 +779,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
89198 unsigned int curr;
89199 unsigned int snap;
89200
89201- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
89202+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
89203 snap = (unsigned int)rdp->dynticks_snap;
89204
89205 /*
89206@@ -1449,9 +1449,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
89207 rdp = this_cpu_ptr(rsp->rda);
89208 rcu_preempt_check_blocked_tasks(rnp);
89209 rnp->qsmask = rnp->qsmaskinit;
89210- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
89211+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
89212 WARN_ON_ONCE(rnp->completed != rsp->completed);
89213- ACCESS_ONCE(rnp->completed) = rsp->completed;
89214+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
89215 if (rnp == rdp->mynode)
89216 __note_gp_changes(rsp, rnp, rdp);
89217 rcu_preempt_boost_start_gp(rnp);
89218@@ -1545,7 +1545,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
89219 rcu_for_each_node_breadth_first(rsp, rnp) {
89220 raw_spin_lock_irq(&rnp->lock);
89221 smp_mb__after_unlock_lock();
89222- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
89223+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
89224 rdp = this_cpu_ptr(rsp->rda);
89225 if (rnp == rdp->mynode)
89226 __note_gp_changes(rsp, rnp, rdp);
89227@@ -1560,7 +1560,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
89228 rcu_nocb_gp_set(rnp, nocb);
89229
89230 /* Declare grace period done. */
89231- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
89232+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
89233 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
89234 rsp->fqs_state = RCU_GP_IDLE;
89235 rdp = this_cpu_ptr(rsp->rda);
89236@@ -1912,7 +1912,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
89237 rsp->qlen += rdp->qlen;
89238 rdp->n_cbs_orphaned += rdp->qlen;
89239 rdp->qlen_lazy = 0;
89240- ACCESS_ONCE(rdp->qlen) = 0;
89241+ ACCESS_ONCE_RW(rdp->qlen) = 0;
89242 }
89243
89244 /*
89245@@ -2159,7 +2159,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
89246 }
89247 smp_mb(); /* List handling before counting for rcu_barrier(). */
89248 rdp->qlen_lazy -= count_lazy;
89249- ACCESS_ONCE(rdp->qlen) -= count;
89250+ ACCESS_ONCE_RW(rdp->qlen) -= count;
89251 rdp->n_cbs_invoked += count;
89252
89253 /* Reinstate batch limit if we have worked down the excess. */
89254@@ -2304,7 +2304,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
89255 if (rnp_old != NULL)
89256 raw_spin_unlock(&rnp_old->fqslock);
89257 if (ret) {
89258- ACCESS_ONCE(rsp->n_force_qs_lh)++;
89259+ ACCESS_ONCE_RW(rsp->n_force_qs_lh)++;
89260 return;
89261 }
89262 rnp_old = rnp;
89263@@ -2316,7 +2316,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
89264 smp_mb__after_unlock_lock();
89265 raw_spin_unlock(&rnp_old->fqslock);
89266 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
89267- ACCESS_ONCE(rsp->n_force_qs_lh)++;
89268+ ACCESS_ONCE_RW(rsp->n_force_qs_lh)++;
89269 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
89270 return; /* Someone beat us to it. */
89271 }
89272@@ -2362,7 +2362,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
89273 /*
89274 * Do RCU core processing for the current CPU.
89275 */
89276-static void rcu_process_callbacks(struct softirq_action *unused)
89277+static void rcu_process_callbacks(void)
89278 {
89279 struct rcu_state *rsp;
89280
89281@@ -2470,7 +2470,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
89282 WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
89283 if (debug_rcu_head_queue(head)) {
89284 /* Probable double call_rcu(), so leak the callback. */
89285- ACCESS_ONCE(head->func) = rcu_leak_callback;
89286+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
89287 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
89288 return;
89289 }
89290@@ -2498,7 +2498,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
89291 local_irq_restore(flags);
89292 return;
89293 }
89294- ACCESS_ONCE(rdp->qlen)++;
89295+ ACCESS_ONCE_RW(rdp->qlen)++;
89296 if (lazy)
89297 rdp->qlen_lazy++;
89298 else
89299@@ -2759,11 +2759,11 @@ void synchronize_sched_expedited(void)
89300 * counter wrap on a 32-bit system. Quite a few more CPUs would of
89301 * course be required on a 64-bit system.
89302 */
89303- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
89304+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
89305 (ulong)atomic_long_read(&rsp->expedited_done) +
89306 ULONG_MAX / 8)) {
89307 synchronize_sched();
89308- atomic_long_inc(&rsp->expedited_wrap);
89309+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
89310 return;
89311 }
89312
89313@@ -2771,7 +2771,7 @@ void synchronize_sched_expedited(void)
89314 * Take a ticket. Note that atomic_inc_return() implies a
89315 * full memory barrier.
89316 */
89317- snap = atomic_long_inc_return(&rsp->expedited_start);
89318+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
89319 firstsnap = snap;
89320 get_online_cpus();
89321 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
89322@@ -2784,14 +2784,14 @@ void synchronize_sched_expedited(void)
89323 synchronize_sched_expedited_cpu_stop,
89324 NULL) == -EAGAIN) {
89325 put_online_cpus();
89326- atomic_long_inc(&rsp->expedited_tryfail);
89327+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
89328
89329 /* Check to see if someone else did our work for us. */
89330 s = atomic_long_read(&rsp->expedited_done);
89331 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
89332 /* ensure test happens before caller kfree */
89333 smp_mb__before_atomic_inc(); /* ^^^ */
89334- atomic_long_inc(&rsp->expedited_workdone1);
89335+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
89336 return;
89337 }
89338
89339@@ -2800,7 +2800,7 @@ void synchronize_sched_expedited(void)
89340 udelay(trycount * num_online_cpus());
89341 } else {
89342 wait_rcu_gp(call_rcu_sched);
89343- atomic_long_inc(&rsp->expedited_normal);
89344+ atomic_long_inc_unchecked(&rsp->expedited_normal);
89345 return;
89346 }
89347
89348@@ -2809,7 +2809,7 @@ void synchronize_sched_expedited(void)
89349 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
89350 /* ensure test happens before caller kfree */
89351 smp_mb__before_atomic_inc(); /* ^^^ */
89352- atomic_long_inc(&rsp->expedited_workdone2);
89353+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
89354 return;
89355 }
89356
89357@@ -2821,10 +2821,10 @@ void synchronize_sched_expedited(void)
89358 * period works for us.
89359 */
89360 get_online_cpus();
89361- snap = atomic_long_read(&rsp->expedited_start);
89362+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
89363 smp_mb(); /* ensure read is before try_stop_cpus(). */
89364 }
89365- atomic_long_inc(&rsp->expedited_stoppedcpus);
89366+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
89367
89368 /*
89369 * Everyone up to our most recent fetch is covered by our grace
89370@@ -2833,16 +2833,16 @@ void synchronize_sched_expedited(void)
89371 * than we did already did their update.
89372 */
89373 do {
89374- atomic_long_inc(&rsp->expedited_done_tries);
89375+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
89376 s = atomic_long_read(&rsp->expedited_done);
89377 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
89378 /* ensure test happens before caller kfree */
89379 smp_mb__before_atomic_inc(); /* ^^^ */
89380- atomic_long_inc(&rsp->expedited_done_lost);
89381+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
89382 break;
89383 }
89384 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
89385- atomic_long_inc(&rsp->expedited_done_exit);
89386+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
89387
89388 put_online_cpus();
89389 }
89390@@ -3048,7 +3048,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
89391 * ACCESS_ONCE() to prevent the compiler from speculating
89392 * the increment to precede the early-exit check.
89393 */
89394- ACCESS_ONCE(rsp->n_barrier_done)++;
89395+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
89396 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
89397 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
89398 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
89399@@ -3098,7 +3098,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
89400
89401 /* Increment ->n_barrier_done to prevent duplicate work. */
89402 smp_mb(); /* Keep increment after above mechanism. */
89403- ACCESS_ONCE(rsp->n_barrier_done)++;
89404+ ACCESS_ONCE_RW(rsp->n_barrier_done)++;
89405 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
89406 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
89407 smp_mb(); /* Keep increment before caller's subsequent code. */
89408@@ -3143,10 +3143,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
89409 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
89410 init_callback_list(rdp);
89411 rdp->qlen_lazy = 0;
89412- ACCESS_ONCE(rdp->qlen) = 0;
89413+ ACCESS_ONCE_RW(rdp->qlen) = 0;
89414 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
89415 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
89416- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
89417+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
89418 rdp->cpu = cpu;
89419 rdp->rsp = rsp;
89420 rcu_boot_init_nocb_percpu_data(rdp);
89421@@ -3180,8 +3180,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
89422 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
89423 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
89424 rcu_sysidle_init_percpu_data(rdp->dynticks);
89425- atomic_set(&rdp->dynticks->dynticks,
89426- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
89427+ atomic_set_unchecked(&rdp->dynticks->dynticks,
89428+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
89429 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
89430
89431 /* Add CPU to rcu_node bitmasks. */
89432diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
89433index 75dc3c3..b95d624 100644
89434--- a/kernel/rcu/tree.h
89435+++ b/kernel/rcu/tree.h
89436@@ -87,11 +87,11 @@ struct rcu_dynticks {
89437 long long dynticks_nesting; /* Track irq/process nesting level. */
89438 /* Process level is worth LLONG_MAX/2. */
89439 int dynticks_nmi_nesting; /* Track NMI nesting level. */
89440- atomic_t dynticks; /* Even value for idle, else odd. */
89441+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
89442 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
89443 long long dynticks_idle_nesting;
89444 /* irq/process nesting level from idle. */
89445- atomic_t dynticks_idle; /* Even value for idle, else odd. */
89446+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
89447 /* "Idle" excludes userspace execution. */
89448 unsigned long dynticks_idle_jiffies;
89449 /* End of last non-NMI non-idle period. */
89450@@ -431,17 +431,17 @@ struct rcu_state {
89451 /* _rcu_barrier(). */
89452 /* End of fields guarded by barrier_mutex. */
89453
89454- atomic_long_t expedited_start; /* Starting ticket. */
89455- atomic_long_t expedited_done; /* Done ticket. */
89456- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
89457- atomic_long_t expedited_tryfail; /* # acquisition failures. */
89458- atomic_long_t expedited_workdone1; /* # done by others #1. */
89459- atomic_long_t expedited_workdone2; /* # done by others #2. */
89460- atomic_long_t expedited_normal; /* # fallbacks to normal. */
89461- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
89462- atomic_long_t expedited_done_tries; /* # tries to update _done. */
89463- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
89464- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
89465+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
89466+ atomic_long_t expedited_done; /* Done ticket. */
89467+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
89468+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
89469+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
89470+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
89471+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
89472+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
89473+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
89474+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
89475+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
89476
89477 unsigned long jiffies_force_qs; /* Time at which to invoke */
89478 /* force_quiescent_state(). */
89479diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
89480index 962d1d5..c6c62d12d 100644
89481--- a/kernel/rcu/tree_plugin.h
89482+++ b/kernel/rcu/tree_plugin.h
89483@@ -758,7 +758,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
89484 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
89485 {
89486 return !rcu_preempted_readers_exp(rnp) &&
89487- ACCESS_ONCE(rnp->expmask) == 0;
89488+ ACCESS_ONCE_RW(rnp->expmask) == 0;
89489 }
89490
89491 /*
89492@@ -920,7 +920,7 @@ void synchronize_rcu_expedited(void)
89493
89494 /* Clean up and exit. */
89495 smp_mb(); /* ensure expedited GP seen before counter increment. */
89496- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
89497+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
89498 unlock_mb_ret:
89499 mutex_unlock(&sync_rcu_preempt_exp_mutex);
89500 mb_ret:
89501@@ -1496,7 +1496,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
89502 free_cpumask_var(cm);
89503 }
89504
89505-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
89506+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
89507 .store = &rcu_cpu_kthread_task,
89508 .thread_should_run = rcu_cpu_kthread_should_run,
89509 .thread_fn = rcu_cpu_kthread,
89510@@ -1972,7 +1972,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
89511 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
89512 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
89513 cpu, ticks_value, ticks_title,
89514- atomic_read(&rdtp->dynticks) & 0xfff,
89515+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
89516 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
89517 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
89518 fast_no_hz);
89519@@ -2138,7 +2138,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
89520
89521 /* Enqueue the callback on the nocb list and update counts. */
89522 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
89523- ACCESS_ONCE(*old_rhpp) = rhp;
89524+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
89525 atomic_long_add(rhcount, &rdp->nocb_q_count);
89526 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
89527
89528@@ -2311,12 +2311,12 @@ static int rcu_nocb_kthread(void *arg)
89529 * Extract queued callbacks, update counts, and wait
89530 * for a grace period to elapse.
89531 */
89532- ACCESS_ONCE(rdp->nocb_head) = NULL;
89533+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
89534 tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
89535 c = atomic_long_xchg(&rdp->nocb_q_count, 0);
89536 cl = atomic_long_xchg(&rdp->nocb_q_count_lazy, 0);
89537- ACCESS_ONCE(rdp->nocb_p_count) += c;
89538- ACCESS_ONCE(rdp->nocb_p_count_lazy) += cl;
89539+ ACCESS_ONCE_RW(rdp->nocb_p_count) += c;
89540+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) += cl;
89541 rcu_nocb_wait_gp(rdp);
89542
89543 /* Each pass through the following loop invokes a callback. */
89544@@ -2342,8 +2342,8 @@ static int rcu_nocb_kthread(void *arg)
89545 list = next;
89546 }
89547 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
89548- ACCESS_ONCE(rdp->nocb_p_count) -= c;
89549- ACCESS_ONCE(rdp->nocb_p_count_lazy) -= cl;
89550+ ACCESS_ONCE_RW(rdp->nocb_p_count) -= c;
89551+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) -= cl;
89552 rdp->n_nocbs_invoked += c;
89553 }
89554 return 0;
89555@@ -2360,7 +2360,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
89556 {
89557 if (!rcu_nocb_need_deferred_wakeup(rdp))
89558 return;
89559- ACCESS_ONCE(rdp->nocb_defer_wakeup) = false;
89560+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = false;
89561 wake_up(&rdp->nocb_wq);
89562 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWakeEmpty"));
89563 }
89564@@ -2386,7 +2386,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
89565 t = kthread_run(rcu_nocb_kthread, rdp,
89566 "rcuo%c/%d", rsp->abbr, cpu);
89567 BUG_ON(IS_ERR(t));
89568- ACCESS_ONCE(rdp->nocb_kthread) = t;
89569+ ACCESS_ONCE_RW(rdp->nocb_kthread) = t;
89570 }
89571 }
89572
89573@@ -2522,11 +2522,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
89574
89575 /* Record start of fully idle period. */
89576 j = jiffies;
89577- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
89578+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
89579 smp_mb__before_atomic_inc();
89580- atomic_inc(&rdtp->dynticks_idle);
89581+ atomic_inc_unchecked(&rdtp->dynticks_idle);
89582 smp_mb__after_atomic_inc();
89583- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
89584+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
89585 }
89586
89587 /*
89588@@ -2591,9 +2591,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
89589
89590 /* Record end of idle period. */
89591 smp_mb__before_atomic_inc();
89592- atomic_inc(&rdtp->dynticks_idle);
89593+ atomic_inc_unchecked(&rdtp->dynticks_idle);
89594 smp_mb__after_atomic_inc();
89595- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
89596+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
89597
89598 /*
89599 * If we are the timekeeping CPU, we are permitted to be non-idle
89600@@ -2634,7 +2634,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
89601 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
89602
89603 /* Pick up current idle and NMI-nesting counter and check. */
89604- cur = atomic_read(&rdtp->dynticks_idle);
89605+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
89606 if (cur & 0x1) {
89607 *isidle = false; /* We are not idle! */
89608 return;
89609@@ -2697,7 +2697,7 @@ static void rcu_sysidle(unsigned long j)
89610 case RCU_SYSIDLE_NOT:
89611
89612 /* First time all are idle, so note a short idle period. */
89613- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
89614+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
89615 break;
89616
89617 case RCU_SYSIDLE_SHORT:
89618@@ -2734,7 +2734,7 @@ static void rcu_sysidle(unsigned long j)
89619 static void rcu_sysidle_cancel(void)
89620 {
89621 smp_mb();
89622- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
89623+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
89624 }
89625
89626 /*
89627@@ -2782,7 +2782,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
89628 smp_mb(); /* grace period precedes setting inuse. */
89629
89630 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
89631- ACCESS_ONCE(rshp->inuse) = 0;
89632+ ACCESS_ONCE_RW(rshp->inuse) = 0;
89633 }
89634
89635 /*
89636diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
89637index 5cdc62e..cc52e88 100644
89638--- a/kernel/rcu/tree_trace.c
89639+++ b/kernel/rcu/tree_trace.c
89640@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
89641 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
89642 rdp->passed_quiesce, rdp->qs_pending);
89643 seq_printf(m, " dt=%d/%llx/%d df=%lu",
89644- atomic_read(&rdp->dynticks->dynticks),
89645+ atomic_read_unchecked(&rdp->dynticks->dynticks),
89646 rdp->dynticks->dynticks_nesting,
89647 rdp->dynticks->dynticks_nmi_nesting,
89648 rdp->dynticks_fqs);
89649@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
89650 struct rcu_state *rsp = (struct rcu_state *)m->private;
89651
89652 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",
89653- atomic_long_read(&rsp->expedited_start),
89654+ atomic_long_read_unchecked(&rsp->expedited_start),
89655 atomic_long_read(&rsp->expedited_done),
89656- atomic_long_read(&rsp->expedited_wrap),
89657- atomic_long_read(&rsp->expedited_tryfail),
89658- atomic_long_read(&rsp->expedited_workdone1),
89659- atomic_long_read(&rsp->expedited_workdone2),
89660- atomic_long_read(&rsp->expedited_normal),
89661- atomic_long_read(&rsp->expedited_stoppedcpus),
89662- atomic_long_read(&rsp->expedited_done_tries),
89663- atomic_long_read(&rsp->expedited_done_lost),
89664- atomic_long_read(&rsp->expedited_done_exit));
89665+ atomic_long_read_unchecked(&rsp->expedited_wrap),
89666+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
89667+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
89668+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
89669+ atomic_long_read_unchecked(&rsp->expedited_normal),
89670+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
89671+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
89672+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
89673+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
89674 return 0;
89675 }
89676
89677diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
89678index 4c0a9b0..7e81362 100644
89679--- a/kernel/rcu/update.c
89680+++ b/kernel/rcu/update.c
89681@@ -311,10 +311,10 @@ int rcu_jiffies_till_stall_check(void)
89682 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
89683 */
89684 if (till_stall_check < 3) {
89685- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
89686+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
89687 till_stall_check = 3;
89688 } else if (till_stall_check > 300) {
89689- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
89690+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
89691 till_stall_check = 300;
89692 }
89693 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
89694diff --git a/kernel/resource.c b/kernel/resource.c
89695index 8957d68..770cbe4 100644
89696--- a/kernel/resource.c
89697+++ b/kernel/resource.c
89698@@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
89699
89700 static int __init ioresources_init(void)
89701 {
89702+#ifdef CONFIG_GRKERNSEC_PROC_ADD
89703+#ifdef CONFIG_GRKERNSEC_PROC_USER
89704+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
89705+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
89706+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
89707+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
89708+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
89709+#endif
89710+#else
89711 proc_create("ioports", 0, NULL, &proc_ioports_operations);
89712 proc_create("iomem", 0, NULL, &proc_iomem_operations);
89713+#endif
89714 return 0;
89715 }
89716 __initcall(ioresources_init);
89717diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
89718index e73efba..c9bfbd4 100644
89719--- a/kernel/sched/auto_group.c
89720+++ b/kernel/sched/auto_group.c
89721@@ -11,7 +11,7 @@
89722
89723 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
89724 static struct autogroup autogroup_default;
89725-static atomic_t autogroup_seq_nr;
89726+static atomic_unchecked_t autogroup_seq_nr;
89727
89728 void __init autogroup_init(struct task_struct *init_task)
89729 {
89730@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
89731
89732 kref_init(&ag->kref);
89733 init_rwsem(&ag->lock);
89734- ag->id = atomic_inc_return(&autogroup_seq_nr);
89735+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
89736 ag->tg = tg;
89737 #ifdef CONFIG_RT_GROUP_SCHED
89738 /*
89739diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
89740index a63f4dc..349bbb0 100644
89741--- a/kernel/sched/completion.c
89742+++ b/kernel/sched/completion.c
89743@@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
89744 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
89745 * or number of jiffies left till timeout) if completed.
89746 */
89747-long __sched
89748+long __sched __intentional_overflow(-1)
89749 wait_for_completion_interruptible_timeout(struct completion *x,
89750 unsigned long timeout)
89751 {
89752@@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
89753 *
89754 * Return: -ERESTARTSYS if interrupted, 0 if completed.
89755 */
89756-int __sched wait_for_completion_killable(struct completion *x)
89757+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
89758 {
89759 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
89760 if (t == -ERESTARTSYS)
89761@@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
89762 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
89763 * or number of jiffies left till timeout) if completed.
89764 */
89765-long __sched
89766+long __sched __intentional_overflow(-1)
89767 wait_for_completion_killable_timeout(struct completion *x,
89768 unsigned long timeout)
89769 {
89770diff --git a/kernel/sched/core.c b/kernel/sched/core.c
89771index 084d17f..e416b9f 100644
89772--- a/kernel/sched/core.c
89773+++ b/kernel/sched/core.c
89774@@ -1775,7 +1775,7 @@ void set_numabalancing_state(bool enabled)
89775 int sysctl_numa_balancing(struct ctl_table *table, int write,
89776 void __user *buffer, size_t *lenp, loff_t *ppos)
89777 {
89778- struct ctl_table t;
89779+ ctl_table_no_const t;
89780 int err;
89781 int state = numabalancing_enabled;
89782
89783@@ -2238,8 +2238,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
89784 next->active_mm = oldmm;
89785 atomic_inc(&oldmm->mm_count);
89786 enter_lazy_tlb(oldmm, next);
89787- } else
89788+ } else {
89789 switch_mm(oldmm, mm, next);
89790+ populate_stack();
89791+ }
89792
89793 if (!prev->mm) {
89794 prev->active_mm = NULL;
89795@@ -3004,6 +3006,8 @@ int can_nice(const struct task_struct *p, const int nice)
89796 /* convert nice value [19,-20] to rlimit style value [1,40] */
89797 int nice_rlim = 20 - nice;
89798
89799+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
89800+
89801 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
89802 capable(CAP_SYS_NICE));
89803 }
89804@@ -3037,7 +3041,8 @@ SYSCALL_DEFINE1(nice, int, increment)
89805 if (nice > MAX_NICE)
89806 nice = MAX_NICE;
89807
89808- if (increment < 0 && !can_nice(current, nice))
89809+ if (increment < 0 && (!can_nice(current, nice) ||
89810+ gr_handle_chroot_nice()))
89811 return -EPERM;
89812
89813 retval = security_task_setnice(current, nice);
89814@@ -3310,6 +3315,7 @@ recheck:
89815 if (policy != p->policy && !rlim_rtprio)
89816 return -EPERM;
89817
89818+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
89819 /* can't increase priority */
89820 if (attr->sched_priority > p->rt_priority &&
89821 attr->sched_priority > rlim_rtprio)
89822@@ -4708,6 +4714,7 @@ void idle_task_exit(void)
89823
89824 if (mm != &init_mm) {
89825 switch_mm(mm, &init_mm, current);
89826+ populate_stack();
89827 finish_arch_post_lock_switch();
89828 }
89829 mmdrop(mm);
89830@@ -4803,7 +4810,7 @@ static void migrate_tasks(unsigned int dead_cpu)
89831
89832 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
89833
89834-static struct ctl_table sd_ctl_dir[] = {
89835+static ctl_table_no_const sd_ctl_dir[] __read_only = {
89836 {
89837 .procname = "sched_domain",
89838 .mode = 0555,
89839@@ -4820,17 +4827,17 @@ static struct ctl_table sd_ctl_root[] = {
89840 {}
89841 };
89842
89843-static struct ctl_table *sd_alloc_ctl_entry(int n)
89844+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
89845 {
89846- struct ctl_table *entry =
89847+ ctl_table_no_const *entry =
89848 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
89849
89850 return entry;
89851 }
89852
89853-static void sd_free_ctl_entry(struct ctl_table **tablep)
89854+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
89855 {
89856- struct ctl_table *entry;
89857+ ctl_table_no_const *entry;
89858
89859 /*
89860 * In the intermediate directories, both the child directory and
89861@@ -4838,22 +4845,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
89862 * will always be set. In the lowest directory the names are
89863 * static strings and all have proc handlers.
89864 */
89865- for (entry = *tablep; entry->mode; entry++) {
89866- if (entry->child)
89867- sd_free_ctl_entry(&entry->child);
89868+ for (entry = tablep; entry->mode; entry++) {
89869+ if (entry->child) {
89870+ sd_free_ctl_entry(entry->child);
89871+ pax_open_kernel();
89872+ entry->child = NULL;
89873+ pax_close_kernel();
89874+ }
89875 if (entry->proc_handler == NULL)
89876 kfree(entry->procname);
89877 }
89878
89879- kfree(*tablep);
89880- *tablep = NULL;
89881+ kfree(tablep);
89882 }
89883
89884 static int min_load_idx = 0;
89885 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
89886
89887 static void
89888-set_table_entry(struct ctl_table *entry,
89889+set_table_entry(ctl_table_no_const *entry,
89890 const char *procname, void *data, int maxlen,
89891 umode_t mode, proc_handler *proc_handler,
89892 bool load_idx)
89893@@ -4873,7 +4883,7 @@ set_table_entry(struct ctl_table *entry,
89894 static struct ctl_table *
89895 sd_alloc_ctl_domain_table(struct sched_domain *sd)
89896 {
89897- struct ctl_table *table = sd_alloc_ctl_entry(14);
89898+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
89899
89900 if (table == NULL)
89901 return NULL;
89902@@ -4911,9 +4921,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
89903 return table;
89904 }
89905
89906-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
89907+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
89908 {
89909- struct ctl_table *entry, *table;
89910+ ctl_table_no_const *entry, *table;
89911 struct sched_domain *sd;
89912 int domain_num = 0, i;
89913 char buf[32];
89914@@ -4940,11 +4950,13 @@ static struct ctl_table_header *sd_sysctl_header;
89915 static void register_sched_domain_sysctl(void)
89916 {
89917 int i, cpu_num = num_possible_cpus();
89918- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
89919+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
89920 char buf[32];
89921
89922 WARN_ON(sd_ctl_dir[0].child);
89923+ pax_open_kernel();
89924 sd_ctl_dir[0].child = entry;
89925+ pax_close_kernel();
89926
89927 if (entry == NULL)
89928 return;
89929@@ -4967,8 +4979,12 @@ static void unregister_sched_domain_sysctl(void)
89930 if (sd_sysctl_header)
89931 unregister_sysctl_table(sd_sysctl_header);
89932 sd_sysctl_header = NULL;
89933- if (sd_ctl_dir[0].child)
89934- sd_free_ctl_entry(&sd_ctl_dir[0].child);
89935+ if (sd_ctl_dir[0].child) {
89936+ sd_free_ctl_entry(sd_ctl_dir[0].child);
89937+ pax_open_kernel();
89938+ sd_ctl_dir[0].child = NULL;
89939+ pax_close_kernel();
89940+ }
89941 }
89942 #else
89943 static void register_sched_domain_sysctl(void)
89944diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
89945index 8cbe2d2..61f20a1 100644
89946--- a/kernel/sched/fair.c
89947+++ b/kernel/sched/fair.c
89948@@ -1806,7 +1806,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
89949
89950 static void reset_ptenuma_scan(struct task_struct *p)
89951 {
89952- ACCESS_ONCE(p->mm->numa_scan_seq)++;
89953+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
89954 p->mm->numa_scan_offset = 0;
89955 }
89956
89957@@ -7181,7 +7181,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
89958 * run_rebalance_domains is triggered when needed from the scheduler tick.
89959 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
89960 */
89961-static void run_rebalance_domains(struct softirq_action *h)
89962+static __latent_entropy void run_rebalance_domains(void)
89963 {
89964 struct rq *this_rq = this_rq();
89965 enum cpu_idle_type idle = this_rq->idle_balance ?
89966diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
89967index 369b4d6..fa4eb3b 100644
89968--- a/kernel/sched/sched.h
89969+++ b/kernel/sched/sched.h
89970@@ -1157,7 +1157,7 @@ struct sched_class {
89971 #ifdef CONFIG_FAIR_GROUP_SCHED
89972 void (*task_move_group) (struct task_struct *p, int on_rq);
89973 #endif
89974-};
89975+} __do_const;
89976
89977 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
89978 {
89979diff --git a/kernel/signal.c b/kernel/signal.c
89980index 6ea13c0..31e3b25 100644
89981--- a/kernel/signal.c
89982+++ b/kernel/signal.c
89983@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
89984
89985 int print_fatal_signals __read_mostly;
89986
89987-static void __user *sig_handler(struct task_struct *t, int sig)
89988+static __sighandler_t sig_handler(struct task_struct *t, int sig)
89989 {
89990 return t->sighand->action[sig - 1].sa.sa_handler;
89991 }
89992
89993-static int sig_handler_ignored(void __user *handler, int sig)
89994+static int sig_handler_ignored(__sighandler_t handler, int sig)
89995 {
89996 /* Is it explicitly or implicitly ignored? */
89997 return handler == SIG_IGN ||
89998@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
89999
90000 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
90001 {
90002- void __user *handler;
90003+ __sighandler_t handler;
90004
90005 handler = sig_handler(t, sig);
90006
90007@@ -371,6 +371,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
90008 atomic_inc(&user->sigpending);
90009 rcu_read_unlock();
90010
90011+ if (!override_rlimit)
90012+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
90013+
90014 if (override_rlimit ||
90015 atomic_read(&user->sigpending) <=
90016 task_rlimit(t, RLIMIT_SIGPENDING)) {
90017@@ -498,7 +501,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
90018
90019 int unhandled_signal(struct task_struct *tsk, int sig)
90020 {
90021- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
90022+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
90023 if (is_global_init(tsk))
90024 return 1;
90025 if (handler != SIG_IGN && handler != SIG_DFL)
90026@@ -818,6 +821,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
90027 }
90028 }
90029
90030+ /* allow glibc communication via tgkill to other threads in our
90031+ thread group */
90032+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
90033+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
90034+ && gr_handle_signal(t, sig))
90035+ return -EPERM;
90036+
90037 return security_task_kill(t, info, sig, 0);
90038 }
90039
90040@@ -1201,7 +1211,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
90041 return send_signal(sig, info, p, 1);
90042 }
90043
90044-static int
90045+int
90046 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
90047 {
90048 return send_signal(sig, info, t, 0);
90049@@ -1238,6 +1248,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
90050 unsigned long int flags;
90051 int ret, blocked, ignored;
90052 struct k_sigaction *action;
90053+ int is_unhandled = 0;
90054
90055 spin_lock_irqsave(&t->sighand->siglock, flags);
90056 action = &t->sighand->action[sig-1];
90057@@ -1252,9 +1263,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
90058 }
90059 if (action->sa.sa_handler == SIG_DFL)
90060 t->signal->flags &= ~SIGNAL_UNKILLABLE;
90061+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
90062+ is_unhandled = 1;
90063 ret = specific_send_sig_info(sig, info, t);
90064 spin_unlock_irqrestore(&t->sighand->siglock, flags);
90065
90066+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
90067+ normal operation */
90068+ if (is_unhandled) {
90069+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
90070+ gr_handle_crash(t, sig);
90071+ }
90072+
90073 return ret;
90074 }
90075
90076@@ -1321,8 +1341,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
90077 ret = check_kill_permission(sig, info, p);
90078 rcu_read_unlock();
90079
90080- if (!ret && sig)
90081+ if (!ret && sig) {
90082 ret = do_send_sig_info(sig, info, p, true);
90083+ if (!ret)
90084+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
90085+ }
90086
90087 return ret;
90088 }
90089@@ -2928,7 +2951,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
90090 int error = -ESRCH;
90091
90092 rcu_read_lock();
90093- p = find_task_by_vpid(pid);
90094+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90095+ /* allow glibc communication via tgkill to other threads in our
90096+ thread group */
90097+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
90098+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
90099+ p = find_task_by_vpid_unrestricted(pid);
90100+ else
90101+#endif
90102+ p = find_task_by_vpid(pid);
90103 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
90104 error = check_kill_permission(sig, info, p);
90105 /*
90106@@ -3241,8 +3272,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
90107 }
90108 seg = get_fs();
90109 set_fs(KERNEL_DS);
90110- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
90111- (stack_t __force __user *) &uoss,
90112+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
90113+ (stack_t __force_user *) &uoss,
90114 compat_user_stack_pointer());
90115 set_fs(seg);
90116 if (ret >= 0 && uoss_ptr) {
90117diff --git a/kernel/smpboot.c b/kernel/smpboot.c
90118index eb89e18..a4e6792 100644
90119--- a/kernel/smpboot.c
90120+++ b/kernel/smpboot.c
90121@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
90122 }
90123 smpboot_unpark_thread(plug_thread, cpu);
90124 }
90125- list_add(&plug_thread->list, &hotplug_threads);
90126+ pax_list_add(&plug_thread->list, &hotplug_threads);
90127 out:
90128 mutex_unlock(&smpboot_threads_lock);
90129 return ret;
90130@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
90131 {
90132 get_online_cpus();
90133 mutex_lock(&smpboot_threads_lock);
90134- list_del(&plug_thread->list);
90135+ pax_list_del(&plug_thread->list);
90136 smpboot_destroy_threads(plug_thread);
90137 mutex_unlock(&smpboot_threads_lock);
90138 put_online_cpus();
90139diff --git a/kernel/softirq.c b/kernel/softirq.c
90140index 92f24f5..db41501 100644
90141--- a/kernel/softirq.c
90142+++ b/kernel/softirq.c
90143@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
90144 EXPORT_SYMBOL(irq_stat);
90145 #endif
90146
90147-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
90148+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
90149
90150 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
90151
90152@@ -268,7 +268,7 @@ restart:
90153 kstat_incr_softirqs_this_cpu(vec_nr);
90154
90155 trace_softirq_entry(vec_nr);
90156- h->action(h);
90157+ h->action();
90158 trace_softirq_exit(vec_nr);
90159 if (unlikely(prev_count != preempt_count())) {
90160 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
90161@@ -428,7 +428,7 @@ void __raise_softirq_irqoff(unsigned int nr)
90162 or_softirq_pending(1UL << nr);
90163 }
90164
90165-void open_softirq(int nr, void (*action)(struct softirq_action *))
90166+void __init open_softirq(int nr, void (*action)(void))
90167 {
90168 softirq_vec[nr].action = action;
90169 }
90170@@ -480,7 +480,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
90171 }
90172 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
90173
90174-static void tasklet_action(struct softirq_action *a)
90175+static void tasklet_action(void)
90176 {
90177 struct tasklet_struct *list;
90178
90179@@ -516,7 +516,7 @@ static void tasklet_action(struct softirq_action *a)
90180 }
90181 }
90182
90183-static void tasklet_hi_action(struct softirq_action *a)
90184+static __latent_entropy void tasklet_hi_action(void)
90185 {
90186 struct tasklet_struct *list;
90187
90188@@ -743,7 +743,7 @@ static struct notifier_block cpu_nfb = {
90189 .notifier_call = cpu_callback
90190 };
90191
90192-static struct smp_hotplug_thread softirq_threads = {
90193+static struct smp_hotplug_thread softirq_threads __read_only = {
90194 .store = &ksoftirqd,
90195 .thread_should_run = ksoftirqd_should_run,
90196 .thread_fn = run_ksoftirqd,
90197diff --git a/kernel/sys.c b/kernel/sys.c
90198index fba0f29..84400e2 100644
90199--- a/kernel/sys.c
90200+++ b/kernel/sys.c
90201@@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
90202 error = -EACCES;
90203 goto out;
90204 }
90205+
90206+ if (gr_handle_chroot_setpriority(p, niceval)) {
90207+ error = -EACCES;
90208+ goto out;
90209+ }
90210+
90211 no_nice = security_task_setnice(p, niceval);
90212 if (no_nice) {
90213 error = no_nice;
90214@@ -351,6 +357,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
90215 goto error;
90216 }
90217
90218+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
90219+ goto error;
90220+
90221 if (rgid != (gid_t) -1 ||
90222 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
90223 new->sgid = new->egid;
90224@@ -386,6 +395,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
90225 old = current_cred();
90226
90227 retval = -EPERM;
90228+
90229+ if (gr_check_group_change(kgid, kgid, kgid))
90230+ goto error;
90231+
90232 if (ns_capable(old->user_ns, CAP_SETGID))
90233 new->gid = new->egid = new->sgid = new->fsgid = kgid;
90234 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
90235@@ -403,7 +416,7 @@ error:
90236 /*
90237 * change the user struct in a credentials set to match the new UID
90238 */
90239-static int set_user(struct cred *new)
90240+int set_user(struct cred *new)
90241 {
90242 struct user_struct *new_user;
90243
90244@@ -483,6 +496,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
90245 goto error;
90246 }
90247
90248+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
90249+ goto error;
90250+
90251 if (!uid_eq(new->uid, old->uid)) {
90252 retval = set_user(new);
90253 if (retval < 0)
90254@@ -533,6 +549,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
90255 old = current_cred();
90256
90257 retval = -EPERM;
90258+
90259+ if (gr_check_crash_uid(kuid))
90260+ goto error;
90261+ if (gr_check_user_change(kuid, kuid, kuid))
90262+ goto error;
90263+
90264 if (ns_capable(old->user_ns, CAP_SETUID)) {
90265 new->suid = new->uid = kuid;
90266 if (!uid_eq(kuid, old->uid)) {
90267@@ -602,6 +624,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
90268 goto error;
90269 }
90270
90271+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
90272+ goto error;
90273+
90274 if (ruid != (uid_t) -1) {
90275 new->uid = kruid;
90276 if (!uid_eq(kruid, old->uid)) {
90277@@ -684,6 +709,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
90278 goto error;
90279 }
90280
90281+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
90282+ goto error;
90283+
90284 if (rgid != (gid_t) -1)
90285 new->gid = krgid;
90286 if (egid != (gid_t) -1)
90287@@ -745,12 +773,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
90288 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
90289 ns_capable(old->user_ns, CAP_SETUID)) {
90290 if (!uid_eq(kuid, old->fsuid)) {
90291+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
90292+ goto error;
90293+
90294 new->fsuid = kuid;
90295 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
90296 goto change_okay;
90297 }
90298 }
90299
90300+error:
90301 abort_creds(new);
90302 return old_fsuid;
90303
90304@@ -783,12 +815,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
90305 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
90306 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
90307 ns_capable(old->user_ns, CAP_SETGID)) {
90308+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
90309+ goto error;
90310+
90311 if (!gid_eq(kgid, old->fsgid)) {
90312 new->fsgid = kgid;
90313 goto change_okay;
90314 }
90315 }
90316
90317+error:
90318 abort_creds(new);
90319 return old_fsgid;
90320
90321@@ -1167,19 +1203,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
90322 return -EFAULT;
90323
90324 down_read(&uts_sem);
90325- error = __copy_to_user(&name->sysname, &utsname()->sysname,
90326+ error = __copy_to_user(name->sysname, &utsname()->sysname,
90327 __OLD_UTS_LEN);
90328 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
90329- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
90330+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
90331 __OLD_UTS_LEN);
90332 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
90333- error |= __copy_to_user(&name->release, &utsname()->release,
90334+ error |= __copy_to_user(name->release, &utsname()->release,
90335 __OLD_UTS_LEN);
90336 error |= __put_user(0, name->release + __OLD_UTS_LEN);
90337- error |= __copy_to_user(&name->version, &utsname()->version,
90338+ error |= __copy_to_user(name->version, &utsname()->version,
90339 __OLD_UTS_LEN);
90340 error |= __put_user(0, name->version + __OLD_UTS_LEN);
90341- error |= __copy_to_user(&name->machine, &utsname()->machine,
90342+ error |= __copy_to_user(name->machine, &utsname()->machine,
90343 __OLD_UTS_LEN);
90344 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
90345 up_read(&uts_sem);
90346@@ -1381,6 +1417,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
90347 */
90348 new_rlim->rlim_cur = 1;
90349 }
90350+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
90351+ is changed to a lower value. Since tasks can be created by the same
90352+ user in between this limit change and an execve by this task, force
90353+ a recheck only for this task by setting PF_NPROC_EXCEEDED
90354+ */
90355+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
90356+ tsk->flags |= PF_NPROC_EXCEEDED;
90357 }
90358 if (!retval) {
90359 if (old_rlim)
90360diff --git a/kernel/sysctl.c b/kernel/sysctl.c
90361index 74f5b58..65ba165 100644
90362--- a/kernel/sysctl.c
90363+++ b/kernel/sysctl.c
90364@@ -94,7 +94,6 @@
90365
90366
90367 #if defined(CONFIG_SYSCTL)
90368-
90369 /* External variables not in a header file. */
90370 extern int max_threads;
90371 extern int suid_dumpable;
90372@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
90373
90374 /* Constants used for minimum and maximum */
90375 #ifdef CONFIG_LOCKUP_DETECTOR
90376-static int sixty = 60;
90377+static int sixty __read_only = 60;
90378 #endif
90379
90380-static int __maybe_unused neg_one = -1;
90381+static int __maybe_unused neg_one __read_only = -1;
90382
90383-static int zero;
90384-static int __maybe_unused one = 1;
90385-static int __maybe_unused two = 2;
90386-static int __maybe_unused four = 4;
90387-static unsigned long one_ul = 1;
90388-static int one_hundred = 100;
90389+static int zero __read_only = 0;
90390+static int __maybe_unused one __read_only = 1;
90391+static int __maybe_unused two __read_only = 2;
90392+static int __maybe_unused three __read_only = 3;
90393+static int __maybe_unused four __read_only = 4;
90394+static unsigned long one_ul __read_only = 1;
90395+static int one_hundred __read_only = 100;
90396 #ifdef CONFIG_PRINTK
90397-static int ten_thousand = 10000;
90398+static int ten_thousand __read_only = 10000;
90399 #endif
90400
90401 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
90402@@ -179,10 +179,8 @@ static int proc_taint(struct ctl_table *table, int write,
90403 void __user *buffer, size_t *lenp, loff_t *ppos);
90404 #endif
90405
90406-#ifdef CONFIG_PRINTK
90407 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90408 void __user *buffer, size_t *lenp, loff_t *ppos);
90409-#endif
90410
90411 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
90412 void __user *buffer, size_t *lenp, loff_t *ppos);
90413@@ -213,6 +211,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
90414
90415 #endif
90416
90417+extern struct ctl_table grsecurity_table[];
90418+
90419 static struct ctl_table kern_table[];
90420 static struct ctl_table vm_table[];
90421 static struct ctl_table fs_table[];
90422@@ -227,6 +227,20 @@ extern struct ctl_table epoll_table[];
90423 int sysctl_legacy_va_layout;
90424 #endif
90425
90426+#ifdef CONFIG_PAX_SOFTMODE
90427+static ctl_table pax_table[] = {
90428+ {
90429+ .procname = "softmode",
90430+ .data = &pax_softmode,
90431+ .maxlen = sizeof(unsigned int),
90432+ .mode = 0600,
90433+ .proc_handler = &proc_dointvec,
90434+ },
90435+
90436+ { }
90437+};
90438+#endif
90439+
90440 /* The default sysctl tables: */
90441
90442 static struct ctl_table sysctl_base_table[] = {
90443@@ -275,6 +289,22 @@ static int max_extfrag_threshold = 1000;
90444 #endif
90445
90446 static struct ctl_table kern_table[] = {
90447+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
90448+ {
90449+ .procname = "grsecurity",
90450+ .mode = 0500,
90451+ .child = grsecurity_table,
90452+ },
90453+#endif
90454+
90455+#ifdef CONFIG_PAX_SOFTMODE
90456+ {
90457+ .procname = "pax",
90458+ .mode = 0500,
90459+ .child = pax_table,
90460+ },
90461+#endif
90462+
90463 {
90464 .procname = "sched_child_runs_first",
90465 .data = &sysctl_sched_child_runs_first,
90466@@ -630,7 +660,7 @@ static struct ctl_table kern_table[] = {
90467 .data = &modprobe_path,
90468 .maxlen = KMOD_PATH_LEN,
90469 .mode = 0644,
90470- .proc_handler = proc_dostring,
90471+ .proc_handler = proc_dostring_modpriv,
90472 },
90473 {
90474 .procname = "modules_disabled",
90475@@ -797,16 +827,20 @@ static struct ctl_table kern_table[] = {
90476 .extra1 = &zero,
90477 .extra2 = &one,
90478 },
90479+#endif
90480 {
90481 .procname = "kptr_restrict",
90482 .data = &kptr_restrict,
90483 .maxlen = sizeof(int),
90484 .mode = 0644,
90485 .proc_handler = proc_dointvec_minmax_sysadmin,
90486+#ifdef CONFIG_GRKERNSEC_HIDESYM
90487+ .extra1 = &two,
90488+#else
90489 .extra1 = &zero,
90490+#endif
90491 .extra2 = &two,
90492 },
90493-#endif
90494 {
90495 .procname = "ngroups_max",
90496 .data = &ngroups_max,
90497@@ -1051,10 +1085,17 @@ static struct ctl_table kern_table[] = {
90498 */
90499 {
90500 .procname = "perf_event_paranoid",
90501- .data = &sysctl_perf_event_paranoid,
90502- .maxlen = sizeof(sysctl_perf_event_paranoid),
90503+ .data = &sysctl_perf_event_legitimately_concerned,
90504+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
90505 .mode = 0644,
90506- .proc_handler = proc_dointvec,
90507+ /* go ahead, be a hero */
90508+ .proc_handler = proc_dointvec_minmax_sysadmin,
90509+ .extra1 = &neg_one,
90510+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
90511+ .extra2 = &three,
90512+#else
90513+ .extra2 = &two,
90514+#endif
90515 },
90516 {
90517 .procname = "perf_event_mlock_kb",
90518@@ -1316,6 +1357,13 @@ static struct ctl_table vm_table[] = {
90519 .proc_handler = proc_dointvec_minmax,
90520 .extra1 = &zero,
90521 },
90522+ {
90523+ .procname = "heap_stack_gap",
90524+ .data = &sysctl_heap_stack_gap,
90525+ .maxlen = sizeof(sysctl_heap_stack_gap),
90526+ .mode = 0644,
90527+ .proc_handler = proc_doulongvec_minmax,
90528+ },
90529 #else
90530 {
90531 .procname = "nr_trim_pages",
90532@@ -1780,6 +1828,16 @@ int proc_dostring(struct ctl_table *table, int write,
90533 buffer, lenp, ppos);
90534 }
90535
90536+int proc_dostring_modpriv(struct ctl_table *table, int write,
90537+ void __user *buffer, size_t *lenp, loff_t *ppos)
90538+{
90539+ if (write && !capable(CAP_SYS_MODULE))
90540+ return -EPERM;
90541+
90542+ return _proc_do_string(table->data, table->maxlen, write,
90543+ buffer, lenp, ppos);
90544+}
90545+
90546 static size_t proc_skip_spaces(char **buf)
90547 {
90548 size_t ret;
90549@@ -1885,6 +1943,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
90550 len = strlen(tmp);
90551 if (len > *size)
90552 len = *size;
90553+ if (len > sizeof(tmp))
90554+ len = sizeof(tmp);
90555 if (copy_to_user(*buf, tmp, len))
90556 return -EFAULT;
90557 *size -= len;
90558@@ -2049,7 +2109,7 @@ int proc_dointvec(struct ctl_table *table, int write,
90559 static int proc_taint(struct ctl_table *table, int write,
90560 void __user *buffer, size_t *lenp, loff_t *ppos)
90561 {
90562- struct ctl_table t;
90563+ ctl_table_no_const t;
90564 unsigned long tmptaint = get_taint();
90565 int err;
90566
90567@@ -2077,7 +2137,6 @@ static int proc_taint(struct ctl_table *table, int write,
90568 return err;
90569 }
90570
90571-#ifdef CONFIG_PRINTK
90572 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90573 void __user *buffer, size_t *lenp, loff_t *ppos)
90574 {
90575@@ -2086,7 +2145,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
90576
90577 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
90578 }
90579-#endif
90580
90581 struct do_proc_dointvec_minmax_conv_param {
90582 int *min;
90583@@ -2633,6 +2691,12 @@ int proc_dostring(struct ctl_table *table, int write,
90584 return -ENOSYS;
90585 }
90586
90587+int proc_dostring_modpriv(struct ctl_table *table, int write,
90588+ void __user *buffer, size_t *lenp, loff_t *ppos)
90589+{
90590+ return -ENOSYS;
90591+}
90592+
90593 int proc_dointvec(struct ctl_table *table, int write,
90594 void __user *buffer, size_t *lenp, loff_t *ppos)
90595 {
90596@@ -2689,5 +2753,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
90597 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
90598 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
90599 EXPORT_SYMBOL(proc_dostring);
90600+EXPORT_SYMBOL(proc_dostring_modpriv);
90601 EXPORT_SYMBOL(proc_doulongvec_minmax);
90602 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
90603diff --git a/kernel/taskstats.c b/kernel/taskstats.c
90604index 13d2f7c..c93d0b0 100644
90605--- a/kernel/taskstats.c
90606+++ b/kernel/taskstats.c
90607@@ -28,9 +28,12 @@
90608 #include <linux/fs.h>
90609 #include <linux/file.h>
90610 #include <linux/pid_namespace.h>
90611+#include <linux/grsecurity.h>
90612 #include <net/genetlink.h>
90613 #include <linux/atomic.h>
90614
90615+extern int gr_is_taskstats_denied(int pid);
90616+
90617 /*
90618 * Maximum length of a cpumask that can be specified in
90619 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
90620@@ -576,6 +579,9 @@ err:
90621
90622 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
90623 {
90624+ if (gr_is_taskstats_denied(current->pid))
90625+ return -EACCES;
90626+
90627 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
90628 return cmd_attr_register_cpumask(info);
90629 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
90630diff --git a/kernel/time.c b/kernel/time.c
90631index 7c7964c..2a0d412 100644
90632--- a/kernel/time.c
90633+++ b/kernel/time.c
90634@@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
90635 return error;
90636
90637 if (tz) {
90638+ /* we log in do_settimeofday called below, so don't log twice
90639+ */
90640+ if (!tv)
90641+ gr_log_timechange();
90642+
90643 sys_tz = *tz;
90644 update_vsyscall_tz();
90645 if (firsttime) {
90646diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
90647index 88c9c65..7497ebc 100644
90648--- a/kernel/time/alarmtimer.c
90649+++ b/kernel/time/alarmtimer.c
90650@@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
90651 struct platform_device *pdev;
90652 int error = 0;
90653 int i;
90654- struct k_clock alarm_clock = {
90655+ static struct k_clock alarm_clock = {
90656 .clock_getres = alarm_clock_getres,
90657 .clock_get = alarm_clock_get,
90658 .timer_create = alarm_timer_create,
90659diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
90660index f7df8ea..0810193 100644
90661--- a/kernel/time/timekeeping.c
90662+++ b/kernel/time/timekeeping.c
90663@@ -15,6 +15,7 @@
90664 #include <linux/init.h>
90665 #include <linux/mm.h>
90666 #include <linux/sched.h>
90667+#include <linux/grsecurity.h>
90668 #include <linux/syscore_ops.h>
90669 #include <linux/clocksource.h>
90670 #include <linux/jiffies.h>
90671@@ -502,6 +503,8 @@ int do_settimeofday(const struct timespec *tv)
90672 if (!timespec_valid_strict(tv))
90673 return -EINVAL;
90674
90675+ gr_log_timechange();
90676+
90677 raw_spin_lock_irqsave(&timekeeper_lock, flags);
90678 write_seqcount_begin(&timekeeper_seq);
90679
90680diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
90681index 61ed862..3b52c65 100644
90682--- a/kernel/time/timer_list.c
90683+++ b/kernel/time/timer_list.c
90684@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
90685
90686 static void print_name_offset(struct seq_file *m, void *sym)
90687 {
90688+#ifdef CONFIG_GRKERNSEC_HIDESYM
90689+ SEQ_printf(m, "<%p>", NULL);
90690+#else
90691 char symname[KSYM_NAME_LEN];
90692
90693 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
90694 SEQ_printf(m, "<%pK>", sym);
90695 else
90696 SEQ_printf(m, "%s", symname);
90697+#endif
90698 }
90699
90700 static void
90701@@ -119,7 +123,11 @@ next_one:
90702 static void
90703 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
90704 {
90705+#ifdef CONFIG_GRKERNSEC_HIDESYM
90706+ SEQ_printf(m, " .base: %p\n", NULL);
90707+#else
90708 SEQ_printf(m, " .base: %pK\n", base);
90709+#endif
90710 SEQ_printf(m, " .index: %d\n",
90711 base->index);
90712 SEQ_printf(m, " .resolution: %Lu nsecs\n",
90713@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
90714 {
90715 struct proc_dir_entry *pe;
90716
90717+#ifdef CONFIG_GRKERNSEC_PROC_ADD
90718+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
90719+#else
90720 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
90721+#endif
90722 if (!pe)
90723 return -ENOMEM;
90724 return 0;
90725diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
90726index 1fb08f2..ca4bb1e 100644
90727--- a/kernel/time/timer_stats.c
90728+++ b/kernel/time/timer_stats.c
90729@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
90730 static unsigned long nr_entries;
90731 static struct entry entries[MAX_ENTRIES];
90732
90733-static atomic_t overflow_count;
90734+static atomic_unchecked_t overflow_count;
90735
90736 /*
90737 * The entries are in a hash-table, for fast lookup:
90738@@ -140,7 +140,7 @@ static void reset_entries(void)
90739 nr_entries = 0;
90740 memset(entries, 0, sizeof(entries));
90741 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
90742- atomic_set(&overflow_count, 0);
90743+ atomic_set_unchecked(&overflow_count, 0);
90744 }
90745
90746 static struct entry *alloc_entry(void)
90747@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
90748 if (likely(entry))
90749 entry->count++;
90750 else
90751- atomic_inc(&overflow_count);
90752+ atomic_inc_unchecked(&overflow_count);
90753
90754 out_unlock:
90755 raw_spin_unlock_irqrestore(lock, flags);
90756@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
90757
90758 static void print_name_offset(struct seq_file *m, unsigned long addr)
90759 {
90760+#ifdef CONFIG_GRKERNSEC_HIDESYM
90761+ seq_printf(m, "<%p>", NULL);
90762+#else
90763 char symname[KSYM_NAME_LEN];
90764
90765 if (lookup_symbol_name(addr, symname) < 0)
90766- seq_printf(m, "<%p>", (void *)addr);
90767+ seq_printf(m, "<%pK>", (void *)addr);
90768 else
90769 seq_printf(m, "%s", symname);
90770+#endif
90771 }
90772
90773 static int tstats_show(struct seq_file *m, void *v)
90774@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
90775
90776 seq_puts(m, "Timer Stats Version: v0.3\n");
90777 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
90778- if (atomic_read(&overflow_count))
90779- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
90780+ if (atomic_read_unchecked(&overflow_count))
90781+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
90782 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
90783
90784 for (i = 0; i < nr_entries; i++) {
90785@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
90786 {
90787 struct proc_dir_entry *pe;
90788
90789+#ifdef CONFIG_GRKERNSEC_PROC_ADD
90790+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
90791+#else
90792 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
90793+#endif
90794 if (!pe)
90795 return -ENOMEM;
90796 return 0;
90797diff --git a/kernel/timer.c b/kernel/timer.c
90798index 3bb01a3..0e7760e 100644
90799--- a/kernel/timer.c
90800+++ b/kernel/timer.c
90801@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
90802 /*
90803 * This function runs timers and the timer-tq in bottom half context.
90804 */
90805-static void run_timer_softirq(struct softirq_action *h)
90806+static __latent_entropy void run_timer_softirq(void)
90807 {
90808 struct tvec_base *base = __this_cpu_read(tvec_bases);
90809
90810@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
90811 *
90812 * In all cases the return value is guaranteed to be non-negative.
90813 */
90814-signed long __sched schedule_timeout(signed long timeout)
90815+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
90816 {
90817 struct timer_list timer;
90818 unsigned long expire;
90819diff --git a/kernel/torture.c b/kernel/torture.c
90820index acc9afc..4f9eb49 100644
90821--- a/kernel/torture.c
90822+++ b/kernel/torture.c
90823@@ -489,7 +489,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
90824 mutex_lock(&fullstop_mutex);
90825 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
90826 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
90827- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
90828+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
90829 } else {
90830 pr_warn("Concurrent rmmod and shutdown illegal!\n");
90831 }
90832@@ -551,11 +551,11 @@ static int torture_stutter(void *arg)
90833 do {
90834 if (!torture_must_stop()) {
90835 schedule_timeout_interruptible(stutter);
90836- ACCESS_ONCE(stutter_pause_test) = 1;
90837+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
90838 }
90839 if (!torture_must_stop())
90840 schedule_timeout_interruptible(stutter);
90841- ACCESS_ONCE(stutter_pause_test) = 0;
90842+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
90843 torture_shutdown_absorb("torture_stutter");
90844 } while (!torture_must_stop());
90845 torture_kthread_stopping("torture_stutter");
90846@@ -636,7 +636,7 @@ bool torture_cleanup(void)
90847 schedule_timeout_uninterruptible(10);
90848 return true;
90849 }
90850- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
90851+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
90852 mutex_unlock(&fullstop_mutex);
90853 torture_shutdown_cleanup();
90854 torture_shuffle_cleanup();
90855diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
90856index c1bd4ad..4b861dc 100644
90857--- a/kernel/trace/blktrace.c
90858+++ b/kernel/trace/blktrace.c
90859@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
90860 struct blk_trace *bt = filp->private_data;
90861 char buf[16];
90862
90863- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
90864+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
90865
90866 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
90867 }
90868@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
90869 return 1;
90870
90871 bt = buf->chan->private_data;
90872- atomic_inc(&bt->dropped);
90873+ atomic_inc_unchecked(&bt->dropped);
90874 return 0;
90875 }
90876
90877@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
90878
90879 bt->dir = dir;
90880 bt->dev = dev;
90881- atomic_set(&bt->dropped, 0);
90882+ atomic_set_unchecked(&bt->dropped, 0);
90883 INIT_LIST_HEAD(&bt->running_list);
90884
90885 ret = -EIO;
90886diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
90887index 4a54a25..7ca9c89 100644
90888--- a/kernel/trace/ftrace.c
90889+++ b/kernel/trace/ftrace.c
90890@@ -1960,12 +1960,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
90891 if (unlikely(ftrace_disabled))
90892 return 0;
90893
90894+ ret = ftrace_arch_code_modify_prepare();
90895+ FTRACE_WARN_ON(ret);
90896+ if (ret)
90897+ return 0;
90898+
90899 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
90900+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
90901 if (ret) {
90902 ftrace_bug(ret, ip);
90903- return 0;
90904 }
90905- return 1;
90906+ return ret ? 0 : 1;
90907 }
90908
90909 /*
90910@@ -4195,8 +4200,10 @@ static int ftrace_process_locs(struct module *mod,
90911 if (!count)
90912 return 0;
90913
90914+ pax_open_kernel();
90915 sort(start, count, sizeof(*start),
90916 ftrace_cmp_ips, ftrace_swap_ips);
90917+ pax_close_kernel();
90918
90919 start_pg = ftrace_allocate_pages(count);
90920 if (!start_pg)
90921@@ -4908,8 +4915,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
90922 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
90923
90924 static int ftrace_graph_active;
90925-static struct notifier_block ftrace_suspend_notifier;
90926-
90927 int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
90928 {
90929 return 0;
90930@@ -5085,6 +5090,10 @@ static void update_function_graph_func(void)
90931 ftrace_graph_entry = ftrace_graph_entry_test;
90932 }
90933
90934+static struct notifier_block ftrace_suspend_notifier = {
90935+ .notifier_call = ftrace_suspend_notifier_call
90936+};
90937+
90938 int register_ftrace_graph(trace_func_graph_ret_t retfunc,
90939 trace_func_graph_ent_t entryfunc)
90940 {
90941@@ -5098,7 +5107,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
90942 goto out;
90943 }
90944
90945- ftrace_suspend_notifier.notifier_call = ftrace_suspend_notifier_call;
90946 register_pm_notifier(&ftrace_suspend_notifier);
90947
90948 ftrace_graph_active++;
90949diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
90950index c634868..00d0d19 100644
90951--- a/kernel/trace/ring_buffer.c
90952+++ b/kernel/trace/ring_buffer.c
90953@@ -352,9 +352,9 @@ struct buffer_data_page {
90954 */
90955 struct buffer_page {
90956 struct list_head list; /* list of buffer pages */
90957- local_t write; /* index for next write */
90958+ local_unchecked_t write; /* index for next write */
90959 unsigned read; /* index for next read */
90960- local_t entries; /* entries on this page */
90961+ local_unchecked_t entries; /* entries on this page */
90962 unsigned long real_end; /* real end of data */
90963 struct buffer_data_page *page; /* Actual data page */
90964 };
90965@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
90966 unsigned long last_overrun;
90967 local_t entries_bytes;
90968 local_t entries;
90969- local_t overrun;
90970- local_t commit_overrun;
90971+ local_unchecked_t overrun;
90972+ local_unchecked_t commit_overrun;
90973 local_t dropped_events;
90974 local_t committing;
90975 local_t commits;
90976@@ -992,8 +992,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
90977 *
90978 * We add a counter to the write field to denote this.
90979 */
90980- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
90981- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
90982+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
90983+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
90984
90985 /*
90986 * Just make sure we have seen our old_write and synchronize
90987@@ -1021,8 +1021,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
90988 * cmpxchg to only update if an interrupt did not already
90989 * do it for us. If the cmpxchg fails, we don't care.
90990 */
90991- (void)local_cmpxchg(&next_page->write, old_write, val);
90992- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
90993+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
90994+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
90995
90996 /*
90997 * No need to worry about races with clearing out the commit.
90998@@ -1389,12 +1389,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
90999
91000 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
91001 {
91002- return local_read(&bpage->entries) & RB_WRITE_MASK;
91003+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
91004 }
91005
91006 static inline unsigned long rb_page_write(struct buffer_page *bpage)
91007 {
91008- return local_read(&bpage->write) & RB_WRITE_MASK;
91009+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
91010 }
91011
91012 static int
91013@@ -1489,7 +1489,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
91014 * bytes consumed in ring buffer from here.
91015 * Increment overrun to account for the lost events.
91016 */
91017- local_add(page_entries, &cpu_buffer->overrun);
91018+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
91019 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
91020 }
91021
91022@@ -2067,7 +2067,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
91023 * it is our responsibility to update
91024 * the counters.
91025 */
91026- local_add(entries, &cpu_buffer->overrun);
91027+ local_add_unchecked(entries, &cpu_buffer->overrun);
91028 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
91029
91030 /*
91031@@ -2217,7 +2217,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
91032 if (tail == BUF_PAGE_SIZE)
91033 tail_page->real_end = 0;
91034
91035- local_sub(length, &tail_page->write);
91036+ local_sub_unchecked(length, &tail_page->write);
91037 return;
91038 }
91039
91040@@ -2252,7 +2252,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
91041 rb_event_set_padding(event);
91042
91043 /* Set the write back to the previous setting */
91044- local_sub(length, &tail_page->write);
91045+ local_sub_unchecked(length, &tail_page->write);
91046 return;
91047 }
91048
91049@@ -2264,7 +2264,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
91050
91051 /* Set write to end of buffer */
91052 length = (tail + length) - BUF_PAGE_SIZE;
91053- local_sub(length, &tail_page->write);
91054+ local_sub_unchecked(length, &tail_page->write);
91055 }
91056
91057 /*
91058@@ -2290,7 +2290,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
91059 * about it.
91060 */
91061 if (unlikely(next_page == commit_page)) {
91062- local_inc(&cpu_buffer->commit_overrun);
91063+ local_inc_unchecked(&cpu_buffer->commit_overrun);
91064 goto out_reset;
91065 }
91066
91067@@ -2346,7 +2346,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
91068 cpu_buffer->tail_page) &&
91069 (cpu_buffer->commit_page ==
91070 cpu_buffer->reader_page))) {
91071- local_inc(&cpu_buffer->commit_overrun);
91072+ local_inc_unchecked(&cpu_buffer->commit_overrun);
91073 goto out_reset;
91074 }
91075 }
91076@@ -2394,7 +2394,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
91077 length += RB_LEN_TIME_EXTEND;
91078
91079 tail_page = cpu_buffer->tail_page;
91080- write = local_add_return(length, &tail_page->write);
91081+ write = local_add_return_unchecked(length, &tail_page->write);
91082
91083 /* set write to only the index of the write */
91084 write &= RB_WRITE_MASK;
91085@@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
91086 kmemcheck_annotate_bitfield(event, bitfield);
91087 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
91088
91089- local_inc(&tail_page->entries);
91090+ local_inc_unchecked(&tail_page->entries);
91091
91092 /*
91093 * If this is the first commit on the page, then update
91094@@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
91095
91096 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
91097 unsigned long write_mask =
91098- local_read(&bpage->write) & ~RB_WRITE_MASK;
91099+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
91100 unsigned long event_length = rb_event_length(event);
91101 /*
91102 * This is on the tail page. It is possible that
91103@@ -2461,7 +2461,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
91104 */
91105 old_index += write_mask;
91106 new_index += write_mask;
91107- index = local_cmpxchg(&bpage->write, old_index, new_index);
91108+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
91109 if (index == old_index) {
91110 /* update counters */
91111 local_sub(event_length, &cpu_buffer->entries_bytes);
91112@@ -2853,7 +2853,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
91113
91114 /* Do the likely case first */
91115 if (likely(bpage->page == (void *)addr)) {
91116- local_dec(&bpage->entries);
91117+ local_dec_unchecked(&bpage->entries);
91118 return;
91119 }
91120
91121@@ -2865,7 +2865,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
91122 start = bpage;
91123 do {
91124 if (bpage->page == (void *)addr) {
91125- local_dec(&bpage->entries);
91126+ local_dec_unchecked(&bpage->entries);
91127 return;
91128 }
91129 rb_inc_page(cpu_buffer, &bpage);
91130@@ -3149,7 +3149,7 @@ static inline unsigned long
91131 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
91132 {
91133 return local_read(&cpu_buffer->entries) -
91134- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
91135+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
91136 }
91137
91138 /**
91139@@ -3238,7 +3238,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
91140 return 0;
91141
91142 cpu_buffer = buffer->buffers[cpu];
91143- ret = local_read(&cpu_buffer->overrun);
91144+ ret = local_read_unchecked(&cpu_buffer->overrun);
91145
91146 return ret;
91147 }
91148@@ -3261,7 +3261,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
91149 return 0;
91150
91151 cpu_buffer = buffer->buffers[cpu];
91152- ret = local_read(&cpu_buffer->commit_overrun);
91153+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
91154
91155 return ret;
91156 }
91157@@ -3346,7 +3346,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
91158 /* if you care about this being correct, lock the buffer */
91159 for_each_buffer_cpu(buffer, cpu) {
91160 cpu_buffer = buffer->buffers[cpu];
91161- overruns += local_read(&cpu_buffer->overrun);
91162+ overruns += local_read_unchecked(&cpu_buffer->overrun);
91163 }
91164
91165 return overruns;
91166@@ -3522,8 +3522,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
91167 /*
91168 * Reset the reader page to size zero.
91169 */
91170- local_set(&cpu_buffer->reader_page->write, 0);
91171- local_set(&cpu_buffer->reader_page->entries, 0);
91172+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
91173+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
91174 local_set(&cpu_buffer->reader_page->page->commit, 0);
91175 cpu_buffer->reader_page->real_end = 0;
91176
91177@@ -3557,7 +3557,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
91178 * want to compare with the last_overrun.
91179 */
91180 smp_mb();
91181- overwrite = local_read(&(cpu_buffer->overrun));
91182+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
91183
91184 /*
91185 * Here's the tricky part.
91186@@ -4127,8 +4127,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
91187
91188 cpu_buffer->head_page
91189 = list_entry(cpu_buffer->pages, struct buffer_page, list);
91190- local_set(&cpu_buffer->head_page->write, 0);
91191- local_set(&cpu_buffer->head_page->entries, 0);
91192+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
91193+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
91194 local_set(&cpu_buffer->head_page->page->commit, 0);
91195
91196 cpu_buffer->head_page->read = 0;
91197@@ -4138,14 +4138,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
91198
91199 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
91200 INIT_LIST_HEAD(&cpu_buffer->new_pages);
91201- local_set(&cpu_buffer->reader_page->write, 0);
91202- local_set(&cpu_buffer->reader_page->entries, 0);
91203+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
91204+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
91205 local_set(&cpu_buffer->reader_page->page->commit, 0);
91206 cpu_buffer->reader_page->read = 0;
91207
91208 local_set(&cpu_buffer->entries_bytes, 0);
91209- local_set(&cpu_buffer->overrun, 0);
91210- local_set(&cpu_buffer->commit_overrun, 0);
91211+ local_set_unchecked(&cpu_buffer->overrun, 0);
91212+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
91213 local_set(&cpu_buffer->dropped_events, 0);
91214 local_set(&cpu_buffer->entries, 0);
91215 local_set(&cpu_buffer->committing, 0);
91216@@ -4550,8 +4550,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
91217 rb_init_page(bpage);
91218 bpage = reader->page;
91219 reader->page = *data_page;
91220- local_set(&reader->write, 0);
91221- local_set(&reader->entries, 0);
91222+ local_set_unchecked(&reader->write, 0);
91223+ local_set_unchecked(&reader->entries, 0);
91224 reader->read = 0;
91225 *data_page = bpage;
91226
91227diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
91228index e916972..e87f285 100644
91229--- a/kernel/trace/trace.c
91230+++ b/kernel/trace/trace.c
91231@@ -3449,7 +3449,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
91232 return 0;
91233 }
91234
91235-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
91236+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
91237 {
91238 /* do nothing if flag is already set */
91239 if (!!(trace_flags & mask) == !!enabled)
91240diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
91241index 2e29d7b..61367d7 100644
91242--- a/kernel/trace/trace.h
91243+++ b/kernel/trace/trace.h
91244@@ -1264,7 +1264,7 @@ extern const char *__stop___tracepoint_str[];
91245 void trace_printk_init_buffers(void);
91246 void trace_printk_start_comm(void);
91247 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
91248-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
91249+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
91250
91251 /*
91252 * Normal trace_printk() and friends allocates special buffers
91253diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
91254index 26dc348..8708ca7 100644
91255--- a/kernel/trace/trace_clock.c
91256+++ b/kernel/trace/trace_clock.c
91257@@ -123,7 +123,7 @@ u64 notrace trace_clock_global(void)
91258 return now;
91259 }
91260
91261-static atomic64_t trace_counter;
91262+static atomic64_unchecked_t trace_counter;
91263
91264 /*
91265 * trace_clock_counter(): simply an atomic counter.
91266@@ -132,5 +132,5 @@ static atomic64_t trace_counter;
91267 */
91268 u64 notrace trace_clock_counter(void)
91269 {
91270- return atomic64_add_return(1, &trace_counter);
91271+ return atomic64_inc_return_unchecked(&trace_counter);
91272 }
91273diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
91274index 3ddfd8f..41a10fe 100644
91275--- a/kernel/trace/trace_events.c
91276+++ b/kernel/trace/trace_events.c
91277@@ -1718,7 +1718,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
91278 return 0;
91279 }
91280
91281-struct ftrace_module_file_ops;
91282 static void __add_event_to_tracers(struct ftrace_event_call *call);
91283
91284 /* Add an additional event_call dynamically */
91285diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
91286index 0abd9b8..6a663a2 100644
91287--- a/kernel/trace/trace_mmiotrace.c
91288+++ b/kernel/trace/trace_mmiotrace.c
91289@@ -24,7 +24,7 @@ struct header_iter {
91290 static struct trace_array *mmio_trace_array;
91291 static bool overrun_detected;
91292 static unsigned long prev_overruns;
91293-static atomic_t dropped_count;
91294+static atomic_unchecked_t dropped_count;
91295
91296 static void mmio_reset_data(struct trace_array *tr)
91297 {
91298@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
91299
91300 static unsigned long count_overruns(struct trace_iterator *iter)
91301 {
91302- unsigned long cnt = atomic_xchg(&dropped_count, 0);
91303+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
91304 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
91305
91306 if (over > prev_overruns)
91307@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
91308 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
91309 sizeof(*entry), 0, pc);
91310 if (!event) {
91311- atomic_inc(&dropped_count);
91312+ atomic_inc_unchecked(&dropped_count);
91313 return;
91314 }
91315 entry = ring_buffer_event_data(event);
91316@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
91317 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
91318 sizeof(*entry), 0, pc);
91319 if (!event) {
91320- atomic_inc(&dropped_count);
91321+ atomic_inc_unchecked(&dropped_count);
91322 return;
91323 }
91324 entry = ring_buffer_event_data(event);
91325diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
91326index a436de1..f64dde2 100644
91327--- a/kernel/trace/trace_output.c
91328+++ b/kernel/trace/trace_output.c
91329@@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
91330
91331 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
91332 if (!IS_ERR(p)) {
91333- p = mangle_path(s->buffer + s->len, p, "\n");
91334+ p = mangle_path(s->buffer + s->len, p, "\n\\");
91335 if (p) {
91336 s->len = p - s->buffer;
91337 return 1;
91338@@ -939,14 +939,16 @@ int register_ftrace_event(struct trace_event *event)
91339 goto out;
91340 }
91341
91342+ pax_open_kernel();
91343 if (event->funcs->trace == NULL)
91344- event->funcs->trace = trace_nop_print;
91345+ *(void **)&event->funcs->trace = trace_nop_print;
91346 if (event->funcs->raw == NULL)
91347- event->funcs->raw = trace_nop_print;
91348+ *(void **)&event->funcs->raw = trace_nop_print;
91349 if (event->funcs->hex == NULL)
91350- event->funcs->hex = trace_nop_print;
91351+ *(void **)&event->funcs->hex = trace_nop_print;
91352 if (event->funcs->binary == NULL)
91353- event->funcs->binary = trace_nop_print;
91354+ *(void **)&event->funcs->binary = trace_nop_print;
91355+ pax_close_kernel();
91356
91357 key = event->type & (EVENT_HASHSIZE - 1);
91358
91359diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
91360index 21b320e..40607bc 100644
91361--- a/kernel/trace/trace_stack.c
91362+++ b/kernel/trace/trace_stack.c
91363@@ -69,7 +69,7 @@ check_stack(unsigned long ip, unsigned long *stack)
91364 return;
91365
91366 /* we do not handle interrupt stacks yet */
91367- if (!object_is_on_stack(stack))
91368+ if (!object_starts_on_stack(stack))
91369 return;
91370
91371 local_irq_save(flags);
91372diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
91373index bf71b4b..04dee68 100644
91374--- a/kernel/user_namespace.c
91375+++ b/kernel/user_namespace.c
91376@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
91377 !kgid_has_mapping(parent_ns, group))
91378 return -EPERM;
91379
91380+#ifdef CONFIG_GRKERNSEC
91381+ /*
91382+ * This doesn't really inspire confidence:
91383+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
91384+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
91385+ * Increases kernel attack surface in areas developers
91386+ * previously cared little about ("low importance due
91387+ * to requiring "root" capability")
91388+ * To be removed when this code receives *proper* review
91389+ */
91390+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
91391+ !capable(CAP_SETGID))
91392+ return -EPERM;
91393+#endif
91394+
91395 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
91396 if (!ns)
91397 return -ENOMEM;
91398@@ -865,7 +880,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
91399 if (atomic_read(&current->mm->mm_users) > 1)
91400 return -EINVAL;
91401
91402- if (current->fs->users != 1)
91403+ if (atomic_read(&current->fs->users) != 1)
91404 return -EINVAL;
91405
91406 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
91407diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
91408index 4f69f9a..7c6f8f8 100644
91409--- a/kernel/utsname_sysctl.c
91410+++ b/kernel/utsname_sysctl.c
91411@@ -47,7 +47,7 @@ static void put_uts(ctl_table *table, int write, void *which)
91412 static int proc_do_uts_string(ctl_table *table, int write,
91413 void __user *buffer, size_t *lenp, loff_t *ppos)
91414 {
91415- struct ctl_table uts_table;
91416+ ctl_table_no_const uts_table;
91417 int r;
91418 memcpy(&uts_table, table, sizeof(uts_table));
91419 uts_table.data = get_uts(table, write);
91420diff --git a/kernel/watchdog.c b/kernel/watchdog.c
91421index 30e4822..dd2b854 100644
91422--- a/kernel/watchdog.c
91423+++ b/kernel/watchdog.c
91424@@ -479,7 +479,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
91425 static void watchdog_nmi_disable(unsigned int cpu) { return; }
91426 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
91427
91428-static struct smp_hotplug_thread watchdog_threads = {
91429+static struct smp_hotplug_thread watchdog_threads __read_only = {
91430 .store = &softlockup_watchdog,
91431 .thread_should_run = watchdog_should_run,
91432 .thread_fn = watchdog,
91433diff --git a/kernel/workqueue.c b/kernel/workqueue.c
91434index 8edc8718..b6a70b9 100644
91435--- a/kernel/workqueue.c
91436+++ b/kernel/workqueue.c
91437@@ -4709,7 +4709,7 @@ static void rebind_workers(struct worker_pool *pool)
91438 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
91439 worker_flags |= WORKER_REBOUND;
91440 worker_flags &= ~WORKER_UNBOUND;
91441- ACCESS_ONCE(worker->flags) = worker_flags;
91442+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
91443 }
91444
91445 spin_unlock_irq(&pool->lock);
91446diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
91447index 819ac51..1c8a65e 100644
91448--- a/lib/Kconfig.debug
91449+++ b/lib/Kconfig.debug
91450@@ -853,7 +853,7 @@ config DEBUG_MUTEXES
91451
91452 config DEBUG_WW_MUTEX_SLOWPATH
91453 bool "Wait/wound mutex debugging: Slowpath testing"
91454- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91455+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91456 select DEBUG_LOCK_ALLOC
91457 select DEBUG_SPINLOCK
91458 select DEBUG_MUTEXES
91459@@ -866,7 +866,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
91460
91461 config DEBUG_LOCK_ALLOC
91462 bool "Lock debugging: detect incorrect freeing of live locks"
91463- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91464+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91465 select DEBUG_SPINLOCK
91466 select DEBUG_MUTEXES
91467 select LOCKDEP
91468@@ -880,7 +880,7 @@ config DEBUG_LOCK_ALLOC
91469
91470 config PROVE_LOCKING
91471 bool "Lock debugging: prove locking correctness"
91472- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91473+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91474 select LOCKDEP
91475 select DEBUG_SPINLOCK
91476 select DEBUG_MUTEXES
91477@@ -931,7 +931,7 @@ config LOCKDEP
91478
91479 config LOCK_STAT
91480 bool "Lock usage statistics"
91481- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
91482+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
91483 select LOCKDEP
91484 select DEBUG_SPINLOCK
91485 select DEBUG_MUTEXES
91486@@ -1403,6 +1403,7 @@ config LATENCYTOP
91487 depends on DEBUG_KERNEL
91488 depends on STACKTRACE_SUPPORT
91489 depends on PROC_FS
91490+ depends on !GRKERNSEC_HIDESYM
91491 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
91492 select KALLSYMS
91493 select KALLSYMS_ALL
91494@@ -1419,7 +1420,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
91495 config DEBUG_STRICT_USER_COPY_CHECKS
91496 bool "Strict user copy size checks"
91497 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
91498- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
91499+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
91500 help
91501 Enabling this option turns a certain set of sanity checks for user
91502 copy operations into compile time failures.
91503@@ -1538,7 +1539,7 @@ endmenu # runtime tests
91504
91505 config PROVIDE_OHCI1394_DMA_INIT
91506 bool "Remote debugging over FireWire early on boot"
91507- depends on PCI && X86
91508+ depends on PCI && X86 && !GRKERNSEC
91509 help
91510 If you want to debug problems which hang or crash the kernel early
91511 on boot and the crashing machine has a FireWire port, you can use
91512diff --git a/lib/Makefile b/lib/Makefile
91513index 0cd7b68..e149e37 100644
91514--- a/lib/Makefile
91515+++ b/lib/Makefile
91516@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
91517 obj-$(CONFIG_BTREE) += btree.o
91518 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
91519 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
91520-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
91521+obj-y += list_debug.o
91522 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
91523
91524 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
91525diff --git a/lib/average.c b/lib/average.c
91526index 114d1be..ab0350c 100644
91527--- a/lib/average.c
91528+++ b/lib/average.c
91529@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
91530 {
91531 unsigned long internal = ACCESS_ONCE(avg->internal);
91532
91533- ACCESS_ONCE(avg->internal) = internal ?
91534+ ACCESS_ONCE_RW(avg->internal) = internal ?
91535 (((internal << avg->weight) - internal) +
91536 (val << avg->factor)) >> avg->weight :
91537 (val << avg->factor);
91538diff --git a/lib/bitmap.c b/lib/bitmap.c
91539index 06f7e4f..f3cf2b0 100644
91540--- a/lib/bitmap.c
91541+++ b/lib/bitmap.c
91542@@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
91543 {
91544 int c, old_c, totaldigits, ndigits, nchunks, nbits;
91545 u32 chunk;
91546- const char __user __force *ubuf = (const char __user __force *)buf;
91547+ const char __user *ubuf = (const char __force_user *)buf;
91548
91549 bitmap_zero(maskp, nmaskbits);
91550
91551@@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
91552 {
91553 if (!access_ok(VERIFY_READ, ubuf, ulen))
91554 return -EFAULT;
91555- return __bitmap_parse((const char __force *)ubuf,
91556+ return __bitmap_parse((const char __force_kernel *)ubuf,
91557 ulen, 1, maskp, nmaskbits);
91558
91559 }
91560@@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
91561 {
91562 unsigned a, b;
91563 int c, old_c, totaldigits;
91564- const char __user __force *ubuf = (const char __user __force *)buf;
91565+ const char __user *ubuf = (const char __force_user *)buf;
91566 int exp_digit, in_range;
91567
91568 totaldigits = c = 0;
91569@@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
91570 {
91571 if (!access_ok(VERIFY_READ, ubuf, ulen))
91572 return -EFAULT;
91573- return __bitmap_parselist((const char __force *)ubuf,
91574+ return __bitmap_parselist((const char __force_kernel *)ubuf,
91575 ulen, 1, maskp, nmaskbits);
91576 }
91577 EXPORT_SYMBOL(bitmap_parselist_user);
91578diff --git a/lib/bug.c b/lib/bug.c
91579index 1686034..a9c00c8 100644
91580--- a/lib/bug.c
91581+++ b/lib/bug.c
91582@@ -134,6 +134,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
91583 return BUG_TRAP_TYPE_NONE;
91584
91585 bug = find_bug(bugaddr);
91586+ if (!bug)
91587+ return BUG_TRAP_TYPE_NONE;
91588
91589 file = NULL;
91590 line = 0;
91591diff --git a/lib/debugobjects.c b/lib/debugobjects.c
91592index e0731c3..ad66444 100644
91593--- a/lib/debugobjects.c
91594+++ b/lib/debugobjects.c
91595@@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
91596 if (limit > 4)
91597 return;
91598
91599- is_on_stack = object_is_on_stack(addr);
91600+ is_on_stack = object_starts_on_stack(addr);
91601 if (is_on_stack == onstack)
91602 return;
91603
91604diff --git a/lib/div64.c b/lib/div64.c
91605index 4382ad7..08aa558 100644
91606--- a/lib/div64.c
91607+++ b/lib/div64.c
91608@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
91609 EXPORT_SYMBOL(__div64_32);
91610
91611 #ifndef div_s64_rem
91612-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
91613+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
91614 {
91615 u64 quotient;
91616
91617@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
91618 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
91619 */
91620 #ifndef div64_u64
91621-u64 div64_u64(u64 dividend, u64 divisor)
91622+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91623 {
91624 u32 high = divisor >> 32;
91625 u64 quot;
91626diff --git a/lib/dma-debug.c b/lib/dma-debug.c
91627index 98f2d7e..899da5c 100644
91628--- a/lib/dma-debug.c
91629+++ b/lib/dma-debug.c
91630@@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
91631
91632 void dma_debug_add_bus(struct bus_type *bus)
91633 {
91634- struct notifier_block *nb;
91635+ notifier_block_no_const *nb;
91636
91637 if (global_disable)
91638 return;
91639@@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
91640
91641 static void check_for_stack(struct device *dev, void *addr)
91642 {
91643- if (object_is_on_stack(addr))
91644+ if (object_starts_on_stack(addr))
91645 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
91646 "stack [addr=%p]\n", addr);
91647 }
91648diff --git a/lib/hash.c b/lib/hash.c
91649index fea973f..386626f 100644
91650--- a/lib/hash.c
91651+++ b/lib/hash.c
91652@@ -14,7 +14,7 @@
91653 #include <linux/hash.h>
91654 #include <linux/cache.h>
91655
91656-static struct fast_hash_ops arch_hash_ops __read_mostly = {
91657+static struct fast_hash_ops arch_hash_ops __read_only = {
91658 .hash = jhash,
91659 .hash2 = jhash2,
91660 };
91661diff --git a/lib/inflate.c b/lib/inflate.c
91662index 013a761..c28f3fc 100644
91663--- a/lib/inflate.c
91664+++ b/lib/inflate.c
91665@@ -269,7 +269,7 @@ static void free(void *where)
91666 malloc_ptr = free_mem_ptr;
91667 }
91668 #else
91669-#define malloc(a) kmalloc(a, GFP_KERNEL)
91670+#define malloc(a) kmalloc((a), GFP_KERNEL)
91671 #define free(a) kfree(a)
91672 #endif
91673
91674diff --git a/lib/ioremap.c b/lib/ioremap.c
91675index 0c9216c..863bd89 100644
91676--- a/lib/ioremap.c
91677+++ b/lib/ioremap.c
91678@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
91679 unsigned long next;
91680
91681 phys_addr -= addr;
91682- pmd = pmd_alloc(&init_mm, pud, addr);
91683+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
91684 if (!pmd)
91685 return -ENOMEM;
91686 do {
91687@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
91688 unsigned long next;
91689
91690 phys_addr -= addr;
91691- pud = pud_alloc(&init_mm, pgd, addr);
91692+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
91693 if (!pud)
91694 return -ENOMEM;
91695 do {
91696diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
91697index bd2bea9..6b3c95e 100644
91698--- a/lib/is_single_threaded.c
91699+++ b/lib/is_single_threaded.c
91700@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
91701 struct task_struct *p, *t;
91702 bool ret;
91703
91704+ if (!mm)
91705+ return true;
91706+
91707 if (atomic_read(&task->signal->live) != 1)
91708 return false;
91709
91710diff --git a/lib/kobject.c b/lib/kobject.c
91711index 58751bb..93a1853 100644
91712--- a/lib/kobject.c
91713+++ b/lib/kobject.c
91714@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
91715
91716
91717 static DEFINE_SPINLOCK(kobj_ns_type_lock);
91718-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
91719+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
91720
91721-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
91722+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
91723 {
91724 enum kobj_ns_type type = ops->type;
91725 int error;
91726diff --git a/lib/list_debug.c b/lib/list_debug.c
91727index c24c2f7..f0296f4 100644
91728--- a/lib/list_debug.c
91729+++ b/lib/list_debug.c
91730@@ -11,7 +11,9 @@
91731 #include <linux/bug.h>
91732 #include <linux/kernel.h>
91733 #include <linux/rculist.h>
91734+#include <linux/mm.h>
91735
91736+#ifdef CONFIG_DEBUG_LIST
91737 /*
91738 * Insert a new entry between two known consecutive entries.
91739 *
91740@@ -19,21 +21,40 @@
91741 * the prev/next entries already!
91742 */
91743
91744+static bool __list_add_debug(struct list_head *new,
91745+ struct list_head *prev,
91746+ struct list_head *next)
91747+{
91748+ if (unlikely(next->prev != prev)) {
91749+ printk(KERN_ERR "list_add corruption. next->prev should be "
91750+ "prev (%p), but was %p. (next=%p).\n",
91751+ prev, next->prev, next);
91752+ BUG();
91753+ return false;
91754+ }
91755+ if (unlikely(prev->next != next)) {
91756+ printk(KERN_ERR "list_add corruption. prev->next should be "
91757+ "next (%p), but was %p. (prev=%p).\n",
91758+ next, prev->next, prev);
91759+ BUG();
91760+ return false;
91761+ }
91762+ if (unlikely(new == prev || new == next)) {
91763+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
91764+ new, prev, next);
91765+ BUG();
91766+ return false;
91767+ }
91768+ return true;
91769+}
91770+
91771 void __list_add(struct list_head *new,
91772- struct list_head *prev,
91773- struct list_head *next)
91774+ struct list_head *prev,
91775+ struct list_head *next)
91776 {
91777- WARN(next->prev != prev,
91778- "list_add corruption. next->prev should be "
91779- "prev (%p), but was %p. (next=%p).\n",
91780- prev, next->prev, next);
91781- WARN(prev->next != next,
91782- "list_add corruption. prev->next should be "
91783- "next (%p), but was %p. (prev=%p).\n",
91784- next, prev->next, prev);
91785- WARN(new == prev || new == next,
91786- "list_add double add: new=%p, prev=%p, next=%p.\n",
91787- new, prev, next);
91788+ if (!__list_add_debug(new, prev, next))
91789+ return;
91790+
91791 next->prev = new;
91792 new->next = next;
91793 new->prev = prev;
91794@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
91795 }
91796 EXPORT_SYMBOL(__list_add);
91797
91798-void __list_del_entry(struct list_head *entry)
91799+static bool __list_del_entry_debug(struct list_head *entry)
91800 {
91801 struct list_head *prev, *next;
91802
91803 prev = entry->prev;
91804 next = entry->next;
91805
91806- if (WARN(next == LIST_POISON1,
91807- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
91808- entry, LIST_POISON1) ||
91809- WARN(prev == LIST_POISON2,
91810- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
91811- entry, LIST_POISON2) ||
91812- WARN(prev->next != entry,
91813- "list_del corruption. prev->next should be %p, "
91814- "but was %p\n", entry, prev->next) ||
91815- WARN(next->prev != entry,
91816- "list_del corruption. next->prev should be %p, "
91817- "but was %p\n", entry, next->prev))
91818+ if (unlikely(next == LIST_POISON1)) {
91819+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
91820+ entry, LIST_POISON1);
91821+ BUG();
91822+ return false;
91823+ }
91824+ if (unlikely(prev == LIST_POISON2)) {
91825+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
91826+ entry, LIST_POISON2);
91827+ BUG();
91828+ return false;
91829+ }
91830+ if (unlikely(entry->prev->next != entry)) {
91831+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
91832+ "but was %p\n", entry, prev->next);
91833+ BUG();
91834+ return false;
91835+ }
91836+ if (unlikely(entry->next->prev != entry)) {
91837+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
91838+ "but was %p\n", entry, next->prev);
91839+ BUG();
91840+ return false;
91841+ }
91842+ return true;
91843+}
91844+
91845+void __list_del_entry(struct list_head *entry)
91846+{
91847+ if (!__list_del_entry_debug(entry))
91848 return;
91849
91850- __list_del(prev, next);
91851+ __list_del(entry->prev, entry->next);
91852 }
91853 EXPORT_SYMBOL(__list_del_entry);
91854
91855@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
91856 void __list_add_rcu(struct list_head *new,
91857 struct list_head *prev, struct list_head *next)
91858 {
91859- WARN(next->prev != prev,
91860- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
91861- prev, next->prev, next);
91862- WARN(prev->next != next,
91863- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
91864- next, prev->next, prev);
91865+ if (!__list_add_debug(new, prev, next))
91866+ return;
91867+
91868 new->next = next;
91869 new->prev = prev;
91870 rcu_assign_pointer(list_next_rcu(prev), new);
91871 next->prev = new;
91872 }
91873 EXPORT_SYMBOL(__list_add_rcu);
91874+#endif
91875+
91876+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
91877+{
91878+#ifdef CONFIG_DEBUG_LIST
91879+ if (!__list_add_debug(new, prev, next))
91880+ return;
91881+#endif
91882+
91883+ pax_open_kernel();
91884+ next->prev = new;
91885+ new->next = next;
91886+ new->prev = prev;
91887+ prev->next = new;
91888+ pax_close_kernel();
91889+}
91890+EXPORT_SYMBOL(__pax_list_add);
91891+
91892+void pax_list_del(struct list_head *entry)
91893+{
91894+#ifdef CONFIG_DEBUG_LIST
91895+ if (!__list_del_entry_debug(entry))
91896+ return;
91897+#endif
91898+
91899+ pax_open_kernel();
91900+ __list_del(entry->prev, entry->next);
91901+ entry->next = LIST_POISON1;
91902+ entry->prev = LIST_POISON2;
91903+ pax_close_kernel();
91904+}
91905+EXPORT_SYMBOL(pax_list_del);
91906+
91907+void pax_list_del_init(struct list_head *entry)
91908+{
91909+ pax_open_kernel();
91910+ __list_del(entry->prev, entry->next);
91911+ INIT_LIST_HEAD(entry);
91912+ pax_close_kernel();
91913+}
91914+EXPORT_SYMBOL(pax_list_del_init);
91915+
91916+void __pax_list_add_rcu(struct list_head *new,
91917+ struct list_head *prev, struct list_head *next)
91918+{
91919+#ifdef CONFIG_DEBUG_LIST
91920+ if (!__list_add_debug(new, prev, next))
91921+ return;
91922+#endif
91923+
91924+ pax_open_kernel();
91925+ new->next = next;
91926+ new->prev = prev;
91927+ rcu_assign_pointer(list_next_rcu(prev), new);
91928+ next->prev = new;
91929+ pax_close_kernel();
91930+}
91931+EXPORT_SYMBOL(__pax_list_add_rcu);
91932+
91933+void pax_list_del_rcu(struct list_head *entry)
91934+{
91935+#ifdef CONFIG_DEBUG_LIST
91936+ if (!__list_del_entry_debug(entry))
91937+ return;
91938+#endif
91939+
91940+ pax_open_kernel();
91941+ __list_del(entry->prev, entry->next);
91942+ entry->next = LIST_POISON1;
91943+ entry->prev = LIST_POISON2;
91944+ pax_close_kernel();
91945+}
91946+EXPORT_SYMBOL(pax_list_del_rcu);
91947diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
91948index 963b703..438bc51 100644
91949--- a/lib/percpu-refcount.c
91950+++ b/lib/percpu-refcount.c
91951@@ -29,7 +29,7 @@
91952 * can't hit 0 before we've added up all the percpu refs.
91953 */
91954
91955-#define PCPU_COUNT_BIAS (1U << 31)
91956+#define PCPU_COUNT_BIAS (1U << 30)
91957
91958 /**
91959 * percpu_ref_init - initialize a percpu refcount
91960diff --git a/lib/radix-tree.c b/lib/radix-tree.c
91961index 9599aa7..9cf6c72 100644
91962--- a/lib/radix-tree.c
91963+++ b/lib/radix-tree.c
91964@@ -66,7 +66,7 @@ struct radix_tree_preload {
91965 int nr;
91966 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
91967 };
91968-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
91969+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
91970
91971 static inline void *ptr_to_indirect(void *ptr)
91972 {
91973diff --git a/lib/random32.c b/lib/random32.c
91974index fa5da61..35fe9af 100644
91975--- a/lib/random32.c
91976+++ b/lib/random32.c
91977@@ -42,7 +42,7 @@
91978 static void __init prandom_state_selftest(void);
91979 #endif
91980
91981-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
91982+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
91983
91984 /**
91985 * prandom_u32_state - seeded pseudo-random number generator.
91986diff --git a/lib/rbtree.c b/lib/rbtree.c
91987index 65f4eff..2cfa167 100644
91988--- a/lib/rbtree.c
91989+++ b/lib/rbtree.c
91990@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
91991 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
91992
91993 static const struct rb_augment_callbacks dummy_callbacks = {
91994- dummy_propagate, dummy_copy, dummy_rotate
91995+ .propagate = dummy_propagate,
91996+ .copy = dummy_copy,
91997+ .rotate = dummy_rotate
91998 };
91999
92000 void rb_insert_color(struct rb_node *node, struct rb_root *root)
92001diff --git a/lib/show_mem.c b/lib/show_mem.c
92002index 0922579..9d7adb9 100644
92003--- a/lib/show_mem.c
92004+++ b/lib/show_mem.c
92005@@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
92006 quicklist_total_size());
92007 #endif
92008 #ifdef CONFIG_MEMORY_FAILURE
92009- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
92010+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
92011 #endif
92012 }
92013diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
92014index bb2b201..46abaf9 100644
92015--- a/lib/strncpy_from_user.c
92016+++ b/lib/strncpy_from_user.c
92017@@ -21,7 +21,7 @@
92018 */
92019 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
92020 {
92021- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92022+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92023 long res = 0;
92024
92025 /*
92026diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
92027index a28df52..3d55877 100644
92028--- a/lib/strnlen_user.c
92029+++ b/lib/strnlen_user.c
92030@@ -26,7 +26,7 @@
92031 */
92032 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
92033 {
92034- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92035+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
92036 long align, res = 0;
92037 unsigned long c;
92038
92039diff --git a/lib/swiotlb.c b/lib/swiotlb.c
92040index b604b83..c0547f6 100644
92041--- a/lib/swiotlb.c
92042+++ b/lib/swiotlb.c
92043@@ -674,7 +674,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
92044
92045 void
92046 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
92047- dma_addr_t dev_addr)
92048+ dma_addr_t dev_addr, struct dma_attrs *attrs)
92049 {
92050 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
92051
92052diff --git a/lib/usercopy.c b/lib/usercopy.c
92053index 4f5b1dd..7cab418 100644
92054--- a/lib/usercopy.c
92055+++ b/lib/usercopy.c
92056@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
92057 WARN(1, "Buffer overflow detected!\n");
92058 }
92059 EXPORT_SYMBOL(copy_from_user_overflow);
92060+
92061+void copy_to_user_overflow(void)
92062+{
92063+ WARN(1, "Buffer overflow detected!\n");
92064+}
92065+EXPORT_SYMBOL(copy_to_user_overflow);
92066diff --git a/lib/vsprintf.c b/lib/vsprintf.c
92067index 0648291..42bf42b 100644
92068--- a/lib/vsprintf.c
92069+++ b/lib/vsprintf.c
92070@@ -16,6 +16,9 @@
92071 * - scnprintf and vscnprintf
92072 */
92073
92074+#ifdef CONFIG_GRKERNSEC_HIDESYM
92075+#define __INCLUDED_BY_HIDESYM 1
92076+#endif
92077 #include <stdarg.h>
92078 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
92079 #include <linux/types.h>
92080@@ -1183,7 +1186,11 @@ char *address_val(char *buf, char *end, const void *addr,
92081 return number(buf, end, num, spec);
92082 }
92083
92084+#ifdef CONFIG_GRKERNSEC_HIDESYM
92085+int kptr_restrict __read_mostly = 2;
92086+#else
92087 int kptr_restrict __read_mostly;
92088+#endif
92089
92090 /*
92091 * Show a '%p' thing. A kernel extension is that the '%p' is followed
92092@@ -1196,6 +1203,7 @@ int kptr_restrict __read_mostly;
92093 * - 'f' For simple symbolic function names without offset
92094 * - 'S' For symbolic direct pointers with offset
92095 * - 's' For symbolic direct pointers without offset
92096+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
92097 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
92098 * - 'B' For backtraced symbolic direct pointers with offset
92099 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
92100@@ -1263,12 +1271,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92101
92102 if (!ptr && *fmt != 'K') {
92103 /*
92104- * Print (null) with the same width as a pointer so it makes
92105+ * Print (nil) with the same width as a pointer so it makes
92106 * tabular output look nice.
92107 */
92108 if (spec.field_width == -1)
92109 spec.field_width = default_width;
92110- return string(buf, end, "(null)", spec);
92111+ return string(buf, end, "(nil)", spec);
92112 }
92113
92114 switch (*fmt) {
92115@@ -1278,6 +1286,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92116 /* Fallthrough */
92117 case 'S':
92118 case 's':
92119+#ifdef CONFIG_GRKERNSEC_HIDESYM
92120+ break;
92121+#else
92122+ return symbol_string(buf, end, ptr, spec, fmt);
92123+#endif
92124+ case 'A':
92125 case 'B':
92126 return symbol_string(buf, end, ptr, spec, fmt);
92127 case 'R':
92128@@ -1333,6 +1347,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92129 va_end(va);
92130 return buf;
92131 }
92132+ case 'P':
92133+ break;
92134 case 'K':
92135 /*
92136 * %pK cannot be used in IRQ context because its test
92137@@ -1390,6 +1406,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
92138 ((const struct file *)ptr)->f_path.dentry,
92139 spec, fmt);
92140 }
92141+
92142+#ifdef CONFIG_GRKERNSEC_HIDESYM
92143+ /* 'P' = approved pointers to copy to userland,
92144+ as in the /proc/kallsyms case, as we make it display nothing
92145+ for non-root users, and the real contents for root users
92146+ Also ignore 'K' pointers, since we force their NULLing for non-root users
92147+ above
92148+ */
92149+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
92150+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
92151+ dump_stack();
92152+ ptr = NULL;
92153+ }
92154+#endif
92155+
92156 spec.flags |= SMALL;
92157 if (spec.field_width == -1) {
92158 spec.field_width = default_width;
92159@@ -2089,11 +2120,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
92160 typeof(type) value; \
92161 if (sizeof(type) == 8) { \
92162 args = PTR_ALIGN(args, sizeof(u32)); \
92163- *(u32 *)&value = *(u32 *)args; \
92164- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
92165+ *(u32 *)&value = *(const u32 *)args; \
92166+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
92167 } else { \
92168 args = PTR_ALIGN(args, sizeof(type)); \
92169- value = *(typeof(type) *)args; \
92170+ value = *(const typeof(type) *)args; \
92171 } \
92172 args += sizeof(type); \
92173 value; \
92174@@ -2156,7 +2187,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
92175 case FORMAT_TYPE_STR: {
92176 const char *str_arg = args;
92177 args += strlen(str_arg) + 1;
92178- str = string(str, end, (char *)str_arg, spec);
92179+ str = string(str, end, str_arg, spec);
92180 break;
92181 }
92182
92183diff --git a/localversion-grsec b/localversion-grsec
92184new file mode 100644
92185index 0000000..7cd6065
92186--- /dev/null
92187+++ b/localversion-grsec
92188@@ -0,0 +1 @@
92189+-grsec
92190diff --git a/mm/Kconfig b/mm/Kconfig
92191index 2f42b9c..6095e14 100644
92192--- a/mm/Kconfig
92193+++ b/mm/Kconfig
92194@@ -330,10 +330,11 @@ config KSM
92195 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
92196
92197 config DEFAULT_MMAP_MIN_ADDR
92198- int "Low address space to protect from user allocation"
92199+ int "Low address space to protect from user allocation"
92200 depends on MMU
92201- default 4096
92202- help
92203+ default 32768 if ALPHA || ARM || PARISC || SPARC32
92204+ default 65536
92205+ help
92206 This is the portion of low virtual memory which should be protected
92207 from userspace allocation. Keeping a user from writing to low pages
92208 can help reduce the impact of kernel NULL pointer bugs.
92209@@ -364,7 +365,7 @@ config MEMORY_FAILURE
92210
92211 config HWPOISON_INJECT
92212 tristate "HWPoison pages injector"
92213- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
92214+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
92215 select PROC_PAGE_MONITOR
92216
92217 config NOMMU_INITIAL_TRIM_EXCESS
92218diff --git a/mm/backing-dev.c b/mm/backing-dev.c
92219index 09d9591..165bb75 100644
92220--- a/mm/backing-dev.c
92221+++ b/mm/backing-dev.c
92222@@ -12,7 +12,7 @@
92223 #include <linux/device.h>
92224 #include <trace/events/writeback.h>
92225
92226-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
92227+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
92228
92229 struct backing_dev_info default_backing_dev_info = {
92230 .name = "default",
92231@@ -533,7 +533,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
92232 return err;
92233
92234 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
92235- atomic_long_inc_return(&bdi_seq));
92236+ atomic_long_inc_return_unchecked(&bdi_seq));
92237 if (err) {
92238 bdi_destroy(bdi);
92239 return err;
92240diff --git a/mm/filemap.c b/mm/filemap.c
92241index 088358c..bb415bf 100644
92242--- a/mm/filemap.c
92243+++ b/mm/filemap.c
92244@@ -2125,7 +2125,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
92245 struct address_space *mapping = file->f_mapping;
92246
92247 if (!mapping->a_ops->readpage)
92248- return -ENOEXEC;
92249+ return -ENODEV;
92250 file_accessed(file);
92251 vma->vm_ops = &generic_file_vm_ops;
92252 return 0;
92253@@ -2303,6 +2303,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
92254 *pos = i_size_read(inode);
92255
92256 if (limit != RLIM_INFINITY) {
92257+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
92258 if (*pos >= limit) {
92259 send_sig(SIGXFSZ, current, 0);
92260 return -EFBIG;
92261diff --git a/mm/fremap.c b/mm/fremap.c
92262index 34feba6..315fe78 100644
92263--- a/mm/fremap.c
92264+++ b/mm/fremap.c
92265@@ -179,6 +179,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
92266 retry:
92267 vma = find_vma(mm, start);
92268
92269+#ifdef CONFIG_PAX_SEGMEXEC
92270+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
92271+ goto out;
92272+#endif
92273+
92274 /*
92275 * Make sure the vma is shared, that it supports prefaulting,
92276 * and that the remapped range is valid and fully within
92277diff --git a/mm/highmem.c b/mm/highmem.c
92278index b32b70c..e512eb0 100644
92279--- a/mm/highmem.c
92280+++ b/mm/highmem.c
92281@@ -138,8 +138,9 @@ static void flush_all_zero_pkmaps(void)
92282 * So no dangers, even with speculative execution.
92283 */
92284 page = pte_page(pkmap_page_table[i]);
92285+ pax_open_kernel();
92286 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
92287-
92288+ pax_close_kernel();
92289 set_page_address(page, NULL);
92290 need_flush = 1;
92291 }
92292@@ -198,9 +199,11 @@ start:
92293 }
92294 }
92295 vaddr = PKMAP_ADDR(last_pkmap_nr);
92296+
92297+ pax_open_kernel();
92298 set_pte_at(&init_mm, vaddr,
92299 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
92300-
92301+ pax_close_kernel();
92302 pkmap_count[last_pkmap_nr] = 1;
92303 set_page_address(page, (void *)vaddr);
92304
92305diff --git a/mm/hugetlb.c b/mm/hugetlb.c
92306index c82290b..863d466 100644
92307--- a/mm/hugetlb.c
92308+++ b/mm/hugetlb.c
92309@@ -2107,6 +2107,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
92310 struct hstate *h = &default_hstate;
92311 unsigned long tmp;
92312 int ret;
92313+ ctl_table_no_const hugetlb_table;
92314
92315 if (!hugepages_supported())
92316 return -ENOTSUPP;
92317@@ -2116,9 +2117,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
92318 if (write && h->order >= MAX_ORDER)
92319 return -EINVAL;
92320
92321- table->data = &tmp;
92322- table->maxlen = sizeof(unsigned long);
92323- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
92324+ hugetlb_table = *table;
92325+ hugetlb_table.data = &tmp;
92326+ hugetlb_table.maxlen = sizeof(unsigned long);
92327+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
92328 if (ret)
92329 goto out;
92330
92331@@ -2163,6 +2165,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
92332 struct hstate *h = &default_hstate;
92333 unsigned long tmp;
92334 int ret;
92335+ ctl_table_no_const hugetlb_table;
92336
92337 if (!hugepages_supported())
92338 return -ENOTSUPP;
92339@@ -2172,9 +2175,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
92340 if (write && h->order >= MAX_ORDER)
92341 return -EINVAL;
92342
92343- table->data = &tmp;
92344- table->maxlen = sizeof(unsigned long);
92345- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
92346+ hugetlb_table = *table;
92347+ hugetlb_table.data = &tmp;
92348+ hugetlb_table.maxlen = sizeof(unsigned long);
92349+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
92350 if (ret)
92351 goto out;
92352
92353@@ -2639,6 +2643,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
92354 return 1;
92355 }
92356
92357+#ifdef CONFIG_PAX_SEGMEXEC
92358+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
92359+{
92360+ struct mm_struct *mm = vma->vm_mm;
92361+ struct vm_area_struct *vma_m;
92362+ unsigned long address_m;
92363+ pte_t *ptep_m;
92364+
92365+ vma_m = pax_find_mirror_vma(vma);
92366+ if (!vma_m)
92367+ return;
92368+
92369+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
92370+ address_m = address + SEGMEXEC_TASK_SIZE;
92371+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
92372+ get_page(page_m);
92373+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
92374+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
92375+}
92376+#endif
92377+
92378 /*
92379 * Hugetlb_cow() should be called with page lock of the original hugepage held.
92380 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
92381@@ -2756,6 +2781,11 @@ retry_avoidcopy:
92382 make_huge_pte(vma, new_page, 1));
92383 page_remove_rmap(old_page);
92384 hugepage_add_new_anon_rmap(new_page, vma, address);
92385+
92386+#ifdef CONFIG_PAX_SEGMEXEC
92387+ pax_mirror_huge_pte(vma, address, new_page);
92388+#endif
92389+
92390 /* Make the old page be freed below */
92391 new_page = old_page;
92392 }
92393@@ -2915,6 +2945,10 @@ retry:
92394 && (vma->vm_flags & VM_SHARED)));
92395 set_huge_pte_at(mm, address, ptep, new_pte);
92396
92397+#ifdef CONFIG_PAX_SEGMEXEC
92398+ pax_mirror_huge_pte(vma, address, page);
92399+#endif
92400+
92401 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
92402 /* Optimization, do the COW without a second fault */
92403 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
92404@@ -2981,6 +3015,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92405 struct hstate *h = hstate_vma(vma);
92406 struct address_space *mapping;
92407
92408+#ifdef CONFIG_PAX_SEGMEXEC
92409+ struct vm_area_struct *vma_m;
92410+#endif
92411+
92412 address &= huge_page_mask(h);
92413
92414 ptep = huge_pte_offset(mm, address);
92415@@ -2994,6 +3032,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
92416 VM_FAULT_SET_HINDEX(hstate_index(h));
92417 }
92418
92419+#ifdef CONFIG_PAX_SEGMEXEC
92420+ vma_m = pax_find_mirror_vma(vma);
92421+ if (vma_m) {
92422+ unsigned long address_m;
92423+
92424+ if (vma->vm_start > vma_m->vm_start) {
92425+ address_m = address;
92426+ address -= SEGMEXEC_TASK_SIZE;
92427+ vma = vma_m;
92428+ h = hstate_vma(vma);
92429+ } else
92430+ address_m = address + SEGMEXEC_TASK_SIZE;
92431+
92432+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
92433+ return VM_FAULT_OOM;
92434+ address_m &= HPAGE_MASK;
92435+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
92436+ }
92437+#endif
92438+
92439 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
92440 if (!ptep)
92441 return VM_FAULT_OOM;
92442diff --git a/mm/internal.h b/mm/internal.h
92443index 07b6736..ae8da20 100644
92444--- a/mm/internal.h
92445+++ b/mm/internal.h
92446@@ -109,6 +109,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
92447 * in mm/page_alloc.c
92448 */
92449 extern void __free_pages_bootmem(struct page *page, unsigned int order);
92450+extern void free_compound_page(struct page *page);
92451 extern void prep_compound_page(struct page *page, unsigned long order);
92452 #ifdef CONFIG_MEMORY_FAILURE
92453 extern bool is_free_buddy_page(struct page *page);
92454@@ -367,7 +368,7 @@ extern u32 hwpoison_filter_enable;
92455
92456 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
92457 unsigned long, unsigned long,
92458- unsigned long, unsigned long);
92459+ unsigned long, unsigned long) __intentional_overflow(-1);
92460
92461 extern void set_pageblock_order(void);
92462 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
92463diff --git a/mm/iov_iter.c b/mm/iov_iter.c
92464index 10e46cd..e3052f6 100644
92465--- a/mm/iov_iter.c
92466+++ b/mm/iov_iter.c
92467@@ -87,7 +87,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
92468
92469 while (bytes) {
92470 char __user *buf = iov->iov_base + base;
92471- int copy = min(bytes, iov->iov_len - base);
92472+ size_t copy = min(bytes, iov->iov_len - base);
92473
92474 base = 0;
92475 left = __copy_from_user_inatomic(vaddr, buf, copy);
92476@@ -115,7 +115,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
92477
92478 kaddr = kmap_atomic(page);
92479 if (likely(i->nr_segs == 1)) {
92480- int left;
92481+ size_t left;
92482 char __user *buf = i->iov->iov_base + i->iov_offset;
92483 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
92484 copied = bytes - left;
92485@@ -143,7 +143,7 @@ size_t iov_iter_copy_from_user(struct page *page,
92486
92487 kaddr = kmap(page);
92488 if (likely(i->nr_segs == 1)) {
92489- int left;
92490+ size_t left;
92491 char __user *buf = i->iov->iov_base + i->iov_offset;
92492 left = __copy_from_user(kaddr + offset, buf, bytes);
92493 copied = bytes - left;
92494@@ -173,7 +173,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
92495 * zero-length segments (without overruning the iovec).
92496 */
92497 while (bytes || unlikely(i->count && !iov->iov_len)) {
92498- int copy;
92499+ size_t copy;
92500
92501 copy = min(bytes, iov->iov_len - base);
92502 BUG_ON(!i->count || i->count < copy);
92503diff --git a/mm/kmemleak.c b/mm/kmemleak.c
92504index 8d2fcdf..6dd9f1a 100644
92505--- a/mm/kmemleak.c
92506+++ b/mm/kmemleak.c
92507@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
92508
92509 for (i = 0; i < object->trace_len; i++) {
92510 void *ptr = (void *)object->trace[i];
92511- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
92512+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
92513 }
92514 }
92515
92516@@ -1871,7 +1871,7 @@ static int __init kmemleak_late_init(void)
92517 return -ENOMEM;
92518 }
92519
92520- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
92521+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
92522 &kmemleak_fops);
92523 if (!dentry)
92524 pr_warning("Failed to create the debugfs kmemleak file\n");
92525diff --git a/mm/maccess.c b/mm/maccess.c
92526index d53adf9..03a24bf 100644
92527--- a/mm/maccess.c
92528+++ b/mm/maccess.c
92529@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
92530 set_fs(KERNEL_DS);
92531 pagefault_disable();
92532 ret = __copy_from_user_inatomic(dst,
92533- (__force const void __user *)src, size);
92534+ (const void __force_user *)src, size);
92535 pagefault_enable();
92536 set_fs(old_fs);
92537
92538@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
92539
92540 set_fs(KERNEL_DS);
92541 pagefault_disable();
92542- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
92543+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
92544 pagefault_enable();
92545 set_fs(old_fs);
92546
92547diff --git a/mm/madvise.c b/mm/madvise.c
92548index a402f8f..f5e5daa 100644
92549--- a/mm/madvise.c
92550+++ b/mm/madvise.c
92551@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
92552 pgoff_t pgoff;
92553 unsigned long new_flags = vma->vm_flags;
92554
92555+#ifdef CONFIG_PAX_SEGMEXEC
92556+ struct vm_area_struct *vma_m;
92557+#endif
92558+
92559 switch (behavior) {
92560 case MADV_NORMAL:
92561 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
92562@@ -126,6 +130,13 @@ success:
92563 /*
92564 * vm_flags is protected by the mmap_sem held in write mode.
92565 */
92566+
92567+#ifdef CONFIG_PAX_SEGMEXEC
92568+ vma_m = pax_find_mirror_vma(vma);
92569+ if (vma_m)
92570+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
92571+#endif
92572+
92573 vma->vm_flags = new_flags;
92574
92575 out:
92576@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
92577 struct vm_area_struct **prev,
92578 unsigned long start, unsigned long end)
92579 {
92580+
92581+#ifdef CONFIG_PAX_SEGMEXEC
92582+ struct vm_area_struct *vma_m;
92583+#endif
92584+
92585 *prev = vma;
92586 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
92587 return -EINVAL;
92588@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
92589 zap_page_range(vma, start, end - start, &details);
92590 } else
92591 zap_page_range(vma, start, end - start, NULL);
92592+
92593+#ifdef CONFIG_PAX_SEGMEXEC
92594+ vma_m = pax_find_mirror_vma(vma);
92595+ if (vma_m) {
92596+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
92597+ struct zap_details details = {
92598+ .nonlinear_vma = vma_m,
92599+ .last_index = ULONG_MAX,
92600+ };
92601+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
92602+ } else
92603+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
92604+ }
92605+#endif
92606+
92607 return 0;
92608 }
92609
92610@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
92611 if (end < start)
92612 return error;
92613
92614+#ifdef CONFIG_PAX_SEGMEXEC
92615+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
92616+ if (end > SEGMEXEC_TASK_SIZE)
92617+ return error;
92618+ } else
92619+#endif
92620+
92621+ if (end > TASK_SIZE)
92622+ return error;
92623+
92624 error = 0;
92625 if (end == start)
92626 return error;
92627diff --git a/mm/memory-failure.c b/mm/memory-failure.c
92628index eb8fb72..ae36cf3 100644
92629--- a/mm/memory-failure.c
92630+++ b/mm/memory-failure.c
92631@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
92632
92633 int sysctl_memory_failure_recovery __read_mostly = 1;
92634
92635-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
92636+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
92637
92638 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
92639
92640@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
92641 pfn, t->comm, t->pid);
92642 si.si_signo = SIGBUS;
92643 si.si_errno = 0;
92644- si.si_addr = (void *)addr;
92645+ si.si_addr = (void __user *)addr;
92646 #ifdef __ARCH_SI_TRAPNO
92647 si.si_trapno = trapno;
92648 #endif
92649@@ -791,7 +791,7 @@ static struct page_state {
92650 unsigned long res;
92651 char *msg;
92652 int (*action)(struct page *p, unsigned long pfn);
92653-} error_states[] = {
92654+} __do_const error_states[] = {
92655 { reserved, reserved, "reserved kernel", me_kernel },
92656 /*
92657 * free pages are specially detected outside this table:
92658@@ -1091,7 +1091,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92659 nr_pages = 1 << compound_order(hpage);
92660 else /* normal page or thp */
92661 nr_pages = 1;
92662- atomic_long_add(nr_pages, &num_poisoned_pages);
92663+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
92664
92665 /*
92666 * We need/can do nothing about count=0 pages.
92667@@ -1120,7 +1120,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92668 if (PageHWPoison(hpage)) {
92669 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
92670 || (p != hpage && TestSetPageHWPoison(hpage))) {
92671- atomic_long_sub(nr_pages, &num_poisoned_pages);
92672+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92673 unlock_page(hpage);
92674 return 0;
92675 }
92676@@ -1186,14 +1186,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
92677 */
92678 if (!PageHWPoison(p)) {
92679 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
92680- atomic_long_sub(nr_pages, &num_poisoned_pages);
92681+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92682 put_page(hpage);
92683 res = 0;
92684 goto out;
92685 }
92686 if (hwpoison_filter(p)) {
92687 if (TestClearPageHWPoison(p))
92688- atomic_long_sub(nr_pages, &num_poisoned_pages);
92689+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92690 unlock_page(hpage);
92691 put_page(hpage);
92692 return 0;
92693@@ -1415,7 +1415,7 @@ int unpoison_memory(unsigned long pfn)
92694 return 0;
92695 }
92696 if (TestClearPageHWPoison(p))
92697- atomic_long_dec(&num_poisoned_pages);
92698+ atomic_long_dec_unchecked(&num_poisoned_pages);
92699 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
92700 return 0;
92701 }
92702@@ -1429,7 +1429,7 @@ int unpoison_memory(unsigned long pfn)
92703 */
92704 if (TestClearPageHWPoison(page)) {
92705 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
92706- atomic_long_sub(nr_pages, &num_poisoned_pages);
92707+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
92708 freeit = 1;
92709 if (PageHuge(page))
92710 clear_page_hwpoison_huge_page(page);
92711@@ -1554,11 +1554,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
92712 if (PageHuge(page)) {
92713 set_page_hwpoison_huge_page(hpage);
92714 dequeue_hwpoisoned_huge_page(hpage);
92715- atomic_long_add(1 << compound_order(hpage),
92716+ atomic_long_add_unchecked(1 << compound_order(hpage),
92717 &num_poisoned_pages);
92718 } else {
92719 SetPageHWPoison(page);
92720- atomic_long_inc(&num_poisoned_pages);
92721+ atomic_long_inc_unchecked(&num_poisoned_pages);
92722 }
92723 }
92724 return ret;
92725@@ -1597,7 +1597,7 @@ static int __soft_offline_page(struct page *page, int flags)
92726 put_page(page);
92727 pr_info("soft_offline: %#lx: invalidated\n", pfn);
92728 SetPageHWPoison(page);
92729- atomic_long_inc(&num_poisoned_pages);
92730+ atomic_long_inc_unchecked(&num_poisoned_pages);
92731 return 0;
92732 }
92733
92734@@ -1648,7 +1648,7 @@ static int __soft_offline_page(struct page *page, int flags)
92735 if (!is_free_buddy_page(page))
92736 pr_info("soft offline: %#lx: page leaked\n",
92737 pfn);
92738- atomic_long_inc(&num_poisoned_pages);
92739+ atomic_long_inc_unchecked(&num_poisoned_pages);
92740 }
92741 } else {
92742 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
92743@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
92744 if (PageHuge(page)) {
92745 set_page_hwpoison_huge_page(hpage);
92746 dequeue_hwpoisoned_huge_page(hpage);
92747- atomic_long_add(1 << compound_order(hpage),
92748+ atomic_long_add_unchecked(1 << compound_order(hpage),
92749 &num_poisoned_pages);
92750 } else {
92751 SetPageHWPoison(page);
92752- atomic_long_inc(&num_poisoned_pages);
92753+ atomic_long_inc_unchecked(&num_poisoned_pages);
92754 }
92755 }
92756 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
92757diff --git a/mm/memory.c b/mm/memory.c
92758index 037b812..948123c 100644
92759--- a/mm/memory.c
92760+++ b/mm/memory.c
92761@@ -413,6 +413,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
92762 free_pte_range(tlb, pmd, addr);
92763 } while (pmd++, addr = next, addr != end);
92764
92765+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
92766 start &= PUD_MASK;
92767 if (start < floor)
92768 return;
92769@@ -427,6 +428,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
92770 pmd = pmd_offset(pud, start);
92771 pud_clear(pud);
92772 pmd_free_tlb(tlb, pmd, start);
92773+#endif
92774+
92775 }
92776
92777 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
92778@@ -446,6 +449,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
92779 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
92780 } while (pud++, addr = next, addr != end);
92781
92782+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
92783 start &= PGDIR_MASK;
92784 if (start < floor)
92785 return;
92786@@ -460,6 +464,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
92787 pud = pud_offset(pgd, start);
92788 pgd_clear(pgd);
92789 pud_free_tlb(tlb, pud, start);
92790+#endif
92791+
92792 }
92793
92794 /*
92795@@ -1652,12 +1658,6 @@ no_page_table:
92796 return page;
92797 }
92798
92799-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
92800-{
92801- return stack_guard_page_start(vma, addr) ||
92802- stack_guard_page_end(vma, addr+PAGE_SIZE);
92803-}
92804-
92805 /**
92806 * __get_user_pages() - pin user pages in memory
92807 * @tsk: task_struct of target task
92808@@ -1735,10 +1735,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
92809
92810 i = 0;
92811
92812- do {
92813+ while (nr_pages) {
92814 struct vm_area_struct *vma;
92815
92816- vma = find_extend_vma(mm, start);
92817+ vma = find_vma(mm, start);
92818 if (!vma && in_gate_area(mm, start)) {
92819 unsigned long pg = start & PAGE_MASK;
92820 pgd_t *pgd;
92821@@ -1787,7 +1787,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
92822 goto next_page;
92823 }
92824
92825- if (!vma)
92826+ if (!vma || start < vma->vm_start)
92827 goto efault;
92828 vm_flags = vma->vm_flags;
92829 if (vm_flags & (VM_IO | VM_PFNMAP))
92830@@ -1848,11 +1848,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
92831 int ret;
92832 unsigned int fault_flags = 0;
92833
92834- /* For mlock, just skip the stack guard page. */
92835- if (foll_flags & FOLL_MLOCK) {
92836- if (stack_guard_page(vma, start))
92837- goto next_page;
92838- }
92839 if (foll_flags & FOLL_WRITE)
92840 fault_flags |= FAULT_FLAG_WRITE;
92841 if (nonblocking)
92842@@ -1932,7 +1927,7 @@ next_page:
92843 start += page_increm * PAGE_SIZE;
92844 nr_pages -= page_increm;
92845 } while (nr_pages && start < vma->vm_end);
92846- } while (nr_pages);
92847+ }
92848 return i;
92849 efault:
92850 return i ? : -EFAULT;
92851@@ -2145,6 +2140,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
92852 page_add_file_rmap(page);
92853 set_pte_at(mm, addr, pte, mk_pte(page, prot));
92854
92855+#ifdef CONFIG_PAX_SEGMEXEC
92856+ pax_mirror_file_pte(vma, addr, page, ptl);
92857+#endif
92858+
92859 retval = 0;
92860 pte_unmap_unlock(pte, ptl);
92861 return retval;
92862@@ -2189,9 +2188,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
92863 if (!page_count(page))
92864 return -EINVAL;
92865 if (!(vma->vm_flags & VM_MIXEDMAP)) {
92866+
92867+#ifdef CONFIG_PAX_SEGMEXEC
92868+ struct vm_area_struct *vma_m;
92869+#endif
92870+
92871 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
92872 BUG_ON(vma->vm_flags & VM_PFNMAP);
92873 vma->vm_flags |= VM_MIXEDMAP;
92874+
92875+#ifdef CONFIG_PAX_SEGMEXEC
92876+ vma_m = pax_find_mirror_vma(vma);
92877+ if (vma_m)
92878+ vma_m->vm_flags |= VM_MIXEDMAP;
92879+#endif
92880+
92881 }
92882 return insert_page(vma, addr, page, vma->vm_page_prot);
92883 }
92884@@ -2274,6 +2285,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
92885 unsigned long pfn)
92886 {
92887 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
92888+ BUG_ON(vma->vm_mirror);
92889
92890 if (addr < vma->vm_start || addr >= vma->vm_end)
92891 return -EFAULT;
92892@@ -2521,7 +2533,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
92893
92894 BUG_ON(pud_huge(*pud));
92895
92896- pmd = pmd_alloc(mm, pud, addr);
92897+ pmd = (mm == &init_mm) ?
92898+ pmd_alloc_kernel(mm, pud, addr) :
92899+ pmd_alloc(mm, pud, addr);
92900 if (!pmd)
92901 return -ENOMEM;
92902 do {
92903@@ -2541,7 +2555,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
92904 unsigned long next;
92905 int err;
92906
92907- pud = pud_alloc(mm, pgd, addr);
92908+ pud = (mm == &init_mm) ?
92909+ pud_alloc_kernel(mm, pgd, addr) :
92910+ pud_alloc(mm, pgd, addr);
92911 if (!pud)
92912 return -ENOMEM;
92913 do {
92914@@ -2663,6 +2679,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
92915 return ret;
92916 }
92917
92918+#ifdef CONFIG_PAX_SEGMEXEC
92919+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
92920+{
92921+ struct mm_struct *mm = vma->vm_mm;
92922+ spinlock_t *ptl;
92923+ pte_t *pte, entry;
92924+
92925+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
92926+ entry = *pte;
92927+ if (!pte_present(entry)) {
92928+ if (!pte_none(entry)) {
92929+ BUG_ON(pte_file(entry));
92930+ free_swap_and_cache(pte_to_swp_entry(entry));
92931+ pte_clear_not_present_full(mm, address, pte, 0);
92932+ }
92933+ } else {
92934+ struct page *page;
92935+
92936+ flush_cache_page(vma, address, pte_pfn(entry));
92937+ entry = ptep_clear_flush(vma, address, pte);
92938+ BUG_ON(pte_dirty(entry));
92939+ page = vm_normal_page(vma, address, entry);
92940+ if (page) {
92941+ update_hiwater_rss(mm);
92942+ if (PageAnon(page))
92943+ dec_mm_counter_fast(mm, MM_ANONPAGES);
92944+ else
92945+ dec_mm_counter_fast(mm, MM_FILEPAGES);
92946+ page_remove_rmap(page);
92947+ page_cache_release(page);
92948+ }
92949+ }
92950+ pte_unmap_unlock(pte, ptl);
92951+}
92952+
92953+/* PaX: if vma is mirrored, synchronize the mirror's PTE
92954+ *
92955+ * the ptl of the lower mapped page is held on entry and is not released on exit
92956+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
92957+ */
92958+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
92959+{
92960+ struct mm_struct *mm = vma->vm_mm;
92961+ unsigned long address_m;
92962+ spinlock_t *ptl_m;
92963+ struct vm_area_struct *vma_m;
92964+ pmd_t *pmd_m;
92965+ pte_t *pte_m, entry_m;
92966+
92967+ BUG_ON(!page_m || !PageAnon(page_m));
92968+
92969+ vma_m = pax_find_mirror_vma(vma);
92970+ if (!vma_m)
92971+ return;
92972+
92973+ BUG_ON(!PageLocked(page_m));
92974+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
92975+ address_m = address + SEGMEXEC_TASK_SIZE;
92976+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
92977+ pte_m = pte_offset_map(pmd_m, address_m);
92978+ ptl_m = pte_lockptr(mm, pmd_m);
92979+ if (ptl != ptl_m) {
92980+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
92981+ if (!pte_none(*pte_m))
92982+ goto out;
92983+ }
92984+
92985+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
92986+ page_cache_get(page_m);
92987+ page_add_anon_rmap(page_m, vma_m, address_m);
92988+ inc_mm_counter_fast(mm, MM_ANONPAGES);
92989+ set_pte_at(mm, address_m, pte_m, entry_m);
92990+ update_mmu_cache(vma_m, address_m, pte_m);
92991+out:
92992+ if (ptl != ptl_m)
92993+ spin_unlock(ptl_m);
92994+ pte_unmap(pte_m);
92995+ unlock_page(page_m);
92996+}
92997+
92998+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
92999+{
93000+ struct mm_struct *mm = vma->vm_mm;
93001+ unsigned long address_m;
93002+ spinlock_t *ptl_m;
93003+ struct vm_area_struct *vma_m;
93004+ pmd_t *pmd_m;
93005+ pte_t *pte_m, entry_m;
93006+
93007+ BUG_ON(!page_m || PageAnon(page_m));
93008+
93009+ vma_m = pax_find_mirror_vma(vma);
93010+ if (!vma_m)
93011+ return;
93012+
93013+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
93014+ address_m = address + SEGMEXEC_TASK_SIZE;
93015+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
93016+ pte_m = pte_offset_map(pmd_m, address_m);
93017+ ptl_m = pte_lockptr(mm, pmd_m);
93018+ if (ptl != ptl_m) {
93019+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
93020+ if (!pte_none(*pte_m))
93021+ goto out;
93022+ }
93023+
93024+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
93025+ page_cache_get(page_m);
93026+ page_add_file_rmap(page_m);
93027+ inc_mm_counter_fast(mm, MM_FILEPAGES);
93028+ set_pte_at(mm, address_m, pte_m, entry_m);
93029+ update_mmu_cache(vma_m, address_m, pte_m);
93030+out:
93031+ if (ptl != ptl_m)
93032+ spin_unlock(ptl_m);
93033+ pte_unmap(pte_m);
93034+}
93035+
93036+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
93037+{
93038+ struct mm_struct *mm = vma->vm_mm;
93039+ unsigned long address_m;
93040+ spinlock_t *ptl_m;
93041+ struct vm_area_struct *vma_m;
93042+ pmd_t *pmd_m;
93043+ pte_t *pte_m, entry_m;
93044+
93045+ vma_m = pax_find_mirror_vma(vma);
93046+ if (!vma_m)
93047+ return;
93048+
93049+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
93050+ address_m = address + SEGMEXEC_TASK_SIZE;
93051+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
93052+ pte_m = pte_offset_map(pmd_m, address_m);
93053+ ptl_m = pte_lockptr(mm, pmd_m);
93054+ if (ptl != ptl_m) {
93055+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
93056+ if (!pte_none(*pte_m))
93057+ goto out;
93058+ }
93059+
93060+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
93061+ set_pte_at(mm, address_m, pte_m, entry_m);
93062+out:
93063+ if (ptl != ptl_m)
93064+ spin_unlock(ptl_m);
93065+ pte_unmap(pte_m);
93066+}
93067+
93068+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
93069+{
93070+ struct page *page_m;
93071+ pte_t entry;
93072+
93073+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
93074+ goto out;
93075+
93076+ entry = *pte;
93077+ page_m = vm_normal_page(vma, address, entry);
93078+ if (!page_m)
93079+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
93080+ else if (PageAnon(page_m)) {
93081+ if (pax_find_mirror_vma(vma)) {
93082+ pte_unmap_unlock(pte, ptl);
93083+ lock_page(page_m);
93084+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
93085+ if (pte_same(entry, *pte))
93086+ pax_mirror_anon_pte(vma, address, page_m, ptl);
93087+ else
93088+ unlock_page(page_m);
93089+ }
93090+ } else
93091+ pax_mirror_file_pte(vma, address, page_m, ptl);
93092+
93093+out:
93094+ pte_unmap_unlock(pte, ptl);
93095+}
93096+#endif
93097+
93098 /*
93099 * This routine handles present pages, when users try to write
93100 * to a shared page. It is done by copying the page to a new address
93101@@ -2860,6 +3056,12 @@ gotten:
93102 */
93103 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
93104 if (likely(pte_same(*page_table, orig_pte))) {
93105+
93106+#ifdef CONFIG_PAX_SEGMEXEC
93107+ if (pax_find_mirror_vma(vma))
93108+ BUG_ON(!trylock_page(new_page));
93109+#endif
93110+
93111 if (old_page) {
93112 if (!PageAnon(old_page)) {
93113 dec_mm_counter_fast(mm, MM_FILEPAGES);
93114@@ -2911,6 +3113,10 @@ gotten:
93115 page_remove_rmap(old_page);
93116 }
93117
93118+#ifdef CONFIG_PAX_SEGMEXEC
93119+ pax_mirror_anon_pte(vma, address, new_page, ptl);
93120+#endif
93121+
93122 /* Free the old page.. */
93123 new_page = old_page;
93124 ret |= VM_FAULT_WRITE;
93125@@ -3184,6 +3390,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
93126 swap_free(entry);
93127 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
93128 try_to_free_swap(page);
93129+
93130+#ifdef CONFIG_PAX_SEGMEXEC
93131+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
93132+#endif
93133+
93134 unlock_page(page);
93135 if (page != swapcache) {
93136 /*
93137@@ -3207,6 +3418,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
93138
93139 /* No need to invalidate - it was non-present before */
93140 update_mmu_cache(vma, address, page_table);
93141+
93142+#ifdef CONFIG_PAX_SEGMEXEC
93143+ pax_mirror_anon_pte(vma, address, page, ptl);
93144+#endif
93145+
93146 unlock:
93147 pte_unmap_unlock(page_table, ptl);
93148 out:
93149@@ -3226,40 +3442,6 @@ out_release:
93150 }
93151
93152 /*
93153- * This is like a special single-page "expand_{down|up}wards()",
93154- * except we must first make sure that 'address{-|+}PAGE_SIZE'
93155- * doesn't hit another vma.
93156- */
93157-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
93158-{
93159- address &= PAGE_MASK;
93160- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
93161- struct vm_area_struct *prev = vma->vm_prev;
93162-
93163- /*
93164- * Is there a mapping abutting this one below?
93165- *
93166- * That's only ok if it's the same stack mapping
93167- * that has gotten split..
93168- */
93169- if (prev && prev->vm_end == address)
93170- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
93171-
93172- expand_downwards(vma, address - PAGE_SIZE);
93173- }
93174- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
93175- struct vm_area_struct *next = vma->vm_next;
93176-
93177- /* As VM_GROWSDOWN but s/below/above/ */
93178- if (next && next->vm_start == address + PAGE_SIZE)
93179- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
93180-
93181- expand_upwards(vma, address + PAGE_SIZE);
93182- }
93183- return 0;
93184-}
93185-
93186-/*
93187 * We enter with non-exclusive mmap_sem (to exclude vma changes,
93188 * but allow concurrent faults), and pte mapped but not yet locked.
93189 * We return with mmap_sem still held, but pte unmapped and unlocked.
93190@@ -3268,27 +3450,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
93191 unsigned long address, pte_t *page_table, pmd_t *pmd,
93192 unsigned int flags)
93193 {
93194- struct page *page;
93195+ struct page *page = NULL;
93196 spinlock_t *ptl;
93197 pte_t entry;
93198
93199- pte_unmap(page_table);
93200-
93201- /* Check if we need to add a guard page to the stack */
93202- if (check_stack_guard_page(vma, address) < 0)
93203- return VM_FAULT_SIGBUS;
93204-
93205- /* Use the zero-page for reads */
93206 if (!(flags & FAULT_FLAG_WRITE)) {
93207 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
93208 vma->vm_page_prot));
93209- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
93210+ ptl = pte_lockptr(mm, pmd);
93211+ spin_lock(ptl);
93212 if (!pte_none(*page_table))
93213 goto unlock;
93214 goto setpte;
93215 }
93216
93217 /* Allocate our own private page. */
93218+ pte_unmap(page_table);
93219+
93220 if (unlikely(anon_vma_prepare(vma)))
93221 goto oom;
93222 page = alloc_zeroed_user_highpage_movable(vma, address);
93223@@ -3312,6 +3490,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
93224 if (!pte_none(*page_table))
93225 goto release;
93226
93227+#ifdef CONFIG_PAX_SEGMEXEC
93228+ if (pax_find_mirror_vma(vma))
93229+ BUG_ON(!trylock_page(page));
93230+#endif
93231+
93232 inc_mm_counter_fast(mm, MM_ANONPAGES);
93233 page_add_new_anon_rmap(page, vma, address);
93234 setpte:
93235@@ -3319,6 +3502,12 @@ setpte:
93236
93237 /* No need to invalidate - it was non-present before */
93238 update_mmu_cache(vma, address, page_table);
93239+
93240+#ifdef CONFIG_PAX_SEGMEXEC
93241+ if (page)
93242+ pax_mirror_anon_pte(vma, address, page, ptl);
93243+#endif
93244+
93245 unlock:
93246 pte_unmap_unlock(page_table, ptl);
93247 return 0;
93248@@ -3535,6 +3724,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93249 return ret;
93250 }
93251 do_set_pte(vma, address, fault_page, pte, false, false);
93252+
93253+#ifdef CONFIG_PAX_SEGMEXEC
93254+ pax_mirror_file_pte(vma, address, fault_page, ptl);
93255+#endif
93256+
93257 unlock_page(fault_page);
93258 unlock_out:
93259 pte_unmap_unlock(pte, ptl);
93260@@ -3576,7 +3770,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93261 page_cache_release(fault_page);
93262 goto uncharge_out;
93263 }
93264+
93265+#ifdef CONFIG_PAX_SEGMEXEC
93266+ if (pax_find_mirror_vma(vma))
93267+ BUG_ON(!trylock_page(new_page));
93268+#endif
93269+
93270 do_set_pte(vma, address, new_page, pte, true, true);
93271+
93272+#ifdef CONFIG_PAX_SEGMEXEC
93273+ pax_mirror_anon_pte(vma, address, new_page, ptl);
93274+#endif
93275+
93276 pte_unmap_unlock(pte, ptl);
93277 unlock_page(fault_page);
93278 page_cache_release(fault_page);
93279@@ -3624,6 +3829,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93280 return ret;
93281 }
93282 do_set_pte(vma, address, fault_page, pte, true, false);
93283+
93284+#ifdef CONFIG_PAX_SEGMEXEC
93285+ pax_mirror_file_pte(vma, address, fault_page, ptl);
93286+#endif
93287+
93288 pte_unmap_unlock(pte, ptl);
93289
93290 if (set_page_dirty(fault_page))
93291@@ -3854,6 +4064,12 @@ static int handle_pte_fault(struct mm_struct *mm,
93292 if (flags & FAULT_FLAG_WRITE)
93293 flush_tlb_fix_spurious_fault(vma, address);
93294 }
93295+
93296+#ifdef CONFIG_PAX_SEGMEXEC
93297+ pax_mirror_pte(vma, address, pte, pmd, ptl);
93298+ return 0;
93299+#endif
93300+
93301 unlock:
93302 pte_unmap_unlock(pte, ptl);
93303 return 0;
93304@@ -3870,9 +4086,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
93305 pmd_t *pmd;
93306 pte_t *pte;
93307
93308+#ifdef CONFIG_PAX_SEGMEXEC
93309+ struct vm_area_struct *vma_m;
93310+#endif
93311+
93312 if (unlikely(is_vm_hugetlb_page(vma)))
93313 return hugetlb_fault(mm, vma, address, flags);
93314
93315+#ifdef CONFIG_PAX_SEGMEXEC
93316+ vma_m = pax_find_mirror_vma(vma);
93317+ if (vma_m) {
93318+ unsigned long address_m;
93319+ pgd_t *pgd_m;
93320+ pud_t *pud_m;
93321+ pmd_t *pmd_m;
93322+
93323+ if (vma->vm_start > vma_m->vm_start) {
93324+ address_m = address;
93325+ address -= SEGMEXEC_TASK_SIZE;
93326+ vma = vma_m;
93327+ } else
93328+ address_m = address + SEGMEXEC_TASK_SIZE;
93329+
93330+ pgd_m = pgd_offset(mm, address_m);
93331+ pud_m = pud_alloc(mm, pgd_m, address_m);
93332+ if (!pud_m)
93333+ return VM_FAULT_OOM;
93334+ pmd_m = pmd_alloc(mm, pud_m, address_m);
93335+ if (!pmd_m)
93336+ return VM_FAULT_OOM;
93337+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
93338+ return VM_FAULT_OOM;
93339+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
93340+ }
93341+#endif
93342+
93343 pgd = pgd_offset(mm, address);
93344 pud = pud_alloc(mm, pgd, address);
93345 if (!pud)
93346@@ -4003,6 +4251,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
93347 spin_unlock(&mm->page_table_lock);
93348 return 0;
93349 }
93350+
93351+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
93352+{
93353+ pud_t *new = pud_alloc_one(mm, address);
93354+ if (!new)
93355+ return -ENOMEM;
93356+
93357+ smp_wmb(); /* See comment in __pte_alloc */
93358+
93359+ spin_lock(&mm->page_table_lock);
93360+ if (pgd_present(*pgd)) /* Another has populated it */
93361+ pud_free(mm, new);
93362+ else
93363+ pgd_populate_kernel(mm, pgd, new);
93364+ spin_unlock(&mm->page_table_lock);
93365+ return 0;
93366+}
93367 #endif /* __PAGETABLE_PUD_FOLDED */
93368
93369 #ifndef __PAGETABLE_PMD_FOLDED
93370@@ -4033,6 +4298,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
93371 spin_unlock(&mm->page_table_lock);
93372 return 0;
93373 }
93374+
93375+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
93376+{
93377+ pmd_t *new = pmd_alloc_one(mm, address);
93378+ if (!new)
93379+ return -ENOMEM;
93380+
93381+ smp_wmb(); /* See comment in __pte_alloc */
93382+
93383+ spin_lock(&mm->page_table_lock);
93384+#ifndef __ARCH_HAS_4LEVEL_HACK
93385+ if (pud_present(*pud)) /* Another has populated it */
93386+ pmd_free(mm, new);
93387+ else
93388+ pud_populate_kernel(mm, pud, new);
93389+#else
93390+ if (pgd_present(*pud)) /* Another has populated it */
93391+ pmd_free(mm, new);
93392+ else
93393+ pgd_populate_kernel(mm, pud, new);
93394+#endif /* __ARCH_HAS_4LEVEL_HACK */
93395+ spin_unlock(&mm->page_table_lock);
93396+ return 0;
93397+}
93398 #endif /* __PAGETABLE_PMD_FOLDED */
93399
93400 #if !defined(__HAVE_ARCH_GATE_AREA)
93401@@ -4046,7 +4335,7 @@ static int __init gate_vma_init(void)
93402 gate_vma.vm_start = FIXADDR_USER_START;
93403 gate_vma.vm_end = FIXADDR_USER_END;
93404 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
93405- gate_vma.vm_page_prot = __P101;
93406+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
93407
93408 return 0;
93409 }
93410@@ -4180,8 +4469,8 @@ out:
93411 return ret;
93412 }
93413
93414-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
93415- void *buf, int len, int write)
93416+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
93417+ void *buf, size_t len, int write)
93418 {
93419 resource_size_t phys_addr;
93420 unsigned long prot = 0;
93421@@ -4207,8 +4496,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
93422 * Access another process' address space as given in mm. If non-NULL, use the
93423 * given task for page fault accounting.
93424 */
93425-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93426- unsigned long addr, void *buf, int len, int write)
93427+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93428+ unsigned long addr, void *buf, size_t len, int write)
93429 {
93430 struct vm_area_struct *vma;
93431 void *old_buf = buf;
93432@@ -4216,7 +4505,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93433 down_read(&mm->mmap_sem);
93434 /* ignore errors, just check how much was successfully transferred */
93435 while (len) {
93436- int bytes, ret, offset;
93437+ ssize_t bytes, ret, offset;
93438 void *maddr;
93439 struct page *page = NULL;
93440
93441@@ -4275,8 +4564,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
93442 *
93443 * The caller must hold a reference on @mm.
93444 */
93445-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
93446- void *buf, int len, int write)
93447+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
93448+ void *buf, size_t len, int write)
93449 {
93450 return __access_remote_vm(NULL, mm, addr, buf, len, write);
93451 }
93452@@ -4286,11 +4575,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
93453 * Source/target buffer must be kernel space,
93454 * Do not walk the page table directly, use get_user_pages
93455 */
93456-int access_process_vm(struct task_struct *tsk, unsigned long addr,
93457- void *buf, int len, int write)
93458+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
93459+ void *buf, size_t len, int write)
93460 {
93461 struct mm_struct *mm;
93462- int ret;
93463+ ssize_t ret;
93464
93465 mm = get_task_mm(tsk);
93466 if (!mm)
93467diff --git a/mm/mempolicy.c b/mm/mempolicy.c
93468index 30cc47f8..c12ef34 100644
93469--- a/mm/mempolicy.c
93470+++ b/mm/mempolicy.c
93471@@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
93472 unsigned long vmstart;
93473 unsigned long vmend;
93474
93475+#ifdef CONFIG_PAX_SEGMEXEC
93476+ struct vm_area_struct *vma_m;
93477+#endif
93478+
93479 vma = find_vma(mm, start);
93480 if (!vma || vma->vm_start > start)
93481 return -EFAULT;
93482@@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
93483 err = vma_replace_policy(vma, new_pol);
93484 if (err)
93485 goto out;
93486+
93487+#ifdef CONFIG_PAX_SEGMEXEC
93488+ vma_m = pax_find_mirror_vma(vma);
93489+ if (vma_m) {
93490+ err = vma_replace_policy(vma_m, new_pol);
93491+ if (err)
93492+ goto out;
93493+ }
93494+#endif
93495+
93496 }
93497
93498 out:
93499@@ -1225,6 +1239,17 @@ static long do_mbind(unsigned long start, unsigned long len,
93500
93501 if (end < start)
93502 return -EINVAL;
93503+
93504+#ifdef CONFIG_PAX_SEGMEXEC
93505+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
93506+ if (end > SEGMEXEC_TASK_SIZE)
93507+ return -EINVAL;
93508+ } else
93509+#endif
93510+
93511+ if (end > TASK_SIZE)
93512+ return -EINVAL;
93513+
93514 if (end == start)
93515 return 0;
93516
93517@@ -1453,8 +1478,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
93518 */
93519 tcred = __task_cred(task);
93520 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
93521- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
93522- !capable(CAP_SYS_NICE)) {
93523+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
93524 rcu_read_unlock();
93525 err = -EPERM;
93526 goto out_put;
93527@@ -1485,6 +1509,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
93528 goto out;
93529 }
93530
93531+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93532+ if (mm != current->mm &&
93533+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
93534+ mmput(mm);
93535+ err = -EPERM;
93536+ goto out;
93537+ }
93538+#endif
93539+
93540 err = do_migrate_pages(mm, old, new,
93541 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
93542
93543diff --git a/mm/migrate.c b/mm/migrate.c
93544index bed4880..a493f67 100644
93545--- a/mm/migrate.c
93546+++ b/mm/migrate.c
93547@@ -1485,8 +1485,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
93548 */
93549 tcred = __task_cred(task);
93550 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
93551- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
93552- !capable(CAP_SYS_NICE)) {
93553+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
93554 rcu_read_unlock();
93555 err = -EPERM;
93556 goto out;
93557diff --git a/mm/mlock.c b/mm/mlock.c
93558index b1eb536..091d154 100644
93559--- a/mm/mlock.c
93560+++ b/mm/mlock.c
93561@@ -14,6 +14,7 @@
93562 #include <linux/pagevec.h>
93563 #include <linux/mempolicy.h>
93564 #include <linux/syscalls.h>
93565+#include <linux/security.h>
93566 #include <linux/sched.h>
93567 #include <linux/export.h>
93568 #include <linux/rmap.h>
93569@@ -606,7 +607,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
93570 {
93571 unsigned long nstart, end, tmp;
93572 struct vm_area_struct * vma, * prev;
93573- int error;
93574+ int error = 0;
93575
93576 VM_BUG_ON(start & ~PAGE_MASK);
93577 VM_BUG_ON(len != PAGE_ALIGN(len));
93578@@ -615,6 +616,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
93579 return -EINVAL;
93580 if (end == start)
93581 return 0;
93582+ if (end > TASK_SIZE)
93583+ return -EINVAL;
93584+
93585 vma = find_vma(current->mm, start);
93586 if (!vma || vma->vm_start > start)
93587 return -ENOMEM;
93588@@ -626,6 +630,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
93589 for (nstart = start ; ; ) {
93590 vm_flags_t newflags;
93591
93592+#ifdef CONFIG_PAX_SEGMEXEC
93593+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
93594+ break;
93595+#endif
93596+
93597 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
93598
93599 newflags = vma->vm_flags & ~VM_LOCKED;
93600@@ -739,6 +748,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
93601 locked += current->mm->locked_vm;
93602
93603 /* check against resource limits */
93604+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
93605 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
93606 error = do_mlock(start, len, 1);
93607
93608@@ -776,6 +786,11 @@ static int do_mlockall(int flags)
93609 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
93610 vm_flags_t newflags;
93611
93612+#ifdef CONFIG_PAX_SEGMEXEC
93613+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
93614+ break;
93615+#endif
93616+
93617 newflags = vma->vm_flags & ~VM_LOCKED;
93618 if (flags & MCL_CURRENT)
93619 newflags |= VM_LOCKED;
93620@@ -807,8 +822,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
93621 lock_limit >>= PAGE_SHIFT;
93622
93623 ret = -ENOMEM;
93624+
93625+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
93626+
93627 down_write(&current->mm->mmap_sem);
93628-
93629 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
93630 capable(CAP_IPC_LOCK))
93631 ret = do_mlockall(flags);
93632diff --git a/mm/mmap.c b/mm/mmap.c
93633index b1202cf..ee487f8 100644
93634--- a/mm/mmap.c
93635+++ b/mm/mmap.c
93636@@ -37,6 +37,7 @@
93637 #include <linux/sched/sysctl.h>
93638 #include <linux/notifier.h>
93639 #include <linux/memory.h>
93640+#include <linux/random.h>
93641
93642 #include <asm/uaccess.h>
93643 #include <asm/cacheflush.h>
93644@@ -53,6 +54,16 @@
93645 #define arch_rebalance_pgtables(addr, len) (addr)
93646 #endif
93647
93648+static inline void verify_mm_writelocked(struct mm_struct *mm)
93649+{
93650+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
93651+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
93652+ up_read(&mm->mmap_sem);
93653+ BUG();
93654+ }
93655+#endif
93656+}
93657+
93658 static void unmap_region(struct mm_struct *mm,
93659 struct vm_area_struct *vma, struct vm_area_struct *prev,
93660 unsigned long start, unsigned long end);
93661@@ -72,16 +83,25 @@ static void unmap_region(struct mm_struct *mm,
93662 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
93663 *
93664 */
93665-pgprot_t protection_map[16] = {
93666+pgprot_t protection_map[16] __read_only = {
93667 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
93668 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
93669 };
93670
93671-pgprot_t vm_get_page_prot(unsigned long vm_flags)
93672+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
93673 {
93674- return __pgprot(pgprot_val(protection_map[vm_flags &
93675+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
93676 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
93677 pgprot_val(arch_vm_get_page_prot(vm_flags)));
93678+
93679+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
93680+ if (!(__supported_pte_mask & _PAGE_NX) &&
93681+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
93682+ (vm_flags & (VM_READ | VM_WRITE)))
93683+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
93684+#endif
93685+
93686+ return prot;
93687 }
93688 EXPORT_SYMBOL(vm_get_page_prot);
93689
93690@@ -91,6 +111,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
93691 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
93692 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
93693 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
93694+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
93695 /*
93696 * Make sure vm_committed_as in one cacheline and not cacheline shared with
93697 * other variables. It can be updated by several CPUs frequently.
93698@@ -247,6 +268,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
93699 struct vm_area_struct *next = vma->vm_next;
93700
93701 might_sleep();
93702+ BUG_ON(vma->vm_mirror);
93703 if (vma->vm_ops && vma->vm_ops->close)
93704 vma->vm_ops->close(vma);
93705 if (vma->vm_file)
93706@@ -291,6 +313,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
93707 * not page aligned -Ram Gupta
93708 */
93709 rlim = rlimit(RLIMIT_DATA);
93710+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
93711 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
93712 (mm->end_data - mm->start_data) > rlim)
93713 goto out;
93714@@ -942,6 +965,12 @@ static int
93715 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
93716 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
93717 {
93718+
93719+#ifdef CONFIG_PAX_SEGMEXEC
93720+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
93721+ return 0;
93722+#endif
93723+
93724 if (is_mergeable_vma(vma, file, vm_flags) &&
93725 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
93726 if (vma->vm_pgoff == vm_pgoff)
93727@@ -961,6 +990,12 @@ static int
93728 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
93729 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
93730 {
93731+
93732+#ifdef CONFIG_PAX_SEGMEXEC
93733+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
93734+ return 0;
93735+#endif
93736+
93737 if (is_mergeable_vma(vma, file, vm_flags) &&
93738 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
93739 pgoff_t vm_pglen;
93740@@ -1003,13 +1038,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
93741 struct vm_area_struct *vma_merge(struct mm_struct *mm,
93742 struct vm_area_struct *prev, unsigned long addr,
93743 unsigned long end, unsigned long vm_flags,
93744- struct anon_vma *anon_vma, struct file *file,
93745+ struct anon_vma *anon_vma, struct file *file,
93746 pgoff_t pgoff, struct mempolicy *policy)
93747 {
93748 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
93749 struct vm_area_struct *area, *next;
93750 int err;
93751
93752+#ifdef CONFIG_PAX_SEGMEXEC
93753+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
93754+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
93755+
93756+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
93757+#endif
93758+
93759 /*
93760 * We later require that vma->vm_flags == vm_flags,
93761 * so this tests vma->vm_flags & VM_SPECIAL, too.
93762@@ -1025,6 +1067,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
93763 if (next && next->vm_end == end) /* cases 6, 7, 8 */
93764 next = next->vm_next;
93765
93766+#ifdef CONFIG_PAX_SEGMEXEC
93767+ if (prev)
93768+ prev_m = pax_find_mirror_vma(prev);
93769+ if (area)
93770+ area_m = pax_find_mirror_vma(area);
93771+ if (next)
93772+ next_m = pax_find_mirror_vma(next);
93773+#endif
93774+
93775 /*
93776 * Can it merge with the predecessor?
93777 */
93778@@ -1044,9 +1095,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
93779 /* cases 1, 6 */
93780 err = vma_adjust(prev, prev->vm_start,
93781 next->vm_end, prev->vm_pgoff, NULL);
93782- } else /* cases 2, 5, 7 */
93783+
93784+#ifdef CONFIG_PAX_SEGMEXEC
93785+ if (!err && prev_m)
93786+ err = vma_adjust(prev_m, prev_m->vm_start,
93787+ next_m->vm_end, prev_m->vm_pgoff, NULL);
93788+#endif
93789+
93790+ } else { /* cases 2, 5, 7 */
93791 err = vma_adjust(prev, prev->vm_start,
93792 end, prev->vm_pgoff, NULL);
93793+
93794+#ifdef CONFIG_PAX_SEGMEXEC
93795+ if (!err && prev_m)
93796+ err = vma_adjust(prev_m, prev_m->vm_start,
93797+ end_m, prev_m->vm_pgoff, NULL);
93798+#endif
93799+
93800+ }
93801 if (err)
93802 return NULL;
93803 khugepaged_enter_vma_merge(prev);
93804@@ -1060,12 +1126,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
93805 mpol_equal(policy, vma_policy(next)) &&
93806 can_vma_merge_before(next, vm_flags,
93807 anon_vma, file, pgoff+pglen)) {
93808- if (prev && addr < prev->vm_end) /* case 4 */
93809+ if (prev && addr < prev->vm_end) { /* case 4 */
93810 err = vma_adjust(prev, prev->vm_start,
93811 addr, prev->vm_pgoff, NULL);
93812- else /* cases 3, 8 */
93813+
93814+#ifdef CONFIG_PAX_SEGMEXEC
93815+ if (!err && prev_m)
93816+ err = vma_adjust(prev_m, prev_m->vm_start,
93817+ addr_m, prev_m->vm_pgoff, NULL);
93818+#endif
93819+
93820+ } else { /* cases 3, 8 */
93821 err = vma_adjust(area, addr, next->vm_end,
93822 next->vm_pgoff - pglen, NULL);
93823+
93824+#ifdef CONFIG_PAX_SEGMEXEC
93825+ if (!err && area_m)
93826+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
93827+ next_m->vm_pgoff - pglen, NULL);
93828+#endif
93829+
93830+ }
93831 if (err)
93832 return NULL;
93833 khugepaged_enter_vma_merge(area);
93834@@ -1174,8 +1255,10 @@ none:
93835 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
93836 struct file *file, long pages)
93837 {
93838- const unsigned long stack_flags
93839- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
93840+
93841+#ifdef CONFIG_PAX_RANDMMAP
93842+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
93843+#endif
93844
93845 mm->total_vm += pages;
93846
93847@@ -1183,7 +1266,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
93848 mm->shared_vm += pages;
93849 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
93850 mm->exec_vm += pages;
93851- } else if (flags & stack_flags)
93852+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
93853 mm->stack_vm += pages;
93854 }
93855 #endif /* CONFIG_PROC_FS */
93856@@ -1213,6 +1296,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
93857 locked += mm->locked_vm;
93858 lock_limit = rlimit(RLIMIT_MEMLOCK);
93859 lock_limit >>= PAGE_SHIFT;
93860+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
93861 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
93862 return -EAGAIN;
93863 }
93864@@ -1239,7 +1323,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93865 * (the exception is when the underlying filesystem is noexec
93866 * mounted, in which case we dont add PROT_EXEC.)
93867 */
93868- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
93869+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
93870 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
93871 prot |= PROT_EXEC;
93872
93873@@ -1265,7 +1349,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93874 /* Obtain the address to map to. we verify (or select) it and ensure
93875 * that it represents a valid section of the address space.
93876 */
93877- addr = get_unmapped_area(file, addr, len, pgoff, flags);
93878+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
93879 if (addr & ~PAGE_MASK)
93880 return addr;
93881
93882@@ -1276,6 +1360,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93883 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
93884 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
93885
93886+#ifdef CONFIG_PAX_MPROTECT
93887+ if (mm->pax_flags & MF_PAX_MPROTECT) {
93888+
93889+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
93890+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
93891+ mm->binfmt->handle_mmap)
93892+ mm->binfmt->handle_mmap(file);
93893+#endif
93894+
93895+#ifndef CONFIG_PAX_MPROTECT_COMPAT
93896+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
93897+ gr_log_rwxmmap(file);
93898+
93899+#ifdef CONFIG_PAX_EMUPLT
93900+ vm_flags &= ~VM_EXEC;
93901+#else
93902+ return -EPERM;
93903+#endif
93904+
93905+ }
93906+
93907+ if (!(vm_flags & VM_EXEC))
93908+ vm_flags &= ~VM_MAYEXEC;
93909+#else
93910+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
93911+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
93912+#endif
93913+ else
93914+ vm_flags &= ~VM_MAYWRITE;
93915+ }
93916+#endif
93917+
93918+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
93919+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
93920+ vm_flags &= ~VM_PAGEEXEC;
93921+#endif
93922+
93923 if (flags & MAP_LOCKED)
93924 if (!can_do_mlock())
93925 return -EPERM;
93926@@ -1363,6 +1484,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
93927 vm_flags |= VM_NORESERVE;
93928 }
93929
93930+ if (!gr_acl_handle_mmap(file, prot))
93931+ return -EACCES;
93932+
93933 addr = mmap_region(file, addr, len, vm_flags, pgoff);
93934 if (!IS_ERR_VALUE(addr) &&
93935 ((vm_flags & VM_LOCKED) ||
93936@@ -1456,7 +1580,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
93937 vm_flags_t vm_flags = vma->vm_flags;
93938
93939 /* If it was private or non-writable, the write bit is already clear */
93940- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
93941+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
93942 return 0;
93943
93944 /* The backer wishes to know when pages are first written to? */
93945@@ -1502,7 +1626,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
93946 struct rb_node **rb_link, *rb_parent;
93947 unsigned long charged = 0;
93948
93949+#ifdef CONFIG_PAX_SEGMEXEC
93950+ struct vm_area_struct *vma_m = NULL;
93951+#endif
93952+
93953+ /*
93954+ * mm->mmap_sem is required to protect against another thread
93955+ * changing the mappings in case we sleep.
93956+ */
93957+ verify_mm_writelocked(mm);
93958+
93959 /* Check against address space limit. */
93960+
93961+#ifdef CONFIG_PAX_RANDMMAP
93962+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
93963+#endif
93964+
93965 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
93966 unsigned long nr_pages;
93967
93968@@ -1521,11 +1660,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
93969
93970 /* Clear old maps */
93971 error = -ENOMEM;
93972-munmap_back:
93973 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
93974 if (do_munmap(mm, addr, len))
93975 return -ENOMEM;
93976- goto munmap_back;
93977+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
93978 }
93979
93980 /*
93981@@ -1556,6 +1694,16 @@ munmap_back:
93982 goto unacct_error;
93983 }
93984
93985+#ifdef CONFIG_PAX_SEGMEXEC
93986+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
93987+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
93988+ if (!vma_m) {
93989+ error = -ENOMEM;
93990+ goto free_vma;
93991+ }
93992+ }
93993+#endif
93994+
93995 vma->vm_mm = mm;
93996 vma->vm_start = addr;
93997 vma->vm_end = addr + len;
93998@@ -1575,6 +1723,13 @@ munmap_back:
93999 if (error)
94000 goto unmap_and_free_vma;
94001
94002+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
94003+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
94004+ vma->vm_flags |= VM_PAGEEXEC;
94005+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
94006+ }
94007+#endif
94008+
94009 /* Can addr have changed??
94010 *
94011 * Answer: Yes, several device drivers can do it in their
94012@@ -1608,6 +1763,12 @@ munmap_back:
94013 }
94014
94015 vma_link(mm, vma, prev, rb_link, rb_parent);
94016+
94017+#ifdef CONFIG_PAX_SEGMEXEC
94018+ if (vma_m)
94019+ BUG_ON(pax_mirror_vma(vma_m, vma));
94020+#endif
94021+
94022 /* Once vma denies write, undo our temporary denial count */
94023 if (vm_flags & VM_DENYWRITE)
94024 allow_write_access(file);
94025@@ -1616,6 +1777,7 @@ out:
94026 perf_event_mmap(vma);
94027
94028 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
94029+ track_exec_limit(mm, addr, addr + len, vm_flags);
94030 if (vm_flags & VM_LOCKED) {
94031 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
94032 vma == get_gate_vma(current->mm)))
94033@@ -1648,6 +1810,12 @@ unmap_and_free_vma:
94034 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
94035 charged = 0;
94036 free_vma:
94037+
94038+#ifdef CONFIG_PAX_SEGMEXEC
94039+ if (vma_m)
94040+ kmem_cache_free(vm_area_cachep, vma_m);
94041+#endif
94042+
94043 kmem_cache_free(vm_area_cachep, vma);
94044 unacct_error:
94045 if (charged)
94046@@ -1655,7 +1823,63 @@ unacct_error:
94047 return error;
94048 }
94049
94050-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
94051+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
94052+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
94053+{
94054+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
94055+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
94056+
94057+ return 0;
94058+}
94059+#endif
94060+
94061+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
94062+{
94063+ if (!vma) {
94064+#ifdef CONFIG_STACK_GROWSUP
94065+ if (addr > sysctl_heap_stack_gap)
94066+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
94067+ else
94068+ vma = find_vma(current->mm, 0);
94069+ if (vma && (vma->vm_flags & VM_GROWSUP))
94070+ return false;
94071+#endif
94072+ return true;
94073+ }
94074+
94075+ if (addr + len > vma->vm_start)
94076+ return false;
94077+
94078+ if (vma->vm_flags & VM_GROWSDOWN)
94079+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
94080+#ifdef CONFIG_STACK_GROWSUP
94081+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
94082+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
94083+#endif
94084+ else if (offset)
94085+ return offset <= vma->vm_start - addr - len;
94086+
94087+ return true;
94088+}
94089+
94090+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
94091+{
94092+ if (vma->vm_start < len)
94093+ return -ENOMEM;
94094+
94095+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
94096+ if (offset <= vma->vm_start - len)
94097+ return vma->vm_start - len - offset;
94098+ else
94099+ return -ENOMEM;
94100+ }
94101+
94102+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
94103+ return vma->vm_start - len - sysctl_heap_stack_gap;
94104+ return -ENOMEM;
94105+}
94106+
94107+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
94108 {
94109 /*
94110 * We implement the search by looking for an rbtree node that
94111@@ -1703,11 +1927,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
94112 }
94113 }
94114
94115- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
94116+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
94117 check_current:
94118 /* Check if current node has a suitable gap */
94119 if (gap_start > high_limit)
94120 return -ENOMEM;
94121+
94122+ if (gap_end - gap_start > info->threadstack_offset)
94123+ gap_start += info->threadstack_offset;
94124+ else
94125+ gap_start = gap_end;
94126+
94127+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
94128+ if (gap_end - gap_start > sysctl_heap_stack_gap)
94129+ gap_start += sysctl_heap_stack_gap;
94130+ else
94131+ gap_start = gap_end;
94132+ }
94133+ if (vma->vm_flags & VM_GROWSDOWN) {
94134+ if (gap_end - gap_start > sysctl_heap_stack_gap)
94135+ gap_end -= sysctl_heap_stack_gap;
94136+ else
94137+ gap_end = gap_start;
94138+ }
94139 if (gap_end >= low_limit && gap_end - gap_start >= length)
94140 goto found;
94141
94142@@ -1757,7 +1999,7 @@ found:
94143 return gap_start;
94144 }
94145
94146-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
94147+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
94148 {
94149 struct mm_struct *mm = current->mm;
94150 struct vm_area_struct *vma;
94151@@ -1811,6 +2053,24 @@ check_current:
94152 gap_end = vma->vm_start;
94153 if (gap_end < low_limit)
94154 return -ENOMEM;
94155+
94156+ if (gap_end - gap_start > info->threadstack_offset)
94157+ gap_end -= info->threadstack_offset;
94158+ else
94159+ gap_end = gap_start;
94160+
94161+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
94162+ if (gap_end - gap_start > sysctl_heap_stack_gap)
94163+ gap_start += sysctl_heap_stack_gap;
94164+ else
94165+ gap_start = gap_end;
94166+ }
94167+ if (vma->vm_flags & VM_GROWSDOWN) {
94168+ if (gap_end - gap_start > sysctl_heap_stack_gap)
94169+ gap_end -= sysctl_heap_stack_gap;
94170+ else
94171+ gap_end = gap_start;
94172+ }
94173 if (gap_start <= high_limit && gap_end - gap_start >= length)
94174 goto found;
94175
94176@@ -1874,6 +2134,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
94177 struct mm_struct *mm = current->mm;
94178 struct vm_area_struct *vma;
94179 struct vm_unmapped_area_info info;
94180+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
94181
94182 if (len > TASK_SIZE - mmap_min_addr)
94183 return -ENOMEM;
94184@@ -1881,11 +2142,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
94185 if (flags & MAP_FIXED)
94186 return addr;
94187
94188+#ifdef CONFIG_PAX_RANDMMAP
94189+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
94190+#endif
94191+
94192 if (addr) {
94193 addr = PAGE_ALIGN(addr);
94194 vma = find_vma(mm, addr);
94195 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
94196- (!vma || addr + len <= vma->vm_start))
94197+ check_heap_stack_gap(vma, addr, len, offset))
94198 return addr;
94199 }
94200
94201@@ -1894,6 +2159,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
94202 info.low_limit = mm->mmap_base;
94203 info.high_limit = TASK_SIZE;
94204 info.align_mask = 0;
94205+ info.threadstack_offset = offset;
94206 return vm_unmapped_area(&info);
94207 }
94208 #endif
94209@@ -1912,6 +2178,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94210 struct mm_struct *mm = current->mm;
94211 unsigned long addr = addr0;
94212 struct vm_unmapped_area_info info;
94213+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
94214
94215 /* requested length too big for entire address space */
94216 if (len > TASK_SIZE - mmap_min_addr)
94217@@ -1920,12 +2187,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94218 if (flags & MAP_FIXED)
94219 return addr;
94220
94221+#ifdef CONFIG_PAX_RANDMMAP
94222+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
94223+#endif
94224+
94225 /* requesting a specific address */
94226 if (addr) {
94227 addr = PAGE_ALIGN(addr);
94228 vma = find_vma(mm, addr);
94229 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
94230- (!vma || addr + len <= vma->vm_start))
94231+ check_heap_stack_gap(vma, addr, len, offset))
94232 return addr;
94233 }
94234
94235@@ -1934,6 +2205,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94236 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
94237 info.high_limit = mm->mmap_base;
94238 info.align_mask = 0;
94239+ info.threadstack_offset = offset;
94240 addr = vm_unmapped_area(&info);
94241
94242 /*
94243@@ -1946,6 +2218,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
94244 VM_BUG_ON(addr != -ENOMEM);
94245 info.flags = 0;
94246 info.low_limit = TASK_UNMAPPED_BASE;
94247+
94248+#ifdef CONFIG_PAX_RANDMMAP
94249+ if (mm->pax_flags & MF_PAX_RANDMMAP)
94250+ info.low_limit += mm->delta_mmap;
94251+#endif
94252+
94253 info.high_limit = TASK_SIZE;
94254 addr = vm_unmapped_area(&info);
94255 }
94256@@ -2046,6 +2324,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
94257 return vma;
94258 }
94259
94260+#ifdef CONFIG_PAX_SEGMEXEC
94261+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
94262+{
94263+ struct vm_area_struct *vma_m;
94264+
94265+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
94266+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
94267+ BUG_ON(vma->vm_mirror);
94268+ return NULL;
94269+ }
94270+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
94271+ vma_m = vma->vm_mirror;
94272+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
94273+ BUG_ON(vma->vm_file != vma_m->vm_file);
94274+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
94275+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
94276+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
94277+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
94278+ return vma_m;
94279+}
94280+#endif
94281+
94282 /*
94283 * Verify that the stack growth is acceptable and
94284 * update accounting. This is shared with both the
94285@@ -2062,6 +2362,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
94286 return -ENOMEM;
94287
94288 /* Stack limit test */
94289+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
94290 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
94291 return -ENOMEM;
94292
94293@@ -2072,6 +2373,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
94294 locked = mm->locked_vm + grow;
94295 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
94296 limit >>= PAGE_SHIFT;
94297+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
94298 if (locked > limit && !capable(CAP_IPC_LOCK))
94299 return -ENOMEM;
94300 }
94301@@ -2101,37 +2403,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
94302 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
94303 * vma is the last one with address > vma->vm_end. Have to extend vma.
94304 */
94305+#ifndef CONFIG_IA64
94306+static
94307+#endif
94308 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
94309 {
94310 int error;
94311+ bool locknext;
94312
94313 if (!(vma->vm_flags & VM_GROWSUP))
94314 return -EFAULT;
94315
94316+ /* Also guard against wrapping around to address 0. */
94317+ if (address < PAGE_ALIGN(address+1))
94318+ address = PAGE_ALIGN(address+1);
94319+ else
94320+ return -ENOMEM;
94321+
94322 /*
94323 * We must make sure the anon_vma is allocated
94324 * so that the anon_vma locking is not a noop.
94325 */
94326 if (unlikely(anon_vma_prepare(vma)))
94327 return -ENOMEM;
94328+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
94329+ if (locknext && anon_vma_prepare(vma->vm_next))
94330+ return -ENOMEM;
94331 vma_lock_anon_vma(vma);
94332+ if (locknext)
94333+ vma_lock_anon_vma(vma->vm_next);
94334
94335 /*
94336 * vma->vm_start/vm_end cannot change under us because the caller
94337 * is required to hold the mmap_sem in read mode. We need the
94338- * anon_vma lock to serialize against concurrent expand_stacks.
94339- * Also guard against wrapping around to address 0.
94340+ * anon_vma locks to serialize against concurrent expand_stacks
94341+ * and expand_upwards.
94342 */
94343- if (address < PAGE_ALIGN(address+4))
94344- address = PAGE_ALIGN(address+4);
94345- else {
94346- vma_unlock_anon_vma(vma);
94347- return -ENOMEM;
94348- }
94349 error = 0;
94350
94351 /* Somebody else might have raced and expanded it already */
94352- if (address > vma->vm_end) {
94353+ 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)
94354+ error = -ENOMEM;
94355+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
94356 unsigned long size, grow;
94357
94358 size = address - vma->vm_start;
94359@@ -2166,6 +2479,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
94360 }
94361 }
94362 }
94363+ if (locknext)
94364+ vma_unlock_anon_vma(vma->vm_next);
94365 vma_unlock_anon_vma(vma);
94366 khugepaged_enter_vma_merge(vma);
94367 validate_mm(vma->vm_mm);
94368@@ -2180,6 +2495,8 @@ int expand_downwards(struct vm_area_struct *vma,
94369 unsigned long address)
94370 {
94371 int error;
94372+ bool lockprev = false;
94373+ struct vm_area_struct *prev;
94374
94375 /*
94376 * We must make sure the anon_vma is allocated
94377@@ -2193,6 +2510,15 @@ int expand_downwards(struct vm_area_struct *vma,
94378 if (error)
94379 return error;
94380
94381+ prev = vma->vm_prev;
94382+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
94383+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
94384+#endif
94385+ if (lockprev && anon_vma_prepare(prev))
94386+ return -ENOMEM;
94387+ if (lockprev)
94388+ vma_lock_anon_vma(prev);
94389+
94390 vma_lock_anon_vma(vma);
94391
94392 /*
94393@@ -2202,9 +2528,17 @@ int expand_downwards(struct vm_area_struct *vma,
94394 */
94395
94396 /* Somebody else might have raced and expanded it already */
94397- if (address < vma->vm_start) {
94398+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
94399+ error = -ENOMEM;
94400+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
94401 unsigned long size, grow;
94402
94403+#ifdef CONFIG_PAX_SEGMEXEC
94404+ struct vm_area_struct *vma_m;
94405+
94406+ vma_m = pax_find_mirror_vma(vma);
94407+#endif
94408+
94409 size = vma->vm_end - address;
94410 grow = (vma->vm_start - address) >> PAGE_SHIFT;
94411
94412@@ -2229,13 +2563,27 @@ int expand_downwards(struct vm_area_struct *vma,
94413 vma->vm_pgoff -= grow;
94414 anon_vma_interval_tree_post_update_vma(vma);
94415 vma_gap_update(vma);
94416+
94417+#ifdef CONFIG_PAX_SEGMEXEC
94418+ if (vma_m) {
94419+ anon_vma_interval_tree_pre_update_vma(vma_m);
94420+ vma_m->vm_start -= grow << PAGE_SHIFT;
94421+ vma_m->vm_pgoff -= grow;
94422+ anon_vma_interval_tree_post_update_vma(vma_m);
94423+ vma_gap_update(vma_m);
94424+ }
94425+#endif
94426+
94427 spin_unlock(&vma->vm_mm->page_table_lock);
94428
94429+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
94430 perf_event_mmap(vma);
94431 }
94432 }
94433 }
94434 vma_unlock_anon_vma(vma);
94435+ if (lockprev)
94436+ vma_unlock_anon_vma(prev);
94437 khugepaged_enter_vma_merge(vma);
94438 validate_mm(vma->vm_mm);
94439 return error;
94440@@ -2333,6 +2681,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
94441 do {
94442 long nrpages = vma_pages(vma);
94443
94444+#ifdef CONFIG_PAX_SEGMEXEC
94445+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
94446+ vma = remove_vma(vma);
94447+ continue;
94448+ }
94449+#endif
94450+
94451 if (vma->vm_flags & VM_ACCOUNT)
94452 nr_accounted += nrpages;
94453 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
94454@@ -2377,6 +2732,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
94455 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
94456 vma->vm_prev = NULL;
94457 do {
94458+
94459+#ifdef CONFIG_PAX_SEGMEXEC
94460+ if (vma->vm_mirror) {
94461+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
94462+ vma->vm_mirror->vm_mirror = NULL;
94463+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
94464+ vma->vm_mirror = NULL;
94465+ }
94466+#endif
94467+
94468 vma_rb_erase(vma, &mm->mm_rb);
94469 mm->map_count--;
94470 tail_vma = vma;
94471@@ -2404,14 +2769,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94472 struct vm_area_struct *new;
94473 int err = -ENOMEM;
94474
94475+#ifdef CONFIG_PAX_SEGMEXEC
94476+ struct vm_area_struct *vma_m, *new_m = NULL;
94477+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
94478+#endif
94479+
94480 if (is_vm_hugetlb_page(vma) && (addr &
94481 ~(huge_page_mask(hstate_vma(vma)))))
94482 return -EINVAL;
94483
94484+#ifdef CONFIG_PAX_SEGMEXEC
94485+ vma_m = pax_find_mirror_vma(vma);
94486+#endif
94487+
94488 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
94489 if (!new)
94490 goto out_err;
94491
94492+#ifdef CONFIG_PAX_SEGMEXEC
94493+ if (vma_m) {
94494+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
94495+ if (!new_m) {
94496+ kmem_cache_free(vm_area_cachep, new);
94497+ goto out_err;
94498+ }
94499+ }
94500+#endif
94501+
94502 /* most fields are the same, copy all, and then fixup */
94503 *new = *vma;
94504
94505@@ -2424,6 +2808,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94506 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
94507 }
94508
94509+#ifdef CONFIG_PAX_SEGMEXEC
94510+ if (vma_m) {
94511+ *new_m = *vma_m;
94512+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
94513+ new_m->vm_mirror = new;
94514+ new->vm_mirror = new_m;
94515+
94516+ if (new_below)
94517+ new_m->vm_end = addr_m;
94518+ else {
94519+ new_m->vm_start = addr_m;
94520+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
94521+ }
94522+ }
94523+#endif
94524+
94525 err = vma_dup_policy(vma, new);
94526 if (err)
94527 goto out_free_vma;
94528@@ -2443,6 +2843,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94529 else
94530 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
94531
94532+#ifdef CONFIG_PAX_SEGMEXEC
94533+ if (!err && vma_m) {
94534+ struct mempolicy *pol = vma_policy(new);
94535+
94536+ if (anon_vma_clone(new_m, vma_m))
94537+ goto out_free_mpol;
94538+
94539+ mpol_get(pol);
94540+ set_vma_policy(new_m, pol);
94541+
94542+ if (new_m->vm_file)
94543+ get_file(new_m->vm_file);
94544+
94545+ if (new_m->vm_ops && new_m->vm_ops->open)
94546+ new_m->vm_ops->open(new_m);
94547+
94548+ if (new_below)
94549+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
94550+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
94551+ else
94552+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
94553+
94554+ if (err) {
94555+ if (new_m->vm_ops && new_m->vm_ops->close)
94556+ new_m->vm_ops->close(new_m);
94557+ if (new_m->vm_file)
94558+ fput(new_m->vm_file);
94559+ mpol_put(pol);
94560+ }
94561+ }
94562+#endif
94563+
94564 /* Success. */
94565 if (!err)
94566 return 0;
94567@@ -2452,10 +2884,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94568 new->vm_ops->close(new);
94569 if (new->vm_file)
94570 fput(new->vm_file);
94571- unlink_anon_vmas(new);
94572 out_free_mpol:
94573 mpol_put(vma_policy(new));
94574 out_free_vma:
94575+
94576+#ifdef CONFIG_PAX_SEGMEXEC
94577+ if (new_m) {
94578+ unlink_anon_vmas(new_m);
94579+ kmem_cache_free(vm_area_cachep, new_m);
94580+ }
94581+#endif
94582+
94583+ unlink_anon_vmas(new);
94584 kmem_cache_free(vm_area_cachep, new);
94585 out_err:
94586 return err;
94587@@ -2468,6 +2908,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
94588 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94589 unsigned long addr, int new_below)
94590 {
94591+
94592+#ifdef CONFIG_PAX_SEGMEXEC
94593+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
94594+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
94595+ if (mm->map_count >= sysctl_max_map_count-1)
94596+ return -ENOMEM;
94597+ } else
94598+#endif
94599+
94600 if (mm->map_count >= sysctl_max_map_count)
94601 return -ENOMEM;
94602
94603@@ -2479,11 +2928,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
94604 * work. This now handles partial unmappings.
94605 * Jeremy Fitzhardinge <jeremy@goop.org>
94606 */
94607+#ifdef CONFIG_PAX_SEGMEXEC
94608 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94609 {
94610+ int ret = __do_munmap(mm, start, len);
94611+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
94612+ return ret;
94613+
94614+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
94615+}
94616+
94617+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94618+#else
94619+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94620+#endif
94621+{
94622 unsigned long end;
94623 struct vm_area_struct *vma, *prev, *last;
94624
94625+ /*
94626+ * mm->mmap_sem is required to protect against another thread
94627+ * changing the mappings in case we sleep.
94628+ */
94629+ verify_mm_writelocked(mm);
94630+
94631 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
94632 return -EINVAL;
94633
94634@@ -2558,6 +3026,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
94635 /* Fix up all other VM information */
94636 remove_vma_list(mm, vma);
94637
94638+ track_exec_limit(mm, start, end, 0UL);
94639+
94640 return 0;
94641 }
94642
94643@@ -2566,6 +3036,13 @@ int vm_munmap(unsigned long start, size_t len)
94644 int ret;
94645 struct mm_struct *mm = current->mm;
94646
94647+
94648+#ifdef CONFIG_PAX_SEGMEXEC
94649+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
94650+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
94651+ return -EINVAL;
94652+#endif
94653+
94654 down_write(&mm->mmap_sem);
94655 ret = do_munmap(mm, start, len);
94656 up_write(&mm->mmap_sem);
94657@@ -2579,16 +3056,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
94658 return vm_munmap(addr, len);
94659 }
94660
94661-static inline void verify_mm_writelocked(struct mm_struct *mm)
94662-{
94663-#ifdef CONFIG_DEBUG_VM
94664- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
94665- WARN_ON(1);
94666- up_read(&mm->mmap_sem);
94667- }
94668-#endif
94669-}
94670-
94671 /*
94672 * this is really a simplified "do_mmap". it only handles
94673 * anonymous maps. eventually we may be able to do some
94674@@ -2602,6 +3069,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94675 struct rb_node ** rb_link, * rb_parent;
94676 pgoff_t pgoff = addr >> PAGE_SHIFT;
94677 int error;
94678+ unsigned long charged;
94679
94680 len = PAGE_ALIGN(len);
94681 if (!len)
94682@@ -2609,10 +3077,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94683
94684 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
94685
94686+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
94687+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
94688+ flags &= ~VM_EXEC;
94689+
94690+#ifdef CONFIG_PAX_MPROTECT
94691+ if (mm->pax_flags & MF_PAX_MPROTECT)
94692+ flags &= ~VM_MAYEXEC;
94693+#endif
94694+
94695+ }
94696+#endif
94697+
94698 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
94699 if (error & ~PAGE_MASK)
94700 return error;
94701
94702+ charged = len >> PAGE_SHIFT;
94703+
94704 error = mlock_future_check(mm, mm->def_flags, len);
94705 if (error)
94706 return error;
94707@@ -2626,21 +3108,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94708 /*
94709 * Clear old maps. this also does some error checking for us
94710 */
94711- munmap_back:
94712 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
94713 if (do_munmap(mm, addr, len))
94714 return -ENOMEM;
94715- goto munmap_back;
94716+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
94717 }
94718
94719 /* Check against address space limits *after* clearing old maps... */
94720- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
94721+ if (!may_expand_vm(mm, charged))
94722 return -ENOMEM;
94723
94724 if (mm->map_count > sysctl_max_map_count)
94725 return -ENOMEM;
94726
94727- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
94728+ if (security_vm_enough_memory_mm(mm, charged))
94729 return -ENOMEM;
94730
94731 /* Can we just expand an old private anonymous mapping? */
94732@@ -2654,7 +3135,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94733 */
94734 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94735 if (!vma) {
94736- vm_unacct_memory(len >> PAGE_SHIFT);
94737+ vm_unacct_memory(charged);
94738 return -ENOMEM;
94739 }
94740
94741@@ -2668,10 +3149,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
94742 vma_link(mm, vma, prev, rb_link, rb_parent);
94743 out:
94744 perf_event_mmap(vma);
94745- mm->total_vm += len >> PAGE_SHIFT;
94746+ mm->total_vm += charged;
94747 if (flags & VM_LOCKED)
94748- mm->locked_vm += (len >> PAGE_SHIFT);
94749+ mm->locked_vm += charged;
94750 vma->vm_flags |= VM_SOFTDIRTY;
94751+ track_exec_limit(mm, addr, addr + len, flags);
94752 return addr;
94753 }
94754
94755@@ -2733,6 +3215,7 @@ void exit_mmap(struct mm_struct *mm)
94756 while (vma) {
94757 if (vma->vm_flags & VM_ACCOUNT)
94758 nr_accounted += vma_pages(vma);
94759+ vma->vm_mirror = NULL;
94760 vma = remove_vma(vma);
94761 }
94762 vm_unacct_memory(nr_accounted);
94763@@ -2750,6 +3233,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
94764 struct vm_area_struct *prev;
94765 struct rb_node **rb_link, *rb_parent;
94766
94767+#ifdef CONFIG_PAX_SEGMEXEC
94768+ struct vm_area_struct *vma_m = NULL;
94769+#endif
94770+
94771+ if (security_mmap_addr(vma->vm_start))
94772+ return -EPERM;
94773+
94774 /*
94775 * The vm_pgoff of a purely anonymous vma should be irrelevant
94776 * until its first write fault, when page's anon_vma and index
94777@@ -2773,7 +3263,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
94778 security_vm_enough_memory_mm(mm, vma_pages(vma)))
94779 return -ENOMEM;
94780
94781+#ifdef CONFIG_PAX_SEGMEXEC
94782+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
94783+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
94784+ if (!vma_m)
94785+ return -ENOMEM;
94786+ }
94787+#endif
94788+
94789 vma_link(mm, vma, prev, rb_link, rb_parent);
94790+
94791+#ifdef CONFIG_PAX_SEGMEXEC
94792+ if (vma_m)
94793+ BUG_ON(pax_mirror_vma(vma_m, vma));
94794+#endif
94795+
94796 return 0;
94797 }
94798
94799@@ -2792,6 +3296,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
94800 struct rb_node **rb_link, *rb_parent;
94801 bool faulted_in_anon_vma = true;
94802
94803+ BUG_ON(vma->vm_mirror);
94804+
94805 /*
94806 * If anonymous vma has not yet been faulted, update new pgoff
94807 * to match new location, to increase its chance of merging.
94808@@ -2856,6 +3362,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
94809 return NULL;
94810 }
94811
94812+#ifdef CONFIG_PAX_SEGMEXEC
94813+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
94814+{
94815+ struct vm_area_struct *prev_m;
94816+ struct rb_node **rb_link_m, *rb_parent_m;
94817+ struct mempolicy *pol_m;
94818+
94819+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
94820+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
94821+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
94822+ *vma_m = *vma;
94823+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
94824+ if (anon_vma_clone(vma_m, vma))
94825+ return -ENOMEM;
94826+ pol_m = vma_policy(vma_m);
94827+ mpol_get(pol_m);
94828+ set_vma_policy(vma_m, pol_m);
94829+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
94830+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
94831+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
94832+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
94833+ if (vma_m->vm_file)
94834+ get_file(vma_m->vm_file);
94835+ if (vma_m->vm_ops && vma_m->vm_ops->open)
94836+ vma_m->vm_ops->open(vma_m);
94837+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
94838+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
94839+ vma_m->vm_mirror = vma;
94840+ vma->vm_mirror = vma_m;
94841+ return 0;
94842+}
94843+#endif
94844+
94845 /*
94846 * Return true if the calling process may expand its vm space by the passed
94847 * number of pages
94848@@ -2867,6 +3406,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
94849
94850 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
94851
94852+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
94853 if (cur + npages > lim)
94854 return 0;
94855 return 1;
94856@@ -2937,6 +3477,22 @@ struct vm_area_struct *_install_special_mapping(struct mm_struct *mm,
94857 vma->vm_start = addr;
94858 vma->vm_end = addr + len;
94859
94860+#ifdef CONFIG_PAX_MPROTECT
94861+ if (mm->pax_flags & MF_PAX_MPROTECT) {
94862+#ifndef CONFIG_PAX_MPROTECT_COMPAT
94863+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
94864+ return ERR_PTR(-EPERM);
94865+ if (!(vm_flags & VM_EXEC))
94866+ vm_flags &= ~VM_MAYEXEC;
94867+#else
94868+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
94869+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
94870+#endif
94871+ else
94872+ vm_flags &= ~VM_MAYWRITE;
94873+ }
94874+#endif
94875+
94876 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
94877 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
94878
94879diff --git a/mm/mprotect.c b/mm/mprotect.c
94880index c43d557..0b7ccd2 100644
94881--- a/mm/mprotect.c
94882+++ b/mm/mprotect.c
94883@@ -24,10 +24,18 @@
94884 #include <linux/migrate.h>
94885 #include <linux/perf_event.h>
94886 #include <linux/ksm.h>
94887+#include <linux/sched/sysctl.h>
94888+
94889+#ifdef CONFIG_PAX_MPROTECT
94890+#include <linux/elf.h>
94891+#include <linux/binfmts.h>
94892+#endif
94893+
94894 #include <asm/uaccess.h>
94895 #include <asm/pgtable.h>
94896 #include <asm/cacheflush.h>
94897 #include <asm/tlbflush.h>
94898+#include <asm/mmu_context.h>
94899
94900 #ifndef pgprot_modify
94901 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
94902@@ -256,6 +264,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
94903 return pages;
94904 }
94905
94906+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
94907+/* called while holding the mmap semaphor for writing except stack expansion */
94908+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
94909+{
94910+ unsigned long oldlimit, newlimit = 0UL;
94911+
94912+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
94913+ return;
94914+
94915+ spin_lock(&mm->page_table_lock);
94916+ oldlimit = mm->context.user_cs_limit;
94917+ if ((prot & VM_EXEC) && oldlimit < end)
94918+ /* USER_CS limit moved up */
94919+ newlimit = end;
94920+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
94921+ /* USER_CS limit moved down */
94922+ newlimit = start;
94923+
94924+ if (newlimit) {
94925+ mm->context.user_cs_limit = newlimit;
94926+
94927+#ifdef CONFIG_SMP
94928+ wmb();
94929+ cpus_clear(mm->context.cpu_user_cs_mask);
94930+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
94931+#endif
94932+
94933+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
94934+ }
94935+ spin_unlock(&mm->page_table_lock);
94936+ if (newlimit == end) {
94937+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
94938+
94939+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
94940+ if (is_vm_hugetlb_page(vma))
94941+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
94942+ else
94943+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
94944+ }
94945+}
94946+#endif
94947+
94948 int
94949 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
94950 unsigned long start, unsigned long end, unsigned long newflags)
94951@@ -268,11 +318,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
94952 int error;
94953 int dirty_accountable = 0;
94954
94955+#ifdef CONFIG_PAX_SEGMEXEC
94956+ struct vm_area_struct *vma_m = NULL;
94957+ unsigned long start_m, end_m;
94958+
94959+ start_m = start + SEGMEXEC_TASK_SIZE;
94960+ end_m = end + SEGMEXEC_TASK_SIZE;
94961+#endif
94962+
94963 if (newflags == oldflags) {
94964 *pprev = vma;
94965 return 0;
94966 }
94967
94968+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
94969+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
94970+
94971+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
94972+ return -ENOMEM;
94973+
94974+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
94975+ return -ENOMEM;
94976+ }
94977+
94978 /*
94979 * If we make a private mapping writable we increase our commit;
94980 * but (without finer accounting) cannot reduce our commit if we
94981@@ -289,6 +357,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
94982 }
94983 }
94984
94985+#ifdef CONFIG_PAX_SEGMEXEC
94986+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
94987+ if (start != vma->vm_start) {
94988+ error = split_vma(mm, vma, start, 1);
94989+ if (error)
94990+ goto fail;
94991+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
94992+ *pprev = (*pprev)->vm_next;
94993+ }
94994+
94995+ if (end != vma->vm_end) {
94996+ error = split_vma(mm, vma, end, 0);
94997+ if (error)
94998+ goto fail;
94999+ }
95000+
95001+ if (pax_find_mirror_vma(vma)) {
95002+ error = __do_munmap(mm, start_m, end_m - start_m);
95003+ if (error)
95004+ goto fail;
95005+ } else {
95006+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
95007+ if (!vma_m) {
95008+ error = -ENOMEM;
95009+ goto fail;
95010+ }
95011+ vma->vm_flags = newflags;
95012+ error = pax_mirror_vma(vma_m, vma);
95013+ if (error) {
95014+ vma->vm_flags = oldflags;
95015+ goto fail;
95016+ }
95017+ }
95018+ }
95019+#endif
95020+
95021 /*
95022 * First try to merge with previous and/or next vma.
95023 */
95024@@ -319,9 +423,21 @@ success:
95025 * vm_flags and vm_page_prot are protected by the mmap_sem
95026 * held in write mode.
95027 */
95028+
95029+#ifdef CONFIG_PAX_SEGMEXEC
95030+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
95031+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
95032+#endif
95033+
95034 vma->vm_flags = newflags;
95035+
95036+#ifdef CONFIG_PAX_MPROTECT
95037+ if (mm->binfmt && mm->binfmt->handle_mprotect)
95038+ mm->binfmt->handle_mprotect(vma, newflags);
95039+#endif
95040+
95041 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
95042- vm_get_page_prot(newflags));
95043+ vm_get_page_prot(vma->vm_flags));
95044
95045 if (vma_wants_writenotify(vma)) {
95046 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
95047@@ -360,6 +476,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95048 end = start + len;
95049 if (end <= start)
95050 return -ENOMEM;
95051+
95052+#ifdef CONFIG_PAX_SEGMEXEC
95053+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95054+ if (end > SEGMEXEC_TASK_SIZE)
95055+ return -EINVAL;
95056+ } else
95057+#endif
95058+
95059+ if (end > TASK_SIZE)
95060+ return -EINVAL;
95061+
95062 if (!arch_validate_prot(prot))
95063 return -EINVAL;
95064
95065@@ -367,7 +494,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95066 /*
95067 * Does the application expect PROT_READ to imply PROT_EXEC:
95068 */
95069- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
95070+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
95071 prot |= PROT_EXEC;
95072
95073 vm_flags = calc_vm_prot_bits(prot);
95074@@ -399,6 +526,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95075 if (start > vma->vm_start)
95076 prev = vma;
95077
95078+#ifdef CONFIG_PAX_MPROTECT
95079+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
95080+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
95081+#endif
95082+
95083 for (nstart = start ; ; ) {
95084 unsigned long newflags;
95085
95086@@ -409,6 +541,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95087
95088 /* newflags >> 4 shift VM_MAY% in place of VM_% */
95089 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
95090+ if (prot & (PROT_WRITE | PROT_EXEC))
95091+ gr_log_rwxmprotect(vma);
95092+
95093+ error = -EACCES;
95094+ goto out;
95095+ }
95096+
95097+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
95098 error = -EACCES;
95099 goto out;
95100 }
95101@@ -423,6 +563,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
95102 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
95103 if (error)
95104 goto out;
95105+
95106+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
95107+
95108 nstart = tmp;
95109
95110 if (nstart < prev->vm_end)
95111diff --git a/mm/mremap.c b/mm/mremap.c
95112index 05f1180..c3cde48 100644
95113--- a/mm/mremap.c
95114+++ b/mm/mremap.c
95115@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
95116 continue;
95117 pte = ptep_get_and_clear(mm, old_addr, old_pte);
95118 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
95119+
95120+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
95121+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
95122+ pte = pte_exprotect(pte);
95123+#endif
95124+
95125 pte = move_soft_dirty_pte(pte);
95126 set_pte_at(mm, new_addr, new_pte, pte);
95127 }
95128@@ -344,6 +350,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
95129 if (is_vm_hugetlb_page(vma))
95130 goto Einval;
95131
95132+#ifdef CONFIG_PAX_SEGMEXEC
95133+ if (pax_find_mirror_vma(vma))
95134+ goto Einval;
95135+#endif
95136+
95137 /* We can't remap across vm area boundaries */
95138 if (old_len > vma->vm_end - addr)
95139 goto Efault;
95140@@ -399,20 +410,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
95141 unsigned long ret = -EINVAL;
95142 unsigned long charged = 0;
95143 unsigned long map_flags;
95144+ unsigned long pax_task_size = TASK_SIZE;
95145
95146 if (new_addr & ~PAGE_MASK)
95147 goto out;
95148
95149- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
95150+#ifdef CONFIG_PAX_SEGMEXEC
95151+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
95152+ pax_task_size = SEGMEXEC_TASK_SIZE;
95153+#endif
95154+
95155+ pax_task_size -= PAGE_SIZE;
95156+
95157+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
95158 goto out;
95159
95160 /* Check if the location we're moving into overlaps the
95161 * old location at all, and fail if it does.
95162 */
95163- if ((new_addr <= addr) && (new_addr+new_len) > addr)
95164- goto out;
95165-
95166- if ((addr <= new_addr) && (addr+old_len) > new_addr)
95167+ if (addr + old_len > new_addr && new_addr + new_len > addr)
95168 goto out;
95169
95170 ret = do_munmap(mm, new_addr, new_len);
95171@@ -481,6 +497,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95172 unsigned long ret = -EINVAL;
95173 unsigned long charged = 0;
95174 bool locked = false;
95175+ unsigned long pax_task_size = TASK_SIZE;
95176
95177 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
95178 return ret;
95179@@ -502,6 +519,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95180 if (!new_len)
95181 return ret;
95182
95183+#ifdef CONFIG_PAX_SEGMEXEC
95184+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
95185+ pax_task_size = SEGMEXEC_TASK_SIZE;
95186+#endif
95187+
95188+ pax_task_size -= PAGE_SIZE;
95189+
95190+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
95191+ old_len > pax_task_size || addr > pax_task_size-old_len)
95192+ return ret;
95193+
95194 down_write(&current->mm->mmap_sem);
95195
95196 if (flags & MREMAP_FIXED) {
95197@@ -552,6 +580,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95198 new_addr = addr;
95199 }
95200 ret = addr;
95201+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
95202 goto out;
95203 }
95204 }
95205@@ -575,7 +604,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
95206 goto out;
95207 }
95208
95209+ map_flags = vma->vm_flags;
95210 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
95211+ if (!(ret & ~PAGE_MASK)) {
95212+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
95213+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
95214+ }
95215 }
95216 out:
95217 if (ret & ~PAGE_MASK)
95218diff --git a/mm/nommu.c b/mm/nommu.c
95219index 85f8d66..b3375fa 100644
95220--- a/mm/nommu.c
95221+++ b/mm/nommu.c
95222@@ -67,7 +67,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
95223 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
95224 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
95225 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
95226-int heap_stack_gap = 0;
95227
95228 atomic_long_t mmap_pages_allocated;
95229
95230@@ -854,15 +853,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
95231 EXPORT_SYMBOL(find_vma);
95232
95233 /*
95234- * find a VMA
95235- * - we don't extend stack VMAs under NOMMU conditions
95236- */
95237-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
95238-{
95239- return find_vma(mm, addr);
95240-}
95241-
95242-/*
95243 * expand a stack to a given address
95244 * - not supported under NOMMU conditions
95245 */
95246@@ -1569,6 +1559,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
95247
95248 /* most fields are the same, copy all, and then fixup */
95249 *new = *vma;
95250+ INIT_LIST_HEAD(&new->anon_vma_chain);
95251 *region = *vma->vm_region;
95252 new->vm_region = region;
95253
95254@@ -2004,8 +1995,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
95255 }
95256 EXPORT_SYMBOL(generic_file_remap_pages);
95257
95258-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95259- unsigned long addr, void *buf, int len, int write)
95260+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95261+ unsigned long addr, void *buf, size_t len, int write)
95262 {
95263 struct vm_area_struct *vma;
95264
95265@@ -2046,8 +2037,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
95266 *
95267 * The caller must hold a reference on @mm.
95268 */
95269-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
95270- void *buf, int len, int write)
95271+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
95272+ void *buf, size_t len, int write)
95273 {
95274 return __access_remote_vm(NULL, mm, addr, buf, len, write);
95275 }
95276@@ -2056,7 +2047,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
95277 * Access another process' address space.
95278 * - source/target buffer must be kernel space
95279 */
95280-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
95281+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
95282 {
95283 struct mm_struct *mm;
95284
95285diff --git a/mm/page-writeback.c b/mm/page-writeback.c
95286index 154af21..86e447f 100644
95287--- a/mm/page-writeback.c
95288+++ b/mm/page-writeback.c
95289@@ -685,7 +685,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
95290 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
95291 * - the bdi dirty thresh drops quickly due to change of JBOD workload
95292 */
95293-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
95294+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
95295 unsigned long thresh,
95296 unsigned long bg_thresh,
95297 unsigned long dirty,
95298diff --git a/mm/page_alloc.c b/mm/page_alloc.c
95299index 56eb0eb..bb5e928 100644
95300--- a/mm/page_alloc.c
95301+++ b/mm/page_alloc.c
95302@@ -61,6 +61,7 @@
95303 #include <linux/page-debug-flags.h>
95304 #include <linux/hugetlb.h>
95305 #include <linux/sched/rt.h>
95306+#include <linux/random.h>
95307
95308 #include <asm/sections.h>
95309 #include <asm/tlbflush.h>
95310@@ -355,7 +356,7 @@ out:
95311 * This usage means that zero-order pages may not be compound.
95312 */
95313
95314-static void free_compound_page(struct page *page)
95315+void free_compound_page(struct page *page)
95316 {
95317 __free_pages_ok(page, compound_order(page));
95318 }
95319@@ -729,6 +730,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
95320 int i;
95321 int bad = 0;
95322
95323+#ifdef CONFIG_PAX_MEMORY_SANITIZE
95324+ unsigned long index = 1UL << order;
95325+#endif
95326+
95327 trace_mm_page_free(page, order);
95328 kmemcheck_free_shadow(page, order);
95329
95330@@ -745,6 +750,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
95331 debug_check_no_obj_freed(page_address(page),
95332 PAGE_SIZE << order);
95333 }
95334+
95335+#ifdef CONFIG_PAX_MEMORY_SANITIZE
95336+ for (; index; --index)
95337+ sanitize_highpage(page + index - 1);
95338+#endif
95339+
95340 arch_free_page(page, order);
95341 kernel_map_pages(page, 1 << order, 0);
95342
95343@@ -767,6 +778,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
95344 local_irq_restore(flags);
95345 }
95346
95347+#ifdef CONFIG_PAX_LATENT_ENTROPY
95348+bool __meminitdata extra_latent_entropy;
95349+
95350+static int __init setup_pax_extra_latent_entropy(char *str)
95351+{
95352+ extra_latent_entropy = true;
95353+ return 0;
95354+}
95355+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
95356+
95357+volatile u64 latent_entropy __latent_entropy;
95358+EXPORT_SYMBOL(latent_entropy);
95359+#endif
95360+
95361 void __init __free_pages_bootmem(struct page *page, unsigned int order)
95362 {
95363 unsigned int nr_pages = 1 << order;
95364@@ -782,6 +807,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
95365 __ClearPageReserved(p);
95366 set_page_count(p, 0);
95367
95368+#ifdef CONFIG_PAX_LATENT_ENTROPY
95369+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
95370+ u64 hash = 0;
95371+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
95372+ const u64 *data = lowmem_page_address(page);
95373+
95374+ for (index = 0; index < end; index++)
95375+ hash ^= hash + data[index];
95376+ latent_entropy ^= hash;
95377+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
95378+ }
95379+#endif
95380+
95381 page_zone(page)->managed_pages += nr_pages;
95382 set_page_refcounted(page);
95383 __free_pages(page, order);
95384@@ -898,8 +936,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
95385 arch_alloc_page(page, order);
95386 kernel_map_pages(page, 1 << order, 1);
95387
95388+#ifndef CONFIG_PAX_MEMORY_SANITIZE
95389 if (gfp_flags & __GFP_ZERO)
95390 prep_zero_page(page, order, gfp_flags);
95391+#endif
95392
95393 if (order && (gfp_flags & __GFP_COMP))
95394 prep_compound_page(page, order);
95395@@ -2402,7 +2442,7 @@ static void reset_alloc_batches(struct zonelist *zonelist,
95396 continue;
95397 mod_zone_page_state(zone, NR_ALLOC_BATCH,
95398 high_wmark_pages(zone) - low_wmark_pages(zone) -
95399- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
95400+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
95401 }
95402 }
95403
95404diff --git a/mm/page_io.c b/mm/page_io.c
95405index 7c59ef6..1358905 100644
95406--- a/mm/page_io.c
95407+++ b/mm/page_io.c
95408@@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
95409 struct file *swap_file = sis->swap_file;
95410 struct address_space *mapping = swap_file->f_mapping;
95411 struct iovec iov = {
95412- .iov_base = kmap(page),
95413+ .iov_base = (void __force_user *)kmap(page),
95414 .iov_len = PAGE_SIZE,
95415 };
95416
95417diff --git a/mm/percpu.c b/mm/percpu.c
95418index 2ddf9a9..f8fc075 100644
95419--- a/mm/percpu.c
95420+++ b/mm/percpu.c
95421@@ -123,7 +123,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
95422 static unsigned int pcpu_high_unit_cpu __read_mostly;
95423
95424 /* the address of the first chunk which starts with the kernel static area */
95425-void *pcpu_base_addr __read_mostly;
95426+void *pcpu_base_addr __read_only;
95427 EXPORT_SYMBOL_GPL(pcpu_base_addr);
95428
95429 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
95430diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
95431index 8505c92..946bfc9 100644
95432--- a/mm/process_vm_access.c
95433+++ b/mm/process_vm_access.c
95434@@ -13,6 +13,7 @@
95435 #include <linux/uio.h>
95436 #include <linux/sched.h>
95437 #include <linux/highmem.h>
95438+#include <linux/security.h>
95439 #include <linux/ptrace.h>
95440 #include <linux/slab.h>
95441 #include <linux/syscalls.h>
95442@@ -161,19 +162,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
95443 ssize_t iov_len;
95444 size_t total_len = iov_iter_count(iter);
95445
95446+ return -ENOSYS; // PaX: until properly audited
95447+
95448 /*
95449 * Work out how many pages of struct pages we're going to need
95450 * when eventually calling get_user_pages
95451 */
95452 for (i = 0; i < riovcnt; i++) {
95453 iov_len = rvec[i].iov_len;
95454- if (iov_len > 0) {
95455- nr_pages_iov = ((unsigned long)rvec[i].iov_base
95456- + iov_len)
95457- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
95458- / PAGE_SIZE + 1;
95459- nr_pages = max(nr_pages, nr_pages_iov);
95460- }
95461+ if (iov_len <= 0)
95462+ continue;
95463+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
95464+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
95465+ nr_pages = max(nr_pages, nr_pages_iov);
95466 }
95467
95468 if (nr_pages == 0)
95469@@ -201,6 +202,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
95470 goto free_proc_pages;
95471 }
95472
95473+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
95474+ rc = -EPERM;
95475+ goto put_task_struct;
95476+ }
95477+
95478 mm = mm_access(task, PTRACE_MODE_ATTACH);
95479 if (!mm || IS_ERR(mm)) {
95480 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
95481diff --git a/mm/rmap.c b/mm/rmap.c
95482index 14d1e28..3777962 100644
95483--- a/mm/rmap.c
95484+++ b/mm/rmap.c
95485@@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95486 struct anon_vma *anon_vma = vma->anon_vma;
95487 struct anon_vma_chain *avc;
95488
95489+#ifdef CONFIG_PAX_SEGMEXEC
95490+ struct anon_vma_chain *avc_m = NULL;
95491+#endif
95492+
95493 might_sleep();
95494 if (unlikely(!anon_vma)) {
95495 struct mm_struct *mm = vma->vm_mm;
95496@@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95497 if (!avc)
95498 goto out_enomem;
95499
95500+#ifdef CONFIG_PAX_SEGMEXEC
95501+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
95502+ if (!avc_m)
95503+ goto out_enomem_free_avc;
95504+#endif
95505+
95506 anon_vma = find_mergeable_anon_vma(vma);
95507 allocated = NULL;
95508 if (!anon_vma) {
95509@@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95510 /* page_table_lock to protect against threads */
95511 spin_lock(&mm->page_table_lock);
95512 if (likely(!vma->anon_vma)) {
95513+
95514+#ifdef CONFIG_PAX_SEGMEXEC
95515+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
95516+
95517+ if (vma_m) {
95518+ BUG_ON(vma_m->anon_vma);
95519+ vma_m->anon_vma = anon_vma;
95520+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
95521+ avc_m = NULL;
95522+ }
95523+#endif
95524+
95525 vma->anon_vma = anon_vma;
95526 anon_vma_chain_link(vma, avc, anon_vma);
95527 allocated = NULL;
95528@@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
95529
95530 if (unlikely(allocated))
95531 put_anon_vma(allocated);
95532+
95533+#ifdef CONFIG_PAX_SEGMEXEC
95534+ if (unlikely(avc_m))
95535+ anon_vma_chain_free(avc_m);
95536+#endif
95537+
95538 if (unlikely(avc))
95539 anon_vma_chain_free(avc);
95540 }
95541 return 0;
95542
95543 out_enomem_free_avc:
95544+
95545+#ifdef CONFIG_PAX_SEGMEXEC
95546+ if (avc_m)
95547+ anon_vma_chain_free(avc_m);
95548+#endif
95549+
95550 anon_vma_chain_free(avc);
95551 out_enomem:
95552 return -ENOMEM;
95553@@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
95554 * Attach the anon_vmas from src to dst.
95555 * Returns 0 on success, -ENOMEM on failure.
95556 */
95557-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
95558+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
95559 {
95560 struct anon_vma_chain *avc, *pavc;
95561 struct anon_vma *root = NULL;
95562@@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
95563 * the corresponding VMA in the parent process is attached to.
95564 * Returns 0 on success, non-zero on failure.
95565 */
95566-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
95567+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
95568 {
95569 struct anon_vma_chain *avc;
95570 struct anon_vma *anon_vma;
95571@@ -374,8 +408,10 @@ static void anon_vma_ctor(void *data)
95572 void __init anon_vma_init(void)
95573 {
95574 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
95575- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
95576- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
95577+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
95578+ anon_vma_ctor);
95579+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
95580+ SLAB_PANIC|SLAB_NO_SANITIZE);
95581 }
95582
95583 /*
95584diff --git a/mm/shmem.c b/mm/shmem.c
95585index a2801ba..b8651e6 100644
95586--- a/mm/shmem.c
95587+++ b/mm/shmem.c
95588@@ -33,7 +33,7 @@
95589 #include <linux/swap.h>
95590 #include <linux/aio.h>
95591
95592-static struct vfsmount *shm_mnt;
95593+struct vfsmount *shm_mnt;
95594
95595 #ifdef CONFIG_SHMEM
95596 /*
95597@@ -77,14 +77,15 @@ static struct vfsmount *shm_mnt;
95598 #define BOGO_DIRENT_SIZE 20
95599
95600 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
95601-#define SHORT_SYMLINK_LEN 128
95602+#define SHORT_SYMLINK_LEN 64
95603
95604 /*
95605- * shmem_fallocate and shmem_writepage communicate via inode->i_private
95606- * (with i_mutex making sure that it has only one user at a time):
95607- * we would prefer not to enlarge the shmem inode just for that.
95608+ * shmem_fallocate communicates with shmem_fault or shmem_writepage via
95609+ * inode->i_private (with i_mutex making sure that it has only one user at
95610+ * a time): we would prefer not to enlarge the shmem inode just for that.
95611 */
95612 struct shmem_falloc {
95613+ int mode; /* FALLOC_FL mode currently operating */
95614 pgoff_t start; /* start of range currently being fallocated */
95615 pgoff_t next; /* the next page offset to be fallocated */
95616 pgoff_t nr_falloced; /* how many new pages have been fallocated */
95617@@ -759,6 +760,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
95618 spin_lock(&inode->i_lock);
95619 shmem_falloc = inode->i_private;
95620 if (shmem_falloc &&
95621+ !shmem_falloc->mode &&
95622 index >= shmem_falloc->start &&
95623 index < shmem_falloc->next)
95624 shmem_falloc->nr_unswapped++;
95625@@ -1233,6 +1235,43 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
95626 int error;
95627 int ret = VM_FAULT_LOCKED;
95628
95629+ /*
95630+ * Trinity finds that probing a hole which tmpfs is punching can
95631+ * prevent the hole-punch from ever completing: which in turn
95632+ * locks writers out with its hold on i_mutex. So refrain from
95633+ * faulting pages into the hole while it's being punched, and
95634+ * wait on i_mutex to be released if vmf->flags permits,
95635+ */
95636+ if (unlikely(inode->i_private)) {
95637+ struct shmem_falloc *shmem_falloc;
95638+ spin_lock(&inode->i_lock);
95639+ shmem_falloc = inode->i_private;
95640+ if (!shmem_falloc ||
95641+ shmem_falloc->mode != FALLOC_FL_PUNCH_HOLE ||
95642+ vmf->pgoff < shmem_falloc->start ||
95643+ vmf->pgoff >= shmem_falloc->next)
95644+ shmem_falloc = NULL;
95645+ spin_unlock(&inode->i_lock);
95646+ /*
95647+ * i_lock has protected us from taking shmem_falloc seriously
95648+ * once return from shmem_fallocate() went back up that stack.
95649+ * i_lock does not serialize with i_mutex at all, but it does
95650+ * not matter if sometimes we wait unnecessarily, or sometimes
95651+ * miss out on waiting: we just need to make those cases rare.
95652+ */
95653+ if (shmem_falloc) {
95654+ if ((vmf->flags & FAULT_FLAG_ALLOW_RETRY) &&
95655+ !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) {
95656+ up_read(&vma->vm_mm->mmap_sem);
95657+ mutex_lock(&inode->i_mutex);
95658+ mutex_unlock(&inode->i_mutex);
95659+ return VM_FAULT_RETRY;
95660+ }
95661+ /* cond_resched? Leave that to GUP or return to user */
95662+ return VM_FAULT_NOPAGE;
95663+ }
95664+ }
95665+
95666 error = shmem_getpage(inode, vmf->pgoff, &vmf->page, SGP_CACHE, &ret);
95667 if (error)
95668 return ((error == -ENOMEM) ? VM_FAULT_OOM : VM_FAULT_SIGBUS);
95669@@ -1733,18 +1772,26 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
95670
95671 mutex_lock(&inode->i_mutex);
95672
95673+ shmem_falloc.mode = mode & ~FALLOC_FL_KEEP_SIZE;
95674+
95675 if (mode & FALLOC_FL_PUNCH_HOLE) {
95676 struct address_space *mapping = file->f_mapping;
95677 loff_t unmap_start = round_up(offset, PAGE_SIZE);
95678 loff_t unmap_end = round_down(offset + len, PAGE_SIZE) - 1;
95679
95680+ shmem_falloc.start = unmap_start >> PAGE_SHIFT;
95681+ shmem_falloc.next = (unmap_end + 1) >> PAGE_SHIFT;
95682+ spin_lock(&inode->i_lock);
95683+ inode->i_private = &shmem_falloc;
95684+ spin_unlock(&inode->i_lock);
95685+
95686 if ((u64)unmap_end > (u64)unmap_start)
95687 unmap_mapping_range(mapping, unmap_start,
95688 1 + unmap_end - unmap_start, 0);
95689 shmem_truncate_range(inode, offset, offset + len - 1);
95690 /* No need to unmap again: hole-punching leaves COWed pages */
95691 error = 0;
95692- goto out;
95693+ goto undone;
95694 }
95695
95696 /* We need to check rlimit even when FALLOC_FL_KEEP_SIZE */
95697@@ -2138,6 +2185,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
95698 static int shmem_xattr_validate(const char *name)
95699 {
95700 struct { const char *prefix; size_t len; } arr[] = {
95701+
95702+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
95703+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
95704+#endif
95705+
95706 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
95707 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
95708 };
95709@@ -2193,6 +2245,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
95710 if (err)
95711 return err;
95712
95713+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
95714+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
95715+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
95716+ return -EOPNOTSUPP;
95717+ if (size > 8)
95718+ return -EINVAL;
95719+ }
95720+#endif
95721+
95722 return simple_xattr_set(&info->xattrs, name, value, size, flags);
95723 }
95724
95725@@ -2505,8 +2566,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
95726 int err = -ENOMEM;
95727
95728 /* Round up to L1_CACHE_BYTES to resist false sharing */
95729- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
95730- L1_CACHE_BYTES), GFP_KERNEL);
95731+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
95732 if (!sbinfo)
95733 return -ENOMEM;
95734
95735diff --git a/mm/slab.c b/mm/slab.c
95736index 9432556..e0dc685 100644
95737--- a/mm/slab.c
95738+++ b/mm/slab.c
95739@@ -311,10 +311,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
95740 if ((x)->max_freeable < i) \
95741 (x)->max_freeable = i; \
95742 } while (0)
95743-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
95744-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
95745-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
95746-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
95747+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
95748+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
95749+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
95750+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
95751+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
95752+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
95753 #else
95754 #define STATS_INC_ACTIVE(x) do { } while (0)
95755 #define STATS_DEC_ACTIVE(x) do { } while (0)
95756@@ -331,6 +333,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
95757 #define STATS_INC_ALLOCMISS(x) do { } while (0)
95758 #define STATS_INC_FREEHIT(x) do { } while (0)
95759 #define STATS_INC_FREEMISS(x) do { } while (0)
95760+#define STATS_INC_SANITIZED(x) do { } while (0)
95761+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
95762 #endif
95763
95764 #if DEBUG
95765@@ -447,7 +451,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
95766 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
95767 */
95768 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
95769- const struct page *page, void *obj)
95770+ const struct page *page, const void *obj)
95771 {
95772 u32 offset = (obj - page->s_mem);
95773 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
95774@@ -1558,12 +1562,12 @@ void __init kmem_cache_init(void)
95775 */
95776
95777 kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
95778- kmalloc_size(INDEX_AC), ARCH_KMALLOC_FLAGS);
95779+ kmalloc_size(INDEX_AC), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
95780
95781 if (INDEX_AC != INDEX_NODE)
95782 kmalloc_caches[INDEX_NODE] =
95783 create_kmalloc_cache("kmalloc-node",
95784- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
95785+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
95786
95787 slab_early_init = 0;
95788
95789@@ -3525,6 +3529,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
95790 struct array_cache *ac = cpu_cache_get(cachep);
95791
95792 check_irq_off();
95793+
95794+#ifdef CONFIG_PAX_MEMORY_SANITIZE
95795+ if (pax_sanitize_slab) {
95796+ if (!(cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))) {
95797+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
95798+
95799+ if (cachep->ctor)
95800+ cachep->ctor(objp);
95801+
95802+ STATS_INC_SANITIZED(cachep);
95803+ } else
95804+ STATS_INC_NOT_SANITIZED(cachep);
95805+ }
95806+#endif
95807+
95808 kmemleak_free_recursive(objp, cachep->flags);
95809 objp = cache_free_debugcheck(cachep, objp, caller);
95810
95811@@ -3748,6 +3767,7 @@ void kfree(const void *objp)
95812
95813 if (unlikely(ZERO_OR_NULL_PTR(objp)))
95814 return;
95815+ VM_BUG_ON(!virt_addr_valid(objp));
95816 local_irq_save(flags);
95817 kfree_debugcheck(objp);
95818 c = virt_to_cache(objp);
95819@@ -4189,14 +4209,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
95820 }
95821 /* cpu stats */
95822 {
95823- unsigned long allochit = atomic_read(&cachep->allochit);
95824- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
95825- unsigned long freehit = atomic_read(&cachep->freehit);
95826- unsigned long freemiss = atomic_read(&cachep->freemiss);
95827+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
95828+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
95829+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
95830+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
95831
95832 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
95833 allochit, allocmiss, freehit, freemiss);
95834 }
95835+#ifdef CONFIG_PAX_MEMORY_SANITIZE
95836+ {
95837+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
95838+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
95839+
95840+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
95841+ }
95842+#endif
95843 #endif
95844 }
95845
95846@@ -4417,13 +4445,69 @@ static const struct file_operations proc_slabstats_operations = {
95847 static int __init slab_proc_init(void)
95848 {
95849 #ifdef CONFIG_DEBUG_SLAB_LEAK
95850- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
95851+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
95852 #endif
95853 return 0;
95854 }
95855 module_init(slab_proc_init);
95856 #endif
95857
95858+bool is_usercopy_object(const void *ptr)
95859+{
95860+ struct page *page;
95861+ struct kmem_cache *cachep;
95862+
95863+ if (ZERO_OR_NULL_PTR(ptr))
95864+ return false;
95865+
95866+ if (!slab_is_available())
95867+ return false;
95868+
95869+ if (!virt_addr_valid(ptr))
95870+ return false;
95871+
95872+ page = virt_to_head_page(ptr);
95873+
95874+ if (!PageSlab(page))
95875+ return false;
95876+
95877+ cachep = page->slab_cache;
95878+ return cachep->flags & SLAB_USERCOPY;
95879+}
95880+
95881+#ifdef CONFIG_PAX_USERCOPY
95882+const char *check_heap_object(const void *ptr, unsigned long n)
95883+{
95884+ struct page *page;
95885+ struct kmem_cache *cachep;
95886+ unsigned int objnr;
95887+ unsigned long offset;
95888+
95889+ if (ZERO_OR_NULL_PTR(ptr))
95890+ return "<null>";
95891+
95892+ if (!virt_addr_valid(ptr))
95893+ return NULL;
95894+
95895+ page = virt_to_head_page(ptr);
95896+
95897+ if (!PageSlab(page))
95898+ return NULL;
95899+
95900+ cachep = page->slab_cache;
95901+ if (!(cachep->flags & SLAB_USERCOPY))
95902+ return cachep->name;
95903+
95904+ objnr = obj_to_index(cachep, page, ptr);
95905+ BUG_ON(objnr >= cachep->num);
95906+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
95907+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
95908+ return NULL;
95909+
95910+ return cachep->name;
95911+}
95912+#endif
95913+
95914 /**
95915 * ksize - get the actual amount of memory allocated for a given object
95916 * @objp: Pointer to the object
95917diff --git a/mm/slab.h b/mm/slab.h
95918index 6bd4c35..97565a1 100644
95919--- a/mm/slab.h
95920+++ b/mm/slab.h
95921@@ -32,6 +32,15 @@ extern struct list_head slab_caches;
95922 /* The slab cache that manages slab cache information */
95923 extern struct kmem_cache *kmem_cache;
95924
95925+#ifdef CONFIG_PAX_MEMORY_SANITIZE
95926+#ifdef CONFIG_X86_64
95927+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
95928+#else
95929+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
95930+#endif
95931+extern bool pax_sanitize_slab;
95932+#endif
95933+
95934 unsigned long calculate_alignment(unsigned long flags,
95935 unsigned long align, unsigned long size);
95936
95937@@ -67,7 +76,8 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
95938
95939 /* Legal flag mask for kmem_cache_create(), for various configurations */
95940 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
95941- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
95942+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
95943+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
95944
95945 #if defined(CONFIG_DEBUG_SLAB)
95946 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
95947@@ -245,6 +255,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
95948 return s;
95949
95950 page = virt_to_head_page(x);
95951+
95952+ BUG_ON(!PageSlab(page));
95953+
95954 cachep = page->slab_cache;
95955 if (slab_equal_or_root(cachep, s))
95956 return cachep;
95957diff --git a/mm/slab_common.c b/mm/slab_common.c
95958index 102cc6f..c7aab3d 100644
95959--- a/mm/slab_common.c
95960+++ b/mm/slab_common.c
95961@@ -23,11 +23,22 @@
95962
95963 #include "slab.h"
95964
95965-enum slab_state slab_state;
95966+enum slab_state slab_state __read_only;
95967 LIST_HEAD(slab_caches);
95968 DEFINE_MUTEX(slab_mutex);
95969 struct kmem_cache *kmem_cache;
95970
95971+#ifdef CONFIG_PAX_MEMORY_SANITIZE
95972+bool pax_sanitize_slab __read_only = true;
95973+static int __init pax_sanitize_slab_setup(char *str)
95974+{
95975+ pax_sanitize_slab = !!simple_strtol(str, NULL, 0);
95976+ printk("%sabled PaX slab sanitization\n", pax_sanitize_slab ? "En" : "Dis");
95977+ return 1;
95978+}
95979+__setup("pax_sanitize_slab=", pax_sanitize_slab_setup);
95980+#endif
95981+
95982 #ifdef CONFIG_DEBUG_VM
95983 static int kmem_cache_sanity_check(const char *name, size_t size)
95984 {
95985@@ -158,7 +169,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
95986 if (err)
95987 goto out_free_cache;
95988
95989- s->refcount = 1;
95990+ atomic_set(&s->refcount, 1);
95991 list_add(&s->list, &slab_caches);
95992 memcg_register_cache(s);
95993 out:
95994@@ -334,8 +345,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
95995 get_online_cpus();
95996 mutex_lock(&slab_mutex);
95997
95998- s->refcount--;
95999- if (s->refcount)
96000+ if (!atomic_dec_and_test(&s->refcount))
96001 goto out_unlock;
96002
96003 if (kmem_cache_destroy_memcg_children(s) != 0)
96004@@ -358,7 +368,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
96005 rcu_barrier();
96006
96007 memcg_free_cache_params(s);
96008-#ifdef SLAB_SUPPORTS_SYSFS
96009+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96010 sysfs_slab_remove(s);
96011 #else
96012 slab_kmem_cache_release(s);
96013@@ -393,7 +403,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
96014 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
96015 name, size, err);
96016
96017- s->refcount = -1; /* Exempt from merging for now */
96018+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
96019 }
96020
96021 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
96022@@ -406,7 +416,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
96023
96024 create_boot_cache(s, name, size, flags);
96025 list_add(&s->list, &slab_caches);
96026- s->refcount = 1;
96027+ atomic_set(&s->refcount, 1);
96028 return s;
96029 }
96030
96031@@ -418,6 +428,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
96032 EXPORT_SYMBOL(kmalloc_dma_caches);
96033 #endif
96034
96035+#ifdef CONFIG_PAX_USERCOPY_SLABS
96036+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
96037+EXPORT_SYMBOL(kmalloc_usercopy_caches);
96038+#endif
96039+
96040 /*
96041 * Conversion table for small slabs sizes / 8 to the index in the
96042 * kmalloc array. This is necessary for slabs < 192 since we have non power
96043@@ -482,6 +497,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
96044 return kmalloc_dma_caches[index];
96045
96046 #endif
96047+
96048+#ifdef CONFIG_PAX_USERCOPY_SLABS
96049+ if (unlikely((flags & GFP_USERCOPY)))
96050+ return kmalloc_usercopy_caches[index];
96051+
96052+#endif
96053+
96054 return kmalloc_caches[index];
96055 }
96056
96057@@ -538,7 +560,7 @@ void __init create_kmalloc_caches(unsigned long flags)
96058 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
96059 if (!kmalloc_caches[i]) {
96060 kmalloc_caches[i] = create_kmalloc_cache(NULL,
96061- 1 << i, flags);
96062+ 1 << i, SLAB_USERCOPY | flags);
96063 }
96064
96065 /*
96066@@ -547,10 +569,10 @@ void __init create_kmalloc_caches(unsigned long flags)
96067 * earlier power of two caches
96068 */
96069 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
96070- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
96071+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
96072
96073 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
96074- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
96075+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
96076 }
96077
96078 /* Kmalloc array is now usable */
96079@@ -583,6 +605,23 @@ void __init create_kmalloc_caches(unsigned long flags)
96080 }
96081 }
96082 #endif
96083+
96084+#ifdef CONFIG_PAX_USERCOPY_SLABS
96085+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
96086+ struct kmem_cache *s = kmalloc_caches[i];
96087+
96088+ if (s) {
96089+ int size = kmalloc_size(i);
96090+ char *n = kasprintf(GFP_NOWAIT,
96091+ "usercopy-kmalloc-%d", size);
96092+
96093+ BUG_ON(!n);
96094+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
96095+ size, SLAB_USERCOPY | flags);
96096+ }
96097+ }
96098+#endif
96099+
96100 }
96101 #endif /* !CONFIG_SLOB */
96102
96103@@ -623,6 +662,9 @@ void print_slabinfo_header(struct seq_file *m)
96104 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
96105 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
96106 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
96107+#ifdef CONFIG_PAX_MEMORY_SANITIZE
96108+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
96109+#endif
96110 #endif
96111 seq_putc(m, '\n');
96112 }
96113diff --git a/mm/slob.c b/mm/slob.c
96114index 730cad4..8cfd442 100644
96115--- a/mm/slob.c
96116+++ b/mm/slob.c
96117@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
96118 /*
96119 * Return the size of a slob block.
96120 */
96121-static slobidx_t slob_units(slob_t *s)
96122+static slobidx_t slob_units(const slob_t *s)
96123 {
96124 if (s->units > 0)
96125 return s->units;
96126@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
96127 /*
96128 * Return the next free slob block pointer after this one.
96129 */
96130-static slob_t *slob_next(slob_t *s)
96131+static slob_t *slob_next(const slob_t *s)
96132 {
96133 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
96134 slobidx_t next;
96135@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
96136 /*
96137 * Returns true if s is the last free block in its page.
96138 */
96139-static int slob_last(slob_t *s)
96140+static int slob_last(const slob_t *s)
96141 {
96142 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
96143 }
96144
96145-static void *slob_new_pages(gfp_t gfp, int order, int node)
96146+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
96147 {
96148- void *page;
96149+ struct page *page;
96150
96151 #ifdef CONFIG_NUMA
96152 if (node != NUMA_NO_NODE)
96153@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
96154 if (!page)
96155 return NULL;
96156
96157- return page_address(page);
96158+ __SetPageSlab(page);
96159+ return page;
96160 }
96161
96162-static void slob_free_pages(void *b, int order)
96163+static void slob_free_pages(struct page *sp, int order)
96164 {
96165 if (current->reclaim_state)
96166 current->reclaim_state->reclaimed_slab += 1 << order;
96167- free_pages((unsigned long)b, order);
96168+ __ClearPageSlab(sp);
96169+ page_mapcount_reset(sp);
96170+ sp->private = 0;
96171+ __free_pages(sp, order);
96172 }
96173
96174 /*
96175@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
96176
96177 /* Not enough space: must allocate a new page */
96178 if (!b) {
96179- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
96180- if (!b)
96181+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
96182+ if (!sp)
96183 return NULL;
96184- sp = virt_to_page(b);
96185- __SetPageSlab(sp);
96186+ b = page_address(sp);
96187
96188 spin_lock_irqsave(&slob_lock, flags);
96189 sp->units = SLOB_UNITS(PAGE_SIZE);
96190 sp->freelist = b;
96191+ sp->private = 0;
96192 INIT_LIST_HEAD(&sp->lru);
96193 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
96194 set_slob_page_free(sp, slob_list);
96195@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
96196 if (slob_page_free(sp))
96197 clear_slob_page_free(sp);
96198 spin_unlock_irqrestore(&slob_lock, flags);
96199- __ClearPageSlab(sp);
96200- page_mapcount_reset(sp);
96201- slob_free_pages(b, 0);
96202+ slob_free_pages(sp, 0);
96203 return;
96204 }
96205
96206+#ifdef CONFIG_PAX_MEMORY_SANITIZE
96207+ if (pax_sanitize_slab)
96208+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
96209+#endif
96210+
96211 if (!slob_page_free(sp)) {
96212 /* This slob page is about to become partially free. Easy! */
96213 sp->units = units;
96214@@ -424,11 +431,10 @@ out:
96215 */
96216
96217 static __always_inline void *
96218-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
96219+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
96220 {
96221- unsigned int *m;
96222- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96223- void *ret;
96224+ slob_t *m;
96225+ void *ret = NULL;
96226
96227 gfp &= gfp_allowed_mask;
96228
96229@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
96230
96231 if (!m)
96232 return NULL;
96233- *m = size;
96234+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
96235+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
96236+ m[0].units = size;
96237+ m[1].units = align;
96238 ret = (void *)m + align;
96239
96240 trace_kmalloc_node(caller, ret,
96241 size, size + align, gfp, node);
96242 } else {
96243 unsigned int order = get_order(size);
96244+ struct page *page;
96245
96246 if (likely(order))
96247 gfp |= __GFP_COMP;
96248- ret = slob_new_pages(gfp, order, node);
96249+ page = slob_new_pages(gfp, order, node);
96250+ if (page) {
96251+ ret = page_address(page);
96252+ page->private = size;
96253+ }
96254
96255 trace_kmalloc_node(caller, ret,
96256 size, PAGE_SIZE << order, gfp, node);
96257 }
96258
96259- kmemleak_alloc(ret, size, 1, gfp);
96260+ return ret;
96261+}
96262+
96263+static __always_inline void *
96264+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
96265+{
96266+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96267+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
96268+
96269+ if (!ZERO_OR_NULL_PTR(ret))
96270+ kmemleak_alloc(ret, size, 1, gfp);
96271 return ret;
96272 }
96273
96274@@ -493,34 +517,112 @@ void kfree(const void *block)
96275 return;
96276 kmemleak_free(block);
96277
96278+ VM_BUG_ON(!virt_addr_valid(block));
96279 sp = virt_to_page(block);
96280- if (PageSlab(sp)) {
96281+ VM_BUG_ON(!PageSlab(sp));
96282+ if (!sp->private) {
96283 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96284- unsigned int *m = (unsigned int *)(block - align);
96285- slob_free(m, *m + align);
96286- } else
96287+ slob_t *m = (slob_t *)(block - align);
96288+ slob_free(m, m[0].units + align);
96289+ } else {
96290+ __ClearPageSlab(sp);
96291+ page_mapcount_reset(sp);
96292+ sp->private = 0;
96293 __free_pages(sp, compound_order(sp));
96294+ }
96295 }
96296 EXPORT_SYMBOL(kfree);
96297
96298+bool is_usercopy_object(const void *ptr)
96299+{
96300+ if (!slab_is_available())
96301+ return false;
96302+
96303+ // PAX: TODO
96304+
96305+ return false;
96306+}
96307+
96308+#ifdef CONFIG_PAX_USERCOPY
96309+const char *check_heap_object(const void *ptr, unsigned long n)
96310+{
96311+ struct page *page;
96312+ const slob_t *free;
96313+ const void *base;
96314+ unsigned long flags;
96315+
96316+ if (ZERO_OR_NULL_PTR(ptr))
96317+ return "<null>";
96318+
96319+ if (!virt_addr_valid(ptr))
96320+ return NULL;
96321+
96322+ page = virt_to_head_page(ptr);
96323+ if (!PageSlab(page))
96324+ return NULL;
96325+
96326+ if (page->private) {
96327+ base = page;
96328+ if (base <= ptr && n <= page->private - (ptr - base))
96329+ return NULL;
96330+ return "<slob>";
96331+ }
96332+
96333+ /* some tricky double walking to find the chunk */
96334+ spin_lock_irqsave(&slob_lock, flags);
96335+ base = (void *)((unsigned long)ptr & PAGE_MASK);
96336+ free = page->freelist;
96337+
96338+ while (!slob_last(free) && (void *)free <= ptr) {
96339+ base = free + slob_units(free);
96340+ free = slob_next(free);
96341+ }
96342+
96343+ while (base < (void *)free) {
96344+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
96345+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
96346+ int offset;
96347+
96348+ if (ptr < base + align)
96349+ break;
96350+
96351+ offset = ptr - base - align;
96352+ if (offset >= m) {
96353+ base += size;
96354+ continue;
96355+ }
96356+
96357+ if (n > m - offset)
96358+ break;
96359+
96360+ spin_unlock_irqrestore(&slob_lock, flags);
96361+ return NULL;
96362+ }
96363+
96364+ spin_unlock_irqrestore(&slob_lock, flags);
96365+ return "<slob>";
96366+}
96367+#endif
96368+
96369 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
96370 size_t ksize(const void *block)
96371 {
96372 struct page *sp;
96373 int align;
96374- unsigned int *m;
96375+ slob_t *m;
96376
96377 BUG_ON(!block);
96378 if (unlikely(block == ZERO_SIZE_PTR))
96379 return 0;
96380
96381 sp = virt_to_page(block);
96382- if (unlikely(!PageSlab(sp)))
96383- return PAGE_SIZE << compound_order(sp);
96384+ VM_BUG_ON(!PageSlab(sp));
96385+ if (sp->private)
96386+ return sp->private;
96387
96388 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
96389- m = (unsigned int *)(block - align);
96390- return SLOB_UNITS(*m) * SLOB_UNIT;
96391+ m = (slob_t *)(block - align);
96392+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
96393 }
96394 EXPORT_SYMBOL(ksize);
96395
96396@@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
96397
96398 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
96399 {
96400- void *b;
96401+ void *b = NULL;
96402
96403 flags &= gfp_allowed_mask;
96404
96405 lockdep_trace_alloc(flags);
96406
96407+#ifdef CONFIG_PAX_USERCOPY_SLABS
96408+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
96409+#else
96410 if (c->size < PAGE_SIZE) {
96411 b = slob_alloc(c->size, flags, c->align, node);
96412 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
96413 SLOB_UNITS(c->size) * SLOB_UNIT,
96414 flags, node);
96415 } else {
96416- b = slob_new_pages(flags, get_order(c->size), node);
96417+ struct page *sp;
96418+
96419+ sp = slob_new_pages(flags, get_order(c->size), node);
96420+ if (sp) {
96421+ b = page_address(sp);
96422+ sp->private = c->size;
96423+ }
96424 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
96425 PAGE_SIZE << get_order(c->size),
96426 flags, node);
96427 }
96428+#endif
96429
96430 if (b && c->ctor)
96431 c->ctor(b);
96432@@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
96433
96434 static void __kmem_cache_free(void *b, int size)
96435 {
96436- if (size < PAGE_SIZE)
96437+ struct page *sp;
96438+
96439+ sp = virt_to_page(b);
96440+ BUG_ON(!PageSlab(sp));
96441+ if (!sp->private)
96442 slob_free(b, size);
96443 else
96444- slob_free_pages(b, get_order(size));
96445+ slob_free_pages(sp, get_order(size));
96446 }
96447
96448 static void kmem_rcu_free(struct rcu_head *head)
96449@@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
96450
96451 void kmem_cache_free(struct kmem_cache *c, void *b)
96452 {
96453+ int size = c->size;
96454+
96455+#ifdef CONFIG_PAX_USERCOPY_SLABS
96456+ if (size + c->align < PAGE_SIZE) {
96457+ size += c->align;
96458+ b -= c->align;
96459+ }
96460+#endif
96461+
96462 kmemleak_free_recursive(b, c->flags);
96463 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
96464 struct slob_rcu *slob_rcu;
96465- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
96466- slob_rcu->size = c->size;
96467+ slob_rcu = b + (size - sizeof(struct slob_rcu));
96468+ slob_rcu->size = size;
96469 call_rcu(&slob_rcu->head, kmem_rcu_free);
96470 } else {
96471- __kmem_cache_free(b, c->size);
96472+ __kmem_cache_free(b, size);
96473 }
96474
96475+#ifdef CONFIG_PAX_USERCOPY_SLABS
96476+ trace_kfree(_RET_IP_, b);
96477+#else
96478 trace_kmem_cache_free(_RET_IP_, b);
96479+#endif
96480+
96481 }
96482 EXPORT_SYMBOL(kmem_cache_free);
96483
96484diff --git a/mm/slub.c b/mm/slub.c
96485index 2b1ce69..4a2193f 100644
96486--- a/mm/slub.c
96487+++ b/mm/slub.c
96488@@ -207,7 +207,7 @@ struct track {
96489
96490 enum track_item { TRACK_ALLOC, TRACK_FREE };
96491
96492-#ifdef CONFIG_SYSFS
96493+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96494 static int sysfs_slab_add(struct kmem_cache *);
96495 static int sysfs_slab_alias(struct kmem_cache *, const char *);
96496 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
96497@@ -546,7 +546,7 @@ static void print_track(const char *s, struct track *t)
96498 if (!t->addr)
96499 return;
96500
96501- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
96502+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
96503 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
96504 #ifdef CONFIG_STACKTRACE
96505 {
96506@@ -2666,6 +2666,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
96507
96508 slab_free_hook(s, x);
96509
96510+#ifdef CONFIG_PAX_MEMORY_SANITIZE
96511+ if (pax_sanitize_slab && !(s->flags & SLAB_NO_SANITIZE)) {
96512+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
96513+ if (s->ctor)
96514+ s->ctor(x);
96515+ }
96516+#endif
96517+
96518 redo:
96519 /*
96520 * Determine the currently cpus per cpu slab.
96521@@ -2733,7 +2741,7 @@ static int slub_min_objects;
96522 * Merge control. If this is set then no merging of slab caches will occur.
96523 * (Could be removed. This was introduced to pacify the merge skeptics.)
96524 */
96525-static int slub_nomerge;
96526+static int slub_nomerge = 1;
96527
96528 /*
96529 * Calculate the order of allocation given an slab object size.
96530@@ -3014,6 +3022,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
96531 s->inuse = size;
96532
96533 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
96534+#ifdef CONFIG_PAX_MEMORY_SANITIZE
96535+ (pax_sanitize_slab && !(flags & SLAB_NO_SANITIZE)) ||
96536+#endif
96537 s->ctor)) {
96538 /*
96539 * Relocate free pointer after the object if it is not
96540@@ -3343,6 +3354,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
96541 EXPORT_SYMBOL(__kmalloc_node);
96542 #endif
96543
96544+bool is_usercopy_object(const void *ptr)
96545+{
96546+ struct page *page;
96547+ struct kmem_cache *s;
96548+
96549+ if (ZERO_OR_NULL_PTR(ptr))
96550+ return false;
96551+
96552+ if (!slab_is_available())
96553+ return false;
96554+
96555+ if (!virt_addr_valid(ptr))
96556+ return false;
96557+
96558+ page = virt_to_head_page(ptr);
96559+
96560+ if (!PageSlab(page))
96561+ return false;
96562+
96563+ s = page->slab_cache;
96564+ return s->flags & SLAB_USERCOPY;
96565+}
96566+
96567+#ifdef CONFIG_PAX_USERCOPY
96568+const char *check_heap_object(const void *ptr, unsigned long n)
96569+{
96570+ struct page *page;
96571+ struct kmem_cache *s;
96572+ unsigned long offset;
96573+
96574+ if (ZERO_OR_NULL_PTR(ptr))
96575+ return "<null>";
96576+
96577+ if (!virt_addr_valid(ptr))
96578+ return NULL;
96579+
96580+ page = virt_to_head_page(ptr);
96581+
96582+ if (!PageSlab(page))
96583+ return NULL;
96584+
96585+ s = page->slab_cache;
96586+ if (!(s->flags & SLAB_USERCOPY))
96587+ return s->name;
96588+
96589+ offset = (ptr - page_address(page)) % s->size;
96590+ if (offset <= s->object_size && n <= s->object_size - offset)
96591+ return NULL;
96592+
96593+ return s->name;
96594+}
96595+#endif
96596+
96597 size_t ksize(const void *object)
96598 {
96599 struct page *page;
96600@@ -3371,6 +3435,7 @@ void kfree(const void *x)
96601 if (unlikely(ZERO_OR_NULL_PTR(x)))
96602 return;
96603
96604+ VM_BUG_ON(!virt_addr_valid(x));
96605 page = virt_to_head_page(x);
96606 if (unlikely(!PageSlab(page))) {
96607 BUG_ON(!PageCompound(page));
96608@@ -3679,7 +3744,7 @@ static int slab_unmergeable(struct kmem_cache *s)
96609 /*
96610 * We may have set a slab to be unmergeable during bootstrap.
96611 */
96612- if (s->refcount < 0)
96613+ if (atomic_read(&s->refcount) < 0)
96614 return 1;
96615
96616 return 0;
96617@@ -3736,7 +3801,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
96618 int i;
96619 struct kmem_cache *c;
96620
96621- s->refcount++;
96622+ atomic_inc(&s->refcount);
96623
96624 /*
96625 * Adjust the object sizes so that we clear
96626@@ -3755,7 +3820,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
96627 }
96628
96629 if (sysfs_slab_alias(s, name)) {
96630- s->refcount--;
96631+ atomic_dec(&s->refcount);
96632 s = NULL;
96633 }
96634 }
96635@@ -3872,7 +3937,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
96636 }
96637 #endif
96638
96639-#ifdef CONFIG_SYSFS
96640+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96641 static int count_inuse(struct page *page)
96642 {
96643 return page->inuse;
96644@@ -4156,7 +4221,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
96645 len += sprintf(buf + len, "%7ld ", l->count);
96646
96647 if (l->addr)
96648+#ifdef CONFIG_GRKERNSEC_HIDESYM
96649+ len += sprintf(buf + len, "%pS", NULL);
96650+#else
96651 len += sprintf(buf + len, "%pS", (void *)l->addr);
96652+#endif
96653 else
96654 len += sprintf(buf + len, "<not-available>");
96655
96656@@ -4261,12 +4330,12 @@ static void resiliency_test(void)
96657 validate_slab_cache(kmalloc_caches[9]);
96658 }
96659 #else
96660-#ifdef CONFIG_SYSFS
96661+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96662 static void resiliency_test(void) {};
96663 #endif
96664 #endif
96665
96666-#ifdef CONFIG_SYSFS
96667+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96668 enum slab_stat_type {
96669 SL_ALL, /* All slabs */
96670 SL_PARTIAL, /* Only partially allocated slabs */
96671@@ -4506,13 +4575,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
96672 {
96673 if (!s->ctor)
96674 return 0;
96675+#ifdef CONFIG_GRKERNSEC_HIDESYM
96676+ return sprintf(buf, "%pS\n", NULL);
96677+#else
96678 return sprintf(buf, "%pS\n", s->ctor);
96679+#endif
96680 }
96681 SLAB_ATTR_RO(ctor);
96682
96683 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
96684 {
96685- return sprintf(buf, "%d\n", s->refcount - 1);
96686+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
96687 }
96688 SLAB_ATTR_RO(aliases);
96689
96690@@ -4600,6 +4673,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
96691 SLAB_ATTR_RO(cache_dma);
96692 #endif
96693
96694+#ifdef CONFIG_PAX_USERCOPY_SLABS
96695+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
96696+{
96697+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
96698+}
96699+SLAB_ATTR_RO(usercopy);
96700+#endif
96701+
96702 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
96703 {
96704 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
96705@@ -4934,6 +5015,9 @@ static struct attribute *slab_attrs[] = {
96706 #ifdef CONFIG_ZONE_DMA
96707 &cache_dma_attr.attr,
96708 #endif
96709+#ifdef CONFIG_PAX_USERCOPY_SLABS
96710+ &usercopy_attr.attr,
96711+#endif
96712 #ifdef CONFIG_NUMA
96713 &remote_node_defrag_ratio_attr.attr,
96714 #endif
96715@@ -5184,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
96716 return name;
96717 }
96718
96719+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96720 static int sysfs_slab_add(struct kmem_cache *s)
96721 {
96722 int err;
96723@@ -5257,6 +5342,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
96724 kobject_del(&s->kobj);
96725 kobject_put(&s->kobj);
96726 }
96727+#endif
96728
96729 /*
96730 * Need to buffer aliases during bootup until sysfs becomes
96731@@ -5270,6 +5356,7 @@ struct saved_alias {
96732
96733 static struct saved_alias *alias_list;
96734
96735+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
96736 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
96737 {
96738 struct saved_alias *al;
96739@@ -5292,6 +5379,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
96740 alias_list = al;
96741 return 0;
96742 }
96743+#endif
96744
96745 static int __init slab_sysfs_init(void)
96746 {
96747diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
96748index 4cba9c2..b4f9fcc 100644
96749--- a/mm/sparse-vmemmap.c
96750+++ b/mm/sparse-vmemmap.c
96751@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
96752 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
96753 if (!p)
96754 return NULL;
96755- pud_populate(&init_mm, pud, p);
96756+ pud_populate_kernel(&init_mm, pud, p);
96757 }
96758 return pud;
96759 }
96760@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
96761 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
96762 if (!p)
96763 return NULL;
96764- pgd_populate(&init_mm, pgd, p);
96765+ pgd_populate_kernel(&init_mm, pgd, p);
96766 }
96767 return pgd;
96768 }
96769diff --git a/mm/sparse.c b/mm/sparse.c
96770index d1b48b6..6e8590e 100644
96771--- a/mm/sparse.c
96772+++ b/mm/sparse.c
96773@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
96774
96775 for (i = 0; i < PAGES_PER_SECTION; i++) {
96776 if (PageHWPoison(&memmap[i])) {
96777- atomic_long_sub(1, &num_poisoned_pages);
96778+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
96779 ClearPageHWPoison(&memmap[i]);
96780 }
96781 }
96782diff --git a/mm/swap.c b/mm/swap.c
96783index 9ce43ba..43bdc4c 100644
96784--- a/mm/swap.c
96785+++ b/mm/swap.c
96786@@ -31,6 +31,7 @@
96787 #include <linux/memcontrol.h>
96788 #include <linux/gfp.h>
96789 #include <linux/uio.h>
96790+#include <linux/hugetlb.h>
96791
96792 #include "internal.h"
96793
96794@@ -76,6 +77,8 @@ static void __put_compound_page(struct page *page)
96795
96796 __page_cache_release(page);
96797 dtor = get_compound_page_dtor(page);
96798+ if (!PageHuge(page))
96799+ BUG_ON(dtor != free_compound_page);
96800 (*dtor)(page);
96801 }
96802
96803diff --git a/mm/swapfile.c b/mm/swapfile.c
96804index 4a7f7e6..22cddf5 100644
96805--- a/mm/swapfile.c
96806+++ b/mm/swapfile.c
96807@@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
96808
96809 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
96810 /* Activity counter to indicate that a swapon or swapoff has occurred */
96811-static atomic_t proc_poll_event = ATOMIC_INIT(0);
96812+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
96813
96814 static inline unsigned char swap_count(unsigned char ent)
96815 {
96816@@ -1959,7 +1959,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
96817 spin_unlock(&swap_lock);
96818
96819 err = 0;
96820- atomic_inc(&proc_poll_event);
96821+ atomic_inc_unchecked(&proc_poll_event);
96822 wake_up_interruptible(&proc_poll_wait);
96823
96824 out_dput:
96825@@ -1976,8 +1976,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
96826
96827 poll_wait(file, &proc_poll_wait, wait);
96828
96829- if (seq->poll_event != atomic_read(&proc_poll_event)) {
96830- seq->poll_event = atomic_read(&proc_poll_event);
96831+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
96832+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
96833 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
96834 }
96835
96836@@ -2075,7 +2075,7 @@ static int swaps_open(struct inode *inode, struct file *file)
96837 return ret;
96838
96839 seq = file->private_data;
96840- seq->poll_event = atomic_read(&proc_poll_event);
96841+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
96842 return 0;
96843 }
96844
96845@@ -2534,7 +2534,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
96846 (frontswap_map) ? "FS" : "");
96847
96848 mutex_unlock(&swapon_mutex);
96849- atomic_inc(&proc_poll_event);
96850+ atomic_inc_unchecked(&proc_poll_event);
96851 wake_up_interruptible(&proc_poll_wait);
96852
96853 if (S_ISREG(inode->i_mode))
96854diff --git a/mm/util.c b/mm/util.c
96855index d5ea733..e8953f9 100644
96856--- a/mm/util.c
96857+++ b/mm/util.c
96858@@ -299,6 +299,12 @@ done:
96859 void arch_pick_mmap_layout(struct mm_struct *mm)
96860 {
96861 mm->mmap_base = TASK_UNMAPPED_BASE;
96862+
96863+#ifdef CONFIG_PAX_RANDMMAP
96864+ if (mm->pax_flags & MF_PAX_RANDMMAP)
96865+ mm->mmap_base += mm->delta_mmap;
96866+#endif
96867+
96868 mm->get_unmapped_area = arch_get_unmapped_area;
96869 }
96870 #endif
96871@@ -475,6 +481,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
96872 if (!mm->arg_end)
96873 goto out_mm; /* Shh! No looking before we're done */
96874
96875+ if (gr_acl_handle_procpidmem(task))
96876+ goto out_mm;
96877+
96878 len = mm->arg_end - mm->arg_start;
96879
96880 if (len > buflen)
96881diff --git a/mm/vmalloc.c b/mm/vmalloc.c
96882index bf233b2..1dfa1bc 100644
96883--- a/mm/vmalloc.c
96884+++ b/mm/vmalloc.c
96885@@ -40,6 +40,21 @@ struct vfree_deferred {
96886 };
96887 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
96888
96889+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
96890+struct stack_deferred_llist {
96891+ struct llist_head list;
96892+ void *stack;
96893+ void *lowmem_stack;
96894+};
96895+
96896+struct stack_deferred {
96897+ struct stack_deferred_llist list;
96898+ struct work_struct wq;
96899+};
96900+
96901+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
96902+#endif
96903+
96904 static void __vunmap(const void *, int);
96905
96906 static void free_work(struct work_struct *w)
96907@@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
96908 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
96909 struct llist_node *llnode = llist_del_all(&p->list);
96910 while (llnode) {
96911- void *p = llnode;
96912+ void *x = llnode;
96913 llnode = llist_next(llnode);
96914- __vunmap(p, 1);
96915+ __vunmap(x, 1);
96916 }
96917 }
96918
96919+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
96920+static void unmap_work(struct work_struct *w)
96921+{
96922+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
96923+ struct llist_node *llnode = llist_del_all(&p->list.list);
96924+ while (llnode) {
96925+ struct stack_deferred_llist *x =
96926+ llist_entry((struct llist_head *)llnode,
96927+ struct stack_deferred_llist, list);
96928+ void *stack = ACCESS_ONCE(x->stack);
96929+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
96930+ llnode = llist_next(llnode);
96931+ __vunmap(stack, 0);
96932+ free_memcg_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
96933+ }
96934+}
96935+#endif
96936+
96937 /*** Page table manipulation functions ***/
96938
96939 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
96940@@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
96941
96942 pte = pte_offset_kernel(pmd, addr);
96943 do {
96944- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
96945- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
96946+
96947+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
96948+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
96949+ BUG_ON(!pte_exec(*pte));
96950+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
96951+ continue;
96952+ }
96953+#endif
96954+
96955+ {
96956+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
96957+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
96958+ }
96959 } while (pte++, addr += PAGE_SIZE, addr != end);
96960 }
96961
96962@@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
96963 pte = pte_alloc_kernel(pmd, addr);
96964 if (!pte)
96965 return -ENOMEM;
96966+
96967+ pax_open_kernel();
96968 do {
96969 struct page *page = pages[*nr];
96970
96971- if (WARN_ON(!pte_none(*pte)))
96972+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
96973+ if (pgprot_val(prot) & _PAGE_NX)
96974+#endif
96975+
96976+ if (!pte_none(*pte)) {
96977+ pax_close_kernel();
96978+ WARN_ON(1);
96979 return -EBUSY;
96980- if (WARN_ON(!page))
96981+ }
96982+ if (!page) {
96983+ pax_close_kernel();
96984+ WARN_ON(1);
96985 return -ENOMEM;
96986+ }
96987 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
96988 (*nr)++;
96989 } while (pte++, addr += PAGE_SIZE, addr != end);
96990+ pax_close_kernel();
96991 return 0;
96992 }
96993
96994@@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
96995 pmd_t *pmd;
96996 unsigned long next;
96997
96998- pmd = pmd_alloc(&init_mm, pud, addr);
96999+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
97000 if (!pmd)
97001 return -ENOMEM;
97002 do {
97003@@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
97004 pud_t *pud;
97005 unsigned long next;
97006
97007- pud = pud_alloc(&init_mm, pgd, addr);
97008+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
97009 if (!pud)
97010 return -ENOMEM;
97011 do {
97012@@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
97013 if (addr >= MODULES_VADDR && addr < MODULES_END)
97014 return 1;
97015 #endif
97016+
97017+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
97018+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
97019+ return 1;
97020+#endif
97021+
97022 return is_vmalloc_addr(x);
97023 }
97024
97025@@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
97026
97027 if (!pgd_none(*pgd)) {
97028 pud_t *pud = pud_offset(pgd, addr);
97029+#ifdef CONFIG_X86
97030+ if (!pud_large(*pud))
97031+#endif
97032 if (!pud_none(*pud)) {
97033 pmd_t *pmd = pmd_offset(pud, addr);
97034+#ifdef CONFIG_X86
97035+ if (!pmd_large(*pmd))
97036+#endif
97037 if (!pmd_none(*pmd)) {
97038 pte_t *ptep, pte;
97039
97040@@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
97041 for_each_possible_cpu(i) {
97042 struct vmap_block_queue *vbq;
97043 struct vfree_deferred *p;
97044+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97045+ struct stack_deferred *p2;
97046+#endif
97047
97048 vbq = &per_cpu(vmap_block_queue, i);
97049 spin_lock_init(&vbq->lock);
97050 INIT_LIST_HEAD(&vbq->free);
97051+
97052 p = &per_cpu(vfree_deferred, i);
97053 init_llist_head(&p->list);
97054 INIT_WORK(&p->wq, free_work);
97055+
97056+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97057+ p2 = &per_cpu(stack_deferred, i);
97058+ init_llist_head(&p2->list.list);
97059+ INIT_WORK(&p2->wq, unmap_work);
97060+#endif
97061 }
97062
97063 /* Import existing vmlist entries. */
97064@@ -1317,6 +1396,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
97065 struct vm_struct *area;
97066
97067 BUG_ON(in_interrupt());
97068+
97069+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
97070+ if (flags & VM_KERNEXEC) {
97071+ if (start != VMALLOC_START || end != VMALLOC_END)
97072+ return NULL;
97073+ start = (unsigned long)MODULES_EXEC_VADDR;
97074+ end = (unsigned long)MODULES_EXEC_END;
97075+ }
97076+#endif
97077+
97078 if (flags & VM_IOREMAP)
97079 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
97080
97081@@ -1522,6 +1611,23 @@ void vunmap(const void *addr)
97082 }
97083 EXPORT_SYMBOL(vunmap);
97084
97085+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97086+void unmap_process_stacks(struct task_struct *task)
97087+{
97088+ if (unlikely(in_interrupt())) {
97089+ struct stack_deferred *p = &__get_cpu_var(stack_deferred);
97090+ struct stack_deferred_llist *list = task->stack;
97091+ list->stack = task->stack;
97092+ list->lowmem_stack = task->lowmem_stack;
97093+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
97094+ schedule_work(&p->wq);
97095+ } else {
97096+ __vunmap(task->stack, 0);
97097+ free_memcg_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
97098+ }
97099+}
97100+#endif
97101+
97102 /**
97103 * vmap - map an array of pages into virtually contiguous space
97104 * @pages: array of page pointers
97105@@ -1542,6 +1648,11 @@ void *vmap(struct page **pages, unsigned int count,
97106 if (count > totalram_pages)
97107 return NULL;
97108
97109+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
97110+ if (!(pgprot_val(prot) & _PAGE_NX))
97111+ flags |= VM_KERNEXEC;
97112+#endif
97113+
97114 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
97115 __builtin_return_address(0));
97116 if (!area)
97117@@ -1642,6 +1753,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
97118 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
97119 goto fail;
97120
97121+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
97122+ if (!(pgprot_val(prot) & _PAGE_NX))
97123+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
97124+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
97125+ else
97126+#endif
97127+
97128 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
97129 start, end, node, gfp_mask, caller);
97130 if (!area)
97131@@ -1818,10 +1936,9 @@ EXPORT_SYMBOL(vzalloc_node);
97132 * For tight control over page level allocator and protection flags
97133 * use __vmalloc() instead.
97134 */
97135-
97136 void *vmalloc_exec(unsigned long size)
97137 {
97138- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
97139+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
97140 NUMA_NO_NODE, __builtin_return_address(0));
97141 }
97142
97143@@ -2128,6 +2245,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
97144 {
97145 struct vm_struct *area;
97146
97147+ BUG_ON(vma->vm_mirror);
97148+
97149 size = PAGE_ALIGN(size);
97150
97151 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
97152@@ -2610,7 +2729,11 @@ static int s_show(struct seq_file *m, void *p)
97153 v->addr, v->addr + v->size, v->size);
97154
97155 if (v->caller)
97156+#ifdef CONFIG_GRKERNSEC_HIDESYM
97157+ seq_printf(m, " %pK", v->caller);
97158+#else
97159 seq_printf(m, " %pS", v->caller);
97160+#endif
97161
97162 if (v->nr_pages)
97163 seq_printf(m, " pages=%d", v->nr_pages);
97164diff --git a/mm/vmstat.c b/mm/vmstat.c
97165index 302dd07..3841f1c 100644
97166--- a/mm/vmstat.c
97167+++ b/mm/vmstat.c
97168@@ -20,6 +20,7 @@
97169 #include <linux/writeback.h>
97170 #include <linux/compaction.h>
97171 #include <linux/mm_inline.h>
97172+#include <linux/grsecurity.h>
97173
97174 #include "internal.h"
97175
97176@@ -79,7 +80,7 @@ void vm_events_fold_cpu(int cpu)
97177 *
97178 * vm_stat contains the global counters
97179 */
97180-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
97181+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
97182 EXPORT_SYMBOL(vm_stat);
97183
97184 #ifdef CONFIG_SMP
97185@@ -423,7 +424,7 @@ static inline void fold_diff(int *diff)
97186
97187 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
97188 if (diff[i])
97189- atomic_long_add(diff[i], &vm_stat[i]);
97190+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
97191 }
97192
97193 /*
97194@@ -455,7 +456,7 @@ static void refresh_cpu_vm_stats(void)
97195 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
97196 if (v) {
97197
97198- atomic_long_add(v, &zone->vm_stat[i]);
97199+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
97200 global_diff[i] += v;
97201 #ifdef CONFIG_NUMA
97202 /* 3 seconds idle till flush */
97203@@ -517,7 +518,7 @@ void cpu_vm_stats_fold(int cpu)
97204
97205 v = p->vm_stat_diff[i];
97206 p->vm_stat_diff[i] = 0;
97207- atomic_long_add(v, &zone->vm_stat[i]);
97208+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
97209 global_diff[i] += v;
97210 }
97211 }
97212@@ -537,8 +538,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
97213 if (pset->vm_stat_diff[i]) {
97214 int v = pset->vm_stat_diff[i];
97215 pset->vm_stat_diff[i] = 0;
97216- atomic_long_add(v, &zone->vm_stat[i]);
97217- atomic_long_add(v, &vm_stat[i]);
97218+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
97219+ atomic_long_add_unchecked(v, &vm_stat[i]);
97220 }
97221 }
97222 #endif
97223@@ -1156,10 +1157,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
97224 stat_items_size += sizeof(struct vm_event_state);
97225 #endif
97226
97227- v = kmalloc(stat_items_size, GFP_KERNEL);
97228+ v = kzalloc(stat_items_size, GFP_KERNEL);
97229 m->private = v;
97230 if (!v)
97231 return ERR_PTR(-ENOMEM);
97232+
97233+#ifdef CONFIG_GRKERNSEC_PROC_ADD
97234+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97235+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
97236+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97237+ && !in_group_p(grsec_proc_gid)
97238+#endif
97239+ )
97240+ return (unsigned long *)m->private + *pos;
97241+#endif
97242+#endif
97243+
97244 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
97245 v[i] = global_page_state(i);
97246 v += NR_VM_ZONE_STAT_ITEMS;
97247@@ -1308,10 +1321,16 @@ static int __init setup_vmstat(void)
97248 cpu_notifier_register_done();
97249 #endif
97250 #ifdef CONFIG_PROC_FS
97251- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
97252- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
97253- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
97254- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
97255+ {
97256+ mode_t gr_mode = S_IRUGO;
97257+#ifdef CONFIG_GRKERNSEC_PROC_ADD
97258+ gr_mode = S_IRUSR;
97259+#endif
97260+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
97261+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
97262+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
97263+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
97264+ }
97265 #endif
97266 return 0;
97267 }
97268diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
97269index 44ebd5c..1f732bae 100644
97270--- a/net/8021q/vlan.c
97271+++ b/net/8021q/vlan.c
97272@@ -475,7 +475,7 @@ out:
97273 return NOTIFY_DONE;
97274 }
97275
97276-static struct notifier_block vlan_notifier_block __read_mostly = {
97277+static struct notifier_block vlan_notifier_block = {
97278 .notifier_call = vlan_device_event,
97279 };
97280
97281@@ -550,8 +550,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
97282 err = -EPERM;
97283 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
97284 break;
97285- if ((args.u.name_type >= 0) &&
97286- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
97287+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
97288 struct vlan_net *vn;
97289
97290 vn = net_generic(net, vlan_net_id);
97291diff --git a/net/9p/client.c b/net/9p/client.c
97292index 0004cba..feba240 100644
97293--- a/net/9p/client.c
97294+++ b/net/9p/client.c
97295@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
97296 len - inline_len);
97297 } else {
97298 err = copy_from_user(ename + inline_len,
97299- uidata, len - inline_len);
97300+ (char __force_user *)uidata, len - inline_len);
97301 if (err) {
97302 err = -EFAULT;
97303 goto out_err;
97304@@ -1571,7 +1571,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
97305 kernel_buf = 1;
97306 indata = data;
97307 } else
97308- indata = (__force char *)udata;
97309+ indata = (__force_kernel char *)udata;
97310 /*
97311 * response header len is 11
97312 * PDU Header(7) + IO Size (4)
97313@@ -1646,7 +1646,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
97314 kernel_buf = 1;
97315 odata = data;
97316 } else
97317- odata = (char *)udata;
97318+ odata = (char __force_kernel *)udata;
97319 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
97320 P9_ZC_HDR_SZ, kernel_buf, "dqd",
97321 fid->fid, offset, rsize);
97322diff --git a/net/9p/mod.c b/net/9p/mod.c
97323index 6ab36ae..6f1841b 100644
97324--- a/net/9p/mod.c
97325+++ b/net/9p/mod.c
97326@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
97327 void v9fs_register_trans(struct p9_trans_module *m)
97328 {
97329 spin_lock(&v9fs_trans_lock);
97330- list_add_tail(&m->list, &v9fs_trans_list);
97331+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
97332 spin_unlock(&v9fs_trans_lock);
97333 }
97334 EXPORT_SYMBOL(v9fs_register_trans);
97335@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
97336 void v9fs_unregister_trans(struct p9_trans_module *m)
97337 {
97338 spin_lock(&v9fs_trans_lock);
97339- list_del_init(&m->list);
97340+ pax_list_del_init((struct list_head *)&m->list);
97341 spin_unlock(&v9fs_trans_lock);
97342 }
97343 EXPORT_SYMBOL(v9fs_unregister_trans);
97344diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
97345index 80d08f6..de63fd1 100644
97346--- a/net/9p/trans_fd.c
97347+++ b/net/9p/trans_fd.c
97348@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
97349 oldfs = get_fs();
97350 set_fs(get_ds());
97351 /* The cast to a user pointer is valid due to the set_fs() */
97352- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
97353+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
97354 set_fs(oldfs);
97355
97356 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
97357diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
97358index af46bc4..f9adfcd 100644
97359--- a/net/appletalk/atalk_proc.c
97360+++ b/net/appletalk/atalk_proc.c
97361@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
97362 struct proc_dir_entry *p;
97363 int rc = -ENOMEM;
97364
97365- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
97366+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
97367 if (!atalk_proc_dir)
97368 goto out;
97369
97370diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
97371index 876fbe8..8bbea9f 100644
97372--- a/net/atm/atm_misc.c
97373+++ b/net/atm/atm_misc.c
97374@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
97375 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
97376 return 1;
97377 atm_return(vcc, truesize);
97378- atomic_inc(&vcc->stats->rx_drop);
97379+ atomic_inc_unchecked(&vcc->stats->rx_drop);
97380 return 0;
97381 }
97382 EXPORT_SYMBOL(atm_charge);
97383@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
97384 }
97385 }
97386 atm_return(vcc, guess);
97387- atomic_inc(&vcc->stats->rx_drop);
97388+ atomic_inc_unchecked(&vcc->stats->rx_drop);
97389 return NULL;
97390 }
97391 EXPORT_SYMBOL(atm_alloc_charge);
97392@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
97393
97394 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
97395 {
97396-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
97397+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
97398 __SONET_ITEMS
97399 #undef __HANDLE_ITEM
97400 }
97401@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
97402
97403 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
97404 {
97405-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
97406+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
97407 __SONET_ITEMS
97408 #undef __HANDLE_ITEM
97409 }
97410diff --git a/net/atm/lec.c b/net/atm/lec.c
97411index 4c5b8ba..95f7005 100644
97412--- a/net/atm/lec.c
97413+++ b/net/atm/lec.c
97414@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
97415 }
97416
97417 static struct lane2_ops lane2_ops = {
97418- lane2_resolve, /* resolve, spec 3.1.3 */
97419- lane2_associate_req, /* associate_req, spec 3.1.4 */
97420- NULL /* associate indicator, spec 3.1.5 */
97421+ .resolve = lane2_resolve,
97422+ .associate_req = lane2_associate_req,
97423+ .associate_indicator = NULL
97424 };
97425
97426 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
97427diff --git a/net/atm/lec.h b/net/atm/lec.h
97428index 4149db1..f2ab682 100644
97429--- a/net/atm/lec.h
97430+++ b/net/atm/lec.h
97431@@ -48,7 +48,7 @@ struct lane2_ops {
97432 const u8 *tlvs, u32 sizeoftlvs);
97433 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
97434 const u8 *tlvs, u32 sizeoftlvs);
97435-};
97436+} __no_const;
97437
97438 /*
97439 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
97440diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
97441index d1b2d9a..d549f7f 100644
97442--- a/net/atm/mpoa_caches.c
97443+++ b/net/atm/mpoa_caches.c
97444@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
97445
97446
97447 static struct in_cache_ops ingress_ops = {
97448- in_cache_add_entry, /* add_entry */
97449- in_cache_get, /* get */
97450- in_cache_get_with_mask, /* get_with_mask */
97451- in_cache_get_by_vcc, /* get_by_vcc */
97452- in_cache_put, /* put */
97453- in_cache_remove_entry, /* remove_entry */
97454- cache_hit, /* cache_hit */
97455- clear_count_and_expired, /* clear_count */
97456- check_resolving_entries, /* check_resolving */
97457- refresh_entries, /* refresh */
97458- in_destroy_cache /* destroy_cache */
97459+ .add_entry = in_cache_add_entry,
97460+ .get = in_cache_get,
97461+ .get_with_mask = in_cache_get_with_mask,
97462+ .get_by_vcc = in_cache_get_by_vcc,
97463+ .put = in_cache_put,
97464+ .remove_entry = in_cache_remove_entry,
97465+ .cache_hit = cache_hit,
97466+ .clear_count = clear_count_and_expired,
97467+ .check_resolving = check_resolving_entries,
97468+ .refresh = refresh_entries,
97469+ .destroy_cache = in_destroy_cache
97470 };
97471
97472 static struct eg_cache_ops egress_ops = {
97473- eg_cache_add_entry, /* add_entry */
97474- eg_cache_get_by_cache_id, /* get_by_cache_id */
97475- eg_cache_get_by_tag, /* get_by_tag */
97476- eg_cache_get_by_vcc, /* get_by_vcc */
97477- eg_cache_get_by_src_ip, /* get_by_src_ip */
97478- eg_cache_put, /* put */
97479- eg_cache_remove_entry, /* remove_entry */
97480- update_eg_cache_entry, /* update */
97481- clear_expired, /* clear_expired */
97482- eg_destroy_cache /* destroy_cache */
97483+ .add_entry = eg_cache_add_entry,
97484+ .get_by_cache_id = eg_cache_get_by_cache_id,
97485+ .get_by_tag = eg_cache_get_by_tag,
97486+ .get_by_vcc = eg_cache_get_by_vcc,
97487+ .get_by_src_ip = eg_cache_get_by_src_ip,
97488+ .put = eg_cache_put,
97489+ .remove_entry = eg_cache_remove_entry,
97490+ .update = update_eg_cache_entry,
97491+ .clear_expired = clear_expired,
97492+ .destroy_cache = eg_destroy_cache
97493 };
97494
97495
97496diff --git a/net/atm/proc.c b/net/atm/proc.c
97497index bbb6461..cf04016 100644
97498--- a/net/atm/proc.c
97499+++ b/net/atm/proc.c
97500@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
97501 const struct k_atm_aal_stats *stats)
97502 {
97503 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
97504- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
97505- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
97506- atomic_read(&stats->rx_drop));
97507+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
97508+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
97509+ atomic_read_unchecked(&stats->rx_drop));
97510 }
97511
97512 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
97513diff --git a/net/atm/resources.c b/net/atm/resources.c
97514index 0447d5d..3cf4728 100644
97515--- a/net/atm/resources.c
97516+++ b/net/atm/resources.c
97517@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
97518 static void copy_aal_stats(struct k_atm_aal_stats *from,
97519 struct atm_aal_stats *to)
97520 {
97521-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
97522+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
97523 __AAL_STAT_ITEMS
97524 #undef __HANDLE_ITEM
97525 }
97526@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
97527 static void subtract_aal_stats(struct k_atm_aal_stats *from,
97528 struct atm_aal_stats *to)
97529 {
97530-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
97531+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
97532 __AAL_STAT_ITEMS
97533 #undef __HANDLE_ITEM
97534 }
97535diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
97536index 919a5ce..cc6b444 100644
97537--- a/net/ax25/sysctl_net_ax25.c
97538+++ b/net/ax25/sysctl_net_ax25.c
97539@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
97540 {
97541 char path[sizeof("net/ax25/") + IFNAMSIZ];
97542 int k;
97543- struct ctl_table *table;
97544+ ctl_table_no_const *table;
97545
97546 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
97547 if (!table)
97548diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
97549index f04224c..f326579 100644
97550--- a/net/batman-adv/bat_iv_ogm.c
97551+++ b/net/batman-adv/bat_iv_ogm.c
97552@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
97553
97554 /* randomize initial seqno to avoid collision */
97555 get_random_bytes(&random_seqno, sizeof(random_seqno));
97556- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
97557+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
97558
97559 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
97560 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
97561@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
97562 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
97563
97564 /* change sequence number to network order */
97565- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
97566+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
97567 batadv_ogm_packet->seqno = htonl(seqno);
97568- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
97569+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
97570
97571 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
97572
97573@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
97574 return;
97575
97576 /* could be changed by schedule_own_packet() */
97577- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
97578+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
97579
97580 if (ogm_packet->flags & BATADV_DIRECTLINK)
97581 has_directlink_flag = true;
97582diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
97583index f14e54a..66f3e2e 100644
97584--- a/net/batman-adv/fragmentation.c
97585+++ b/net/batman-adv/fragmentation.c
97586@@ -446,7 +446,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
97587 frag_header.packet_type = BATADV_UNICAST_FRAG;
97588 frag_header.version = BATADV_COMPAT_VERSION;
97589 frag_header.ttl = BATADV_TTL;
97590- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
97591+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
97592 frag_header.reserved = 0;
97593 frag_header.no = 0;
97594 frag_header.total_size = htons(skb->len);
97595diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
97596index 744a59b..8fd037c 100644
97597--- a/net/batman-adv/soft-interface.c
97598+++ b/net/batman-adv/soft-interface.c
97599@@ -296,7 +296,7 @@ send:
97600 primary_if->net_dev->dev_addr);
97601
97602 /* set broadcast sequence number */
97603- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
97604+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
97605 bcast_packet->seqno = htonl(seqno);
97606
97607 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
97608@@ -729,7 +729,7 @@ static int batadv_softif_init_late(struct net_device *dev)
97609 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
97610
97611 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
97612- atomic_set(&bat_priv->bcast_seqno, 1);
97613+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
97614 atomic_set(&bat_priv->tt.vn, 0);
97615 atomic_set(&bat_priv->tt.local_changes, 0);
97616 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
97617@@ -743,7 +743,7 @@ static int batadv_softif_init_late(struct net_device *dev)
97618
97619 /* randomize initial seqno to avoid collision */
97620 get_random_bytes(&random_seqno, sizeof(random_seqno));
97621- atomic_set(&bat_priv->frag_seqno, random_seqno);
97622+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
97623
97624 bat_priv->primary_if = NULL;
97625 bat_priv->num_ifaces = 0;
97626diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
97627index 34891a5..3cfece0 100644
97628--- a/net/batman-adv/types.h
97629+++ b/net/batman-adv/types.h
97630@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
97631 struct batadv_hard_iface_bat_iv {
97632 unsigned char *ogm_buff;
97633 int ogm_buff_len;
97634- atomic_t ogm_seqno;
97635+ atomic_unchecked_t ogm_seqno;
97636 };
97637
97638 /**
97639@@ -766,7 +766,7 @@ struct batadv_priv {
97640 atomic_t bonding;
97641 atomic_t fragmentation;
97642 atomic_t packet_size_max;
97643- atomic_t frag_seqno;
97644+ atomic_unchecked_t frag_seqno;
97645 #ifdef CONFIG_BATMAN_ADV_BLA
97646 atomic_t bridge_loop_avoidance;
97647 #endif
97648@@ -785,7 +785,7 @@ struct batadv_priv {
97649 #endif
97650 uint32_t isolation_mark;
97651 uint32_t isolation_mark_mask;
97652- atomic_t bcast_seqno;
97653+ atomic_unchecked_t bcast_seqno;
97654 atomic_t bcast_queue_left;
97655 atomic_t batman_queue_left;
97656 char num_ifaces;
97657diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
97658index b9a418e..2af862a 100644
97659--- a/net/bluetooth/hci_sock.c
97660+++ b/net/bluetooth/hci_sock.c
97661@@ -1053,7 +1053,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
97662 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
97663 }
97664
97665- len = min_t(unsigned int, len, sizeof(uf));
97666+ len = min((size_t)len, sizeof(uf));
97667 if (copy_from_user(&uf, optval, len)) {
97668 err = -EFAULT;
97669 break;
97670diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
97671index dc4d301..4975bac 100644
97672--- a/net/bluetooth/l2cap_core.c
97673+++ b/net/bluetooth/l2cap_core.c
97674@@ -3536,8 +3536,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
97675 break;
97676
97677 case L2CAP_CONF_RFC:
97678- if (olen == sizeof(rfc))
97679- memcpy(&rfc, (void *)val, olen);
97680+ if (olen != sizeof(rfc))
97681+ break;
97682+
97683+ memcpy(&rfc, (void *)val, olen);
97684
97685 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
97686 rfc.mode != chan->mode)
97687diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
97688index ade3fb4..df37cb4 100644
97689--- a/net/bluetooth/l2cap_sock.c
97690+++ b/net/bluetooth/l2cap_sock.c
97691@@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
97692 struct sock *sk = sock->sk;
97693 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
97694 struct l2cap_options opts;
97695- int len, err = 0;
97696+ int err = 0;
97697+ size_t len = optlen;
97698 u32 opt;
97699
97700 BT_DBG("sk %p", sk);
97701@@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
97702 opts.max_tx = chan->max_tx;
97703 opts.txwin_size = chan->tx_win;
97704
97705- len = min_t(unsigned int, sizeof(opts), optlen);
97706+ len = min(sizeof(opts), len);
97707 if (copy_from_user((char *) &opts, optval, len)) {
97708 err = -EFAULT;
97709 break;
97710@@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
97711 struct bt_security sec;
97712 struct bt_power pwr;
97713 struct l2cap_conn *conn;
97714- int len, err = 0;
97715+ int err = 0;
97716+ size_t len = optlen;
97717 u32 opt;
97718
97719 BT_DBG("sk %p", sk);
97720@@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
97721
97722 sec.level = BT_SECURITY_LOW;
97723
97724- len = min_t(unsigned int, sizeof(sec), optlen);
97725+ len = min(sizeof(sec), len);
97726 if (copy_from_user((char *) &sec, optval, len)) {
97727 err = -EFAULT;
97728 break;
97729@@ -866,7 +868,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
97730
97731 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
97732
97733- len = min_t(unsigned int, sizeof(pwr), optlen);
97734+ len = min(sizeof(pwr), len);
97735 if (copy_from_user((char *) &pwr, optval, len)) {
97736 err = -EFAULT;
97737 break;
97738diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
97739index c603a5e..7f08991 100644
97740--- a/net/bluetooth/rfcomm/sock.c
97741+++ b/net/bluetooth/rfcomm/sock.c
97742@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
97743 struct sock *sk = sock->sk;
97744 struct bt_security sec;
97745 int err = 0;
97746- size_t len;
97747+ size_t len = optlen;
97748 u32 opt;
97749
97750 BT_DBG("sk %p", sk);
97751@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
97752
97753 sec.level = BT_SECURITY_LOW;
97754
97755- len = min_t(unsigned int, sizeof(sec), optlen);
97756+ len = min(sizeof(sec), len);
97757 if (copy_from_user((char *) &sec, optval, len)) {
97758 err = -EFAULT;
97759 break;
97760diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
97761index 403ec09..a21a003 100644
97762--- a/net/bluetooth/rfcomm/tty.c
97763+++ b/net/bluetooth/rfcomm/tty.c
97764@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
97765 BT_DBG("tty %p id %d", tty, tty->index);
97766
97767 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
97768- dev->channel, dev->port.count);
97769+ dev->channel, atomic_read(&dev->port.count));
97770
97771 err = tty_port_open(&dev->port, tty, filp);
97772 if (err)
97773@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
97774 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
97775
97776 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
97777- dev->port.count);
97778+ atomic_read(&dev->port.count));
97779
97780 tty_port_close(&dev->port, tty, filp);
97781 }
97782diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
97783index 1059ed3..d70846a 100644
97784--- a/net/bridge/netfilter/ebtables.c
97785+++ b/net/bridge/netfilter/ebtables.c
97786@@ -1524,7 +1524,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
97787 tmp.valid_hooks = t->table->valid_hooks;
97788 }
97789 mutex_unlock(&ebt_mutex);
97790- if (copy_to_user(user, &tmp, *len) != 0) {
97791+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
97792 BUGPRINT("c2u Didn't work\n");
97793 ret = -EFAULT;
97794 break;
97795@@ -2330,7 +2330,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
97796 goto out;
97797 tmp.valid_hooks = t->valid_hooks;
97798
97799- if (copy_to_user(user, &tmp, *len) != 0) {
97800+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
97801 ret = -EFAULT;
97802 break;
97803 }
97804@@ -2341,7 +2341,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
97805 tmp.entries_size = t->table->entries_size;
97806 tmp.valid_hooks = t->table->valid_hooks;
97807
97808- if (copy_to_user(user, &tmp, *len) != 0) {
97809+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
97810 ret = -EFAULT;
97811 break;
97812 }
97813diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
97814index 0f45522..dab651f 100644
97815--- a/net/caif/cfctrl.c
97816+++ b/net/caif/cfctrl.c
97817@@ -10,6 +10,7 @@
97818 #include <linux/spinlock.h>
97819 #include <linux/slab.h>
97820 #include <linux/pkt_sched.h>
97821+#include <linux/sched.h>
97822 #include <net/caif/caif_layer.h>
97823 #include <net/caif/cfpkt.h>
97824 #include <net/caif/cfctrl.h>
97825@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
97826 memset(&dev_info, 0, sizeof(dev_info));
97827 dev_info.id = 0xff;
97828 cfsrvl_init(&this->serv, 0, &dev_info, false);
97829- atomic_set(&this->req_seq_no, 1);
97830- atomic_set(&this->rsp_seq_no, 1);
97831+ atomic_set_unchecked(&this->req_seq_no, 1);
97832+ atomic_set_unchecked(&this->rsp_seq_no, 1);
97833 this->serv.layer.receive = cfctrl_recv;
97834 sprintf(this->serv.layer.name, "ctrl");
97835 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
97836@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
97837 struct cfctrl_request_info *req)
97838 {
97839 spin_lock_bh(&ctrl->info_list_lock);
97840- atomic_inc(&ctrl->req_seq_no);
97841- req->sequence_no = atomic_read(&ctrl->req_seq_no);
97842+ atomic_inc_unchecked(&ctrl->req_seq_no);
97843+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
97844 list_add_tail(&req->list, &ctrl->list);
97845 spin_unlock_bh(&ctrl->info_list_lock);
97846 }
97847@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
97848 if (p != first)
97849 pr_warn("Requests are not received in order\n");
97850
97851- atomic_set(&ctrl->rsp_seq_no,
97852+ atomic_set_unchecked(&ctrl->rsp_seq_no,
97853 p->sequence_no);
97854 list_del(&p->list);
97855 goto out;
97856diff --git a/net/can/af_can.c b/net/can/af_can.c
97857index a27f8aa..67174a3 100644
97858--- a/net/can/af_can.c
97859+++ b/net/can/af_can.c
97860@@ -863,7 +863,7 @@ static const struct net_proto_family can_family_ops = {
97861 };
97862
97863 /* notifier block for netdevice event */
97864-static struct notifier_block can_netdev_notifier __read_mostly = {
97865+static struct notifier_block can_netdev_notifier = {
97866 .notifier_call = can_notifier,
97867 };
97868
97869diff --git a/net/can/bcm.c b/net/can/bcm.c
97870index dcb75c0..24b1b43 100644
97871--- a/net/can/bcm.c
97872+++ b/net/can/bcm.c
97873@@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
97874 }
97875
97876 /* create /proc/net/can-bcm directory */
97877- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
97878+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
97879 return 0;
97880 }
97881
97882diff --git a/net/can/gw.c b/net/can/gw.c
97883index 050a211..bb9fe33 100644
97884--- a/net/can/gw.c
97885+++ b/net/can/gw.c
97886@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
97887 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
97888
97889 static HLIST_HEAD(cgw_list);
97890-static struct notifier_block notifier;
97891
97892 static struct kmem_cache *cgw_cache __read_mostly;
97893
97894@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
97895 return err;
97896 }
97897
97898+static struct notifier_block notifier = {
97899+ .notifier_call = cgw_notifier
97900+};
97901+
97902 static __init int cgw_module_init(void)
97903 {
97904 /* sanitize given module parameter */
97905@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
97906 return -ENOMEM;
97907
97908 /* set notifier */
97909- notifier.notifier_call = cgw_notifier;
97910 register_netdevice_notifier(&notifier);
97911
97912 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
97913diff --git a/net/can/proc.c b/net/can/proc.c
97914index b543470..d2ddae2 100644
97915--- a/net/can/proc.c
97916+++ b/net/can/proc.c
97917@@ -468,7 +468,7 @@ static void can_remove_proc_readentry(const char *name)
97918 void can_init_proc(void)
97919 {
97920 /* create /proc/net/can directory */
97921- can_dir = proc_mkdir("can", init_net.proc_net);
97922+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
97923
97924 if (!can_dir) {
97925 printk(KERN_INFO "can: failed to create /proc/net/can . "
97926diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
97927index 1948d59..9e854d5 100644
97928--- a/net/ceph/messenger.c
97929+++ b/net/ceph/messenger.c
97930@@ -187,7 +187,7 @@ static void con_fault(struct ceph_connection *con);
97931 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
97932
97933 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
97934-static atomic_t addr_str_seq = ATOMIC_INIT(0);
97935+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
97936
97937 static struct page *zero_page; /* used in certain error cases */
97938
97939@@ -198,7 +198,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
97940 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
97941 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
97942
97943- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
97944+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
97945 s = addr_str[i];
97946
97947 switch (ss->ss_family) {
97948diff --git a/net/compat.c b/net/compat.c
97949index 9a76eaf..5b8ccfd 100644
97950--- a/net/compat.c
97951+++ b/net/compat.c
97952@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
97953 return -EFAULT;
97954 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
97955 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
97956- kmsg->msg_name = compat_ptr(tmp1);
97957- kmsg->msg_iov = compat_ptr(tmp2);
97958- kmsg->msg_control = compat_ptr(tmp3);
97959+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
97960+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
97961+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
97962 return 0;
97963 }
97964
97965@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
97966
97967 if (kern_msg->msg_namelen) {
97968 if (mode == VERIFY_READ) {
97969- int err = move_addr_to_kernel(kern_msg->msg_name,
97970+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
97971 kern_msg->msg_namelen,
97972 kern_address);
97973 if (err < 0)
97974@@ -99,7 +99,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
97975 kern_msg->msg_name = NULL;
97976
97977 tot_len = iov_from_user_compat_to_kern(kern_iov,
97978- (struct compat_iovec __user *)kern_msg->msg_iov,
97979+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
97980 kern_msg->msg_iovlen);
97981 if (tot_len >= 0)
97982 kern_msg->msg_iov = kern_iov;
97983@@ -119,20 +119,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
97984
97985 #define CMSG_COMPAT_FIRSTHDR(msg) \
97986 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
97987- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
97988+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
97989 (struct compat_cmsghdr __user *)NULL)
97990
97991 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
97992 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
97993 (ucmlen) <= (unsigned long) \
97994 ((mhdr)->msg_controllen - \
97995- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
97996+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
97997
97998 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
97999 struct compat_cmsghdr __user *cmsg, int cmsg_len)
98000 {
98001 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
98002- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
98003+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
98004 msg->msg_controllen)
98005 return NULL;
98006 return (struct compat_cmsghdr __user *)ptr;
98007@@ -222,7 +222,7 @@ Efault:
98008
98009 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
98010 {
98011- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
98012+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
98013 struct compat_cmsghdr cmhdr;
98014 struct compat_timeval ctv;
98015 struct compat_timespec cts[3];
98016@@ -278,7 +278,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
98017
98018 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
98019 {
98020- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
98021+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
98022 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
98023 int fdnum = scm->fp->count;
98024 struct file **fp = scm->fp->fp;
98025@@ -366,7 +366,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
98026 return -EFAULT;
98027 old_fs = get_fs();
98028 set_fs(KERNEL_DS);
98029- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
98030+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
98031 set_fs(old_fs);
98032
98033 return err;
98034@@ -427,7 +427,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
98035 len = sizeof(ktime);
98036 old_fs = get_fs();
98037 set_fs(KERNEL_DS);
98038- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
98039+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
98040 set_fs(old_fs);
98041
98042 if (!err) {
98043@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
98044 case MCAST_JOIN_GROUP:
98045 case MCAST_LEAVE_GROUP:
98046 {
98047- struct compat_group_req __user *gr32 = (void *)optval;
98048+ struct compat_group_req __user *gr32 = (void __user *)optval;
98049 struct group_req __user *kgr =
98050 compat_alloc_user_space(sizeof(struct group_req));
98051 u32 interface;
98052@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
98053 case MCAST_BLOCK_SOURCE:
98054 case MCAST_UNBLOCK_SOURCE:
98055 {
98056- struct compat_group_source_req __user *gsr32 = (void *)optval;
98057+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
98058 struct group_source_req __user *kgsr = compat_alloc_user_space(
98059 sizeof(struct group_source_req));
98060 u32 interface;
98061@@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
98062 }
98063 case MCAST_MSFILTER:
98064 {
98065- struct compat_group_filter __user *gf32 = (void *)optval;
98066+ struct compat_group_filter __user *gf32 = (void __user *)optval;
98067 struct group_filter __user *kgf;
98068 u32 interface, fmode, numsrc;
98069
98070@@ -650,7 +650,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
98071 char __user *optval, int __user *optlen,
98072 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
98073 {
98074- struct compat_group_filter __user *gf32 = (void *)optval;
98075+ struct compat_group_filter __user *gf32 = (void __user *)optval;
98076 struct group_filter __user *kgf;
98077 int __user *koptlen;
98078 u32 interface, fmode, numsrc;
98079@@ -803,7 +803,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
98080
98081 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
98082 return -EINVAL;
98083- if (copy_from_user(a, args, nas[call]))
98084+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
98085 return -EFAULT;
98086 a0 = a[0];
98087 a1 = a[1];
98088diff --git a/net/core/datagram.c b/net/core/datagram.c
98089index a16ed7b..eb44d17 100644
98090--- a/net/core/datagram.c
98091+++ b/net/core/datagram.c
98092@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
98093 }
98094
98095 kfree_skb(skb);
98096- atomic_inc(&sk->sk_drops);
98097+ atomic_inc_unchecked(&sk->sk_drops);
98098 sk_mem_reclaim_partial(sk);
98099
98100 return err;
98101diff --git a/net/core/dev.c b/net/core/dev.c
98102index a30bef1..51d3e33 100644
98103--- a/net/core/dev.c
98104+++ b/net/core/dev.c
98105@@ -1683,14 +1683,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
98106 {
98107 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
98108 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
98109- atomic_long_inc(&dev->rx_dropped);
98110+ atomic_long_inc_unchecked(&dev->rx_dropped);
98111 kfree_skb(skb);
98112 return NET_RX_DROP;
98113 }
98114 }
98115
98116 if (unlikely(!is_skb_forwardable(dev, skb))) {
98117- atomic_long_inc(&dev->rx_dropped);
98118+ atomic_long_inc_unchecked(&dev->rx_dropped);
98119 kfree_skb(skb);
98120 return NET_RX_DROP;
98121 }
98122@@ -2463,7 +2463,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
98123
98124 struct dev_gso_cb {
98125 void (*destructor)(struct sk_buff *skb);
98126-};
98127+} __no_const;
98128
98129 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
98130
98131@@ -2893,7 +2893,7 @@ recursion_alert:
98132 rc = -ENETDOWN;
98133 rcu_read_unlock_bh();
98134
98135- atomic_long_inc(&dev->tx_dropped);
98136+ atomic_long_inc_unchecked(&dev->tx_dropped);
98137 kfree_skb(skb);
98138 return rc;
98139 out:
98140@@ -3237,7 +3237,7 @@ enqueue:
98141
98142 local_irq_restore(flags);
98143
98144- atomic_long_inc(&skb->dev->rx_dropped);
98145+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
98146 kfree_skb(skb);
98147 return NET_RX_DROP;
98148 }
98149@@ -3314,7 +3314,7 @@ int netif_rx_ni(struct sk_buff *skb)
98150 }
98151 EXPORT_SYMBOL(netif_rx_ni);
98152
98153-static void net_tx_action(struct softirq_action *h)
98154+static __latent_entropy void net_tx_action(void)
98155 {
98156 struct softnet_data *sd = &__get_cpu_var(softnet_data);
98157
98158@@ -3647,7 +3647,7 @@ ncls:
98159 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
98160 } else {
98161 drop:
98162- atomic_long_inc(&skb->dev->rx_dropped);
98163+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
98164 kfree_skb(skb);
98165 /* Jamal, now you will not able to escape explaining
98166 * me how you were going to use this. :-)
98167@@ -4366,7 +4366,7 @@ void netif_napi_del(struct napi_struct *napi)
98168 }
98169 EXPORT_SYMBOL(netif_napi_del);
98170
98171-static void net_rx_action(struct softirq_action *h)
98172+static __latent_entropy void net_rx_action(void)
98173 {
98174 struct softnet_data *sd = &__get_cpu_var(softnet_data);
98175 unsigned long time_limit = jiffies + 2;
98176@@ -6366,8 +6366,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
98177 } else {
98178 netdev_stats_to_stats64(storage, &dev->stats);
98179 }
98180- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
98181- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
98182+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
98183+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
98184 return storage;
98185 }
98186 EXPORT_SYMBOL(dev_get_stats);
98187diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
98188index cf999e0..c59a975 100644
98189--- a/net/core/dev_ioctl.c
98190+++ b/net/core/dev_ioctl.c
98191@@ -366,9 +366,13 @@ void dev_load(struct net *net, const char *name)
98192 if (no_module && capable(CAP_NET_ADMIN))
98193 no_module = request_module("netdev-%s", name);
98194 if (no_module && capable(CAP_SYS_MODULE)) {
98195+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98196+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
98197+#else
98198 if (!request_module("%s", name))
98199 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
98200 name);
98201+#endif
98202 }
98203 }
98204 EXPORT_SYMBOL(dev_load);
98205diff --git a/net/core/dst.c b/net/core/dst.c
98206index 80d6286..a028409 100644
98207--- a/net/core/dst.c
98208+++ b/net/core/dst.c
98209@@ -269,6 +269,15 @@ again:
98210 }
98211 EXPORT_SYMBOL(dst_destroy);
98212
98213+static void dst_destroy_rcu(struct rcu_head *head)
98214+{
98215+ struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head);
98216+
98217+ dst = dst_destroy(dst);
98218+ if (dst)
98219+ __dst_free(dst);
98220+}
98221+
98222 void dst_release(struct dst_entry *dst)
98223 {
98224 if (dst) {
98225@@ -276,11 +285,8 @@ void dst_release(struct dst_entry *dst)
98226
98227 newrefcnt = atomic_dec_return(&dst->__refcnt);
98228 WARN_ON(newrefcnt < 0);
98229- if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt) {
98230- dst = dst_destroy(dst);
98231- if (dst)
98232- __dst_free(dst);
98233- }
98234+ if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
98235+ call_rcu(&dst->rcu_head, dst_destroy_rcu);
98236 }
98237 }
98238 EXPORT_SYMBOL(dst_release);
98239diff --git a/net/core/filter.c b/net/core/filter.c
98240index 4aec7b9..5cf605c 100644
98241--- a/net/core/filter.c
98242+++ b/net/core/filter.c
98243@@ -1121,7 +1121,11 @@ do_pass:
98244 break;
98245
98246 default:
98247- goto err;
98248+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
98249+ fp->code, fp->jt, fp->jf, fp->k);
98250+ kfree(addrs);
98251+ BUG();
98252+ return -EINVAL;
98253 }
98254
98255 insn++;
98256@@ -1170,7 +1174,7 @@ static int check_load_and_stores(struct sock_filter *filter, int flen)
98257 u16 *masks, memvalid = 0; /* one bit per cell, 16 cells */
98258 int pc, ret = 0;
98259
98260- BUILD_BUG_ON(BPF_MEMWORDS > 16);
98261+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
98262 masks = kmalloc(flen * sizeof(*masks), GFP_KERNEL);
98263 if (!masks)
98264 return -ENOMEM;
98265@@ -1605,7 +1609,7 @@ int sk_unattached_filter_create(struct sk_filter **pfp,
98266 if (!fp)
98267 return -ENOMEM;
98268
98269- memcpy(fp->insns, fprog->filter, fsize);
98270+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
98271
98272 atomic_set(&fp->refcnt, 1);
98273 fp->len = fprog->len;
98274diff --git a/net/core/flow.c b/net/core/flow.c
98275index a0348fd..6951c76 100644
98276--- a/net/core/flow.c
98277+++ b/net/core/flow.c
98278@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
98279 static int flow_entry_valid(struct flow_cache_entry *fle,
98280 struct netns_xfrm *xfrm)
98281 {
98282- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
98283+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
98284 return 0;
98285 if (fle->object && !fle->object->ops->check(fle->object))
98286 return 0;
98287@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
98288 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
98289 fcp->hash_count++;
98290 }
98291- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
98292+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
98293 flo = fle->object;
98294 if (!flo)
98295 goto ret_object;
98296@@ -263,7 +263,7 @@ nocache:
98297 }
98298 flo = resolver(net, key, family, dir, flo, ctx);
98299 if (fle) {
98300- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
98301+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
98302 if (!IS_ERR(flo))
98303 fle->object = flo;
98304 else
98305diff --git a/net/core/iovec.c b/net/core/iovec.c
98306index b618694..192bbba 100644
98307--- a/net/core/iovec.c
98308+++ b/net/core/iovec.c
98309@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
98310 if (m->msg_namelen) {
98311 if (mode == VERIFY_READ) {
98312 void __user *namep;
98313- namep = (void __user __force *) m->msg_name;
98314+ namep = (void __force_user *) m->msg_name;
98315 err = move_addr_to_kernel(namep, m->msg_namelen,
98316 address);
98317 if (err < 0)
98318@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
98319 }
98320
98321 size = m->msg_iovlen * sizeof(struct iovec);
98322- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
98323+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
98324 return -EFAULT;
98325
98326 m->msg_iov = iov;
98327diff --git a/net/core/neighbour.c b/net/core/neighbour.c
98328index 32d872e..487e769 100644
98329--- a/net/core/neighbour.c
98330+++ b/net/core/neighbour.c
98331@@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
98332 void __user *buffer, size_t *lenp, loff_t *ppos)
98333 {
98334 int size, ret;
98335- struct ctl_table tmp = *ctl;
98336+ ctl_table_no_const tmp = *ctl;
98337
98338 tmp.extra1 = &zero;
98339 tmp.extra2 = &unres_qlen_max;
98340@@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
98341 void __user *buffer,
98342 size_t *lenp, loff_t *ppos)
98343 {
98344- struct ctl_table tmp = *ctl;
98345+ ctl_table_no_const tmp = *ctl;
98346 int ret;
98347
98348 tmp.extra1 = &zero;
98349@@ -3059,11 +3059,12 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
98350 memset(&t->neigh_vars[NEIGH_VAR_GC_INTERVAL], 0,
98351 sizeof(t->neigh_vars[NEIGH_VAR_GC_INTERVAL]));
98352 } else {
98353+ struct neigh_table *ntable = container_of(p, struct neigh_table, parms);
98354 dev_name_source = "default";
98355- t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = (int *)(p + 1);
98356- t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = (int *)(p + 1) + 1;
98357- t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = (int *)(p + 1) + 2;
98358- t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = (int *)(p + 1) + 3;
98359+ t->neigh_vars[NEIGH_VAR_GC_INTERVAL].data = &ntable->gc_interval;
98360+ t->neigh_vars[NEIGH_VAR_GC_THRESH1].data = &ntable->gc_thresh1;
98361+ t->neigh_vars[NEIGH_VAR_GC_THRESH2].data = &ntable->gc_thresh2;
98362+ t->neigh_vars[NEIGH_VAR_GC_THRESH3].data = &ntable->gc_thresh3;
98363 }
98364
98365 if (handler) {
98366diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
98367index 2bf8329..2eb1423 100644
98368--- a/net/core/net-procfs.c
98369+++ b/net/core/net-procfs.c
98370@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
98371 struct rtnl_link_stats64 temp;
98372 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
98373
98374- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
98375+ if (gr_proc_is_restricted())
98376+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
98377+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
98378+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
98379+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
98380+ else
98381+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
98382 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
98383 dev->name, stats->rx_bytes, stats->rx_packets,
98384 stats->rx_errors,
98385@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
98386 return 0;
98387 }
98388
98389-static const struct seq_operations dev_seq_ops = {
98390+const struct seq_operations dev_seq_ops = {
98391 .start = dev_seq_start,
98392 .next = dev_seq_next,
98393 .stop = dev_seq_stop,
98394@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
98395
98396 static int softnet_seq_open(struct inode *inode, struct file *file)
98397 {
98398- return seq_open(file, &softnet_seq_ops);
98399+ return seq_open_restrict(file, &softnet_seq_ops);
98400 }
98401
98402 static const struct file_operations softnet_seq_fops = {
98403@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
98404 else
98405 seq_printf(seq, "%04x", ntohs(pt->type));
98406
98407+#ifdef CONFIG_GRKERNSEC_HIDESYM
98408+ seq_printf(seq, " %-8s %pf\n",
98409+ pt->dev ? pt->dev->name : "", NULL);
98410+#else
98411 seq_printf(seq, " %-8s %pf\n",
98412 pt->dev ? pt->dev->name : "", pt->func);
98413+#endif
98414 }
98415
98416 return 0;
98417diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
98418index 1cac29e..fb482f3 100644
98419--- a/net/core/net-sysfs.c
98420+++ b/net/core/net-sysfs.c
98421@@ -259,7 +259,7 @@ static ssize_t carrier_changes_show(struct device *dev,
98422 {
98423 struct net_device *netdev = to_net_dev(dev);
98424 return sprintf(buf, fmt_dec,
98425- atomic_read(&netdev->carrier_changes));
98426+ atomic_read_unchecked(&netdev->carrier_changes));
98427 }
98428 static DEVICE_ATTR_RO(carrier_changes);
98429
98430diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
98431index 7c8ffd9..0cb3687 100644
98432--- a/net/core/net_namespace.c
98433+++ b/net/core/net_namespace.c
98434@@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
98435 int error;
98436 LIST_HEAD(net_exit_list);
98437
98438- list_add_tail(&ops->list, list);
98439+ pax_list_add_tail((struct list_head *)&ops->list, list);
98440 if (ops->init || (ops->id && ops->size)) {
98441 for_each_net(net) {
98442 error = ops_init(ops, net);
98443@@ -456,7 +456,7 @@ static int __register_pernet_operations(struct list_head *list,
98444
98445 out_undo:
98446 /* If I have an error cleanup all namespaces I initialized */
98447- list_del(&ops->list);
98448+ pax_list_del((struct list_head *)&ops->list);
98449 ops_exit_list(ops, &net_exit_list);
98450 ops_free_list(ops, &net_exit_list);
98451 return error;
98452@@ -467,7 +467,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
98453 struct net *net;
98454 LIST_HEAD(net_exit_list);
98455
98456- list_del(&ops->list);
98457+ pax_list_del((struct list_head *)&ops->list);
98458 for_each_net(net)
98459 list_add_tail(&net->exit_list, &net_exit_list);
98460 ops_exit_list(ops, &net_exit_list);
98461@@ -601,7 +601,7 @@ int register_pernet_device(struct pernet_operations *ops)
98462 mutex_lock(&net_mutex);
98463 error = register_pernet_operations(&pernet_list, ops);
98464 if (!error && (first_device == &pernet_list))
98465- first_device = &ops->list;
98466+ first_device = (struct list_head *)&ops->list;
98467 mutex_unlock(&net_mutex);
98468 return error;
98469 }
98470diff --git a/net/core/netpoll.c b/net/core/netpoll.c
98471index e33937f..b2b4981 100644
98472--- a/net/core/netpoll.c
98473+++ b/net/core/netpoll.c
98474@@ -382,7 +382,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
98475 struct udphdr *udph;
98476 struct iphdr *iph;
98477 struct ethhdr *eth;
98478- static atomic_t ip_ident;
98479+ static atomic_unchecked_t ip_ident;
98480 struct ipv6hdr *ip6h;
98481
98482 udp_len = len + sizeof(*udph);
98483@@ -453,7 +453,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
98484 put_unaligned(0x45, (unsigned char *)iph);
98485 iph->tos = 0;
98486 put_unaligned(htons(ip_len), &(iph->tot_len));
98487- iph->id = htons(atomic_inc_return(&ip_ident));
98488+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
98489 iph->frag_off = 0;
98490 iph->ttl = 64;
98491 iph->protocol = IPPROTO_UDP;
98492diff --git a/net/core/pktgen.c b/net/core/pktgen.c
98493index 0304f98..ddfead6 100644
98494--- a/net/core/pktgen.c
98495+++ b/net/core/pktgen.c
98496@@ -3725,7 +3725,7 @@ static int __net_init pg_net_init(struct net *net)
98497 pn->net = net;
98498 INIT_LIST_HEAD(&pn->pktgen_threads);
98499 pn->pktgen_exiting = false;
98500- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
98501+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
98502 if (!pn->proc_dir) {
98503 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
98504 return -ENODEV;
98505diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
98506index 1999ed8..1e6e58a 100644
98507--- a/net/core/rtnetlink.c
98508+++ b/net/core/rtnetlink.c
98509@@ -58,7 +58,7 @@ struct rtnl_link {
98510 rtnl_doit_func doit;
98511 rtnl_dumpit_func dumpit;
98512 rtnl_calcit_func calcit;
98513-};
98514+} __no_const;
98515
98516 static DEFINE_MUTEX(rtnl_mutex);
98517
98518@@ -299,10 +299,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
98519 if (rtnl_link_ops_get(ops->kind))
98520 return -EEXIST;
98521
98522- if (!ops->dellink)
98523- ops->dellink = unregister_netdevice_queue;
98524+ if (!ops->dellink) {
98525+ pax_open_kernel();
98526+ *(void **)&ops->dellink = unregister_netdevice_queue;
98527+ pax_close_kernel();
98528+ }
98529
98530- list_add_tail(&ops->list, &link_ops);
98531+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
98532 return 0;
98533 }
98534 EXPORT_SYMBOL_GPL(__rtnl_link_register);
98535@@ -349,7 +352,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
98536 for_each_net(net) {
98537 __rtnl_kill_links(net, ops);
98538 }
98539- list_del(&ops->list);
98540+ pax_list_del((struct list_head *)&ops->list);
98541 }
98542 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
98543
98544@@ -1008,7 +1011,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
98545 (dev->ifalias &&
98546 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
98547 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
98548- atomic_read(&dev->carrier_changes)))
98549+ atomic_read_unchecked(&dev->carrier_changes)))
98550 goto nla_put_failure;
98551
98552 if (1) {
98553diff --git a/net/core/scm.c b/net/core/scm.c
98554index b442e7e..6f5b5a2 100644
98555--- a/net/core/scm.c
98556+++ b/net/core/scm.c
98557@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
98558 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
98559 {
98560 struct cmsghdr __user *cm
98561- = (__force struct cmsghdr __user *)msg->msg_control;
98562+ = (struct cmsghdr __force_user *)msg->msg_control;
98563 struct cmsghdr cmhdr;
98564 int cmlen = CMSG_LEN(len);
98565 int err;
98566@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
98567 err = -EFAULT;
98568 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
98569 goto out;
98570- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
98571+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
98572 goto out;
98573 cmlen = CMSG_SPACE(len);
98574 if (msg->msg_controllen < cmlen)
98575@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
98576 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
98577 {
98578 struct cmsghdr __user *cm
98579- = (__force struct cmsghdr __user*)msg->msg_control;
98580+ = (struct cmsghdr __force_user *)msg->msg_control;
98581
98582 int fdmax = 0;
98583 int fdnum = scm->fp->count;
98584@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
98585 if (fdnum < fdmax)
98586 fdmax = fdnum;
98587
98588- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
98589+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
98590 i++, cmfptr++)
98591 {
98592 struct socket *sock;
98593diff --git a/net/core/skbuff.c b/net/core/skbuff.c
98594index 8383b2b..6397efb 100644
98595--- a/net/core/skbuff.c
98596+++ b/net/core/skbuff.c
98597@@ -2003,7 +2003,7 @@ EXPORT_SYMBOL(__skb_checksum);
98598 __wsum skb_checksum(const struct sk_buff *skb, int offset,
98599 int len, __wsum csum)
98600 {
98601- const struct skb_checksum_ops ops = {
98602+ static const struct skb_checksum_ops ops = {
98603 .update = csum_partial_ext,
98604 .combine = csum_block_add_ext,
98605 };
98606@@ -3220,13 +3220,15 @@ void __init skb_init(void)
98607 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
98608 sizeof(struct sk_buff),
98609 0,
98610- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
98611+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
98612+ SLAB_NO_SANITIZE,
98613 NULL);
98614 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
98615 (2*sizeof(struct sk_buff)) +
98616 sizeof(atomic_t),
98617 0,
98618- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
98619+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
98620+ SLAB_NO_SANITIZE,
98621 NULL);
98622 }
98623
98624diff --git a/net/core/sock.c b/net/core/sock.c
98625index 664ee42..aaf9e6e 100644
98626--- a/net/core/sock.c
98627+++ b/net/core/sock.c
98628@@ -442,7 +442,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
98629 struct sk_buff_head *list = &sk->sk_receive_queue;
98630
98631 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
98632- atomic_inc(&sk->sk_drops);
98633+ atomic_inc_unchecked(&sk->sk_drops);
98634 trace_sock_rcvqueue_full(sk, skb);
98635 return -ENOMEM;
98636 }
98637@@ -452,7 +452,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
98638 return err;
98639
98640 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
98641- atomic_inc(&sk->sk_drops);
98642+ atomic_inc_unchecked(&sk->sk_drops);
98643 return -ENOBUFS;
98644 }
98645
98646@@ -472,7 +472,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
98647 skb_dst_force(skb);
98648
98649 spin_lock_irqsave(&list->lock, flags);
98650- skb->dropcount = atomic_read(&sk->sk_drops);
98651+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
98652 __skb_queue_tail(list, skb);
98653 spin_unlock_irqrestore(&list->lock, flags);
98654
98655@@ -492,7 +492,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
98656 skb->dev = NULL;
98657
98658 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
98659- atomic_inc(&sk->sk_drops);
98660+ atomic_inc_unchecked(&sk->sk_drops);
98661 goto discard_and_relse;
98662 }
98663 if (nested)
98664@@ -510,7 +510,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
98665 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
98666 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
98667 bh_unlock_sock(sk);
98668- atomic_inc(&sk->sk_drops);
98669+ atomic_inc_unchecked(&sk->sk_drops);
98670 goto discard_and_relse;
98671 }
98672
98673@@ -998,12 +998,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
98674 struct timeval tm;
98675 } v;
98676
98677- int lv = sizeof(int);
98678- int len;
98679+ unsigned int lv = sizeof(int);
98680+ unsigned int len;
98681
98682 if (get_user(len, optlen))
98683 return -EFAULT;
98684- if (len < 0)
98685+ if (len > INT_MAX)
98686 return -EINVAL;
98687
98688 memset(&v, 0, sizeof(v));
98689@@ -1155,11 +1155,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
98690
98691 case SO_PEERNAME:
98692 {
98693- char address[128];
98694+ char address[_K_SS_MAXSIZE];
98695
98696 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
98697 return -ENOTCONN;
98698- if (lv < len)
98699+ if (lv < len || sizeof address < len)
98700 return -EINVAL;
98701 if (copy_to_user(optval, address, len))
98702 return -EFAULT;
98703@@ -1240,7 +1240,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
98704
98705 if (len > lv)
98706 len = lv;
98707- if (copy_to_user(optval, &v, len))
98708+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
98709 return -EFAULT;
98710 lenout:
98711 if (put_user(len, optlen))
98712@@ -2375,7 +2375,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
98713 */
98714 smp_wmb();
98715 atomic_set(&sk->sk_refcnt, 1);
98716- atomic_set(&sk->sk_drops, 0);
98717+ atomic_set_unchecked(&sk->sk_drops, 0);
98718 }
98719 EXPORT_SYMBOL(sock_init_data);
98720
98721@@ -2503,6 +2503,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
98722 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
98723 int level, int type)
98724 {
98725+ struct sock_extended_err ee;
98726 struct sock_exterr_skb *serr;
98727 struct sk_buff *skb, *skb2;
98728 int copied, err;
98729@@ -2524,7 +2525,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
98730 sock_recv_timestamp(msg, sk, skb);
98731
98732 serr = SKB_EXT_ERR(skb);
98733- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
98734+ ee = serr->ee;
98735+ put_cmsg(msg, level, type, sizeof ee, &ee);
98736
98737 msg->msg_flags |= MSG_ERRQUEUE;
98738 err = copied;
98739diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
98740index a4216a4..1c07687 100644
98741--- a/net/core/sock_diag.c
98742+++ b/net/core/sock_diag.c
98743@@ -9,26 +9,33 @@
98744 #include <linux/inet_diag.h>
98745 #include <linux/sock_diag.h>
98746
98747-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
98748+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
98749 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
98750 static DEFINE_MUTEX(sock_diag_table_mutex);
98751
98752 int sock_diag_check_cookie(void *sk, __u32 *cookie)
98753 {
98754+#ifndef CONFIG_GRKERNSEC_HIDESYM
98755 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
98756 cookie[1] != INET_DIAG_NOCOOKIE) &&
98757 ((u32)(unsigned long)sk != cookie[0] ||
98758 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
98759 return -ESTALE;
98760 else
98761+#endif
98762 return 0;
98763 }
98764 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
98765
98766 void sock_diag_save_cookie(void *sk, __u32 *cookie)
98767 {
98768+#ifdef CONFIG_GRKERNSEC_HIDESYM
98769+ cookie[0] = 0;
98770+ cookie[1] = 0;
98771+#else
98772 cookie[0] = (u32)(unsigned long)sk;
98773 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
98774+#endif
98775 }
98776 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
98777
98778@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
98779 mutex_lock(&sock_diag_table_mutex);
98780 if (sock_diag_handlers[hndl->family])
98781 err = -EBUSY;
98782- else
98783+ else {
98784+ pax_open_kernel();
98785 sock_diag_handlers[hndl->family] = hndl;
98786+ pax_close_kernel();
98787+ }
98788 mutex_unlock(&sock_diag_table_mutex);
98789
98790 return err;
98791@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
98792
98793 mutex_lock(&sock_diag_table_mutex);
98794 BUG_ON(sock_diag_handlers[family] != hnld);
98795+ pax_open_kernel();
98796 sock_diag_handlers[family] = NULL;
98797+ pax_close_kernel();
98798 mutex_unlock(&sock_diag_table_mutex);
98799 }
98800 EXPORT_SYMBOL_GPL(sock_diag_unregister);
98801diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
98802index cf9cd13..8b56af3 100644
98803--- a/net/core/sysctl_net_core.c
98804+++ b/net/core/sysctl_net_core.c
98805@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
98806 {
98807 unsigned int orig_size, size;
98808 int ret, i;
98809- struct ctl_table tmp = {
98810+ ctl_table_no_const tmp = {
98811 .data = &size,
98812 .maxlen = sizeof(size),
98813 .mode = table->mode
98814@@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
98815 void __user *buffer, size_t *lenp, loff_t *ppos)
98816 {
98817 char id[IFNAMSIZ];
98818- struct ctl_table tbl = {
98819+ ctl_table_no_const tbl = {
98820 .data = id,
98821 .maxlen = IFNAMSIZ,
98822 };
98823@@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
98824
98825 static __net_init int sysctl_core_net_init(struct net *net)
98826 {
98827- struct ctl_table *tbl;
98828+ ctl_table_no_const *tbl = NULL;
98829
98830 net->core.sysctl_somaxconn = SOMAXCONN;
98831
98832- tbl = netns_core_table;
98833 if (!net_eq(net, &init_net)) {
98834- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
98835+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
98836 if (tbl == NULL)
98837 goto err_dup;
98838
98839@@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
98840 if (net->user_ns != &init_user_ns) {
98841 tbl[0].procname = NULL;
98842 }
98843- }
98844-
98845- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
98846+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
98847+ } else
98848+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
98849 if (net->core.sysctl_hdr == NULL)
98850 goto err_reg;
98851
98852 return 0;
98853
98854 err_reg:
98855- if (tbl != netns_core_table)
98856- kfree(tbl);
98857+ kfree(tbl);
98858 err_dup:
98859 return -ENOMEM;
98860 }
98861@@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
98862 kfree(tbl);
98863 }
98864
98865-static __net_initdata struct pernet_operations sysctl_core_ops = {
98866+static __net_initconst struct pernet_operations sysctl_core_ops = {
98867 .init = sysctl_core_net_init,
98868 .exit = sysctl_core_net_exit,
98869 };
98870diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
98871index 4c04848..f575934 100644
98872--- a/net/decnet/af_decnet.c
98873+++ b/net/decnet/af_decnet.c
98874@@ -465,6 +465,7 @@ static struct proto dn_proto = {
98875 .sysctl_rmem = sysctl_decnet_rmem,
98876 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
98877 .obj_size = sizeof(struct dn_sock),
98878+ .slab_flags = SLAB_USERCOPY,
98879 };
98880
98881 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
98882diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
98883index 3b726f3..1af6368 100644
98884--- a/net/decnet/dn_dev.c
98885+++ b/net/decnet/dn_dev.c
98886@@ -200,7 +200,7 @@ static struct dn_dev_sysctl_table {
98887 .extra1 = &min_t3,
98888 .extra2 = &max_t3
98889 },
98890- {0}
98891+ { }
98892 },
98893 };
98894
98895diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
98896index 5325b54..a0d4d69 100644
98897--- a/net/decnet/sysctl_net_decnet.c
98898+++ b/net/decnet/sysctl_net_decnet.c
98899@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
98900
98901 if (len > *lenp) len = *lenp;
98902
98903- if (copy_to_user(buffer, addr, len))
98904+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
98905 return -EFAULT;
98906
98907 *lenp = len;
98908@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
98909
98910 if (len > *lenp) len = *lenp;
98911
98912- if (copy_to_user(buffer, devname, len))
98913+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
98914 return -EFAULT;
98915
98916 *lenp = len;
98917diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
98918index ef2d543..5b9b73f 100644
98919--- a/net/ieee802154/reassembly.c
98920+++ b/net/ieee802154/reassembly.c
98921@@ -434,12 +434,11 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
98922
98923 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
98924 {
98925- struct ctl_table *table;
98926+ ctl_table_no_const *table = NULL;
98927 struct ctl_table_header *hdr;
98928
98929- table = lowpan_frags_ns_ctl_table;
98930 if (!net_eq(net, &init_net)) {
98931- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
98932+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
98933 GFP_KERNEL);
98934 if (table == NULL)
98935 goto err_alloc;
98936@@ -452,9 +451,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
98937 /* Don't export sysctls to unprivileged users */
98938 if (net->user_ns != &init_user_ns)
98939 table[0].procname = NULL;
98940- }
98941-
98942- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
98943+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
98944+ } else
98945+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
98946 if (hdr == NULL)
98947 goto err_reg;
98948
98949@@ -462,8 +461,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
98950 return 0;
98951
98952 err_reg:
98953- if (!net_eq(net, &init_net))
98954- kfree(table);
98955+ kfree(table);
98956 err_alloc:
98957 return -ENOMEM;
98958 }
98959diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
98960index 6d6dd34..e5c9bec 100644
98961--- a/net/ipv4/af_inet.c
98962+++ b/net/ipv4/af_inet.c
98963@@ -1736,13 +1736,9 @@ static int __init inet_init(void)
98964
98965 BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
98966
98967- sysctl_local_reserved_ports = kzalloc(65536 / 8, GFP_KERNEL);
98968- if (!sysctl_local_reserved_ports)
98969- goto out;
98970-
98971 rc = proto_register(&tcp_prot, 1);
98972 if (rc)
98973- goto out_free_reserved_ports;
98974+ goto out;
98975
98976 rc = proto_register(&udp_prot, 1);
98977 if (rc)
98978@@ -1852,8 +1848,6 @@ out_unregister_udp_proto:
98979 proto_unregister(&udp_prot);
98980 out_unregister_tcp_proto:
98981 proto_unregister(&tcp_prot);
98982-out_free_reserved_ports:
98983- kfree(sysctl_local_reserved_ports);
98984 goto out;
98985 }
98986
98987diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
98988index bdbf68b..deb4759 100644
98989--- a/net/ipv4/devinet.c
98990+++ b/net/ipv4/devinet.c
98991@@ -1543,7 +1543,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
98992 idx = 0;
98993 head = &net->dev_index_head[h];
98994 rcu_read_lock();
98995- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
98996+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
98997 net->dev_base_seq;
98998 hlist_for_each_entry_rcu(dev, head, index_hlist) {
98999 if (idx < s_idx)
99000@@ -1861,7 +1861,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
99001 idx = 0;
99002 head = &net->dev_index_head[h];
99003 rcu_read_lock();
99004- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
99005+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
99006 net->dev_base_seq;
99007 hlist_for_each_entry_rcu(dev, head, index_hlist) {
99008 if (idx < s_idx)
99009@@ -2096,7 +2096,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
99010 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
99011 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
99012
99013-static struct devinet_sysctl_table {
99014+static const struct devinet_sysctl_table {
99015 struct ctl_table_header *sysctl_header;
99016 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
99017 } devinet_sysctl = {
99018@@ -2218,7 +2218,7 @@ static __net_init int devinet_init_net(struct net *net)
99019 int err;
99020 struct ipv4_devconf *all, *dflt;
99021 #ifdef CONFIG_SYSCTL
99022- struct ctl_table *tbl = ctl_forward_entry;
99023+ ctl_table_no_const *tbl = NULL;
99024 struct ctl_table_header *forw_hdr;
99025 #endif
99026
99027@@ -2236,7 +2236,7 @@ static __net_init int devinet_init_net(struct net *net)
99028 goto err_alloc_dflt;
99029
99030 #ifdef CONFIG_SYSCTL
99031- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
99032+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
99033 if (tbl == NULL)
99034 goto err_alloc_ctl;
99035
99036@@ -2256,7 +2256,10 @@ static __net_init int devinet_init_net(struct net *net)
99037 goto err_reg_dflt;
99038
99039 err = -ENOMEM;
99040- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
99041+ if (!net_eq(net, &init_net))
99042+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
99043+ else
99044+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
99045 if (forw_hdr == NULL)
99046 goto err_reg_ctl;
99047 net->ipv4.forw_hdr = forw_hdr;
99048@@ -2272,8 +2275,7 @@ err_reg_ctl:
99049 err_reg_dflt:
99050 __devinet_sysctl_unregister(all);
99051 err_reg_all:
99052- if (tbl != ctl_forward_entry)
99053- kfree(tbl);
99054+ kfree(tbl);
99055 err_alloc_ctl:
99056 #endif
99057 if (dflt != &ipv4_devconf_dflt)
99058diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
99059index 255aa99..45c78f8 100644
99060--- a/net/ipv4/fib_frontend.c
99061+++ b/net/ipv4/fib_frontend.c
99062@@ -1015,12 +1015,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
99063 #ifdef CONFIG_IP_ROUTE_MULTIPATH
99064 fib_sync_up(dev);
99065 #endif
99066- atomic_inc(&net->ipv4.dev_addr_genid);
99067+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
99068 rt_cache_flush(dev_net(dev));
99069 break;
99070 case NETDEV_DOWN:
99071 fib_del_ifaddr(ifa, NULL);
99072- atomic_inc(&net->ipv4.dev_addr_genid);
99073+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
99074 if (ifa->ifa_dev->ifa_list == NULL) {
99075 /* Last address was deleted from this interface.
99076 * Disable IP.
99077@@ -1058,7 +1058,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
99078 #ifdef CONFIG_IP_ROUTE_MULTIPATH
99079 fib_sync_up(dev);
99080 #endif
99081- atomic_inc(&net->ipv4.dev_addr_genid);
99082+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
99083 rt_cache_flush(net);
99084 break;
99085 case NETDEV_DOWN:
99086diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
99087index b10cd43a..22327f9 100644
99088--- a/net/ipv4/fib_semantics.c
99089+++ b/net/ipv4/fib_semantics.c
99090@@ -768,7 +768,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
99091 nh->nh_saddr = inet_select_addr(nh->nh_dev,
99092 nh->nh_gw,
99093 nh->nh_parent->fib_scope);
99094- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
99095+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
99096
99097 return nh->nh_saddr;
99098 }
99099diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
99100index a56b8e6..5be2a30 100644
99101--- a/net/ipv4/inet_connection_sock.c
99102+++ b/net/ipv4/inet_connection_sock.c
99103@@ -29,7 +29,7 @@ const char inet_csk_timer_bug_msg[] = "inet_csk BUG: unknown timer value\n";
99104 EXPORT_SYMBOL(inet_csk_timer_bug_msg);
99105 #endif
99106
99107-unsigned long *sysctl_local_reserved_ports;
99108+unsigned long sysctl_local_reserved_ports[65536 / 8 / sizeof(unsigned long)];
99109 EXPORT_SYMBOL(sysctl_local_reserved_ports);
99110
99111 void inet_get_local_port_range(struct net *net, int *low, int *high)
99112diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
99113index 8b9cf27..0d8d592 100644
99114--- a/net/ipv4/inet_hashtables.c
99115+++ b/net/ipv4/inet_hashtables.c
99116@@ -18,6 +18,7 @@
99117 #include <linux/sched.h>
99118 #include <linux/slab.h>
99119 #include <linux/wait.h>
99120+#include <linux/security.h>
99121
99122 #include <net/inet_connection_sock.h>
99123 #include <net/inet_hashtables.h>
99124@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
99125 return inet_ehashfn(net, laddr, lport, faddr, fport);
99126 }
99127
99128+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
99129+
99130 /*
99131 * Allocate and initialize a new local port bind bucket.
99132 * The bindhash mutex for snum's hash chain must be held here.
99133@@ -554,6 +557,8 @@ ok:
99134 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
99135 spin_unlock(&head->lock);
99136
99137+ gr_update_task_in_ip_table(current, inet_sk(sk));
99138+
99139 if (tw) {
99140 inet_twsk_deschedule(tw, death_row);
99141 while (twrefcnt) {
99142diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
99143index 48f4244..f56d83a 100644
99144--- a/net/ipv4/inetpeer.c
99145+++ b/net/ipv4/inetpeer.c
99146@@ -496,8 +496,8 @@ relookup:
99147 if (p) {
99148 p->daddr = *daddr;
99149 atomic_set(&p->refcnt, 1);
99150- atomic_set(&p->rid, 0);
99151- atomic_set(&p->ip_id_count,
99152+ atomic_set_unchecked(&p->rid, 0);
99153+ atomic_set_unchecked(&p->ip_id_count,
99154 (daddr->family == AF_INET) ?
99155 secure_ip_id(daddr->addr.a4) :
99156 secure_ipv6_id(daddr->addr.a6));
99157diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
99158index ed32313..3762abe 100644
99159--- a/net/ipv4/ip_fragment.c
99160+++ b/net/ipv4/ip_fragment.c
99161@@ -284,7 +284,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
99162 return 0;
99163
99164 start = qp->rid;
99165- end = atomic_inc_return(&peer->rid);
99166+ end = atomic_inc_return_unchecked(&peer->rid);
99167 qp->rid = end;
99168
99169 rc = qp->q.fragments && (end - start) > max;
99170@@ -761,12 +761,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
99171
99172 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
99173 {
99174- struct ctl_table *table;
99175+ ctl_table_no_const *table = NULL;
99176 struct ctl_table_header *hdr;
99177
99178- table = ip4_frags_ns_ctl_table;
99179 if (!net_eq(net, &init_net)) {
99180- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
99181+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
99182 if (table == NULL)
99183 goto err_alloc;
99184
99185@@ -777,9 +776,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
99186 /* Don't export sysctls to unprivileged users */
99187 if (net->user_ns != &init_user_ns)
99188 table[0].procname = NULL;
99189- }
99190+ hdr = register_net_sysctl(net, "net/ipv4", table);
99191+ } else
99192+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
99193
99194- hdr = register_net_sysctl(net, "net/ipv4", table);
99195 if (hdr == NULL)
99196 goto err_reg;
99197
99198@@ -787,8 +787,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
99199 return 0;
99200
99201 err_reg:
99202- if (!net_eq(net, &init_net))
99203- kfree(table);
99204+ kfree(table);
99205 err_alloc:
99206 return -ENOMEM;
99207 }
99208diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
99209index 94213c8..8bdb342 100644
99210--- a/net/ipv4/ip_gre.c
99211+++ b/net/ipv4/ip_gre.c
99212@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
99213 module_param(log_ecn_error, bool, 0644);
99214 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
99215
99216-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
99217+static struct rtnl_link_ops ipgre_link_ops;
99218 static int ipgre_tunnel_init(struct net_device *dev);
99219
99220 static int ipgre_net_id __read_mostly;
99221@@ -732,7 +732,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
99222 [IFLA_GRE_PMTUDISC] = { .type = NLA_U8 },
99223 };
99224
99225-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
99226+static struct rtnl_link_ops ipgre_link_ops = {
99227 .kind = "gre",
99228 .maxtype = IFLA_GRE_MAX,
99229 .policy = ipgre_policy,
99230@@ -746,7 +746,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
99231 .fill_info = ipgre_fill_info,
99232 };
99233
99234-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
99235+static struct rtnl_link_ops ipgre_tap_ops = {
99236 .kind = "gretap",
99237 .maxtype = IFLA_GRE_MAX,
99238 .policy = ipgre_policy,
99239diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
99240index 64741b9..6f334a2 100644
99241--- a/net/ipv4/ip_sockglue.c
99242+++ b/net/ipv4/ip_sockglue.c
99243@@ -1188,7 +1188,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
99244 len = min_t(unsigned int, len, opt->optlen);
99245 if (put_user(len, optlen))
99246 return -EFAULT;
99247- if (copy_to_user(optval, opt->__data, len))
99248+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
99249+ copy_to_user(optval, opt->__data, len))
99250 return -EFAULT;
99251 return 0;
99252 }
99253@@ -1319,7 +1320,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
99254 if (sk->sk_type != SOCK_STREAM)
99255 return -ENOPROTOOPT;
99256
99257- msg.msg_control = optval;
99258+ msg.msg_control = (void __force_kernel *)optval;
99259 msg.msg_controllen = len;
99260 msg.msg_flags = flags;
99261
99262diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
99263index 2acc233..b93143f 100644
99264--- a/net/ipv4/ip_tunnel.c
99265+++ b/net/ipv4/ip_tunnel.c
99266@@ -73,12 +73,7 @@ static void __tunnel_dst_set(struct ip_tunnel_dst *idst,
99267 {
99268 struct dst_entry *old_dst;
99269
99270- if (dst) {
99271- if (dst->flags & DST_NOCACHE)
99272- dst = NULL;
99273- else
99274- dst_clone(dst);
99275- }
99276+ dst_clone(dst);
99277 old_dst = xchg((__force struct dst_entry **)&idst->dst, dst);
99278 dst_release(old_dst);
99279 }
99280@@ -108,13 +103,14 @@ static struct rtable *tunnel_rtable_get(struct ip_tunnel *t, u32 cookie)
99281
99282 rcu_read_lock();
99283 dst = rcu_dereference(this_cpu_ptr(t->dst_cache)->dst);
99284+ if (dst && !atomic_inc_not_zero(&dst->__refcnt))
99285+ dst = NULL;
99286 if (dst) {
99287 if (dst->obsolete && dst->ops->check(dst, cookie) == NULL) {
99288- rcu_read_unlock();
99289 tunnel_dst_reset(t);
99290- return NULL;
99291+ dst_release(dst);
99292+ dst = NULL;
99293 }
99294- dst_hold(dst);
99295 }
99296 rcu_read_unlock();
99297 return (struct rtable *)dst;
99298diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
99299index 13ef00f..8ffca25 100644
99300--- a/net/ipv4/ip_vti.c
99301+++ b/net/ipv4/ip_vti.c
99302@@ -45,7 +45,7 @@
99303 #include <net/net_namespace.h>
99304 #include <net/netns/generic.h>
99305
99306-static struct rtnl_link_ops vti_link_ops __read_mostly;
99307+static struct rtnl_link_ops vti_link_ops;
99308
99309 static int vti_net_id __read_mostly;
99310 static int vti_tunnel_init(struct net_device *dev);
99311@@ -513,7 +513,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
99312 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
99313 };
99314
99315-static struct rtnl_link_ops vti_link_ops __read_mostly = {
99316+static struct rtnl_link_ops vti_link_ops = {
99317 .kind = "vti",
99318 .maxtype = IFLA_VTI_MAX,
99319 .policy = vti_policy,
99320diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
99321index b3e86ea..18ce98c 100644
99322--- a/net/ipv4/ipconfig.c
99323+++ b/net/ipv4/ipconfig.c
99324@@ -334,7 +334,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
99325
99326 mm_segment_t oldfs = get_fs();
99327 set_fs(get_ds());
99328- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
99329+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
99330 set_fs(oldfs);
99331 return res;
99332 }
99333@@ -345,7 +345,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
99334
99335 mm_segment_t oldfs = get_fs();
99336 set_fs(get_ds());
99337- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
99338+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
99339 set_fs(oldfs);
99340 return res;
99341 }
99342@@ -356,7 +356,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
99343
99344 mm_segment_t oldfs = get_fs();
99345 set_fs(get_ds());
99346- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
99347+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
99348 set_fs(oldfs);
99349 return res;
99350 }
99351diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
99352index 62eaa00..29b2dc2 100644
99353--- a/net/ipv4/ipip.c
99354+++ b/net/ipv4/ipip.c
99355@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
99356 static int ipip_net_id __read_mostly;
99357
99358 static int ipip_tunnel_init(struct net_device *dev);
99359-static struct rtnl_link_ops ipip_link_ops __read_mostly;
99360+static struct rtnl_link_ops ipip_link_ops;
99361
99362 static int ipip_err(struct sk_buff *skb, u32 info)
99363 {
99364@@ -409,7 +409,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
99365 [IFLA_IPTUN_PMTUDISC] = { .type = NLA_U8 },
99366 };
99367
99368-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
99369+static struct rtnl_link_ops ipip_link_ops = {
99370 .kind = "ipip",
99371 .maxtype = IFLA_IPTUN_MAX,
99372 .policy = ipip_policy,
99373diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
99374index f95b6f9..2ee2097 100644
99375--- a/net/ipv4/netfilter/arp_tables.c
99376+++ b/net/ipv4/netfilter/arp_tables.c
99377@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
99378 #endif
99379
99380 static int get_info(struct net *net, void __user *user,
99381- const int *len, int compat)
99382+ int len, int compat)
99383 {
99384 char name[XT_TABLE_MAXNAMELEN];
99385 struct xt_table *t;
99386 int ret;
99387
99388- if (*len != sizeof(struct arpt_getinfo)) {
99389- duprintf("length %u != %Zu\n", *len,
99390+ if (len != sizeof(struct arpt_getinfo)) {
99391+ duprintf("length %u != %Zu\n", len,
99392 sizeof(struct arpt_getinfo));
99393 return -EINVAL;
99394 }
99395@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
99396 info.size = private->size;
99397 strcpy(info.name, name);
99398
99399- if (copy_to_user(user, &info, *len) != 0)
99400+ if (copy_to_user(user, &info, len) != 0)
99401 ret = -EFAULT;
99402 else
99403 ret = 0;
99404@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
99405
99406 switch (cmd) {
99407 case ARPT_SO_GET_INFO:
99408- ret = get_info(sock_net(sk), user, len, 1);
99409+ ret = get_info(sock_net(sk), user, *len, 1);
99410 break;
99411 case ARPT_SO_GET_ENTRIES:
99412 ret = compat_get_entries(sock_net(sk), user, len);
99413@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
99414
99415 switch (cmd) {
99416 case ARPT_SO_GET_INFO:
99417- ret = get_info(sock_net(sk), user, len, 0);
99418+ ret = get_info(sock_net(sk), user, *len, 0);
99419 break;
99420
99421 case ARPT_SO_GET_ENTRIES:
99422diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
99423index 99e810f..3711b81 100644
99424--- a/net/ipv4/netfilter/ip_tables.c
99425+++ b/net/ipv4/netfilter/ip_tables.c
99426@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
99427 #endif
99428
99429 static int get_info(struct net *net, void __user *user,
99430- const int *len, int compat)
99431+ int len, int compat)
99432 {
99433 char name[XT_TABLE_MAXNAMELEN];
99434 struct xt_table *t;
99435 int ret;
99436
99437- if (*len != sizeof(struct ipt_getinfo)) {
99438- duprintf("length %u != %zu\n", *len,
99439+ if (len != sizeof(struct ipt_getinfo)) {
99440+ duprintf("length %u != %zu\n", len,
99441 sizeof(struct ipt_getinfo));
99442 return -EINVAL;
99443 }
99444@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
99445 info.size = private->size;
99446 strcpy(info.name, name);
99447
99448- if (copy_to_user(user, &info, *len) != 0)
99449+ if (copy_to_user(user, &info, len) != 0)
99450 ret = -EFAULT;
99451 else
99452 ret = 0;
99453@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
99454
99455 switch (cmd) {
99456 case IPT_SO_GET_INFO:
99457- ret = get_info(sock_net(sk), user, len, 1);
99458+ ret = get_info(sock_net(sk), user, *len, 1);
99459 break;
99460 case IPT_SO_GET_ENTRIES:
99461 ret = compat_get_entries(sock_net(sk), user, len);
99462@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
99463
99464 switch (cmd) {
99465 case IPT_SO_GET_INFO:
99466- ret = get_info(sock_net(sk), user, len, 0);
99467+ ret = get_info(sock_net(sk), user, *len, 0);
99468 break;
99469
99470 case IPT_SO_GET_ENTRIES:
99471diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
99472index 2510c02..cfb34fa 100644
99473--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
99474+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
99475@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
99476 spin_lock_init(&cn->lock);
99477
99478 #ifdef CONFIG_PROC_FS
99479- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
99480+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
99481 if (!cn->procdir) {
99482 pr_err("Unable to proc dir entry\n");
99483 return -ENOMEM;
99484diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
99485index 044a0dd..e0c1971 100644
99486--- a/net/ipv4/ping.c
99487+++ b/net/ipv4/ping.c
99488@@ -59,7 +59,7 @@ struct ping_table {
99489 };
99490
99491 static struct ping_table ping_table;
99492-struct pingv6_ops pingv6_ops;
99493+struct pingv6_ops *pingv6_ops;
99494 EXPORT_SYMBOL_GPL(pingv6_ops);
99495
99496 static u16 ping_port_rover;
99497@@ -348,7 +348,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
99498 return -ENODEV;
99499 }
99500 }
99501- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
99502+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
99503 scoped);
99504 rcu_read_unlock();
99505
99506@@ -556,7 +556,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
99507 }
99508 #if IS_ENABLED(CONFIG_IPV6)
99509 } else if (skb->protocol == htons(ETH_P_IPV6)) {
99510- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
99511+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
99512 #endif
99513 }
99514
99515@@ -574,7 +574,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
99516 info, (u8 *)icmph);
99517 #if IS_ENABLED(CONFIG_IPV6)
99518 } else if (family == AF_INET6) {
99519- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
99520+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
99521 info, (u8 *)icmph);
99522 #endif
99523 }
99524@@ -844,6 +844,8 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99525 {
99526 struct inet_sock *isk = inet_sk(sk);
99527 int family = sk->sk_family;
99528+ struct sockaddr_in *sin;
99529+ struct sockaddr_in6 *sin6;
99530 struct sk_buff *skb;
99531 int copied, err;
99532
99533@@ -853,12 +855,19 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99534 if (flags & MSG_OOB)
99535 goto out;
99536
99537+ if (addr_len) {
99538+ if (family == AF_INET)
99539+ *addr_len = sizeof(*sin);
99540+ else if (family == AF_INET6 && addr_len)
99541+ *addr_len = sizeof(*sin6);
99542+ }
99543+
99544 if (flags & MSG_ERRQUEUE) {
99545 if (family == AF_INET) {
99546 return ip_recv_error(sk, msg, len, addr_len);
99547 #if IS_ENABLED(CONFIG_IPV6)
99548 } else if (family == AF_INET6) {
99549- return pingv6_ops.ipv6_recv_error(sk, msg, len,
99550+ return pingv6_ops->ipv6_recv_error(sk, msg, len,
99551 addr_len);
99552 #endif
99553 }
99554@@ -890,7 +899,6 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99555 sin->sin_port = 0 /* skb->h.uh->source */;
99556 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
99557 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
99558- *addr_len = sizeof(*sin);
99559 }
99560
99561 if (isk->cmsg_flags)
99562@@ -912,14 +920,13 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99563 sin6->sin6_scope_id =
99564 ipv6_iface_scope_id(&sin6->sin6_addr,
99565 IP6CB(skb)->iif);
99566- *addr_len = sizeof(*sin6);
99567 }
99568
99569 if (inet6_sk(sk)->rxopt.all)
99570- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
99571+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
99572 if (skb->protocol == htons(ETH_P_IPV6) &&
99573 inet6_sk(sk)->rxopt.all)
99574- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
99575+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
99576 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
99577 ip_cmsg_recv(msg, skb);
99578 #endif
99579@@ -1111,7 +1118,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
99580 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
99581 0, sock_i_ino(sp),
99582 atomic_read(&sp->sk_refcnt), sp,
99583- atomic_read(&sp->sk_drops));
99584+ atomic_read_unchecked(&sp->sk_drops));
99585 }
99586
99587 static int ping_v4_seq_show(struct seq_file *seq, void *v)
99588diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
99589index a9dbe58..46f577f 100644
99590--- a/net/ipv4/raw.c
99591+++ b/net/ipv4/raw.c
99592@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
99593 int raw_rcv(struct sock *sk, struct sk_buff *skb)
99594 {
99595 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
99596- atomic_inc(&sk->sk_drops);
99597+ atomic_inc_unchecked(&sk->sk_drops);
99598 kfree_skb(skb);
99599 return NET_RX_DROP;
99600 }
99601@@ -696,6 +696,9 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99602 if (flags & MSG_OOB)
99603 goto out;
99604
99605+ if (addr_len)
99606+ *addr_len = sizeof(*sin);
99607+
99608 if (flags & MSG_ERRQUEUE) {
99609 err = ip_recv_error(sk, msg, len, addr_len);
99610 goto out;
99611@@ -723,7 +726,6 @@ static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
99612 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
99613 sin->sin_port = 0;
99614 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
99615- *addr_len = sizeof(*sin);
99616 }
99617 if (inet->cmsg_flags)
99618 ip_cmsg_recv(msg, skb);
99619@@ -748,16 +750,20 @@ static int raw_init(struct sock *sk)
99620
99621 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
99622 {
99623+ struct icmp_filter filter;
99624+
99625 if (optlen > sizeof(struct icmp_filter))
99626 optlen = sizeof(struct icmp_filter);
99627- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
99628+ if (copy_from_user(&filter, optval, optlen))
99629 return -EFAULT;
99630+ raw_sk(sk)->filter = filter;
99631 return 0;
99632 }
99633
99634 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
99635 {
99636 int len, ret = -EFAULT;
99637+ struct icmp_filter filter;
99638
99639 if (get_user(len, optlen))
99640 goto out;
99641@@ -767,8 +773,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
99642 if (len > sizeof(struct icmp_filter))
99643 len = sizeof(struct icmp_filter);
99644 ret = -EFAULT;
99645- if (put_user(len, optlen) ||
99646- copy_to_user(optval, &raw_sk(sk)->filter, len))
99647+ filter = raw_sk(sk)->filter;
99648+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
99649 goto out;
99650 ret = 0;
99651 out: return ret;
99652@@ -997,7 +1003,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
99653 0, 0L, 0,
99654 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
99655 0, sock_i_ino(sp),
99656- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
99657+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
99658 }
99659
99660 static int raw_seq_show(struct seq_file *seq, void *v)
99661diff --git a/net/ipv4/route.c b/net/ipv4/route.c
99662index 5e676be..f6c62f1 100644
99663--- a/net/ipv4/route.c
99664+++ b/net/ipv4/route.c
99665@@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
99666
99667 static int rt_cache_seq_open(struct inode *inode, struct file *file)
99668 {
99669- return seq_open(file, &rt_cache_seq_ops);
99670+ return seq_open_restrict(file, &rt_cache_seq_ops);
99671 }
99672
99673 static const struct file_operations rt_cache_seq_fops = {
99674@@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
99675
99676 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
99677 {
99678- return seq_open(file, &rt_cpu_seq_ops);
99679+ return seq_open_restrict(file, &rt_cpu_seq_ops);
99680 }
99681
99682 static const struct file_operations rt_cpu_seq_fops = {
99683@@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
99684
99685 static int rt_acct_proc_open(struct inode *inode, struct file *file)
99686 {
99687- return single_open(file, rt_acct_proc_show, NULL);
99688+ return single_open_restrict(file, rt_acct_proc_show, NULL);
99689 }
99690
99691 static const struct file_operations rt_acct_proc_fops = {
99692@@ -2610,34 +2610,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
99693 .maxlen = sizeof(int),
99694 .mode = 0200,
99695 .proc_handler = ipv4_sysctl_rtcache_flush,
99696+ .extra1 = &init_net,
99697 },
99698 { },
99699 };
99700
99701 static __net_init int sysctl_route_net_init(struct net *net)
99702 {
99703- struct ctl_table *tbl;
99704+ ctl_table_no_const *tbl = NULL;
99705
99706- tbl = ipv4_route_flush_table;
99707 if (!net_eq(net, &init_net)) {
99708- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
99709+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
99710 if (tbl == NULL)
99711 goto err_dup;
99712
99713 /* Don't export sysctls to unprivileged users */
99714 if (net->user_ns != &init_user_ns)
99715 tbl[0].procname = NULL;
99716- }
99717- tbl[0].extra1 = net;
99718+ tbl[0].extra1 = net;
99719+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
99720+ } else
99721+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
99722
99723- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
99724 if (net->ipv4.route_hdr == NULL)
99725 goto err_reg;
99726 return 0;
99727
99728 err_reg:
99729- if (tbl != ipv4_route_flush_table)
99730- kfree(tbl);
99731+ kfree(tbl);
99732 err_dup:
99733 return -ENOMEM;
99734 }
99735@@ -2660,8 +2660,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
99736
99737 static __net_init int rt_genid_init(struct net *net)
99738 {
99739- atomic_set(&net->ipv4.rt_genid, 0);
99740- atomic_set(&net->fnhe_genid, 0);
99741+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
99742+ atomic_set_unchecked(&net->fnhe_genid, 0);
99743 get_random_bytes(&net->ipv4.dev_addr_genid,
99744 sizeof(net->ipv4.dev_addr_genid));
99745 return 0;
99746diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
99747index 5cde8f2..5f5684e 100644
99748--- a/net/ipv4/sysctl_net_ipv4.c
99749+++ b/net/ipv4/sysctl_net_ipv4.c
99750@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
99751 container_of(table->data, struct net, ipv4.ip_local_ports.range);
99752 int ret;
99753 int range[2];
99754- struct ctl_table tmp = {
99755+ ctl_table_no_const tmp = {
99756 .data = &range,
99757 .maxlen = sizeof(range),
99758 .mode = table->mode,
99759@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
99760 int ret;
99761 gid_t urange[2];
99762 kgid_t low, high;
99763- struct ctl_table tmp = {
99764+ ctl_table_no_const tmp = {
99765 .data = &urange,
99766 .maxlen = sizeof(urange),
99767 .mode = table->mode,
99768@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
99769 void __user *buffer, size_t *lenp, loff_t *ppos)
99770 {
99771 char val[TCP_CA_NAME_MAX];
99772- struct ctl_table tbl = {
99773+ ctl_table_no_const tbl = {
99774 .data = val,
99775 .maxlen = TCP_CA_NAME_MAX,
99776 };
99777@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
99778 void __user *buffer, size_t *lenp,
99779 loff_t *ppos)
99780 {
99781- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
99782+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
99783 int ret;
99784
99785 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
99786@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
99787 void __user *buffer, size_t *lenp,
99788 loff_t *ppos)
99789 {
99790- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
99791+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
99792 int ret;
99793
99794 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
99795@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
99796 void __user *buffer, size_t *lenp,
99797 loff_t *ppos)
99798 {
99799- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
99800+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
99801 struct tcp_fastopen_context *ctxt;
99802 int ret;
99803 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
99804@@ -438,7 +438,7 @@ static struct ctl_table ipv4_table[] = {
99805 },
99806 {
99807 .procname = "ip_local_reserved_ports",
99808- .data = NULL, /* initialized in sysctl_ipv4_init */
99809+ .data = sysctl_local_reserved_ports,
99810 .maxlen = 65536,
99811 .mode = 0644,
99812 .proc_handler = proc_do_large_bitmap,
99813@@ -843,13 +843,12 @@ static struct ctl_table ipv4_net_table[] = {
99814
99815 static __net_init int ipv4_sysctl_init_net(struct net *net)
99816 {
99817- struct ctl_table *table;
99818+ ctl_table_no_const *table = NULL;
99819
99820- table = ipv4_net_table;
99821 if (!net_eq(net, &init_net)) {
99822 int i;
99823
99824- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
99825+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
99826 if (table == NULL)
99827 goto err_alloc;
99828
99829@@ -858,15 +857,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
99830 table[i].data += (void *)net - (void *)&init_net;
99831 }
99832
99833- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
99834+ if (!net_eq(net, &init_net))
99835+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
99836+ else
99837+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
99838 if (net->ipv4.ipv4_hdr == NULL)
99839 goto err_reg;
99840
99841 return 0;
99842
99843 err_reg:
99844- if (!net_eq(net, &init_net))
99845- kfree(table);
99846+ kfree(table);
99847 err_alloc:
99848 return -ENOMEM;
99849 }
99850@@ -888,16 +889,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
99851 static __init int sysctl_ipv4_init(void)
99852 {
99853 struct ctl_table_header *hdr;
99854- struct ctl_table *i;
99855-
99856- for (i = ipv4_table; i->procname; i++) {
99857- if (strcmp(i->procname, "ip_local_reserved_ports") == 0) {
99858- i->data = sysctl_local_reserved_ports;
99859- break;
99860- }
99861- }
99862- if (!i->procname)
99863- return -EINVAL;
99864
99865 hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
99866 if (hdr == NULL)
99867diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
99868index 3a26b3b..8bbe4ae 100644
99869--- a/net/ipv4/tcp_input.c
99870+++ b/net/ipv4/tcp_input.c
99871@@ -754,7 +754,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
99872 * without any lock. We want to make sure compiler wont store
99873 * intermediate values in this location.
99874 */
99875- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
99876+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
99877 sk->sk_max_pacing_rate);
99878 }
99879
99880@@ -4478,7 +4478,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
99881 * simplifies code)
99882 */
99883 static void
99884-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
99885+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
99886 struct sk_buff *head, struct sk_buff *tail,
99887 u32 start, u32 end)
99888 {
99889@@ -5558,6 +5558,7 @@ discard:
99890 tcp_paws_reject(&tp->rx_opt, 0))
99891 goto discard_and_undo;
99892
99893+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
99894 if (th->syn) {
99895 /* We see SYN without ACK. It is attempt of
99896 * simultaneous connect with crossed SYNs.
99897@@ -5608,6 +5609,7 @@ discard:
99898 goto discard;
99899 #endif
99900 }
99901+#endif
99902 /* "fifth, if neither of the SYN or RST bits is set then
99903 * drop the segment and return."
99904 */
99905@@ -5654,7 +5656,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
99906 goto discard;
99907
99908 if (th->syn) {
99909- if (th->fin)
99910+ if (th->fin || th->urg || th->psh)
99911 goto discard;
99912 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
99913 return 1;
99914diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
99915index 438f3b9..bc9e1ad 100644
99916--- a/net/ipv4/tcp_ipv4.c
99917+++ b/net/ipv4/tcp_ipv4.c
99918@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
99919 EXPORT_SYMBOL(sysctl_tcp_low_latency);
99920
99921
99922+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99923+extern int grsec_enable_blackhole;
99924+#endif
99925+
99926 #ifdef CONFIG_TCP_MD5SIG
99927 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
99928 __be32 daddr, __be32 saddr, const struct tcphdr *th);
99929@@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
99930 return 0;
99931
99932 reset:
99933+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99934+ if (!grsec_enable_blackhole)
99935+#endif
99936 tcp_v4_send_reset(rsk, skb);
99937 discard:
99938 kfree_skb(skb);
99939@@ -1974,12 +1981,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
99940 TCP_SKB_CB(skb)->sacked = 0;
99941
99942 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
99943- if (!sk)
99944+ if (!sk) {
99945+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99946+ ret = 1;
99947+#endif
99948 goto no_tcp_socket;
99949-
99950+ }
99951 process:
99952- if (sk->sk_state == TCP_TIME_WAIT)
99953+ if (sk->sk_state == TCP_TIME_WAIT) {
99954+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99955+ ret = 2;
99956+#endif
99957 goto do_time_wait;
99958+ }
99959
99960 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
99961 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
99962@@ -2033,6 +2047,10 @@ csum_error:
99963 bad_packet:
99964 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
99965 } else {
99966+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99967+ if (!grsec_enable_blackhole || (ret == 1 &&
99968+ (skb->dev->flags & IFF_LOOPBACK)))
99969+#endif
99970 tcp_v4_send_reset(NULL, skb);
99971 }
99972
99973diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
99974index 05c1b15..3e9344b 100644
99975--- a/net/ipv4/tcp_minisocks.c
99976+++ b/net/ipv4/tcp_minisocks.c
99977@@ -27,6 +27,10 @@
99978 #include <net/inet_common.h>
99979 #include <net/xfrm.h>
99980
99981+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99982+extern int grsec_enable_blackhole;
99983+#endif
99984+
99985 int sysctl_tcp_syncookies __read_mostly = 1;
99986 EXPORT_SYMBOL(sysctl_tcp_syncookies);
99987
99988@@ -709,7 +713,10 @@ embryonic_reset:
99989 * avoid becoming vulnerable to outside attack aiming at
99990 * resetting legit local connections.
99991 */
99992- req->rsk_ops->send_reset(sk, skb);
99993+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
99994+ if (!grsec_enable_blackhole)
99995+#endif
99996+ req->rsk_ops->send_reset(sk, skb);
99997 } else if (fastopen) { /* received a valid RST pkt */
99998 reqsk_fastopen_remove(sk, req, true);
99999 tcp_reset(sk);
100000diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
100001index 3b66610..bfbe23a 100644
100002--- a/net/ipv4/tcp_probe.c
100003+++ b/net/ipv4/tcp_probe.c
100004@@ -238,7 +238,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
100005 if (cnt + width >= len)
100006 break;
100007
100008- if (copy_to_user(buf + cnt, tbuf, width))
100009+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
100010 return -EFAULT;
100011 cnt += width;
100012 }
100013diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
100014index 286227a..c495a76 100644
100015--- a/net/ipv4/tcp_timer.c
100016+++ b/net/ipv4/tcp_timer.c
100017@@ -22,6 +22,10 @@
100018 #include <linux/gfp.h>
100019 #include <net/tcp.h>
100020
100021+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100022+extern int grsec_lastack_retries;
100023+#endif
100024+
100025 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
100026 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
100027 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
100028@@ -192,6 +196,13 @@ static int tcp_write_timeout(struct sock *sk)
100029 }
100030 }
100031
100032+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100033+ if ((sk->sk_state == TCP_LAST_ACK) &&
100034+ (grsec_lastack_retries > 0) &&
100035+ (grsec_lastack_retries < retry_until))
100036+ retry_until = grsec_lastack_retries;
100037+#endif
100038+
100039 if (retransmits_timed_out(sk, retry_until,
100040 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
100041 /* Has it gone just too far? */
100042diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
100043index 54a5fe9..78fea00 100644
100044--- a/net/ipv4/udp.c
100045+++ b/net/ipv4/udp.c
100046@@ -87,6 +87,7 @@
100047 #include <linux/types.h>
100048 #include <linux/fcntl.h>
100049 #include <linux/module.h>
100050+#include <linux/security.h>
100051 #include <linux/socket.h>
100052 #include <linux/sockios.h>
100053 #include <linux/igmp.h>
100054@@ -113,6 +114,10 @@
100055 #include <net/busy_poll.h>
100056 #include "udp_impl.h"
100057
100058+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100059+extern int grsec_enable_blackhole;
100060+#endif
100061+
100062 struct udp_table udp_table __read_mostly;
100063 EXPORT_SYMBOL(udp_table);
100064
100065@@ -615,6 +620,9 @@ found:
100066 return s;
100067 }
100068
100069+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
100070+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
100071+
100072 /*
100073 * This routine is called by the ICMP module when it gets some
100074 * sort of error condition. If err < 0 then the socket should
100075@@ -914,9 +922,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
100076 dport = usin->sin_port;
100077 if (dport == 0)
100078 return -EINVAL;
100079+
100080+ err = gr_search_udp_sendmsg(sk, usin);
100081+ if (err)
100082+ return err;
100083 } else {
100084 if (sk->sk_state != TCP_ESTABLISHED)
100085 return -EDESTADDRREQ;
100086+
100087+ err = gr_search_udp_sendmsg(sk, NULL);
100088+ if (err)
100089+ return err;
100090+
100091 daddr = inet->inet_daddr;
100092 dport = inet->inet_dport;
100093 /* Open fast path for connected socket.
100094@@ -1164,7 +1181,7 @@ static unsigned int first_packet_length(struct sock *sk)
100095 IS_UDPLITE(sk));
100096 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
100097 IS_UDPLITE(sk));
100098- atomic_inc(&sk->sk_drops);
100099+ atomic_inc_unchecked(&sk->sk_drops);
100100 __skb_unlink(skb, rcvq);
100101 __skb_queue_tail(&list_kill, skb);
100102 }
100103@@ -1235,6 +1252,12 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
100104 int is_udplite = IS_UDPLITE(sk);
100105 bool slow;
100106
100107+ /*
100108+ * Check any passed addresses
100109+ */
100110+ if (addr_len)
100111+ *addr_len = sizeof(*sin);
100112+
100113 if (flags & MSG_ERRQUEUE)
100114 return ip_recv_error(sk, msg, len, addr_len);
100115
100116@@ -1244,6 +1267,10 @@ try_again:
100117 if (!skb)
100118 goto out;
100119
100120+ err = gr_search_udp_recvmsg(sk, skb);
100121+ if (err)
100122+ goto out_free;
100123+
100124 ulen = skb->len - sizeof(struct udphdr);
100125 copied = len;
100126 if (copied > ulen)
100127@@ -1277,7 +1304,7 @@ try_again:
100128 if (unlikely(err)) {
100129 trace_kfree_skb(skb, udp_recvmsg);
100130 if (!peeked) {
100131- atomic_inc(&sk->sk_drops);
100132+ atomic_inc_unchecked(&sk->sk_drops);
100133 UDP_INC_STATS_USER(sock_net(sk),
100134 UDP_MIB_INERRORS, is_udplite);
100135 }
100136@@ -1296,7 +1323,6 @@ try_again:
100137 sin->sin_port = udp_hdr(skb)->source;
100138 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
100139 memset(sin->sin_zero, 0, sizeof(sin->sin_zero));
100140- *addr_len = sizeof(*sin);
100141 }
100142 if (inet->cmsg_flags)
100143 ip_cmsg_recv(msg, skb);
100144@@ -1567,7 +1593,7 @@ csum_error:
100145 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
100146 drop:
100147 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
100148- atomic_inc(&sk->sk_drops);
100149+ atomic_inc_unchecked(&sk->sk_drops);
100150 kfree_skb(skb);
100151 return -1;
100152 }
100153@@ -1586,7 +1612,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
100154 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
100155
100156 if (!skb1) {
100157- atomic_inc(&sk->sk_drops);
100158+ atomic_inc_unchecked(&sk->sk_drops);
100159 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
100160 IS_UDPLITE(sk));
100161 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
100162@@ -1787,6 +1813,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
100163 goto csum_error;
100164
100165 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
100166+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100167+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
100168+#endif
100169 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
100170
100171 /*
100172@@ -2355,7 +2384,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
100173 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
100174 0, sock_i_ino(sp),
100175 atomic_read(&sp->sk_refcnt), sp,
100176- atomic_read(&sp->sk_drops));
100177+ atomic_read_unchecked(&sp->sk_drops));
100178 }
100179
100180 int udp4_seq_show(struct seq_file *seq, void *v)
100181diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
100182index 6156f68..d6ab46d 100644
100183--- a/net/ipv4/xfrm4_policy.c
100184+++ b/net/ipv4/xfrm4_policy.c
100185@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
100186 fl4->flowi4_tos = iph->tos;
100187 }
100188
100189-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
100190+static int xfrm4_garbage_collect(struct dst_ops *ops)
100191 {
100192 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
100193
100194- xfrm4_policy_afinfo.garbage_collect(net);
100195+ xfrm_garbage_collect_deferred(net);
100196 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
100197 }
100198
100199@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
100200
100201 static int __net_init xfrm4_net_init(struct net *net)
100202 {
100203- struct ctl_table *table;
100204+ ctl_table_no_const *table = NULL;
100205 struct ctl_table_header *hdr;
100206
100207- table = xfrm4_policy_table;
100208 if (!net_eq(net, &init_net)) {
100209- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
100210+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
100211 if (!table)
100212 goto err_alloc;
100213
100214 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
100215- }
100216-
100217- hdr = register_net_sysctl(net, "net/ipv4", table);
100218+ hdr = register_net_sysctl(net, "net/ipv4", table);
100219+ } else
100220+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
100221 if (!hdr)
100222 goto err_reg;
100223
100224@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
100225 return 0;
100226
100227 err_reg:
100228- if (!net_eq(net, &init_net))
100229- kfree(table);
100230+ kfree(table);
100231 err_alloc:
100232 return -ENOMEM;
100233 }
100234diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
100235index 6c7fa08..285086c 100644
100236--- a/net/ipv6/addrconf.c
100237+++ b/net/ipv6/addrconf.c
100238@@ -598,7 +598,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
100239 idx = 0;
100240 head = &net->dev_index_head[h];
100241 rcu_read_lock();
100242- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
100243+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
100244 net->dev_base_seq;
100245 hlist_for_each_entry_rcu(dev, head, index_hlist) {
100246 if (idx < s_idx)
100247@@ -2395,7 +2395,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
100248 p.iph.ihl = 5;
100249 p.iph.protocol = IPPROTO_IPV6;
100250 p.iph.ttl = 64;
100251- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
100252+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
100253
100254 if (ops->ndo_do_ioctl) {
100255 mm_segment_t oldfs = get_fs();
100256@@ -4146,7 +4146,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
100257 s_ip_idx = ip_idx = cb->args[2];
100258
100259 rcu_read_lock();
100260- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
100261+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
100262 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
100263 idx = 0;
100264 head = &net->dev_index_head[h];
100265@@ -4758,7 +4758,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
100266 dst_free(&ifp->rt->dst);
100267 break;
100268 }
100269- atomic_inc(&net->ipv6.dev_addr_genid);
100270+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
100271 rt_genid_bump_ipv6(net);
100272 }
100273
100274@@ -4779,7 +4779,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
100275 int *valp = ctl->data;
100276 int val = *valp;
100277 loff_t pos = *ppos;
100278- struct ctl_table lctl;
100279+ ctl_table_no_const lctl;
100280 int ret;
100281
100282 /*
100283@@ -4864,7 +4864,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
100284 int *valp = ctl->data;
100285 int val = *valp;
100286 loff_t pos = *ppos;
100287- struct ctl_table lctl;
100288+ ctl_table_no_const lctl;
100289 int ret;
100290
100291 /*
100292diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
100293index d935889..2f64330 100644
100294--- a/net/ipv6/af_inet6.c
100295+++ b/net/ipv6/af_inet6.c
100296@@ -776,7 +776,7 @@ static int __net_init inet6_net_init(struct net *net)
100297 net->ipv6.sysctl.bindv6only = 0;
100298 net->ipv6.sysctl.icmpv6_time = 1*HZ;
100299 net->ipv6.sysctl.flowlabel_consistency = 1;
100300- atomic_set(&net->ipv6.rt_genid, 0);
100301+ atomic_set_unchecked(&net->ipv6.rt_genid, 0);
100302
100303 err = ipv6_init_mibs(net);
100304 if (err)
100305diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
100306index c3bf2d2..1f00573 100644
100307--- a/net/ipv6/datagram.c
100308+++ b/net/ipv6/datagram.c
100309@@ -938,5 +938,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
100310 0,
100311 sock_i_ino(sp),
100312 atomic_read(&sp->sk_refcnt), sp,
100313- atomic_read(&sp->sk_drops));
100314+ atomic_read_unchecked(&sp->sk_drops));
100315 }
100316diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
100317index 7b32652..0bc348b 100644
100318--- a/net/ipv6/icmp.c
100319+++ b/net/ipv6/icmp.c
100320@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
100321
100322 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
100323 {
100324- struct ctl_table *table;
100325+ ctl_table_no_const *table;
100326
100327 table = kmemdup(ipv6_icmp_table_template,
100328 sizeof(ipv6_icmp_table_template),
100329diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
100330index 9d92146..d986c6a 100644
100331--- a/net/ipv6/ip6_gre.c
100332+++ b/net/ipv6/ip6_gre.c
100333@@ -71,7 +71,7 @@ struct ip6gre_net {
100334 struct net_device *fb_tunnel_dev;
100335 };
100336
100337-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
100338+static struct rtnl_link_ops ip6gre_link_ops;
100339 static int ip6gre_tunnel_init(struct net_device *dev);
100340 static void ip6gre_tunnel_setup(struct net_device *dev);
100341 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
100342@@ -1291,7 +1291,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
100343 }
100344
100345
100346-static struct inet6_protocol ip6gre_protocol __read_mostly = {
100347+static struct inet6_protocol ip6gre_protocol = {
100348 .handler = ip6gre_rcv,
100349 .err_handler = ip6gre_err,
100350 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
100351@@ -1636,7 +1636,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
100352 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
100353 };
100354
100355-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
100356+static struct rtnl_link_ops ip6gre_link_ops = {
100357 .kind = "ip6gre",
100358 .maxtype = IFLA_GRE_MAX,
100359 .policy = ip6gre_policy,
100360@@ -1650,7 +1650,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
100361 .fill_info = ip6gre_fill_info,
100362 };
100363
100364-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
100365+static struct rtnl_link_ops ip6gre_tap_ops = {
100366 .kind = "ip6gretap",
100367 .maxtype = IFLA_GRE_MAX,
100368 .policy = ip6gre_policy,
100369diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
100370index afa0824..04ba530 100644
100371--- a/net/ipv6/ip6_tunnel.c
100372+++ b/net/ipv6/ip6_tunnel.c
100373@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
100374
100375 static int ip6_tnl_dev_init(struct net_device *dev);
100376 static void ip6_tnl_dev_setup(struct net_device *dev);
100377-static struct rtnl_link_ops ip6_link_ops __read_mostly;
100378+static struct rtnl_link_ops ip6_link_ops;
100379
100380 static int ip6_tnl_net_id __read_mostly;
100381 struct ip6_tnl_net {
100382@@ -1708,7 +1708,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
100383 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
100384 };
100385
100386-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
100387+static struct rtnl_link_ops ip6_link_ops = {
100388 .kind = "ip6tnl",
100389 .maxtype = IFLA_IPTUN_MAX,
100390 .policy = ip6_tnl_policy,
100391diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
100392index 6cc9f93..6e5bb7c 100644
100393--- a/net/ipv6/ip6_vti.c
100394+++ b/net/ipv6/ip6_vti.c
100395@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
100396
100397 static int vti6_dev_init(struct net_device *dev);
100398 static void vti6_dev_setup(struct net_device *dev);
100399-static struct rtnl_link_ops vti6_link_ops __read_mostly;
100400+static struct rtnl_link_ops vti6_link_ops;
100401
100402 static int vti6_net_id __read_mostly;
100403 struct vti6_net {
100404@@ -980,7 +980,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
100405 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
100406 };
100407
100408-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
100409+static struct rtnl_link_ops vti6_link_ops = {
100410 .kind = "vti6",
100411 .maxtype = IFLA_VTI_MAX,
100412 .policy = vti6_policy,
100413diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
100414index edb58af..78de133 100644
100415--- a/net/ipv6/ipv6_sockglue.c
100416+++ b/net/ipv6/ipv6_sockglue.c
100417@@ -991,7 +991,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
100418 if (sk->sk_type != SOCK_STREAM)
100419 return -ENOPROTOOPT;
100420
100421- msg.msg_control = optval;
100422+ msg.msg_control = (void __force_kernel *)optval;
100423 msg.msg_controllen = len;
100424 msg.msg_flags = flags;
100425
100426diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
100427index e080fbb..412b3cf 100644
100428--- a/net/ipv6/netfilter/ip6_tables.c
100429+++ b/net/ipv6/netfilter/ip6_tables.c
100430@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
100431 #endif
100432
100433 static int get_info(struct net *net, void __user *user,
100434- const int *len, int compat)
100435+ int len, int compat)
100436 {
100437 char name[XT_TABLE_MAXNAMELEN];
100438 struct xt_table *t;
100439 int ret;
100440
100441- if (*len != sizeof(struct ip6t_getinfo)) {
100442- duprintf("length %u != %zu\n", *len,
100443+ if (len != sizeof(struct ip6t_getinfo)) {
100444+ duprintf("length %u != %zu\n", len,
100445 sizeof(struct ip6t_getinfo));
100446 return -EINVAL;
100447 }
100448@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
100449 info.size = private->size;
100450 strcpy(info.name, name);
100451
100452- if (copy_to_user(user, &info, *len) != 0)
100453+ if (copy_to_user(user, &info, len) != 0)
100454 ret = -EFAULT;
100455 else
100456 ret = 0;
100457@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100458
100459 switch (cmd) {
100460 case IP6T_SO_GET_INFO:
100461- ret = get_info(sock_net(sk), user, len, 1);
100462+ ret = get_info(sock_net(sk), user, *len, 1);
100463 break;
100464 case IP6T_SO_GET_ENTRIES:
100465 ret = compat_get_entries(sock_net(sk), user, len);
100466@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100467
100468 switch (cmd) {
100469 case IP6T_SO_GET_INFO:
100470- ret = get_info(sock_net(sk), user, len, 0);
100471+ ret = get_info(sock_net(sk), user, *len, 0);
100472 break;
100473
100474 case IP6T_SO_GET_ENTRIES:
100475diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
100476index 767ab8d..c5ec70a 100644
100477--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
100478+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
100479@@ -90,12 +90,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
100480
100481 static int nf_ct_frag6_sysctl_register(struct net *net)
100482 {
100483- struct ctl_table *table;
100484+ ctl_table_no_const *table = NULL;
100485 struct ctl_table_header *hdr;
100486
100487- table = nf_ct_frag6_sysctl_table;
100488 if (!net_eq(net, &init_net)) {
100489- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
100490+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
100491 GFP_KERNEL);
100492 if (table == NULL)
100493 goto err_alloc;
100494@@ -103,9 +102,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
100495 table[0].data = &net->nf_frag.frags.timeout;
100496 table[1].data = &net->nf_frag.frags.low_thresh;
100497 table[2].data = &net->nf_frag.frags.high_thresh;
100498- }
100499-
100500- hdr = register_net_sysctl(net, "net/netfilter", table);
100501+ hdr = register_net_sysctl(net, "net/netfilter", table);
100502+ } else
100503+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
100504 if (hdr == NULL)
100505 goto err_reg;
100506
100507@@ -113,8 +112,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
100508 return 0;
100509
100510 err_reg:
100511- if (!net_eq(net, &init_net))
100512- kfree(table);
100513+ kfree(table);
100514 err_alloc:
100515 return -ENOMEM;
100516 }
100517diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
100518index 56596ce..c734618 100644
100519--- a/net/ipv6/output_core.c
100520+++ b/net/ipv6/output_core.c
100521@@ -10,7 +10,7 @@
100522
100523 void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
100524 {
100525- static atomic_t ipv6_fragmentation_id;
100526+ static atomic_unchecked_t ipv6_fragmentation_id;
100527 struct in6_addr addr;
100528 int ident;
100529
100530@@ -26,7 +26,7 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
100531 return;
100532 }
100533 #endif
100534- ident = atomic_inc_return(&ipv6_fragmentation_id);
100535+ ident = atomic_inc_return_unchecked(&ipv6_fragmentation_id);
100536
100537 addr = rt->rt6i_dst.addr;
100538 addr.s6_addr32[0] ^= (__force __be32)ident;
100539diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
100540index bda7429..469b26b 100644
100541--- a/net/ipv6/ping.c
100542+++ b/net/ipv6/ping.c
100543@@ -246,6 +246,24 @@ static struct pernet_operations ping_v6_net_ops = {
100544 };
100545 #endif
100546
100547+static struct pingv6_ops real_pingv6_ops = {
100548+ .ipv6_recv_error = ipv6_recv_error,
100549+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
100550+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
100551+ .icmpv6_err_convert = icmpv6_err_convert,
100552+ .ipv6_icmp_error = ipv6_icmp_error,
100553+ .ipv6_chk_addr = ipv6_chk_addr,
100554+};
100555+
100556+static struct pingv6_ops dummy_pingv6_ops = {
100557+ .ipv6_recv_error = dummy_ipv6_recv_error,
100558+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
100559+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
100560+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
100561+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
100562+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
100563+};
100564+
100565 int __init pingv6_init(void)
100566 {
100567 #ifdef CONFIG_PROC_FS
100568@@ -253,13 +271,7 @@ int __init pingv6_init(void)
100569 if (ret)
100570 return ret;
100571 #endif
100572- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
100573- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
100574- pingv6_ops.ip6_datagram_recv_specific_ctl =
100575- ip6_datagram_recv_specific_ctl;
100576- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
100577- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
100578- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
100579+ pingv6_ops = &real_pingv6_ops;
100580 return inet6_register_protosw(&pingv6_protosw);
100581 }
100582
100583@@ -268,14 +280,9 @@ int __init pingv6_init(void)
100584 */
100585 void pingv6_exit(void)
100586 {
100587- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
100588- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
100589- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
100590- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
100591- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
100592- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
100593 #ifdef CONFIG_PROC_FS
100594 unregister_pernet_subsys(&ping_v6_net_ops);
100595 #endif
100596+ pingv6_ops = &dummy_pingv6_ops;
100597 inet6_unregister_protosw(&pingv6_protosw);
100598 }
100599diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
100600index 091d066..139d410 100644
100601--- a/net/ipv6/proc.c
100602+++ b/net/ipv6/proc.c
100603@@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
100604 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
100605 goto proc_snmp6_fail;
100606
100607- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
100608+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
100609 if (!net->mib.proc_net_devsnmp6)
100610 goto proc_dev_snmp6_fail;
100611 return 0;
100612diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
100613index 1f29996..46fe0c7 100644
100614--- a/net/ipv6/raw.c
100615+++ b/net/ipv6/raw.c
100616@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
100617 {
100618 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
100619 skb_checksum_complete(skb)) {
100620- atomic_inc(&sk->sk_drops);
100621+ atomic_inc_unchecked(&sk->sk_drops);
100622 kfree_skb(skb);
100623 return NET_RX_DROP;
100624 }
100625@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
100626 struct raw6_sock *rp = raw6_sk(sk);
100627
100628 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
100629- atomic_inc(&sk->sk_drops);
100630+ atomic_inc_unchecked(&sk->sk_drops);
100631 kfree_skb(skb);
100632 return NET_RX_DROP;
100633 }
100634@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
100635
100636 if (inet->hdrincl) {
100637 if (skb_checksum_complete(skb)) {
100638- atomic_inc(&sk->sk_drops);
100639+ atomic_inc_unchecked(&sk->sk_drops);
100640 kfree_skb(skb);
100641 return NET_RX_DROP;
100642 }
100643@@ -469,6 +469,9 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
100644 if (flags & MSG_OOB)
100645 return -EOPNOTSUPP;
100646
100647+ if (addr_len)
100648+ *addr_len=sizeof(*sin6);
100649+
100650 if (flags & MSG_ERRQUEUE)
100651 return ipv6_recv_error(sk, msg, len, addr_len);
100652
100653@@ -507,7 +510,6 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk,
100654 sin6->sin6_flowinfo = 0;
100655 sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
100656 IP6CB(skb)->iif);
100657- *addr_len = sizeof(*sin6);
100658 }
100659
100660 sock_recv_ts_and_drops(msg, sk, skb);
100661@@ -610,7 +612,7 @@ out:
100662 return err;
100663 }
100664
100665-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
100666+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
100667 struct flowi6 *fl6, struct dst_entry **dstp,
100668 unsigned int flags)
100669 {
100670@@ -922,12 +924,15 @@ do_confirm:
100671 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
100672 char __user *optval, int optlen)
100673 {
100674+ struct icmp6_filter filter;
100675+
100676 switch (optname) {
100677 case ICMPV6_FILTER:
100678 if (optlen > sizeof(struct icmp6_filter))
100679 optlen = sizeof(struct icmp6_filter);
100680- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
100681+ if (copy_from_user(&filter, optval, optlen))
100682 return -EFAULT;
100683+ raw6_sk(sk)->filter = filter;
100684 return 0;
100685 default:
100686 return -ENOPROTOOPT;
100687@@ -940,6 +945,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
100688 char __user *optval, int __user *optlen)
100689 {
100690 int len;
100691+ struct icmp6_filter filter;
100692
100693 switch (optname) {
100694 case ICMPV6_FILTER:
100695@@ -951,7 +957,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
100696 len = sizeof(struct icmp6_filter);
100697 if (put_user(len, optlen))
100698 return -EFAULT;
100699- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
100700+ filter = raw6_sk(sk)->filter;
100701+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
100702 return -EFAULT;
100703 return 0;
100704 default:
100705diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
100706index cc85a9b..526a133 100644
100707--- a/net/ipv6/reassembly.c
100708+++ b/net/ipv6/reassembly.c
100709@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
100710
100711 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
100712 {
100713- struct ctl_table *table;
100714+ ctl_table_no_const *table = NULL;
100715 struct ctl_table_header *hdr;
100716
100717- table = ip6_frags_ns_ctl_table;
100718 if (!net_eq(net, &init_net)) {
100719- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
100720+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
100721 if (table == NULL)
100722 goto err_alloc;
100723
100724@@ -642,9 +641,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
100725 /* Don't export sysctls to unprivileged users */
100726 if (net->user_ns != &init_user_ns)
100727 table[0].procname = NULL;
100728- }
100729+ hdr = register_net_sysctl(net, "net/ipv6", table);
100730+ } else
100731+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
100732
100733- hdr = register_net_sysctl(net, "net/ipv6", table);
100734 if (hdr == NULL)
100735 goto err_reg;
100736
100737@@ -652,8 +652,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
100738 return 0;
100739
100740 err_reg:
100741- if (!net_eq(net, &init_net))
100742- kfree(table);
100743+ kfree(table);
100744 err_alloc:
100745 return -ENOMEM;
100746 }
100747diff --git a/net/ipv6/route.c b/net/ipv6/route.c
100748index 6ebdb7b6..f225ab1 100644
100749--- a/net/ipv6/route.c
100750+++ b/net/ipv6/route.c
100751@@ -2971,7 +2971,7 @@ struct ctl_table ipv6_route_table_template[] = {
100752
100753 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
100754 {
100755- struct ctl_table *table;
100756+ ctl_table_no_const *table;
100757
100758 table = kmemdup(ipv6_route_table_template,
100759 sizeof(ipv6_route_table_template),
100760diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
100761index 4f40817..54dcbef 100644
100762--- a/net/ipv6/sit.c
100763+++ b/net/ipv6/sit.c
100764@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
100765 static void ipip6_dev_free(struct net_device *dev);
100766 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
100767 __be32 *v4dst);
100768-static struct rtnl_link_ops sit_link_ops __read_mostly;
100769+static struct rtnl_link_ops sit_link_ops;
100770
100771 static int sit_net_id __read_mostly;
100772 struct sit_net {
100773@@ -1661,7 +1661,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
100774 unregister_netdevice_queue(dev, head);
100775 }
100776
100777-static struct rtnl_link_ops sit_link_ops __read_mostly = {
100778+static struct rtnl_link_ops sit_link_ops = {
100779 .kind = "sit",
100780 .maxtype = IFLA_IPTUN_MAX,
100781 .policy = ipip6_policy,
100782diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
100783index 7f405a1..eabef92 100644
100784--- a/net/ipv6/sysctl_net_ipv6.c
100785+++ b/net/ipv6/sysctl_net_ipv6.c
100786@@ -54,7 +54,7 @@ static struct ctl_table ipv6_rotable[] = {
100787
100788 static int __net_init ipv6_sysctl_net_init(struct net *net)
100789 {
100790- struct ctl_table *ipv6_table;
100791+ ctl_table_no_const *ipv6_table;
100792 struct ctl_table *ipv6_route_table;
100793 struct ctl_table *ipv6_icmp_table;
100794 int err;
100795diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
100796index e289830..79a5718 100644
100797--- a/net/ipv6/tcp_ipv6.c
100798+++ b/net/ipv6/tcp_ipv6.c
100799@@ -102,6 +102,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
100800 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
100801 }
100802
100803+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100804+extern int grsec_enable_blackhole;
100805+#endif
100806+
100807 static void tcp_v6_hash(struct sock *sk)
100808 {
100809 if (sk->sk_state != TCP_CLOSE) {
100810@@ -1416,6 +1420,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
100811 return 0;
100812
100813 reset:
100814+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100815+ if (!grsec_enable_blackhole)
100816+#endif
100817 tcp_v6_send_reset(sk, skb);
100818 discard:
100819 if (opt_skb)
100820@@ -1500,12 +1507,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
100821 TCP_SKB_CB(skb)->sacked = 0;
100822
100823 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
100824- if (!sk)
100825+ if (!sk) {
100826+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100827+ ret = 1;
100828+#endif
100829 goto no_tcp_socket;
100830+ }
100831
100832 process:
100833- if (sk->sk_state == TCP_TIME_WAIT)
100834+ if (sk->sk_state == TCP_TIME_WAIT) {
100835+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100836+ ret = 2;
100837+#endif
100838 goto do_time_wait;
100839+ }
100840
100841 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
100842 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
100843@@ -1557,6 +1572,10 @@ csum_error:
100844 bad_packet:
100845 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
100846 } else {
100847+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100848+ if (!grsec_enable_blackhole || (ret == 1 &&
100849+ (skb->dev->flags & IFF_LOOPBACK)))
100850+#endif
100851 tcp_v6_send_reset(NULL, skb);
100852 }
100853
100854diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
100855index 20b63d2..13be908 100644
100856--- a/net/ipv6/udp.c
100857+++ b/net/ipv6/udp.c
100858@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
100859 udp_ipv6_hash_secret + net_hash_mix(net));
100860 }
100861
100862+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100863+extern int grsec_enable_blackhole;
100864+#endif
100865+
100866 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
100867 {
100868 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
100869@@ -392,6 +396,9 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
100870 int is_udp4;
100871 bool slow;
100872
100873+ if (addr_len)
100874+ *addr_len = sizeof(struct sockaddr_in6);
100875+
100876 if (flags & MSG_ERRQUEUE)
100877 return ipv6_recv_error(sk, msg, len, addr_len);
100878
100879@@ -435,7 +442,7 @@ try_again:
100880 if (unlikely(err)) {
100881 trace_kfree_skb(skb, udpv6_recvmsg);
100882 if (!peeked) {
100883- atomic_inc(&sk->sk_drops);
100884+ atomic_inc_unchecked(&sk->sk_drops);
100885 if (is_udp4)
100886 UDP_INC_STATS_USER(sock_net(sk),
100887 UDP_MIB_INERRORS,
100888@@ -475,7 +482,7 @@ try_again:
100889 ipv6_iface_scope_id(&sin6->sin6_addr,
100890 IP6CB(skb)->iif);
100891 }
100892- *addr_len = sizeof(*sin6);
100893+
100894 }
100895
100896 if (np->rxopt.all)
100897@@ -690,7 +697,7 @@ csum_error:
100898 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
100899 drop:
100900 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
100901- atomic_inc(&sk->sk_drops);
100902+ atomic_inc_unchecked(&sk->sk_drops);
100903 kfree_skb(skb);
100904 return -1;
100905 }
100906@@ -747,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
100907 if (likely(skb1 == NULL))
100908 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
100909 if (!skb1) {
100910- atomic_inc(&sk->sk_drops);
100911+ atomic_inc_unchecked(&sk->sk_drops);
100912 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
100913 IS_UDPLITE(sk));
100914 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
100915@@ -886,6 +893,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
100916 goto csum_error;
100917
100918 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
100919+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
100920+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
100921+#endif
100922 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
100923
100924 kfree_skb(skb);
100925diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
100926index 2a0bbda..d75ca57 100644
100927--- a/net/ipv6/xfrm6_policy.c
100928+++ b/net/ipv6/xfrm6_policy.c
100929@@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
100930 }
100931 }
100932
100933-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
100934+static int xfrm6_garbage_collect(struct dst_ops *ops)
100935 {
100936 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
100937
100938- xfrm6_policy_afinfo.garbage_collect(net);
100939+ xfrm_garbage_collect_deferred(net);
100940 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
100941 }
100942
100943@@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
100944
100945 static int __net_init xfrm6_net_init(struct net *net)
100946 {
100947- struct ctl_table *table;
100948+ ctl_table_no_const *table = NULL;
100949 struct ctl_table_header *hdr;
100950
100951- table = xfrm6_policy_table;
100952 if (!net_eq(net, &init_net)) {
100953- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
100954+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
100955 if (!table)
100956 goto err_alloc;
100957
100958 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
100959- }
100960+ hdr = register_net_sysctl(net, "net/ipv6", table);
100961+ } else
100962+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
100963
100964- hdr = register_net_sysctl(net, "net/ipv6", table);
100965 if (!hdr)
100966 goto err_reg;
100967
100968@@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
100969 return 0;
100970
100971 err_reg:
100972- if (!net_eq(net, &init_net))
100973- kfree(table);
100974+ kfree(table);
100975 err_alloc:
100976 return -ENOMEM;
100977 }
100978diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
100979index e15c16a..7cf07aa 100644
100980--- a/net/ipx/ipx_proc.c
100981+++ b/net/ipx/ipx_proc.c
100982@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
100983 struct proc_dir_entry *p;
100984 int rc = -ENOMEM;
100985
100986- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
100987+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
100988
100989 if (!ipx_proc_dir)
100990 goto out;
100991diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
100992index 2ba8b97..6d33010 100644
100993--- a/net/irda/ircomm/ircomm_tty.c
100994+++ b/net/irda/ircomm/ircomm_tty.c
100995@@ -317,11 +317,11 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
100996 add_wait_queue(&port->open_wait, &wait);
100997
100998 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
100999- __FILE__, __LINE__, tty->driver->name, port->count);
101000+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
101001
101002 spin_lock_irqsave(&port->lock, flags);
101003 if (!tty_hung_up_p(filp))
101004- port->count--;
101005+ atomic_dec(&port->count);
101006 port->blocked_open++;
101007 spin_unlock_irqrestore(&port->lock, flags);
101008
101009@@ -356,7 +356,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
101010 }
101011
101012 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
101013- __FILE__, __LINE__, tty->driver->name, port->count);
101014+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
101015
101016 schedule();
101017 }
101018@@ -366,12 +366,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
101019
101020 spin_lock_irqsave(&port->lock, flags);
101021 if (!tty_hung_up_p(filp))
101022- port->count++;
101023+ atomic_inc(&port->count);
101024 port->blocked_open--;
101025 spin_unlock_irqrestore(&port->lock, flags);
101026
101027 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
101028- __FILE__, __LINE__, tty->driver->name, port->count);
101029+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
101030
101031 if (!retval)
101032 port->flags |= ASYNC_NORMAL_ACTIVE;
101033@@ -445,12 +445,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
101034
101035 /* ++ is not atomic, so this should be protected - Jean II */
101036 spin_lock_irqsave(&self->port.lock, flags);
101037- self->port.count++;
101038+ atomic_inc(&self->port.count);
101039 spin_unlock_irqrestore(&self->port.lock, flags);
101040 tty_port_tty_set(&self->port, tty);
101041
101042 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
101043- self->line, self->port.count);
101044+ self->line, atomic_read(&self->port.count));
101045
101046 /* Not really used by us, but lets do it anyway */
101047 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
101048@@ -987,7 +987,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
101049 tty_kref_put(port->tty);
101050 }
101051 port->tty = NULL;
101052- port->count = 0;
101053+ atomic_set(&port->count, 0);
101054 spin_unlock_irqrestore(&port->lock, flags);
101055
101056 wake_up_interruptible(&port->open_wait);
101057@@ -1344,7 +1344,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
101058 seq_putc(m, '\n');
101059
101060 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
101061- seq_printf(m, "Open count: %d\n", self->port.count);
101062+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
101063 seq_printf(m, "Max data size: %d\n", self->max_data_size);
101064 seq_printf(m, "Max header size: %d\n", self->max_header_size);
101065
101066diff --git a/net/irda/irproc.c b/net/irda/irproc.c
101067index b9ac598..f88cc56 100644
101068--- a/net/irda/irproc.c
101069+++ b/net/irda/irproc.c
101070@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
101071 {
101072 int i;
101073
101074- proc_irda = proc_mkdir("irda", init_net.proc_net);
101075+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
101076 if (proc_irda == NULL)
101077 return;
101078
101079diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
101080index 8c9d730..66c6305 100644
101081--- a/net/iucv/af_iucv.c
101082+++ b/net/iucv/af_iucv.c
101083@@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
101084
101085 write_lock_bh(&iucv_sk_list.lock);
101086
101087- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
101088+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
101089 while (__iucv_get_sock_by_name(name)) {
101090 sprintf(name, "%08x",
101091- atomic_inc_return(&iucv_sk_list.autobind_name));
101092+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
101093 }
101094
101095 write_unlock_bh(&iucv_sk_list.lock);
101096diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
101097index da78793..bdd78cf 100644
101098--- a/net/iucv/iucv.c
101099+++ b/net/iucv/iucv.c
101100@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
101101 return NOTIFY_OK;
101102 }
101103
101104-static struct notifier_block __refdata iucv_cpu_notifier = {
101105+static struct notifier_block iucv_cpu_notifier = {
101106 .notifier_call = iucv_cpu_notify,
101107 };
101108
101109diff --git a/net/key/af_key.c b/net/key/af_key.c
101110index f3c8307..7127791 100644
101111--- a/net/key/af_key.c
101112+++ b/net/key/af_key.c
101113@@ -3070,10 +3070,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
101114 static u32 get_acqseq(void)
101115 {
101116 u32 res;
101117- static atomic_t acqseq;
101118+ static atomic_unchecked_t acqseq;
101119
101120 do {
101121- res = atomic_inc_return(&acqseq);
101122+ res = atomic_inc_return_unchecked(&acqseq);
101123 } while (!res);
101124 return res;
101125 }
101126diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
101127index 76125c5..e474828 100644
101128--- a/net/l2tp/l2tp_eth.c
101129+++ b/net/l2tp/l2tp_eth.c
101130@@ -42,12 +42,12 @@ struct l2tp_eth {
101131 struct sock *tunnel_sock;
101132 struct l2tp_session *session;
101133 struct list_head list;
101134- atomic_long_t tx_bytes;
101135- atomic_long_t tx_packets;
101136- atomic_long_t tx_dropped;
101137- atomic_long_t rx_bytes;
101138- atomic_long_t rx_packets;
101139- atomic_long_t rx_errors;
101140+ atomic_long_unchecked_t tx_bytes;
101141+ atomic_long_unchecked_t tx_packets;
101142+ atomic_long_unchecked_t tx_dropped;
101143+ atomic_long_unchecked_t rx_bytes;
101144+ atomic_long_unchecked_t rx_packets;
101145+ atomic_long_unchecked_t rx_errors;
101146 };
101147
101148 /* via l2tp_session_priv() */
101149@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
101150 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
101151
101152 if (likely(ret == NET_XMIT_SUCCESS)) {
101153- atomic_long_add(len, &priv->tx_bytes);
101154- atomic_long_inc(&priv->tx_packets);
101155+ atomic_long_add_unchecked(len, &priv->tx_bytes);
101156+ atomic_long_inc_unchecked(&priv->tx_packets);
101157 } else {
101158- atomic_long_inc(&priv->tx_dropped);
101159+ atomic_long_inc_unchecked(&priv->tx_dropped);
101160 }
101161 return NETDEV_TX_OK;
101162 }
101163@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
101164 {
101165 struct l2tp_eth *priv = netdev_priv(dev);
101166
101167- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
101168- stats->tx_packets = atomic_long_read(&priv->tx_packets);
101169- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
101170- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
101171- stats->rx_packets = atomic_long_read(&priv->rx_packets);
101172- stats->rx_errors = atomic_long_read(&priv->rx_errors);
101173+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
101174+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
101175+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
101176+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
101177+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
101178+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
101179 return stats;
101180 }
101181
101182@@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
101183 nf_reset(skb);
101184
101185 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
101186- atomic_long_inc(&priv->rx_packets);
101187- atomic_long_add(data_len, &priv->rx_bytes);
101188+ atomic_long_inc_unchecked(&priv->rx_packets);
101189+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
101190 } else {
101191- atomic_long_inc(&priv->rx_errors);
101192+ atomic_long_inc_unchecked(&priv->rx_errors);
101193 }
101194 return;
101195
101196 error:
101197- atomic_long_inc(&priv->rx_errors);
101198+ atomic_long_inc_unchecked(&priv->rx_errors);
101199 kfree_skb(skb);
101200 }
101201
101202diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
101203index 3397fe6..861fd1a 100644
101204--- a/net/l2tp/l2tp_ip.c
101205+++ b/net/l2tp/l2tp_ip.c
101206@@ -518,6 +518,9 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
101207 if (flags & MSG_OOB)
101208 goto out;
101209
101210+ if (addr_len)
101211+ *addr_len = sizeof(*sin);
101212+
101213 skb = skb_recv_datagram(sk, flags, noblock, &err);
101214 if (!skb)
101215 goto out;
101216@@ -540,7 +543,6 @@ static int l2tp_ip_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *m
101217 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
101218 sin->sin_port = 0;
101219 memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
101220- *addr_len = sizeof(*sin);
101221 }
101222 if (inet->cmsg_flags)
101223 ip_cmsg_recv(msg, skb);
101224diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
101225index 1a3c7e0..80f8b0c 100644
101226--- a/net/llc/llc_proc.c
101227+++ b/net/llc/llc_proc.c
101228@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
101229 int rc = -ENOMEM;
101230 struct proc_dir_entry *p;
101231
101232- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
101233+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
101234 if (!llc_proc_dir)
101235 goto out;
101236
101237diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
101238index aaa59d7..21a2c4a 100644
101239--- a/net/mac80211/cfg.c
101240+++ b/net/mac80211/cfg.c
101241@@ -839,7 +839,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
101242 ret = ieee80211_vif_use_channel(sdata, chandef,
101243 IEEE80211_CHANCTX_EXCLUSIVE);
101244 }
101245- } else if (local->open_count == local->monitors) {
101246+ } else if (local_read(&local->open_count) == local->monitors) {
101247 local->_oper_chandef = *chandef;
101248 ieee80211_hw_config(local, 0);
101249 }
101250@@ -3440,7 +3440,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
101251 else
101252 local->probe_req_reg--;
101253
101254- if (!local->open_count)
101255+ if (!local_read(&local->open_count))
101256 break;
101257
101258 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
101259@@ -3903,8 +3903,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
101260 if (chanctx_conf) {
101261 *chandef = chanctx_conf->def;
101262 ret = 0;
101263- } else if (local->open_count > 0 &&
101264- local->open_count == local->monitors &&
101265+ } else if (local_read(&local->open_count) > 0 &&
101266+ local_read(&local->open_count) == local->monitors &&
101267 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
101268 if (local->use_chanctx)
101269 *chandef = local->monitor_chandef;
101270diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
101271index f169b6e..a5dc4eb 100644
101272--- a/net/mac80211/ieee80211_i.h
101273+++ b/net/mac80211/ieee80211_i.h
101274@@ -28,6 +28,7 @@
101275 #include <net/ieee80211_radiotap.h>
101276 #include <net/cfg80211.h>
101277 #include <net/mac80211.h>
101278+#include <asm/local.h>
101279 #include "key.h"
101280 #include "sta_info.h"
101281 #include "debug.h"
101282@@ -999,7 +1000,7 @@ struct ieee80211_local {
101283 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
101284 spinlock_t queue_stop_reason_lock;
101285
101286- int open_count;
101287+ local_t open_count;
101288 int monitors, cooked_mntrs;
101289 /* number of interfaces with corresponding FIF_ flags */
101290 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
101291diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
101292index 34799e0..b411290 100644
101293--- a/net/mac80211/iface.c
101294+++ b/net/mac80211/iface.c
101295@@ -524,7 +524,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101296 break;
101297 }
101298
101299- if (local->open_count == 0) {
101300+ if (local_read(&local->open_count) == 0) {
101301 res = drv_start(local);
101302 if (res)
101303 goto err_del_bss;
101304@@ -571,7 +571,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101305 res = drv_add_interface(local, sdata);
101306 if (res)
101307 goto err_stop;
101308- } else if (local->monitors == 0 && local->open_count == 0) {
101309+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
101310 res = ieee80211_add_virtual_monitor(local);
101311 if (res)
101312 goto err_stop;
101313@@ -680,7 +680,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101314 atomic_inc(&local->iff_promiscs);
101315
101316 if (coming_up)
101317- local->open_count++;
101318+ local_inc(&local->open_count);
101319
101320 if (hw_reconf_flags)
101321 ieee80211_hw_config(local, hw_reconf_flags);
101322@@ -718,7 +718,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
101323 err_del_interface:
101324 drv_remove_interface(local, sdata);
101325 err_stop:
101326- if (!local->open_count)
101327+ if (!local_read(&local->open_count))
101328 drv_stop(local);
101329 err_del_bss:
101330 sdata->bss = NULL;
101331@@ -871,7 +871,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101332 }
101333
101334 if (going_down)
101335- local->open_count--;
101336+ local_dec(&local->open_count);
101337
101338 switch (sdata->vif.type) {
101339 case NL80211_IFTYPE_AP_VLAN:
101340@@ -930,7 +930,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101341 }
101342 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
101343
101344- if (local->open_count == 0)
101345+ if (local_read(&local->open_count) == 0)
101346 ieee80211_clear_tx_pending(local);
101347
101348 /*
101349@@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101350
101351 ieee80211_recalc_ps(local, -1);
101352
101353- if (local->open_count == 0) {
101354+ if (local_read(&local->open_count) == 0) {
101355 ieee80211_stop_device(local);
101356
101357 /* no reconfiguring after stop! */
101358@@ -981,7 +981,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
101359 ieee80211_configure_filter(local);
101360 ieee80211_hw_config(local, hw_reconf_flags);
101361
101362- if (local->monitors == local->open_count)
101363+ if (local->monitors == local_read(&local->open_count))
101364 ieee80211_add_virtual_monitor(local);
101365 }
101366
101367diff --git a/net/mac80211/main.c b/net/mac80211/main.c
101368index 4c1bf61..00b449b 100644
101369--- a/net/mac80211/main.c
101370+++ b/net/mac80211/main.c
101371@@ -174,7 +174,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
101372 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
101373 IEEE80211_CONF_CHANGE_POWER);
101374
101375- if (changed && local->open_count) {
101376+ if (changed && local_read(&local->open_count)) {
101377 ret = drv_config(local, changed);
101378 /*
101379 * Goal:
101380diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
101381index d478b88..8c8d157 100644
101382--- a/net/mac80211/pm.c
101383+++ b/net/mac80211/pm.c
101384@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
101385 struct ieee80211_sub_if_data *sdata;
101386 struct sta_info *sta;
101387
101388- if (!local->open_count)
101389+ if (!local_read(&local->open_count))
101390 goto suspend;
101391
101392 ieee80211_scan_cancel(local);
101393@@ -58,7 +58,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
101394 cancel_work_sync(&local->dynamic_ps_enable_work);
101395 del_timer_sync(&local->dynamic_ps_timer);
101396
101397- local->wowlan = wowlan && local->open_count;
101398+ local->wowlan = wowlan && local_read(&local->open_count);
101399 if (local->wowlan) {
101400 int err = drv_suspend(local, wowlan);
101401 if (err < 0) {
101402@@ -123,7 +123,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
101403 WARN_ON(!list_empty(&local->chanctx_list));
101404
101405 /* stop hardware - this must stop RX */
101406- if (local->open_count)
101407+ if (local_read(&local->open_count))
101408 ieee80211_stop_device(local);
101409
101410 suspend:
101411diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
101412index 8fdadfd..a4f72b8 100644
101413--- a/net/mac80211/rate.c
101414+++ b/net/mac80211/rate.c
101415@@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
101416
101417 ASSERT_RTNL();
101418
101419- if (local->open_count)
101420+ if (local_read(&local->open_count))
101421 return -EBUSY;
101422
101423 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
101424diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
101425index 6ff1346..936ca9a 100644
101426--- a/net/mac80211/rc80211_pid_debugfs.c
101427+++ b/net/mac80211/rc80211_pid_debugfs.c
101428@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
101429
101430 spin_unlock_irqrestore(&events->lock, status);
101431
101432- if (copy_to_user(buf, pb, p))
101433+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
101434 return -EFAULT;
101435
101436 return p;
101437diff --git a/net/mac80211/util.c b/net/mac80211/util.c
101438index 3c36583..12887fe 100644
101439--- a/net/mac80211/util.c
101440+++ b/net/mac80211/util.c
101441@@ -1509,7 +1509,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
101442 }
101443 #endif
101444 /* everything else happens only if HW was up & running */
101445- if (!local->open_count)
101446+ if (!local_read(&local->open_count))
101447 goto wake_up;
101448
101449 /*
101450@@ -1734,7 +1734,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
101451 local->in_reconfig = false;
101452 barrier();
101453
101454- if (local->monitors == local->open_count && local->monitors > 0)
101455+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
101456 ieee80211_add_virtual_monitor(local);
101457
101458 /*
101459diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
101460index e9410d1..77b6378 100644
101461--- a/net/netfilter/Kconfig
101462+++ b/net/netfilter/Kconfig
101463@@ -1081,6 +1081,16 @@ config NETFILTER_XT_MATCH_ESP
101464
101465 To compile it as a module, choose M here. If unsure, say N.
101466
101467+config NETFILTER_XT_MATCH_GRADM
101468+ tristate '"gradm" match support'
101469+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
101470+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
101471+ ---help---
101472+ The gradm match allows to match on grsecurity RBAC being enabled.
101473+ It is useful when iptables rules are applied early on bootup to
101474+ prevent connections to the machine (except from a trusted host)
101475+ while the RBAC system is disabled.
101476+
101477 config NETFILTER_XT_MATCH_HASHLIMIT
101478 tristate '"hashlimit" match support'
101479 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
101480diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
101481index bffdad7..f9317d1 100644
101482--- a/net/netfilter/Makefile
101483+++ b/net/netfilter/Makefile
101484@@ -133,6 +133,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
101485 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
101486 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
101487 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
101488+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
101489 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
101490 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
101491 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
101492diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
101493index 1172083..986f1c1 100644
101494--- a/net/netfilter/ipset/ip_set_core.c
101495+++ b/net/netfilter/ipset/ip_set_core.c
101496@@ -1924,7 +1924,7 @@ done:
101497 return ret;
101498 }
101499
101500-static struct nf_sockopt_ops so_set __read_mostly = {
101501+static struct nf_sockopt_ops so_set = {
101502 .pf = PF_INET,
101503 .get_optmin = SO_IP_SET,
101504 .get_optmax = SO_IP_SET + 1,
101505diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
101506index a8eb0a8..86f2de4 100644
101507--- a/net/netfilter/ipvs/ip_vs_conn.c
101508+++ b/net/netfilter/ipvs/ip_vs_conn.c
101509@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
101510 /* Increase the refcnt counter of the dest */
101511 ip_vs_dest_hold(dest);
101512
101513- conn_flags = atomic_read(&dest->conn_flags);
101514+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
101515 if (cp->protocol != IPPROTO_UDP)
101516 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
101517 flags = cp->flags;
101518@@ -900,7 +900,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
101519
101520 cp->control = NULL;
101521 atomic_set(&cp->n_control, 0);
101522- atomic_set(&cp->in_pkts, 0);
101523+ atomic_set_unchecked(&cp->in_pkts, 0);
101524
101525 cp->packet_xmit = NULL;
101526 cp->app = NULL;
101527@@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
101528
101529 /* Don't drop the entry if its number of incoming packets is not
101530 located in [0, 8] */
101531- i = atomic_read(&cp->in_pkts);
101532+ i = atomic_read_unchecked(&cp->in_pkts);
101533 if (i > 8 || i < 0) return 0;
101534
101535 if (!todrop_rate[i]) return 0;
101536diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
101537index 3d2d2c8..c87e4d3 100644
101538--- a/net/netfilter/ipvs/ip_vs_core.c
101539+++ b/net/netfilter/ipvs/ip_vs_core.c
101540@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
101541 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
101542 /* do not touch skb anymore */
101543
101544- atomic_inc(&cp->in_pkts);
101545+ atomic_inc_unchecked(&cp->in_pkts);
101546 ip_vs_conn_put(cp);
101547 return ret;
101548 }
101549@@ -1711,7 +1711,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
101550 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
101551 pkts = sysctl_sync_threshold(ipvs);
101552 else
101553- pkts = atomic_add_return(1, &cp->in_pkts);
101554+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
101555
101556 if (ipvs->sync_state & IP_VS_STATE_MASTER)
101557 ip_vs_sync_conn(net, cp, pkts);
101558diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
101559index c42e83d..a6a3f8b 100644
101560--- a/net/netfilter/ipvs/ip_vs_ctl.c
101561+++ b/net/netfilter/ipvs/ip_vs_ctl.c
101562@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
101563 */
101564 ip_vs_rs_hash(ipvs, dest);
101565 }
101566- atomic_set(&dest->conn_flags, conn_flags);
101567+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
101568
101569 /* bind the service */
101570 old_svc = rcu_dereference_protected(dest->svc, 1);
101571@@ -1654,7 +1654,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
101572 * align with netns init in ip_vs_control_net_init()
101573 */
101574
101575-static struct ctl_table vs_vars[] = {
101576+static ctl_table_no_const vs_vars[] __read_only = {
101577 {
101578 .procname = "amemthresh",
101579 .maxlen = sizeof(int),
101580@@ -2075,7 +2075,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
101581 " %-7s %-6d %-10d %-10d\n",
101582 &dest->addr.in6,
101583 ntohs(dest->port),
101584- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
101585+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
101586 atomic_read(&dest->weight),
101587 atomic_read(&dest->activeconns),
101588 atomic_read(&dest->inactconns));
101589@@ -2086,7 +2086,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
101590 "%-7s %-6d %-10d %-10d\n",
101591 ntohl(dest->addr.ip),
101592 ntohs(dest->port),
101593- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
101594+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
101595 atomic_read(&dest->weight),
101596 atomic_read(&dest->activeconns),
101597 atomic_read(&dest->inactconns));
101598@@ -2564,7 +2564,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
101599
101600 entry.addr = dest->addr.ip;
101601 entry.port = dest->port;
101602- entry.conn_flags = atomic_read(&dest->conn_flags);
101603+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
101604 entry.weight = atomic_read(&dest->weight);
101605 entry.u_threshold = dest->u_threshold;
101606 entry.l_threshold = dest->l_threshold;
101607@@ -3107,7 +3107,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
101608 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
101609 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
101610 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
101611- (atomic_read(&dest->conn_flags) &
101612+ (atomic_read_unchecked(&dest->conn_flags) &
101613 IP_VS_CONN_F_FWD_MASK)) ||
101614 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
101615 atomic_read(&dest->weight)) ||
101616@@ -3697,7 +3697,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
101617 {
101618 int idx;
101619 struct netns_ipvs *ipvs = net_ipvs(net);
101620- struct ctl_table *tbl;
101621+ ctl_table_no_const *tbl;
101622
101623 atomic_set(&ipvs->dropentry, 0);
101624 spin_lock_init(&ipvs->dropentry_lock);
101625diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
101626index 547ff33..c8c8117 100644
101627--- a/net/netfilter/ipvs/ip_vs_lblc.c
101628+++ b/net/netfilter/ipvs/ip_vs_lblc.c
101629@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
101630 * IPVS LBLC sysctl table
101631 */
101632 #ifdef CONFIG_SYSCTL
101633-static struct ctl_table vs_vars_table[] = {
101634+static ctl_table_no_const vs_vars_table[] __read_only = {
101635 {
101636 .procname = "lblc_expiration",
101637 .data = NULL,
101638diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
101639index 3f21a2f..a112e85 100644
101640--- a/net/netfilter/ipvs/ip_vs_lblcr.c
101641+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
101642@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
101643 * IPVS LBLCR sysctl table
101644 */
101645
101646-static struct ctl_table vs_vars_table[] = {
101647+static ctl_table_no_const vs_vars_table[] __read_only = {
101648 {
101649 .procname = "lblcr_expiration",
101650 .data = NULL,
101651diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
101652index db80126..ef7110e 100644
101653--- a/net/netfilter/ipvs/ip_vs_sync.c
101654+++ b/net/netfilter/ipvs/ip_vs_sync.c
101655@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
101656 cp = cp->control;
101657 if (cp) {
101658 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
101659- pkts = atomic_add_return(1, &cp->in_pkts);
101660+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
101661 else
101662 pkts = sysctl_sync_threshold(ipvs);
101663 ip_vs_sync_conn(net, cp->control, pkts);
101664@@ -771,7 +771,7 @@ control:
101665 if (!cp)
101666 return;
101667 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
101668- pkts = atomic_add_return(1, &cp->in_pkts);
101669+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
101670 else
101671 pkts = sysctl_sync_threshold(ipvs);
101672 goto sloop;
101673@@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
101674
101675 if (opt)
101676 memcpy(&cp->in_seq, opt, sizeof(*opt));
101677- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
101678+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
101679 cp->state = state;
101680 cp->old_state = cp->state;
101681 /*
101682diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
101683index c47444e..b0961c6 100644
101684--- a/net/netfilter/ipvs/ip_vs_xmit.c
101685+++ b/net/netfilter/ipvs/ip_vs_xmit.c
101686@@ -1102,7 +1102,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
101687 else
101688 rc = NF_ACCEPT;
101689 /* do not touch skb anymore */
101690- atomic_inc(&cp->in_pkts);
101691+ atomic_inc_unchecked(&cp->in_pkts);
101692 goto out;
101693 }
101694
101695@@ -1194,7 +1194,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
101696 else
101697 rc = NF_ACCEPT;
101698 /* do not touch skb anymore */
101699- atomic_inc(&cp->in_pkts);
101700+ atomic_inc_unchecked(&cp->in_pkts);
101701 goto out;
101702 }
101703
101704diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
101705index a4b5e2a..13b1de3 100644
101706--- a/net/netfilter/nf_conntrack_acct.c
101707+++ b/net/netfilter/nf_conntrack_acct.c
101708@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
101709 #ifdef CONFIG_SYSCTL
101710 static int nf_conntrack_acct_init_sysctl(struct net *net)
101711 {
101712- struct ctl_table *table;
101713+ ctl_table_no_const *table;
101714
101715 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
101716 GFP_KERNEL);
101717diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
101718index 75421f2..0e69621 100644
101719--- a/net/netfilter/nf_conntrack_core.c
101720+++ b/net/netfilter/nf_conntrack_core.c
101721@@ -1789,6 +1789,10 @@ void nf_conntrack_init_end(void)
101722 #define DYING_NULLS_VAL ((1<<30)+1)
101723 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
101724
101725+#ifdef CONFIG_GRKERNSEC_HIDESYM
101726+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
101727+#endif
101728+
101729 int nf_conntrack_init_net(struct net *net)
101730 {
101731 int ret = -ENOMEM;
101732@@ -1814,7 +1818,11 @@ int nf_conntrack_init_net(struct net *net)
101733 if (!net->ct.stat)
101734 goto err_pcpu_lists;
101735
101736+#ifdef CONFIG_GRKERNSEC_HIDESYM
101737+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
101738+#else
101739 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
101740+#endif
101741 if (!net->ct.slabname)
101742 goto err_slabname;
101743
101744diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
101745index 1df1761..ce8b88a 100644
101746--- a/net/netfilter/nf_conntrack_ecache.c
101747+++ b/net/netfilter/nf_conntrack_ecache.c
101748@@ -188,7 +188,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
101749 #ifdef CONFIG_SYSCTL
101750 static int nf_conntrack_event_init_sysctl(struct net *net)
101751 {
101752- struct ctl_table *table;
101753+ ctl_table_no_const *table;
101754
101755 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
101756 GFP_KERNEL);
101757diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
101758index 5b3eae7..dd4b8fe 100644
101759--- a/net/netfilter/nf_conntrack_helper.c
101760+++ b/net/netfilter/nf_conntrack_helper.c
101761@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
101762
101763 static int nf_conntrack_helper_init_sysctl(struct net *net)
101764 {
101765- struct ctl_table *table;
101766+ ctl_table_no_const *table;
101767
101768 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
101769 GFP_KERNEL);
101770diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
101771index b65d586..beec902 100644
101772--- a/net/netfilter/nf_conntrack_proto.c
101773+++ b/net/netfilter/nf_conntrack_proto.c
101774@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
101775
101776 static void
101777 nf_ct_unregister_sysctl(struct ctl_table_header **header,
101778- struct ctl_table **table,
101779+ ctl_table_no_const **table,
101780 unsigned int users)
101781 {
101782 if (users > 0)
101783diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
101784index f641751..d3c5b51 100644
101785--- a/net/netfilter/nf_conntrack_standalone.c
101786+++ b/net/netfilter/nf_conntrack_standalone.c
101787@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
101788
101789 static int nf_conntrack_standalone_init_sysctl(struct net *net)
101790 {
101791- struct ctl_table *table;
101792+ ctl_table_no_const *table;
101793
101794 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
101795 GFP_KERNEL);
101796diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
101797index 7a394df..bd91a8a 100644
101798--- a/net/netfilter/nf_conntrack_timestamp.c
101799+++ b/net/netfilter/nf_conntrack_timestamp.c
101800@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
101801 #ifdef CONFIG_SYSCTL
101802 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
101803 {
101804- struct ctl_table *table;
101805+ ctl_table_no_const *table;
101806
101807 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
101808 GFP_KERNEL);
101809diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
101810index 85296d4..8becdec 100644
101811--- a/net/netfilter/nf_log.c
101812+++ b/net/netfilter/nf_log.c
101813@@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
101814
101815 #ifdef CONFIG_SYSCTL
101816 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
101817-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
101818+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
101819
101820 static int nf_log_proc_dostring(struct ctl_table *table, int write,
101821 void __user *buffer, size_t *lenp, loff_t *ppos)
101822@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
101823 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
101824 mutex_unlock(&nf_log_mutex);
101825 } else {
101826+ ctl_table_no_const nf_log_table = *table;
101827+
101828 mutex_lock(&nf_log_mutex);
101829 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
101830 lockdep_is_held(&nf_log_mutex));
101831 if (!logger)
101832- table->data = "NONE";
101833+ nf_log_table.data = "NONE";
101834 else
101835- table->data = logger->name;
101836- r = proc_dostring(table, write, buffer, lenp, ppos);
101837+ nf_log_table.data = logger->name;
101838+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
101839 mutex_unlock(&nf_log_mutex);
101840 }
101841
101842diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
101843index f042ae5..30ea486 100644
101844--- a/net/netfilter/nf_sockopt.c
101845+++ b/net/netfilter/nf_sockopt.c
101846@@ -45,7 +45,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
101847 }
101848 }
101849
101850- list_add(&reg->list, &nf_sockopts);
101851+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
101852 out:
101853 mutex_unlock(&nf_sockopt_mutex);
101854 return ret;
101855@@ -55,7 +55,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
101856 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
101857 {
101858 mutex_lock(&nf_sockopt_mutex);
101859- list_del(&reg->list);
101860+ pax_list_del((struct list_head *)&reg->list);
101861 mutex_unlock(&nf_sockopt_mutex);
101862 }
101863 EXPORT_SYMBOL(nf_unregister_sockopt);
101864diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
101865index d292c8d..9f1e166 100644
101866--- a/net/netfilter/nfnetlink_log.c
101867+++ b/net/netfilter/nfnetlink_log.c
101868@@ -79,7 +79,7 @@ static int nfnl_log_net_id __read_mostly;
101869 struct nfnl_log_net {
101870 spinlock_t instances_lock;
101871 struct hlist_head instance_table[INSTANCE_BUCKETS];
101872- atomic_t global_seq;
101873+ atomic_unchecked_t global_seq;
101874 };
101875
101876 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
101877@@ -561,7 +561,7 @@ __build_packet_message(struct nfnl_log_net *log,
101878 /* global sequence number */
101879 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
101880 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
101881- htonl(atomic_inc_return(&log->global_seq))))
101882+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
101883 goto nla_put_failure;
101884
101885 if (data_len) {
101886diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
101887index 8a779be..1551d4c 100644
101888--- a/net/netfilter/nft_compat.c
101889+++ b/net/netfilter/nft_compat.c
101890@@ -216,7 +216,7 @@ target_dump_info(struct sk_buff *skb, const struct xt_target *t, const void *in)
101891 /* We want to reuse existing compat_to_user */
101892 old_fs = get_fs();
101893 set_fs(KERNEL_DS);
101894- t->compat_to_user(out, in);
101895+ t->compat_to_user((void __force_user *)out, in);
101896 set_fs(old_fs);
101897 ret = nla_put(skb, NFTA_TARGET_INFO, XT_ALIGN(t->targetsize), out);
101898 kfree(out);
101899@@ -403,7 +403,7 @@ match_dump_info(struct sk_buff *skb, const struct xt_match *m, const void *in)
101900 /* We want to reuse existing compat_to_user */
101901 old_fs = get_fs();
101902 set_fs(KERNEL_DS);
101903- m->compat_to_user(out, in);
101904+ m->compat_to_user((void __force_user *)out, in);
101905 set_fs(old_fs);
101906 ret = nla_put(skb, NFTA_MATCH_INFO, XT_ALIGN(m->matchsize), out);
101907 kfree(out);
101908diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
101909new file mode 100644
101910index 0000000..c566332
101911--- /dev/null
101912+++ b/net/netfilter/xt_gradm.c
101913@@ -0,0 +1,51 @@
101914+/*
101915+ * gradm match for netfilter
101916